5 files changed, 8 insertions, 226 deletions
diff --git a/app-containers/lxd/Manifest b/app-containers/lxd/Manifest
index a2fbf96293aa..60459cb22051 100644
--- a/app-containers/lxd/Manifest
+++ b/app-containers/lxd/Manifest
@@ -22,8 +22,7 @@ DIST lxd-5.20.tar.gz 22825821 BLAKE2B 616e6659c75e87027883dc6643c8c42cce75f69e77
 DIST lxd-5.20.tar.gz.asc 833 BLAKE2B 03d469429fee81e6b061de458eeffe7aacf19ccc1dacb73e2e9cf3530439c82fcd016496aa7757d3ff54af2da7372c5ecf0642b3adddff950065b1ceb1e64103 SHA512 e48af466194523903a472a246dfa81cd67ec4ad7b1be6edb1ce9135945be8a810fca3f98de5a4d8b93390119cb0e4eda78a323d5dea0330b0c92e755781982a3
 EBUILD lxd-4.0.9-r4.ebuild 4910 BLAKE2B e49519f08b5214bf26ac9859f4fc514361aae85f6e6ac9bc80463e23b54547ce724682eba8dcbf34bb9a024d615f58fc717b20612c2a97db4c974b339df7cad1 SHA512 85b77939031b81a5bfa544d04b2274ed45abb6337faa0db9bde6a6ac4624230b5c69eb469ae1035e7e79a2219e0d4538d07122cf5c803a90c6ae5df26f1bce5b
 EBUILD lxd-5.0.2-r3.ebuild 5899 BLAKE2B b4e6beb45164e5bed163cba3bf1cd12d5431ce32d1bf009a4d4b698da08d95f933e18d19b774ea480e5ca0ad3164b1ec1c316ca7a4fc88109aea033382cf326f SHA512 e264f5fc588460fa670bba08cb22e8dbba1cd42aa0dc72414a4893e299d8ec50f7733880b8605374755e0ff26b3b45a03e3d46ae1b6fd3cd815f32f0408b35f1
-EBUILD lxd-5.0.3-r1.ebuild 5995 BLAKE2B e5836d918fd654dfce318f3cc2cda5773fdab36d550631051e696988ae9ab56aa01ed2bb0a6e6d1d5d90034fc060431c9a03c25e501bc295bd9d7eb71ffac340 SHA512 ab65a0ff7cd9bdab4ac725bd5c3e60e56f744c4f4d122232a961994f00a85b72d99ec95af1ac47f5b5cb49a1cccf78eea52c46b50d5a47300dbd8ce49d66792c
-EBUILD lxd-5.0.3.ebuild 5864 BLAKE2B 352df199d004976bae3bf86f5d34b998fcebac6a0c6d19d6dca188d0b66f4faf96024120d7b8b5f98b802da66ed715b0af42839d4fd0e1f0361a512d5bcc308b SHA512 35571d216ee72df722bcaa997dc0549ad3a3adf88b3e9728395593e9b0c9c5b94fe6a648e80926303b23fc9fcaf66f6c4491b08c4f69ac0c1617d655e6f3c629
-EBUILD lxd-5.19.ebuild 5005 BLAKE2B a371a53672b07efa199bae9495f04053898a9c970e371492f5043c5e992b786411fa9a3d8a8a0484abb3e8332edf01f25334b282cc92ebe57b9756fe55caea39 SHA512 87ffbcc2800fad290c9d95ed654b56e2ac8341863c01555c34d524a49877d47f32abd12bda30cbbca6eabd9bc5129c0219319c0e1afd6b35f41b65b455931c0e
-EBUILD lxd-5.20.ebuild 5020 BLAKE2B 734801638d1567d7200e7e3f3c890d37c820eaf51521f10b5e03d422cbf724e7491e25e31860f8b1cd4d431ce95de7dbd71a417c8176d19bc0653d07172e5d58 SHA512 bd6635b11cbdb71ec8efe29a22d4273937c51887f4abcfdb9eb181f12f2aea35c1b1584c3d9feaf118176da9f7caf64e9cf6de62f12de78243c5c2205c8cab83
+EBUILD lxd-5.0.3-r2.ebuild 5969 BLAKE2B b257d7cba0b129420588d1c489a07d919b7b8a12b5e02783837e978b64065c420f05a526943ed1bb1e8718597b431ae6b95de297f9ec1680004b0e03b36fd9e6 SHA512 075484b66c1a9e766cca15f04e28d3d7a4252c4e950b683a32c9112ac0d59a4d33e4f7736b059776779608ed9e8c97db008695a5d4dd1c534829f96ee86c5e51
+EBUILD lxd-5.19-r1.ebuild 4979 BLAKE2B 100fcb50fa3513c937397b2ebc1e05f2b58ba1d5e75cee8d1807db2c7918acfe3c4348ee15f696ef22656fea73180b714cae4a524699d52be26a5dedb4c11353 SHA512 c5c56226096f81f95e3039f893dcd1bdbc273f311a335df67f400598946eadf50702218c22abda15b65446da1b605bc259fe7836e8a88070ebc28f1303426aef
+EBUILD lxd-5.20-r1.ebuild 4994 BLAKE2B 50ce6a835a7b55a3f4d90010ef684172eaae434b1b4bd0c104eeab9f5edc399da8ade283bb7b0452ad3473730b0ce2747ddf48ba49af423e311f8ee3ae0d5f22 SHA512 e8e4fe768f7b1bcf2528f34cabc2307b09a9c107d3dbdda6fc5577816dda12b223184f878055363cb6ab224a882cd4a813502f6db0fa0b00845fa9401c031f18
 MISC metadata.xml 1607 BLAKE2B efd749f3764c659858a53c597b47ed2d6d6bb33e8c15700f01eedb9b78ea925ce8aa27578249b190be1da52b3855b895445bf866ddb8d5bb13db5daf2d0027a8 SHA512 e9d1ca983014ec8ac8ce8b1635d2b2cda308c615650c1350a09bd40870b2bde0c771fb7577d1e949bd73cf9c340a44b63a638b15ef66d93d947105edb1f4c46d
