gentoo auto-resync : 30:04:2024 - 00:00:01

7 files changed, 2 insertions, 463 deletions

diff --git a/app-containers/Manifest.gz b/app-containers/Manifest.gz
index 6ed375600a24..c440793f3e7a 100644
--- a/app-containers/Manifest.gz
+++ b/app-containers/Manifest.gz
diff --git a/app-containers/distrobox/Manifest b/app-containers/distrobox/Manifest
index d524e594cfcc..d244b7c4227b 100644
--- a/app-containers/distrobox/Manifest
+++ b/app-containers/distrobox/Manifest
@@ -1,6 +1,6 @@
 DIST distrobox-1.7.0.1.tar.gz 6756031 BLAKE2B 320dde2bdf005c5bd66954f212547adb6bbd6d06611272c6a1b1859eef7ad47dbbbf300baaef555e2bf9a750def117ec69418affb75514652aa0e366314fbaf2 SHA512 971a3f15216d2dfa2829a1ea085c7579c4f0bf0e57678474f83df05ae8c897db8a8cd477a429d0126cad11ac0379029b9c759944cea8649971e67f20a3e18328
 DIST distrobox-1.7.1.tar.gz 6885484 BLAKE2B c4b2710d7f1cff7baee2e340a79345359e9906e508e8b1bc351a7b8ee2d8d2e1cb13c381e40231f8c962542e37e32988d04a687810bdfd7ec917868944c51cf3 SHA512 a86a49b9f6158af3172369a201ce3852a349258c46ebb8dfb269f7b96dfbe2bf2fe9f80a5cf9b9236432d99f4f67fb3d95ab4663964fcdb0f888d48cbdd82c39
 EBUILD distrobox-1.7.0.1.ebuild 746 BLAKE2B acf4ad5520af4d0d96b7af6160b4f274caedb7b0b23c1a37c8bdfd3fb43b1c4b695f72062d4bba3e79993a081c0ccf6d33678aec43b52f2714f4b9723782f080 SHA512 dc48796ccb252eb1dc422567af37c3aec58831dd6450476af2efe1a04d7aff41333c1ac6d4762bc914ad6ba5c7f1a91be7a513b78a4fdbf13ed9c1cf3a49e8d5
-EBUILD distrobox-1.7.1.ebuild 747 BLAKE2B c0e47c0cd8b825792647ae6bc12f9771eb2527d62b1e779e652b0580103e5668f191ffa2fd9db3ccabdb078c48d68ce3054390ced200112202f9ee9c2c3c6bcd SHA512 8e7673d428025cf9515f8f93169464afeaec9d2cd9050774dcd8d09f47e933e69a6b0787b7ac9b56842a9e1490149a6ac51f5ffe6915aa345407c8ef5a948b2a
+EBUILD distrobox-1.7.1.ebuild 746 BLAKE2B acf4ad5520af4d0d96b7af6160b4f274caedb7b0b23c1a37c8bdfd3fb43b1c4b695f72062d4bba3e79993a081c0ccf6d33678aec43b52f2714f4b9723782f080 SHA512 dc48796ccb252eb1dc422567af37c3aec58831dd6450476af2efe1a04d7aff41333c1ac6d4762bc914ad6ba5c7f1a91be7a513b78a4fdbf13ed9c1cf3a49e8d5
 EBUILD distrobox-9999.ebuild 747 BLAKE2B c0e47c0cd8b825792647ae6bc12f9771eb2527d62b1e779e652b0580103e5668f191ffa2fd9db3ccabdb078c48d68ce3054390ced200112202f9ee9c2c3c6bcd SHA512 8e7673d428025cf9515f8f93169464afeaec9d2cd9050774dcd8d09f47e933e69a6b0787b7ac9b56842a9e1490149a6ac51f5ffe6915aa345407c8ef5a948b2a
 MISC metadata.xml 957 BLAKE2B a02f57f2c65a9241edbc6a1e99170712ceca000977c2271ba51c5311e7718471585ea791ed8c978a86a961d02450623c05b5f9006d4386be2130df08341b0e49 SHA512 65f455bcfd246a8de0084e1534dc85f09435f1fad2590ba87dda0bed90d8fa976d3fad2142b2006a596e713d3d91f0d3d3156017cebacf9dc7883596edb0740f
