9 files changed, 68 insertions, 24 deletions
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index d33e4ce9f83c..b50d6f19c396 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/bubblewrap/Manifest b/sys-apps/bubblewrap/Manifest
index 5a9fbdc38208..54f1a0f8851e 100644
--- a/sys-apps/bubblewrap/Manifest
+++ b/sys-apps/bubblewrap/Manifest
@@ -1,3 +1,5 @@
 DIST bubblewrap-0.6.2.tar.xz 146312 BLAKE2B bf02e9095cd1e80b84e0439d14ce57fc9bb08f9f0d3596a19eb34a55bd03b9d371368eda75f2b2106d47db29d1c2d9845fe2a12f5d0c554bbb532c9e0e53d368 SHA512 235da019cb370ea6d9328352acb38e6ff368f02f71db1ae85f2dd37655757975bd5b57bbe15f7b419b53a26b8ec3edd81b55893b420d5f42d6a9dab3471d0096
+DIST bubblewrap-0.7.0.tar.xz 147700 BLAKE2B 379feff513a509e6e00c933ca6bafdeef43827e406fbf31e56c1d16feb099a887f88125fb52d038e78b1604c504bdba771aeaeb3274e8d11163492f00fe9633c SHA512 3d163eecd79774e02d082141d027b7ac13f7d3a29c22f6513203e1088f53d53d8dde50e36fc4c8a34e8cde2f3e2a692e00b741f4bee2cc2bb21b9deb600271b5
 EBUILD bubblewrap-0.6.2-r1.ebuild 1158 BLAKE2B ba210fc5efe3f6a0cbdad8cf7202d76df25577c6af271393bad36ca1b681d4666855ffca984b43e9c054f08f90ba27bd3af338df2a73c43d92542449d39b4b45 SHA512 3f794436afcc7627d218a0543b8444b9b0df3d9dcea880e3efd35c73b4e108e1f847f56b5480e39335fb78c935d1f121b905f4f51b943948f12e7cf740e14cb6
+EBUILD bubblewrap-0.7.0.ebuild 1164 BLAKE2B 72f0f4b86fd818ef412855fe87819357b795ed5e2f75afb8b1657df6dc936ef0a0746bf16654f27622a646edcdff507e0841f2bc573f0b0349ef67e1e97764fa SHA512 44195b2ba3041648bf967c2fb73e86107d09b1d0b9516e26999e9225aca7e831f0e2a5883aa78f24d1bde7c8470ce1eccaca6d39445815769075cdbd7c5d96a5
 MISC metadata.xml 453 BLAKE2B 69f1ca03c4b84f4adc2db8bbed8bf57852719c136778747e2679517afe63b1a0621ab486121b71d78c8ae235c2cd7e3077e85ed8d3ad51cc16f1838eb94bd448 SHA512 486775a479174ad72dbcd7f6a89c8001af1a8a4c5b73620153fed4da28b15fb1c481003ffd96ef68d2b49569ed0c1a9d445bc03a9901056cd29b77b3cf13a1ef
