gentoo auto-resync : 24:11:2022 - 07:10:12

4 files changed, 39 insertions, 27 deletions

diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest
index f3c3475465a8..4c5170ad2e06 100644
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@@ -24,8 +24,8 @@ DIST qemu-7.1.0.tar.xz 121833004 BLAKE2B e05f91ce4993c7591a2df08b5fb017f8b8ec214
 DIST qemu-7.2.0-rc1.tar.xz 122418104 BLAKE2B 9cf9c97070bbad3aa94906d9527016f8e8a3c7028ec3bd9a3e98c5be0f0e4582a21b5f503404671c88ddcebd886379226901c80414bf67d941176f33147246a9 SHA512 9d1c008c57b5e4f9c7b64fa12b1784b95d2c6c774a3e7316c60e5344e7f2b3261832fb0fec9edd7bb13bc22eb10180a9830ac0a8ca0c032e5044b90f846de1a6
 DIST qemu-7.2.0_rc1-docs.tar.xz 1985244 BLAKE2B 25d5fed85a49f4c801838b2270a6fb4af8ddd85bbbb4b5f4988940447ef719fc494576bae2760f061787bce2177bea9fecc16103a280c6ae68f1ecb44d9ca3de SHA512 d20cf42c092b0d6480c5198fba6379eda27b8f0b5dbb78c5f94eb385cf011901e91f31cba6c02d514b18bc56b8a968bcf1f7e80ccbd37547bc15e42706a86a82
 EBUILD qemu-7.0.0-r3.ebuild 27290 BLAKE2B 985947dc90817bed2c5e0878158604577b6ac3f7f605fd6372aa5b480851a6c94ea44e73aa301b7c1a5b8fa59f2281e57f99a84e5b10bc07beff0a3096b48a22 SHA512 8cc6ae4e2bde1b458d1682624fb46a56c1837592545638e63907c4067e67c39a609e85941381a33a80013d5e82c202644c6a9c5202091e344eabe3f8f6eb0c5b
-EBUILD qemu-7.1.0-r2.ebuild 27361 BLAKE2B 66dce3e20be4b713b787739359aafdc8b7f4c1ec3324e7f56fd7531608ffc7739a46918567c4f2bf7acb35a166bd4cfae614e2cdb55a0b9507e19189b780ef68 SHA512 0bfc759abf92582f8cdbc2c8afbfbc5cbc59c85f22cbcb8e61faa1560a1076c53a4b4d53f92ba1ca04815ef8e87ae8c77d2a9ce38e5afddae673bd37ad5c2079
+EBUILD qemu-7.1.0-r2.ebuild 27369 BLAKE2B ad5433a42427f8e686926e32c148e05aad664d47bcb920973b9becebe7eef70dc6802443252045977c98a6a8934bc0624fb1f277421d0ea1e641afdf07e58405 SHA512 1d9f4a98361b1139eec1693fc45ae54e00d10b784840de0213800fa68642f7e52526dab830584983ad1978b06d448b10e186a16d6ef9fdfdac5ad16483288cd0
 EBUILD qemu-7.1.0.ebuild 28397 BLAKE2B d9348f01501bd60b1dd11a87ec52214a29c2e0fac5e815b3820f12a97390434509537b850646fe62c002aa259d9fa5c802659be430df2e556998b658dd05117c SHA512 a7113edecc8c9fd0d46faff044bb498deb700c1eb8da9b8d38cfcc742fcb9e04e35f5db8b89234cedf93560bd2c5b40229f09440c544f21547caf7931c875ea7
