gentoo auto-resync : 06:01:2024 - 12:54:38

5 files changed, 3 insertions, 193 deletions

diff --git a/app-containers/Manifest.gz b/app-containers/Manifest.gz
index 9e0ae7f10227..71a4172f00fa 100644
--- a/app-containers/Manifest.gz
+++ b/app-containers/Manifest.gz
diff --git a/app-containers/earthly/Manifest b/app-containers/earthly/Manifest
index c09ffe740269..aada56efbb79 100644
--- a/app-containers/earthly/Manifest
+++ b/app-containers/earthly/Manifest
@@ -5,6 +5,6 @@ DIST earthly-0.7.22.tar.gz 7813193 BLAKE2B f34b938776379f2ba0722757d53646d89841e
 DIST earthly-0.7.23-deps.tar.xz 157140928 BLAKE2B 493c7dce3e79f94659e99501020c07232a2d6ff78a055209b1b42be8615e38e01dacef4ceb50a80ed26e597de4dbb892fee2d54f6721fd5af62c86a0a9197d45 SHA512 a278077be794a1085105271fc3e031c02079e2b4f45c7220b3114df72ba26758758d5c0f1171ff861feb1c305765952494bf1afe95dcc469d2b9c6aad13fe7b9
 DIST earthly-0.7.23.tar.gz 8023353 BLAKE2B 458850b26a2730eb10ae3912f249d6ba9fdf81ed0c734f568ebf2cbaf5da005d258d38a089d452d42628d071d0b07f73e4f73cb29e7a02c406c1ea394d22ae97 SHA512 be524a6ab86ad3cff307d990f3645007cde673383cbaf132ebc6ab9e7052e8d13e163e958353041151d9fe6dc987ab75372dbf061a8413a932408a844cfe1007
 EBUILD earthly-0.7.21.ebuild 1815 BLAKE2B a0692dca782e264b67a80abbfd483dbe1fec441d572ea3044757e7272d2fd7fd0c262625f7737f89d728a9fb5969e09df26b11084a25065d8ace18fe2520b8ff SHA512 8fb15dba6822e82ba72155a66354b61780d3338eebaed1077e43dacb4df3081a18f8938f07641610ad52c2fed09bdc73c2b51fd47af562ad2d777bde7f63e1c3
-EBUILD earthly-0.7.22.ebuild 1816 BLAKE2B 94a8a8220455a52b87b1bf2ba5058c2fee6c10a9544d735b04d9ae4da1aa77cfdccb26e9cf5b15d7a8222a51dc158f3956f3639b6cdb51efa23e5065dda5f1de SHA512 babace1ebe376a2d061e4d5df673b9112a854933edceef1e6a0ca65fba6a7e20216298f34ab4e0e46b16daad16eab1dbfcb24ae3b1603cc6187e46de3e297550
+EBUILD earthly-0.7.22.ebuild 1815 BLAKE2B 900072e82f6abfb22384d538a23cba53aa8dcd2c113d67f99627aa9c82269ec96e293d73ffb26f2b6c4dda85e9d3522b8ffa1eaa47d118f7a1f7aee78eac22b9 SHA512 6c61b8eddfd270d674a0d6c4de5a792679a1736770e185940fb4e88a1b0a3e7e35b98ef555d92fa8773ab1c6302e3a1cf4e277493e5b2c5329c00726a2050a5e
 EBUILD earthly-0.7.23.ebuild 1814 BLAKE2B 30a38f4c88d37001b5f1a5c3ec5544e47ca7d4141b55aae876414f0ad125a53fc9af5f354e2075b386513baf414193ef6912c645e2c18ae0e8e69cd7040f0ba6 SHA512 e4addfaad685007702a7b1c028a9a9b173c5739181822cdb781bb389de5925f49d7b5526bbcd873f2ceae418d2788d17860d9c187c301a25679ef5a74c1b99ef
 MISC metadata.xml 927 BLAKE2B b7d5184df16f39603bf6df8b503e701d737fec188d1d97673e4ca59babd990c1b872784c91db04c74d9a08dbffa76f4e7530d8b021cbbe9ae51fd9966f709522 SHA512 f7f49eb583b2b5a9939c26e9eaff3917392525c3a94e5f8274c89b69e172547ad02fa4ed1b078e7d778f765659e1b9a7cf99d88042034cfbfbef54e685c8b6dd
