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

10 files changed, 64 insertions, 90 deletions

diff --git a/app-containers/Manifest.gz b/app-containers/Manifest.gz
index 4e93f7ce47c5..59be0692d7f0 100644
--- a/app-containers/Manifest.gz
+++ b/app-containers/Manifest.gz
diff --git a/app-containers/cri-o/Manifest b/app-containers/cri-o/Manifest
index cad4c529e24b..9150a97eb9dc 100644
--- a/app-containers/cri-o/Manifest
+++ b/app-containers/cri-o/Manifest
@@ -2,6 +2,6 @@ AUX cri-o.logrotated 81 BLAKE2B f17d96920c3e9bbfe68a38fcae49be999c0edcea085ebbc1
 AUX crio.initd 846 BLAKE2B 844400d3cd706d4f78616edb3c8a50a9819ee21aecc7fc33f7d3d00871fde86b59e4b604ccc7cdb0058b10ccd28277f19dbdce34c83b2529c14e063126318617 SHA512 29561e95398975748236217bbd9df64997f6e3de6c0555d007306bd0535895a648368385a13079eb7d52c06249a91980523a73b6563e86d0575d9cd9c3fa4ee9
 DIST cri-o-1.29.2.tar.gz 21203342 BLAKE2B deec88f8a505bdc1f184a3512da7f6d4b78499c4a66cacf0651a9fe56b62d33d62eaaf2ce68e5d8e856e13988b26e076ab69c24b30a62b42d88656441d948fcb SHA512 dd4105e0097a098b9009b00b59a8e8aeaad85b07177305e2e4b2c68a583a0c342e7a615f47a8cbcb7f179035f2c279573069f15aa1e91e491fe770eec1df326c
 DIST cri-o-1.30.4.tar.gz 19645954 BLAKE2B bb55eb674e7703ca313ed03cf6fa9952390121440a37c3413aac0c739b2cd7f03d36993139d41ae210faabb0530cab939074a78b8aa4319e0994063132a2e344 SHA512 fe0d69107e186943482909dac5e332226d7dfd5a1702722edc5c4f5df3ad9c6bff63e43dc7831c057ecc3ca387ee77815d43f531ad1e7b921d645d59797aa95d
-EBUILD cri-o-1.29.2.ebuild 2764 BLAKE2B 90d82107c6f203c02cabd61695818452208db82c2c08cbb48873218988f8e7b0825d4d9ae45f7dec6e4efd7814594dab5adf66a50f1170abd649cdbd3ae472ea SHA512 f08bceeeed6d779df076e8b1337278a92f1ca1bb831ef0004ff08a7b76bc56640d46c27a30615cfc5f5e555eafabe250456aa0e09d54a91e2b66012577370c4b
-EBUILD cri-o-1.30.4.ebuild 2764 BLAKE2B 6b282bd9dcb8fbba3198b8f45aa3337b794c99483d2a861cf538704495e048e9d0c896b8a71edded0e923532a8bd152e77a7fe93e1e23b3738e2310bc4a2a944 SHA512 e9b3f49933c42d2599a20d4285f71f1982b5b67dbedcfd07e08b88a976baa0db4492f0d5901f12b5731caa27540d9496aa3b63f62267d939e1010b8d18bc30f3
+EBUILD cri-o-1.29.2.ebuild 2789 BLAKE2B f590e6d4c5e52c2761ec41b523d6662d029e8ff88bbe98034408b936f5c91761b43f13bfcd334a4680551c49572fca8ab2b1522103bb7129b7a34014510bd00c SHA512 2e4fc13b0f882b76ae14bcc1bdac1444c37c0f65320c2f1425dee2da457c37c49c4a0cf46a27ca869068143ee759ca694b771dea8b6b259c73dfc8a651819da7
+EBUILD cri-o-1.30.4.ebuild 2789 BLAKE2B e4f2542d3beff6d12a19e1e063af80689f102ee64643320f0b35b4d733a77c8be6a5f94b5e7e697883d40f2fdaa1b9d35f5f87827e437997ab9b6c607d50d1ff SHA512 508db6f18db98bae3418711750cc501201ed4f3a82816657e8c6ab9bff82dedf43d6375311d0ed853e7587718b6a4f35a5c7509bd171a6cff36a1c8cb9bc7329
 MISC metadata.xml 908 BLAKE2B ff6e1663f563dff74dbdeeb5d5c778a70fe2395ff0c0836e31b538f0009215a74946384a1429f2cf8e65bccc26d4b357233f1aab1a2c70ca3f544653d79cf999 SHA512 0fe5ad9f9f1c3b7386f361febbedddb690fcf83145f80da05d77be72bf04f84d9106d46ff6962ed6cc99d7b12f3792263eb7b1711763a2cd2f8a7dac08ed5c09