-EBUILD qemu-7.2.0_rc1-r1.ebuild 27330 BLAKE2B 8de5f589fe6afa5fa1cb64f3c61349b51f50a10afdc24b1ffff9a75c6cc7296213de8a972c5fb4167a4d337cfaa7a1bbc1110d2f4079753051c7795dc469094e SHA512 75b994b4ba7b50d106e5d5cb3086d0cc00cfa09d29df4849cb72e10e124eaa4f5c23075a5b797d9a28e31c80cf3acf298f3cf5431841d1d13daa40d18c55efbd
-EBUILD qemu-9999.ebuild 27320 BLAKE2B 32e6ded305a07fb4a37e33ba7176bc8afbde82c838ffc0a0fa001efdefdfb2e016679cc93a5bfbb8ae14dbb9844b6f833ae7bb0be98578ada2a55d3a21f941be SHA512 1e662b2bb8ff07f4f8970c0672bc3deb42c373a15b94db6edf7deb357f9b94326f92a9a3a5ae59bff3de86ec8816d8f2735589b6bc78411015a1f1e776b7ff9c
+EBUILD qemu-7.2.0_rc1-r1.ebuild 27338 BLAKE2B b2517fbb9474286d9b0e6c4609ee8063e44d0ec57e6975d3807944c9e57b18589d7da9ee6954a6cc5f84b85adba221ec90c937dc61e614105b7755cc6b541daa SHA512 95259a4be936394063b486f9b7864f724f55c486be6b7c2e13566f56f70d57188b529ca45f9767f53a2d5f9eb441e67de422c6d01682550ccefbab4c1e7a4856
+EBUILD qemu-9999.ebuild 27328 BLAKE2B 5303cfce62658e6a714a1a274b3597bc37c467244d5d416793c7605eec4f75b9b8a4b81602453e7c60acfd212eeeee80c3867dfffde688db7fc9863b721f5fc6 SHA512 cb9fbcfd18cb1e571ccf81125299d29b66c80611f1758f952de83db63beafbf763775de30b32e2a80bb058b3fadd73085f8c4c30c4e0a4c709dbf3fc1ad442ce
 MISC metadata.xml 4787 BLAKE2B 587c653d3989f07a476e95210ab5f878387f830dba00fde02840aace8b9f4288189ca2ef4226fefa088a355aa714d244ea5a8e5f24f6d038a35ad54e9d8ee147 SHA512 7395730466501bb707983248b10ab9930b8016cc8ff193ab4d532996faf59d8e4ec79ecf675ec650082d47dc86a81b5eea941dccdb70c1de39fbf1ea65838620
diff --git a/app-emulation/qemu/qemu-7.1.0-r2.ebuild b/app-emulation/qemu/qemu-7.1.0-r2.ebuild
index a71f1773c462..7937c736489c 100644
--- a/app-emulation/qemu/qemu-7.1.0-r2.ebuild
+++ b/app-emulation/qemu/qemu-7.1.0-r2.ebuild
@@ -52,12 +52,12 @@ SLOT="0"
 
 [[ ${QEMU_DOCS_PREBUILT} == 1 ]] && QEMU_DOC_USEFLAG="doc"
 
-IUSE="accessibility +aio alsa bpf bzip2 capstone +caps +curl debug ${QEMU_DOC_USEFLAG}
+IUSE="accessibility +aio alsa bpf bzip2 capstone +curl debug ${QEMU_DOC_USEFLAG}
 	+fdt fuse glusterfs +gnutls gtk infiniband iscsi io-uring
 	jack jemalloc +jpeg
 	lzo multipath
 	ncurses nfs nls numa opengl +oss pam +pin-upstream-blobs
-	plugins +png pulseaudio python rbd sasl +seccomp sdl sdl-image selinux
+	plugins +png pulseaudio python rbd sasl sdl sdl-image selinux
 	+slirp
 	smartcard snappy spice ssh static static-user systemtap test udev usb
 	usbredir vde +vhost-net virgl virtfs +vnc vte xattr xen
@@ -117,7 +117,7 @@ IUSE+=" ${use_softmmu_targets} ${use_user_targets}"
 RESTRICT="!test? ( test )"
 # Allow no targets to be built so that people can get a tools-only build.
 # Block USE flag configurations known to not work.
-REQUIRED_USE="caps seccomp
+REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
 	qemu_softmmu_targets_arm? ( fdt )
 	qemu_softmmu_targets_microblaze? ( fdt )
@@ -131,7 +131,7 @@ REQUIRED_USE="caps seccomp
 	static? ( static-user !alsa !gtk !jack !opengl !pam !pulseaudio !plugins !rbd !snappy !udev )
 	static-user? ( !plugins )
 	virgl? ( opengl )
-	virtfs? ( caps xattr )
+	virtfs? ( xattr )
 	vnc? ( gnutls )
 	vte? ( gtk )
 	multipath? ( udev )
@@ -156,6 +156,8 @@ ALL_DEPEND="
 # Dependencies required for qemu tools (qemu-nbd, qemu-img, qemu-io, ...)
 # softmmu targets (qemu-system-*).
 SOFTMMU_TOOLS_DEPEND="