diff --git a/sys-apps/bubblewrap/bubblewrap-0.7.0.ebuild b/sys-apps/bubblewrap/bubblewrap-0.7.0.ebuild
new file mode 100644
index 000000000000..fa95d51552b8
--- /dev/null
+++ b/sys-apps/bubblewrap/bubblewrap-0.7.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit linux-info meson
+
+DESCRIPTION="Unprivileged sandboxing tool, namespaces-powered chroot-like solution"
+HOMEPAGE="https://github.com/containers/bubblewrap/"
+SRC_URI="https://github.com/containers/${PN}/releases/download/v${PV}/${P}.tar.xz"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+IUSE="selinux suid"
+
+RDEPEND="
+	sys-libs/libseccomp
+	sys-libs/libcap
+	selinux? ( >=sys-libs/libselinux-2.1.9 )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-text/docbook-xml-dtd:4.3
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	virtual/pkgconfig
+"
+
+# tests require root privileges
+RESTRICT="test"
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != buildonly ]]; then
+		CONFIG_CHECK="~UTS_NS ~IPC_NS ~USER_NS ~PID_NS ~NET_NS"
+		linux-info_pkg_setup
+	fi
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dbash_completion=enabled
+		-Dman=enabled
+		-Dtests=false
+		-Dzsh_completion=enabled
+		$(meson_feature selinux)
+	)
+
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	if use suid; then
+		chmod u+s "${ED}"/usr/bin/bwrap
+	fi
+}
diff --git a/sys-apps/flatpak/Manifest b/sys-apps/flatpak/Manifest
index 18f95395f7a5..d561f7be3e47 100644
--- a/sys-apps/flatpak/Manifest
+++ b/sys-apps/flatpak/Manifest
@@ -1,5 +1,5 @@
 DIST flatpak-1.12.3.tar.xz 1555340 BLAKE2B 512b3f6abfb06d242aedad2c27c9870750254a9d0a3769999739f8885bbf1740b649e2a41f2c079532b049fcce8b58529572ea35e930437ed6b62194a73bcbb6 SHA512 2f39665457b4c3b99e32ebc88cf5b70202dba6118887617d3d7faa20f688f3f3fc14e343b70c0d11eb15ee743a68d07078e6cda14fd91aa10ca375797cfc95bc
 DIST flatpak-1.14.0.tar.xz 1636864 BLAKE2B f7f211480577eb5bd422c49790ebfb84da5e5a03cc6dee3815af786bfcd347bd7b01e853c027a42a1510fba68d667c4a25f6b9f998753466baae61a765c73864 SHA512 88f011534a8da6c2421d7d24043756bfe6c46957b6d09ba96b269002a5f0d0372b51f4a8643af2020ef4ed8c5b5f102994ddab54a7052cfba15f8e3b160e8a83
-EBUILD flatpak-1.12.3.ebuild 2393 BLAKE2B 227b4fdf5e99cdaa7816010ff55bd06e4eeb6b34389d826fa39a2a198350fe96acf9f408e9ac1d23da00dbe71d8200e68849eeac3f375081a67f863d6b95a0de SHA512 40820a8cb27ad7947e8900ee854fc425d08397b80e841c08ccf428401880bc9fae44f2639b21a43908d15da2d53fd36aa3e9f5e1989dbc77bf1399547bd3f803
-EBUILD flatpak-1.14.0-r1.ebuild 2530 BLAKE2B 9ed02f25da71f4ac92869e9dd1cc8f9240059e2de2f9be63f4d9f8313a694611532d8c1602534b835cd989005d552253341ad54ba408349819c1bd5ab2a2a3c4 SHA512 4dd08fb0c9d50f615ab45ce211091b83f5892b94190b83ec4e84bcd767485b095b336962d61a95a60f3057922736d87d0ff3089fc98a21a1e0bdae72bc582724
+EBUILD flatpak-1.12.3.ebuild 2401 BLAKE2B 295f7a4d27842ab9774ba710697c260250220c6171c2219891dc9e64818feb74f7bba089bd65b3c83462741b05ac98d08b0bd1770380483c26d8a2721b3c0897 SHA512 7a2afc6bf9ac02d2fe0dfd1d3409c1d0ad94d5905bc9207e306b283e0ce37931decc88d03edaf746151caf97aa35e45f19f96aa8b633afe5f4823a4addb532d2
+EBUILD flatpak-1.14.0-r1.ebuild 2538 BLAKE2B 9a29e556126e44d18135e66d6d72b4ee2db2208e87dae9afcf4d3a44501b3bdb497f5ffc10ee69f8d2315433f775ab0580147516936678fbc1cca09c45ea6110 SHA512 2ff4901f478e209845c205d6eb0a552752299e0ccfaf73ff36d0375d2b8f4901273445bdf766f3a6507a54969c86151378cc3e2368da15c6ae9c5f0320e44513
 MISC metadata.xml 325 BLAKE2B a8ca5c0feaab721a66653a8d5e084d2bba127d75faa0975a4dac7d4d7395801fc69bed88bf13663826188696ee5e25e18afc1b0d5161d27e15f36b9c88487146 SHA512 2736f22e733f2214b80c46b3280f90103e21c3211bea129614bcf372f05803b5d5148d34406e8aa332f7b21090e8aaa698bb1a25d767ccea21d3977f0894f464
