gentoo auto-resync : 12:01:2025 - 06:41:42

9 files changed, 6 insertions, 462 deletions

diff --git a/app-containers/Manifest.gz b/app-containers/Manifest.gz
index 809bcd5ca928..bea283f83ac9 100644
--- a/app-containers/Manifest.gz
+++ b/app-containers/Manifest.gz
diff --git a/app-containers/sen/Manifest b/app-containers/sen/Manifest
index dbaf83eabe46..7561318feb1e 100644
--- a/app-containers/sen/Manifest
+++ b/app-containers/sen/Manifest
@@ -1,5 +1,5 @@
-DIST sen-0.6.1_p20200905.tar.gz 1913978 BLAKE2B 189bff583770265de29ca3e54cad1283051c05eccab4fc98160801e50b31376188c52e49b43972292fe231b376ba42879fb34d7b1ae70c2246d676a6e25f670b SHA512 cd1899c1b4c5c7cf7f1f2f5e557bd609a7d7619dbc3fc6457f5ef5ce5c9ab43d92a6fbfa228c43d543d4f46c7928d74dbed9ab8346cabc772c8e7c63a7c07bfe
 DIST sen-0.7.0.tar.gz 1930302 BLAKE2B b17eeb080d2873485e81e90b7bee81f4930ace05b5d10a259a062b1dc818659d61a45d8bf01df95c33514060cce84f5c09f82066400afe11e4797fffa4303b6b SHA512 fc350eaf6694df2ff2378e24e06a07247a5c5bc060e09c4bb5478deca781d4f4fc593927dff14a1e7c7779eabb897fb6170183daee48a4e6b03bcfef975521b0
-EBUILD sen-0.6.1_p20200905-r1.ebuild 846 BLAKE2B 6bd9c496f34f189d68802e5e4a67551f6427412803ec453da1066897f3e7f0bc46ab4dd7a8366101ed2dce5292b38c47ec5ce421986ce1789b4480481f67cec2 SHA512 6ecf7ade1340d22b09ce793e15cd4216944033f9a9da06852747cdf39688cbcb0cf72835630528749f80b9bd8d2473f0b4c9d7b37115acf1ff3c00802263c7e1
+DIST sen-0.8.0.tar.gz 1931211 BLAKE2B a8c6a4fc3343fd90c03ab9d0dfa85ff39639a21bb807a2122d29e000c6df1832b2277553b3d3cf88bbc0ef51a0105a5f9246f1e9b05439dd7f1ea71fcadc49cf SHA512 03fa23c5e5e8e4d556f6b2154db5a4128a8a51c60ea57792a11080ac7870af6bd128e374f682fc7ba1c206148c2a146bc81233b36306a27da77f09f8a508713f
 EBUILD sen-0.7.0.ebuild 658 BLAKE2B 2b1d0cd4d870e0ccbf224697baf0b6fe1dc2dcb799c8a9afeb1eb4e494d8bc3e5da6369f1a8e72e65753a68d3aa797fd12965e71c5b62cf9074ca3b2809537c2 SHA512 303b197821565e1d790cab0242fc1a53363904ff453f2cc9d6515916a158a2341fe97e458abfc0ae3ebee785a253ea6fdf0e8b2b11db061d9aaa27bd3b380f7b
+EBUILD sen-0.8.0.ebuild 658 BLAKE2B 1afa570ec1a07a96bec5eee357e1be3e459d07bc4802e6013b0ebfff5c0b688587d4b11949cdc5b01db9b7630ee45936170c2a2b2ce1c99df3c94689216a4e9c SHA512 8529592a2d9f573ec59086b20ca9f52cb21f5061ccd27519d5213259d0f7bc802c395c4094eee46711d0e3de4db4f4ab901749cefcb6a062380d9683f5ced80c
 MISC metadata.xml 290 BLAKE2B d0cdad8552c8165bbd5ff6709b9b1ac17890e28be90e2f80e215647a1683583f6dd0e48a9a496926a35430a6dd8a3ec9388cdf44642838349ea468bfdf0dff94 SHA512 3dbc8716f2244331c67eee99dbc406a09282c3a5282335aca0981a3907c9ec4bb8a4aafcba6f12eff244a94029f4b5ef2c06ce9f284600e0ca33ffcb57c3d888