diff --git a/app-containers/distrobox/distrobox-1.7.1.ebuild b/app-containers/distrobox/distrobox-1.7.1.ebuild
index ddd8a782dfb3..a49244c1584d 100644
--- a/app-containers/distrobox/distrobox-1.7.1.ebuild
+++ b/app-containers/distrobox/distrobox-1.7.1.ebuild
@@ -15,7 +15,7 @@ else
 	SRC_URI="https://github.com/89luca89/${PN}/archive/${PV}.tar.gz
 		-> ${P}.tar.gz"
 
-	KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~riscv ~x86"
 fi
 
 LICENSE="GPL-3"  # GPL-3.0-only !
diff --git a/app-containers/incus/Manifest b/app-containers/incus/Manifest
index f0c8c3b23325..11306fcdc269 100644
--- a/app-containers/incus/Manifest
+++ b/app-containers/incus/Manifest
@@ -2,19 +2,12 @@ AUX incus-0.4.confd 702 BLAKE2B d1410842512d42b015626208336302940a169e504e0792d7
 AUX incus-0.4.initd 1782 BLAKE2B 87dfde36250676bab6438a385acf87544b6e1ab150d057d3878cbdadc310e61893ba7cdc8802bd6fba00579d8c7b720c1d1644c75e9b9a8a69464e8cd6d28e17 SHA512 3661b64904141eb3240c5ac0f06a0513f772b531d9e0a2d6b33e0ca79788df45bed2327c017355379fea96f62f2009f20159e5e9056ce878a226a830cdc6fe8e
 AUX incus-0.4.service 620 BLAKE2B 8e9bee88c79adbdbcbf90ed9602e8f041277dc059dd294a01d7792e90bc70af4a1a40becc830ef140c66cb712b83f02a0761df37d19582ab34e34afe2ccc22da SHA512 44ede44e2450169704c5d0ebd540c3b646567b909fdf4ccaf3aef6ba1d344ed277f7325306a79117ae556c2d3aee4288c37aba87a58b3da1009f5cb609cd0ea5
 AUX incus-0.4.socket 195 BLAKE2B 47fd548c3a3809dccab38303b0f103f59da4d57b9ccc7366574de6da161099a29e9065050ad9e47dc7b36b46af031c58ac45628468808d1f70ec63cc890ddb7a SHA512 f905d405f1031196e53297a6d0d83bde27a9571d9315fad39fb6940e11be4df89e91710f7f13cbeb9592e74eba5614307c95e6fa0642dbcc71e34a9a3ae5ee31
-AUX incus-0.6-fix-column-handling-with-all-projects.patch 1432 BLAKE2B a0c4b18bc263adec2d5f66927f2471611eef3c305a459a9f610ead99ebef145b83d084504f7ebe43782b64319b484161c7b16a9caa7cb3a71379506725d04a04 SHA512 cd3a232c096b2ab24cdda9fdb8f755518205247ddbba5c98f962895d66e3fc014527498e6dd71127749a9472250b4a7c7d6b7dbfe36ead40528b6402e70e5e35
 AUX incus-startup-0.4.service 297 BLAKE2B a9a13cdf5f966601fc28785072c7e05e6636d1f0583762cc220150ca94e930deb1b40a5d57cd2747ca0be67bd4548460b1ed48a8e67734d23101f86d909c3ba8 SHA512 21044267b73a8d59686d4d0a371cc5e74d4ad4c43331f1886a114e9e41cab4fd796da83469a766e360e75b0f356c3e2c4249c4b2f3ae36c3a2fccf539508bbb8
 AUX incus-startup-0.4.sh 304 BLAKE2B a30c8a848ed2a3c8ff6eb2552bc59916eb01b178edf0f2036b54e8a02e41b7a534c4d5333b102344fec4804e50bde22dc916a575bd2b44333d90f15633be4fb6 SHA512 60706d6dc3bbf09337a557c0c4335e1b5147cc2a8b2fa15becac887fc36a27724ef385c94e0516b9050400e11d2d3db4e2a382b72ffd65b11475cc57ab4c9f4f
 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-0.6.tar.xz 11749212 BLAKE2B 6cf607f13f0dd14e04b49e97e718d6f11612193a6f27515988c9d12383e3655147edd1120a2b030c9b77f3f72c0c73ae3ec960090b4d76f59930ac0256c2a5c8 SHA512 c90251be777963c437c8f5a3f6a9e448d41f58ec2f2fb7bafbdc241f32234edd50a82a4c6d4a19e822a3d090282e8ea220842a27b17d17bce8691c1549209f7f
