gentoo auto-resync : 14:09:2022 - 11:10:10

25 files changed, 13 insertions, 710 deletions

diff --git a/app-containers/Manifest.gz b/app-containers/Manifest.gz
index 0a2dfe9fe09d..018fe3ecedeb 100644
--- a/app-containers/Manifest.gz
+++ b/app-containers/Manifest.gz
diff --git a/app-containers/containerd/Manifest b/app-containers/containerd/Manifest
index 11f2fdf3a123..14cca65a27d2 100644
--- a/app-containers/containerd/Manifest
+++ b/app-containers/containerd/Manifest
@@ -2,4 +2,4 @@ AUX containerd.initd 766 BLAKE2B 07b323c35f9cafa156969644ccab7c618baf60a82ad8037
 DIST containerd-1.6.8-deps.tar.xz 96625924 BLAKE2B 773b7c660826648b4077d320cbb3b265129fdd81233ac4aeb833586c9f25707c62e338492fb9905010b160e3fa635069ca4220136bca344ce54d154ee074bdeb SHA512 d805fefc0500fe2156bd8c6a752f9d13cafe85b528454ddc6efc95b09e05548df666cf9136aa3169794a0f7cc8135b943da1b106eec7e3dbbc83938892d80ead
 DIST containerd-1.6.8.tar.gz 8663866 BLAKE2B 4b1473febb738ce46d435a687971058f4bf586a2877b2899446a323e2e7ccf8a0ec9015277693f9b1bac6f663721117704e97031ce923ae62d27a8d7b882bdfd SHA512 c204c028cdfd76537d1da01c66526fc85b29b02d2412569bb9b265375603614b037356c61846025a72281398f0f46df326a5ea3df97f57901cce85f2f728f0ba
 EBUILD containerd-1.6.8.ebuild 1972 BLAKE2B 61b059f9f5aa48eeb1e94480141e5c827bb1d1fc3d418d2f7e51fb020e3af108c0162d58fd28842ad7be5ced62221a708f0eb37eff3ad0152d9ba8671c737015 SHA512 2149d274746c929e34bfbcf480cdaf6b4677349091cea64b0d00f87f6c41f662e28075922a91ba4a48e4848c7c10995c060043e9eb097740de2702c724c6a86d
-MISC metadata.xml 1144 BLAKE2B 960f8dd81a1e56c0d381355da41a845c2e9c12db0c8c546da1593a0499e4929b37610dff83943c388f8edc5878b9824e47ddac02ba129176a916054400e10e90 SHA512 904a5a11d7729ea6021aaf1b1d91ae3f7609c08b8c191d9f4c35c62914b0acf1ee45f3f7e0416711225809f129da4b4c76c934e6207026b69b0096f431820982
+MISC metadata.xml 1093 BLAKE2B 692497be353e27b92d968142a155b5010a60f60739e1cfc9faeb966033f868c67e18c8feaaf661903266f160742a0c9e3d34485258df3ace9e8982d2ad3602d6 SHA512 18280d46fe79ecbcfd4e3f9cc139103da1fca31b6a5cfafb4c9c30d8b2a559fa30bf71f17f228a96c56506c5e18eb7c1f3340b5428c213be9e2e45e4cf5fc407
diff --git a/app-containers/containerd/metadata.xml b/app-containers/containerd/metadata.xml
index 5641ef372193..5d63e8606e99 100644
--- a/app-containers/containerd/metadata.xml
+++ b/app-containers/containerd/metadata.xml
@@ -17,7 +17,6 @@
 		<name>Georgy Yakovlev</name>
 	</maintainer>
 	<use>
-	<flag name="apparmor">Support for AppArmor</flag>
 	<flag name="btrfs">Support for BTRFS snapshot driver</flag>
 	<flag name="cri">Support for Kubernetes CRI</flag>
 	<flag name="device-mapper">Support for device mapper snapshot driver</flag>
diff --git a/app-containers/docker/Manifest b/app-containers/docker/Manifest
index 7e4eb4efd2e5..1caca9d424a8 100644
--- a/app-containers/docker/Manifest
+++ b/app-containers/docker/Manifest
@@ -2,4 +2,4 @@ AUX 0001-Openrc-Depend-on-containerd-init-script.patch 774 BLAKE2B a7ac6f6a1e9ee
 AUX ppc64-buildmode.patch 916 BLAKE2B c28a2fcfed4812f44b664dc9b24e87f3999fcb9b79b7f47c6fd5a6b024529c49ef71817d4c379c7a95832a44b9c2f45c9f7707cb580b31be18dff4ee9a110e44 SHA512 bc87464d9f3351b2791e6f86bc7f2101e652c25b99cdcc02e46e4ff18f4bfb7ffc35d338370656bde6ad09ed98805e045065012dc6a264967d26272f7de099ff
 DIST docker-20.10.17.tar.gz 11182479 BLAKE2B 515c048ab6f19e256040122323f394dfa2e8f7a4aefd89e5b374355bd7907f3ba5eaae37d7ce3aed0d1add8fa025b8e5ac3c46c4dc90adf757426fd40af39dbf SHA512 1def92a4f87695b1889e482947f2bc49342ad868ee15425900b0c6f8954ba77aa2a9a8bd4fc500ba124218603aa8c7127daf7192140cace6e652a311391397c4
 EBUILD docker-20.10.17.ebuild 8002 BLAKE2B a5967d16b5f5ad0cb674696e19451e0475ffb9edcfa9e49d9a236d68b3560fab38e2acc3952749023ff8bcdcede5babf464f21055c2c166e350ba9f9e9d748a8 SHA512 d9ad2d0cdc3aa182fbcbbfeaf596af1ffc369237a85440142c48be0f6d1a6c5b868e3a877e8d54222fa3ffe2ce9a435a5e4016398c62598fd931f4507a850206
-MISC metadata.xml 1743 BLAKE2B 3ef4233f485d3c50deb1b86c7eb6e2e48b222e323cc31ee71432a09b9b7c50710ef1942da38fd4b91a9f4d780e5d272dcdd97e20842324ab0e0859125e95ba8a SHA512 7c536d86cb173347e76676ff9310077e5b0cb6a28ec0c1599f8aaff9b4f85b2d5add7e698bb1be199143281692e3ec3354920146edffbb10493d6c955079a442
+MISC metadata.xml 1680 BLAKE2B 6c128f9ea99f1634e260b2f944b6560636d8501f93c3e208aff7ca8ee10199f520b187a063f9a8869130305bef8749ee1af10971658e04515e80907bc8a48be0 SHA512 913bed94f44d2093868999e8a1064c8443e4d1298b53ac065b0df0857809e93194f7650dfa1e49933022461f0adec956effff61f627838e1d0104e9d9004bf14
diff --git a/app-containers/docker/metadata.xml b/app-containers/docker/metadata.xml
index bc364de188b5..5f163941881c 100644
--- a/app-containers/docker/metadata.xml
+++ b/app-containers/docker/metadata.xml
@@ -21,9 +21,6 @@
 			Enables dependencies for the "aufs" graph driver, including
 			necessary kernel flags.
 		</flag>
-		<flag name="apparmor">
-			Enable AppArmor support.
-		</flag>
 		<flag name="btrfs">
 			Enables dependencies for the "btrfs" graph driver, including
 			necessary kernel flags.
diff --git a/app-containers/lxc/Manifest b/app-containers/lxc/Manifest
index 60096b3a3e30..ae2e0bb27283 100644
--- a/app-containers/lxc/Manifest
+++ b/app-containers/lxc/Manifest
@@ -6,4 +6,4 @@ AUX lxc_at.service.5.0.0 395 BLAKE2B b4a329964041a9b3017df80aedb73f296d60e0b7809
 DIST lxc-5.0.1.tar.gz 973206 BLAKE2B 6d5cb1a03eb2612d0f8cb59783a64ec42bedd560cacfebf76383d9599dfc153e381f0e584a1c8c9a0b5b18a46bfb01863649dc5a019546e9ded6079b5ec69ddd SHA512 c87563b556aec83c93a7c62932217791e92da950cc76983f0d5e1d603fe1ae298a63fb5e88ec9ef5173846d579babb5acd0836679b915de00844bb9edf9c8d7e
 DIST lxc-5.0.1.tar.gz.asc 833 BLAKE2B f85df5fc5bd88a738042f622ee4191b99e0a8e07db7ceb5824d634bc451f4bf93c8b64d1c72d4899f639ad30bbc9ee82be292dbe310218fa20566ee00f9bb752 SHA512 09de4e74d174b54cf9240ca4ef4793b9f63355c65f610abffb40e6dc2dc9130380761a50725e4dcee39b421e4b51c874d141fe22d5ecfd7ad3af35f7ebec09a0
 EBUILD lxc-5.0.1.ebuild 4748 BLAKE2B 1fa18490e2fc1284ce509a04f5ca8c81802db2a3b479decc626470e775530e8b37a743133c1a8b8f82a25ec7f18c2c313bad43bf6fe2e7732c5bd3f608c81f53 SHA512 4aeb0b7179039fcb20198086cfcbdfa07bd20b8776b373c4c50baf1039b70f2c2004b5ce1471189d19d286a823be140ef3941c4b33a55f3de40346ae16a21686