diff --git a/app-containers/sen/sen-0.6.1_p20200905-r1.ebuild b/app-containers/sen/sen-0.8.0.ebuild
index 9f7bf271cf92..e954d938ca66 100644
--- a/app-containers/sen/sen-0.6.1_p20200905-r1.ebuild
+++ b/app-containers/sen/sen-0.8.0.ebuild
@@ -1,18 +1,14 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-inherit distutils-r1
-
-COMMIT="02e5872ee2905861e1da06ab5174e1a3f41f0e0b"
+PYTHON_COMPAT=( python3_{10..13} )
+inherit distutils-r1 pypi
 
 DESCRIPTION="Terminal User Interface for docker engine"
 HOMEPAGE="https://github.com/TomasTomecek/sen"
-SRC_URI="https://github.com/TomasTomecek/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${COMMIT}"
 
 LICENSE="MIT"
 SLOT="0"
@@ -23,7 +19,7 @@ RDEPEND="
 	dev-python/urwidtrees[${PYTHON_USEDEP}]
 	dev-python/docker[${PYTHON_USEDEP}]
 "
-BDEPEND="
+BDEPEND="${RDEPEND}
 	test? (
 		dev-python/flexmock[${PYTHON_USEDEP}]
 	)
@@ -35,7 +31,3 @@ python_install_all() {
 	distutils-r1_python_install_all
 	dodoc -r docs
 }
-
-python_test() {
-	epytest tests
-}
diff --git a/app-containers/slirp4netns/Manifest b/app-containers/slirp4netns/Manifest
index 4c842af4afe5..efe6b1a416f2 100644
--- a/app-containers/slirp4netns/Manifest
+++ b/app-containers/slirp4netns/Manifest
@@ -1,7 +1,3 @@
-DIST slirp4netns-1.1.12.tar.gz 60223 BLAKE2B 2bd4ed6cded075a151fec0e6b2222b0a72f2027d702cd3e2760ab8c811e375ea5becfeb32ccf71f4b41a257b9e7f32852d6d805912ad950da3364e240d191674 SHA512 82584e40079c2a7730c098f2a2406dc042498f7d50cc9ad8404acf3bb3a50c6969737be531d64b2eca6ba86a968bb5bfea9ad10eba4979cc40a5da5c9745ebdb
-DIST slirp4netns-1.1.9.tar.gz 58951 BLAKE2B e4fde408b3cd55dec0cca495c58936ec32c6201a0fe63c1a9fc9502ac41da615f92271d5fb365475f6864dd3c195097c81f01268b1b8d10d0f888c4e154cac34 SHA512 6471bf2b2eff9bd3ef037de986ab612f20bfce7a52bfd2b1b434d0606a3d2e6170b3fc43b168c8cc6f56ffb82f8361f21a26522ac1092c71f6e694a9588d5854
 DIST slirp4netns-1.2.0.tar.gz 62617 BLAKE2B ddedfbbd64094142392bcb1730900634983a8422ae33bc9eb798e42e8f45a773ad30ba78f7a406c9db2c2a7393572a313b9464bc09c2f13343bcf6d960a9f609 SHA512 4ede7323aab92d0ad0026bc5e1aefc07898a5b50c4ff57c13eb9d8e75d73a4bb5ac992f021404053fcba2b05c56dcafcbfefbc4bbc47f72a0797ab62bd76a60a