-DIST incus-0.6.tar.xz.asc 833 BLAKE2B 47d80cbf92961d03e8a96eb313213960b02730d21d0a36c37e22bd1ea238bee72b94f2f98f49574b4ae07d847099db760a253f3bf69ff2658bcba65bc6a61315 SHA512 7504f74bf1659f06c40b9ae04853bb993988ae704f2b46c39a744bfa7b179383b5377851b6514b368826d6b3beb930188f3cf73b51c99a1b4cb90f8f03a60b5c
-DIST incus-0.7.tar.xz 11829696 BLAKE2B 9e7dd7b196e538a4eb47d158d7c3d5459eace38431dfbe91d5f28f5b9dfc174e485b44f6b8c0f87a054e11f40d29d754f05fc6835034e4131bd8d6b948d720fa SHA512 79e389be3fa094c6c82c1e06b9f2a7e5181dc91db40cdcae4b28593a3e9e53f4f5705b5d6566b48689dbdaec9a277704df0c1b396455aca5f4c5ab93e74dc4d7
-DIST incus-0.7.tar.xz.asc 833 BLAKE2B afb20ff942a4497e895d0cf40b4de260ea32d4cb40284e317188c6aef5e100836ac434038aa931a2ee733abce3569a6ef8bbc162afdcf4dfc542e5c6b55e7d6b SHA512 0ace5c060e1222220858814fb55ecd48ccb0f51d902e6ef29f32d715e185a8c3dcbd29f556453fdc19ad23b1eea7b39db06786cc73373d881d0137d3ebf3af9a
 DIST incus-6.0.0.tar.xz 11839792 BLAKE2B 135574e6f19262992bb068a3c0a0045c192699503e417eb861e00a974e631fd869485eb96238d1dbe4712e789367d31afae1c62bade2a8b75f7e9a7620547e74 SHA512 eb6d784a535d487bd85b3e8272d7cddc23f2ed98ca2b3e2f19c038b4a6f910d4030822424154489adef7a688757905927309d25f6d1ff621d99d678fe6aeae2b
 DIST incus-6.0.0.tar.xz.asc 833 BLAKE2B f35c38f886290ff08e017cd54e8019c43bfbf1f9c84b26ede2cfa78acbe4047af4314465e77d6e900f296552d5ac8f8c07d26a11920bff937fbb8a0a910efb0d SHA512 0360520752fad3e95807d09e4fd6d60c96a202d0dbb61621925abd75aa801b6d573abbece3179a8906bdc47e96ddec4a746607ce2d10dcc1a76d0afd459cbf81
-EBUILD incus-0.6-r1.ebuild 5646 BLAKE2B d02935bfac358387ffff2ed30581dd93e4aad56a8f06b8726fab913450bbdf4cbe29115c1285ea36b6aff558278ddf538ba46ae959e5bd22f10a3ed9174c88d5 SHA512 7e3927505996a7ceb6d04740c5460d43355dd928bb4482e175041a4a6116ce9a473a39c59a5c61d02177155c749c70469a579ca9f356a6e91729ff72f762349f
-EBUILD incus-0.7.ebuild 5908 BLAKE2B e5c0f73452fb6f79771384bc5aff13fad1ae5bc5596b61f569d272e36d94af6d6944475072a50289bed803de0dabe100955f3690a861fb66b7ede6a05fcef341 SHA512 e2deecf9ba3120174e05ec32c889723757baac170dc155738fb91fe66bd6c5008d5117e2da16a2dd724d7d13d71d1bacc73d7a8ce6babe0fc04079ff2bda1185
 EBUILD incus-6.0.0-r1.ebuild 6230 BLAKE2B 84fe8adf62a9e2790de3dcef052bd5bd77e251b7040f516d041732ae12ffa389b3b50133c5b884af7cbe212a4b7ca930a32a072780b5a4fba6dfbed0e61d0e88 SHA512 3f07dae0bfee0faa020d9b308c6ad8dab9be18c8cde84603cc19d9e25251269a4623e203040ad21ac676eca970a8e2680e9e0225a12d667484378b51813597be
 MISC metadata.xml 1597 BLAKE2B 6e8ceafa8dca7d49fa754470c9645e11946d3419135ec3a12581e227945b64a13612a7eb3e833027bbf6d3c795acbaced979ba80f00a9e36f6831fb6111dd2d2 SHA512 d3c0ec128f715627addc5be758c87bea808626f9d9ada75aeac9be9a84039b68385ae65edfb5d57951ff4e7352565fbba040035da82ce8eaffcca585811d3577