-MISC metadata.xml 713 BLAKE2B 982d13dbe2adffcdb473804981effa8eabc89ca95dc2f39ae6ebdbdce0f786311333c8f9cbfe2105faf55dcbaf7a63a09b46e6b7c7987ba629f5e87de24a348c SHA512 4c9d018afe1967708c18747f504b98487f110b6a021cd97c94693fa4b39d892b148ad19ae64399396b34502ed6f598d7515418b69d0b22031776366a9f172f3b
+MISC metadata.xml 656 BLAKE2B 97012edd8475cb10c97ff62f6c3030fab35193e25053fdafa0deecc35af6ac2992e346390c5327dfc45b49dbfe74de66dfa9e1cee72a634fa4793221e6f96cdc SHA512 c09331c0f63df4025b06d579066c92f8d7391dc53981ba0b0e3a4703dfffa9f853282f4da2d6c5ff4c0b52f53aa166fb93dc0fea1897fe6b7bb9e390a0cf96c3
diff --git a/app-containers/lxc/metadata.xml b/app-containers/lxc/metadata.xml
index 8c08b596f2e4..2d20f0346cc6 100644
--- a/app-containers/lxc/metadata.xml
+++ b/app-containers/lxc/metadata.xml
@@ -10,7 +10,6 @@
     <name>Gentoo Virtualization Project</name>
   </maintainer>
   <use>
-    <flag name="apparmor">Enable AppArmor support</flag>
     <flag name="io-uring">Enable io_uring support, and use io_uring instead of epoll</flag>
     <flag name="tools">Build and install additional command line tools</flag>
   </use>
diff --git a/app-containers/lxd/Manifest b/app-containers/lxd/Manifest
index 4bed0e5f4558..0815eeb3e440 100644
--- a/app-containers/lxd/Manifest
+++ b/app-containers/lxd/Manifest
@@ -9,4 +9,4 @@ DIST lxd-5.0.1.tar.gz 14640923 BLAKE2B 81bdf3301c0eecc719864cd8e18fd886113f83d19
 DIST lxd-5.0.1.tar.gz.asc 833 BLAKE2B d233c8ebfb5b71f66ff08b4d74861a42bf45ef3e9622d4f113603a7a6c1a29b5aa3422c075ad5250a7d5ab7526a49dd676672d0a73194024af477fa762e02b12 SHA512 bf22f26b6688420e843e9e24eb731a2068eae3d90c77787e0f4a279d4cb7a8a2df38b7e9c8ea79f604c1d54743238cb36474baf018ea6bf72e6f37838b252294
 EBUILD lxd-5.0.0.ebuild 4827 BLAKE2B 7b598644b60abb3cadd890d229b10a5e7471e2d9154c2470de1b6006122123af182ea5ec296d2103f64ec24208d3b774ecaeaec9e3f49fad67d4ba5ce14f5046 SHA512 03bb5431efd54d86f1dcb9b7a2c302ca5490c22d2744247f7dc5490b67a7c93baefd89964c7a06d1d8fb7d3f6439c0eb9926c5c63a8e5c4cddec3c0950ffcaa9
 EBUILD lxd-5.0.1.ebuild 5275 BLAKE2B 7c54af31e6ef75298a333731f03fc040987318d1b3bfbf125fc7c36a24e3794a873d618435c59deca09475cc133b32a5ec1a6abcc38b3d7d78fa6e92c1496499 SHA512 913ee7028a3cd8a6a6ba9a5f93a906b97e0f8f6ffe6539aab7d16ee806f08f9d91824acf52638c21b81a4f31e694b5359e0e2e707a00d8e0fbca80be07da9a78
-MISC metadata.xml 1477 BLAKE2B 12c6a83c8f73c731c9c49752ab005da68f6ea95d52684590297f2c7531e6c4d8669f8d311b2d93a91155d9a85fa76d4a223823a6ca11904ce482a96cb52f252d SHA512 2158166b54d9caad10c60c128738381ef0e0447eb1c4030c659d369d94e6401992b1f3e62f51bbc60a773618a8f594de5cce86b4e10c81856b18e76ae54f2018
+MISC metadata.xml 1403 BLAKE2B 4bff140bc9282b41631293b9cc28a5f85bec2b0f923c762c6572e75b752aba113632747142bd3b3a87322ce8d2ba10fd15afe3f1a7c1384e49c408ca176f267d SHA512 38fb2faa661a8473d0221117299baea01c06f46e5fbf5bd7e32f26b7d0a433ab35c5e0e5dde42c7478b7118489d619fdacca29b3a9b0e89cf432c5bccd3ffba3
diff --git a/app-containers/lxd/metadata.xml b/app-containers/lxd/metadata.xml
index a666d3414c49..dd209643cdb4 100644
--- a/app-containers/lxd/metadata.xml
+++ b/app-containers/lxd/metadata.xml
@@ -9,9 +9,6 @@
     <email>virtualization@gentoo.org</email>
     <name>Gentoo Virtualization Project</name>
   </maintainer>
-  <use>
-    <flag name="apparmor">Enable AppArmor support</flag>
-  </use>
   <longdescription>
     LXD is a modern, secure and powerful system container and virtual machine manager.
 
diff --git a/app-containers/nerdctl/Manifest b/app-containers/nerdctl/Manifest
index 8bde4d8a68e8..970aee865d38 100644
--- a/app-containers/nerdctl/Manifest
+++ b/app-containers/nerdctl/Manifest
@@ -1,13 +1,5 @@
-DIST nerdctl-0.17.1-vendor.tar.gz 7762770 BLAKE2B 399a99047cb3a3ab31806529e2502f3446e3df717950f1db05d8a449e5c931719717a35e420791232b19338c9d81c8443f0cd2520c38509aedbbaddc8b6d2893 SHA512 ec2967abee1ff44dcd44dd21d079a9d1e9bb254d0a5b150f57a2668cdd26e7f6dd5de99bc1fff3a94b4fb1c4546785e78245ed4e4e5f026b81b909f8dbf318c6
-DIST nerdctl-0.18.0-vendor.tar.gz 7757873 BLAKE2B dfc77baee4649cf5a4ffa2ae196460d34eea531f930f04b894cc715b68a4295d1bcf98c89702032aaf6c5fc0b1a7f8b885f6c4b0bd61afd044b67fe4510c6967 SHA512 b542abafbd1dfe4213646b66b69d7bb286b8fda152870846cd350ad0362cbd16ca5f2d8fe23ae056f0c18f5674eb984f2993cf2937d7aff7b67668d65d9e1488
-DIST nerdctl-0.19.0-vendor.tar.gz 7798588 BLAKE2B 1bf17d09de13e5d2160cca500e8d9dc2eb666f5639e12353e1153bbf201f48d376c7b369a97bd851082c32276c6ba280d8f8e1add7b56206d3f07a0dfc725393 SHA512 9f84d829c2c40589f930345bb7073e6ca868e9e840f74c9176b049b63b2983dca55168eb54113b7b74e7651f1c902f84c9fca8d0f5d948ba7510db91f3a52e74
-DIST nerdctl-0.21.0-vendor.tar.gz 7984755 BLAKE2B e28b260667109604edb8b0f0c090fcb9769dd4a7411843f2d6180a3bb6f3165ca8feb3c4798c78f2eb2134bc9a205e263e8098e80a6fe0f0de5641b13158d7f8 SHA512 174f8dc8be631eef84d7c461bf4a797fc6d47b20385286cedbbb769c764a97a64937fb2a104c45f42459c4b2217b6fe2bb534f07153a6761f59798d2a08490e0
-DIST nerdctl-0.22.0-vendor.tar.gz 8330256 BLAKE2B d85e7f2938dbaec1ba247d7d3d889bd24fa9e008fc12295a3cd9f8578ebe1f2a3f1d52a23e147ad912fbbd2ccb5c1a796f621285d21f33fb449394ebb449ca0c SHA512 850079c686a0a4ae1616f42f84fed5a4280e0bc0df12ab50f8f883265bc3c04d82081e4a0aa8585673945d6185d2c79cbf07ce1157e794a9b7891b6be1fdff65
 DIST nerdctl-0.22.2-vendor.tar.gz 8374960 BLAKE2B 84b8cb1bef03d05f9277c6931f1f4596609b35ba4e555b02885a5ad99aa692ac8c7b32c778f18993bba518945816dc9ca2ebdb4818b733fc999c4b717c0c7313 SHA512 fa6c166c5376395e129b2b79653382c7e5bc6fcc4a744063afd92fc4b5e84afc41489543c58c0f65c893d7b3d906d502b520d5cb4401ca4ca49c9526606c9291
