10 files changed, 49 insertions, 686 deletions
diff --git a/app-containers/Manifest.gz b/app-containers/Manifest.gz
index d746dcc06c7d..f0bd0ec2df4d 100644
--- a/app-containers/Manifest.gz
+++ b/app-containers/Manifest.gz
diff --git a/app-containers/docker-compose/Manifest b/app-containers/docker-compose/Manifest
index 0b3ac436be86..8c97aa0690ac 100644
--- a/app-containers/docker-compose/Manifest
+++ b/app-containers/docker-compose/Manifest
@@ -1,5 +1,6 @@
 AUX docker-compose-1.29.0-setup-py.patch 1858 BLAKE2B 9a53ffec0449fe1fa110b21617bc3e804829625abc6205f10962f568acbdfa7c38ffeec7e7feb0fe585b95555ff786223b3a7c24e960738cea0dfa7803be3f59 SHA512 66a25230e8d7f294c7baa3053cee508623d85e8453eb758f7f80aed9416aef9018c8878e9c0db6b96e657bb450508d442d6b055e11e80996ef3aba276d98fe63
 AUX docker-compose-1.29.2-docker-7.patch 1453 BLAKE2B ec9faf576c90002bfa1e44e04b48a2fe10f7b16a3f169b091e83b059292cd5dc8d84bf98732a1e7ab8e3ade7fcb2b9b8fbaad8113d25920803b3c3080a6ac3d9 SHA512 c463ec01fd75201fc632c11cfef2034d9f82ad250a26c04e9d4eaf71ec8bc93d6adb9391626e00161b418fc09599d2a1eef991f21165dc2f010f36011b4886b9
+AUX docker-compose-1.29.2-python-3.13.patch 967 BLAKE2B d654d277ce5631e46e18ac2cf2feebf9ecdef6ef8268e5e0844bf8d66f0c16400a48738dad0927d8ebbb15a5ef7baab81a840e6ae0df76e532e13faa7f038b42 SHA512 10fb96fe58d2273e88e6faccf9b6ac623bd29dbb6b74b96df24e3d81814e3f2fe8e7bb4afa345fec1141adb024d45e1ecf2945586f8abc2940f5792a0d9cb97a
 AUX docker-compose-1.29.2-tests-unit-cli-test-py.patch 900 BLAKE2B 400b1fac44687d05a10543519e0829ab4534342b3f39f9a0e2ac2e42ae7bc4e46f1d432734069e7097d2c18767144ab8e40af6b0ac8fe7984f2cc7fc822276f0 SHA512 e64e1c5b4e90b3a7b04a5dc52ac2e77545a5ce70128b6780d3e6fa6724877359a488ddf75c375db21f8382881779d20a4d58e5a1a927008c26bf8601e5fcf3ef
 DIST docker-compose-1.29.2.gh.tar.gz 320320 BLAKE2B 2d1a6375127fa09661822f7148665161b45bbd234c93444ae31c1d926513fcbc9fb845f8af01d8f11788f24b7517bff5f6cea2a5da9ade897891f2dd728f26bd SHA512 09f2ae2ae7a17ab5fb3e22580f7a80f1a8253f7ad9fc8f29aca432911bcde46ed22030ff3073cdd7eff3d55aaba17f56e628a178ec05c3a9b4f28495d6045111
 DIST docker-compose-2.28.1-deps.tar.xz 63440736 BLAKE2B 8af853b07539a413d2532e4d851558c71a27f49679316cab86d026cbc483b6d1bc02c991d839978e60b39e459c09433d215f105e7bac031bc946d2585e275fe3 SHA512 99ef80068d28692da7da9abfbe7f19c28b62425b0cd5ce7d66698e31a40bc8625f665b261077251426577be535e8d5059ffdadbe11a05abdb3768107b5a127f2
@@ -8,8 +9,8 @@ DIST docker-compose-2.32.1-deps.tar.xz 62997012 BLAKE2B a726ecc43b6201169f846719
 DIST docker-compose-2.32.1.gh.tar.gz 381904 BLAKE2B e26b7f38c00196c58743e6aaae3538135ba7cfc0b1ad9dbb7704c7cce281817e452d6bf569d968d62b47b95397f6cc1419efddb818bf71ccc9b8c24923d058d2 SHA512 1577910990193099016b20a49b9f0f79ec89d1f9e39f5f484253405bb33f341d06b18e0e82f7d65ed9d8b5be8d7510b739fd53e130b98ad1a6edf40f2282cbe5
 DIST docker-compose-2.32.3-deps.tar.xz 63026156 BLAKE2B 14fbf37a3daae8cb3d4b9ebe0fd46bc8900dc74ef6661edea6fd7452b653ea987c223cabaf88e6e01d71f57238809b5ee3ffdec39a01b851168fc5eb1bdcbb76 SHA512 6ec2d4d586a0e6e93aa46db1b6d6f5c25ad461a0f8552ce8ed7f9e47e12e70d0e9f91b84498bee84218acf23285f319304e36a94f84d97f8c71ea35c25fd3f9b
 DIST docker-compose-2.32.3.gh.tar.gz 382194 BLAKE2B a2739832123dddb2a6c7d71a52294bad711d4fe99887c5e8272d59d697c50db721779ee12e6813b9e4f22f536a063b14f3636ba50064c7e51c273f71bbdeff41 SHA512 33b952af17ee518e0499d4ee5ff6da525bc55791cc76b94d013c05bdc80bb34d9290feb8b1ec52decc4df9c2c36e07ed601f9b8985f5d576e877550de39b650a
-EBUILD docker-compose-1.29.2-r6.ebuild 2214 BLAKE2B 74d623745c116017b06ff2fd7598ed3237e95545510ba2f5e93c5de90a659c9c1d08df155345d02540938aa795412550a38827cb40b7f69a4a7cecdea3d9a47d SHA512 a771a06b8f9cd7f779dc38b2fe38ac77dad29c423daef3c193188ea8038345e0d80c71d145fefecd0ccf526233279630fc4404af94f9e922c4d35585e6d84019
 EBUILD docker-compose-1.29.2-r7.ebuild 2214 BLAKE2B 4b80fa52a9479c10227f838e30044e4b306908be6f3d2864d90bd88fbbc367d7a11faa132c3280f73fadaf82f3d381c6c2a27b271c7d76774a26c8f9739441a8 SHA512 46d6c6600ce5e7b38d608cad8cf208f2121c936cc56f561e4e64600905f939ab229d51d312e6d7f5e01947433e18a6054bac15fb093371d110d41cdc8df8437a