-EBUILD slirp4netns-1.1.12-r1.ebuild 955 BLAKE2B 2d3fffd1ec322fc172dfd247bdb5be260ce2f1ce89c150372f408af5badf9e9c1c08c7c54050f6b8a2497d330f8ab208822bb4d65621cc124de4abd1201bb3a6 SHA512 8d5b519a4db4b1904dfd4b06a679cf54ab78a73cffbaf01ea6975d39334f1707087124f89be6c314ff7cbd04ed5b54d3c702a598517cd3c7dabfa7edba2c0211
-EBUILD slirp4netns-1.1.9.ebuild 956 BLAKE2B 3e124c54f59260a727c8bce6d8c92778e4b4110d23464891844f97399bbdfa0570adc8b4670f19b689023948a099c4cbf067809afc99e30f6e666820a6296994 SHA512 1a41116be0660aded739fe100bd3c88570debadc08fa98a3f08d9f19f768f1c4d77ac33c63d64f405f9741f14dd3cc286841ed41c5a5090fa53f81ba32e3092f
 EBUILD slirp4netns-1.2.0.ebuild 955 BLAKE2B 2d3fffd1ec322fc172dfd247bdb5be260ce2f1ce89c150372f408af5badf9e9c1c08c7c54050f6b8a2497d330f8ab208822bb4d65621cc124de4abd1201bb3a6 SHA512 8d5b519a4db4b1904dfd4b06a679cf54ab78a73cffbaf01ea6975d39334f1707087124f89be6c314ff7cbd04ed5b54d3c702a598517cd3c7dabfa7edba2c0211
 MISC metadata.xml 474 BLAKE2B 2ee42e8e38fbb422d879db39fd00613cf69d1760840d69f937e14be0bcb78edf763a749ebb0d72e278f0d71b59ddeb20c3cb67d24dc0d00fd4224575c3417818 SHA512 425ebcc108ae87e17d7ad57f6d868fa7cbc75f6e1ff6e8ec8aa00e217b384d43ccd7f77bb2092f10d25a5a690c82fd85d6f7f062bfb9721810de1fb27c3db192
diff --git a/app-containers/slirp4netns/slirp4netns-1.1.12-r1.ebuild b/app-containers/slirp4netns/slirp4netns-1.1.12-r1.ebuild
deleted file mode 100644
index 3895f2b716fe..000000000000
--- a/app-containers/slirp4netns/slirp4netns-1.1.12-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="User-mode networking for unprivileged network namespaces"
-HOMEPAGE="https://github.com/rootless-containers/slirp4netns"
-SRC_URI="https://github.com/rootless-containers/slirp4netns/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~ppc64 ~riscv"
-
-RDEPEND="
-	dev-libs/glib:2=
-	net-libs/libslirp:=
-	sys-libs/libseccomp:=
-	sys-libs/libcap:="
-
-DEPEND="${RDEPEND}"
-
-BDEPEND="virtual/pkgconfig"
-
-RESTRICT+=" test"
-
-src_prepare() {
-	default
-
-	# Respect AR variable for bug 722162.
-	sed -e 's|^AC_PROG_CC$|AC_DEFUN([AC_PROG_AR], [AC_CHECK_TOOL(AR, ar, :)])\nAC_PROG_AR\n\0|' \
-		-i configure.ac || die
-	eautoreconf
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog "You need to have the tun kernel module loaded in order to have"
-		elog "slirp4netns working"
-	fi
-}
diff --git a/app-containers/slirp4netns/slirp4netns-1.1.9.ebuild b/app-containers/slirp4netns/slirp4netns-1.1.9.ebuild
deleted file mode 100644
index d200849be68c..000000000000
--- a/app-containers/slirp4netns/slirp4netns-1.1.9.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="User-mode networking for unprivileged network namespaces"
-HOMEPAGE="https://github.com/rootless-containers/slirp4netns"
-SRC_URI="https://github.com/rootless-containers/slirp4netns/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-KEYWORDS="~amd64 ~arm64 ~ppc64"
-LICENSE="GPL-2"
-SLOT="0"
-
-RDEPEND="
-	dev-libs/glib:2=
-	dev-libs/libpcre:=
-	net-libs/libslirp:=
-	sys-libs/libseccomp:=
-	sys-libs/libcap:="
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-RESTRICT="test"
-
-src_prepare() {
-	# Respect AR variable for bug 722162.
-	sed -e 's|^AC_PROG_CC$|AC_DEFUN([AC_PROG_AR], [AC_CHECK_TOOL(AR, ar, :)])\nAC_PROG_AR\n\0|' \
-		-i configure.ac || die
-	eautoreconf
-	default
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog "You need to have the tun kernel module loaded in order to have"
-		elog "slirp4netns working"
-	fi
-}
diff --git a/app-containers/snapd/Manifest b/app-containers/snapd/Manifest
index ccf1c8485552..f1adae52a34e 100644
--- a/app-containers/snapd/Manifest
+++ b/app-containers/snapd/Manifest
@@ -1,9 +1,5 @@
 AUX README.gentoo 1941 BLAKE2B dd25269f2aaaea693701d74511d632bc45f2c99954ae683cb81d4df41c4c1f8007bb6c337234e46bfc5973aa7e8356cd12ac510e9109eca09890cbc42bd184bb SHA512 5b522e6c29bdad84a71245fa1f0289e9cfed0501d936b433829f66ef9d655f3cc13d6bca29beeae2c00e1b68f9fa30058608b9c4cde86ba66eab67bd011c9d00
