Merge updates from master

15 files changed, 166 insertions, 402 deletions

diff --git a/app-editors/vscode/Manifest b/app-editors/vscode/Manifest
index 39f06af0bf3b..d58257400504 100644
--- a/app-editors/vscode/Manifest
+++ b/app-editors/vscode/Manifest
@@ -1,9 +1,6 @@
-DIST vscode-1.94.2-amd64.tar.gz 145188698 BLAKE2B 0ba98d4af28da95d2d19b5cbb27b18a6c6f82a73c585e57ef94868133f595050b4ab1e78eb25d02a40fcf187057467e88f421e4e22544e301c709d2b1d590e0f SHA512 41f02fe383a825c0e50dae1a5527c2e62e6d8b930f62667a4ad17479264325f3a23bbf196a8ed5121a18bb9b3e853b7c840a0e1490157dc74adaa654bc566062
-DIST vscode-1.94.2-arm.tar.gz 129620768 BLAKE2B c31a0b60a8c0e6fcf6010846f29a1ed14804b20b5910d91e896e4f43f18ac26413f32f89546be1f5e68a4dcbcb24741369e8dd1f0d48436beb41e6b40c01da81 SHA512 37e541de5659b8a7097c54e5b7f6313a8e7f93691bbe640b302c1fc0c8588b8560c75e037d7a29df635bca47be791b29886c8171f5e15b0b76fc0e1069b68814
-DIST vscode-1.94.2-arm64.tar.gz 141296756 BLAKE2B 160dbbeea65cd482c42e7d48c120c63167fe274ebfab2c458923930aa9f5b69c005bbddd7d66139084809b73ff7ce04defc9421b738ef608a8f11a7385ee14ea SHA512 bba6212737b30f43ee943d3ab8883d6c184fe6e2f66375cb893521d766a75fb139664ea18f4e91436fb7863c5a72534b02a2d6aff6953c09085b5b5eec506064
-DIST vscode-1.95.1-amd64.tar.gz 148382845 BLAKE2B af91c360425684b660ab165bd5d10084d393be0ed84769c0b4967cc575aa62d1c6478410adb0aa3467e66dd40750ba068c026d3d37923997e93300ef773d76ed SHA512 c48f070031e239b5140028e0af05208a5519a844513b5ca99f779fb62cb56f03342df5809f0cfbf6fdd940ddbfb7176acf6f3ecf041f7484aa02de0457e1555c
-DIST vscode-1.95.1-arm.tar.gz 132440825 BLAKE2B 99e79889dcb2d1131963a08258c6b1dc4519e08000dc707e0e19531fa015553efa7e49caeb7b813edaa59cf43186d979dff552bd0c2ff0559b09149666e66a15 SHA512 3e35c51b5127ce89743c465d4ffe61d8d5b6b52bea025cc09a55461289a1d8a22255a1f08151609177e7694c586cf918a0c562dd39051eb17aea02af60f33c87
-DIST vscode-1.95.1-arm64.tar.gz 144398553 BLAKE2B 54d9bcba210df773a10361c79329d2d7511d942a5eead4af619ee84f6d159ed3b694cbb5f9d340e25fc4d39cb40de1e9c17894b16b63b265903260d03ef7e655 SHA512 aec996bc4071eba11d19d2a17dc92e127569d99e08fa0c2f9f66e4d8c62529457dbc65b21180442fd58197a5ad534a21eb287286fa3ac317171009733e6db86f
 DIST vscode-1.95.2-amd64.tar.gz 148406981 BLAKE2B cf76d73f3ea9d993cb25a2c69ddca39ea4b17754ed3eba1e778169f5471fcc57b4ebf79357f80f47aa8d58e0913587e9558f5fa95cf031ae1eddf7f702eac200 SHA512 f203f8f7e40d665d6eb77069473f10842e896776dfe3c0c8c502fa46798f524c8125d50020576e33ea3890b592d5ddf36d488039fbc75d0bd6d638304a8059ad
 DIST vscode-1.95.2-arm.tar.gz 132480370 BLAKE2B ef4f2c352be078a0941aba8fb84efb6795cd95ef9c2d14620fc1dfd4e7c97006618e100ab0434c380007b30b540cc58e3a65dc830e5faf8588fc0bdbc78f2610 SHA512 e1a3990bfbdbfac3b1ec7041e1e85307d39a1beb3bc42c79a23a9f07aa596fd41c8528b086702535fa862adadfe97397d4bd3c90fff3b3bcb1cddb1b78a61e8e
 DIST vscode-1.95.2-arm64.tar.gz 144419300 BLAKE2B 2f0720344a72b529e1dff6d413e9e715d47a6436610564911d584aad218998547f84672ac934effdcc211957c7d9c17acd8464d4c159a6b3451149d944127691 SHA512 c8680de5489b61542ca6d3d9a62b6a1c273ee4a5fcfbe7bb78e9da9fcee7668a908c72ec2081e1caf5dae539a884f3d9576ef91373c38a9e27d1c5b7c1b65d7e