+EBUILD docker-compose-1.29.2-r8.ebuild 2254 BLAKE2B bdca207cff8afae78a44a1a6f4638b6dda9017f3d54d1b6e5d09e3c51b8ffc7901c07fee389a4b6f9d3f23d49ffd744c461cf68c416c39e056ce0413c1d298fb SHA512 2a9db2364caadf5bf74d3c769310719cae68188682a03e4efa102b2f4c3c220000eb771a3b97ecaf6e9a841683b6a9f06895fd8bdc1a25cc0544740987d9e02e
 EBUILD docker-compose-2.28.1.ebuild 1169 BLAKE2B 72002373d5ebbcaf56770fb774bd44cb066d86c58132833ad91207de777e0a39008dcecd567587b704d8e1f14f4fc45a68f8fc015a4b2ca71c22bf778f497cad SHA512 7a4096b217ff830d6125b2e57ce37feee3b278478ba10bec7c9212f6fcb5cb92f884a1123f042c3a6aef32dce878eedb3e8551c406efee317f8bea7d764c780c
 EBUILD docker-compose-2.32.1.ebuild 1171 BLAKE2B 59f519cdb2ff8c5cc8e1a4816c74838bbd2d90d55743cba2af7f5e3ce824457528cb0a46c5e7644dffea2ec2f39347c5c9ef7f26a978bb10fe04c682355c9521 SHA512 aac01275e4d54b9763e7689d2a6455e3fecb7f79ff9f07de457635c57f5322ed15d1c3ae899b2ea8d461945d6ae7df0d58f76a985eae69a946fef796e3505f02
 EBUILD docker-compose-2.32.3.ebuild 1211 BLAKE2B f9e519be393aec680d11fc6660e62ea69f75b21148061b66517e30e05b3fc4d5d51b1fb9bce67b3b1a611513c0621440edb44c92431b16ca256ed8451226a45e SHA512 53012a603cac131edd81ae43ab7cc02539a4d5cc48cd0e620d28415dc1a2c5240d61837735e95741b1f6d4acf231036e423f3efd6c30ec4b5342dbd09564679a
diff --git a/app-containers/docker-compose/docker-compose-1.29.2-r6.ebuild b/app-containers/docker-compose/docker-compose-1.29.2-r8.ebuild
index 212c92a1c835..a0bbd6b27ad5 100644
--- a/app-containers/docker-compose/docker-compose-1.29.2-r6.ebuild
+++ b/app-containers/docker-compose/docker-compose-1.29.2-r8.ebuild
@@ -1,10 +1,10 @@
-# Copyright 2018-2024 Gentoo Authors
+# Copyright 2018-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..13} )
 
 inherit bash-completion-r1 distutils-r1
 
@@ -13,9 +13,11 @@ DESCRIPTION="Multi-container orchestration for Docker"
 HOMEPAGE="https://github.com/docker/compose"
 SRC_URI="https://github.com/docker/compose/archive/${MY_PV}.tar.gz -> ${P}.gh.tar.gz"
 
+S="${WORKDIR}/compose-${MY_PV}"
+
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm64"
+KEYWORDS="~amd64 ~arm64"
 
 RDEPEND="
 	>=dev-python/distro-1.5.0[${PYTHON_USEDEP}]
@@ -39,8 +41,6 @@ DEPEND="${RDEPEND}
 		dev-python/py[${PYTHON_USEDEP}]
 	)"
 
-S="${WORKDIR}/compose-${MY_PV}"
-
 EPYTEST_DESELECT=(
 	# These are not ready for >=dev-python/docker-7
 	tests/unit/cli/docker_client_test.py::TLSConfigTestCase::
@@ -55,6 +55,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-tests-unit-cli-test-py.patch
 	# Bug #920631 -- https://bugs.gentoo.org/920631
 	"${FILESDIR}"/${P}-docker-7.patch
+	"${FILESDIR}"/${P}-python-3.13.patch
 )
 
 DOCS=( CHANGELOG.md README.md )
diff --git a/app-containers/docker-compose/files/docker-compose-1.29.2-python-3.13.patch b/app-containers/docker-compose/files/docker-compose-1.29.2-python-3.13.patch
new file mode 100644
index 000000000000..15bcef2d9a07
--- /dev/null
+++ b/app-containers/docker-compose/files/docker-compose-1.29.2-python-3.13.patch
@@ -0,0 +1,35 @@
+From e84ec8f7ed416df359b8e26f86232b5c8c1b41d4 Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Fri, 28 Mar 2025 19:42:43 +0100
+Subject: [PATCH] Replace pipes.quote by shlex.quote for Python 3.13
+
+---
+ compose/cli/main.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/compose/cli/main.py b/compose/cli/main.py
+index fabd608..fe6ccc2 100644
+--- a/compose/cli/main.py
++++ b/compose/cli/main.py
+@@ -2,8 +2,8 @@ import contextlib
+ import functools
+ import json
+ import logging
+-import pipes
+ import re
++import shlex
+ import subprocess
+ import sys
+ from distutils.spawn import find_executable
+@@ -1579,7 +1579,7 @@ def call_docker(args, dockeropts, environment):
+         )
+ 
+     args = [executable_path] + tls_options + args
+-    log.debug(" ".join(map(pipes.quote, args)))
++    log.debug(" ".join(map(shlex.quote, args)))
+ 
+     filtered_env = {k: v for k, v in environment.items() if v is not None}
+ 
+-- 
+2.48.1
+
diff --git a/app-containers/incus/Manifest b/app-containers/incus/Manifest
index 871a2dfc1e34..34f8eed5ada4 100644
--- a/app-containers/incus/Manifest
+++ b/app-containers/incus/Manifest
@@ -9,19 +9,10 @@ AUX incus-startup-0.4.sh 304 BLAKE2B a30c8a848ed2a3c8ff6eb2552bc59916eb01b178edf
 AUX incus-user-0.4.initd 670 BLAKE2B 5481019916f573a71ee5dadd5a2fefac137951a9b7bb54da7b55376c4ab4b64f2c709904467cf7d14ebc7b297c9113b01064966388f082a52ea91b90c334c2d4 SHA512 048d4634b25c8000ea6c0bf856050016e04b29080c8a68a9924b58781a3093c3adf0f4ed88841bf297df659f370162d4d7296d2d15256f67ca6f6d5fa5af92ab
 AUX incus-user-0.4.service 247 BLAKE2B 97c181da8dc7c91e8effec89a8bac17b626e8e2f34e5d2212025d29543271903f16c3f878dbdb7eeddbde64a26714233be03e087281d50acdbb12a2d420bec96 SHA512 8d47426559af02e6d71d5fd10d858c21056af8d4e921c576bc1ae9d8827fdd24607360620383a7bbb1343c883d8a9d71fc783fecf377884c5c64015e6db37031
 AUX incus-user-0.4.socket 204 BLAKE2B df26315099820f77fc875c1619078c0b3adc1cf131f4a2c5f3b6f91609bc07a4535d9fb24d20f91c77b0de7f8334442ba17c704310f35ccbc2864a6148f78389 SHA512 a2541cc29d87e96d6a2ebec1cb72dd5779648b4d739657cf123590c23ae00b8022ebf68a7a2af24cfdb9fcb89a05ec87ecd15e37f3160c7ceedf23f3a2459950