-DIST snapd-2.58.tar.xz 6980916 BLAKE2B d3de507513db808fa4f85498b5c238de143f06660f1d677186c8c763b38643a2486e25b747977b3eb584619d79ea0a12e88dc5a909045a853c1d8f849f2c1638 SHA512 555915b8b4d9d2d91a3ba19e9e78cf6b19d9683a9f390ad225aa5876320cb8595b464d6133706c4923fc15fbe04ba2b65a47e403c9a2d8859adae827f8ec000a
-DIST snapd-2.61.tar.xz 7626784 BLAKE2B d716e91df4702fbd415bb6204a4557f37afd3dce187e3bca33b12a2ac5a1b54d1c31473d1537a784f6cbbfaf213f676d1f1b29d716e8c5f45a785229c9f3e018 SHA512 2fd432d7ef2204535576e980de7060ad15a0b3610b25e0f41b630ae34e172f97460f0a38d9d456af08dd36c619e90119219788a49e56a69afc7fbf014fc1db22
 DIST snapd-2.63-bug-933073-GNU_SOURCE.patch 870 BLAKE2B acc2a9ec7ca16849736701b37e51f238be5700cf0cd40dac6493f126a48235ffc1f103096d546313d05a2262f8bdb6f84966cbb79c4cf3f5c1cdf4dfd5dc231e SHA512 5e4018d1972e18496666cf60c6e132f8655d8f0f4d6f8a77f9a7e5d2063b823f97a17bf26b562e6ab93ea32f081a90df6969a617e77114f37553a350f44f11fb
 DIST snapd-2.63.tar.xz 7502152 BLAKE2B 8ae38699227b7f0e6b512526fc8857b3e50ed220ac95860c372ca0a4b26f5a034bd9309688217696444254e41cc70fe3a45c0bf026c84e5f950e7df8aebd47a0 SHA512 956ee142ab6cb5de522307f7844819c861b2831e22dab56f7bfca16ff7f947093f8a8727d49370cc000ed71f3af9c57cff9c4be93ebf199e8c631a152a68ec5b
-EBUILD snapd-2.58.ebuild 5206 BLAKE2B 9df542b74025c4151e20ee6eff9e640742587831b29d3195c97b0ee60ecbe8ce50558e0ecd437b26d87c378575e9d7b1c384ace7f6d647e4b34c519df25ddb68 SHA512 4d2541d85b110db48c3949a3e1a82a0b1ab454ed58a166381011ff452b171e279bebbb5f40e3e7e266849cdf0e2d5d608c12c19c97214d688cd9e739f7be0497
-EBUILD snapd-2.61.ebuild 5210 BLAKE2B 68d8b4bfc3a34c17a28de28ef53549cf058dfee074dccf7fbcf33d6ae5f3d32b27279cba0b2ee1cdc7fbd2b8737abe83ec9816ce25fa354cb0fe37d7e1adfe33 SHA512 ddd4fbf0a5c4959230aa59dc1d5ed65389af526e589cb879750fc3d6e07d477b9f38e2c6b47745a47dd0afaeac4f6fa02333d9e1c0532abc569662e76914d6f2
 EBUILD snapd-2.63.ebuild 5402 BLAKE2B 109ac54af3d902cccfcf689ce13dc67d2bf18e7ea4a0c739d7b6f9a4372eb5f41fb9207353cebf976b5e60c384743c95f7ab1edacbbdbfd440d74b1a237d7bd5 SHA512 5a50f6d44df3b3820e389fb1a163846f43a0954d486497354417fdd88eab0949c970ced7b201d344d6f793603594c66b91636bad5d3ce199289f4dcd3d7c3e61
 MISC metadata.xml 457 BLAKE2B 204b67bf36a85bd18f4111b4d8590195908bf15ae0bafedb76b6124b7d19c6570627925e5dfc46dd4dd47732c6d8f1066451831a0cc475518aab8a29403ececc SHA512 07671272b60f1a6793e3f36b096e99153263830314359eb86000aec65266c61ebe9c448af4ec166d6163e3ca2325f36cc74fe5aace95e7ffa7b0293516b18120