diff --git a/sys-apps/flatpak/flatpak-1.12.3.ebuild b/sys-apps/flatpak/flatpak-1.12.3.ebuild
index 8a2d52051324..d83453336f19 100644
--- a/sys-apps/flatpak/flatpak-1.12.3.ebuild
+++ b/sys-apps/flatpak/flatpak-1.12.3.ebuild
@@ -35,7 +35,7 @@ RDEPEND="
 	>=gnome-base/dconf-0.26:=
 	gnome-base/gsettings-desktop-schemas
 	>=net-libs/libsoup-2.4:=
-	sys-apps/bubblewrap
+	>=sys-apps/bubblewrap-0.5.0
 	sys-apps/dbus
 	>=sys-fs/fuse-2.9.9:0=
 	sys-apps/xdg-dbus-proxy
diff --git a/sys-apps/flatpak/flatpak-1.14.0-r1.ebuild b/sys-apps/flatpak/flatpak-1.14.0-r1.ebuild
index 7cf4ec168fb0..8da6deeddf67 100644
--- a/sys-apps/flatpak/flatpak-1.14.0-r1.ebuild
+++ b/sys-apps/flatpak/flatpak-1.14.0-r1.ebuild
@@ -33,7 +33,7 @@ RDEPEND="
 	>=gnome-base/dconf-0.26:=
 	gnome-base/gsettings-desktop-schemas
 	net-misc/curl:=
-	sys-apps/bubblewrap
+	>=sys-apps/bubblewrap-0.5.0
 	sys-apps/dbus
 	>=sys-fs/fuse-2.9.9:0=
 	sys-apps/xdg-dbus-proxy
diff --git a/sys-apps/fwupd/Manifest b/sys-apps/fwupd/Manifest
index dea48d5899da..2a7316d4df0b 100644
--- a/sys-apps/fwupd/Manifest
+++ b/sys-apps/fwupd/Manifest
@@ -3,6 +3,6 @@ AUX fwupd-1.8.6-installed_tests.patch 10375 BLAKE2B 2baf10a3a681dcd15ce1c99a3f4b
 AUX fwupd-r2 308 BLAKE2B 4494e69515347569965f0966ce2fe0779a6273df18412b4f6045c6186730dc8088f85eb029347b01c22897662d9205f98871752dee99690871a39cbb26db3899 SHA512 0f5070dc73cb6e0cfad7a66781afb85c695faffd05685e9df8c9798b94d55b31c0977134015d0d5418f5815d10529d79c898ae0efb2bdf0dc9ee44b696d5fdd7
 DIST fwupd-1.8.5.tar.xz 3289548 BLAKE2B d82845ad4a6faaee966d43b8d9d5be0d4522ac6f2455ac8ef9d9c90dd0141a4feb7dd28f5c79526a49fd2ac4b785f92328a913a0fd13073fa2357aa996dd0700 SHA512 96856a56cb10b789bbbb82a33b702473cf1bdc32a9fddca6e48313ba3fefbe2f63a12a7290e3b4bd11939844f6989a0e15e96a4c2911cb900cd9e8d9c6c13f15
 DIST fwupd-1.8.7.tar.xz 3335636 BLAKE2B 1c4e8f369581f826a710274e0789fbcfe735ce58407d1c0f7472721895bf426e0ddf0fd3d014a35efe39726f8891faa7960aaa455482b435138ea116bddbc142 SHA512 374339178a1fbf85bc25b47077d0db351b3664a02ec9478c4a5381228125f3bd65ef0be9eb526574bd09ab665aadd6cd9e39f01ebbfebbd338ec191ba24c5a36