-DIST incus-6.0.2.tar.xz 11197324 BLAKE2B fa15816ea05865ce48f7cb668c3138d2d186a1876669d6eaf05ffd335d8feedf7eda41301be9d2e07879aa3fb2e7177a5bd26cb89a3789d46ef648c2fcb06db5 SHA512 ef58bc22154204a3f89b973fd5289385fa98aa2c2a97b0ff3ed2fa2a0c899ee3dc08cb46552ade2e86dc13f5de55f9ef59aea775c60eb3df74d088f8a1e2795a
-DIST incus-6.0.2.tar.xz.asc 833 BLAKE2B bcdeb0d2a3684dcdcb620166865523a2e9eb595f0e7760f05a06ea0608dc4fc7111b75206fe62a63cfd90a0d0ec79206404994e53770d5e35a639a67e1ad753c SHA512 18587ddc7b7cb41418ee0e7a43875663e71c9d39a505fd55bc29fe83717b5d5cdc876c46912561610735ddf80462631716354a943a272ae5ccf0ee495aff1c1c
 DIST incus-6.0.3.tar.xz 11916020 BLAKE2B d3d998bd50124604c52ff007eefed586c216ce1a0a77d45724fd489db1d93f2fa304f5d6e1c368ff2dd4d1170b24605fd24bbf2a6e4506207686ca392936c200 SHA512 6a879e6634cf545b4c427800d923a32e5fe58a6eaf220ad8d0cb08e0ced5e6c4be09274ae095bb9dae25a55445462ea83d3d9235f67bbb9896944f596bf17e1a
 DIST incus-6.0.3.tar.xz.asc 833 BLAKE2B 38835ab036709161150992cb40df4ff1ae1887d4f3e0b037d0415f75d2bb711cb3c5945bffe1b91d289acfb7e19e726964278e5c2ab31731ba9f7534f139dec7 SHA512 7d5360ab91aafe1d047a60e38a07e24c3c7b158e753087a943ec5e59d6a27c19a872080c9007b6cf592040d3408845bc188d76f6e732408d0680a3782cebce47
 DIST incus-6.10.1.tar.xz 18023076 BLAKE2B c35c7a81448b17db6db8959458c23a58392d9e3dcfedaf6d1094964c0c35d46d551a4d6cbaab93cde4b9006bdeb064dcc50148fc2cded6c9ca122f635dab58cd SHA512 12566fef798b34e3d1f3abe4bebada50a99f0e30fd33e1c5ffab458a2ebdac484650e6bf35a48bc4680669d24c9fd912b549e43ed01318bdac52d1b1767cb275
 DIST incus-6.10.1.tar.xz.asc 833 BLAKE2B 2e2de67bae59502fdad66a7ac5b7771d4e305f87e4b3e35bc829a73bd053a7ca8256f9bfa8e4c2fc6ee2268cdc8bd9b9bac7ed319e5cda14829daeaa39108b51 SHA512 4f00405913b0d04a0eec407756928e59e477ecf4dfc07b063a13fc5683fcc6e18efe1d2947a6b9c12e5fb1b64d39dc076f4a41da129fe132d30e7cfc23af80a4
