8 files changed, 2 insertions, 619 deletions
diff --git a/app-containers/Manifest.gz b/app-containers/Manifest.gz
index 581ff5097039..4e93f7ce47c5 100644
--- a/app-containers/Manifest.gz
+++ b/app-containers/Manifest.gz
diff --git a/app-containers/incus/Manifest b/app-containers/incus/Manifest
index af1060b45646..b4bdf2f6b5fd 100644
--- a/app-containers/incus/Manifest
+++ b/app-containers/incus/Manifest
@@ -9,16 +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.1.tar.xz 11653056 BLAKE2B d026f9fb99d7393d286006cfe759681b58b980b7a2432a98ba8a6862e17099ef6ee8d1ec1766d00fac1a6d1e748a7d10d3d5ad14b31c542618044f77a27fe255 SHA512 8218c121cf1afd307f748c0f1c0b1ba34a05fa0c43a515aab03d9f92c66becaa6bff245e93842e7b0746ce6019d66f1a5e4c317ec05e0ab088b539e5378d78dc
-DIST incus-6.0.1.tar.xz.asc 833 BLAKE2B c5c9d3d4796e97ef745102c13e52d691e7f087a5a0cc8e0a069ec7c94686e6e8de04d3dd247157e16eb3deea2b877453e3462ec829ced2ba9cb1928af9a3aa1b SHA512 c47df95afa7c9ef7041fb29497567ab3b1ed30c3c175b4be84bc75a6a2c47072cc291e43fa738a5a58d753b04aef87334780f9d45184a9543a49fad263859aa0
 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.5.tar.xz 11233032 BLAKE2B 667bf93a55dc58f8426765d3b536fee0e3b3f521fa64ba51948874a04dbf4549d856170f50723aaad18690169e41913507bdac4cf426c65cf89df06ae883b1e8 SHA512 e5e9d0b7458052214813201c771c24e878c0682d749bb150fd477f5319a4dc1b641c963646ee5c16981d5698e941b62a4c5cc7a5f29e9f45eebf6a443dc029ec
-DIST incus-6.5.tar.xz.asc 833 BLAKE2B f2c468c86f5d4524bc0590bbd6b2c3e6bb69e2173cc63eb3f0b1d75a5ecd0ceb3e906c77a31011f82ced4407a00562e066494ff2ae4e82144e9eb0e28d88d4e7 SHA512 f31aceb2972dac43f7dfca5968224961b2666eccacb1a31cc9de1baf5415e85f32f41e23f4b6eb4411e66f59260b7a847457827b641e02e7221ec6b12331d911
 DIST incus-6.6.tar.xz 11835124 BLAKE2B a21ada1f3a0eb571a896c86538873ec061293a3f7430a71a0edbc2a3f547b2ffb12095296c983b25c3285f81a13ce4c4d63c857615ddbbd8ac6a65b4a83f3976 SHA512 7d4d31702655ef5a7851a4058c04b89ade635e9196700bdd2845657c38dd5ba253f6da2a30f6dc60e4657ea1d04b08aeb7ea22842732507a558c9225eddfe007
 DIST incus-6.6.tar.xz.asc 833 BLAKE2B f59487815f87bfec1bb70342eb3463346bd0a25c8d980cc857095d8490ca45dc7785b0ea1bd7489064b08633de4cc710aa90823fdd22bb9dfd7ddfd9076b1d4c SHA512 69021d4a7827abfef370aeeaac0671e81902918d3b767468aaea54093214461e8cc23fbc8e4f83f957f5d4120d4969f0966c6312d250f2e7ce3373c603edf37a
-EBUILD incus-6.0.1-r1.ebuild 6236 BLAKE2B ee00f04271796cd356f778e1e9271d323d0cfe36083cc9cf371643e726dcf25a1edc7d3e308d4b19acf7e57dbed3e17477c9062ac94da4d1403b74239202b727 SHA512 0461e8619211647efedcfb8d273412ad0fa56e9f1ee873923c024c403cd766faee5722042fafa355adaa8a89823ab30362461773b030dd1f4521a95fc9e2ee2c
 EBUILD incus-6.0.2.ebuild 6083 BLAKE2B c9caaeb98078d7dad8bb277196fbe651eb956020bb933fdbd7d84a1f7caef1c2450d7bb31cfb9ea7717d768bf8cd4dde45c68f81508783e15150b56efc492c79 SHA512 0c6cb9391eaff33920b0e18daf1dc3299db0be2f451a547aa146fdbe85d0b3bafea31cf09f8fb744ec305de41d9ac7c3978ff1bc33aeafd0b8c5794817be3d8f
