gentoo auto-resync : 29:05:2024 - 00:07:15

12 files changed, 37 insertions, 374 deletions

diff --git a/app-containers/Manifest.gz b/app-containers/Manifest.gz
index 9bd7d1fd14a1..f5f41f00fd1c 100644
--- a/app-containers/Manifest.gz
+++ b/app-containers/Manifest.gz
diff --git a/app-containers/crun/Manifest b/app-containers/crun/Manifest
index 20d50b9c5f16..7aa25b8424d3 100644
--- a/app-containers/crun/Manifest
+++ b/app-containers/crun/Manifest
@@ -3,6 +3,6 @@ DIST crun-1.11.2.tar.xz 738176 BLAKE2B ef13475089c87599159ce00dd26fbb19c7f2bb956
 DIST crun-1.14.3.tar.xz 750456 BLAKE2B 5a63b5da2f85ff1a83d4589be224c5b7a1123b6d7714b90a63c1907b78d42392aff25ffe5d9a4127173ac47026d57e9c93a39f5ba4b07de7f9f3722c14e6d203 SHA512 d6645c519ff00dda5def6d58240600d15e76969489918d51c0def2fee7dbad6374f83e5afc14a998d176aa2944765df5cd84c3031b265a1931ab23f2fc965fc1
 DIST crun-1.8.4.tar.xz 729552 BLAKE2B 8169518a0ddd8deb3820f7030d03dec6941d5d34fb73a036b82f15b0d8f2f702e117de00b829a16cb9976e118f5a5ca732b1cd572708f664cfeafc564f883824 SHA512 2ed80db2e7ddd1438bbe33e99ec2cdbcc55c4869504f719ff9302e834929752af09a59cd905accb37ee5f6cae3b9b16fd4f4c3fdab31db5fc38b007c1505bfa0
 EBUILD crun-1.11.2.ebuild 1829 BLAKE2B 7de0ec9104725bee5336c6e766077e87cbf7ab89ad9363ad409c4ba3df2f52b04294828fd4573cde35f740b0ef17f534b72b5d532321a98764f376daabc3fd9d SHA512 77c44e288c714be902a8714b9cbdf23245c24790a7df1766add33516b380083a2ad1034f19f38a95e135a692d6d92318d4ba9cfd23a644ec1eb476b2e59e3edd
-EBUILD crun-1.14.3.ebuild 1628 BLAKE2B 1aee422d6c5b01e1c0cb1094ce6c2d02e3a92918959a5cd838d760c9a367c3f85d687aa0876c45885fca84ae1425293e9eb19d1bc88f140e31dc894f9bb7d036 SHA512 10660563d1ecd2181b363bbf51839443bafd0355ab2336e531848e236117bd269a8972764ce5ab84c28390b1ac5ba640f893adb3347a0557d5b56308ac508519
+EBUILD crun-1.14.3.ebuild 1625 BLAKE2B c405ac2c2fce7b8167e8b8df618ab54bcd5d0b009ba88f94cd8d54e429387a5748e76d26e889a9791a331b8814a242fe89958cef8d0592ab8c17dbbd9bd3b042 SHA512 ed5b0d330c516edba0fed743d04c12cbdabd4ca6adc8704068d5af6f26a5e949181cadd13cd5072af09b54e92fc5df2c7a27fb7c0babed7837f5b0aa9d63b9f5
 EBUILD crun-1.8.4.ebuild 1672 BLAKE2B 388b4daf7cc6fb32e33e9114253cab94281abff7a17d260dcfa255042ba57489e2dff0b95bfa6f5d700fac01066c9d2cb282becc8ac90458ed7c10d5f967aa90 SHA512 69077ea7f94586489abf3b16d0cef1f793569ab2db7a3334c89c7af7e2d4561479de456838da9f5aa1a9eaa5c3f51471436aa66a8595f643ed8a60eda7f8a0eb
 MISC metadata.xml 1300 BLAKE2B a0ae27420fca097e4e7b5e983de3b76fef43bf13887bd5fe903da14e20c2f0ebd2fc273dae74e32e28c2768b5f8d6e5e6c8b4c9f07ca6d47e41902621173a167 SHA512 1699a89a01de32b580bc74bc747430ef7b1a6284b2f459b4041b22de0efbebda45778803deb512a61806ed8e2998b141caefb7830acafc68d42ce4343b193dd6