-EBUILD nerdctl-0.17.1.ebuild 989 BLAKE2B a6fcbb62d09d948200679bc0be906eaae18ac7875a9eec42bb262a1076a2c051d701ee82978445f534b14e160878dbf347fbe81902c52cc3536cd599729a281b SHA512 0e53088fc1b6764b230bd2657e99dd432dc025d721b1efac53e3b84383890c0344057a71746c7f955a41838728fee92758544f82932fa9b270d2a6e306542a3e
-EBUILD nerdctl-0.18.0.ebuild 989 BLAKE2B 6c7750f0daf4839bdc3f67400f9fc343d1b7d410ad97b05bc8055133709c3137415799d4b0ed4c4be5645914407b11a9a3b04c68ca6d8c0a51249d3b602980ee SHA512 1d9f94fc8a9b2d62d975f11641da5b4d5b5715f73f123104384abb0e588889200f1345f6491d5e03cf38c62143794fd8f142be56038406a4a71fb7426e517842
-EBUILD nerdctl-0.19.0.ebuild 989 BLAKE2B 6c7750f0daf4839bdc3f67400f9fc343d1b7d410ad97b05bc8055133709c3137415799d4b0ed4c4be5645914407b11a9a3b04c68ca6d8c0a51249d3b602980ee SHA512 1d9f94fc8a9b2d62d975f11641da5b4d5b5715f73f123104384abb0e588889200f1345f6491d5e03cf38c62143794fd8f142be56038406a4a71fb7426e517842
-EBUILD nerdctl-0.21.0.ebuild 989 BLAKE2B cb3a2ea31a333183062094d2c65e8d0868a77569191f7a5f6e9f5f62b5b7788cdc0a1754cd1dcd0beab0d90ab16af9226277bf70159e4cd9bf48bc5ec3def07e SHA512 74409f3826d0e82d9ac1ead966ad0fdeea9b1247234373a907578e9df86d5bdeda886b746e6cc82ae01ad0eda00daa9a128c3dea9dda3c7a795cd7a7fa3a72af
-EBUILD nerdctl-0.22.0.ebuild 989 BLAKE2B ab38a1baf2d8df7ee1d58f09eccb7596ead498b67bbade8dd3a903f2cfdbc18bbdb655ffb7d1676570de6ffc754c12cb6c7ef488bacdc835ff6345b017bb67a1 SHA512 b9f4b3c6a0db8cfd1a8031e9e333257d31cf924dc2b95594d78f8b7c3a7f5fbb6cdeaf48a96b0ea99f8255476603915d0e3592f12bccda357ba5a2e46bc68293
+DIST nerdctl-0.23.0-vendor.tar.gz 8420534 BLAKE2B 824ea8761a81ed063b853f5a78bd7506f7eecfe6f7b6e3e7d9fbb7113477c32236b59e669821851117b07eb7b5be82cab6b8750ddef59a053535dfa48a65dc77 SHA512 e8431d292a0e8f6db828b3475bb2e918612961b46212e6dcad6b1edadf6fca828c7ff0aeeadbc6e847b8a2d2b0c362f789b6a19ebb6c20922e0f77e46d3df84a
 EBUILD nerdctl-0.22.2.ebuild 989 BLAKE2B 37554b2f0f2a4454315f8e8874efdb1fa2b559e21f32982d3195a43b8deef1e9e6c8e5e98fa955d1b8b740582c3a069c7141693a498b5df7b8830d141b6c8713 SHA512 a759af6318826e41dcc439da16e1a36f86af9d053bc904ef80676bcb4f4aba152c3f02201e4fd16d5e7406c271164d4dbb77d59778331acad5fe00865b8723e8
+EBUILD nerdctl-0.23.0.ebuild 989 BLAKE2B 47a7ac4ccc3be14eced47b04f508aeebe66b251b48007c5262b4ba6bc843e12b79abffec6241460488340b5cd55426d45835f174c1cb8b5c2a2ba8a6a7433100 SHA512 42b9bb0acf1fdf996bed5a26e4ad20067c221c7ffb066061f8cada2d04aa03c0c72f229a8b95b62b43c49fb756fe3086031a32dc84d00266f035fbc6fc22c1d3
 MISC metadata.xml 328 BLAKE2B e1284388fe40d8aa709a783d583fc6116eafc276e6d3e65741a03dea3cfb007549c1dadfdc2eea8ee92e430c22b734ad76944efb9c00082b4dc84e003c684763 SHA512 27f4323cda23315264bc5ea386e19b3faea4fc4808835c7105b2827cb98ed62bbbc49fa9676bd8e897d66e1b2d1cc338eebfff4c7ed01b769c13f1b72e3d5252
diff --git a/app-containers/nerdctl/nerdctl-0.18.0.ebuild b/app-containers/nerdctl/nerdctl-0.18.0.ebuild
deleted file mode 100644
index 7641dedec9f4..000000000000
--- a/app-containers/nerdctl/nerdctl-0.18.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit go-module
-
-DESCRIPTION="Docker-compatible CLI for containerd, with support for Compose"
-HOMEPAGE="https://github.com/containerd/nerdctl"
-
-EGIT_COMMIT="77276ff0fffad3f855ab9f2f5a4ad5527ef76485"
-# There are too many vendor dependencies to distribute via EGO_SUM (see https://bugs.gentoo.org/721088),
-# so they are instead distributed via a combined tarball.
-SRC_URI="https://github.com/zmedico/nerdctl/archive/refs/tags/v${PV}-vendor.tar.gz -> ${P}-vendor.tar.gz"
-BDEPEND=">=dev-lang/go-1.16"
-LICENSE="Apache-2.0 BSD BSD-2 ISC MIT"
-SLOT="0"
-
-KEYWORDS="~amd64"
-IUSE=""
-S=${WORKDIR}/${P}-vendor
-
-src_prepare() {
-	sed -e 's:/usr/local/bin:/usr/bin:' \
-		-e "s|^VERSION[[:space:]]*=.*|VERSION := v${PV}|" \
-		-e "s|^REVISION[[:space:]]*=.*|REVISION := ${EGIT_COMMIT}|" \
-		-i Makefile || die
-	default
-}
-
-src_install() {
-	DOCS=(README.md docs examples)
-	default_src_install
-}
diff --git a/app-containers/nerdctl/nerdctl-0.19.0.ebuild b/app-containers/nerdctl/nerdctl-0.19.0.ebuild
deleted file mode 100644
index 7641dedec9f4..000000000000
--- a/app-containers/nerdctl/nerdctl-0.19.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit go-module
-
-DESCRIPTION="Docker-compatible CLI for containerd, with support for Compose"
-HOMEPAGE="https://github.com/containerd/nerdctl"
-
-EGIT_COMMIT="77276ff0fffad3f855ab9f2f5a4ad5527ef76485"
-# There are too many vendor dependencies to distribute via EGO_SUM (see https://bugs.gentoo.org/721088),
-# so they are instead distributed via a combined tarball.
-SRC_URI="https://github.com/zmedico/nerdctl/archive/refs/tags/v${PV}-vendor.tar.gz -> ${P}-vendor.tar.gz"
-BDEPEND=">=dev-lang/go-1.16"
-LICENSE="Apache-2.0 BSD BSD-2 ISC MIT"
-SLOT="0"
-
-KEYWORDS="~amd64"
-IUSE=""
-S=${WORKDIR}/${P}-vendor
-
-src_prepare() {
-	sed -e 's:/usr/local/bin:/usr/bin:' \
-		-e "s|^VERSION[[:space:]]*=.*|VERSION := v${PV}|" \
-		-e "s|^REVISION[[:space:]]*=.*|REVISION := ${EGIT_COMMIT}|" \
-		-i Makefile || die
-	default
-}
-
-src_install() {
-	DOCS=(README.md docs examples)
-	default_src_install
-}
diff --git a/app-containers/nerdctl/nerdctl-0.21.0.ebuild b/app-containers/nerdctl/nerdctl-0.21.0.ebuild
deleted file mode 100644
index 1c01c33ad6f2..000000000000
--- a/app-containers/nerdctl/nerdctl-0.21.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit go-module
-
-DESCRIPTION="Docker-compatible CLI for containerd, with support for Compose"
-HOMEPAGE="https://github.com/containerd/nerdctl"
-
-EGIT_COMMIT="9ddf5226eabcbb7b4b43987f3b0f8d53d86d3bca"
-# There are too many vendor dependencies to distribute via EGO_SUM (see https://bugs.gentoo.org/721088),
-# so they are instead distributed via a combined tarball.
-SRC_URI="https://github.com/zmedico/nerdctl/archive/refs/tags/v${PV}-vendor.tar.gz -> ${P}-vendor.tar.gz"
-BDEPEND=">=dev-lang/go-1.16"
-LICENSE="Apache-2.0 BSD BSD-2 ISC MIT"
-SLOT="0"
-
-KEYWORDS="~amd64"
-IUSE=""
-S=${WORKDIR}/${P}-vendor
-
-src_prepare() {
-	sed -e 's:/usr/local/bin:/usr/bin:' \
-		-e "s|^VERSION[[:space:]]*=.*|VERSION := v${PV}|" \
-		-e "s|^REVISION[[:space:]]*=.*|REVISION := ${EGIT_COMMIT}|" \
-		-i Makefile || die
-	default
-}
-
-src_install() {
-	DOCS=(README.md docs examples)
-	default_src_install
-}
diff --git a/app-containers/nerdctl/nerdctl-0.22.0.ebuild b/app-containers/nerdctl/nerdctl-0.22.0.ebuild
deleted file mode 100644
index f2b3218e9d28..000000000000
--- a/app-containers/nerdctl/nerdctl-0.22.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit go-module
-
-DESCRIPTION="Docker-compatible CLI for containerd, with support for Compose"
-HOMEPAGE="https://github.com/containerd/nerdctl"
-
-EGIT_COMMIT="8e278e2aa61a89d4e50d1a534217f264bd1a5ddf"
-# There are too many vendor dependencies to distribute via EGO_SUM (see https://bugs.gentoo.org/721088),
-# so they are instead distributed via a combined tarball.
-SRC_URI="https://github.com/zmedico/nerdctl/archive/refs/tags/v${PV}-vendor.tar.gz -> ${P}-vendor.tar.gz"
-BDEPEND=">=dev-lang/go-1.16"
-LICENSE="Apache-2.0 BSD BSD-2 ISC MIT"
-SLOT="0"
-
-KEYWORDS="~amd64"
-IUSE=""
-S=${WORKDIR}/${P}-vendor
-
-src_prepare() {
-	sed -e 's:/usr/local/bin:/usr/bin:' \
-		-e "s|^VERSION[[:space:]]*=.*|VERSION := v${PV}|" \
-		-e "s|^REVISION[[:space:]]*=.*|REVISION := ${EGIT_COMMIT}|" \
-		-i Makefile || die
-	default
-}
-
-src_install() {
-	DOCS=(README.md docs examples)
-	default_src_install
-}
diff --git a/app-containers/nerdctl/nerdctl-0.17.1.ebuild b/app-containers/nerdctl/nerdctl-0.23.0.ebuild
index cfcad48ce82f..93e8df5fdcff 100644
--- a/app-containers/nerdctl/nerdctl-0.17.1.ebuild
+++ b/app-containers/nerdctl/nerdctl-0.23.0.ebuild
@@ -7,7 +7,7 @@ inherit go-module
 DESCRIPTION="Docker-compatible CLI for containerd, with support for Compose"
 HOMEPAGE="https://github.com/containerd/nerdctl"
 