-EBUILD incus-6.5-r1.ebuild 6087 BLAKE2B c1a26044a629e62b7106510834e29ba4d7f40103cafd74075df0badb7f3598502151a7a7d7800bad4290a884d60a3bd9d8f1b4ec8ce6fcd11818261d9a1ce8fe SHA512 3260a2eff07674371629e86ec769e52a607565e9c1e9c250a1fda2c9cffe9ec569ea80af5fe6a803c5e4fba40a62203f050e7652e56c8f97ea0e15940540a04a
 EBUILD incus-6.6.ebuild 6087 BLAKE2B c1a26044a629e62b7106510834e29ba4d7f40103cafd74075df0badb7f3598502151a7a7d7800bad4290a884d60a3bd9d8f1b4ec8ce6fcd11818261d9a1ce8fe SHA512 3260a2eff07674371629e86ec769e52a607565e9c1e9c250a1fda2c9cffe9ec569ea80af5fe6a803c5e4fba40a62203f050e7652e56c8f97ea0e15940540a04a
 MISC metadata.xml 1593 BLAKE2B 7142f75669fbc2f3d3d599896dd5839dff6b2afb6a47f54eb67b026db073afac4736639e6b17b4ab312b1987282c3b4fc3c8edba00d1d3b90e227f9fafef2c62 SHA512 6653c90a46eee2ca256e05645796f1d0094f11eee4ad7da7cc2c5e141575099b0676c7a31a49a2addb53e523b46434c99e61f1781cf3a801c8d63c9931d7659d
diff --git a/app-containers/incus/incus-6.0.1-r1.ebuild b/app-containers/incus/incus-6.0.1-r1.ebuild
deleted file mode 100644
index ff4ba32ceb36..000000000000
--- a/app-containers/incus/incus-6.0.1-r1.ebuild
+++ /dev/null
@@ -1,219 +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/lxc-to-incus
-	/usr/bin/incus-agent
-	/usr/bin/incus-benchmark
-	/usr/bin/incus-migrate
-	/usr/sbin/fuidshift
-	/usr/sbin/lxd-to-incus
-	/usr/sbin/incusd"
-
-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
-
-	# Fix hardcoded ovmf file path, see bug 763180
-	sed -i \
-		-e "s:/usr/share/OVMF:/usr/share/edk2/OvmfX64:g" \
-		-e "s:OVMF_VARS.ms.fd:OVMF_VARS.fd:g" \
-		doc/environment.md \
-		internal/server/apparmor/instance.go \
-		internal/server/apparmor/instance_qemu.go \
-		internal/server/instance/drivers/driver_qemu.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-0.4.confd incus
-	newinitd "${FILESDIR}"/incus-0.4.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.5-r1.ebuild b/app-containers/incus/incus-6.5-r1.ebuild
deleted file mode 100644
index 65a3654dfb92..000000000000
--- a/app-containers/incus/incus-6.5-r1.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/stable"
-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/lxc/Manifest b/app-containers/lxc/Manifest
index ad641cfae0f2..515a9dce620d 100644
--- a/app-containers/lxc/Manifest
+++ b/app-containers/lxc/Manifest
@@ -5,11 +5,8 @@ AUX lxc.service-5.0.0 527 BLAKE2B 44d1fca919615c1acb672baa7b77bd43680975782683ad
 AUX lxc_at.service.5.0.0 395 BLAKE2B b4a329964041a9b3017df80aedb73f296d60e0b78097c72e52b921de939246a45d07591535d3971458cee38bf4ddf84021af3f325bffac6db9ba7c4c78a48a5b SHA512 d896c2eb889b83a77041fcd51604bea11db65b8b494c9c063a72ed182006577ed49e2e2c0842353de4676b3fc1246508e5b7c669d797929818cccf485282d85c
 DIST lxc-5.0.3.tar.gz 975269 BLAKE2B 533d97fe4d986acbf5d562bb2c295a63df2a9a8bfc27aeff5056e4235f667102500debc586c5698482ec048c1b222a0fdc234db6fd6648c4b649f87a85de18f8 SHA512 0553be317431ab7ec0c450c0f85724a53de1f251c39c9716168e17cda6a8daec70b8221228c4be64027df28a327e0f1fd508e6bb48348ab540bbfeaf2b9ac974
 DIST lxc-5.0.3.tar.gz.asc 833 BLAKE2B c35278ed17cad76d2ea94b3985e0110731efea751fb5f1c2d1c9db71486e4844285f372a94c8611dcfe91fdb16459694843b9e0a8273cfc68a56f549c7162cfb SHA512 a5ce5769d49abdf35d94de8273fd3e9c2a8ba4fafea71cf33ee6bce1d83531c8b550d972f7080409a4cc5a92e9d04ece50ed108f92c6aec4868d150e58d7d11a
