gentoo auto-resync : 28:10:2024 - 03:04:40

4 files changed, 2 insertions, 88 deletions

diff --git a/app-containers/incus/Manifest b/app-containers/incus/Manifest
index b4bdf2f6b5fd..6b113dcc5c45 100644
--- a/app-containers/incus/Manifest
+++ b/app-containers/incus/Manifest
@@ -1,5 +1,3 @@
-AUX incus-0.4.confd 702 BLAKE2B d1410842512d42b015626208336302940a169e504e0792d73a96b3756e1b7b4280c137b04b4199b0c2e47503944ee4bcdd2c37ceeab7d4ec9de222dff5692cc6 SHA512 7b494bb07ee1e281abedc22c2c7d374ebf35c14bcab25cae634ae146e5f4368fcc9381c700009420d46db2760472ae3a794741ae36353ce1957d412816f30c3d
-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-6.0.confd 864 BLAKE2B 0bbce1f2ae17649598ab213514cdbfaa9d1bd7092078c2297ac82e643b79942a076cd28473e2e1406b9da1b0ecde700dcf0cf7b0612cd78d8e01a86eb54b6ac3 SHA512 cbc7d3c7732a0bb4175d48df24dba3d24e6e2b51e06f93d37f8b6c4368bd4d93ee966694407f9fa6350293cbaafbf907983ae26a508be454333bef417e53b6d7
@@ -14,5 +12,5 @@ DIST incus-6.0.2.tar.xz.asc 833 BLAKE2B bcdeb0d2a3684dcdcb620166865523a2e9eb595f
 DIST incus-6.6.tar.xz 11835124 BLAKE2B a21ada1f3a0eb571a896c86538873ec061293a3f7430a71a0edbc2a3f547b2ffb12095296c983b25c3285f81a13ce4c4d63c857615ddbbd8ac6a65b4a83f3976 SHA512 7d4d31702655ef5a7851a4058c04b89ade635e9196700bdd2845657c38dd5ba253f6da2a30f6dc60e4657ea1d04b08aeb7ea22842732507a558c9225eddfe007
 DIST incus-6.6.tar.xz.asc 833 BLAKE2B f59487815f87bfec1bb70342eb3463346bd0a25c8d980cc857095d8490ca45dc7785b0ea1bd7489064b08633de4cc710aa90823fdd22bb9dfd7ddfd9076b1d4c SHA512 69021d4a7827abfef370aeeaac0671e81902918d3b767468aaea54093214461e8cc23fbc8e4f83f957f5d4120d4969f0966c6312d250f2e7ce3373c603edf37a
 EBUILD incus-6.0.2.ebuild 6083 BLAKE2B c9caaeb98078d7dad8bb277196fbe651eb956020bb933fdbd7d84a1f7caef1c2450d7bb31cfb9ea7717d768bf8cd4dde45c68f81508783e15150b56efc492c79 SHA512 0c6cb9391eaff33920b0e18daf1dc3299db0be2f451a547aa146fdbe85d0b3bafea31cf09f8fb744ec305de41d9ac7c3978ff1bc33aeafd0b8c5794817be3d8f
-EBUILD incus-6.6.ebuild 6087 BLAKE2B c1a26044a629e62b7106510834e29ba4d7f40103cafd74075df0badb7f3598502151a7a7d7800bad4290a884d60a3bd9d8f1b4ec8ce6fcd11818261d9a1ce8fe SHA512 3260a2eff07674371629e86ec769e52a607565e9c1e9c250a1fda2c9cffe9ec569ea80af5fe6a803c5e4fba40a62203f050e7652e56c8f97ea0e15940540a04a
+EBUILD incus-6.6.ebuild 6173 BLAKE2B 1ac2d20ccfafee4697587c57ea676835fbfe84d70e4154c33ef8316fd1066f328a44c7b41bc84ec971271ade061b4f09f616c7fc746b22664f45b703fe2f25a3 SHA512 2037e19a3a43be689f666b3d794be77627cfa6da9aff0fb03f5340628ffd8fae375ec9c130f2cfb3f3ffb5c89d6968eeaebcd0e36a881654633809dd18c96c72
 MISC metadata.xml 1593 BLAKE2B 7142f75669fbc2f3d3d599896dd5839dff6b2afb6a47f54eb67b026db073afac4736639e6b17b4ab312b1987282c3b4fc3c8edba00d1d3b90e227f9fafef2c62 SHA512 6653c90a46eee2ca256e05645796f1d0094f11eee4ad7da7cc2c5e141575099b0676c7a31a49a2addb53e523b46434c99e61f1781cf3a801c8d63c9931d7659d