+	sys-libs/libcap-ng[static-libs(+)]
+	>=sys-libs/libseccomp-2.1.0[static-libs(+)]
 	>=x11-libs/pixman-0.28.0[static-libs(+)]
 	accessibility? (
 		app-accessibility/brltty[api]
@@ -166,7 +168,6 @@ SOFTMMU_TOOLS_DEPEND="
 	bpf? ( dev-libs/libbpf:= )
 	bzip2? ( app-arch/bzip2[static-libs(+)] )
 	capstone? ( dev-libs/capstone:= )
-	caps? ( sys-libs/libcap-ng[static-libs(+)] )
 	curl? ( >=net-misc/curl-7.15.4[static-libs(+)] )
 	fdt? ( >=sys-apps/dtc-1.5.1[static-libs(+)] )
 	fuse? ( >=sys-fs/fuse-3.1:3[static-libs(+)] )
@@ -209,7 +210,6 @@ SOFTMMU_TOOLS_DEPEND="
 		media-libs/libsdl2[static-libs(+)]
 	)
 	sdl-image? ( media-libs/sdl2-image[static-libs(+)] )
-	seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] )
 	slirp? ( net-libs/libslirp[static-libs(+)] )
 	smartcard? ( >=app-emulation/libcacard-2.5.0[static-libs(+)] )
 	snappy? ( app-arch/snappy:= )
@@ -555,7 +555,6 @@ qemu_src_configure() {
 		$(conf_softmmu bpf)
 		$(conf_notuser bzip2)
 		$(conf_notuser capstone)
-		$(conf_notuser caps cap-ng)
 		$(conf_notuser curl)
 		$(conf_tools doc docs)
 		$(conf_notuser fdt)
@@ -582,7 +581,6 @@ qemu_src_configure() {
 		$(conf_notuser sasl vnc-sasl)
 		$(conf_notuser sdl)
 		$(conf_softmmu sdl-image)
-		$(conf_notuser seccomp)
 		$(conf_notuser slirp slirp system)
 		$(conf_notuser smartcard)
 		$(conf_notuser snappy)
@@ -627,6 +625,8 @@ qemu_src_configure() {
 			--disable-system
 			--disable-blobs
 			--disable-tools
+			--disable-cap-ng
+			--disable-seccomp
 		)
 		local static_flag="static-user"
 		;;
@@ -635,6 +635,8 @@ qemu_src_configure() {
 			--disable-linux-user
 			--enable-system
 			--disable-tools
+			--enable-cap-ng
+			--enable-seccomp
 		)
 		local static_flag="static"
 		;;
@@ -643,6 +645,8 @@ qemu_src_configure() {
 			--disable-linux-user
 			--disable-system
 			--disable-blobs
+			--enable-cap-ng
+			--enable-seccomp
 			--enable-tools
 		)
 		local static_flag="static"
diff --git a/app-emulation/qemu/qemu-7.2.0_rc1-r1.ebuild b/app-emulation/qemu/qemu-7.2.0_rc1-r1.ebuild
index 55f7d11a7162..2a80d49394ec 100644
--- a/app-emulation/qemu/qemu-7.2.0_rc1-r1.ebuild
+++ b/app-emulation/qemu/qemu-7.2.0_rc1-r1.ebuild
@@ -52,12 +52,12 @@ SLOT="0"
 
 [[ ${QEMU_DOCS_PREBUILT} == 1 ]] && QEMU_DOC_USEFLAG="doc"
 
-IUSE="accessibility +aio alsa bpf bzip2 capstone +caps +curl debug ${QEMU_DOC_USEFLAG}
+IUSE="accessibility +aio alsa bpf bzip2 capstone +curl debug ${QEMU_DOC_USEFLAG}
 	+fdt fuse glusterfs +gnutls gtk infiniband iscsi io-uring
 	jack jemalloc +jpeg
 	lzo multipath
 	ncurses nfs nls numa opengl +oss pam +pin-upstream-blobs
-	plugins +png pulseaudio python rbd sasl +seccomp sdl sdl-image selinux
+	plugins +png pulseaudio python rbd sasl sdl sdl-image selinux
 	+slirp
 	smartcard snappy spice ssh static static-user systemtap test udev usb
 	usbredir vde +vhost-net virgl virtfs +vnc vte xattr xen
@@ -117,7 +117,7 @@ IUSE+=" ${use_softmmu_targets} ${use_user_targets}"
 RESTRICT="!test? ( test )"
 # Allow no targets to be built so that people can get a tools-only build.
 # Block USE flag configurations known to not work.
-REQUIRED_USE="caps seccomp
+REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
 	qemu_softmmu_targets_arm? ( fdt )
 	qemu_softmmu_targets_microblaze? ( fdt )
@@ -131,7 +131,7 @@ REQUIRED_USE="caps seccomp
 	static? ( static-user !alsa !gtk !jack !opengl !pam !pulseaudio !plugins !rbd !snappy !udev )
 	static-user? ( !plugins )
 	virgl? ( opengl )
-	virtfs? ( caps xattr )
+	virtfs? ( xattr )
 	vnc? ( gnutls )
 	vte? ( gtk )
 	multipath? ( udev )
@@ -156,6 +156,8 @@ ALL_DEPEND="
 # Dependencies required for qemu tools (qemu-nbd, qemu-img, qemu-io, ...)
 # softmmu targets (qemu-system-*).
 SOFTMMU_TOOLS_DEPEND="
+	sys-libs/libcap-ng[static-libs(+)]
+	>=sys-libs/libseccomp-2.1.0[static-libs(+)]
 	>=x11-libs/pixman-0.28.0[static-libs(+)]
 	accessibility? (
 		app-accessibility/brltty[api]
@@ -166,7 +168,6 @@ SOFTMMU_TOOLS_DEPEND="
 	bpf? ( dev-libs/libbpf:= )
 	bzip2? ( app-arch/bzip2[static-libs(+)] )
 	capstone? ( dev-libs/capstone:= )
-	caps? ( sys-libs/libcap-ng[static-libs(+)] )
 	curl? ( >=net-misc/curl-7.15.4[static-libs(+)] )
 	fdt? ( >=sys-apps/dtc-1.5.1[static-libs(+)] )
 	fuse? ( >=sys-fs/fuse-3.1:3[static-libs(+)] )
@@ -209,7 +210,6 @@ SOFTMMU_TOOLS_DEPEND="
 		media-libs/libsdl2[static-libs(+)]
 	)
 	sdl-image? ( media-libs/sdl2-image[static-libs(+)] )
-	seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] )
 	slirp? ( net-libs/libslirp[static-libs(+)] )
 	smartcard? ( >=app-emulation/libcacard-2.5.0[static-libs(+)] )
 	snappy? ( app-arch/snappy:= )