+DIST vscode-1.95.3-amd64.tar.gz 148378619 BLAKE2B 2bb94b67e48583a3484e2c3af637f0a05b88340e862bdb3f318aa15cf22f78ac165f0769b3a56d7565763f0ce6aa31e793f54981b5b45029384f39c857fbbed9 SHA512 c20ff3e28c81070bc3919ad879e14ba898f14b2fa47bba5574144665f01c811bf3d93be72afbe314cba382faaae187f93c5c7f9bf60c488095fbb327115fba62
+DIST vscode-1.95.3-arm.tar.gz 132455720 BLAKE2B 62fcf8f1708bca3f92e2e710b990b8a714f5386edda293e720fcbf1fba972664d9db259acedf045c79f091edb6e3fe29d6fd08ebeebb72c01ac0498737000216 SHA512 bc3dc9611eaaab8c65574417c4f98603a341928a45b52c182b3d0dcaa1cc74ef815a61bd47ace6de164de688e92bd9f17cb6c2b032f8af00010a360c223596f5
+DIST vscode-1.95.3-arm64.tar.gz 144398988 BLAKE2B 2bae1b98e3bcb5c3bab388035b5b0b1137b7e7ff77eda6f6809eca424f1956845218fb2c5366d7ec24e71f7b1684935e12329f481168c977a3c0553b549e6f02 SHA512 bc3386abd90231c11d9a10b6bba62b627dadd4701fb06c7e20eb4e2b80284416c36532b023767daecb58ab3a70107151ca570b1d345d3a1415adaa7510a3bd0a
diff --git a/app-editors/vscode/vscode-1.95.1.ebuild b/app-editors/vscode/vscode-1.95.1.ebuild
deleted file mode 100644
index 3d10ad08d715..000000000000
--- a/app-editors/vscode/vscode-1.95.1.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit desktop pax-utils xdg optfeature
-
-DESCRIPTION="Multiplatform Visual Studio Code from Microsoft"
-HOMEPAGE="https://code.visualstudio.com"
-SRC_URI="
-	amd64? ( https://update.code.visualstudio.com/${PV}/linux-x64/stable -> ${P}-amd64.tar.gz )
-	arm? ( https://update.code.visualstudio.com/${PV}/linux-armhf/stable -> ${P}-arm.tar.gz )
-	arm64? ( https://update.code.visualstudio.com/${PV}/linux-arm64/stable -> ${P}-arm64.tar.gz )
-"
-S="${WORKDIR}"
-
-LICENSE="
-	Apache-2.0
-	BSD
-	BSD-1
-	BSD-2
-	BSD-4
-	CC-BY-4.0
-	ISC
-	LGPL-2.1+
-	Microsoft-vscode
-	MIT
-	MPL-2.0
-	openssl
-	PYTHON
-	TextMate-bundle
-	Unlicense
-	UoI-NCSA
-	W3C
-"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~arm ~arm64"
-IUSE="egl kerberos wayland"
-RESTRICT="mirror strip bindist"
-
-RDEPEND="
-	>=app-accessibility/at-spi2-core-2.46.0:2
-	app-crypt/libsecret[crypt]
-	app-misc/ca-certificates
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	media-libs/alsa-lib
-	media-libs/libglvnd
-	media-libs/mesa
-	net-misc/curl
-	sys-apps/dbus
-	sys-libs/zlib
-	sys-process/lsof
-	x11-libs/cairo
-	x11-libs/gtk+:3
-	x11-libs/libdrm
-	x11-libs/libX11
-	x11-libs/libxcb
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libxkbcommon
-	x11-libs/libxkbfile
-	x11-libs/libXrandr
-	x11-libs/libXScrnSaver
-	x11-libs/pango
-	x11-misc/xdg-utils
-	kerberos? ( app-crypt/mit-krb5 )
-"
-
-QA_PREBUILT="*"
-
-src_install() {
-	if use amd64; then
-		cd "${WORKDIR}/VSCode-linux-x64" || die
-	elif use arm; then
-		cd "${WORKDIR}/VSCode-linux-armhf" || die
-	elif use arm64; then
-		cd "${WORKDIR}/VSCode-linux-arm64" || die
-	else
-		die "Visual Studio Code only supports amd64, arm and arm64"
-	fi
-
-	# Cleanup
-	rm -r ./resources/app/ThirdPartyNotices.txt || die
-
-	# Disable update server
-	sed -e "/updateUrl/d" -i ./resources/app/product.json || die
-
-	if ! use kerberos; then
-		rm -r ./resources/app/node_modules/kerberos || die
-	fi
-
-	# Install
-	pax-mark m code
-	mkdir -p "${ED}/opt/${PN}" || die
-	cp -r . "${ED}/opt/${PN}" || die
-	fperms 4711 /opt/${PN}/chrome-sandbox
-
-	dosym -r "/opt/${PN}/bin/code" "usr/bin/vscode"
-	dosym -r "/opt/${PN}/bin/code" "usr/bin/code"
-
-	local EXEC_EXTRA_FLAGS=()
-	if use wayland; then
-		EXEC_EXTRA_FLAGS+=( "--ozone-platform-hint=auto" "--enable-wayland-ime" )
-	fi
-	if use egl; then
-		EXEC_EXTRA_FLAGS+=( "--use-gl=egl" )
-	fi
-
-	sed "s|@exec_extra_flags@|${EXEC_EXTRA_FLAGS[*]}|g" \
-		"${FILESDIR}/code-url-handler.desktop" \
-		> "${T}/code-url-handler.desktop" || die
-
-	sed "s|@exec_extra_flags@|${EXEC_EXTRA_FLAGS[*]}|g" \
-		"${FILESDIR}/code.desktop" \
-		> "${T}/code.desktop" || die
-
-	domenu "${T}/code.desktop"
-	domenu "${T}/code-url-handler.desktop"
-	newicon "resources/app/resources/linux/code.png" "vscode.png"
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	optfeature "desktop notifications" x11-libs/libnotify
-	optfeature "keyring support inside vscode" "virtual/secret-service"
-}
diff --git a/app-editors/vscode/vscode-1.94.2.ebuild b/app-editors/vscode/vscode-1.95.3.ebuild
index 7757235fed73..7757235fed73 100644
--- a/app-editors/vscode/vscode-1.94.2.ebuild
+++ b/app-editors/vscode/vscode-1.95.3.ebuild
diff --git a/app-editors/vscodium/Manifest b/app-editors/vscodium/Manifest
index fe0eb251959f..7c95e7f407e9 100644
--- a/app-editors/vscodium/Manifest
+++ b/app-editors/vscodium/Manifest
@@ -1,12 +1,6 @@
-DIST vscodium-1.94.1.24283-amd64.tar.gz 130462425 BLAKE2B 18869686c76fcaa066650df59fd138875fe67e8d2e3f1abf644b2d6d3f35e1e9a7e4635cf8af39edb40860dabef1238fd59da106027751537dcfc31bdf44bf4e SHA512 b81be4773a9d2843ebbc3882561932e12aabe1972a2f8ed7c018bdf18ee69e01ebb67b946981c24f8f2da6798010acbd64904a233bd3a3bd4ccaa324efdcc575
-DIST vscodium-1.94.1.24283-arm.tar.gz 118802719 BLAKE2B 5452fc7a0b454cd7b96378c45614c4f6f8cfb20ce0335aadca94ccb833faf48f135d3530421724765911dfae3282740ca0348b4233a4df336628e8485855676e SHA512 44a6af108df428f8db9e055134057e487c1f50dec1be36a461eeec61fd5987b63e2a1ba56e5f573d0507a8053095a398f67b781881584d4b742656a405bb63bc
-DIST vscodium-1.94.1.24283-arm64.tar.gz 130400583 BLAKE2B 4991ab4c8e30326efa6966b9bd745487fe55afae9fdf136a6f99c64b4eb16f99dd213d6c94fde176137d0843e2a05344555e1ce0b7ef0b754a45688b1c7f70a3 SHA512 056c91d8d85c39e7d1258d94a445cd70a99ea7844e535ab0e748110a6da59787b07f1ae06e21d57726fa8148350e41700885283dd091368dfc7e9e219a5da97e
-DIST vscodium-1.94.2.24286-amd64.tar.gz 130462753 BLAKE2B aaa4491f2159b4f158174d73f41188d88efd99fe247a75d36b967950be8eb7d5095d4447477ad531dcfdd403ee71f2300a6636c4a269d5eb83f4b08cbcf78c16 SHA512 7c6c32582a688088aa7cbcd7dbbab1ee44325d4134b78aa1a7278ea4a4d903193a76923466d302aa9a89ef70b6869358d2acb1fcc07975a722edd43ccba91ae3
-DIST vscodium-1.94.2.24286-arm.tar.gz 118804173 BLAKE2B 8e20f8b111141114c79077922f8292c636582a403fd0042c2050a34f7b79eadcb294526b885b326ca0d02b5bc98cd5c0a50edf9607424bdfa004112cc4aaa46e SHA512 af7aa92c4b7c1397bd6411f5b2edd86adb7bc48922108bd46c4ceab663d3c1262c25441e75651238bc999849ce589a8768413a293522c882e4a32d92a864d625
-DIST vscodium-1.94.2.24286-arm64.tar.gz 130400501 BLAKE2B 3520c0ec2d3794ce6449c6dcab64a8dee95e09d0f6ae98a7510ef3bf534e1e4b862b00b27684e51c3eb6ad51ca82df1e49bef92d8bfa6e95bf70773e46631228 SHA512 dfb84f9946352beeba0b138d661a96f94d378cd50ba2a2eaf72400951314b95d1582032ba64f9c6ea95d706f9e3fcb453680ff35ab9579c64024e76d17df9edc
-DIST vscodium-1.95.1.24307-amd64.tar.gz 133761601 BLAKE2B 526e3f8a35f5fdcd80a11a1b4d08889fbc014b688ce81fd1ac0203ca5d148edf29d7447d4d041c1a5cb657ded6da89c75a82fcb8dc84ec5708805aac65ea05db SHA512 16d0f9a9e2e76c117d3ae663f9f4b90c0cb12984f92e88175f8c9bc8f529c92573a20cab0cd7015e3365954bb2022b59a6cfa76081eb4bce4de1420080306d42
-DIST vscodium-1.95.1.24307-arm.tar.gz 121749295 BLAKE2B deed0d74a429459c5c8561ca69039dac2dcb7c8211f563fd35ecd9443b6b6345d0f0a4c17e69d547267f822ce2f591644d1ee1bfdc93205d93878476087d697d SHA512 5f3cc30366270c857969b08268965c0f6411228f437df211172c1837af327cf16af2d5018b425a7f1309aef593a6e66b78a37c3d4b48f4ca57a08d4f8cfe95cb
-DIST vscodium-1.95.1.24307-arm64.tar.gz 133657550 BLAKE2B 860a76d9e4ba2d52f996f2b0ff38e4a02ac5055811a4773b733768cb9b4791e9e1d2aa7cd6832eed303772a855da7e41f2c4f12073647a56ffd0ebdeaf3c0e04 SHA512 da448f6fc6c8bdf86ad34e0c90b2d4b00887194bbe2256440777f33c9580622507600cd6c85b6682ccd9dc93eeda4805492770c7c32343112bd91d94b1406728
 DIST vscodium-1.95.2.24313-amd64.tar.gz 135687532 BLAKE2B 0fade954c5b1b9ff9e02a0c1f038d2b6101f654f08de1d5eac8c6d7a763339b9fe496b5f8b3770fdb765945b83326d93ddd78d0c15bd8012c6b06e71d6097313 SHA512 01f3d498f2f6848b93b4dd5f8274f09a0cf89f8891906f7378b8e1aa5dcccb06d3cccf07b7e28ea2a1cdf1e23cefd8caa5838d1068e3c4e4abb6a88d44938f1c
 DIST vscodium-1.95.2.24313-arm.tar.gz 121752120 BLAKE2B 6862fa6125f6869007b51afb80b75901849062b403151ff73b124a9df27c9c616c9752208474d361906c576b0345609ec85f230944a286a6ee78fa609df0aa2a SHA512 993a43e1ecd28cf17dbdd1cf3e322b40e20be4b076a092c97b4e6adf957eed88b7506c63b5de97fc2c6d79313ccc9979be9c4f384cdb9295155ea603972fbe23
 DIST vscodium-1.95.2.24313-arm64.tar.gz 133658561 BLAKE2B 34e97a59ac2ea8d963309c9ca736c1b5f83cc4e4a472210245a5d178c9a74b803867d1f414af1acd4cbc49094fb9ff8088538654a0e490207856d195aa23bcf8 SHA512 283b7fd396daf91458dcb2f99925e95b654310565dfaaf34bfdeb1327eb73fb08494e24a87739ceea9d13d41608f7bd57095ece9d3b3e54dd1becb1db4622078
+DIST vscodium-1.95.3.24321-amd64.tar.gz 135715917 BLAKE2B e6510efb8a20895c873db0d278f50b59b2dc5c4cd98086fcbc7d241634cc56ba9e3f22398f6f653d796122d847e5043407a8af644e71e779756963efcb6d55a6 SHA512 e6dfbeb8118cc401ca398749c553e3e66d9ea20663426f331a308bff3bac6aa253d7fa00579e7b49674875d47152185c76bd7f505179a1074910454827caa338
+DIST vscodium-1.95.3.24321-arm.tar.gz 121776506 BLAKE2B e836b8a8ade0df009a6db3c77adef681bfff28758a1acdc6b5654af9b6791bea50dc98a8dd5b1fe7fe603cb17d169d7b480e301b27f9d217183fbb3eff9f7072 SHA512 cabfde835c45308ab0bb7d427c546fb17c91c82236412aba88bccc1ffa5e5e05e92eead8679a58e4b5b8a3f457788d172cfcf3c4f92df9796c7ad7e03b25d03d
+DIST vscodium-1.95.3.24321-arm64.tar.gz 133684443 BLAKE2B 32c3626ce0bb101b42b0c77a887a213d49feea7271cef075c0b3338686278f5762b4e8a4a3003e57822f021d90d89dadb32b2f755b76e2e95ce2463791a5d8da SHA512 a6fccc9421fcfc9a0d590d60a8f34297d8eabc9864e898cd1d3b3d6630928d053475f33df34542bab7e35279512ade8a31602b5f8db5ef8bea4dc8d6794e0a5e
diff --git a/app-editors/vscodium/vscodium-1.94.2.24286.ebuild b/app-editors/vscodium/vscodium-1.94.2.24286.ebuild
deleted file mode 100644
index 4bf914823a45..000000000000
--- a/app-editors/vscodium/vscodium-1.94.2.24286.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit desktop pax-utils xdg optfeature
-
-# Usage: arch_src_uri <gentoo arch> <upstream arch>
-arch_src_uri() {
-	echo "${1}? (
-		https://github.com/VSCodium/${PN}/releases/download/${PV}/VSCodium-linux-${2}-${PV}.tar.gz
-			-> ${P}-${1}.tar.gz
-	)"
-}
-
-DESCRIPTION="A community-driven, freely-licensed binary distribution of Microsoft's VSCode"
-HOMEPAGE="https://vscodium.com/"
-SRC_URI="
-	$(arch_src_uri amd64 x64)
-	$(arch_src_uri arm armhf)
-	$(arch_src_uri arm64 arm64)
-"
-S="${WORKDIR}"
-
-LICENSE="
-	Apache-2.0
-	BSD
-	BSD-1
-	BSD-2
-	BSD-4
-	CC-BY-4.0
-	ISC
-	LGPL-2.1+
-	MIT
-	MPL-2.0
-	openssl
-	PYTHON
-	TextMate-bundle
-	Unlicense
-	UoI-NCSA
-	W3C
-"
-SLOT="0"
-KEYWORDS="-* amd64 ~arm ~arm64"
-IUSE="egl kerberos wayland"
-RESTRICT="strip bindist"
-
-RDEPEND="
-	>=app-accessibility/at-spi2-core-2.46.0:2
-	app-crypt/libsecret[crypt]
-	app-misc/ca-certificates
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	media-libs/alsa-lib
-	media-libs/libglvnd
-	media-libs/mesa
-	net-misc/curl
-	net-print/cups
-	sys-apps/dbus
-	sys-libs/zlib
-	sys-process/lsof
-	x11-libs/cairo
-	x11-libs/gtk+:3
-	x11-libs/libdrm
-	x11-libs/libX11
-	x11-libs/libxcb
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libxkbcommon
-	x11-libs/libxkbfile
-	x11-libs/libXrandr
-	x11-libs/libXScrnSaver
-	x11-libs/pango
-	x11-misc/xdg-utils
-	kerberos? ( app-crypt/mit-krb5 )
-"
-
-QA_PREBUILT="*"
-
-src_install() {
-	# Cleanup license file - it exists only in amd64 tarball
-	rm -f "${S}/resources/app/LICENSE.txt" || die
-
-	if ! use kerberos; then
-		rm -rf "${S}/resources/app/node_modules.asar.unpacked/kerberos" || die
-	fi
-
-	# Install
-	pax-mark m codium
-	mkdir -p "${ED}/opt/${PN}" || die
-	cp -r . "${ED}/opt/${PN}" || die
-	fperms 4711 /opt/${PN}/chrome-sandbox
-
-	dosym -r "/opt/${PN}/bin/codium" "usr/bin/vscodium"
-	dosym -r "/opt/${PN}/bin/codium" "usr/bin/codium"
-
-	local EXEC_EXTRA_FLAGS=()
-	if use wayland; then
-		EXEC_EXTRA_FLAGS+=( "--ozone-platform-hint=auto" )
-	fi
-	if use egl; then
-		EXEC_EXTRA_FLAGS+=( "--use-gl=egl" )
-	fi
-
-	sed "s|@exec_extra_flags@|${EXEC_EXTRA_FLAGS[*]}|g" \
-		"${FILESDIR}/vscodium-url-handler.desktop" \
-		> "${T}/vscodium-url-handler.desktop" || die
-
-	sed "s|@exec_extra_flags@|${EXEC_EXTRA_FLAGS[*]}|g" \
-		"${FILESDIR}/vscodium.desktop" \
-		> "${T}/vscodium.desktop" || die
-
-	domenu "${T}/vscodium.desktop"
-	domenu "${T}/vscodium-url-handler.desktop"
-	newicon "resources/app/resources/linux/code.png" "vscodium.png"
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	elog "When compared to the regular VSCode, VSCodium has a few quirks"
-	elog "More information at: https://github.com/VSCodium/vscodium/blob/master/docs/index.md"
-	optfeature "desktop notifications" x11-libs/libnotify
-	optfeature "keyring support inside vscode" "virtual/secret-service"
-}
diff --git a/app-editors/vscodium/vscodium-1.95.1.24307.ebuild b/app-editors/vscodium/vscodium-1.95.1.24307.ebuild
deleted file mode 100644
index ea6d7f815b1c..000000000000
--- a/app-editors/vscodium/vscodium-1.95.1.24307.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit desktop pax-utils xdg optfeature
-
-# Usage: arch_src_uri <gentoo arch> <upstream arch>
-arch_src_uri() {
-	echo "${1}? (
-		https://github.com/VSCodium/${PN}/releases/download/${PV}/VSCodium-linux-${2}-${PV}.tar.gz
-			-> ${P}-${1}.tar.gz
-	)"
-}
-
-DESCRIPTION="A community-driven, freely-licensed binary distribution of Microsoft's VSCode"
-HOMEPAGE="https://vscodium.com/"
-SRC_URI="
-	$(arch_src_uri amd64 x64)
-	$(arch_src_uri arm armhf)
-	$(arch_src_uri arm64 arm64)
-"
-S="${WORKDIR}"
-
-LICENSE="
-	Apache-2.0
-	BSD
-	BSD-1
-	BSD-2
-	BSD-4
-	CC-BY-4.0
-	ISC
-	LGPL-2.1+
-	MIT
-	MPL-2.0
-	openssl
-	PYTHON
-	TextMate-bundle
-	Unlicense
-	UoI-NCSA
-	W3C
-"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~arm ~arm64"
-IUSE="egl kerberos wayland"
-RESTRICT="strip bindist"
-
-RDEPEND="
-	>=app-accessibility/at-spi2-core-2.46.0:2
-	app-crypt/libsecret[crypt]
-	app-misc/ca-certificates
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	media-libs/alsa-lib
-	media-libs/libglvnd
-	media-libs/mesa
-	net-misc/curl
-	net-print/cups
-	sys-apps/dbus
-	sys-libs/zlib
-	sys-process/lsof
-	x11-libs/cairo
-	x11-libs/gtk+:3
-	x11-libs/libdrm
-	x11-libs/libX11
-	x11-libs/libxcb
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libxkbcommon
-	x11-libs/libxkbfile
-	x11-libs/libXrandr
-	x11-libs/libXScrnSaver
-	x11-libs/pango
-	x11-misc/xdg-utils
-	kerberos? ( app-crypt/mit-krb5 )
-"
-
-QA_PREBUILT="*"
-
-src_install() {
-	# Cleanup license file - it exists only in amd64 tarball
-	rm -f "${S}/resources/app/LICENSE.txt" || die
-
-	if ! use kerberos; then
-		rm -rf "${S}/resources/app/node_modules.asar.unpacked/kerberos" || die
-	fi
-
-	# Install
-	pax-mark m codium
-	mkdir -p "${ED}/opt/${PN}" || die
-	cp -r . "${ED}/opt/${PN}" || die
-	fperms 4711 /opt/${PN}/chrome-sandbox
-
-	dosym -r "/opt/${PN}/bin/codium" "usr/bin/vscodium"
-	dosym -r "/opt/${PN}/bin/codium" "usr/bin/codium"
-
-	local EXEC_EXTRA_FLAGS=()
-	if use wayland; then
-		EXEC_EXTRA_FLAGS+=( "--ozone-platform-hint=auto" )
-	fi
-	if use egl; then
-		EXEC_EXTRA_FLAGS+=( "--use-gl=egl" )
-	fi
-
-	sed "s|@exec_extra_flags@|${EXEC_EXTRA_FLAGS[*]}|g" \
-		"${FILESDIR}/vscodium-url-handler.desktop" \
-		> "${T}/vscodium-url-handler.desktop" || die
-
-	sed "s|@exec_extra_flags@|${EXEC_EXTRA_FLAGS[*]}|g" \
-		"${FILESDIR}/vscodium.desktop" \
-		> "${T}/vscodium.desktop" || die
-
-	domenu "${T}/vscodium.desktop"
-	domenu "${T}/vscodium-url-handler.desktop"
-	newicon "resources/app/resources/linux/code.png" "vscodium.png"
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	elog "When compared to the regular VSCode, VSCodium has a few quirks"
-	elog "More information at: https://github.com/VSCodium/vscodium/blob/master/docs/index.md"
-	optfeature "desktop notifications" x11-libs/libnotify
-	optfeature "keyring support inside vscode" "virtual/secret-service"
-}
diff --git a/app-editors/vscodium/vscodium-1.94.1.24283.ebuild b/app-editors/vscodium/vscodium-1.95.3.24321.ebuild
index 4bf914823a45..4bf914823a45 100644
--- a/app-editors/vscodium/vscodium-1.94.1.24283.ebuild
+++ b/app-editors/vscodium/vscodium-1.95.3.24321.ebuild
diff --git a/dev-ml/0install/0install-2.18.ebuild b/dev-ml/0install/0install-2.18.ebuild
new file mode 100644
index 000000000000..b88424ef2d7c
--- /dev/null
+++ b/dev-ml/0install/0install-2.18.ebuild
@@ -0,0 +1,33 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit dune
+
+DESCRIPTION="Package dependency solver"
+HOMEPAGE="https://docs.0install.net/developers/solver/"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tbz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64"
+
+IUSE="+ocamlopt"
+
+RDEPEND="
+	dev-ml/lwt:=[ocamlopt?]
+	dev-ml/ocurl:=[ocamlopt?]
+	dev-ml/yojson:=[ocamlopt?]
+	dev-ml/xmlm:=
+"
+
+RESTRICT="test"
+
+src_compile() {
+	dune-compile 0install-solver 0install
+}
+
+src_install() {
+	dune-install 0install-solver 0install
+}
diff --git a/dev-ml/0install/Manifest b/dev-ml/0install/Manifest
new file mode 100644
index 000000000000..65daafe4855a
--- /dev/null
+++ b/dev-ml/0install/Manifest
@@ -0,0 +1 @@
+DIST 0install-2.18.tbz 452385 BLAKE2B 90b4ce4d508005fd3fc9303e4fbb86fe830568fccab2aa6cbbadd16b232b3b3d2446dcd830069e0d96011c500f2e484d7009fbeedf12b6f520e17042aa784605 SHA512 6d4734754951fad9caad5d876a1301e283bdd77a080d6601d57b21c540a30a616b18f664cbd4f86748c90de41cf3ef54f3a883fd75f638abbe3630a0320e4a7f
diff --git a/dev-ml/0install/metadata.xml b/dev-ml/0install/metadata.xml
new file mode 100644
index 000000000000..cb019eed3ab9
--- /dev/null
+++ b/dev-ml/0install/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>ml@gentoo.org</email>
+		<name>ML</name>
+	</maintainer>
+	<longdescription lang="en">
+		Zero Install is a decentralised cross-distribution software
+		installation system. Other features include full support for shared
+		libraries (with a SAT solver for dependency resolution),
+		sharing between users, and integration with native platform package
+		managers. It supports both binary and source packages, and works on
+		Linux, macOS, Unix and Windows systems.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">0install/0install</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-ml/opam-0install-cudf/Manifest b/dev-ml/opam-0install-cudf/Manifest
new file mode 100644
index 000000000000..07d60554cdb0
--- /dev/null
+++ b/dev-ml/opam-0install-cudf/Manifest
@@ -0,0 +1 @@
+DIST opam-0install-cudf-0.5.0.tar.gz 9327 BLAKE2B 705e0bcdd8311e5c330f37e5b05ccb02fa73e42603d0c574480c54101fb746a5d5b61176811dff9eaf09bac370f064dfb8a9ada8f4912586a79e7fccefd122ad SHA512 83c0372168d612ef80548ab7fb021a92cdc39e13a77d87c5af5fd21eb515389b624d09c24d500e9ac33b3fc10d17c9869f160f8771f9c8f545b0453b9a0fd4df
diff --git a/dev-ml/opam-0install-cudf/metadata.xml b/dev-ml/opam-0install-cudf/metadata.xml
new file mode 100644
index 000000000000..923f467c195e
--- /dev/null
+++ b/dev-ml/opam-0install-cudf/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>ml@gentoo.org</email>
+		<name>ML</name>
+	</maintainer>
+	<longdescription lang="en">
+		Opam's default solver is designed to maintain a set of packages over
+		time, minimising disruption when installing new programs and finding a
+		compromise solution across all packages.
+		In many situations (e.g. CI, local roots or duniverse builds) this is
+		not necessary, and we can get a solution much faster by using a
+		different algorithm.
+		This package provides a generic solver library which uses 0install's
+		solver library. The library uses the CUDF library in order to interface
+		with opam as it is the format common used to talk to all the supported
+		solvers.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">ocaml-opam/opam-0install-cudf</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-ml/opam-0install-cudf/opam-0install-cudf-0.5.0.ebuild b/dev-ml/opam-0install-cudf/opam-0install-cudf-0.5.0.ebuild
new file mode 100644
index 000000000000..9db05d077373
--- /dev/null
+++ b/dev-ml/opam-0install-cudf/opam-0install-cudf-0.5.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit dune
+
+DESCRIPTION="Opam solver using 0install backend using the CUDF interface"
+HOMEPAGE="https://github.com/ocaml-opam/opam-0install-cudf"
+SRC_URI="https://github.com/ocaml-opam/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64"
+
+IUSE="+ocamlopt"
+
+src_configure() {
+	:
+}
diff --git a/sys-auth/seatd/Manifest b/sys-auth/seatd/Manifest
index 6af47d778a2b..5d4f96af4f6d 100644
--- a/sys-auth/seatd/Manifest
+++ b/sys-auth/seatd/Manifest
@@ -1,2 +1,3 @@
 DIST seatd-0.8.0.tar.gz 39349 BLAKE2B 920270808f28c85badb173af22edb03960f2b9cdce5af3124c64fe68c52a77f002272d2f19e97d107303c55ad6de498d279f6b05311793270c6ee84565fc435e SHA512 93b1e5c170564ce9654e4df9985af95cb505274b36e950998bb1f16803d2d46712140eded2bdd8d5e85aec62070afd9c224184276d79a0ff0813408dfc472db7
 DIST seatd-0.9.0.tar.gz 41606 BLAKE2B 17d366fd44541404cd675561d3d22b3f2a45dcb29fc2636f4019df7b2d58f4d90745645ec906d4e2a7325c02ca78029b017106671520b653fb3f96e73e1fb9bc SHA512 531ae25f67ae2c11fc45700391dd6bc38c1213379da6a0867735315595dc760ea89d94eb37d9efce8049bd427c898d33aa54f1c36ccb5286c840e011fc78d264
+DIST seatd-0.9.1.tar.gz 41968 BLAKE2B f935165c00bf0e35d73809d408ae1e0500a8d5be286fba2d14ee30704d0e8555f67f964bf06fb71245eed090b1d1a00abdb26406e0a617e9a592546401f653d2 SHA512 15d24a6646fa82a2bcc21d2a99693e1c54e71b9da24a0ba5c847a72c53d803410cbcee31fc847fef468b18d941d9685391bebf745819d4b24d056cd67e08c3fb
diff --git a/sys-auth/seatd/seatd-0.9.1.ebuild b/sys-auth/seatd/seatd-0.9.1.ebuild
new file mode 100644
index 000000000000..1d71f62aae4a
--- /dev/null
+++ b/sys-auth/seatd/seatd-0.9.1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson systemd
+
+DESCRIPTION="Minimal seat management daemon and universal library"
+HOMEPAGE="https://sr.ht/~kennylevinsen/seatd"
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.sr.ht/~kennylevinsen/seatd"
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	SRC_URI="https://git.sr.ht/~kennylevinsen/seatd/archive/${PV}.tar.gz -> ${P}.tar.gz"
+fi
+LICENSE="MIT"
+SLOT="0/1"
+IUSE="builtin elogind server systemd"
+REQUIRED_USE="?? ( elogind systemd )"
+
+DEPEND="
+	elogind? ( sys-auth/elogind )
+	systemd? ( sys-apps/systemd:= )
+"
+RDEPEND="${DEPEND}
+	server? ( acct-group/seat )
+"
+BDEPEND=">=app-text/scdoc-1.9.7"
+
+src_configure() {
+	local emesonargs=(
+		-Dman-pages=enabled
+		$(meson_feature builtin libseat-builtin)
+		$(meson_feature server)
+	)
+
+	if use elogind ; then
+		emesonargs+=( -Dlibseat-logind=elogind )
+	elif use systemd; then
+		emesonargs+=( -Dlibseat-logind=systemd )
+	else
+		emesonargs+=( -Dlibseat-logind=disabled )
+	fi
+
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	if use server; then
+		newinitd "${FILESDIR}/seatd.initd-r1" seatd
+		systemd_dounit contrib/systemd/seatd.service
+
+		if has_version '<sys-auth/seatd-0.7.0-r2'; then
+			elog "For OpenRC users: seatd is now using the 'seat' group instead of the 'video' group"
+			elog "Make sure your user(s) are in the 'seat' group."
+			elog "Note: 'video' is still needed for GPU access like OpenGL"
+		fi
+	fi
+}