[gentoo-commits] repo/gentoo:master commit in: app-containers/incus/

["Joonas Niilola" <juippis@gentoo.org>]

commit:     3e2a74f524f861a20710687ba255eafa044f33d0
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 14 19:25:55 2023 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sat Oct 14 19:25:55 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e2a74f5

app-containers/incus: don't install fuidshift binary

 - fuidshift is a nice extra tool but not critical to incus (or lxd).
   This makes installing incus and lxd parallel possible. Fuidshift
   can still be gotten from lxd. This change is also the initial step
   required to get lxd-to-incus tool working, arriving most likely on
   next incus version (upstream issue #166).

Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 app-containers/incus/{incus-0.1-r1.ebuild => incus-0.1-r2.ebuild} | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/app-containers/incus/incus-0.1-r1.ebuild b/app-containers/incus/incus-0.1-r2.ebuild
similarity index 94%
rename from app-containers/incus/incus-0.1-r1.ebuild
rename to app-containers/incus/incus-0.1-r2.ebuild
index 12e18f4b1a1d..b7d760e2001d 100644
--- a/app-containers/incus/incus-0.1-r1.ebuild
+++ b/app-containers/incus/incus-0.1-r2.ebuild
@@ -15,7 +15,6 @@ SLOT="0"
 KEYWORDS="~amd64"
 IUSE="apparmor nls"
 
-# incus conflicts with lxd due to fuidshift binary. Even if you replace the package, containers will remain.
 DEPEND="acct-group/incus
 	acct-group/incus-admin
 	app-arch/xz-utils
@@ -29,7 +28,6 @@ DEPEND="acct-group/incus
 	sys-libs/libcap
 	virtual/udev"
 RDEPEND="${DEPEND}
-	!app-containers/lxd
 	net-firewall/ebtables
 	net-firewall/iptables
 	sys-apps/iproute2
@@ -125,7 +123,7 @@ src_compile() {
 	export CGO_LDFLAGS_ALLOW="-Wl,-z,now"
 
 	# lxd-to-incus: this go module is packaged separately (0.1).
-	for k in fuidshift incus-benchmark incus-user incus lxc-to-incus ; do
+	for k in incus-benchmark incus-user incus lxc-to-incus ; do
 		go install -v -x "${S}/cmd/${k}" || die "failed compiling ${k}"
 	done
 
@@ -148,7 +146,7 @@ src_install() {
 
 	dosbin ${bindir}/incusd
 
-	for l in fuidshift incus-agent incus-benchmark incus-migrate incus-user incus lxc-to-incus ; do
+	for l in incus-agent incus-benchmark incus-migrate incus-user incus lxc-to-incus ; do
 		dobin ${bindir}/${l}
 	done