@@ -554,7 +554,6 @@ qemu_src_configure() {
 		$(conf_softmmu bpf)
 		$(conf_notuser bzip2)
 		$(conf_notuser capstone)
-		$(conf_notuser caps cap-ng)
 		$(conf_notuser curl)
 		$(conf_tools doc docs)
 		$(conf_notuser fdt)
@@ -581,7 +580,6 @@ qemu_src_configure() {
 		$(conf_notuser sasl vnc-sasl)
 		$(conf_notuser sdl)
 		$(conf_softmmu sdl-image)
-		$(conf_notuser seccomp)
 		$(conf_notuser slirp)
 		$(conf_notuser smartcard)
 		$(conf_notuser snappy)
@@ -626,6 +624,8 @@ qemu_src_configure() {
 			--disable-system
 			--disable-blobs
 			--disable-tools
+			--disable-cap-ng
+			--disable-seccomp
 		)
 		local static_flag="static-user"
 		;;
@@ -634,6 +634,8 @@ qemu_src_configure() {
 			--disable-linux-user
 			--enable-system
 			--disable-tools
+			--enable-cap-ng
+			--enable-seccomp
 		)
 		local static_flag="static"
 		;;
@@ -643,6 +645,8 @@ qemu_src_configure() {
 			--disable-system
 			--disable-blobs
 			--enable-tools
+			--enable-cap-ng
+			--enable-seccomp
 		)
 		local static_flag="static"
 		;;
diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild
index 3616ee03475f..29c185858cb4 100644
--- a/app-emulation/qemu/qemu-9999.ebuild
+++ b/app-emulation/qemu/qemu-9999.ebuild
@@ -53,12 +53,12 @@ SLOT="0"
 
 [[ ${QEMU_DOCS_PREBUILT} == 1 ]] && QEMU_DOC_USEFLAG="doc"
 
-IUSE="accessibility +aio alsa bpf bzip2 capstone +caps +curl debug ${QEMU_DOC_USEFLAG}
+IUSE="accessibility +aio alsa bpf bzip2 capstone +curl debug ${QEMU_DOC_USEFLAG}
 	+fdt fuse glusterfs +gnutls gtk infiniband iscsi io-uring
 	jack jemalloc +jpeg
 	lzo multipath
 	ncurses nfs nls numa opengl +oss pam +pin-upstream-blobs
-	plugins +png pulseaudio python rbd sasl +seccomp sdl sdl-image selinux
+	plugins +png pulseaudio python rbd sasl sdl sdl-image selinux
 	+slirp
 	smartcard snappy spice ssh static static-user systemtap test udev usb
 	usbredir vde +vhost-net virgl virtfs +vnc vte xattr xen
@@ -118,7 +118,7 @@ IUSE+=" ${use_softmmu_targets} ${use_user_targets}"
 RESTRICT="!test? ( test )"
 # Allow no targets to be built so that people can get a tools-only build.
 # Block USE flag configurations known to not work.
-REQUIRED_USE="caps seccomp
+REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
 	qemu_softmmu_targets_arm? ( fdt )
 	qemu_softmmu_targets_microblaze? ( fdt )
@@ -132,7 +132,7 @@ REQUIRED_USE="caps seccomp
 	static? ( static-user !alsa !gtk !jack !opengl !pam !pulseaudio !plugins !rbd !snappy !udev )
 	static-user? ( !plugins )
 	virgl? ( opengl )
-	virtfs? ( caps xattr )
+	virtfs? ( xattr )
 	vnc? ( gnutls )
 	vte? ( gtk )
 	multipath? ( udev )
@@ -157,6 +157,8 @@ ALL_DEPEND="
 # Dependencies required for qemu tools (qemu-nbd, qemu-img, qemu-io, ...)
 # softmmu targets (qemu-system-*).
 SOFTMMU_TOOLS_DEPEND="
+	sys-libs/libcap-ng[static-libs(+)]
+	>=sys-libs/libseccomp-2.1.0[static-libs(+)]
 	>=x11-libs/pixman-0.28.0[static-libs(+)]
 	accessibility? (
 		app-accessibility/brltty[api]
@@ -167,7 +169,6 @@ SOFTMMU_TOOLS_DEPEND="
 	bpf? ( dev-libs/libbpf:= )
 	bzip2? ( app-arch/bzip2[static-libs(+)] )
 	capstone? ( dev-libs/capstone:= )
-	caps? ( sys-libs/libcap-ng[static-libs(+)] )
 	curl? ( >=net-misc/curl-7.15.4[static-libs(+)] )
 	fdt? ( >=sys-apps/dtc-1.5.1[static-libs(+)] )
 	fuse? ( >=sys-fs/fuse-3.1:3[static-libs(+)] )
@@ -210,7 +211,6 @@ SOFTMMU_TOOLS_DEPEND="
 		media-libs/libsdl2[static-libs(+)]
 	)
 	sdl-image? ( media-libs/sdl2-image[static-libs(+)] )
-	seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] )
 	slirp? ( net-libs/libslirp[static-libs(+)] )
 	smartcard? ( >=app-emulation/libcacard-2.5.0[static-libs(+)] )
 	snappy? ( app-arch/snappy:= )
