commit:     22aa4587e389de0dc7f20d42b6335e04851a4e1b
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Sat Jun  8 06:38:06 2024 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sat Jun  8 06:38:06 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22aa4587

app-containers/incus: drop 6.1

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

 app-containers/incus/Manifest         |   2 -
 app-containers/incus/incus-6.1.ebuild | 219 ----------------------------------
 2 files changed, 221 deletions(-)

diff --git a/app-containers/incus/Manifest b/app-containers/incus/Manifest
index 7cd54e315d3e..cc80f49640f9 100644
--- a/app-containers/incus/Manifest
+++ b/app-containers/incus/Manifest
@@ -1,6 +1,4 @@
 DIST incus-6.0.0.tar.xz 11839792 BLAKE2B 
135574e6f19262992bb068a3c0a0045c192699503e417eb861e00a974e631fd869485eb96238d1dbe4712e789367d31afae1c62bade2a8b75f7e9a7620547e74
 SHA512 
eb6d784a535d487bd85b3e8272d7cddc23f2ed98ca2b3e2f19c038b4a6f910d4030822424154489adef7a688757905927309d25f6d1ff621d99d678fe6aeae2b
 DIST incus-6.0.0.tar.xz.asc 833 BLAKE2B 
f35c38f886290ff08e017cd54e8019c43bfbf1f9c84b26ede2cfa78acbe4047af4314465e77d6e900f296552d5ac8f8c07d26a11920bff937fbb8a0a910efb0d
 SHA512 
0360520752fad3e95807d09e4fd6d60c96a202d0dbb61621925abd75aa801b6d573abbece3179a8906bdc47e96ddec4a746607ce2d10dcc1a76d0afd459cbf81
-DIST incus-6.1.tar.xz 11594436 BLAKE2B 
086d5fbc56a7867a5be0ce7fd5c7292fc889611536f99ad8cdcd47168ebfe7c836952b80d6a4846feae7d3bc2be1f18fe1df2a4ef0ec7abbd4ab78d2d4e3cab0
 SHA512 
1e4b07801789742597fedb2059fc24153a451d2f680c04722b2c025bc2a2792314d0cb32478dd97c91350388009eb67e4d2de504634c2bda38fac2c660a2873e
-DIST incus-6.1.tar.xz.asc 833 BLAKE2B 
6c223614a0fec661596b2a61a3c640b43bed5e861304dca6fab07b81595ba3ba4aab94a7087522db51983767d35c6a5945afe852a08d4d4693d15c7818b75658
 SHA512 
a4329a2425c094cf1e4f451682dd839a51cc072e0cee89932cc3e2fcbc3d6fddabc1fdf7d3f6f61c5ae95299a91c3dcf05f502b7a42135a9d2ed215932bfa51b
 DIST incus-6.2.tar.xz 11060268 BLAKE2B 
ac276e9192bd309d41762e1756ed8276835d597f92fef554f74d8dd11f1d6685f95815c89a1770a7e3fd3c8c08dea65e5dffeac942e97052e7bdb1337d2d3817
 SHA512 
a5a41199b5ec21a6b2abb7ae33d245032db67ec8aedec3eb1cd18236ce39106c25c4a71524d363103c4a6fbe4420368e0fe8763a2eb84afdbf7f069e53312fa7
 DIST incus-6.2.tar.xz.asc 833 BLAKE2B 
68e967083b715716f5eedeeb4e81c5d90e45af1c9bd3ce373d8edab9d872598585e3ee9ae738292a7cc66f52907908627d5dd62ef963f62b37ed74620d59ef90
 SHA512 
77a82dd92438815c0f02a4399f2cda465692589eef12dba4482bdcb0cf1bd1e71dd3a6ccedfa0d9c4a11891b0883764adae3db994f21bb46655372988941ae2a

diff --git a/app-containers/incus/incus-6.1.ebuild 
b/app-containers/incus/incus-6.1.ebuild
deleted file mode 100644
index 79a1af3f07c5..000000000000
--- a/app-containers/incus/incus-6.1.ebuild
+++ /dev/null
@@ -1,219 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit 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"
-KEYWORDS="~amd64 ~arm64"
-IUSE="apparmor fuidshift 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-1.15.6
-       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}
-       fuidshift? ( !app-containers/lxd )
-       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-1.21
-       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/fuidshift
-       /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_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
-
-       # 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.4.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 netgo "${S}"/cmd/incus-migrate
-       CGO_ENABLED=0 go install -v -tags agent,netgo "${S}"/cmd/incus-agent
-
-       use nls && emake build-mo
-}
-
-src_test() {
-       emake check
-}
-
-src_install() {
-       export GOPATH="${S}/_dist"
-
-       if tc-is-cross-compiler ; 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-agent incus-benchmark incus-migrate incus-simplestreams 
incus lxc-to-incus ; do
-               dobin ${bindir}/${m}
-       done
-
-       # fuidshift, should be moved under admin tools at some point
-       if use fuidshift ; then
-               dosbin ${bindir}/fuidshift
-       fi
-
-       newconfd "${FILESDIR}"/incus-0.4.confd incus
-       newinitd "${FILESDIR}"/incus-0.4.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
-}
-
-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 "virtual machine support" app-cdr/cdrtools 
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
-}

Reply via email to