-DIST incus-6.8.tar.xz 11403916 BLAKE2B 09d8e2a8619a040550600234d7fe2e65eea8c6a7054e0b790f3774721ad5de982dee5d0151f8141cda0f5c6b9d63e18b1c4964e4027bf9470ed44a28d482f999 SHA512 c7b0cc22014f482981777f3cef3b0064c02b46c7ced4e8572fd9548eec45a0d87ac868e94ab8d2af80eb24986db64a930ac578c8555e2759022cad559b74ac5c
-DIST incus-6.8.tar.xz.asc 833 BLAKE2B 77b937177b4239da27478ff7826c633d34ee3b5e02e988387fdc63ff43fad307786c27dee2c3cefb8c4129ce8777fad3361c2e2a86152d202c55231d4105d7a8 SHA512 3111e196da18d362c2e60482e313da888ba6ffba1b5ae134bf9d7e89951ebf6d2b2af922d78ee6fd2e9b51bffea5ccadd0d11bf0a3527d07d8351733ce66f2e3
-DIST incus-6.9.tar.xz 11444156 BLAKE2B 440e9ee9422935d68a52370406c1259ad226db680241000ec27633ef213c86cf8dfa49954c9ade4438b4f14ba9f301869a8b18c588edf5ed3439a85fd4a40fc8 SHA512 f8d704a76455fe4073a1fd67aea6dfd4af35d624aa0e91bb568871d5006ec49d9a7e5a19826c58ea300aa28c081e42ae98960f1c6d78a883434c4fd427a0a67b
-DIST incus-6.9.tar.xz.asc 833 BLAKE2B 8051c12f9451b4e0300c2d3eea44743fcb61fc77181d1bc289aa85a5aeeba18b1866d84e387cc99f05996333f869738e8930ee63f28ea12b06ec3cd7bb2bd8c3 SHA512 6ef81ff6432333629888309e8b7ac48d4e92d80da77fe8fcabf248bd1c8927b4d180f9893a8895e7fbc32b8b1dec99388b154bf201275d77660af339f47ca2a2
-EBUILD incus-6.0.2.ebuild 6083 BLAKE2B c9caaeb98078d7dad8bb277196fbe651eb956020bb933fdbd7d84a1f7caef1c2450d7bb31cfb9ea7717d768bf8cd4dde45c68f81508783e15150b56efc492c79 SHA512 0c6cb9391eaff33920b0e18daf1dc3299db0be2f451a547aa146fdbe85d0b3bafea31cf09f8fb744ec305de41d9ac7c3978ff1bc33aeafd0b8c5794817be3d8f
-EBUILD incus-6.0.3.ebuild 6270 BLAKE2B 939d76cb68aef6e4fd52738fc4847175b72ff873ac42bacca41e9079d9f51793a0e05373dc01e7415849ef7685d1c72f95f70a1f1a1a0f2eca41476400d7e064 SHA512 a2a4f48e738a2ddc140a3b7449597cbc21c929437be2141484ee1ca1fb4b0f5a0c6dfd9e8fc3aed6d7b627f08c1ff2aa6cb9f44298d46923e34a1b77a5c8aa93
-EBUILD incus-6.10.1.ebuild 6140 BLAKE2B d6b0decf05daf02188de03ca272834e0033ffcbde4c642d9686fea1639e51ed6db9917f15e72b753f65c2380fe8c40d9f0eb0d55884abb79d29e68cff272bae0 SHA512 4228b0641b248d76e01c12a58eeb49529b3b47adbd070459aab7cee59012af6395e90f7c57c8e3855b8d7392c263bdb64547407caec7fa9aa223f1c9eacee87f
-EBUILD incus-6.8.ebuild 6383 BLAKE2B 5b00f4b6de57500591485d076152684d5b841d2e4ead9c245607b1c4919fea96d88cfe84896b66c86dfb2049a9f17b2832cedf6a968801f0bd1ba9c8d7075b91 SHA512 7bf9f2b7e203522178a5569faf332bb309d0b68e3d5e27224c111fec441d1ee847a0d3e58c344fa6409bb72fd2884ec3fd1fe94d86fbafe9cc137595ba1ba42a
-EBUILD incus-6.9-r2.ebuild 6264 BLAKE2B 5398823be9914419a23523ea1dd6c4cc457c47241f7782d018dd93fe9e0d39ecb9464a0c692d353de0765baaf854b479e9631fe87d78d92c3120ade63d88221f SHA512 15fb681af83e9e7112bcce4f6cd271d9cce4198c86f3fe980e9cc8c2e6798ec43ce45262e0a98942d44c299355f641c2c228ccc4c2b23ba7e2e63e2aa1b16957
+EBUILD incus-6.0.3-r1.ebuild 6312 BLAKE2B 34672a11b2bc0e609f5a2ee9386ba0d0efb77bc2e75ffc8777794bdabd2724f5bddff0afe19137c91e715f4faea76b9318c3e6fd9f9b1a0315644f303623a076 SHA512 293c0001a88dd64c4e253331b1aaf8ea70b7efab9230b6fda4b11602068130d570a2a098c85aa34ad3d4cd45914d5e973946e505c9eea66de177003706abce17
+EBUILD incus-6.10.1-r1.ebuild 6182 BLAKE2B e5b5e85585668cf6b3188310628e7f9fa511521994afe911d77f6737926ec2893418f294c6be712be9cba84fa10e5b7c94ab1374f5d8bba2640cf0c1a5b924ee SHA512 4d147e4ff3fbb465faf5eb222ea36758aa6c74b295a0ae6ebc564095883c570737f234503173e55cbddf9e0847e0df79bf95ba9f77c8cffbb331ff42e9f950e7
 MISC metadata.xml 1696 BLAKE2B d15b2a9b4a9f2197369466403fe00ff6a2a10d3d2b86e2f306a7eeaad4ef3eb6709c22b08df6dc4a8fa0f6d9468da6a240fca27d587c222f081644b8e303da6f SHA512 e07b3700562381e6634ae5bb50163c63fdec2e2798c055da53bd1e84e65a394482b4b95a57effac61f037ecee91440e1d3d608322978846b7c6c5e200e503f0f