diff --git a/app-containers/earthly/earthly-0.7.22.ebuild b/app-containers/earthly/earthly-0.7.22.ebuild
index b5a66cfbbdd4..6043d7bebe64 100644
--- a/app-containers/earthly/earthly-0.7.22.ebuild
+++ b/app-containers/earthly/earthly-0.7.22.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -23,7 +23,7 @@ SRC_URI="
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 RDEPEND="
 	|| (
diff --git a/app-containers/incus/Manifest b/app-containers/incus/Manifest
index acc15bf9f6d0..149be8280d43 100644
--- a/app-containers/incus/Manifest
+++ b/app-containers/incus/Manifest
@@ -18,6 +18,5 @@ DIST incus-0.3.tar.xz.asc 833 BLAKE2B 532ee90f3ed1d4798a19dcc9df8fe6587ab5ab93d1
 DIST incus-0.4.tar.xz 13544656 BLAKE2B 19f6dd9a0707d60e60b42fd586ed2a041a4ac66b071b8a8dc2f11e9fa6f11c3d4c464d4763babc22aa4e58e3964d079bdc3028848c460a5ebaed41573a4b3f65 SHA512 2d31f0dfa5408db9408946b4f872a051c792a2a47fb80962e62e6b6691c9c52c4532935f6d5bcbef05b80a1bc66f6cf68b1e61d148d8964569df0a98360c582e
 DIST incus-0.4.tar.xz.asc 833 BLAKE2B 7d78d6808f8bbab78427ddc41925bde68a965e1594e0a90a56471c81f5f71798e286031caabb50ecf8a8b7b084660eefaf7644f2753d3810903e2f5194cf70fe SHA512 ce5bf32f7007a4dcf339b549da14ce9094ebe031311bd77707155d90e6ab05d1b56841910b934c96d9fed941815ce47ee746222100cee42d28bcc7c312c25bfb
 EBUILD incus-0.3-r1.ebuild 5256 BLAKE2B 88cc719bcd9f67aae827f2e53e17adebbb83b09b9d50d168b68afcf074c064fb5415302ea847d782b40a9c25447767b0b2553f3a22838adbba5046248eb47f45 SHA512 7d20e69dc5e3f5ff4cea2a42ec71677bc5d65a18e6f4281619faf041fec89bf672898c00214ecdaa7de258b852f8130e2123357559fcf55a242967d6eae20fd4
-EBUILD incus-0.3.ebuild 5190 BLAKE2B e4e9ff9904f50eea1fe9a98774c022ed52de663b15405359a0fbacc670027e95b7f18b8665a820bc614b709b475eb6296fe0ce80817cb3ee9120fefac44b6dc5 SHA512 dae31f75947b52467c01e4b0f00f0b2884486c9c68591789fe77dbeffb832d86f57ffae3a6e7c9dd69b962357fa9d89dcfaa6f1115c821a66363862362e29fba
 EBUILD incus-0.4-r1.ebuild 5534 BLAKE2B 555af9f265ac9f564104929032c6787156af76fbe8dbbccc3d8d25f6054d1d1b3a17c1cee148b1c1f8620c0382df38cb1d00dc5710fbb01c5f953bf942ceb00f SHA512 6088a80cd306887f155004429374249acb21b4bc152bd2914c3a9165f8c333aec1ef3cac057b6ea5f696149c840c7438769934ed3ca02757918353fdec875104
 MISC metadata.xml 1597 BLAKE2B 6e8ceafa8dca7d49fa754470c9645e11946d3419135ec3a12581e227945b64a13612a7eb3e833027bbf6d3c795acbaced979ba80f00a9e36f6831fb6111dd2d2 SHA512 d3c0ec128f715627addc5be758c87bea808626f9d9ada75aeac9be9a84039b68385ae65edfb5d57951ff4e7352565fbba040035da82ce8eaffcca585811d3577
diff --git a/app-containers/incus/incus-0.3.ebuild b/app-containers/incus/incus-0.3.ebuild
deleted file mode 100644
index 0c8b25a5b202..000000000000
--- a/app-containers/incus/incus-0.3.ebuild
+++ /dev/null
@@ -1,189 +0,0 @@
-# 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
-}