commit:     6c7e666d1bd0f594af82df0b8f5c80c7063207b2
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Sat Aug  2 10:33:08 2025 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sat Aug  2 10:33:57 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c7e666d

app-containers/incus: add 6.15

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

 app-containers/incus/Manifest          |   2 +
 app-containers/incus/incus-6.15.ebuild | 253 +++++++++++++++++++++++++++++++++
 2 files changed, 255 insertions(+)

diff --git a/app-containers/incus/Manifest b/app-containers/incus/Manifest
index 449e318ef1bb..5d8195094099 100644
--- a/app-containers/incus/Manifest
+++ b/app-containers/incus/Manifest
@@ -4,3 +4,5 @@ DIST incus-6.0.4.tar.xz 12000208 BLAKE2B 
99a4ba40d2eea48515b88f4534c282adc925fe1
 DIST incus-6.0.4.tar.xz.asc 833 BLAKE2B 
96c94cde55cd2e9f7f28db7adb098adf4895437d300dfd42aeac540cdab6677fb604831c28f40f8581e60b89b228557d81696cd64950a1c2147b445a5ec58b30
 SHA512 
1ef2063eab424467c805f8c86b5b0caca848f46d2ef7ebf602049fe32ee15a7e1006d5a2710b355604aef73802b4333cd0428c772e1c5fc4da588c2cd7ee1694
 DIST incus-6.14.tar.xz 12509468 BLAKE2B 
ec3bb614088d82e07c13169a6b26d8c83214fddbdf30049d58f2cca2678a16ccb6acca7bba68d4e15a514dad71639a144a7b2f4b9f3efdf9c8ca8d750692e250
 SHA512 
186abb32dcfbe851f04131ea7a9256fafaa465d40379e825554275697e04f005920c09939a8cb199b499b60df667921900c4a2d5b9a7ab9bd20b3e473468dbf1
 DIST incus-6.14.tar.xz.asc 833 BLAKE2B 
c9cfa631bb316234a6958f2aa3e708e32ea2fca34357700e7d1e38723be539f5b6b1484597c18baca1f22d922c7aca148463dfc0b818f7809126e6873e4826b5
 SHA512 
6a2f4ceeab44462cca74799a1c135eeb17cbece3d270c5195c3eacda8ea24419fc34cab6d157dbfed803bb269df42a02abc417b98887cec5f10b0ec70b430644
+DIST incus-6.15.tar.xz 12716184 BLAKE2B 
bc821575f7f24b42054028ce628a29f38ef41b8a31a94f34381019306681f9279ae6c36cb00b7f84d62f5ddc89d27216d753e5c0f5ec1d327bbd283ab5fe1e15
 SHA512 
7561abce8eb9c01764aca9bb5477028439c05f6c1c20637f288028be93f4bc0d74a36af76f7ad0e35028dfe40e2a0bb2d7b4a363d1da35fe657072f5d847c78e
+DIST incus-6.15.tar.xz.asc 833 BLAKE2B 
ccab84a2fd3f9d6971ff0fd7cba9afc23dbe0fc0bcb8738656f9071db7c773840566009d5014dc15d37be26bff018e3faf8af59dd5d50b629aebd2e79cf3dc5e
 SHA512 
b1bf43ffff719a3f1c6be7a8d32e44f418efb8e926914dea5479ba1175768910fa38b4e5b83c51e90ec34d2d345629597beb286215b9658a611cf568b8e43122

diff --git a/app-containers/incus/incus-6.15.ebuild 
b/app-containers/incus/incus-6.15.ebuild
new file mode 100644
index 000000000000..29786771bf1e
--- /dev/null
+++ b/app-containers/incus/incus-6.15.ebuild
@@ -0,0 +1,253 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-env 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.7
+       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[json]
+       )
+       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
+       apparmor? ( sec-policy/apparmor-profiles )
+       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="
+       ~AIO
+       ~CGROUPS
+       ~IPC_NS
+       ~NET_NS
+       ~PID_NS
+
+       ~SECCOMP
+       ~USER_NS
+       ~UTS_NS
+
+       ~KVM
+       ~MACVTAP
+       ~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."
+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."
+
+       cp "${FILESDIR}"/incus-6.14-r1.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 agent,netgo,static -buildmode default 
"${S}"/cmd/incus-migrate
+
+       # Build the VM agents, statically too
+       if use amd64 ; then
+               GOARCH=amd64 CGO_ENABLED=0 ego build -o 
"${S}"/_dist/bin/incus-agent.linux.x86_64 -v -tags agent,netgo,static 
-buildmode default "${S}"/cmd/incus-agent
+               GOARCH=386 CGO_ENABLED=0 ego build -o 
"${S}"/_dist/bin/incus-agent.linux.i686 -v -tags agent,netgo,static -buildmode 
default "${S}"/cmd/incus-agent
+               GOARCH=amd64 GOOS=windows CGO_ENABLED=0 ego build -o 
"${S}"/_dist/bin/incus-agent.windows.x86_64 -v -tags agent,netgo,static 
-buildmode default "${S}"/cmd/incus-agent
+               GOARCH=386 GOOS=windows CGO_ENABLED=0 ego build -o 
"${S}"/_dist/bin/incus-agent.windows.i686 -v -tags agent,netgo,static 
-buildmode default "${S}"/cmd/incus-agent
+       elif use arm64 ; then
+               GOARCH=arm64 CGO_ENABLED=0 ego build -o 
"${S}"/_dist/bin/incus-agent.linux.aarch64 -v -tags agent,netgo,static 
-buildmode default "${S}"/cmd/incus-agent
+               GOARCH=arm64 GOOS=windows CGO_ENABLED=0 ego build -o 
"${S}"/_dist/bin/incus-agent.windows.aarch64 -v -tags agent,netgo,static 
-buildmode default "${S}"/cmd/incus-agent
+       else
+               echo "No VM support for this arch."
+               return
+       fi
+
+       use nls && emake build-mo
+}
+
+src_test() {
+       emake check
+}
+
+src_install() {
+       export GOPATH="${S}/_dist"
+
+       export GOHOSTARCH=$(go-env_goarch "${CBUILD}")
+       if [[ "${GOARCH}" != "${GOHOSTARCH}" ]]; 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-benchmark incus-migrate incus-simplestreams incus 
lxc-to-incus ; do
+               dobin "${bindir}/${m}"
+       done
+
+       # VM Agents
+       if use amd64 ; then
+               exeinto /usr/libexec/incus/agents
+               doexe ${bindir}/incus-agent.linux.x86_64
+               doexe ${bindir}/incus-agent.linux.i686
+               doexe ${bindir}/incus-agent.windows.x86_64
+               doexe ${bindir}/incus-agent.windows.i686
+       elif use arm64 ; then
+               exeinto /usr/libexec/incus
+               doexe ${bindir}/incus-agent.linux.aarch64
+               doexe ${bindir}/incus-agent.windows.aarch64
+       fi
+
+       # 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,
+       # and INCUS_AGENT_PATH to find multi-setup agents for VMs, #959878.
+       newenvd "${FILESDIR}"/90incus.envd 90incus
+}
+
+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 "support for ACME certificate issuance" app-crypt/lego
+       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
+}

Reply via email to