-EGIT_COMMIT="20233c26d26f11ca73a9a775fba87ca884ab14d2"
+EGIT_COMMIT="660680b7ddfde1d38a66ec1c7f08f8d89ab92c68"
 # There are too many vendor dependencies to distribute via EGO_SUM (see https://bugs.gentoo.org/721088),
 # so they are instead distributed via a combined tarball.
 SRC_URI="https://github.com/zmedico/nerdctl/archive/refs/tags/v${PV}-vendor.tar.gz -> ${P}-vendor.tar.gz"
diff --git a/app-containers/podman/Manifest b/app-containers/podman/Manifest
index 596251eaac7b..db70861f653a 100644
--- a/app-containers/podman/Manifest
+++ b/app-containers/podman/Manifest
@@ -7,4 +7,4 @@ DIST podman-4.2.0.tar.gz 13019518 BLAKE2B a3b8d8b140b9d34e24f87f998fff3558649487
 EBUILD podman-4.1.0-r1.ebuild 4782 BLAKE2B 057db822cd7588941c59d8efd32d2170d42ef4f95880eefa23dafdcc834d377e3df5ca8a3cdc9757d37fe133960225251884316688ec04e921de0e3baa0d69b8 SHA512 64b1c4dfa38678b81f5e563c2634fe78cb41b1d98e893091a405c47a3ea13bb8411b376fcf1ff1794ac24fcc7efe704e4daa6c9aeba92f0bba2498415103c9c6
 EBUILD podman-4.1.1-r1.ebuild 4784 BLAKE2B 1135e265f0c8eb048244124b856e303fc6b45f7ae07167cff41a74613465873600004103733aec711df98f34a2157deb6ce94b728bbfee9b5f143accf8d4e1f5 SHA512 ad69026e96fd27293215a646e21668d3ee99b01a4069f038dc6bdc5542c01653eafb5fa77b933b273e327b799acd9246cc043280feab4d3b1523cc51c0ba5cff
 EBUILD podman-4.2.0-r1.ebuild 4784 BLAKE2B 161825694f430224c3be43cb5041b314e1d4cfed65f177c56c4fb957063e9d691c7a739f7f6dda8c84df2f3b3d8f638a3fc38019638dc976716a1af91aa9cda0 SHA512 31814c43d8ff5f34bd7f18fc84aee44a38b10632d559e314e93413b6dc1ac6d5d815155693577e7464af00df6a0030e64aeddcd321a0fadd4b76a7fa120a49ea
-MISC metadata.xml 1372 BLAKE2B b8d6a880c8f915394b01e98644672f4ec91937606e912158b58740df31576010cef8accb053e217991b700020ffa03b4e6440d90de4698dfd1a6645599d5a0be SHA512 c8b3b35f30b48b156ad9cc0ae4189fb40838e954a925f14abc169f734472b98fe02f88bb95b1d2bc28ce74b4535dec28c662719189a26b06a138f57820cc0a64
+MISC metadata.xml 1309 BLAKE2B f4e08317d4ed405eca3964b49bbc3a5b8a915245bc5e2b3912d254ee3e75e6475d44879b1118a34bd3fe7568d9be9f4747303eba821cda94d97a16d693f71b49 SHA512 ebabde88fb088061c48400021521c9b8b35f1c5af6a3bb8194f8eb1f4bad2506b77ed8ee8a30e76eb4e262c3d132e03930d23feb43a82604499a5c49ee35886f
diff --git a/app-containers/podman/metadata.xml b/app-containers/podman/metadata.xml
index 11d7dc7603dc..3a429ae48984 100644
--- a/app-containers/podman/metadata.xml
+++ b/app-containers/podman/metadata.xml
@@ -15,9 +15,6 @@
 		and volumes.
 	</longdescription>
 	<use>
-		<flag name="apparmor">
-			Enable AppArmor support.
-		</flag>
 		<flag name="btrfs">
 			Enables dependencies for the "btrfs" graph driver, including
 			necessary kernel flags.
diff --git a/app-containers/runc/Manifest b/app-containers/runc/Manifest
index ac4fa142b14e..f947905e9afb 100644
--- a/app-containers/runc/Manifest
+++ b/app-containers/runc/Manifest
@@ -1,3 +1,3 @@
 DIST runc-1.1.3.tar.gz 2333384 BLAKE2B 7530faa80a6d51c840a1ea702ec59580a3e42514f5932a7dd4df9f80ff93245bde05accd572a942190b6be76316f38a408566b003ad380611376e73abe3cb5c0 SHA512 27fce2569d0dc710a0f90095957be30c29da24ce1d2b8e115b9dc11d36f5226d98c4b2d8b92ecfa7581eade90bc51c5d9bccaf15fcb2542dafebe4fabc6e1cd9
 EBUILD runc-1.1.3.ebuild 1843 BLAKE2B a5cd10807918d4128b60944385f1315ecebfb0fb0421750477d360d5295b97555c59c6afc75e939e5d3af2696b43ed4a959f65123503ddc93d70e52123b2b71a SHA512 ebed92d9aa4b179622249695c38e0d5730b68c1e0b4ec9f859b4c6a1ad35cb0c29111b3e66e54f6a014e3c7f753b8f93f623bf01aab857991c77ba3fa0050def