diff --git a/app-containers/crun/crun-1.14.3.ebuild b/app-containers/crun/crun-1.14.3.ebuild
index 49ec3519eadb..d44f6e074aca 100644
--- a/app-containers/crun/crun-1.14.3.ebuild
+++ b/app-containers/crun/crun-1.14.3.ebuild
@@ -15,7 +15,7 @@ if [[ "$PV" == *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/containers/${PN}.git"
 else
 	SRC_URI="https://github.com/containers/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv"
+	KEYWORDS="amd64 ~arm arm64 ppc64 ~riscv"
 fi
 
 LICENSE="GPL-2+ LGPL-2.1+"
diff --git a/app-containers/podman/Manifest b/app-containers/podman/Manifest
index 5685685c64ff..749e0ecc37d8 100644
--- a/app-containers/podman/Manifest
+++ b/app-containers/podman/Manifest
@@ -10,8 +10,8 @@ AUX seccomp-toggle-4.7.0.patch 400 BLAKE2B 9f02e58c06b507a294207c66bd5ea218f8780
 DIST podman-4.9.4.tar.gz 21733620 BLAKE2B 17d099c0a13fbbb77556742313c39995127fc97b4086ef3c2d74a92cc0a4f825a6c729dd099c6d4f4cd3d2ebfd470494babdeaa85a5653b327ea1a16fb5ea993 SHA512 7b52555789a1c214fcf26b0826bdda6cf0ccca588f87c0f15ac5e8358ddac625e17cafbe6a43de07cad964e1418b5ee0d2e38a5cb5dc6f6d4e638399749a7f7b
 DIST podman-5.0.2.tar.gz 23811875 BLAKE2B e943eb36eb0b80332223afc5d971c0886f6eaffeb7133c634d28c0a38e9aae6a54266691067dbca7684882f8b6dad72c3d5de2287ec5a7e8fb4b1cfd96df0b4d SHA512 70dbac9fc81d66eb9b0a5174f5776b805397005cacca917674d2b001591fadd05a776c956e693bad932e9eefe591c35da5c566e8e9e01db8be42bc454cd03104
 DIST podman-5.0.3.tar.gz 23814179 BLAKE2B 46385710e4d24f8eca3a7c98c18a97b96ecd4691b3c965c5a5e7bc690d40d892a6d5fb71c1dd8ec56cc907a2167ab5ee795b4d2c2279c58cef3a5a1cece8b678 SHA512 c605a52cc5aba43d485796c4986f2d1be704e5c931473bf5ba1cf77f703cdb3d16f41d33da0b25287e8d001077f77caf117d3ea5dbd7c56a744274025d9ab07d
-EBUILD podman-4.9.4.ebuild 4333 BLAKE2B 5867c27e10a823ff2b6065244a7fddae63f65d2626fef1306da79f34136b191e2db42c03c57a36c5e4a672415c43f123562d93858491c5f62fce422da6b30ea5 SHA512 acd08fafd1626b6bfaae89fad0acabc68d442b169acbe9c7f97184f7edf2edaa83bf7c593b4acc15b95adc4f4558c8f2401f86489e91ff3d31e0c62801332c30
-EBUILD podman-5.0.2.ebuild 3412 BLAKE2B 0194429cf22dec482365035063ae9de98c3a89d853eaf3bf7e2b887504c4603db30126383c2c4ab84c3f16e7d47df18519317919af01af605ae4603fa2d01657 SHA512 498bbc1b729e20ebbc3564d70292398c4acbd59db7825dead070c24297381f722db70f0f99f31e6548454ff4ac1bae048c0434eccc42d9f505b211c21fc9eed4
-EBUILD podman-5.0.3.ebuild 3412 BLAKE2B 0194429cf22dec482365035063ae9de98c3a89d853eaf3bf7e2b887504c4603db30126383c2c4ab84c3f16e7d47df18519317919af01af605ae4603fa2d01657 SHA512 498bbc1b729e20ebbc3564d70292398c4acbd59db7825dead070c24297381f722db70f0f99f31e6548454ff4ac1bae048c0434eccc42d9f505b211c21fc9eed4
-EBUILD podman-9999.ebuild 3412 BLAKE2B 0194429cf22dec482365035063ae9de98c3a89d853eaf3bf7e2b887504c4603db30126383c2c4ab84c3f16e7d47df18519317919af01af605ae4603fa2d01657 SHA512 498bbc1b729e20ebbc3564d70292398c4acbd59db7825dead070c24297381f722db70f0f99f31e6548454ff4ac1bae048c0434eccc42d9f505b211c21fc9eed4
+EBUILD podman-4.9.4.ebuild 4502 BLAKE2B d58fc9e32f8eb801589184d767fa1aaaaa493f40e78aa9dd6c8d5c1d0c577377228729884ac74a9f8fcc23dac7b2c9bd84ab3f54d17d169ad0d06d447272a0c6 SHA512 3c086dc648321fe7cd73d50f5f2beadf0ea88d581d9d5165dad7473615e47e0ecbf83732123d09a5dc825f1b8c018fbd960d8641c82455719181210f7e604094
+EBUILD podman-5.0.2.ebuild 3581 BLAKE2B 9e0e9beb556ac2cb7ccfc3ecb8f41d5fdd44945dc53b65ce55c06dd02aacddec7b6921b703d2da59a0f01c90a21c5f2c1c5a32bcebd1ddb0964ecae1c43b8617 SHA512 b613ceab57b3ff1c4d1b84e1dbaaaed4b70cddaf5e71338416f8c4d300fb1b95e1e7f5d23efb51cc90511f208dccbc4d00bf0c45e98f215411bb13bfd5f61284
+EBUILD podman-5.0.3.ebuild 3581 BLAKE2B 9e0e9beb556ac2cb7ccfc3ecb8f41d5fdd44945dc53b65ce55c06dd02aacddec7b6921b703d2da59a0f01c90a21c5f2c1c5a32bcebd1ddb0964ecae1c43b8617 SHA512 b613ceab57b3ff1c4d1b84e1dbaaaed4b70cddaf5e71338416f8c4d300fb1b95e1e7f5d23efb51cc90511f208dccbc4d00bf0c45e98f215411bb13bfd5f61284
+EBUILD podman-9999.ebuild 3581 BLAKE2B 9e0e9beb556ac2cb7ccfc3ecb8f41d5fdd44945dc53b65ce55c06dd02aacddec7b6921b703d2da59a0f01c90a21c5f2c1c5a32bcebd1ddb0964ecae1c43b8617 SHA512 b613ceab57b3ff1c4d1b84e1dbaaaed4b70cddaf5e71338416f8c4d300fb1b95e1e7f5d23efb51cc90511f208dccbc4d00bf0c45e98f215411bb13bfd5f61284
 MISC metadata.xml 1709 BLAKE2B 0138cd1f7fec54f2b15f8a8af7a29ee0202b0c824371ed6f45726c06e84c5a0c78e6446f817ee2b81c44320203b50c54072757b9cd271080cd07a072141760ce SHA512 65fdac8344812dd71fcf7018da7320a055870f48af6c4f623a9c65f5375e69eee142409ff3451c5e046eef648e0ac00bf96550a7dfc37be5b7aa3aff1a51d42b
diff --git a/app-containers/podman/podman-4.9.4.ebuild b/app-containers/podman/podman-4.9.4.ebuild
index 845dcbc2a7aa..ea2bd34e2507 100644
--- a/app-containers/podman/podman-4.9.4.ebuild
+++ b/app-containers/podman/podman-4.9.4.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{11,12} )
 
-inherit go-module python-any-r1 tmpfiles linux-info
+inherit go-module python-any-r1 tmpfiles toolchain-funcs linux-info
 
 DESCRIPTION="A tool for managing OCI containers and pods with Docker-compatible CLI"
 HOMEPAGE="https://github.com/containers/podman/ https://podman.io/"
@@ -103,6 +103,12 @@ src_compile() {
 	# https://github.com/gentoo/gentoo/pull/33531#issuecomment-1786107493
 	[[ ${PV} != 9999* ]] && export COMMIT_NO="" GIT_COMMIT="" EPOCH_TEST_COMMIT=""
 
+	# Use proper pkg-config to get gpgme cflags and ldflags when
+	# cross-compiling, bug 930982.
+	if tc-is-cross-compiler; then
+		tc-export PKG_CONFIG
+	fi
+
 	# BUILD_SECCOMP is used in the patch to toggle seccomp
 	emake BUILDFLAGS="-v -work -x" GOMD2MAN="go-md2man" BUILD_SECCOMP="$(usex seccomp)" all $(usev wrapper docker-docs)
 }
diff --git a/app-containers/podman/podman-5.0.2.ebuild b/app-containers/podman/podman-5.0.2.ebuild
index b535f608f817..738613b007dc 100644
--- a/app-containers/podman/podman-5.0.2.ebuild
+++ b/app-containers/podman/podman-5.0.2.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{11,12} )
 