diff --git a/app-containers/cri-o/cri-o-1.29.2.ebuild b/app-containers/cri-o/cri-o-1.29.2.ebuild
index 31584eebabb9..432e9db78f48 100644
--- a/app-containers/cri-o/cri-o-1.29.2.ebuild
+++ b/app-containers/cri-o/cri-o-1.29.2.ebuild
@@ -39,6 +39,7 @@ DEPEND="
 RDEPEND="${COMMON_DEPEND}
 	!<app-containers/podman-1.3.2-r1
 	selinux? ( sec-policy/selinux-crio )"
+BDEPEND="sys-apps/which"
 
 src_prepare() {
 	default
diff --git a/app-containers/cri-o/cri-o-1.30.4.ebuild b/app-containers/cri-o/cri-o-1.30.4.ebuild
index 74f118a739af..4feb101953a2 100644
--- a/app-containers/cri-o/cri-o-1.30.4.ebuild
+++ b/app-containers/cri-o/cri-o-1.30.4.ebuild
@@ -39,6 +39,7 @@ DEPEND="
 RDEPEND="${COMMON_DEPEND}
 	!<app-containers/podman-1.3.2-r1
 	selinux? ( sec-policy/selinux-crio )"
+BDEPEND="sys-apps/which"
 
 src_prepare() {
 	default
diff --git a/app-containers/distrobuilder/Manifest b/app-containers/distrobuilder/Manifest
index 57bdbacdf333..632b1fd8ed0f 100644
--- a/app-containers/distrobuilder/Manifest
+++ b/app-containers/distrobuilder/Manifest
@@ -3,6 +3,9 @@ DIST distrobuilder-2.1.tar.gz 5599048 BLAKE2B 90e82a20a3ef61d13148951956bb1f74cc
 DIST distrobuilder-2.1.tar.gz.asc 833 BLAKE2B fb3aadbc989438b0606c88e74fdd86e809b6373b907b37372cbbc0ca99415821f61772205967e0a7aa26b0bdaceb66df4ab39da1f08c339edeb84e66a04aab56 SHA512 0220fa34d966e2b3a244af21a894f5db7556b891ee3205b605ef633699553f0f53d876412c855010a0ef685fcfe376997790cf51d59fd46b7c9ba539507de4e3
 DIST distrobuilder-3.0.tar.gz 6135124 BLAKE2B 71cf594cdece46890418ea58af06205c59beaecce46a977efadcb336b93f0e1ed85ba4c1563a1f9f95937e935f844c91b6e45dfc73c0210f134ba3a694adea1d SHA512 c2218e6312257e5f15077d8380b9b49f7b8afd7ed5e43d46ac5d18a8cc332b096ab50c7301f74eb93769548c10f273e21a584ab2e908260ead4d2b219683bd1c
 DIST distrobuilder-3.0.tar.gz.asc 833 BLAKE2B 9a6fba0101eaea411a1b56359265c02533739a180c095ef2edd07dbe65c1d3bd2c1deab46e0cfdab362a282b85843659c8876853252b7ab1ab49e9f3f3dc1e8f SHA512 238a0a93575cb05fcd13fc32b5faed7592ff3345ae91d07fc1ede5696903f2e4da3d6d79bf39bc05ac16f0c8e04afe3eefa0e96b2c789992f55859bac6fd56d0
+DIST distrobuilder-3.1.tar.gz 6184215 BLAKE2B 2cb88f90c4459f71a2878824f7cb8f1d982f960ef498251561f58a57948d4dca35e67c85b15fff584db9ba369da07055d4854689f6d01a8f0f22dff97e813424 SHA512 5b0853a5f9a31b635f2d5160e918af8b7a66812570a1e50e70a515ef581bffe3904f6cf2487fa3d6691ed76ff34f97cd24b645b5f5ba146fec2127c3d9f21558
+DIST distrobuilder-3.1.tar.gz.asc 833 BLAKE2B 6986484fd6efa20eb625ace7a8395abef82c4bc685e45792072cfe3c78bf060bc5e5ec776a801fac4ac32f49088f13029a4dd3fbd41fc008df7100f1a3c805e6 SHA512 7b1c9d7dcb59dfe93635bb8fe5b2a65c030a5da5cacb3c22fb2cdadffec1252ad68901b92efc0eedb0f8aac26cb14a9b5f934caa920d77039d150fe817bd1e21
 EBUILD distrobuilder-2.1.ebuild 1142 BLAKE2B 71d4bd47837aa793011875faebff828846fae4e0f77bff95c9c2783035405279be9c96b76ce2fab81281786c24eb2102684581d94378b21dd08cef005648cb61 SHA512 2c95fa4944165c19936590cfb201042fdd54135de94fe3cd5493df5f04624d39b0f91dbf33adaf24e5ade716a8a1b86a1fca6c755fa6d6b3b696dac9f5587695
 EBUILD distrobuilder-3.0-r1.ebuild 1096 BLAKE2B 98bad35daa9baa0f53bd2965e2a522fe6620df0deb618846349a2f1bbb985aab3fdfb2655109be9e8da584f7041092f5f120c65aad53584d168547a6fc7c34b0 SHA512 8cc0224565c4ef670da1fb1b1fdc1f62878b8a667bdd052492561c9e80ee31d96db86735f80ece6dc94347a86a51ce3ac8a756e15a0a0fb16ae4cac6ae3b5067
+EBUILD distrobuilder-3.1.ebuild 1238 BLAKE2B f963cf224f148d86bda16d89ae3ef46f09720db717ab363cf2764aaef0e8ac2dfa4822972fa820e385d485faf9911192b232077fa8580ce8a3009694b74b6dc9 SHA512 0d47a3582a4a061bfa44cc4bfb09886cb7c5df21867507c4bd4344df02481dcda8b631713c10bf435f77c74f769c18fb5d8cd05a411d4ab893f0523039f60e71
 MISC metadata.xml 586 BLAKE2B d7fd625233c6bb5bafa2b0ee4ad9e45e39433fec0358fb8a0a2deaa117276e990a8795e6d5bd9e30402fa32c892bccc35f44b40ba95b4a8fc230d26afd88ea27 SHA512 42da39e6f8f2079cdda344216c9ba55a37198e8cbc8dfd45fcc50eb0833a55fa39807f17777b736f9d9cd2b8a1f340a24033fb0e494fdd28dd5661d041443e00
diff --git a/app-containers/distrobuilder/distrobuilder-3.1.ebuild b/app-containers/distrobuilder/distrobuilder-3.1.ebuild
new file mode 100644
index 000000000000..babc8dc8f04f
--- /dev/null
+++ b/app-containers/distrobuilder/distrobuilder-3.1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module linux-info optfeature
+
+DESCRIPTION="System container image builder for LXC and incus"
+HOMEPAGE="https://linuxcontainers.org/distrobuilder/introduction/"
+
+SRC_URI="https://linuxcontainers.org/downloads/distrobuilder/distrobuilder-${PV}.tar.gz
+	verify-sig? ( https://linuxcontainers.org/downloads/distrobuilder/distrobuilder-${PV}.tar.gz.asc )"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64"
+IUSE="verify-sig"
+
+RDEPEND="app-cdr/cdrtools
+	app-crypt/gnupg
+	dev-util/debootstrap
+	dev-vcs/git
+	net-misc/rsync
+	sys-fs/squashfs-tools"
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-linuxcontainers )"
+
+# Test deps aren't vendored.
+RESTRICT="test"
+
+CONFIG_CHECK="~OVERLAY_FS"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/linuxcontainers.asc
+
+GOPATH="${S}/_dist"
+
+src_compile() {
+	export GOPATH="${S}/_dist"
+	emake
+}
+
+src_test() {
+	export GOPATH="${S}/_dist"
+	emake check
+}
+
+src_install() {
+	export GOPATH="${S}/_dist"
+	dobin ${GOPATH}/bin/distrobuilder
+	dodoc -r doc/*
+}
+
+pkg_postinst() {
+	optfeature_header "Optional support"
+	optfeature "building MS Windows images" app-arch/wimlib app-misc/hivex
+}
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