diff --git a/app-containers/incus/files/incus-0.6-fix-column-handling-with-all-projects.patch b/app-containers/incus/files/incus-0.6-fix-column-handling-with-all-projects.patch
deleted file mode 100644
index 75e85331f776..000000000000
--- a/app-containers/incus/files/incus-0.6-fix-column-handling-with-all-projects.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From bbc4b946355775606da35557e5404ca83a586c67 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber@stgraber.org>
-Date: Thu, 22 Feb 2024 22:41:15 -0500
-Subject: [PATCH] incus/image: Fix column handling with --all-projects
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Stéphane Graber <stgraber@stgraber.org>
----
- cmd/incus/image.go | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/cmd/incus/image.go b/cmd/incus/image.go
-index 5ee2b74709..d5a1126855 100644
---- a/cmd/incus/image.go
-+++ b/cmd/incus/image.go
-@@ -1134,11 +1134,6 @@ func (c *cmdImageList) parseColumns() ([]imageColumn, error) {
- 	columnList := strings.Split(c.flagColumns, ",")
- 
- 	columns := []imageColumn{}
--	// Add project column if --all-projects flag specified and
--	// no --c was passed
--	if c.flagAllProjects && c.flagColumns == defaultImagesColumns {
--		c.flagColumns = defaultImagesColumnsAllProjects
--	}
- 
- 	for _, columnEntry := range columnList {
- 		if columnEntry == "" {
-@@ -1321,6 +1316,11 @@ func (c *cmdImageList) Run(cmd *cobra.Command, args []string) error {
- 		return err
- 	}
- 
-+	// Add project column if --all-projects flag specified and no -c was passed.
-+	if c.flagAllProjects && c.flagColumns == defaultImagesColumns {
-+		c.flagColumns = defaultImagesColumnsAllProjects
-+	}
-+
- 	// Parse remote
- 	remote := ""
- 	if len(args) > 0 {
diff --git a/app-containers/incus/incus-0.6-r1.ebuild b/app-containers/incus/incus-0.6-r1.ebuild
deleted file mode 100644
index ccbc40adf773..000000000000
--- a/app-containers/incus/incus-0.6-r1.ebuild
+++ /dev/null
@@ -1,208 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit bash-completion-r1 go-module linux-info optfeature systemd 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"
-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
-	dev-libs/lzo
-	>=dev-libs/raft-0.22.0:=[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"
-
-PATCHES=( "${FILESDIR}"/incus-0.6-fix-column-handling-with-all-projects.patch )
-
-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-ovmf: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-user incus lxc-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
-
-	cd "${S}"/cmd/lxd-to-incus || die
-	ego build -v -x ./
-	cd "${S}" || die
-
-	use nls && emake build-mo
-}
-
-src_test() {
-	emake check
-}
-
-src_install() {
-	export GOPATH="${S}/_dist"
-	local bindir="_dist/bin"
-
-	newsbin "${FILESDIR}"/incus-startup-0.4.sh incus-startup
-
-	# Admin tools
-	for l in incusd incus-user ; do
-		dosbin ${bindir}/${l}
-	done
-	dosbin cmd/lxd-to-incus/lxd-to-incus
-
-	# User tools
-	for m in incus-agent incus-benchmark incus-migrate 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
-
-	dobashcomp scripts/bash/incus
-
-	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-0.7.ebuild b/app-containers/incus/incus-0.7.ebuild
deleted file mode 100644
index be2cf6ac0037..000000000000
--- a/app-containers/incus/incus-0.7.ebuild
+++ /dev/null
@@ -1,205 +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 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"
-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
-	dev-libs/lzo
-	>=dev-libs/raft-0.22.0:=[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_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-ovmf: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"
-	local bindir="_dist/bin"
-
-	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
-
-	# 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
-
-	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
-}