-DIST lxc-6.0.1.tar.gz 964526 BLAKE2B 6fb6442e0a9a356433351f412c9a1e4f18155146e49f40ebe6e132ea770a8737793df0c7ca13ca70ce631a2308ff525fca2fd2d127b98edbd00e0af7efce6879 SHA512 7e8b9740178ae46a2ad3ba3f1e509f69f978d0a2a1f7e1938213ae9cb9a80f496d01be64958cad4aa6f01a73f1d8c3759c3e9df9df4f67c77e603ea0809d79c2
-DIST lxc-6.0.1.tar.gz.asc 833 BLAKE2B 8469ff5603c48205c6451630ec8f03617c648e3d13f73ebd7d908017422b75613e5489b42ad0f598fcf5cf9e241fccaeb4b0ec3ac186a670ed56a252e282b16e SHA512 e0ebd29c3e793e1159e350854e2ac7adacd918b76dfa2de1e0227fd45034ac9308d02b7da1c0c80eae471ebba44a0804a7a0bf17cbf1c18de45bc63974e017e0
 DIST lxc-6.0.2.tar.gz 964007 BLAKE2B 55c0155a66194d4d10fff5ffc7edc6d6afab730245a401671f8d1bd6f54bd8558bd0644c0f42bd49b5b470bc343809091f1893c27b5830674870f6b91f23d6e0 SHA512 52841b5f48eeb4b2b63e0437e3abc38cec6a801778eb2fab264c78d7ee3be957bd45aa839c9fcd281396464fa0af84bb2fc8bf4bfadc9509fae3b4dc52b44da5
 DIST lxc-6.0.2.tar.gz.asc 833 BLAKE2B b4b6b56e65239c2125864e16e947a88c2d4d97a1b2dfa6920ca5c2f89b3df7d44d9ec8eb9a56753d6009143a53f6bb5bbd13f3b5b7f26e537aa6f1f1d0d0cc85 SHA512 741caccb3dc0ef1043c04122c75a3e3f6d8e6024a65bf905b186da0aabef971a1224e60f9adee069d1a2c24f43c408be1ccc32e5d4faba85860e9a19d9e4c0d9
 EBUILD lxc-5.0.3.ebuild 5052 BLAKE2B 99a20e705617194a9e38ec6dabbc52fd43dbd5615a6b00379921f4ba200c2110f666878c00195917109f37cfed961258978b79bc3db0814986c36429537e660c SHA512 050ebb35250bd258a602ee84f9f1b1c35531caa0c3f9954bb8380927a8c262ffd66776cc0af643aaf69a7e0c51dccfe82bb2e3993e264ba2a0c91de8bd94faf5
-EBUILD lxc-6.0.1.ebuild 5248 BLAKE2B 12e021cdf30e30bd69032de7899909a5d6c4e45c8f9faec64c6ce4c5a978187e2922f58abde9b1d97e6f7b302be74f66e6c38863610cc88a498b41bdb18a8d0b SHA512 72e12a366d1cb5febdcb4cfde11097739668fea8fa3bdf0799f65f11613338af8d0d2e27758e46cac45aa887f4d91bedfbb8e2f2179562cc3e434ff6c83d705e
 EBUILD lxc-6.0.2.ebuild 5601 BLAKE2B 8885d5a0fe2400dbecf8ccbe8766f3d5795fd675094387d0319ad1e8bfcb3f0b052b2a20e42c3fb11cd4961b0500580356349001755904c52adc7c1298f932d1 SHA512 68e97e42d5ca082c867f089c36264d545bbe69dde4df07136bdcd3c4458b9c986fc2b2c879485ea2348f745d19585953a1ac2032fa99a69c8ab542aaada1ffa1
 MISC metadata.xml 721 BLAKE2B 8aaa67af4ae36f07ac2d893f0d67d86de08d9da065b5ca7118a7a795a2b2ecb55b37a87b95b456ebc8806bbdc9f36e92901b6888cb75f494a7151393b33b6d44 SHA512 3b90cb1c80e2ee9ef3d30273c91ab625ec79ad240edc40dea011078ab44759b03c3ac28484cfc639b4108557a7c5e00e798b4e335da9ba94a5a836f51ee7701a