-MISC metadata.xml 822 BLAKE2B 2029743d60c9a6197e3db4ca27c3ee48bc86f624a50d7caa9bfb7f958383a1736d8817f2f977ac0e673229bd61f341a00f266dbce35dcd9633ecc27b182478d5 SHA512 f80b366f7fc8f4ff5bd46245aa80871748800a557440af3aa45bd1a508732cf634b6f21a3445135450eefbac91ab16f7b344c3f557af8ef69fdd8120ca6cf4e5
+MISC metadata.xml 759 BLAKE2B 2eefd8bf06b709fe70d91b444fb232fb23e51702d75c29b0fb49675056e9721f8f63dac596b55a2ae33ef7b46825a1543a9ffdaaeddcb80448953daa5505bd60 SHA512 34d1dd28f55a6aff44c2f6dadef2dede502837af0fb8411b55a7f3ef96d35d2ddae9cc0d230525715e41c423d813b0089c36369dfa666c1249f152de90a5c555
diff --git a/app-containers/runc/metadata.xml b/app-containers/runc/metadata.xml
index d27ad6413b06..76423a903140 100644
--- a/app-containers/runc/metadata.xml
+++ b/app-containers/runc/metadata.xml
@@ -14,9 +14,6 @@
 		<name>Georgy Yakovlev</name>
 	</maintainer>
 	<use>
-		<flag name="apparmor">
-			Enable AppArmor support.
-		</flag>
 		<flag name="kmem">
 			Enable Kernel Memory Accounting.
 		</flag>
diff --git a/app-containers/snapd/Manifest b/app-containers/snapd/Manifest
index f599442a7981..7d3e85418f29 100644
--- a/app-containers/snapd/Manifest
+++ b/app-containers/snapd/Manifest
@@ -1,10 +1,4 @@
 AUX README.gentoo 1941 BLAKE2B dd25269f2aaaea693701d74511d632bc45f2c99954ae683cb81d4df41c4c1f8007bb6c337234e46bfc5973aa7e8356cd12ac510e9109eca09890cbc42bd184bb SHA512 5b522e6c29bdad84a71245fa1f0289e9cfed0501d936b433829f66ef9d655f3cc13d6bca29beeae2c00e1b68f9fa30058608b9c4cde86ba66eab67bd011c9d00
-DIST snapd-2.56.2.tar.xz 6740504 BLAKE2B e8bf0ab85038b5127fd81f434ef369ac53ec7915a454f8fd24046b6e3a5303bf3924fce04fb2400b0ccdc1a8939809ca20e091ac99a04fe6899dfacdfd3cf299 SHA512 16a57ea828ea875ebe5073cca0975ef74562f095823e980be7096ea6b9e83f6a3f434373065781d6342e805c18ee5adadaab29074440759ed3891691441472b0
-DIST snapd-2.56.tar.xz 6737568 BLAKE2B 662fa682895501df71396095e22fb4587a97cfe4e156b998118ff524ef3a22bf4e60420111167c263c2815ff34a05b026180e41e926324756450e22a1571fc92 SHA512 d2e9949b449ff65122f1202b2048ed63e3ff404aebd71d9877030c7b23130b6be2f1ef62f47b8b0044344fb4826b2b0c81dbcf5cd464ca16f5b3b170735b6039
-DIST snapd-2.57.1.tar.xz 6817444 BLAKE2B 9d3d5a3ad510997a43256ef4755ccc98f6ef0550247721657877089d9e2ba20d87b43a0ea6b806e2c21a9ad4b1b171f228499b9814df0dab1a8a6ba4cf4ef39c SHA512 ded93e2ede0a940960d090686fe4f9128b83401592ab9cbf3f7cb200264e67602e4ea56da2f64950316119c4014eb105711c1f6323cb950f14cc4832db16b53f
 DIST snapd-2.57.2.tar.xz 6827264 BLAKE2B f9b1ae934a9c5b777d2e36854e259ddde301067a91b04ecef064accfccecc74693a2a58700e60867f46f028728a271b87cb3d4cdb316ae35df11363990959c3a SHA512 671e7598074894daf76646f7eea09c4163c57e68d0d46ebb77b20f71b898109fd73c78d363cb1253386ce058c1796eb25fab7f2f0345360426d3b9cc11d38804
-EBUILD snapd-2.56.2.ebuild 5139 BLAKE2B 20516cbcae2220067ff8a8c344d92896d3fced3b857938c4742673663ecddf9aac2131da305bcaee57e954073da7d17dc7df286147882409d9f5299134dc6cf7 SHA512 8f188d7671940c9dd2af180e6bdd08430111641255a7a4c44cd2221dcd5878d3a8c7846372be091a9ef65282e486ea94e8a17447bb764aec93b563efcf8020fe
-EBUILD snapd-2.56.ebuild 5139 BLAKE2B 20516cbcae2220067ff8a8c344d92896d3fced3b857938c4742673663ecddf9aac2131da305bcaee57e954073da7d17dc7df286147882409d9f5299134dc6cf7 SHA512 8f188d7671940c9dd2af180e6bdd08430111641255a7a4c44cd2221dcd5878d3a8c7846372be091a9ef65282e486ea94e8a17447bb764aec93b563efcf8020fe
-EBUILD snapd-2.57.1.ebuild 5139 BLAKE2B 20516cbcae2220067ff8a8c344d92896d3fced3b857938c4742673663ecddf9aac2131da305bcaee57e954073da7d17dc7df286147882409d9f5299134dc6cf7 SHA512 8f188d7671940c9dd2af180e6bdd08430111641255a7a4c44cd2221dcd5878d3a8c7846372be091a9ef65282e486ea94e8a17447bb764aec93b563efcf8020fe
-EBUILD snapd-2.57.2.ebuild 5139 BLAKE2B 20516cbcae2220067ff8a8c344d92896d3fced3b857938c4742673663ecddf9aac2131da305bcaee57e954073da7d17dc7df286147882409d9f5299134dc6cf7 SHA512 8f188d7671940c9dd2af180e6bdd08430111641255a7a4c44cd2221dcd5878d3a8c7846372be091a9ef65282e486ea94e8a17447bb764aec93b563efcf8020fe
-MISC metadata.xml 520 BLAKE2B cdca3f5b58c81ddf5796b174756e1497382390ea4f7411b2aa7a3c794fcafd7fbd919cae00c7cf5ff2251f4c837f5188026d0f5f61986834aee661724afb050d SHA512 2c26112a8808cd73c5575b525eb33129ab5fab8a5fdefba5de3760e568659264a864bf80c2397cf70bb2f9b0e6709e953185af9048cddde9082b040e4a0ee00f
+EBUILD snapd-2.57.2-r1.ebuild 5169 BLAKE2B f96430c3131d507c6b7566f7b085851a6db569a93dae668d0a34d13319c06f563566858367bf028ed600f1d0ba8f29e5970c56ca72241b7b72eccf5318939633 SHA512 b7551510c5b5adf6f12c2df137ef54c8c62f96984141f49e2706a7c88c65490b03f43674b8314c82cb83bbad5de560285d1c10b1b11bf79359034cf758096caf
+MISC metadata.xml 457 BLAKE2B 204b67bf36a85bd18f4111b4d8590195908bf15ae0bafedb76b6124b7d19c6570627925e5dfc46dd4dd47732c6d8f1066451831a0cc475518aab8a29403ececc SHA512 07671272b60f1a6793e3f36b096e99153263830314359eb86000aec65266c61ebe9c448af4ec166d6163e3ca2325f36cc74fe5aace95e7ffa7b0293516b18120
diff --git a/app-containers/snapd/metadata.xml b/app-containers/snapd/metadata.xml
index 0109791c93ff..730665fd01eb 100644
--- a/app-containers/snapd/metadata.xml
+++ b/app-containers/snapd/metadata.xml
@@ -9,9 +9,6 @@
 		<remote-id type="github">snapcore/snapd</remote-id>
 	</upstream>
 	<use>
-		<flag name="apparmor">
-			Enable AppArmor support.
-		</flag>
 		<flag name="forced-devmode">
 			Automatically disable application confinement if feature detection fails.
 		</flag>
