5 files changed, 200 insertions, 7 deletions
diff --git a/app-containers/Manifest.gz b/app-containers/Manifest.gz
index f4928bac9a49..448910d880b6 100644
--- a/app-containers/Manifest.gz
+++ b/app-containers/Manifest.gz
diff --git a/app-containers/incus/Manifest b/app-containers/incus/Manifest
index 7799e95dbf4f..80a4b839b8e7 100644
--- a/app-containers/incus/Manifest
+++ b/app-containers/incus/Manifest
@@ -6,5 +6,8 @@ AUX incus-0.2-lxd-to-incus-openrc-support.patch 2037 BLAKE2B 63c58a3ea9d5cd35e40
 AUX incus-containers-0.1.service 338 BLAKE2B af0849575d2d7578634228576fcf449f8ab54b6fa3a974baec4f91009dec4a6e76253f3724c532f38fc7484ccc6caffae4badf1591c1b04abb3414f4959d550c SHA512 9a9b072442a63683cb9ed71d706606da682e821f609f1f4daea0562ddcea1cc2d6157b29fd466e0aeab149f31b54ab0fff4cf41831e6b2378c47619b8dfd0b55
 DIST incus-0.2.tar.xz 13248036 BLAKE2B 1b83fc3498d5c31984053e000b9d63846aa6a9087158720eb5a25a8c3bd8cd0ab97391334622612b62d9c8aef145f45668f31abfa25e993b959d1609b0af1694 SHA512 0f2656e41faf9e020392f39a012a6ab64a6683894b2e463fac6bf6a2c2bb55280d454e5b4c23ab23526517a0b2b3c66c7b9a6d5f9477ca0848347a8534ea5eec
 DIST incus-0.2.tar.xz.asc 833 BLAKE2B 834f9adaea11a85e0a03c75edaadfd226b3be57c49015c2ba7b4fe021b9e8b2e403b5f11e6a482dd1f024456ef4e0bf3145ce15c9f5b0a26954410a2fdac6f9f SHA512 ab55dbbc450b24429e77d816eddee541ebc8453a71704d1ec003a7b0d12a192faab438f6cfe82e90889d845dfaf9a5e9ea2b8d596198e19adbffb106a326000c
+DIST incus-0.3.tar.xz 13344380 BLAKE2B 8160843df4ff419ef8890fcdd6b6b7e2c3cdec509ae072ec195c2b2c44e61ab3dc20a0488e9023d891b7ee2f2c700cfb8206ebe29236c29705a7121e5436d64f SHA512 d3f3141f72a8ecf007faca8c2f2d1465d766d12f763e714d296fd28acd7e3095dd49834d428f42bf142e301cf1af7ee00ef74005d128c49aa147fb4d9348dbde
+DIST incus-0.3.tar.xz.asc 833 BLAKE2B 532ee90f3ed1d4798a19dcc9df8fe6587ab5ab93d18accae7aae8e44cb8c8086c77702a572a371a966eee4ebed84a2d7941f52001152a1894e1d74aa235a06e0 SHA512 afd2aab52a19b618d194eab71974f84d1d3eb9639b2672d8e94153ac23b05764667374504b5f1355238341c4194de282d3bc7635335375fd347ba513eb66e685
 EBUILD incus-0.2-r1.ebuild 5261 BLAKE2B ac7a6ff3fa5720591e2c3bd61f313859744a14a8c2ffc63ec6a6615749d0fcb1840c464f3e51d735bdf9e478965c6eea9d553b2630bafcfd1b1bc1f78ea99d2f SHA512 e184eb93097ba84795e8d8d02b0048c5bc8558476e8fd37b408e80a1c0e8e6fa412bf3ad2e067315e3419a26ed010f1f1b697c0ef86e4b9081d90a25bb451e4d
+EBUILD incus-0.3.ebuild 5190 BLAKE2B e4e9ff9904f50eea1fe9a98774c022ed52de663b15405359a0fbacc670027e95b7f18b8665a820bc614b709b475eb6296fe0ce80817cb3ee9120fefac44b6dc5 SHA512 dae31f75947b52467c01e4b0f00f0b2884486c9c68591789fe77dbeffb832d86f57ffae3a6e7c9dd69b962357fa9d89dcfaa6f1115c821a66363862362e29fba
 MISC metadata.xml 1471 BLAKE2B d3447fd360c4d3de95ffafefd39f9e65dd257cd39cbdb14fc2e2c513239fafe48b0fef44653fe8fdaaf54151afe59cf48f3f0909097d0c0c4a82cbd87aac4d44 SHA512 393edc7c7f202fac4f08abd2544d1fb41cfc83cea66ccf239eb4441c1f13ea85dd519de84094b1ba022b1a17658612591ee4354a77484da4d8095af917a87c25