@@ -555,7 +555,6 @@ qemu_src_configure() {
 		$(conf_softmmu bpf)
 		$(conf_notuser bzip2)
 		$(conf_notuser capstone)
-		$(conf_notuser caps cap-ng)
 		$(conf_notuser curl)
 		$(conf_tools doc docs)
 		$(conf_notuser fdt)
@@ -582,7 +581,6 @@ qemu_src_configure() {
 		$(conf_notuser sasl vnc-sasl)
 		$(conf_notuser sdl)
 		$(conf_softmmu sdl-image)
-		$(conf_notuser seccomp)
 		$(conf_notuser slirp)
 		$(conf_notuser smartcard)
 		$(conf_notuser snappy)
@@ -627,6 +625,8 @@ qemu_src_configure() {
 			--disable-system
 			--disable-blobs
 			--disable-tools
+			--disable-cap-ng
+			--disable-seccomp
 		)
 		local static_flag="static-user"
 		;;
@@ -635,6 +635,8 @@ qemu_src_configure() {
 			--disable-linux-user
 			--enable-system
 			--disable-tools
+			--enable-cap-ng
+			--enable-seccomp
 		)
 		local static_flag="static"
 		;;
@@ -644,6 +646,8 @@ qemu_src_configure() {
 			--disable-system
 			--disable-blobs
 			--enable-tools
+			--enable-cap-ng
+			--enable-seccomp
 		)
 		local static_flag="static"
 		;;