diff --git a/app-containers/incus/files/incus-0.4.confd b/app-containers/incus/files/incus-0.4.confd
deleted file mode 100644
index b0f7e0e212ae..000000000000
--- a/app-containers/incus/files/incus-0.4.confd
+++ /dev/null
@@ -1,26 +0,0 @@
-# Group which owns the shared socket
-INCUS_OPTIONS+=" --group incus-admin"
-
-# Enable cpu profiling into the specified file
-#INCUS_OPTIONS+=" --cpuprofile /tmp/lxc_cpu_profile"
-
-# Enable memory profiling into the specified file
-#INCUS_OPTIONS+=" --memprofile /tmp/lxc_mem_profile"
-
-# Enable debug mode
-#INCUS_OPTIONS+=" --debug"
-
-# For debugging, print a complete stack trace every n seconds
-#INCUS_OPTIONS+=" --print-goroutines-every 5"
-
-# Enable verbose mode
-#INCUS_OPTIONS+=" -v"
-
-# Logfile to log to
-#INCUS_OPTIONS+=" --logfile /var/log/incus/incus.log"
-
-# Enable syslog logging
-#INCUS_OPTIONS+=" --syslog"
-
-# Increase ulimits to allow more open files on OpenRC.
-rc_ulimit="-n 1048576 -l unlimited"
diff --git a/app-containers/incus/files/incus-0.4.initd b/app-containers/incus/files/incus-0.4.initd
deleted file mode 100644
index 34e1f07a8921..000000000000
--- a/app-containers/incus/files/incus-0.4.initd
+++ /dev/null
@@ -1,59 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-DAEMON=/usr/sbin/incusd
-PIDFILE=/run/incus.pid
-
-depend() {
-	need net
-	need lxcfs
-}
-
-start() {
-	ebegin "Starting incus daemon service"
-
-	modprobe -f loop > /dev/null 2>&1
-
-	# Fix permissions on /var/lib/incus and make sure it exists.
-	# Create a log directory for incus with correct permissions.
-	install -d /var/lib/incus --group incus-admin --owner root --mode 0775
-	install -d /var/log/incus --group incus-admin --owner root
-
-	start-stop-daemon --start \
-		--pidfile ${PIDFILE} \
-		--exec ${DAEMON} \
-		--background \
-		--make-pidfile \
-		-- \
-		${INCUS_OPTIONS}
-	eend ${?}
-
-	# Create necessary systemd paths in order for systemd containers to work on openrc host.
-	# /etc/rc.conf should have following values:
-	#   rc_cgroup_mode="hybrid"
-	if [ -d /sys/fs/cgroup/unified ] &&
-	[ ! -d /sys/fs/cgroup/systemd ]; then
-		install -d /sys/fs/cgroup/systemd --group incus-admin --owner root
-		mount -t cgroup -o none,name=systemd systemd /sys/fs/cgroup/systemd
-	fi
-}
-
-stop() {
-	if [ "${RC_CMD}" = restart ]; then
-		ebegin "Stopping incus daemon service (but not containers)"
-		# start-stop-daemon sends SIGTERM with a timeout of 5s by default.
-		# SIGTERM indicates to INCUS that it will be stopped temporarily.
-		# Instances will keep running.
-		start-stop-daemon --stop --quiet -p "${PIDFILE}"
-		eend ${?}
-	else
-		ebegin "Stopping incus daemon service and containers, waiting 40s"
-		# SIGPWR indicates to INCUS that the host is going down.
-		# LXD will do a clean shutdown of all instances.
-		# After 30s all remaining instances will be killed.
-		# We wait up to 40s for INCUS.
-		start-stop-daemon --stop --quiet -R SIGPWR/40 -p "${PIDFILE}"
-		eend ${?}
-	fi
-}
diff --git a/app-containers/incus/incus-6.6.ebuild b/app-containers/incus/incus-6.6.ebuild
index 65a3654dfb92..a9c0723f61be 100644
--- a/app-containers/incus/incus-6.6.ebuild
+++ b/app-containers/incus/incus-6.6.ebuild
@@ -204,6 +204,7 @@ pkg_postinst() {
 	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 "OCI container images support" app-containers/skopeo app-containers/umoci
 	optfeature "btrfs storage backend" sys-fs/btrfs-progs
 	optfeature "ipv6 support" net-dns/dnsmasq[ipv6]
 	optfeature "full incus-migrate support" net-misc/rsync