-inherit go-module python-any-r1 tmpfiles linux-info
+inherit go-module python-any-r1 tmpfiles toolchain-funcs linux-info
 
 DESCRIPTION="A tool for managing OCI containers and pods with Docker-compatible CLI"
 HOMEPAGE="https://github.com/containers/podman/ https://podman.io/"
@@ -95,6 +95,12 @@ src_compile() {
 	# https://github.com/gentoo/gentoo/pull/33531#issuecomment-1786107493
 	[[ ${PV} != 9999* ]] && export COMMIT_NO="" GIT_COMMIT="" EPOCH_TEST_COMMIT=""
 
+	# Use proper pkg-config to get gpgme cflags and ldflags when
+	# cross-compiling, bug 930982.
+	if tc-is-cross-compiler; then
+		tc-export PKG_CONFIG
+	fi
+
 	# BUILD_SECCOMP is used in the patch to toggle seccomp
 	emake BUILDFLAGS="-v -work -x" GOMD2MAN="go-md2man" BUILD_SECCOMP="$(usex seccomp)" \
 		  all $(usev wrapper docker-docs)
diff --git a/app-containers/podman/podman-5.0.3.ebuild b/app-containers/podman/podman-5.0.3.ebuild
index b535f608f817..738613b007dc 100644
--- a/app-containers/podman/podman-5.0.3.ebuild
+++ b/app-containers/podman/podman-5.0.3.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{11,12} )
 