diff --git a/app-containers/incus/incus-6.0.2.ebuild b/app-containers/incus/incus-6.0.2.ebuild
deleted file mode 100644
index 4de9f46a4cac..000000000000
--- a/app-containers/incus/incus-6.0.2.ebuild
+++ /dev/null
@@ -1,215 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit go-module linux-info optfeature systemd toolchain-funcs verify-sig
-
-DESCRIPTION="Modern, secure and powerful system container and virtual machine manager"
-HOMEPAGE="https://linuxcontainers.org/incus/introduction/ https://github.com/lxc/incus"
-SRC_URI="https://linuxcontainers.org/downloads/incus/${P}.tar.xz
-	verify-sig? ( https://linuxcontainers.org/downloads/incus/${P}.tar.xz.asc )"
-
-LICENSE="Apache-2.0 BSD LGPL-3 MIT"
-SLOT="0/lts"
-KEYWORDS="amd64 ~arm64"
-IUSE="apparmor fuidshift nls"
-
-DEPEND="acct-group/incus
-	acct-group/incus-admin
-	app-arch/xz-utils
-	>=app-containers/lxc-5.0.0:=[apparmor?,seccomp(+)]
-	dev-db/sqlite:3
-	>=dev-libs/cowsql-1.15.6
-	dev-libs/lzo
-	>=dev-libs/raft-0.22.1:=[lz4]
-	>=dev-util/xdelta-3.0[lzma(+)]
-	net-dns/dnsmasq[dhcp]
-	sys-libs/libcap
-	virtual/udev"
-RDEPEND="${DEPEND}
-	fuidshift? ( !app-containers/lxd )
-	net-firewall/ebtables
-	net-firewall/iptables
-	sys-apps/iproute2
-	sys-fs/fuse:*
-	>=sys-fs/lxcfs-5.0.0
-	sys-fs/squashfs-tools[lzma]
-	virtual/acl"
-BDEPEND=">=dev-lang/go-1.21
-	nls? ( sys-devel/gettext )
-	verify-sig? ( sec-keys/openpgp-keys-linuxcontainers )"
-
-CONFIG_CHECK="
-	~CGROUPS
-	~IPC_NS
-	~NET_NS
-	~PID_NS
-
-	~SECCOMP
-	~USER_NS
-	~UTS_NS
-
-	~KVM
-	~MACVTAP
-	~VHOST_VSOCK
-"
-
-ERROR_IPC_NS="CONFIG_IPC_NS is required."
-ERROR_NET_NS="CONFIG_NET_NS is required."
-ERROR_PID_NS="CONFIG_PID_NS is required."
-ERROR_SECCOMP="CONFIG_SECCOMP is required."
-ERROR_UTS_NS="CONFIG_UTS_NS is required."
-
-WARNING_KVM="CONFIG_KVM and CONFIG_KVM_AMD/-INTEL is required for virtual machines."
-WARNING_MACVTAP="CONFIG_MACVTAP is required for virtual machines."
-WARNING_VHOST_VSOCK="CONFIG_VHOST_VSOCK is required for virtual machines."
-
-# Go magic.
-QA_PREBUILT="/usr/bin/incus
-	/usr/bin/incus-agent
-	/usr/bin/incus-benchmark
-	/usr/bin/incus-migrate
-	/usr/bin/lxc-to-incus
-	/usr/sbin/fuidshift
-	/usr/sbin/incusd
-	/usr/sbin/lxd-to-incus"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/linuxcontainers.asc
-
-# The testsuite must be run as root.
-# make: *** [Makefile:156: check] Error 1
-RESTRICT="test"
-
-GOPATH="${S}/_dist"
-
-src_unpack() {
-	verify-sig_src_unpack
-	go-module_src_unpack
-}
-
-src_prepare() {
-	export GOPATH="${S}/_dist"
-
-	default
-
-	sed -i \
-		-e "s:\./configure:./configure --prefix=/usr --libdir=${EPREFIX}/usr/lib/incus:g" \
-		-e "s:make:make ${MAKEOPTS}:g" \
-		Makefile || die
-
-	sed -i \
-		-e "s:/usr/share/OVMF:/usr/share/edk2/OvmfX64:g" \
-		-e "s:OVMF_VARS.ms.fd:OVMF_VARS.fd:g" \
-		internal/server/instance/drivers/edk2/driver_edk2.go || die "Failed to fix hardcoded ovmf paths."
-
-	# Fix hardcoded virtfs-proxy-helper file path, see bug 798924
-	sed -i \
-		-e "s:/usr/lib/qemu/virtfs-proxy-helper:/usr/libexec/virtfs-proxy-helper:g" \
-		internal/server/device/device_utils_disk.go || die "Failed to fix virtfs-proxy-helper path."
-
-	cp "${FILESDIR}"/incus-0.4.service "${T}"/incus.service || die
-	if use apparmor; then
-		sed -i \
-			'/^EnvironmentFile=.*/a ExecStartPre=\/usr\/libexec\/lxc\/lxc-apparmor-load' \
-			"${T}"/incus.service || die
-	fi
-
-	# Disable -Werror's from go modules.
-	find "${S}" -name "cgo.go" -exec sed -i "s/ -Werror / /g" {} + || die
-}
-
-src_configure() { :; }
-
-src_compile() {
-	export GOPATH="${S}/_dist"
-	export CGO_LDFLAGS_ALLOW="-Wl,-z,now"
-
-	for k in incus-benchmark incus-simplestreams incus-user incus lxc-to-incus lxd-to-incus ; do
-		ego install -v -x "${S}/cmd/${k}"
-	done
-
-	if use fuidshift ; then
-		ego install -v -x "${S}/cmd/fuidshift"
-	fi
-
-	ego install -v -x -tags libsqlite3 "${S}"/cmd/incusd
-
-	# Needs to be built statically
-	CGO_ENABLED=0 go install -v -tags netgo "${S}"/cmd/incus-migrate
-	CGO_ENABLED=0 go install -v -tags agent,netgo "${S}"/cmd/incus-agent
-
-	use nls && emake build-mo
-}
-
-src_test() {
-	emake check
-}
-
-src_install() {
-	export GOPATH="${S}/_dist"
-
-	if tc-is-cross-compiler ; then
-		local bindir="_dist/bin/linux_${GOARCH}"
-	else
-		local bindir="_dist/bin"
-	fi
-
-	newsbin "${FILESDIR}"/incus-startup-0.4.sh incus-startup
-
-	# Admin tools
-	for l in incusd incus-user lxd-to-incus ; do
-		dosbin ${bindir}/${l}
-	done
-
-	# User tools
-	for m in incus-agent incus-benchmark incus-migrate incus-simplestreams incus lxc-to-incus ; do
-		dobin ${bindir}/${m}
-	done
-
-	# fuidshift, should be moved under admin tools at some point
-	if use fuidshift ; then
-		dosbin ${bindir}/fuidshift
-	fi
-
-	newconfd "${FILESDIR}"/incus-6.0.confd incus
-	newinitd "${FILESDIR}"/incus-6.0.initd incus
-	newinitd "${FILESDIR}"/incus-user-0.4.initd incus-user
-
-	systemd_dounit "${T}"/incus.service
-	systemd_newunit "${FILESDIR}"/incus-0.4.socket incus.socket
-	systemd_newunit "${FILESDIR}"/incus-startup-0.4.service incus-startup.service
-	systemd_newunit "${FILESDIR}"/incus-user-0.4.service incus-user.service
-	systemd_newunit "${FILESDIR}"/incus-user-0.4.socket incus-user.socket
-
-	if ! tc-is-cross-compiler; then
-		# Generate and install shell completion files.
-		mkdir -p "${D}"/usr/share/{bash-completion/completions/,fish/vendor_completions.d/,zsh/site-functions/} || die
-		"${bindir}"/incus completion bash > "${D}"/usr/share/bash-completion/completions/incus || die
-		"${bindir}"/incus completion fish > "${D}"/usr/share/fish/vendor_completions.d/incus.fish || die
-		"${bindir}"/incus completion zsh > "${D}"/usr/share/zsh/site-functions/_incus || die
-	else
-		ewarn "Shell completion files not installed! Install them manually with incus completion --help"
-	fi
-
-	dodoc AUTHORS
-	dodoc -r doc/*
-	use nls && domo po/*.mo
-}
-
-pkg_postinst() {
-	elog
-	elog "Please see"
-	elog "  https://wiki.gentoo.org/wiki/Incus"
-	elog "  https://wiki.gentoo.org/wiki/Incus#Migrating_from_LXD"
-	elog
-	optfeature "virtual machine support" app-cdr/cdrtools app-emulation/qemu[spice,usbredir,virtfs]
-	optfeature "btrfs storage backend" sys-fs/btrfs-progs
-	optfeature "ipv6 support" net-dns/dnsmasq[ipv6]
-	optfeature "full incus-migrate support" net-misc/rsync
-	optfeature "lvm2 storage backend" sys-fs/lvm2
-	optfeature "zfs storage backend" sys-fs/zfs
-	elog
-	elog "Be sure to add your local user to the incus group."
-	elog
-}
diff --git a/app-containers/incus/incus-6.0.3.ebuild b/app-containers/incus/incus-6.0.3-r1.ebuild
index 0d7cb60a4984..e7e99e8bc46d 100644
--- a/app-containers/incus/incus-6.0.3.ebuild
+++ b/app-containers/incus/incus-6.0.3-r1.ebuild
@@ -48,6 +48,7 @@ BDEPEND=">=dev-lang/go-1.21
 	verify-sig? ( sec-keys/openpgp-keys-linuxcontainers )"
 
 CONFIG_CHECK="
+	~AIO
 	~CGROUPS
 	~IPC_NS
 	~NET_NS
@@ -62,6 +63,7 @@ CONFIG_CHECK="
 	~VHOST_VSOCK
 "
 
+ERROR_AIO="CONFIG_AIO is required."
 ERROR_IPC_NS="CONFIG_IPC_NS is required."
 ERROR_NET_NS="CONFIG_NET_NS is required."
 ERROR_PID_NS="CONFIG_PID_NS is required."
diff --git a/app-containers/incus/incus-6.10.1.ebuild b/app-containers/incus/incus-6.10.1-r1.ebuild
index 629d456d934e..1a9b75f90403 100644
--- a/app-containers/incus/incus-6.10.1.ebuild
+++ b/app-containers/incus/incus-6.10.1-r1.ebuild
@@ -49,6 +49,7 @@ BDEPEND=">=dev-lang/go-1.21
 	verify-sig? ( sec-keys/openpgp-keys-linuxcontainers )"
 
 CONFIG_CHECK="
+	~AIO
 	~CGROUPS
 	~IPC_NS
 	~NET_NS
@@ -63,6 +64,7 @@ CONFIG_CHECK="
 	~VHOST_VSOCK
 "
 
+ERROR_AIO="CONFIG_AIO is required."
 ERROR_IPC_NS="CONFIG_IPC_NS is required."
 ERROR_NET_NS="CONFIG_NET_NS is required."
 ERROR_PID_NS="CONFIG_PID_NS is required."
diff --git a/app-containers/incus/incus-6.8.ebuild b/app-containers/incus/incus-6.8.ebuild
deleted file mode 100644
index 607f1c8b3147..000000000000
--- a/app-containers/incus/incus-6.8.ebuild
+++ /dev/null
@@ -1,228 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit go-module linux-info optfeature systemd toolchain-funcs verify-sig
-
-DESCRIPTION="Modern, secure and powerful system container and virtual machine manager"
-HOMEPAGE="https://linuxcontainers.org/incus/introduction/ https://github.com/lxc/incus"
-SRC_URI="https://linuxcontainers.org/downloads/incus/${P}.tar.xz
-	verify-sig? ( https://linuxcontainers.org/downloads/incus/${P}.tar.xz.asc )"
-
-LICENSE="Apache-2.0 BSD LGPL-3 MIT"
-SLOT="0/stable"
-KEYWORDS="~amd64 ~arm64"
-IUSE="apparmor fuidshift nls qemu"
-
-DEPEND="acct-group/incus
-	acct-group/incus-admin
-	app-arch/xz-utils
-	>=app-containers/lxc-5.0.0:=[apparmor?,seccomp(+)]
-	dev-db/sqlite:3
-	>=dev-libs/cowsql-1.15.6
-	dev-libs/lzo
-	>=dev-libs/raft-0.22.1:=[lz4]
-	>=dev-util/xdelta-3.0[lzma(+)]
-	net-dns/dnsmasq[dhcp]
-	sys-libs/libcap
-	virtual/udev"
-RDEPEND="${DEPEND}
-	|| (
-		net-firewall/iptables
-		net-firewall/nftables
-	)
-	fuidshift? ( !app-containers/lxd )
-	net-firewall/ebtables
-	sys-apps/iproute2
-	sys-fs/fuse:*
-	>=sys-fs/lxcfs-5.0.0
-	sys-fs/squashfs-tools[lzma]
-	virtual/acl
-	qemu? (
-		app-cdr/cdrtools
-		app-emulation/qemu[spice,usbredir,virtfs]
-		sys-apps/gptfdisk
-	)"
-BDEPEND=">=dev-lang/go-1.21
-	nls? ( sys-devel/gettext )
-	verify-sig? ( sec-keys/openpgp-keys-linuxcontainers )"
-
-CONFIG_CHECK="
-	~CGROUPS
-	~IPC_NS
-	~NET_NS
-	~PID_NS
-
-	~SECCOMP
-	~USER_NS
-	~UTS_NS
-
-	~KVM
-	~MACVTAP
-	~VHOST_VSOCK
-"
-
-ERROR_IPC_NS="CONFIG_IPC_NS is required."
-ERROR_NET_NS="CONFIG_NET_NS is required."
-ERROR_PID_NS="CONFIG_PID_NS is required."
-ERROR_SECCOMP="CONFIG_SECCOMP is required."
-ERROR_UTS_NS="CONFIG_UTS_NS is required."
-
-WARNING_KVM="CONFIG_KVM and CONFIG_KVM_AMD/-INTEL is required for virtual machines."
-WARNING_MACVTAP="CONFIG_MACVTAP is required for virtual machines."
-WARNING_VHOST_VSOCK="CONFIG_VHOST_VSOCK is required for virtual machines."
-
-# Go magic.
-QA_PREBUILT="/usr/bin/incus
-	/usr/bin/incus-agent
-	/usr/bin/incus-benchmark
-	/usr/bin/incus-migrate
-	/usr/bin/lxc-to-incus
-	/usr/sbin/fuidshift
-	/usr/sbin/incusd
-	/usr/sbin/lxd-to-incus"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/linuxcontainers.asc
-
-# The testsuite must be run as root.
-# make: *** [Makefile:156: check] Error 1
-RESTRICT="test"
-
-GOPATH="${S}/_dist"
-
-src_unpack() {
-	verify-sig_src_unpack
-	go-module_src_unpack
-}
-
-src_prepare() {
-	export GOPATH="${S}/_dist"
-
-	default
-
-	sed -i \
-		-e "s:\./configure:./configure --prefix=/usr --libdir=${EPREFIX}/usr/lib/incus:g" \
-		-e "s:make:make ${MAKEOPTS}:g" \
-		Makefile || die
-
-	sed -i \
-		-e "s:/usr/share/OVMF:/usr/share/edk2/OvmfX64:g" \
-		-e "s:OVMF_VARS.ms.fd:OVMF_VARS.fd:g" \
-		internal/server/instance/drivers/edk2/driver_edk2.go || die "Failed to fix hardcoded ovmf paths."
-
-	# Fix hardcoded virtfs-proxy-helper file path, see bug 798924
-	sed -i \
-		-e "s:/usr/lib/qemu/virtfs-proxy-helper:/usr/libexec/virtfs-proxy-helper:g" \
-		internal/server/device/device_utils_disk.go || die "Failed to fix virtfs-proxy-helper path."
-
-	cp "${FILESDIR}"/incus-0.4.service "${T}"/incus.service || die
-	if use apparmor; then
-		sed -i \
-			'/^EnvironmentFile=.*/a ExecStartPre=\/usr\/libexec\/lxc\/lxc-apparmor-load' \
-			"${T}"/incus.service || die
-	fi
-
-	# Disable -Werror's from go modules.
-	find "${S}" -name "cgo.go" -exec sed -i "s/ -Werror / /g" {} + || die
-}
-
-src_configure() { :; }
-
-src_compile() {
-	export GOPATH="${S}/_dist"
-	export CGO_LDFLAGS_ALLOW="-Wl,-z,now"
-
-	for k in incus-benchmark incus-simplestreams incus-user incus lxc-to-incus lxd-to-incus ; do
-		ego install -v -x "${S}/cmd/${k}"
-	done
-
-	if use fuidshift ; then
-		ego install -v -x "${S}/cmd/fuidshift"
-	fi
-
-	ego install -v -x -tags libsqlite3 "${S}"/cmd/incusd
-
-	# Needs to be built statically
-	CGO_ENABLED=0 go install -v -tags netgo "${S}"/cmd/incus-migrate
-	CGO_ENABLED=0 go install -v -tags agent,netgo "${S}"/cmd/incus-agent
-
-	use nls && emake build-mo
-}
-
-src_test() {
-	emake check
-}
-
-src_install() {
-	export GOPATH="${S}/_dist"
-
-	if tc-is-cross-compiler ; then
-		local bindir="_dist/bin/linux_${GOARCH}"
-	else
-		local bindir="_dist/bin"
-	fi
-
-	newsbin "${FILESDIR}"/incus-startup-0.4.sh incus-startup
-
-	# Admin tools
-	for l in incusd incus-user lxd-to-incus ; do
-		dosbin ${bindir}/${l}
-	done
-
-	# User tools
-	for m in incus-agent incus-benchmark incus-migrate incus-simplestreams incus lxc-to-incus ; do
-		dobin ${bindir}/${m}
-	done
-
-	# fuidshift, should be moved under admin tools at some point
-	if use fuidshift ; then
-		dosbin ${bindir}/fuidshift
-	fi
-
-	newconfd "${FILESDIR}"/incus-6.0.confd incus
-	newinitd "${FILESDIR}"/incus-6.0.initd incus
-	newinitd "${FILESDIR}"/incus-user-0.4.initd incus-user
-
-	systemd_dounit "${T}"/incus.service
-	systemd_newunit "${FILESDIR}"/incus-0.4.socket incus.socket
-	systemd_newunit "${FILESDIR}"/incus-startup-0.4.service incus-startup.service
-	systemd_newunit "${FILESDIR}"/incus-user-0.4.service incus-user.service
-	systemd_newunit "${FILESDIR}"/incus-user-0.4.socket incus-user.socket
-
-	if ! tc-is-cross-compiler; then
-		# Generate and install shell completion files.
-		mkdir -p "${D}"/usr/share/{bash-completion/completions/,fish/vendor_completions.d/,zsh/site-functions/} || die
-		"${bindir}"/incus completion bash > "${D}"/usr/share/bash-completion/completions/incus || die
-		"${bindir}"/incus completion fish > "${D}"/usr/share/fish/vendor_completions.d/incus.fish || die
-		"${bindir}"/incus completion zsh > "${D}"/usr/share/zsh/site-functions/_incus || die
-	else
-		ewarn "Shell completion files not installed! Install them manually with incus completion --help"
-	fi
-
-	dodoc AUTHORS
-	dodoc -r doc/*
-	use nls && domo po/*.mo
-
-	# Incus needs INCUS_EDK2_PATH in env to find OVMF files for virtual machines, #946184
-	newenvd - 90incus <<- _EOF_
-		INCUS_EDK2_PATH=${EPREFIX}/usr/share/edk2-ovmf
-	_EOF_
-}
-
-pkg_postinst() {
-	elog
-	elog "Please see"
-	elog "  https://wiki.gentoo.org/wiki/Incus"
-	elog "  https://wiki.gentoo.org/wiki/Incus#Migrating_from_LXD"
-	elog
-	optfeature "OCI container images support" app-containers/skopeo app-containers/umoci
-	optfeature "btrfs storage backend" sys-fs/btrfs-progs
-	optfeature "ipv6 support" net-dns/dnsmasq[ipv6]
-	optfeature "full incus-migrate support" net-misc/rsync
-	optfeature "lvm2 storage backend" sys-fs/lvm2
-	optfeature "zfs storage backend" sys-fs/zfs
-	elog
-	elog "Be sure to add your local user to the incus group."
-	elog
-}
diff --git a/app-containers/incus/incus-6.9-r2.ebuild b/app-containers/incus/incus-6.9-r2.ebuild
deleted file mode 100644
index 8b0952f3ad95..000000000000
--- a/app-containers/incus/incus-6.9-r2.ebuild
+++ /dev/null
@@ -1,226 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit go-module linux-info optfeature systemd toolchain-funcs verify-sig
-
-DESCRIPTION="Modern, secure and powerful system container and virtual machine manager"
-HOMEPAGE="https://linuxcontainers.org/incus/introduction/ https://github.com/lxc/incus"
-SRC_URI="https://linuxcontainers.org/downloads/incus/${P}.tar.xz
-	verify-sig? ( https://linuxcontainers.org/downloads/incus/${P}.tar.xz.asc )"
-
-LICENSE="Apache-2.0 BSD LGPL-3 MIT"
-SLOT="0/stable"
-KEYWORDS="~amd64 ~arm64"
-IUSE="apparmor fuidshift nls qemu"
-
-DEPEND="acct-group/incus
-	acct-group/incus-admin
-	app-arch/xz-utils
-	>=app-containers/lxc-5.0.0:=[apparmor?,seccomp(+)]
-	dev-db/sqlite:3
-	>=dev-libs/cowsql-1.15.6
-	dev-libs/lzo
-	>=dev-libs/raft-0.22.1:=[lz4]
-	>=dev-util/xdelta-3.0[lzma(+)]
-	net-dns/dnsmasq[dhcp]
-	sys-libs/libcap
-	virtual/udev"
-RDEPEND="${DEPEND}
-	|| (
-		net-firewall/iptables
-		net-firewall/nftables
-	)
-	fuidshift? ( !app-containers/lxd )
-	net-firewall/ebtables
-	sys-apps/iproute2
-	sys-fs/fuse:*
-	>=sys-fs/lxcfs-5.0.0
-	sys-fs/squashfs-tools[lzma]
-	virtual/acl
-	qemu? (
-		app-cdr/cdrtools
-		app-emulation/qemu[spice,usbredir,virtfs]
-		sys-apps/gptfdisk
-	)"
-BDEPEND=">=dev-lang/go-1.21
-	nls? ( sys-devel/gettext )
-	verify-sig? ( sec-keys/openpgp-keys-linuxcontainers )"
-
-CONFIG_CHECK="
-	~CGROUPS
-	~IPC_NS
-	~NET_NS
-	~PID_NS
-
-	~SECCOMP
-	~USER_NS
-	~UTS_NS
-
-	~KVM
-	~MACVTAP
-	~VHOST_VSOCK
-"
-
-ERROR_IPC_NS="CONFIG_IPC_NS is required."
-ERROR_NET_NS="CONFIG_NET_NS is required."
-ERROR_PID_NS="CONFIG_PID_NS is required."
-ERROR_SECCOMP="CONFIG_SECCOMP is required."
-ERROR_UTS_NS="CONFIG_UTS_NS is required."
-
-WARNING_KVM="CONFIG_KVM and CONFIG_KVM_AMD/-INTEL is required for virtual machines."
-WARNING_MACVTAP="CONFIG_MACVTAP is required for virtual machines."
-WARNING_VHOST_VSOCK="CONFIG_VHOST_VSOCK is required for virtual machines."
-
-# Go magic.
-QA_PREBUILT="/usr/bin/incus
-	/usr/bin/incus-agent
-	/usr/bin/incus-benchmark
-	/usr/bin/incus-migrate
-	/usr/bin/lxc-to-incus
-	/usr/sbin/fuidshift
-	/usr/sbin/incusd
-	/usr/sbin/lxd-to-incus"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/linuxcontainers.asc
-
-# The testsuite must be run as root.
-# make: *** [Makefile:156: check] Error 1
-RESTRICT="test"
-
-GOPATH="${S}/_dist"
-
-PATCHES=( "${FILESDIR}"/incus-6.9-ensure-leading-slash-in-all-paths.patch 
-	"${FILESDIR}"/incus-6.9-read-files-in-chunks.patch )
-
-src_unpack() {
-	verify-sig_src_unpack
-	go-module_src_unpack
-}
-
-src_prepare() {
-	export GOPATH="${S}/_dist"
-
-	default
-
-	sed -i \
-		-e "s:\./configure:./configure --prefix=/usr --libdir=${EPREFIX}/usr/lib/incus:g" \
-		-e "s:make:make ${MAKEOPTS}:g" \
-		Makefile || die
-
-	sed -i \
-		-e "s:/usr/share/OVMF:/usr/share/edk2/OvmfX64:g" \
-		-e "s:OVMF_VARS.ms.fd:OVMF_VARS.fd:g" \
-		internal/server/instance/drivers/edk2/driver_edk2.go || die "Failed to fix hardcoded ovmf paths."
-
-	cp "${FILESDIR}"/incus-0.4.service "${T}"/incus.service || die
-	if use apparmor; then
-		sed -i \
-			'/^EnvironmentFile=.*/a ExecStartPre=\/usr\/libexec\/lxc\/lxc-apparmor-load' \
-			"${T}"/incus.service || die
-	fi
-
-	# Disable -Werror's from go modules.
-	find "${S}" -name "cgo.go" -exec sed -i "s/ -Werror / /g" {} + || die
-}
-
-src_configure() { :; }
-
-src_compile() {
-	export GOPATH="${S}/_dist"
-	export CGO_LDFLAGS_ALLOW="-Wl,-z,now"
-
-	for k in incus-benchmark incus-simplestreams incus-user incus lxc-to-incus lxd-to-incus ; do
-		ego install -v -x "${S}/cmd/${k}"
-	done
-
-	if use fuidshift ; then
-		ego install -v -x "${S}/cmd/fuidshift"
-	fi
-
-	ego install -v -x -tags libsqlite3 "${S}"/cmd/incusd
-
-	# Needs to be built statically
-	CGO_ENABLED=0 go install -v -tags netgo "${S}"/cmd/incus-migrate
-	CGO_ENABLED=0 go install -v -tags agent,netgo "${S}"/cmd/incus-agent
-
-	use nls && emake build-mo
-}
-
-src_test() {
-	emake check
-}
-
-src_install() {
-	export GOPATH="${S}/_dist"
-
-	if tc-is-cross-compiler ; then
-		local bindir="_dist/bin/linux_${GOARCH}"
-	else
-		local bindir="_dist/bin"
-	fi
-
-	newsbin "${FILESDIR}"/incus-startup-0.4.sh incus-startup
-
-	# Admin tools
-	for l in incusd incus-user lxd-to-incus ; do
-		dosbin ${bindir}/${l}
-	done
-
-	# User tools
-	for m in incus-agent incus-benchmark incus-migrate incus-simplestreams incus lxc-to-incus ; do
-		dobin ${bindir}/${m}
-	done
-
-	# fuidshift, should be moved under admin tools at some point
-	if use fuidshift ; then
-		dosbin ${bindir}/fuidshift
-	fi
-
-	newconfd "${FILESDIR}"/incus-6.0.confd incus
-	newinitd "${FILESDIR}"/incus-6.0.initd incus
-	newinitd "${FILESDIR}"/incus-user-0.4.initd incus-user
-
-	systemd_dounit "${T}"/incus.service
-	systemd_newunit "${FILESDIR}"/incus-0.4.socket incus.socket
-	systemd_newunit "${FILESDIR}"/incus-startup-0.4.service incus-startup.service
-	systemd_newunit "${FILESDIR}"/incus-user-0.4.service incus-user.service
-	systemd_newunit "${FILESDIR}"/incus-user-0.4.socket incus-user.socket
-
-	if ! tc-is-cross-compiler; then
-		# Generate and install shell completion files.
-		mkdir -p "${D}"/usr/share/{bash-completion/completions/,fish/vendor_completions.d/,zsh/site-functions/} || die
-		"${bindir}"/incus completion bash > "${D}"/usr/share/bash-completion/completions/incus || die
-		"${bindir}"/incus completion fish > "${D}"/usr/share/fish/vendor_completions.d/incus.fish || die
-		"${bindir}"/incus completion zsh > "${D}"/usr/share/zsh/site-functions/_incus || die
-	else
-		ewarn "Shell completion files not installed! Install them manually with incus completion --help"
-	fi
-
-	dodoc AUTHORS
-	dodoc -r doc/*
-	use nls && domo po/*.mo
-
-	# Incus needs INCUS_EDK2_PATH in env to find OVMF files for virtual machines, #946184
-	newenvd - 90incus <<- _EOF_
-		INCUS_EDK2_PATH=${EPREFIX}/usr/share/edk2-ovmf
-	_EOF_
-}
-
-pkg_postinst() {
-	elog
-	elog "Please see"
-	elog "  https://wiki.gentoo.org/wiki/Incus"
-	elog "  https://wiki.gentoo.org/wiki/Incus#Migrating_from_LXD"
-	elog
-	optfeature "OCI container images support" app-containers/skopeo app-containers/umoci
-	optfeature "btrfs storage backend" sys-fs/btrfs-progs
-	optfeature "ipv6 support" net-dns/dnsmasq[ipv6]
-	optfeature "full incus-migrate support" net-misc/rsync
-	optfeature "lvm2 storage backend" sys-fs/lvm2
-	optfeature "zfs storage backend" sys-fs/zfs
-	elog
-	elog "Be sure to add your local user to the incus group."
-	elog
-}