diff --git a/app-containers/lxc/lxc-6.0.1.ebuild b/app-containers/lxc/lxc-6.0.1.ebuild
deleted file mode 100644
index 415d5d6ed638..000000000000
--- a/app-containers/lxc/lxc-6.0.1.ebuild
+++ /dev/null
@@ -1,174 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit bash-completion-r1 linux-info meson optfeature systemd toolchain-funcs verify-sig
-
-DESCRIPTION="A userspace interface for the Linux kernel containment features"
-HOMEPAGE="https://linuxcontainers.org/ https://github.com/lxc/lxc"
-SRC_URI="https://linuxcontainers.org/downloads/lxc/${P}.tar.gz
-	verify-sig? ( https://linuxcontainers.org/downloads/lxc/${P}.tar.gz.asc )"
-
-LICENSE="GPL-2 LGPL-2.1 LGPL-3"
-SLOT="0/1.8" # SONAME liblxc.so.1 + ${PV//./} _if_ breaking ABI change while bumping.
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
-IUSE="apparmor +caps examples io-uring lto man pam seccomp selinux ssl systemd test +tools"
-
-RDEPEND="acct-group/lxc
-	acct-user/lxc
-	apparmor? ( sys-libs/libapparmor )
-	caps? ( sys-libs/libcap )
-	io-uring? ( >=sys-libs/liburing-2:= )
-	pam? ( sys-libs/pam )
-	seccomp? ( sys-libs/libseccomp )
-	selinux? ( sys-libs/libselinux )
-	ssl? ( dev-libs/openssl:0= )
-	systemd? (
-		sys-apps/dbus
-		sys-apps/systemd:=
-	)
-	tools? ( sys-libs/libcap )"
-DEPEND="${RDEPEND}
-	caps? ( sys-libs/libcap[static-libs] )
-	tools? ( sys-libs/libcap[static-libs] )
-	sys-kernel/linux-headers"
-BDEPEND="virtual/pkgconfig
-	man? ( app-text/docbook2X )
-	verify-sig? ( sec-keys/openpgp-keys-linuxcontainers )"
-
-RESTRICT="!test? ( test )"
-
-CONFIG_CHECK="~!NETPRIO_CGROUP
-	~CGROUPS
-	~CGROUP_CPUACCT
-	~CGROUP_DEVICE
-	~CGROUP_FREEZER
-
-	~CGROUP_SCHED
-	~CPUSETS
-	~IPC_NS
-	~MACVLAN
-
-	~MEMCG
-	~NAMESPACES
-	~NET_NS
-	~PID_NS
-
-	~POSIX_MQUEUE
-	~USER_NS
-	~UTS_NS
-	~VETH"
-
-ERROR_CGROUP_FREEZER="CONFIG_CGROUP_FREEZER: needed to freeze containers"
-ERROR_MACVLAN="CONFIG_MACVLAN: needed for internal (inter-container) networking"
-ERROR_MEMCG="CONFIG_MEMCG: needed for memory resource control in containers"
-ERROR_NET_NS="CONFIG_NET_NS: needed for unshared network"
-ERROR_POSIX_MQUEUE="CONFIG_POSIX_MQUEUE: needed for lxc-execute command"
-ERROR_UTS_NS="CONFIG_UTS_NS: needed to unshare hostnames and uname info"
-ERROR_VETH="CONFIG_VETH: needed for internal (host-to-container) networking"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/linuxcontainers.asc
-
-DOCS=( AUTHORS CONTRIBUTING MAINTAINERS README.md doc/FAQ.txt )
-
-pkg_setup() {
-	linux-info_pkg_setup
-}
-
-src_configure() {
-
-	# -Dtools-multicall=false: will create a single binary called 'lxc' that conflicts with LXD.
-	local emesonargs=(
-		--localstatedir "${EPREFIX}/var"
-
-		-Dcoverity-build=false
-		-Dinstall-state-dirs=false
-		-Doss-fuzz=false
-		-Dspecfile=false
-		-Dtools-multicall=false
-
-		-Dcommands=true
-		-Dinstall-init-files=true
-		-Dmemfd-rexec=true
-		-Dthread-safety=true
-
-		$(meson_use apparmor)
-		$(meson_use caps capabilities)
-		$(meson_use examples)
-		$(meson_use io-uring io-uring-event-loop)
-		$(meson_use lto b_lto)
-		$(meson_use man)
-		$(meson_use pam pam-cgroup)
-		$(meson_use seccomp)
-		$(meson_use selinux)
-		$(meson_use ssl openssl)
-		$(meson_use test tests)
-		$(meson_use tools)
-
-		$(usex systemd -Ddbus=true -Ddbus=false)
-		$(usex systemd -Dinit-script="systemd" -Dinit-script="sysvinit")
-
-		-Ddata-path=/var/lib/lxc
-		-Ddoc-path=/usr/share/doc/${PF}
-		-Dlog-path=/var/log/lxc
-		-Drootfs-mount-path=/var/lib/lxc/rootfs
-		-Druntime-path=/run
-	)
-
-	use tools && local emesonargs+=( -Dcapabilities=true )
-
-	if $(tc-ld-is-gold) || $(tc-ld-is-lld); then
-		local emesonargs+=( -Db_lto_mode=thin )
-	else
-		local emesonargs+=( -Db_lto_mode=default )
-	fi
-
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	# The main bash-completion file will collide with lxd, need to relocate and update symlinks.
-	mkdir -p "${ED}"/$(get_bashcompdir) || die "Failed to create bashcompdir."
-
-	if use tools; then
-		bashcomp_alias lxc-start lxc-{attach,autostart,cgroup,checkpoint,config,console,copy,create,destroy,device,execute,freeze,info,ls,monitor,snapshot,stop,top,unfreeze,unshare,usernsexec,wait}
-	else
-		bashcomp_alias lxc-start lxc-usernsexec
-	fi
-
-	find "${ED}" -name '*.la' -delete -o -name '*.a' -delete || die
-
-	# Replace upstream sysvinit/systemd files.
-	if use systemd; then
-	rm -r "${D}$(systemd_get_systemunitdir)" || die "Failed to remove systemd lib dir"
-	else
-		rm "${ED}"/etc/init.d/lxc-{containers,net} || die "Failed to remove sysvinit scripts"
-	fi
-
-	newinitd "${FILESDIR}/${PN}.initd.9" ${PN}
-	systemd_newunit "${FILESDIR}"/lxc-monitord.service.5.0.0 lxc-monitord.service
-	systemd_newunit "${FILESDIR}"/lxc-net.service.5.0.0 lxc-net.service
-	systemd_newunit "${FILESDIR}"/lxc.service-5.0.0 lxc.service
-	systemd_newunit "${FILESDIR}"/lxc_at.service.5.0.0 "lxc@.service"
-
-	if ! use apparmor; then
-		sed -i '/lxc-apparmor-load/d' "${D}$(systemd_get_systemunitdir)/lxc.service" ||
-			die "Failed to remove apparmor references from lxc.service systemd unit."
-	fi
-}
-
-pkg_postinst() {
-	elog "Please refer to "
-	elog "https://wiki.gentoo.org/wiki/LXC for introduction and usage guide."
-	elog
-	elog "Run 'lxc-checkconfig' to see optional kernel features."
-	elog
-
-	optfeature "creating your own LXC containers" app-containers/distrobuilder
-	optfeature "automatic template scripts" app-containers/lxc-templates
-	optfeature "Debian-based distribution container image support" dev-util/debootstrap
-	optfeature "snapshot & restore functionality" sys-process/criu
-}
diff --git a/app-containers/skopeo/Manifest b/app-containers/skopeo/Manifest
index 2835939a91af..a35551b521cf 100644
--- a/app-containers/skopeo/Manifest
+++ b/app-containers/skopeo/Manifest
@@ -5,6 +5,6 @@ DIST skopeo-1.15.1.tar.gz 10709125 BLAKE2B aa688197fe0d803b6cb1f4e7c5c998a917e7d
 EBUILD skopeo-1.14.0-r3.ebuild 1845 BLAKE2B 75d7c2b86ef231206ed2898089f0c64de58fa923d01c54a5b671c77d133240d10743713a355415c27a551eb2e7794f7f9e3d9f0746d05b992e7f637fc3c84e68 SHA512 fb1d518f9ca77dfa35073b3cc57c6fe866c6dab8dd6feb27eb012af7dab5160464255e043ef7a519e80a1b0900fcabf81587f18fae57d28553875c4c55d95982
 EBUILD skopeo-1.14.2.ebuild 1847 BLAKE2B 8024b877083ba54ef0ab21d835bc5524794e3e31babe163f3ac9130c832f36d9bd00d5a3fa5f646858748132b6018aa84a59c00d646f0eae0c3ac08bd2b3ad37 SHA512 a18d9aa5b6fd1a7ee213b15eab711a86abac4dbffe4443d9c4c0c4fdbb55a90ee1aa9e45a5252a5e149fbdbc53626c2962a6d4ebc451cd2e866f221622040784
 EBUILD skopeo-1.15.0.ebuild 1847 BLAKE2B 8024b877083ba54ef0ab21d835bc5524794e3e31babe163f3ac9130c832f36d9bd00d5a3fa5f646858748132b6018aa84a59c00d646f0eae0c3ac08bd2b3ad37 SHA512 a18d9aa5b6fd1a7ee213b15eab711a86abac4dbffe4443d9c4c0c4fdbb55a90ee1aa9e45a5252a5e149fbdbc53626c2962a6d4ebc451cd2e866f221622040784
-EBUILD skopeo-1.15.1.ebuild 1846 BLAKE2B 9dcf159850e9e3bdc50d5a704276bbd4602a90ade2755a2cf379b11187fb0db4a9f6fa89f05054fa4abd48eb2371a5d125d84ccc65f0961124d4596ea087c122 SHA512 0b6f9a2c843b7514384267fd859aeef21cd8ddebc9aaf4f089e8828317e84c84a6229fd8c859d2e6fe990ea7bc9172dea1970b2a8cf3aa1a07a3e42c30e309f7
+EBUILD skopeo-1.15.1.ebuild 1845 BLAKE2B 75d7c2b86ef231206ed2898089f0c64de58fa923d01c54a5b671c77d133240d10743713a355415c27a551eb2e7794f7f9e3d9f0746d05b992e7f637fc3c84e68 SHA512 fb1d518f9ca77dfa35073b3cc57c6fe866c6dab8dd6feb27eb012af7dab5160464255e043ef7a519e80a1b0900fcabf81587f18fae57d28553875c4c55d95982
 EBUILD skopeo-9999.ebuild 1847 BLAKE2B 8024b877083ba54ef0ab21d835bc5524794e3e31babe163f3ac9130c832f36d9bd00d5a3fa5f646858748132b6018aa84a59c00d646f0eae0c3ac08bd2b3ad37 SHA512 a18d9aa5b6fd1a7ee213b15eab711a86abac4dbffe4443d9c4c0c4fdbb55a90ee1aa9e45a5252a5e149fbdbc53626c2962a6d4ebc451cd2e866f221622040784
 MISC metadata.xml 930 BLAKE2B 0b4b93d0c3358bb809fd90da9c73c5cd50e780ffd62f040621147af47e5958061cae9ce1eeaa6809e9cdbd7554141de080b3c29e4751b4381b6be3f220b231d6 SHA512 152a06ec28cb661c0aeef1e1c264724016811f1716710e8c611c68c1816fa2f6e67a2e2ca0e6c333c4e33a267e7a6eed796c66575d0c3a3ea078611d77e685f0
diff --git a/app-containers/skopeo/skopeo-1.15.1.ebuild b/app-containers/skopeo/skopeo-1.15.1.ebuild
index 4f81ac53e2a7..462b948cd231 100644
--- a/app-containers/skopeo/skopeo-1.15.1.ebuild
+++ b/app-containers/skopeo/skopeo-1.15.1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://github.com/containers/skopeo.git"
 else
 	SRC_URI="https://github.com/containers/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm64"
+	KEYWORDS="amd64 arm64"
 fi
 
 # main