-EBUILD fwupd-1.8.5.ebuild 5119 BLAKE2B a9725b41de730964a415780d69d2aecebbcaa4525cc7871b183a142c3ac9c2dc671004dd383a683f17d60abfa54a8b5b789e98facb2315c5441bb963aa9c6964 SHA512 c22231cba798e96ecfd286863de790a1c388b7bcbb8e37cfb664d71b1dd3e42c43c64679f396188cb481b603d540dcd67e685c3c89c4b325c22553954b27f407
-EBUILD fwupd-1.8.7.ebuild 5014 BLAKE2B 3ddd2fd9c713d176d6791fb9b8873db3e6eb836d02df2f38462a77f8854381e00ce20b067abff5ec2b4a7c675bc07257da9e7f879e4a90ef972dfa54780ea4e8 SHA512 a207bd41824f6d2440d2f7c5d4872abc39442b99c0e286739e7a306146353411cd90850aa4e62792448dafe524b959839ed0bef7395b150c235a9d256f0fd0c8
+EBUILD fwupd-1.8.5.ebuild 4973 BLAKE2B e6c6bfb498e8d93f57cd4ab8a3d176fc9f08374d0a08fef6397a2c200c333520351b64316832e13504d35c06f4b67d5e019b338bca77b8840c74a8dc83d28ef4 SHA512 3c5c70e2f4b4d8889f7792fb7a10bfd437e2ba6995834bac8f11b134a37e8b52351e947883662fd632374f18602936142d3f527e7778ed1e07b7e8d92b7f5bf8
+EBUILD fwupd-1.8.7.ebuild 4868 BLAKE2B 0e3a27e56d011ce74a3981a06c223cc7530022eec342c9465071ca2aa82ed3956eb18bbef62ee515411be99105626d39b07f02b01bf7b0a3f0875743c3ab9f45 SHA512 4e34bf01f2b95c4841c65bdfe49feca97f452fdec1a0beb857a46037fd4857f9f0e79f99b967ecf3302cdad38faf98535e5f9d5ceb4cc50d2fc6408f7519759f
 MISC metadata.xml 1466 BLAKE2B ac548631c37c846437843bb6711add698a211637e273bace245f1f062eea1563e10c6918a9688a67ad3941e0e63bae22570599a29477aadf770430bd4abda126 SHA512 10b8bdaed532227e36a8a83ab0357e8964aeceadee3f045e0d4c90420acf68f370c08588a746e98efe386d2482bfabbf36db72371f4fe4e12fff187c734e79de
diff --git a/sys-apps/fwupd/fwupd-1.8.5.ebuild b/sys-apps/fwupd/fwupd-1.8.5.ebuild
index 8b83f9fc4789..cb1a7821aa10 100644
--- a/sys-apps/fwupd/fwupd-1.8.5.ebuild
+++ b/sys-apps/fwupd/fwupd-1.8.5.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{8..11} )
 
-inherit linux-info meson python-single-r1 vala udev xdg
+inherit meson python-single-r1 vala udev xdg
 
 DESCRIPTION="Aims to make updating firmware on Linux automatic, safe and reliable"
 HOMEPAGE="https://fwupd.org"
@@ -100,14 +100,6 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.8.4-installed_tests.patch
 )
 
-pkg_setup() {
-	python-single-r1_pkg_setup
-
-	if use nvme ; then
-		kernel_is -ge 4 4 || die "NVMe support requires kernel >= 4.4"
-	fi
-}
-
 src_prepare() {
 	default
 
diff --git a/sys-apps/fwupd/fwupd-1.8.7.ebuild b/sys-apps/fwupd/fwupd-1.8.7.ebuild
index 0c8dee6a1b40..fb3d311758aa 100644
--- a/sys-apps/fwupd/fwupd-1.8.7.ebuild
+++ b/sys-apps/fwupd/fwupd-1.8.7.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{8..11} )
 
-inherit linux-info meson python-single-r1 vala udev xdg
+inherit meson python-single-r1 vala udev xdg
 
 DESCRIPTION="Aims to make updating firmware on Linux automatic, safe and reliable"
 HOMEPAGE="https://fwupd.org"
@@ -99,14 +99,6 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.8.6-installed_tests.patch
 )
 
-pkg_setup() {
-	python-single-r1_pkg_setup
-
-	if use nvme ; then
-		kernel_is -ge 4 4 || die "NVMe support requires kernel >= 4.4"
-	fi
-}
-
 src_prepare() {
 	default