-inherit go-module python-any-r1 tmpfiles linux-info
+inherit go-module python-any-r1 tmpfiles toolchain-funcs linux-info
 
 DESCRIPTION="A tool for managing OCI containers and pods with Docker-compatible CLI"
 HOMEPAGE="https://github.com/containers/podman/ https://podman.io/"
@@ -95,6 +95,12 @@ src_compile() {
 	# https://github.com/gentoo/gentoo/pull/33531#issuecomment-1786107493
 	[[ ${PV} != 9999* ]] && export COMMIT_NO="" GIT_COMMIT="" EPOCH_TEST_COMMIT=""
 
+	# Use proper pkg-config to get gpgme cflags and ldflags when
+	# cross-compiling, bug 930982.
+	if tc-is-cross-compiler; then
+		tc-export PKG_CONFIG
+	fi
+
 	# BUILD_SECCOMP is used in the patch to toggle seccomp
 	emake BUILDFLAGS="-v -work -x" GOMD2MAN="go-md2man" BUILD_SECCOMP="$(usex seccomp)" \
 		  all $(usev wrapper docker-docs)
diff --git a/app-containers/podman/podman-9999.ebuild b/app-containers/podman/podman-9999.ebuild
index b535f608f817..738613b007dc 100644
--- a/app-containers/podman/podman-9999.ebuild
+++ b/app-containers/podman/podman-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{11,12} )
 
-inherit go-module python-any-r1 tmpfiles linux-info
+inherit go-module python-any-r1 tmpfiles toolchain-funcs linux-info
 
 DESCRIPTION="A tool for managing OCI containers and pods with Docker-compatible CLI"
 HOMEPAGE="https://github.com/containers/podman/ https://podman.io/"