diff --git a/app-containers/incus/incus-0.3.ebuild b/app-containers/incus/incus-0.3.ebuild
new file mode 100644
index 000000000000..0c8b25a5b202
--- /dev/null
+++ b/app-containers/incus/incus-0.3.ebuild
@@ -0,0 +1,189 @@
+# Copyright 1999-2023 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"
+IUSE="apparmor 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.17.1:=[lz4]
+	>=dev-util/xdelta-3.0[lzma(+)]
+	net-dns/dnsmasq[dhcp]
+	sys-libs/libcap
+	virtual/udev"
+RDEPEND="${DEPEND}
+	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-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/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.1.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"
+
+	# fuidshift should be packaged for incus-lts, making it conflict with lxd.
+	for k in incus-benchmark incus-user incus lxc-to-incus ; do
+		ego install -v -x "${S}/cmd/${k}"
+	done
+
+	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"
+
+	dosbin ${bindir}/incusd
+	dosbin cmd/lxd-to-incus/lxd-to-incus
+
+	for l in incus-agent incus-benchmark incus-migrate incus-user incus lxc-to-incus ; do
+		dobin ${bindir}/${l}
+	done
+
+	dobashcomp scripts/bash/incus
+
+	newconfd "${FILESDIR}"/incus-0.1.confd incus
+	newinitd "${FILESDIR}"/incus-0.1.initd incus
+
+	systemd_dounit "${T}"/incus.service
+	systemd_newunit "${FILESDIR}"/incus-containers-0.1.service incus-containers.service
+	systemd_newunit "${FILESDIR}"/incus-0.1.socket incus.socket
+
+	dodoc AUTHORS
+	dodoc -r doc/*
+	use nls && domo po/*.mo
+}
+
+pkg_postinst() {
+	elog
+	elog "Please see"
+	elog "  https://linuxcontainers.org/incus/introduction/"
+	elog "  https://linuxcontainers.org/incus/docs/main/tutorial/first_steps/"
+	elog "  https://linuxcontainers.org/incus/docs/main/howto/server_migrate_lxd/"
+	elog "before a Gentoo Wiki page is made."
+	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 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/skopeo/Manifest b/app-containers/skopeo/Manifest
index 044cf04272c6..0ba82e8ca777 100644
--- a/app-containers/skopeo/Manifest
+++ b/app-containers/skopeo/Manifest
@@ -5,7 +5,7 @@ DIST skopeo-1.14.0.tar.gz 10548883 BLAKE2B 6ecf54d236405ce59bedf77acc124fa8b3bb1
 DIST skopeo-1.5.1.tar.gz 5636533 BLAKE2B 7f0e86cdee5c3250ec1280d7e71554ac2f8ad96ababe0e81dfabc00e8c128a13fc0c9c561b7a9be389d7386e9f664b95118bd2122612b9c2e8844db49769c03c SHA512 3f8c730eaa739bf2a29b82d3b04aa4eee1c09f957b61964fc8c48e59d1537bcb87b5bdf9c18fa48f9d36cf2b7ede3a1448918a20b5a3167f6ce09881a6cd3dde
 EBUILD skopeo-1.10.0-r1.ebuild 1066 BLAKE2B f55aa099a396fca1f8513786c48929923d7419a08d232ba910d65d325c5f31c2a4fbb43487d3585c36098375687897f07fbd9e7274edeb4e1b7bf5301dba040d SHA512 0109637023cf52163bbdc2a30fbd086f514a5bd77948888ce30a7824cf4472c46f98f6011e9a0302a054578e5bb812d2b495dac041a060bdb26abbbd034c27bc
 EBUILD skopeo-1.11.1.ebuild 1066 BLAKE2B d304dfa99199b32528a24710a716ab757f9670e4b474fd48c5284005a0a01cc457af1d3882572f27aa81eadb058ec495c7dcebf775dec238ae4b44f0d748d0d0 SHA512 14ad618519d078c4f539afdc3595bd80a1fd102e21abd231f71a530de5019557d915a6809ce1cecb7dc1ee6be57ee9a5b12add0fee1fc8d7325fc2f1f567896b
-EBUILD skopeo-1.14.0-r1.ebuild 2074 BLAKE2B e5622deab234e5555773f35887ddb7dacd0bd77cc5f2575e9d65f3dd2faefd58e9ae91c8b43b6f1fa80e24135fff0099a0b93634ad3a88b399272d1fa5426610 SHA512 c12a399c3ffd129ba266def0421b0cff2c755f86b18b04f5bc5b830c56f3d1dd98ddc46dd0129362afe8548647944b260ea8d3194525f95f0909279f871cb412
+EBUILD skopeo-1.14.0-r1.ebuild 2097 BLAKE2B 4f25431121f91ecf094f74820c9a948252ecaaa611b824e8b2dcdc6452a3c4de67c0f9dee07585f15cd6c57bb98aae661618f4cbf017b13160161cceb4143030 SHA512 428330a458080957266cc56f9214e25b08f964c20e33534b771a1f83e9812aca5d2d5703991a089258ab035192939669efb9103c88d8aebc7278dc8ac257c328
 EBUILD skopeo-1.5.1.ebuild 1403 BLAKE2B a4c236cb6248a1551c90683a45247d19d5634ca7e9ca801761953131f73a7bd0058ab5bcea1d7b2593229eb20c6482e2dae833443227467daccef020b23b5f88 SHA512 b163486639a8831eb20db3a5906378485f0aaf3299e815217b1c8a2f4e27ca35af0bda40e6265a7c58107588cab429c0044717666cd22c43e8e21c73a75277dd
 EBUILD skopeo-9999.ebuild 2074 BLAKE2B e5622deab234e5555773f35887ddb7dacd0bd77cc5f2575e9d65f3dd2faefd58e9ae91c8b43b6f1fa80e24135fff0099a0b93634ad3a88b399272d1fa5426610 SHA512 c12a399c3ffd129ba266def0421b0cff2c755f86b18b04f5bc5b830c56f3d1dd98ddc46dd0129362afe8548647944b260ea8d3194525f95f0909279f871cb412
 MISC metadata.xml 932 BLAKE2B 07a3c417bf16785676ad46085fd30feef0bb9970157a34a48b5f633878633788de20da8d9d24b14b356ff19bd7012ceeb9ace0aee84dcece374dd609a14d9ce3 SHA512 33a8355d730bf0f6f53f77ef2a1d0cb5a3a3e9f4b9bb76603e2da9fa087e9065b6bf950170cdb3b194105a24e34ab98e006880b3ac9d737152a4d309ec4d0fe7
diff --git a/app-containers/skopeo/skopeo-1.14.0-r1.ebuild b/app-containers/skopeo/skopeo-1.14.0-r1.ebuild
index 9fc4a1466912..b7a859d817d5 100644
--- a/app-containers/skopeo/skopeo-1.14.0-r1.ebuild
+++ b/app-containers/skopeo/skopeo-1.14.0-r1.ebuild
@@ -16,14 +16,11 @@ else
 fi
 
 # main
-LICENSE="Apache-2.0"
-# deps
-LICENSE+=" BSD BSD-2 CC-BY-SA-4.0 ISC MIT"
+LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT"
 SLOT="0"
 IUSE="btrfs device-mapper rootless"
 
-RDEPEND="
-	app-containers/containers-common
+COMMON_DEPEND="
 	>=app-crypt/gpgme-1.5.5:=
 	>=dev-libs/libassuan-2.4.3:=
 	btrfs? ( >=sys-fs/btrfs-progs-4.0.1 )
@@ -33,7 +30,11 @@ RDEPEND="
 
 # TODO: Is this really needed? cause upstream doesnt mention it https://github.com/containers/skopeo/blob/main/install.md#building-from-source
 # 	dev-libs/libgpg-error:=
-DEPEND="${RDEPEND}"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="
+	${COMMON_DEPEND}
+	app-containers/containers-common
+"
 BDEPEND="dev-go/go-md2man"
 
 RESTRICT="test"