diff --git a/app-containers/snapd/snapd-2.58.ebuild b/app-containers/snapd/snapd-2.58.ebuild
deleted file mode 100644
index 09043d528c25..000000000000
--- a/app-containers/snapd/snapd-2.58.ebuild
+++ /dev/null
@@ -1,179 +0,0 @@
-# Copyright 2020-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools bash-completion-r1 flag-o-matic go-module linux-info readme.gentoo-r1 systemd tmpfiles xdg-utils
-
-DESCRIPTION="Service and tools for management of snap packages"
-HOMEPAGE="http://snapcraft.io/"
-
-SRC_URI="https://github.com/snapcore/${PN}/releases/download/${PV}/${PN}_${PV}.vendor.tar.xz -> ${P}.tar.xz"
-MY_PV=${PV}
-KEYWORDS="amd64"
-
-LICENSE="GPL-3 Apache-2.0 BSD BSD-2 LGPL-3-with-linking-exception MIT"
-SLOT="0"
-IUSE="apparmor +forced-devmode gtk kde systemd"
-REQUIRED_USE="!forced-devmode? ( apparmor ) systemd"
-
-CONFIG_CHECK="~CGROUPS
-		~CGROUP_DEVICE
-		~CGROUP_FREEZER
-		~NAMESPACES
-		~SQUASHFS
-		~SQUASHFS_ZLIB
-		~SQUASHFS_LZO
-		~SQUASHFS_XZ
-		~BLK_DEV_LOOP
-		~SECCOMP
-		~SECCOMP_FILTER"
-
-RDEPEND="
-	sys-libs/libseccomp:=
-	apparmor? (
-		sec-policy/apparmor-profiles
-		sys-apps/apparmor:=
-	)
-	dev-libs/glib
-	virtual/libudev
-	systemd? ( sys-apps/systemd )
-	sys-libs/libcap:=
-	sys-fs/squashfs-tools[lzma]"
-
-DEPEND="${RDEPEND}"
-
-BDEPEND="
-	>=dev-lang/go-1.9
-	dev-python/docutils
-	sys-devel/gettext
-	sys-fs/xfsprogs"
-
-PDEPEND="sys-auth/polkit[gtk?,kde?]"
-
-README_GENTOO_SUFFIX=""
-
-pkg_setup() {
-	if use apparmor; then
-		CONFIG_CHECK+=" ~SECURITY_APPARMOR"
-	fi
-	linux-info_pkg_setup
-
-	# Seems to have issues building with -O3, switch to -O2
-	replace-flags -O3 -O2
-}
-
-src_prepare() {
-	default
-	# Update apparmor profile to allow libtinfow.so*
-	sed -i 's/libtinfo/libtinfo{,w}/' \
-		"cmd/snap-confine/snap-confine.apparmor.in" || die
-
-	if ! use forced-devmode; then
-		sed -e 's#return !apparmorFull#if !apparmorFull {\n\t\tpanic("USE=forced-devmode is disabled")\n\t}\n\treturn false#' \
-			-i "sandbox/forcedevmode.go" || die
-		grep -q 'panic("USE=forced-devmode is disabled")' "sandbox/forcedevmode.go" || die "failed to disable forced-devmode"
-	fi
-
-	sed -i 's:command -v git >/dev/null:false:' -i "mkversion.sh" || die
-
-	./mkversion.sh "${PV}"
-	pushd "cmd" >/dev/null || die
-	eautoreconf
-}
-
-src_configure() {
-	SNAPD_MAKEARGS=(
-		"BINDIR=${EPREFIX}/usr/bin"
-		"DBUSSERVICESDIR=${EPREFIX}/usr/share/dbus-1/services"
-		"LIBEXECDIR=${EPREFIX}/usr/lib"
-		"SNAP_MOUNT_DIR=${EPREFIX}/var/lib/snapd/snap"
-		"SYSTEMDSYSTEMUNITDIR=$(systemd_get_systemunitdir)"
-	)
-	export CGO_ENABLED="1"
-	export CGO_CFLAGS="${CFLAGS}"
-	export CGO_CPPFLAGS="${CPPFLAGS}"
-	export CGO_CXXFLAGS="${CXXFLAGS}"
-
-	pushd "${S}/cmd" >/dev/null || die
-	econf --libdir="${EPREFIX}/usr/lib" \
-		--libexecdir="${EPREFIX}/usr/lib/snapd" \
-		$(use_enable apparmor) \
-		--enable-nvidia-biarch \
-		--with-snap-mount-dir="${EPREFIX}/var/lib/snapd/snap"
-}
-
-src_compile() {
-	export -n GOCACHE XDG_CACHE_HOME
-	export GOBIN="${S}/bin"
-
-	local file
-	for file in "${S}/po/"*.po; do
-		msgfmt "${file}" -o "${file%.po}.mo" || die
-	done
-
-	emake -C "${S}/data" "${SNAPD_MAKEARGS[@]}"
-
-	local -a flags=(-buildmode=pie -ldflags "-s -linkmode external -extldflags '${LDFLAGS}'" -trimpath)
-	local -a staticflags=(-buildmode=pie -ldflags "-s -linkmode external -extldflags '${LDFLAGS} -static'" -trimpath)
-
-	local cmd
-	for cmd in snap snapd snapd-apparmor snap-bootstrap snap-failure snap-preseed snap-recovery-chooser snap-repair snap-seccomp; do
-		go build ${GOFLAGS} -mod=vendor -o "${GOBIN}/${cmd}" "${flags[@]}" \
-		    -v -x "github.com/snapcore/${PN}/cmd/${cmd}"
-		[[ -e "${GOBIN}/${cmd}" ]] || die "failed to build ${cmd}"
-	done
-	for cmd in snapctl snap-exec snap-update-ns; do
-		go build ${GOFLAGS} -mod=vendor -o "${GOBIN}/${cmd}" "${staticflags[@]}" \
-		    -v -x "github.com/snapcore/${PN}/cmd/${cmd}"
-		[[ -e "${GOBIN}/${cmd}" ]] || die "failed to build ${cmd}"
-	done
-}
-
-src_install() {
-	emake -C "${S}/data" install "${SNAPD_MAKEARGS[@]}" DESTDIR="${D}"
-	emake -C "${S}/cmd" install "${SNAPD_MAKEARGS[@]}" DESTDIR="${D}"
-
-	if use apparmor; then
-		mv "${ED}/etc/apparmor.d/usr.lib.snapd.snap-confine"{,.real} || die
-		keepdir /var/lib/snapd/apparmor/profiles
-	fi
-	keepdir /var/lib/snapd/{apparmor/snap-confine,cache,cookie,snap,void}
-	fperms 700 /var/lib/snapd/{cache,cookie}
-
-	dobin "${GOBIN}/"{snap,snapctl}
-	ln "${ED}/usr/bin/snapctl" "${ED}/usr/lib/snapd/snapctl" || die
-
-	exeinto /usr/lib/snapd
-	doexe "${GOBIN}/"{snapd,snapd-apparmor,snap-bootstrap,snap-failure,snap-exec,snap-preseed,snap-recovery-chooser,snap-repair,snap-seccomp,snap-update-ns} \
-		"${S}/"{cmd/snap-discard-ns/snap-discard-ns,cmd/snap-gdb-shim/snap-gdb-shim,cmd/snap-mgmt/snap-mgmt} \
-		"${S}/data/completion/bash/"{complete.sh,etelpmoc.sh,}
-
-	dobashcomp "${S}/data/completion/bash/snap"
-
-	insinto /usr/share/zsh/site-functions
-	doins "${S}/data/completion/zsh/_snap"
-
-	insinto "/usr/share/polkit-1/actions"
-	doins "${S}/data/polkit/io.snapcraft.snapd.policy"
-
-	dodoc "${S}/packaging/ubuntu-16.04/changelog"
-	domo "${S}/po/"*.mo
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-	xdg_desktop_database_update
-	tmpfiles_process snapd.conf
-
-	if use apparmor && [[ -z ${ROOT} && -e /sys/kernel/security/apparmor/profiles &&
-		$(wc -l < /sys/kernel/security/apparmor/profiles) -gt 0 ]]; then
-		apparmor_parser -r "${EPREFIX}/etc/apparmor.d/usr.lib.snapd.snap-confine.real"
-	fi
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/app-containers/snapd/snapd-2.61.ebuild b/app-containers/snapd/snapd-2.61.ebuild
deleted file mode 100644
index 3acdd26301ec..000000000000
--- a/app-containers/snapd/snapd-2.61.ebuild
+++ /dev/null
@@ -1,179 +0,0 @@
-# Copyright 2020-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools bash-completion-r1 flag-o-matic go-module linux-info readme.gentoo-r1 systemd tmpfiles xdg-utils
-
-DESCRIPTION="Service and tools for management of snap packages"
-HOMEPAGE="http://snapcraft.io/"
-
-SRC_URI="https://github.com/snapcore/snapd/releases/download/${PV}/snapd_${PV}.vendor.tar.xz -> ${P}.tar.xz"
-MY_PV=${PV}
-KEYWORDS="amd64"
-
-LICENSE="GPL-3 Apache-2.0 BSD BSD-2 LGPL-3-with-linking-exception MIT"
-SLOT="0"
-IUSE="apparmor +forced-devmode gtk kde systemd"
-REQUIRED_USE="!forced-devmode? ( apparmor ) systemd"
-
-CONFIG_CHECK="~CGROUPS
-		~CGROUP_DEVICE
-		~CGROUP_FREEZER
-		~NAMESPACES
-		~SQUASHFS
-		~SQUASHFS_ZLIB
-		~SQUASHFS_LZO
-		~SQUASHFS_XZ
-		~BLK_DEV_LOOP
-		~SECCOMP
-		~SECCOMP_FILTER"
-
-RDEPEND="
-	sys-libs/libseccomp:=
-	apparmor? (
-		sec-policy/apparmor-profiles
-		sys-apps/apparmor:=
-	)
-	dev-libs/glib
-	virtual/libudev
-	systemd? ( sys-apps/systemd )
-	sys-libs/libcap:=
-	sys-fs/squashfs-tools[lzma,lzo]"
-
-DEPEND="${RDEPEND}"
-
-BDEPEND="
-	>=dev-lang/go-1.9
-	dev-python/docutils
-	sys-devel/gettext
-	sys-fs/xfsprogs"
-
-PDEPEND="sys-auth/polkit[gtk?,kde?]"
-
-README_GENTOO_SUFFIX=""
-
-pkg_setup() {
-	if use apparmor; then
-		CONFIG_CHECK+=" ~SECURITY_APPARMOR"
-	fi
-	linux-info_pkg_setup
-
-	# Seems to have issues building with -O3, switch to -O2
-	replace-flags -O3 -O2
-}
-
-src_prepare() {
-	default
-	# Update apparmor profile to allow libtinfow.so*
-	sed -i 's/libtinfo/libtinfo{,w}/' \
-		"cmd/snap-confine/snap-confine.apparmor.in" || die
-
-	if ! use forced-devmode; then
-		sed -e 's#return !apparmorFull#if !apparmorFull {\n\t\tpanic("USE=forced-devmode is disabled")\n\t}\n\treturn false#' \
-			-i "sandbox/forcedevmode.go" || die
-		grep -q 'panic("USE=forced-devmode is disabled")' "sandbox/forcedevmode.go" || die "failed to disable forced-devmode"
-	fi
-
-	sed -i 's:command -v git >/dev/null:false:' -i "mkversion.sh" || die
-
-	./mkversion.sh "${PV}"
-	pushd "cmd" >/dev/null || die
-	eautoreconf
-}
-
-src_configure() {
-	SNAPD_MAKEARGS=(
-		"BINDIR=${EPREFIX}/usr/bin"
-		"DBUSSERVICESDIR=${EPREFIX}/usr/share/dbus-1/services"
-		"LIBEXECDIR=${EPREFIX}/usr/lib"
-		"SNAP_MOUNT_DIR=${EPREFIX}/var/lib/snapd/snap"
-		"SYSTEMDSYSTEMUNITDIR=$(systemd_get_systemunitdir)"
-	)
-	export CGO_ENABLED="1"
-	export CGO_CFLAGS="${CFLAGS}"
-	export CGO_CPPFLAGS="${CPPFLAGS}"
-	export CGO_CXXFLAGS="${CXXFLAGS}"
-
-	pushd "${S}/cmd" >/dev/null || die
-	econf --libdir="${EPREFIX}/usr/lib" \
-		--libexecdir="${EPREFIX}/usr/lib/snapd" \
-		$(use_enable apparmor) \
-		--enable-nvidia-biarch \
-		--with-snap-mount-dir="${EPREFIX}/var/lib/snapd/snap"
-}
-
-src_compile() {
-	export -n GOCACHE XDG_CACHE_HOME
-	export GOBIN="${S}/bin"
-
-	local file
-	for file in "${S}/po/"*.po; do
-		msgfmt "${file}" -o "${file%.po}.mo" || die
-	done
-
-	emake -C "${S}/data" "${SNAPD_MAKEARGS[@]}"
-
-	local -a flags=(-buildmode=pie -ldflags "-s -linkmode external -extldflags '${LDFLAGS}'" -trimpath)
-	local -a staticflags=(-buildmode=pie -ldflags "-s -linkmode external -extldflags '${LDFLAGS} -static'" -trimpath)
-
-	local cmd
-	for cmd in snap snapd snapd-apparmor snap-bootstrap snap-failure snap-preseed snap-recovery-chooser snap-repair snap-seccomp; do
-		go build ${GOFLAGS} -mod=vendor -o "${GOBIN}/${cmd}" "${flags[@]}" \
-		    -v -x "github.com/snapcore/${PN}/cmd/${cmd}"
-		[[ -e "${GOBIN}/${cmd}" ]] || die "failed to build ${cmd}"
-	done
-	for cmd in snapctl snap-exec snap-update-ns; do
-		go build ${GOFLAGS} -mod=vendor -o "${GOBIN}/${cmd}" "${staticflags[@]}" \
-		    -v -x "github.com/snapcore/${PN}/cmd/${cmd}"
-		[[ -e "${GOBIN}/${cmd}" ]] || die "failed to build ${cmd}"
-	done
-}
-
-src_install() {
-	emake -C "${S}/data" install "${SNAPD_MAKEARGS[@]}" DESTDIR="${D}"
-	emake -C "${S}/cmd" install "${SNAPD_MAKEARGS[@]}" DESTDIR="${D}"
-
-	if use apparmor; then
-		mv "${ED}/etc/apparmor.d/usr.lib.snapd.snap-confine"{,.real} || die
-		keepdir /var/lib/snapd/apparmor/profiles
-	fi
-	keepdir /var/lib/snapd/{apparmor/snap-confine,cache,cookie,snap,void}
-	fperms 700 /var/lib/snapd/{cache,cookie}
-
-	dobin "${GOBIN}/"{snap,snapctl}
-	ln "${ED}/usr/bin/snapctl" "${ED}/usr/lib/snapd/snapctl" || die
-
-	exeinto /usr/lib/snapd
-	doexe "${GOBIN}/"{snapd,snapd-apparmor,snap-bootstrap,snap-failure,snap-exec,snap-preseed,snap-recovery-chooser,snap-repair,snap-seccomp,snap-update-ns} \
-		"${S}/"{cmd/snap-discard-ns/snap-discard-ns,cmd/snap-gdb-shim/snap-gdb-shim,cmd/snap-mgmt/snap-mgmt} \
-		"${S}/data/completion/bash/"{complete.sh,etelpmoc.sh,}
-
-	dobashcomp "${S}/data/completion/bash/snap"
-
-	insinto /usr/share/zsh/site-functions
-	doins "${S}/data/completion/zsh/_snap"
-
-	insinto "/usr/share/polkit-1/actions"
-	doins "${S}/data/polkit/io.snapcraft.snapd.policy"
-
-	dodoc "${S}/packaging/ubuntu-16.04/changelog"
-	domo "${S}/po/"*.mo
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-	xdg_desktop_database_update
-	tmpfiles_process snapd.conf
-
-	if use apparmor && [[ -z ${ROOT} && -e /sys/kernel/security/apparmor/profiles &&
-		$(wc -l < /sys/kernel/security/apparmor/profiles) -gt 0 ]]; then
-		apparmor_parser -r "${EPREFIX}/etc/apparmor.d/usr.lib.snapd.snap-confine.real"
-	fi
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}