@@ -95,6 +95,12 @@ src_compile() {
 	# https://github.com/gentoo/gentoo/pull/33531#issuecomment-1786107493
 	[[ ${PV} != 9999* ]] && export COMMIT_NO="" GIT_COMMIT="" EPOCH_TEST_COMMIT=""
 
+	# Use proper pkg-config to get gpgme cflags and ldflags when
+	# cross-compiling, bug 930982.
+	if tc-is-cross-compiler; then
+		tc-export PKG_CONFIG
+	fi
+
 	# BUILD_SECCOMP is used in the patch to toggle seccomp
 	emake BUILDFLAGS="-v -work -x" GOMD2MAN="go-md2man" BUILD_SECCOMP="$(usex seccomp)" \
 		  all $(usev wrapper docker-docs)
diff --git a/app-containers/snapd/Manifest b/app-containers/snapd/Manifest
index 6abc9c1f0998..bdeb5c000400 100644
--- a/app-containers/snapd/Manifest
+++ b/app-containers/snapd/Manifest
@@ -1,12 +1,8 @@
 AUX README.gentoo 1941 BLAKE2B dd25269f2aaaea693701d74511d632bc45f2c99954ae683cb81d4df41c4c1f8007bb6c337234e46bfc5973aa7e8356cd12ac510e9109eca09890cbc42bd184bb SHA512 5b522e6c29bdad84a71245fa1f0289e9cfed0501d936b433829f66ef9d655f3cc13d6bca29beeae2c00e1b68f9fa30058608b9c4cde86ba66eab67bd011c9d00
-DIST snapd-2.57.6.tar.xz 6889052 BLAKE2B 5d1190f3d1ccc6446f950cc95c09180707c3a96285bcdd197aef06b2d69cfef6daf85a93844f105dd434b29b73d3b9c832dfcbebcdc2451443eb5421046de849 SHA512 cd74fa92cddff3452448a50536ded504c68ca6f786b465b8561ccc43c02856742a895efb71bf92b8d125173e0d083faf61ca563f69da03ebf3c4df1b0b0b8d5e
 DIST snapd-2.58.tar.xz 6980916 BLAKE2B d3de507513db808fa4f85498b5c238de143f06660f1d677186c8c763b38643a2486e25b747977b3eb584619d79ea0a12e88dc5a909045a853c1d8f849f2c1638 SHA512 555915b8b4d9d2d91a3ba19e9e78cf6b19d9683a9f390ad225aa5876320cb8595b464d6133706c4923fc15fbe04ba2b65a47e403c9a2d8859adae827f8ec000a
-DIST snapd-2.60.3.tar.xz 7184964 BLAKE2B c40c4e041a91de1732c23b5845a322873498da76d50e0c91e97941d1fc4f6f1991fe2b009414952bf0ebb614e8e19a0015c698ff09c61a12940349ea714f77f0 SHA512 630738c956773354006c195bfe954902b0d082e94345b54c6a6795139d36e1f95a236c6e9a8947338e03caca03520c6e8c1a1c44d3788ec93107f7f97b2d952d
-DIST snapd-2.60.4.tar.xz 7187708 BLAKE2B 488ca5b70e9174f07ac54cbc221a323607e337dbde45e7c4d11669ed2f61409fa7bb21b4a5432cd84fb312d92cacf19e5bccc80ef77b71233e19e158d937ac04 SHA512 3035e4e5d52fef00606bc532f855817200d9f6035f660b0377d5dccf5bb64bbf0a94a4e3b8f3941e54b62259378dae4084baa2a29fb5120c714559c899c33c0e
 DIST snapd-2.61.tar.xz 7626784 BLAKE2B d716e91df4702fbd415bb6204a4557f37afd3dce187e3bca33b12a2ac5a1b54d1c31473d1537a784f6cbbfaf213f676d1f1b29d716e8c5f45a785229c9f3e018 SHA512 2fd432d7ef2204535576e980de7060ad15a0b3610b25e0f41b630ae34e172f97460f0a38d9d456af08dd36c619e90119219788a49e56a69afc7fbf014fc1db22
-EBUILD snapd-2.57.6.ebuild 5169 BLAKE2B f96430c3131d507c6b7566f7b085851a6db569a93dae668d0a34d13319c06f563566858367bf028ed600f1d0ba8f29e5970c56ca72241b7b72eccf5318939633 SHA512 b7551510c5b5adf6f12c2df137ef54c8c62f96984141f49e2706a7c88c65490b03f43674b8314c82cb83bbad5de560285d1c10b1b11bf79359034cf758096caf
+DIST snapd-2.63.tar.xz 7502152 BLAKE2B 8ae38699227b7f0e6b512526fc8857b3e50ed220ac95860c372ca0a4b26f5a034bd9309688217696444254e41cc70fe3a45c0bf026c84e5f950e7df8aebd47a0 SHA512 956ee142ab6cb5de522307f7844819c861b2831e22dab56f7bfca16ff7f947093f8a8727d49370cc000ed71f3af9c57cff9c4be93ebf199e8c631a152a68ec5b
 EBUILD snapd-2.58.ebuild 5206 BLAKE2B 9df542b74025c4151e20ee6eff9e640742587831b29d3195c97b0ee60ecbe8ce50558e0ecd437b26d87c378575e9d7b1c384ace7f6d647e4b34c519df25ddb68 SHA512 4d2541d85b110db48c3949a3e1a82a0b1ab454ed58a166381011ff452b171e279bebbb5f40e3e7e266849cdf0e2d5d608c12c19c97214d688cd9e739f7be0497
-EBUILD snapd-2.60.3.ebuild 5211 BLAKE2B 42cb4ab1a965b0b424643aa299e9d0da1956b657373a6c4c594911969b221c65f19569fa26359424fe14e4ba20273c902ef39b8d10c8ebe2f35a4833ffb5f0f1 SHA512 5e2ba615523aaf978404acebdf9137952ff31144ade0fda68f8c29b127b97c4e7786839a1b338103435963b4ea884a43fdd66de121b1c79982be39a211f50004
-EBUILD snapd-2.60.4.ebuild 5211 BLAKE2B 42cb4ab1a965b0b424643aa299e9d0da1956b657373a6c4c594911969b221c65f19569fa26359424fe14e4ba20273c902ef39b8d10c8ebe2f35a4833ffb5f0f1 SHA512 5e2ba615523aaf978404acebdf9137952ff31144ade0fda68f8c29b127b97c4e7786839a1b338103435963b4ea884a43fdd66de121b1c79982be39a211f50004
 EBUILD snapd-2.61.ebuild 5210 BLAKE2B 68d8b4bfc3a34c17a28de28ef53549cf058dfee074dccf7fbcf33d6ae5f3d32b27279cba0b2ee1cdc7fbd2b8737abe83ec9816ce25fa354cb0fe37d7e1adfe33 SHA512 ddd4fbf0a5c4959230aa59dc1d5ed65389af526e589cb879750fc3d6e07d477b9f38e2c6b47745a47dd0afaeac4f6fa02333d9e1c0532abc569662e76914d6f2
+EBUILD snapd-2.63.ebuild 5211 BLAKE2B bf0925ea4702b0431471e021fb7ab31fd279bd5eae98eda2d08ec0087224dc5de4dbe1e8e37efb509237264bb1e0ff341adfb2ebc9b37a3f07d0137ae91d2cd5 SHA512 79951c222e3859ecec7b1d863f787fc1e2eb062163b22ef991fded6be998043339ee12d20b2db1a95b3703dd77ee26749f8e6504bcf5e0139e452a345d32ed8b
 MISC metadata.xml 457 BLAKE2B 204b67bf36a85bd18f4111b4d8590195908bf15ae0bafedb76b6124b7d19c6570627925e5dfc46dd4dd47732c6d8f1066451831a0cc475518aab8a29403ececc SHA512 07671272b60f1a6793e3f36b096e99153263830314359eb86000aec65266c61ebe9c448af4ec166d6163e3ca2325f36cc74fe5aace95e7ffa7b0293516b18120
diff --git a/app-containers/snapd/snapd-2.57.6.ebuild b/app-containers/snapd/snapd-2.57.6.ebuild
deleted file mode 100644
index 35255adff108..000000000000
--- a/app-containers/snapd/snapd-2.57.6.ebuild
+++ /dev/null
@@ -1,178 +0,0 @@
-# Copyright 2020-2022 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 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
-
-	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.60.4.ebuild b/app-containers/snapd/snapd-2.60.4.ebuild
deleted file mode 100644
index 7bd5d8f6f6e3..000000000000
--- a/app-containers/snapd/snapd-2.60.4.ebuild
+++ /dev/null
@@ -1,179 +0,0 @@
-# Copyright 2020-2023 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
-}
diff --git a/app-containers/snapd/snapd-2.60.3.ebuild b/app-containers/snapd/snapd-2.63.ebuild
index 7bd5d8f6f6e3..56a00504636a 100644
--- a/app-containers/snapd/snapd-2.60.3.ebuild
+++ b/app-containers/snapd/snapd-2.63.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020-2023 Gentoo Authors
+# Copyright 2020-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8