diff --git a/app-containers/snapd/snapd-2.56.ebuild b/app-containers/snapd/snapd-2.56.ebuild
deleted file mode 100644
index 7e134a2b558e..000000000000
--- a/app-containers/snapd/snapd-2.56.ebuild
+++ /dev/null
@@ -1,178 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools bash-completion-r1 flag-o-matic go-module linux-info readme.gentoo-r1 systemd xdg-utils
-
-DESCRIPTION="Service and tools for management of snap packages"
-HOMEPAGE="http://snapcraft.io/"
-
-SRC_URI="https://github.com/snapcore/${PN}/releases/download/${PV}/${PN}_${PV}.vendor.tar.xz -> ${P}.tar.xz"
-MY_PV=${PV}
-KEYWORDS="~amd64"
-
-LICENSE="GPL-3 Apache-2.0 BSD BSD-2 LGPL-3-with-linking-exception MIT"
-SLOT="0"
-IUSE="apparmor +forced-devmode gtk kde systemd"
-REQUIRED_USE="!forced-devmode? ( apparmor ) systemd"
-
-CONFIG_CHECK="~CGROUPS
-		~CGROUP_DEVICE
-		~CGROUP_FREEZER
-		~NAMESPACES
-		~SQUASHFS
-		~SQUASHFS_ZLIB
-		~SQUASHFS_LZO
-		~SQUASHFS_XZ
-		~BLK_DEV_LOOP
-		~SECCOMP
-		~SECCOMP_FILTER"
-
-RDEPEND="
-	sys-libs/libseccomp:=
-	apparmor? (
-		sec-policy/apparmor-profiles
-		sys-apps/apparmor:=
-	)
-	dev-libs/glib
-	virtual/libudev
-	systemd? ( sys-apps/systemd )
-	sys-libs/libcap:=
-	sys-fs/squashfs-tools[lzma]"
-
-DEPEND="${RDEPEND}"
-
-BDEPEND="
-	>=dev-lang/go-1.9
-	dev-python/docutils
-	sys-devel/gettext
-	sys-fs/xfsprogs"
-
-PDEPEND="sys-auth/polkit[gtk?,kde?]"
-
-README_GENTOO_SUFFIX=""
-
-pkg_setup() {
-	if use apparmor; then
-		CONFIG_CHECK+=" ~SECURITY_APPARMOR"
-	fi
-	linux-info_pkg_setup
-
-	# Seems to have issues building with -O3, switch to -O2
-	replace-flags -O3 -O2
-}
-
-src_prepare() {
-	default
-	# Update apparmor profile to allow libtinfow.so*
-	sed -i 's/libtinfo/libtinfo{,w}/' \
-		"cmd/snap-confine/snap-confine.apparmor.in" || die
-
-	if ! use forced-devmode; then
-		sed -e 's#return !apparmorFull#if !apparmorFull {\n\t\tpanic("USE=forced-devmode is disabled")\n\t}\n\treturn false#' \
-			-i "sandbox/forcedevmode.go" || die
-		grep -q 'panic("USE=forced-devmode is disabled")' "sandbox/forcedevmode.go" || die "failed to disable forced-devmode"
-	fi
-
-	sed -i 's:command -v git >/dev/null:false:' -i "mkversion.sh" || die
-
-	./mkversion.sh "${PV}"
-	pushd "cmd" >/dev/null || die
-	eautoreconf
-}
-
-src_configure() {
-	SNAPD_MAKEARGS=(
-		"BINDIR=${EPREFIX}/usr/bin"
-		"DBUSSERVICESDIR=${EPREFIX}/usr/share/dbus-1/services"
-		"LIBEXECDIR=${EPREFIX}/usr/lib"
-		"SNAP_MOUNT_DIR=${EPREFIX}/var/lib/snapd/snap"
-		"SYSTEMDSYSTEMUNITDIR=$(systemd_get_systemunitdir)"
-	)
-	export CGO_ENABLED="1"
-	export CGO_CFLAGS="${CFLAGS}"
-	export CGO_CPPFLAGS="${CPPFLAGS}"
-	export CGO_CXXFLAGS="${CXXFLAGS}"
-
-	pushd "${S}/cmd" >/dev/null || die
-	econf --libdir="${EPREFIX}/usr/lib" \
-		--libexecdir="${EPREFIX}/usr/lib/snapd" \
-		$(use_enable apparmor) \
-		--enable-nvidia-biarch \
-		--with-snap-mount-dir="${EPREFIX}/var/lib/snapd/snap"
-}
-
-src_compile() {
-	export -n GOCACHE XDG_CACHE_HOME
-	export GOBIN="${S}/bin"
-
-	local file
-	for file in "${S}/po/"*.po; do
-		msgfmt "${file}" -o "${file%.po}.mo" || die
-	done
-
-	emake -C "${S}/data" "${SNAPD_MAKEARGS[@]}"
-
-	local -a flags=(-buildmode=pie -ldflags "-s -linkmode external -extldflags '${LDFLAGS}'" -trimpath)
-	local -a staticflags=(-buildmode=pie -ldflags "-s -linkmode external -extldflags '${LDFLAGS} -static'" -trimpath)
-
-	local cmd
-	for cmd in snap snapd snap-bootstrap snap-failure snap-preseed snap-recovery-chooser snap-repair snap-seccomp; do
-		go build ${GOFLAGS} -mod=vendor -o "${GOBIN}/${cmd}" "${flags[@]}" \
-		    -v -x "github.com/snapcore/${PN}/cmd/${cmd}"
-		[[ -e "${GOBIN}/${cmd}" ]] || die "failed to build ${cmd}"
-	done
-	for cmd in snapctl snap-exec snap-update-ns; do
-		go build ${GOFLAGS} -mod=vendor -o "${GOBIN}/${cmd}" "${staticflags[@]}" \
-		    -v -x "github.com/snapcore/${PN}/cmd/${cmd}"
-		[[ -e "${GOBIN}/${cmd}" ]] || die "failed to build ${cmd}"
-	done
-}
-
-src_install() {
-	emake -C "${S}/data" install "${SNAPD_MAKEARGS[@]}" DESTDIR="${D}"
-	emake -C "${S}/cmd" install "${SNAPD_MAKEARGS[@]}" DESTDIR="${D}"
-
-	if use apparmor; then
-		mv "${ED}/etc/apparmor.d/usr.lib.snapd.snap-confine"{,.real} || die
-		keepdir /var/lib/snapd/apparmor/profiles
-	fi
-	keepdir /var/lib/snapd/{apparmor/snap-confine,cache,cookie,snap,void}
-	fperms 700 /var/lib/snapd/{cache,cookie}
-
-	dobin "${GOBIN}/"{snap,snapctl}
-	ln "${ED}/usr/bin/snapctl" "${ED}/usr/lib/snapd/snapctl" || die
-
-	exeinto /usr/lib/snapd
-	doexe "${GOBIN}/"{snapd,snap-bootstrap,snap-failure,snap-exec,snap-preseed,snap-recovery-chooser,snap-repair,snap-seccomp,snap-update-ns} \
-		"${S}/"{cmd/snap-discard-ns/snap-discard-ns,cmd/snap-gdb-shim/snap-gdb-shim,cmd/snap-mgmt/snap-mgmt} \
-		"${S}/data/completion/bash/"{complete.sh,etelpmoc.sh,}
-
-	dobashcomp "${S}/data/completion/bash/snap"
-
-	insinto /usr/share/zsh/site-functions
-	doins "${S}/data/completion/zsh/_snap"
-
-	insinto "/usr/share/polkit-1/actions"
-	doins "${S}/data/polkit/io.snapcraft.snapd.policy"
-
-	dodoc "${S}/packaging/ubuntu-16.04/changelog"
-	domo "${S}/po/"*.mo
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-	xdg_desktop_database_update
-
-	if use apparmor && [[ -z ${ROOT} && -e /sys/kernel/security/apparmor/profiles &&
-		$(wc -l < /sys/kernel/security/apparmor/profiles) -gt 0 ]]; then
-		apparmor_parser -r "${EPREFIX}/etc/apparmor.d/usr.lib.snapd.snap-confine.real"
-	fi
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/app-containers/snapd/snapd-2.57.1.ebuild b/app-containers/snapd/snapd-2.57.1.ebuild
deleted file mode 100644
index 7e134a2b558e..000000000000
--- a/app-containers/snapd/snapd-2.57.1.ebuild
+++ /dev/null
@@ -1,178 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools bash-completion-r1 flag-o-matic go-module linux-info readme.gentoo-r1 systemd xdg-utils
-
-DESCRIPTION="Service and tools for management of snap packages"
-HOMEPAGE="http://snapcraft.io/"
-
-SRC_URI="https://github.com/snapcore/${PN}/releases/download/${PV}/${PN}_${PV}.vendor.tar.xz -> ${P}.tar.xz"
-MY_PV=${PV}
-KEYWORDS="~amd64"
-
-LICENSE="GPL-3 Apache-2.0 BSD BSD-2 LGPL-3-with-linking-exception MIT"
-SLOT="0"
-IUSE="apparmor +forced-devmode gtk kde systemd"
-REQUIRED_USE="!forced-devmode? ( apparmor ) systemd"
-
-CONFIG_CHECK="~CGROUPS
-		~CGROUP_DEVICE
-		~CGROUP_FREEZER
-		~NAMESPACES
-		~SQUASHFS
-		~SQUASHFS_ZLIB
-		~SQUASHFS_LZO
-		~SQUASHFS_XZ
-		~BLK_DEV_LOOP
-		~SECCOMP
-		~SECCOMP_FILTER"
-
-RDEPEND="
-	sys-libs/libseccomp:=
-	apparmor? (
-		sec-policy/apparmor-profiles
-		sys-apps/apparmor:=
-	)
-	dev-libs/glib
-	virtual/libudev
-	systemd? ( sys-apps/systemd )
-	sys-libs/libcap:=
-	sys-fs/squashfs-tools[lzma]"
-
-DEPEND="${RDEPEND}"
-
-BDEPEND="
-	>=dev-lang/go-1.9
-	dev-python/docutils
-	sys-devel/gettext
-	sys-fs/xfsprogs"
-
-PDEPEND="sys-auth/polkit[gtk?,kde?]"
-
-README_GENTOO_SUFFIX=""
-
-pkg_setup() {
-	if use apparmor; then
-		CONFIG_CHECK+=" ~SECURITY_APPARMOR"
-	fi
-	linux-info_pkg_setup
-
-	# Seems to have issues building with -O3, switch to -O2
-	replace-flags -O3 -O2
-}
-
-src_prepare() {
-	default
-	# Update apparmor profile to allow libtinfow.so*
-	sed -i 's/libtinfo/libtinfo{,w}/' \
-		"cmd/snap-confine/snap-confine.apparmor.in" || die
-
-	if ! use forced-devmode; then
-		sed -e 's#return !apparmorFull#if !apparmorFull {\n\t\tpanic("USE=forced-devmode is disabled")\n\t}\n\treturn false#' \
-			-i "sandbox/forcedevmode.go" || die
-		grep -q 'panic("USE=forced-devmode is disabled")' "sandbox/forcedevmode.go" || die "failed to disable forced-devmode"
-	fi
-
-	sed -i 's:command -v git >/dev/null:false:' -i "mkversion.sh" || die
-
-	./mkversion.sh "${PV}"
-	pushd "cmd" >/dev/null || die
-	eautoreconf
-}
-
-src_configure() {
-	SNAPD_MAKEARGS=(
-		"BINDIR=${EPREFIX}/usr/bin"
-		"DBUSSERVICESDIR=${EPREFIX}/usr/share/dbus-1/services"
-		"LIBEXECDIR=${EPREFIX}/usr/lib"
-		"SNAP_MOUNT_DIR=${EPREFIX}/var/lib/snapd/snap"
-		"SYSTEMDSYSTEMUNITDIR=$(systemd_get_systemunitdir)"
-	)
-	export CGO_ENABLED="1"
-	export CGO_CFLAGS="${CFLAGS}"
-	export CGO_CPPFLAGS="${CPPFLAGS}"
-	export CGO_CXXFLAGS="${CXXFLAGS}"
-
-	pushd "${S}/cmd" >/dev/null || die
-	econf --libdir="${EPREFIX}/usr/lib" \
-		--libexecdir="${EPREFIX}/usr/lib/snapd" \
-		$(use_enable apparmor) \
-		--enable-nvidia-biarch \
-		--with-snap-mount-dir="${EPREFIX}/var/lib/snapd/snap"
-}
-
-src_compile() {
-	export -n GOCACHE XDG_CACHE_HOME
-	export GOBIN="${S}/bin"
-
-	local file
-	for file in "${S}/po/"*.po; do
-		msgfmt "${file}" -o "${file%.po}.mo" || die
-	done
-
-	emake -C "${S}/data" "${SNAPD_MAKEARGS[@]}"
-
-	local -a flags=(-buildmode=pie -ldflags "-s -linkmode external -extldflags '${LDFLAGS}'" -trimpath)
-	local -a staticflags=(-buildmode=pie -ldflags "-s -linkmode external -extldflags '${LDFLAGS} -static'" -trimpath)
-
-	local cmd
-	for cmd in snap snapd snap-bootstrap snap-failure snap-preseed snap-recovery-chooser snap-repair snap-seccomp; do
-		go build ${GOFLAGS} -mod=vendor -o "${GOBIN}/${cmd}" "${flags[@]}" \
-		    -v -x "github.com/snapcore/${PN}/cmd/${cmd}"
-		[[ -e "${GOBIN}/${cmd}" ]] || die "failed to build ${cmd}"
-	done
-	for cmd in snapctl snap-exec snap-update-ns; do
-		go build ${GOFLAGS} -mod=vendor -o "${GOBIN}/${cmd}" "${staticflags[@]}" \
-		    -v -x "github.com/snapcore/${PN}/cmd/${cmd}"
-		[[ -e "${GOBIN}/${cmd}" ]] || die "failed to build ${cmd}"
-	done
-}
-
-src_install() {
-	emake -C "${S}/data" install "${SNAPD_MAKEARGS[@]}" DESTDIR="${D}"
-	emake -C "${S}/cmd" install "${SNAPD_MAKEARGS[@]}" DESTDIR="${D}"
-
-	if use apparmor; then
-		mv "${ED}/etc/apparmor.d/usr.lib.snapd.snap-confine"{,.real} || die
-		keepdir /var/lib/snapd/apparmor/profiles
-	fi
-	keepdir /var/lib/snapd/{apparmor/snap-confine,cache,cookie,snap,void}
-	fperms 700 /var/lib/snapd/{cache,cookie}
-
-	dobin "${GOBIN}/"{snap,snapctl}
-	ln "${ED}/usr/bin/snapctl" "${ED}/usr/lib/snapd/snapctl" || die
-
-	exeinto /usr/lib/snapd
-	doexe "${GOBIN}/"{snapd,snap-bootstrap,snap-failure,snap-exec,snap-preseed,snap-recovery-chooser,snap-repair,snap-seccomp,snap-update-ns} \
-		"${S}/"{cmd/snap-discard-ns/snap-discard-ns,cmd/snap-gdb-shim/snap-gdb-shim,cmd/snap-mgmt/snap-mgmt} \
-		"${S}/data/completion/bash/"{complete.sh,etelpmoc.sh,}
-
-	dobashcomp "${S}/data/completion/bash/snap"
-
-	insinto /usr/share/zsh/site-functions
-	doins "${S}/data/completion/zsh/_snap"
-
-	insinto "/usr/share/polkit-1/actions"
-	doins "${S}/data/polkit/io.snapcraft.snapd.policy"
-
-	dodoc "${S}/packaging/ubuntu-16.04/changelog"
-	domo "${S}/po/"*.mo
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-	xdg_desktop_database_update
-
-	if use apparmor && [[ -z ${ROOT} && -e /sys/kernel/security/apparmor/profiles &&
-		$(wc -l < /sys/kernel/security/apparmor/profiles) -gt 0 ]]; then
-		apparmor_parser -r "${EPREFIX}/etc/apparmor.d/usr.lib.snapd.snap-confine.real"
-	fi
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/app-containers/snapd/snapd-2.56.2.ebuild b/app-containers/snapd/snapd-2.57.2-r1.ebuild
index 7e134a2b558e..35255adff108 100644
--- a/app-containers/snapd/snapd-2.56.2.ebuild
+++ b/app-containers/snapd/snapd-2.57.2-r1.ebuild
@@ -118,7 +118,7 @@ src_compile() {
 	local -a staticflags=(-buildmode=pie -ldflags "-s -linkmode external -extldflags '${LDFLAGS} -static'" -trimpath)
 
 	local cmd
-	for cmd in snap snapd snap-bootstrap snap-failure snap-preseed snap-recovery-chooser snap-repair snap-seccomp; do
+	for cmd in snap snapd snapd-apparmor snap-bootstrap snap-failure snap-preseed snap-recovery-chooser snap-repair snap-seccomp; do
 		go build ${GOFLAGS} -mod=vendor -o "${GOBIN}/${cmd}" "${flags[@]}" \
 		    -v -x "github.com/snapcore/${PN}/cmd/${cmd}"
 		[[ -e "${GOBIN}/${cmd}" ]] || die "failed to build ${cmd}"
@@ -145,7 +145,7 @@ src_install() {
 	ln "${ED}/usr/bin/snapctl" "${ED}/usr/lib/snapd/snapctl" || die
 
 	exeinto /usr/lib/snapd
-	doexe "${GOBIN}/"{snapd,snap-bootstrap,snap-failure,snap-exec,snap-preseed,snap-recovery-chooser,snap-repair,snap-seccomp,snap-update-ns} \
+	doexe "${GOBIN}/"{snapd,snapd-apparmor,snap-bootstrap,snap-failure,snap-exec,snap-preseed,snap-recovery-chooser,snap-repair,snap-seccomp,snap-update-ns} \
 		"${S}/"{cmd/snap-discard-ns/snap-discard-ns,cmd/snap-gdb-shim/snap-gdb-shim,cmd/snap-mgmt/snap-mgmt} \
 		"${S}/data/completion/bash/"{complete.sh,etelpmoc.sh,}
 
diff --git a/app-containers/snapd/snapd-2.57.2.ebuild b/app-containers/snapd/snapd-2.57.2.ebuild
deleted file mode 100644
index 7e134a2b558e..000000000000
--- a/app-containers/snapd/snapd-2.57.2.ebuild
+++ /dev/null
@@ -1,178 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools bash-completion-r1 flag-o-matic go-module linux-info readme.gentoo-r1 systemd xdg-utils
-
-DESCRIPTION="Service and tools for management of snap packages"
-HOMEPAGE="http://snapcraft.io/"
-
-SRC_URI="https://github.com/snapcore/${PN}/releases/download/${PV}/${PN}_${PV}.vendor.tar.xz -> ${P}.tar.xz"
-MY_PV=${PV}
-KEYWORDS="~amd64"
-
-LICENSE="GPL-3 Apache-2.0 BSD BSD-2 LGPL-3-with-linking-exception MIT"
-SLOT="0"
-IUSE="apparmor +forced-devmode gtk kde systemd"
-REQUIRED_USE="!forced-devmode? ( apparmor ) systemd"
-
-CONFIG_CHECK="~CGROUPS
-		~CGROUP_DEVICE
-		~CGROUP_FREEZER
-		~NAMESPACES
-		~SQUASHFS
-		~SQUASHFS_ZLIB
-		~SQUASHFS_LZO
-		~SQUASHFS_XZ
-		~BLK_DEV_LOOP
-		~SECCOMP
-		~SECCOMP_FILTER"
-
-RDEPEND="
-	sys-libs/libseccomp:=
-	apparmor? (
-		sec-policy/apparmor-profiles
-		sys-apps/apparmor:=
-	)
-	dev-libs/glib
-	virtual/libudev
-	systemd? ( sys-apps/systemd )
-	sys-libs/libcap:=
-	sys-fs/squashfs-tools[lzma]"
-
-DEPEND="${RDEPEND}"
-
-BDEPEND="
-	>=dev-lang/go-1.9
-	dev-python/docutils
-	sys-devel/gettext
-	sys-fs/xfsprogs"
-
-PDEPEND="sys-auth/polkit[gtk?,kde?]"
-
-README_GENTOO_SUFFIX=""
-
-pkg_setup() {
-	if use apparmor; then
-		CONFIG_CHECK+=" ~SECURITY_APPARMOR"
-	fi
-	linux-info_pkg_setup
-
-	# Seems to have issues building with -O3, switch to -O2
-	replace-flags -O3 -O2
-}
-
-src_prepare() {
-	default
-	# Update apparmor profile to allow libtinfow.so*
-	sed -i 's/libtinfo/libtinfo{,w}/' \
-		"cmd/snap-confine/snap-confine.apparmor.in" || die
-
-	if ! use forced-devmode; then
-		sed -e 's#return !apparmorFull#if !apparmorFull {\n\t\tpanic("USE=forced-devmode is disabled")\n\t}\n\treturn false#' \
-			-i "sandbox/forcedevmode.go" || die
-		grep -q 'panic("USE=forced-devmode is disabled")' "sandbox/forcedevmode.go" || die "failed to disable forced-devmode"
-	fi
-
-	sed -i 's:command -v git >/dev/null:false:' -i "mkversion.sh" || die
-
-	./mkversion.sh "${PV}"
-	pushd "cmd" >/dev/null || die
-	eautoreconf
-}
-
-src_configure() {
-	SNAPD_MAKEARGS=(
-		"BINDIR=${EPREFIX}/usr/bin"
-		"DBUSSERVICESDIR=${EPREFIX}/usr/share/dbus-1/services"
-		"LIBEXECDIR=${EPREFIX}/usr/lib"
-		"SNAP_MOUNT_DIR=${EPREFIX}/var/lib/snapd/snap"
-		"SYSTEMDSYSTEMUNITDIR=$(systemd_get_systemunitdir)"
-	)
-	export CGO_ENABLED="1"
-	export CGO_CFLAGS="${CFLAGS}"
-	export CGO_CPPFLAGS="${CPPFLAGS}"
-	export CGO_CXXFLAGS="${CXXFLAGS}"
-
-	pushd "${S}/cmd" >/dev/null || die
-	econf --libdir="${EPREFIX}/usr/lib" \
-		--libexecdir="${EPREFIX}/usr/lib/snapd" \
-		$(use_enable apparmor) \
-		--enable-nvidia-biarch \
-		--with-snap-mount-dir="${EPREFIX}/var/lib/snapd/snap"
-}
-
-src_compile() {
-	export -n GOCACHE XDG_CACHE_HOME
-	export GOBIN="${S}/bin"
-
-	local file
-	for file in "${S}/po/"*.po; do
-		msgfmt "${file}" -o "${file%.po}.mo" || die
-	done
-
-	emake -C "${S}/data" "${SNAPD_MAKEARGS[@]}"
-
-	local -a flags=(-buildmode=pie -ldflags "-s -linkmode external -extldflags '${LDFLAGS}'" -trimpath)
-	local -a staticflags=(-buildmode=pie -ldflags "-s -linkmode external -extldflags '${LDFLAGS} -static'" -trimpath)
-
-	local cmd
-	for cmd in snap snapd snap-bootstrap snap-failure snap-preseed snap-recovery-chooser snap-repair snap-seccomp; do
-		go build ${GOFLAGS} -mod=vendor -o "${GOBIN}/${cmd}" "${flags[@]}" \
-		    -v -x "github.com/snapcore/${PN}/cmd/${cmd}"
-		[[ -e "${GOBIN}/${cmd}" ]] || die "failed to build ${cmd}"
-	done
-	for cmd in snapctl snap-exec snap-update-ns; do
-		go build ${GOFLAGS} -mod=vendor -o "${GOBIN}/${cmd}" "${staticflags[@]}" \
-		    -v -x "github.com/snapcore/${PN}/cmd/${cmd}"
-		[[ -e "${GOBIN}/${cmd}" ]] || die "failed to build ${cmd}"
-	done
-}
-
-src_install() {
-	emake -C "${S}/data" install "${SNAPD_MAKEARGS[@]}" DESTDIR="${D}"
-	emake -C "${S}/cmd" install "${SNAPD_MAKEARGS[@]}" DESTDIR="${D}"
-
-	if use apparmor; then
-		mv "${ED}/etc/apparmor.d/usr.lib.snapd.snap-confine"{,.real} || die
-		keepdir /var/lib/snapd/apparmor/profiles
-	fi
-	keepdir /var/lib/snapd/{apparmor/snap-confine,cache,cookie,snap,void}
-	fperms 700 /var/lib/snapd/{cache,cookie}
-
-	dobin "${GOBIN}/"{snap,snapctl}
-	ln "${ED}/usr/bin/snapctl" "${ED}/usr/lib/snapd/snapctl" || die
-
-	exeinto /usr/lib/snapd
-	doexe "${GOBIN}/"{snapd,snap-bootstrap,snap-failure,snap-exec,snap-preseed,snap-recovery-chooser,snap-repair,snap-seccomp,snap-update-ns} \
-		"${S}/"{cmd/snap-discard-ns/snap-discard-ns,cmd/snap-gdb-shim/snap-gdb-shim,cmd/snap-mgmt/snap-mgmt} \
-		"${S}/data/completion/bash/"{complete.sh,etelpmoc.sh,}
-
-	dobashcomp "${S}/data/completion/bash/snap"
-
-	insinto /usr/share/zsh/site-functions
-	doins "${S}/data/completion/zsh/_snap"
-
-	insinto "/usr/share/polkit-1/actions"
-	doins "${S}/data/polkit/io.snapcraft.snapd.policy"
-
-	dodoc "${S}/packaging/ubuntu-16.04/changelog"
-	domo "${S}/po/"*.mo
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-	xdg_desktop_database_update
-
-	if use apparmor && [[ -z ${ROOT} && -e /sys/kernel/security/apparmor/profiles &&
-		$(wc -l < /sys/kernel/security/apparmor/profiles) -gt 0 ]]; then
-		apparmor_parser -r "${EPREFIX}/etc/apparmor.d/usr.lib.snapd.snap-confine.real"
-	fi
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}