diff --git a/app-containers/lxd/lxd-5.0.3-r1.ebuild b/app-containers/lxd/lxd-5.0.3-r2.ebuild
index 0cb951baf4e3..7e0beb10eb7b 100644
--- a/app-containers/lxd/lxd-5.0.3-r1.ebuild
+++ b/app-containers/lxd/lxd-5.0.3-r2.ebuild
@@ -20,9 +20,8 @@ DEPEND="acct-group/lxd
 	app-arch/xz-utils
 	>=app-containers/lxc-5.0.0:=[apparmor?,seccomp(+)]
 	dev-db/sqlite:3
-	>=dev-libs/dqlite-1.13.0:=
+	>=dev-libs/dqlite-1.16.4:=[lz4]
 	dev-libs/lzo
-	>=dev-libs/raft-0.17.1:=[lz4]
 	>=dev-util/xdelta-3.0[lzma(+)]
 	net-dns/dnsmasq[dhcp]
 	sys-libs/libcap
diff --git a/app-containers/lxd/lxd-5.0.3.ebuild b/app-containers/lxd/lxd-5.0.3.ebuild
deleted file mode 100644
index ff98d497f293..000000000000
--- a/app-containers/lxd/lxd-5.0.3.ebuild
+++ /dev/null
@@ -1,214 +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://ubuntu.com/lxd https://github.com/canonical/lxd"
-SRC_URI="https://github.com/canonical/lxd/releases/download/${P}/${P}.tar.gz
-	verify-sig? ( https://github.com/canonical/lxd/releases/download/${P}/${P}.tar.gz.asc
-)"
-
-LICENSE="Apache-2.0 BSD LGPL-3 MIT"
-SLOT="0/lts"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="apparmor nls"
-
-DEPEND="acct-group/lxd
-	app-arch/xz-utils
-	>=app-containers/lxc-5.0.0:=[apparmor?,seccomp(+)]
-	dev-db/sqlite:3
-	>=dev-libs/dqlite-1.13.0:=
-	dev-libs/lzo
-	>=dev-libs/raft-0.17.1:=[lz4]
-	>=dev-util/xdelta-3.0[lzma(+)]
-	net-dns/dnsmasq[dhcp]
-	sys-libs/libcap
-	virtual/udev"
-RDEPEND="${DEPEND}
-	|| (
-			net-firewall/nftables[json]
-			(
-				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
-	nls? ( sys-devel/gettext )
-	verify-sig? ( sec-keys/openpgp-keys-canonical )"
-
-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/fuidshift
-	/usr/bin/lxc
-	/usr/bin/lxc-to-lxd
-	/usr/bin/lxd-agent
-	/usr/bin/lxd-benchmark
-	/usr/bin/lxd-migrate
-	/usr/sbin/lxd"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/canonical.asc
-
-# The testsuite must be run as root.
-# make: *** [Makefile:156: check] Error 1
-RESTRICT="test"
-
-GOPATH="${S}/_dist"
-
-PATCHES=(
-	"${FILESDIR}"/lxd-5.0.3-remove-shellcheck-buildsystem-checks.patch
-)
-
-src_prepare() {
-	export GOPATH="${S}/_dist"
-
-	default
-
-	sed -i \
-		-e "s:\./configure:./configure --prefix=/usr --libdir=${EPREFIX}/usr/lib/lxd: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 \
-		lxd/apparmor/instance.go \
-		lxd/apparmor/instance_qemu.go \
-		lxd/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" \
-		lxd/device/device_utils_disk.go || die "Failed to fix virtfs-proxy-helper path."
-
-	cp "${FILESDIR}"/lxd-4.0.9-r1.service "${T}"/lxd.service || die
-	if use apparmor; then
-		sed -i \
-			'/^EnvironmentFile=.*/a ExecStartPre=\/usr\/libexec\/lxc\/lxc-apparmor-load' \
-			"${T}"/lxd.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 fuidshift lxd-benchmark lxc lxc-to-lxd; do
-		go install -v -x "${S}/${k}" || die "failed compiling ${k}"
-	done
-
-	go install -v -x -tags libsqlite3 "${S}"/lxd || die "Failed to build the daemon"
-
-	# Needs to be built statically
-	CGO_ENABLED=0 go install -v -tags netgo "${S}"/lxd-migrate
-	CGO_ENABLED=0 go install -v -tags agent,netgo "${S}"/lxd-agent
-
-	use nls && emake build-mo
-}
-
-src_test() {
-	emake check
-}
-
-src_install() {
-	export GOPATH="${S}/_dist"
-	local bindir="_dist/bin"
-
-	dosbin ${bindir}/lxd
-
-	for l in fuidshift lxd-agent lxd-benchmark lxd-migrate lxc lxc-to-lxd; do
-		dobin ${bindir}/${l}
-	done
-
-	newbashcomp scripts/bash/lxd-client lxc
-
-	newconfd "${FILESDIR}"/lxd-4.0.0.confd lxd
-	newinitd "${FILESDIR}"/lxd-5.0.2-r1.initd lxd
-
-	systemd_dounit "${T}"/lxd.service
-	systemd_newunit "${FILESDIR}"/lxd-containers-4.0.0.service lxd-containers.service
-	systemd_newunit "${FILESDIR}"/lxd-4.0.0.socket lxd.socket
-
-	dodoc AUTHORS
-	dodoc -r doc/*
-	use nls && domo po/*.mo
-}
-
-pkg_postinst() {
-	elog
-	elog "Consult https://wiki.gentoo.org/wiki/LXD for more information,"
-	elog "including a Quick Start."
-	elog "For virtual machine support, see:"
-	elog "https://wiki.gentoo.org/wiki/LXD#Virtual_machines"
-	elog
-	elog "Please run 'lxc-checkconfig' to see all optional kernel features."
-	elog
-	optfeature "virtual machine support" app-emulation/qemu[spice,usbredir,virtfs]
-	optfeature "btrfs storage backend" sys-fs/btrfs-progs
-	optfeature "ipv6 support" net-dns/dnsmasq[ipv6]
-	optfeature "full lxd-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 lxd group."
-
-	if [[ ${REPLACING_VERSIONS} ]] &&
-	ver_test ${REPLACING_VERSIONS} -lt 5.0.1 &&
-	has_version app-emulation/qemu[spice,usbredir,virtfs]; then
-		ewarn ""
-		ewarn "You're updating from <5.0.1. Due to incompatible API updates in the lxd-agent"
-		ewarn "product, you'll have to restart any running virtual machines before they work"
-		ewarn "properly."
-		ewarn ""
-		ewarn "Run: 'lxc restart your-vm' after the update for your vm's managed by lxd."
-		ewarn ""
-	fi
-
-	if [[ ${REPLACING_VERSIONS} ]] &&
-	has_version "sys-apps/openrc"; then
-		elog ""
-		elog "The new init.d script will attempt to mount "
-		elog "  /sys/fs/cgroup/systemd"
-		elog "by default, which is needed to run systemd containers with openrc host."
-		elog "See the /etc/init.d/lxd file for requirements."
-		elog ""
-	fi
-}
diff --git a/app-containers/lxd/lxd-5.19.ebuild b/app-containers/lxd/lxd-5.19-r1.ebuild
index 2693dbf72267..43ca84883aa1 100644
--- a/app-containers/lxd/lxd-5.19.ebuild
+++ b/app-containers/lxd/lxd-5.19-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -20,9 +20,8 @@ DEPEND="acct-group/lxd
 	app-arch/xz-utils
 	>=app-containers/lxc-5.0.0:=[apparmor?,seccomp(+)]
 	dev-db/sqlite:3
-	>=dev-libs/dqlite-1.13.0:=
+	>=dev-libs/dqlite-1.16.4:=[lz4]
 	dev-libs/lzo
-	>=dev-libs/raft-0.17.1:=[lz4]
 	>=dev-util/xdelta-3.0[lzma(+)]
 	net-dns/dnsmasq[dhcp]
 	sys-libs/libcap
diff --git a/app-containers/lxd/lxd-5.20.ebuild b/app-containers/lxd/lxd-5.20-r1.ebuild
index 13dccccabf6c..d7165784ee4d 100644
--- a/app-containers/lxd/lxd-5.20.ebuild
+++ b/app-containers/lxd/lxd-5.20-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -20,9 +20,8 @@ DEPEND="acct-group/lxd
 	app-arch/xz-utils
 	>=app-containers/lxc-5.0.0:=[apparmor?,seccomp(+)]
 	dev-db/sqlite:3
-	>=dev-libs/dqlite-1.13.0:=
+	>=dev-libs/dqlite-1.16.4:=[lz4]
 	dev-libs/lzo
-	>=dev-libs/raft-0.17.1:=[lz4]
 	>=dev-util/xdelta-3.0[lzma(+)]
 	net-dns/dnsmasq[dhcp]
 	sys-libs/libcap