gentoo auto-resync : 15:01:2024 - 01:16:32

17 files changed, 106 insertions, 102 deletions

diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 859d2ac8433c..79bd62d5726c 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/vscode/Manifest b/app-editors/vscode/Manifest
index 60bb5c999030..b5088a4d2972 100644
--- a/app-editors/vscode/Manifest
+++ b/app-editors/vscode/Manifest
@@ -1,13 +1,11 @@
-AUX vscode-url-handler-wayland.desktop 351 BLAKE2B 8b1d295572865fb25beeb14d9762cbddd4c5ad7521596e44b40fcc6ea0f30ea92991294caecd4b23db3e77a19ba86c99254b5e5453b1ba3998a85a6de738ac4a SHA512 bb980f3d827dc3db4c25467f698aabfffcca68ba6da4981f5c74fe64a20873ca5fdfc2aa590c5d9e929462a759fa43bef766e08017b8bd059481bb2018bf10ef
-AUX vscode-url-handler.desktop 291 BLAKE2B 364ce7de060a947d48486a639aed515f5b17e1720ac1eaee1aa4e13559047622e2897c0426aed792e3d8aed440771c6f5bb3e36873140401c951ec3b749cd661 SHA512 4607346645781f67daeb6cff2425924133537d620bf7dac9c2619cd5a1a29252e7ecf1a27f27e7bb917c413d462f129f9ae26f50ec8b531e5ac872bc8b96dd93
-AUX vscode-wayland.desktop 580 BLAKE2B fb70f6b28e975368550735f2dab8be6ccab9510481c794e6b44545a690224bc93b51cbc6beb809886eee1cde3648eb284374c87c0b74a1fcc3bdf0af0e700a9f SHA512 615cacda3121b4a839816722382c23bfa2cb162e2a772ba91bded9e161a92763bb536778ea8f716e4c6c46f4f6c289a9c922347523d278ba3714569eb64c0234
-AUX vscode.desktop 451 BLAKE2B 3c0cbe4a9bf71d47c3534bf6f7a265a04a0949b0bb86e060a0ecccb3b9f242ba9b46f1fc0dea37ff0d982ec88417da980b31b9658906a8f23c707e9b100183c6 SHA512 334b8c025c4a99e0f1390c56dd89e529c23b0ea3f6ec5a83105eb6acc4ff62b4d25419353d7bf4bb69dec611bd98778e7b8c728d2392827aa97690b5b91c7fb8
+AUX vscode-url-handler.desktop 310 BLAKE2B 3ab159ac9fe169233cc5aeafe1eb18a7fafe9a00b89921dfdfcef0c1a24242a6e092b70c0753fa80f3d69a6d992856a7bee7200b287011078d8069d934cc23bc SHA512 853da70a663b119167d7adaf8be1d060516d4f71601b522fa48890e568cc5cbbb7941b4b7bbec4aae298e28ca2a8b1d2696c50823fbfedfd11c0a16255bb48a9
+AUX vscode.desktop 489 BLAKE2B 154da7270214920d153c9ad0c303bb1594d0e62fe34d85417560043b77f63ebac8ec8ee206acc10a3870e78f9cc367dc0d12222c493b3e9e801e64c140b47c91 SHA512 6185b29487313750a0059d1ddf92f1814613631cfef148955718c93dc35d4c98ddfda5d348d899c6ffe0bd04d7309b5934d931fa7f0192da753f058ab77cba98
 DIST vscode-1.85.0-amd64.tar.gz 135089424 BLAKE2B 682810e3cdf3d119edd766b3288ff683aad6267c42eef2daf1880504caede3b955417700e1dca053eee38384f5f474257d7d53f265bbb18239d19e18ee65d0a5 SHA512 290eba893c69fd917fb89e35c36f51157469dfde5a85ed058ad55af4c3746abac1727c34136341d94becc5777ee747a3955100cf3c80ac9c5b381dc537b293c6
 DIST vscode-1.85.0-arm.tar.gz 122053589 BLAKE2B 67098d2f566d21d50e18d986356576f07f8947276c8334e1197ede308805a1921311dd99b1f6940f5be718382179617dcdea68e4dcad12f00de5789e8f4c5ca0 SHA512 c7e106aae16b2c7ad653e56fd047afe5af8b9e43f5472e40e50033b130ab13488b7589c9c7dc2204b24f83ce8d682224fed69bd3fd499590cc0df879207e139f
 DIST vscode-1.85.0-arm64.tar.gz 132281426 BLAKE2B 8b4319c1106de653273294a2165de893481e8318a38e8cd7661591d05d0bfa48812b7a2da3a50bf6f0d73e45f09c46294df5f5932d62f34a49f0ff49a0fcaacb SHA512 d2b4eae23dda45924f2f9de32f808b6f5ef92cfc2ea08315557c00398722963ece47de34ffe477c110fa9031f3b80c0683cb94ded5c12e51d1162e487f0b2149
 DIST vscode-1.85.1-amd64.tar.gz 135108193 BLAKE2B bd2479617988f81ef0c8255d02f01a16de6142f69fbad72b020dbb8ed55a2859861fe4074bab56eb2a6da91a237c03a182da97b67dcdfef61adb27c8990431ec SHA512 fc06cf3e67f7e268ed485d79e2a0b16ff96b06567d94734c01fd03b98e8912f1969e44e2dd0accdc423c0353a910a64af5d0df56a34404f2314c4a2543da5797
 DIST vscode-1.85.1-arm.tar.gz 122030008 BLAKE2B bd958e9bffcf94add2e5545bb41373a0c9e0b5744b150837b228ed788d9bdae1ec0aedaf948c98f3aa121707716f3bad43aed6c77df99dee473d4f3bf6e69419 SHA512 7761b137f7301e5989b99256bcf9b0806064d7370b506a01e0e112b8ce894b32c7ac162689f75a6fa67616de64cf4277934f2c09634be87ceb9677d150381f69
 DIST vscode-1.85.1-arm64.tar.gz 132288396 BLAKE2B 7888bf80ef6f2452b7f06f5f5ec77f83663c468cb9756757c8f95fde5724f1444b733da783cf34c85806facf2e27870a1b9e0b892945ce395575131530308c5d SHA512 dfb128b6ac17575f85afa3b19a5daea3d8b7b4be6e294002c51903ce736ea332b3c0c840e58c4da0b8715fb47e9cbc85fcf147cf62affe91d21051b90bd6a305
-EBUILD vscode-1.85.0.ebuild 2633 BLAKE2B aeebd05a630b5e9ab9593570466660b6e7fbf371f2cba638ed975b381bbdaf06ccbc43526105807c3853cb4cb65f0298360cceac4e710da3dc320d253482dbcb SHA512 da90cf7e0d1d136d422e53390dd2a6157389c4d0eed7ccb09a3733a229163732e8dbbb7bf7f811610324c9adfa2b1c812175d0944bb7dd639de6247560c739c7
-EBUILD vscode-1.85.1.ebuild 2633 BLAKE2B aeebd05a630b5e9ab9593570466660b6e7fbf371f2cba638ed975b381bbdaf06ccbc43526105807c3853cb4cb65f0298360cceac4e710da3dc320d253482dbcb SHA512 da90cf7e0d1d136d422e53390dd2a6157389c4d0eed7ccb09a3733a229163732e8dbbb7bf7f811610324c9adfa2b1c812175d0944bb7dd639de6247560c739c7
-MISC metadata.xml 1058 BLAKE2B cf7606233d99e4429debe5ef824f235f1ff3083ab5553030453e982bfb5860dd5ccecca3792319665835d604b6ff2cb53ebd885bb959236784c62885087750b2 SHA512 961552953336ad9606c9fc004fc3e0fb8d7481a017b6ba5da683db5ba989f58d474ccb4ea3a001851b2cfe705e7fe3f70ba01a14dd1f048523e73af522d50410
+EBUILD vscode-1.85.0-r2.ebuild 2966 BLAKE2B 870f973cfbb18269e8e82e771c24c42e3a2b12dabdba2cc8607b331ebc8b2743c76778541d95670a8d79ca15581f78dbfece323316c947d03956a277a70a4d4f SHA512 87db329c9f68fd3f256b095d5c6f67667d1f7db74712da9f852c9629c91f403dd03dd20efe176274f71e06e1bb269a73837fb707fb9718ad5fd63cb19f6320c4
+EBUILD vscode-1.85.1-r2.ebuild 2966 BLAKE2B 870f973cfbb18269e8e82e771c24c42e3a2b12dabdba2cc8607b331ebc8b2743c76778541d95670a8d79ca15581f78dbfece323316c947d03956a277a70a4d4f SHA512 87db329c9f68fd3f256b095d5c6f67667d1f7db74712da9f852c9629c91f403dd03dd20efe176274f71e06e1bb269a73837fb707fb9718ad5fd63cb19f6320c4
+MISC metadata.xml 1319 BLAKE2B 02076564e7b3b37433125cdcada4445311f03699bc7adb00f60af4f73f2fa9ebb90b805885198bd7cbdc54b779fa259d56c3142b30d595eaed278130081d8ca7 SHA512 d0922226274b1686ea14c8ca4e5835f6b30399bd71372bde4ac7e4eee4301ccca7fc32472d6ac0bd598b0459ebc33a59d346a21f5fa2d39cac4ed197682354e0
diff --git a/app-editors/vscode/files/vscode-url-handler-wayland.desktop b/app-editors/vscode/files/vscode-url-handler-wayland.desktop
deleted file mode 100644
index a3214afa7d32..000000000000
--- a/app-editors/vscode/files/vscode-url-handler-wayland.desktop
+++ /dev/null
@@ -1,12 +0,0 @@
-[Desktop Entry]
-Name=VSCode - URL Handler
-Comment=Editing evolved
-GenericName=Code Editor
-Exec=/usr/bin/vscode --enable-features=UseOzonePlatform --ozone-platform=wayland --open-url %U
-Icon=vscode
-Type=Application
-NoDisplay=true
-StartupNotify=true
-Categories=Utility;TextEditor;Development;IDE;
-MimeType=x-scheme-handler/vscode;
-Keywords=vscode;code;
diff --git a/app-editors/vscode/files/vscode-url-handler.desktop b/app-editors/vscode/files/vscode-url-handler.desktop
index 73e3834801b4..fe65d7527069 100644
--- a/app-editors/vscode/files/vscode-url-handler.desktop
+++ b/app-editors/vscode/files/vscode-url-handler.desktop
@@ -2,7 +2,7 @@
 Name=VSCode - URL Handler
 Comment=Editing evolved
 GenericName=Code Editor
-Exec=/usr/bin/vscode --open-url %U
+Exec=/usr/bin/vscode @exec_extra_flags@ --open-url %U
 Icon=vscode
 Type=Application
 NoDisplay=true
diff --git a/app-editors/vscode/files/vscode-wayland.desktop b/app-editors/vscode/files/vscode-wayland.desktop
deleted file mode 100644
index 1c12a97ffd01..000000000000
--- a/app-editors/vscode/files/vscode-wayland.desktop
+++ /dev/null
@@ -1,18 +0,0 @@
-[Desktop Entry]
-Name=VSCode Wayland
-Comment=Editing evolved
-GenericName=Code Editor
-Exec=/usr/bin/vscode --enable-features=UseOzonePlatform --ozone-platform=wayland --unity-launch %F
-Icon=vscode
-Type=Application
-StartupNotify=false
-StartupWMClass=Code
-Categories=Utility;TextEditor;Development;IDE;
-MimeType=text/plain;inode/directory;application/x-code-workspace;
-Actions=new-empty-window;
-Keywords=vscode;code;
-
-[Desktop Action new-empty-window]
-Name=New Empty Window
-Exec=/usr/bin/vscode  --enable-features=UseOzonePlatform --ozone-platform=wayland --new-window %F
-Icon=vscode
diff --git a/app-editors/vscode/files/vscode.desktop b/app-editors/vscode/files/vscode.desktop
index d648416a26ca..ec697eca68b6 100644
--- a/app-editors/vscode/files/vscode.desktop
+++ b/app-editors/vscode/files/vscode.desktop
@@ -2,7 +2,7 @@
 Name=VSCode
 Comment=Editing evolved
 GenericName=Code Editor
-Exec=/usr/bin/vscode --unity-launch %F
+Exec=/usr/bin/vscode @exec_extra_flags@ --unity-launch %F
 Icon=vscode
 Type=Application
 StartupNotify=false
@@ -14,5 +14,5 @@ Keywords=vscode;code;
 
 [Desktop Action new-empty-window]
 Name=New Empty Window
-Exec=/usr/bin/vscode --new-window %F
+Exec=/usr/bin/vscode @exec_extra_flags@ --new-window %F
 Icon=vscode
diff --git a/app-editors/vscode/metadata.xml b/app-editors/vscode/metadata.xml
index 5e8dfffc3faa..52921d6c9411 100644
--- a/app-editors/vscode/metadata.xml
+++ b/app-editors/vscode/metadata.xml
@@ -13,6 +13,10 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<use>
+		<flag name="egl">Use EGL platform, enables smooth rending in high refresh rate monitors on X11/Xwayland</flag>
+		<flag name="wayland">Run in wayland mode under wayland sessions, xwayland otherwise. This flag doesn't affect x11 sessions.</flag>
+	</use>
 	<longdescription>
 		Visual Studio Code is a lightweight but powerful source code editor which
 		runs on your desktop and is available for Windows, macOS and Linux. It
diff --git a/app-editors/vscode/vscode-1.85.0.ebuild b/app-editors/vscode/vscode-1.85.0-r2.ebuild
index dc88161cc376..5f6d62e913de 100644
--- a/app-editors/vscode/vscode-1.85.0.ebuild
+++ b/app-editors/vscode/vscode-1.85.0-r2.ebuild
@@ -35,7 +35,7 @@ LICENSE="
 "
 SLOT="0"
 KEYWORDS="-* amd64 ~arm ~arm64"
-IUSE="kerberos"
+IUSE="egl kerberos wayland"
 RESTRICT="mirror strip bindist"
 
 RDEPEND="
@@ -104,10 +104,25 @@ src_install() {
 
 	dosym -r "/opt/${PN}/bin/code" "usr/bin/vscode"
 	dosym -r "/opt/${PN}/bin/code" "usr/bin/code"
-	domenu "${FILESDIR}/vscode.desktop"
-	domenu "${FILESDIR}/vscode-url-handler.desktop"
-	domenu "${FILESDIR}/vscode-wayland.desktop"
-	domenu "${FILESDIR}/vscode-url-handler-wayland.desktop"
+
+	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}/vscode-url-handler.desktop" \
+		> "${T}/vscode-url-handler.desktop" || die
+
+	sed "s|@exec_extra_flags@|${EXEC_EXTRA_FLAGS[*]}|g" \
+		"${FILESDIR}/vscode.desktop" \
+		> "${T}/vscode.desktop" || die
+
+	domenu "${T}/vscode.desktop"
+	domenu "${T}/vscode-url-handler.desktop"
 	newicon "resources/app/resources/linux/code.png" "vscode.png"
 }
 
diff --git a/app-editors/vscode/vscode-1.85.1.ebuild b/app-editors/vscode/vscode-1.85.1-r2.ebuild
index dc88161cc376..5f6d62e913de 100644
--- a/app-editors/vscode/vscode-1.85.1.ebuild
+++ b/app-editors/vscode/vscode-1.85.1-r2.ebuild
@@ -35,7 +35,7 @@ LICENSE="
 "
 SLOT="0"
 KEYWORDS="-* amd64 ~arm ~arm64"
-IUSE="kerberos"
+IUSE="egl kerberos wayland"
 RESTRICT="mirror strip bindist"
 
 RDEPEND="
@@ -104,10 +104,25 @@ src_install() {
 
 	dosym -r "/opt/${PN}/bin/code" "usr/bin/vscode"
 	dosym -r "/opt/${PN}/bin/code" "usr/bin/code"
-	domenu "${FILESDIR}/vscode.desktop"
-	domenu "${FILESDIR}/vscode-url-handler.desktop"
-	domenu "${FILESDIR}/vscode-wayland.desktop"
-	domenu "${FILESDIR}/vscode-url-handler-wayland.desktop"
+
+	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}/vscode-url-handler.desktop" \
+		> "${T}/vscode-url-handler.desktop" || die
+
+	sed "s|@exec_extra_flags@|${EXEC_EXTRA_FLAGS[*]}|g" \
+		"${FILESDIR}/vscode.desktop" \
+		> "${T}/vscode.desktop" || die
+
+	domenu "${T}/vscode.desktop"
+	domenu "${T}/vscode-url-handler.desktop"
 	newicon "resources/app/resources/linux/code.png" "vscode.png"
 }
 
diff --git a/app-editors/vscodium/Manifest b/app-editors/vscodium/Manifest
index f0513e5da777..5cc3134088b5 100644
--- a/app-editors/vscodium/Manifest
+++ b/app-editors/vscodium/Manifest
@@ -1,13 +1,11 @@
-AUX vscodium-url-handler-wayland.desktop 383 BLAKE2B c3e281318290826ce9451fe517b52bd8dee6da01fcb62c57906496bb6f5b369c55571aeffdab020820029186c5ee8722c02ef611c487d81044717bb31519b512 SHA512 77347572def1aae0d643ca4166a9b4db9aa6f80e267ff93474ee3a773491e4f0ebc95a15d25ddd1d23e819a739c56a86dec2d612c566c10f56811c10ac4d41ac
-AUX vscodium-url-handler.desktop 315 BLAKE2B b514551e6256cb444f13bfda86a9e164ed926d8aedbfcb7de3a6b1c3d3c2e465c0ee158c74626814908a153c5f801434952865a708c89ffdf64bce24a83fcc20 SHA512 afcf89af009361b409330a223696013e1ee8973bc3b3068e778fb05c3355fed66063bd537a66685d6ad3578c2808532d4b9c5273a291c7d2f3a9c0b2f997f152
-AUX vscodium-wayland.desktop 609 BLAKE2B 1b25dc9e98b5a12a10f85001b9c5acc9325368a2310a7d1e2aad20e22ae07fb000aa495b694612032e999f431c8f8e47f60eb162d0c7487fcfef6e37249622d4 SHA512 1d371978a5780c8d37e6e1359ca029659055a8d80de0d672d6eb3f21b890db2b92e368fd244be7cf83ec30935271cb269f1b9aef1c7deaaae36c3d739221d8f2
-AUX vscodium.desktop 481 BLAKE2B 89f335edd1f7d0256f95eb96d335c2359d8fd984a29bdc3190218ea63ba9a19e64435eb50c7be818cf28243c8cdf9b385f8987f6917e52df565a4ca555a2a13b SHA512 234f79a5ea9b901b62fe0c094554de3b339a67e8f47ec4b3daa5c0653778b9f51d1ccd91e773b4ca27f27e30a5847d5a3172d0ed322ada4d47624028bd5d8c1b
+AUX vscodium-url-handler.desktop 334 BLAKE2B 3e089403de3df453f9c35737911846105ebee07ba17cd61443f739a035755a3b17b7a76f54231950bb4d752e0853a1e920dc489487ed3b12230dbe96037e833b SHA512 548b2df53ee5975e543a8ce5f8ac48bcc5878a86e7b6759d8e6d6d5cf7a126d91326f801a3c3548b7390dc9113b9bf37ecc38276ddd0b3354c4be8ab58b466fa
+AUX vscodium.desktop 519 BLAKE2B 9bb65cb1b0618deba7db401f314f00611970eb34a82988f349d215759aba195c3d61b51f1e2f1e58ecef0fff952d68a25551a55d75c44a817d8de6dd65562732 SHA512 12db368ca425b707e6c0d9437e987aa0e5a773ac3f8fe51c5aec8eb82768dec0494988a0fef1a8be781e238d9fb9dd22097166ac8eea924154d7481998b0c18e
 DIST vscodium-1.84.2.23319-amd64.tar.gz 122368096 BLAKE2B 14df2425243331503d0f8ca74dd887390fb4e9fa1d7ba8ec28c2326eac9f0be2f00f707c6803e469c380efc019e24f17493dcd6a6544b7bbea798f86cdb1cb2f SHA512 31b985f8c09c3729c7b16ce5cdb2619685f3313776c4cd9f2009b12cca8b5f1387ee3090f657b33337955218950e572386cbc0a19cd9d74abca11a03c44f5afe
 DIST vscodium-1.84.2.23319-arm.tar.gz 110990537 BLAKE2B d7955b27dacd97aaf7dda334cc92b981cf6e2a84f098408564e20c0ba3c7635636022e3e7b7f8d70115976bdaff96c7623e46603ade450b4bc906167099f48a8 SHA512 1f1fbfba86fd3cddc5e8ded8ca8c20abad42fcaf4c554d803ac3878f576561ed8288f18faf67e9a474717f28df4175a619c0af2f950ea6a66ee9602359d6d93b
 DIST vscodium-1.84.2.23319-arm64.tar.gz 122740540 BLAKE2B 62a359372dc084ccaa71649a20f366159420f1fe5f442d7ce21caae745ba6e2040f4d35408fd67050c7ce215db530879a0835a801226b59820d1263fed136c58 SHA512 762a58cb5c9e9c4ab31f790693b3534d0e8fec6215c3e37db4a41da36ebec7a117044017c596d7631c0105242f50ece72e848e4ac0d332211ef2582fd3b35171
 DIST vscodium-1.85.1.23348-amd64.tar.gz 121836227 BLAKE2B beded9bfcf6ee03d58275c522495d43773676451a183c1bc6f5e8e3d3ebaba1ea2ec43638cb03e59cf261fb77eaddefe4c01bd2288f225b3c371a13045a8563a SHA512 d29a2f3f7460d95b15036b82aace1ab9c130bb48650f7be3074a833470ed15300b6891fae20af29b1c02e853eea875194114dd93504bb7ea50184faac836cffd
 DIST vscodium-1.85.1.23348-arm.tar.gz 110358274 BLAKE2B 38380ce42203a4833d6b84e166617a06f8b8bd4151b0148e9f3c0639a9a84aa5c956f772b6253273020e7fe371c4badb5b07ecc574d8e62ae12e8d6900293a84 SHA512 48065ebf3e1c789ea4fb3d7726098ff5d3f160be5895f09721fdb42c60ff0bdb8332a2eb6dc1dfa509c9482633ae3772123df0cea1eb870be1a4097499549594
 DIST vscodium-1.85.1.23348-arm64.tar.gz 122135794 BLAKE2B 4055913bb21c464167537f9f7eaa1dfc00d3ba012fa6dc5fa234c1a738f760d5b2b06ed8846caaf0ea1e31b023f9dfee01852c62844617ce87669bffd4fbcccd SHA512 fe121cd2590bff9b531aebc48323548ded533cba2314fe15492203457fd0f2137c59045b720fa58cdbce32e3017c0deafad020099df330be6705988c90a38499
-EBUILD vscodium-1.84.2.23319.ebuild 2478 BLAKE2B 4e71f84b90267acfca80c80e05faa82e912eff082d759847bfbe9f7ff587da2a0b2c2ccaa0c8b8f8fd57261bc063e8ac07d5e0fe465706bf9c79835e8d0909c4 SHA512 31bc55bb1e0e3febd4a41aeafa5a74358d8720c0aa1950b79493ba002fc11604f5422e83b125c21da5a3dcb8e285219bd520d461b9e531cf3f68322bf72f65c4
-EBUILD vscodium-1.85.1.23348.ebuild 2479 BLAKE2B 2e340aadc3dd3e82af1c19641dfb83b3cb8353c424f26db88de90026846dc56cccbcbf104db4600629fb5c0c4b3a1602ed98765a422a81132b9dfed2c27f7164 SHA512 fc1a275bdc126620bc454842c799076e0cd5a08eda2a13caa6ed1c87dbcfae3ea0d694361f047907daa705a6686249891e2e96009c532f155593ad21c592dc7c
-MISC metadata.xml 1302 BLAKE2B ff0c1f72c2394f21e13b89831493df562ca15114fa5006262f794d3f2580deaad01d7e01f87481dcc75cc5044c8b4950955dcc3dbecbc8cfc7a6ceafaf078fb6 SHA512 8ec965d8544c2ab31e3c2f2f3c879b084126880603681fef5e5158af1bc1f2f79351b68284f6a101d486893f968594e1537df1eedeacdebffdf51de7a38ccb25
+EBUILD vscodium-1.84.2.23319-r2.ebuild 2815 BLAKE2B 1d998a315cdd23a28f3c56fb0b0df3c43600dad28337459a5f8d6bf9af19aaf2035d8cf8125b7f98a2a8333456904976b20b9ad7d039aa6c9094da3de6fa89fd SHA512 e036c0f0055835e407c0bd1d02f3ded3f21f5c00f09b4a45ba5dd8b99b8b1922e93749b45232922361e9379998dedba28b4865cc8dde16d0816807cac0f975df
+EBUILD vscodium-1.85.1.23348-r2.ebuild 2815 BLAKE2B c477c8a0a04aa8269853cb2424508898450dd9abdf21d3160df43ce40400d22cff33d93bdad2b5017bd30304350015e37d2a4e3a13c1f57ab09e7b44979d049a SHA512 ff9f0c86348953561fdfc76b50d5a06001e51484ec658686dcaa9995d8157f565af1528ae6a3d93754a8f74a873c4f3bd5eb7283d23cc5bf61f11ad071b215ff
+MISC metadata.xml 1563 BLAKE2B 63d5132bcea2c419facf49b2d644bf1f58f44da333adb8270aedaaa289563ff5d116a0700df1306bdf1e7d2628f72959b8f18540486d3ce56bfe67adb925d8fe SHA512 ea75764cc70ac6a9452600a106de3784baaa9f84fa5b1021cea2be073636fb0fc8c6904a7db2a560ccb2bba491d76125e5996e0aac28ea11cd039ae16972e595
diff --git a/app-editors/vscodium/files/vscodium-url-handler-wayland.desktop b/app-editors/vscodium/files/vscodium-url-handler-wayland.desktop
deleted file mode 100644
index d853f3e5c908..000000000000
--- a/app-editors/vscodium/files/vscodium-url-handler-wayland.desktop
+++ /dev/null
@@ -1,12 +0,0 @@
-[Desktop Entry]
-Name=VSCodium Wayland - URL Handler
-Comment=Editing evolved
-GenericName=Code Editor
-Exec=/usr/bin/vscodium --enable-features=UseOzonePlatform --ozone-platform=wayland --open-url %U
-Icon=vscodium
-Type=Application
-NoDisplay=true
-StartupNotify=true
-Categories=Utility;TextEditor;Development;IDE;
-MimeType=x-scheme-handler/vscodium;
-Keywords=vscode;vscodium;code;codium;
diff --git a/app-editors/vscodium/files/vscodium-url-handler.desktop b/app-editors/vscodium/files/vscodium-url-handler.desktop
index 48c7d3d369cb..0ca181bf7960 100644
--- a/app-editors/vscodium/files/vscodium-url-handler.desktop
+++ b/app-editors/vscodium/files/vscodium-url-handler.desktop
@@ -2,7 +2,7 @@
 Name=VSCodium - URL Handler
 Comment=Editing evolved
 GenericName=Code Editor
-Exec=/usr/bin/vscodium --open-url %U
+Exec=/usr/bin/vscodium @exec_extra_flags@ --open-url %U
 Icon=vscodium
 Type=Application
 NoDisplay=true
diff --git a/app-editors/vscodium/files/vscodium-wayland.desktop b/app-editors/vscodium/files/vscodium-wayland.desktop
deleted file mode 100644
index 7719bf19ad74..000000000000
--- a/app-editors/vscodium/files/vscodium-wayland.desktop
+++ /dev/null
@@ -1,18 +0,0 @@
-[Desktop Entry]
-Name=VSCodium Wayland
-Comment=Editing evolved
-GenericName=Code Editor
-Exec=/usr/bin/vscodium --enable-features=UseOzonePlatform --ozone-platform=wayland --unity-launch %F
-Icon=vscodium
-Type=Application
-StartupNotify=false
-StartupWMClass=VSCodium
-Categories=Utility;TextEditor;Development;IDE;
-MimeType=text/plain;inode/directory;application/x-code-workspace;
-Actions=new-empty-window;
-Keywords=vscode;vscodium;code;codium;
-
-[Desktop Action new-empty-window]
-Name=New Empty Window
-Exec=/usr/bin/vscodium --enable-features=UseOzonePlatform --ozone-platform=wayland --new-window %F
-Icon=vscodium
diff --git a/app-editors/vscodium/files/vscodium.desktop b/app-editors/vscodium/files/vscodium.desktop
index f3557c1adf7e..e12a430172ae 100644
--- a/app-editors/vscodium/files/vscodium.desktop
+++ b/app-editors/vscodium/files/vscodium.desktop
@@ -2,7 +2,7 @@
 Name=VSCodium
 Comment=Editing evolved
 GenericName=Code Editor
-Exec=/usr/bin/vscodium --unity-launch %F
+Exec=/usr/bin/vscodium @exec_extra_flags@ --unity-launch %F
 Icon=vscodium
 Type=Application
 StartupNotify=false
@@ -14,5 +14,5 @@ Keywords=vscode;vscodium;code;codium;
 
 [Desktop Action new-empty-window]
 Name=New Empty Window
-Exec=/usr/bin/vscodium --new-window %F
+Exec=/usr/bin/vscodium @exec_extra_flags@ --new-window %F
 Icon=vscodium
diff --git a/app-editors/vscodium/metadata.xml b/app-editors/vscodium/metadata.xml
index 42083f1bbf65..8d4e8c9c718e 100644
--- a/app-editors/vscodium/metadata.xml
+++ b/app-editors/vscodium/metadata.xml
@@ -13,6 +13,10 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<use>
+		<flag name="egl">Use EGL platform, enables smooth rending in high refresh rate monitors on X11/Xwayland</flag>
+		<flag name="wayland">Run in wayland mode under wayland sessions, xwayland otherwise. This flag doesn't affect x11 sessions.</flag>
+	</use>
 	<longdescription>
 		Microsoft’s vscode source code is open source (MIT-licensed), but the product available for download (Visual Studio Code) is licensed under the Microsoft-vscode license (a copy can be found in the licenses folder of your gentoo repository) and contains telemetry/tracking. The VSCodium project exists so that you don’t have to download+build from source. This project includes special build scripts that clone Microsoft’s vscode repo, run the build commands, and upload the resulting binaries for you to GitHub releases. These binaries are licensed under the MIT license. Telemetry is disabled.
 	</longdescription>
diff --git a/app-editors/vscodium/vscodium-1.84.2.23319.ebuild b/app-editors/vscodium/vscodium-1.84.2.23319-r2.ebuild
index 13fca65036bb..2d614534f45e 100644
--- a/app-editors/vscodium/vscodium-1.84.2.23319.ebuild
+++ b/app-editors/vscodium/vscodium-1.84.2.23319-r2.ebuild
@@ -42,7 +42,7 @@ LICENSE="
 "
 SLOT="0"
 KEYWORDS="-* amd64 ~arm ~arm64"
-IUSE="kerberos"
+IUSE="egl kerberos wayland"
 RESTRICT="strip bindist"
 
 RDEPEND="
@@ -99,10 +99,25 @@ src_install() {
 
 	dosym -r "/opt/${PN}/bin/codium" "usr/bin/vscodium"
 	dosym -r "/opt/${PN}/bin/codium" "usr/bin/codium"
-	domenu "${FILESDIR}/vscodium.desktop"
-	domenu "${FILESDIR}/vscodium-url-handler.desktop"
-	domenu "${FILESDIR}/vscodium-wayland.desktop"
-	domenu "${FILESDIR}/vscodium-url-handler-wayland.desktop"
+
+	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"
 }
 
diff --git a/app-editors/vscodium/vscodium-1.85.1.23348.ebuild b/app-editors/vscodium/vscodium-1.85.1.23348-r2.ebuild
index 050d31616210..ea6665796b7d 100644
--- a/app-editors/vscodium/vscodium-1.85.1.23348.ebuild
+++ b/app-editors/vscodium/vscodium-1.85.1.23348-r2.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
@@ -41,8 +41,8 @@ LICENSE="
 	W3C
 "
 SLOT="0"
-KEYWORDS="-* ~amd64 ~arm ~arm64"
-IUSE="kerberos"
+KEYWORDS="-* amd64 ~arm ~arm64"
+IUSE="egl kerberos wayland"
 RESTRICT="strip bindist"
 
 RDEPEND="
@@ -99,10 +99,25 @@ src_install() {
 
 	dosym -r "/opt/${PN}/bin/codium" "usr/bin/vscodium"
 	dosym -r "/opt/${PN}/bin/codium" "usr/bin/codium"
-	domenu "${FILESDIR}/vscodium.desktop"
-	domenu "${FILESDIR}/vscodium-url-handler.desktop"
-	domenu "${FILESDIR}/vscodium-wayland.desktop"
-	domenu "${FILESDIR}/vscodium-url-handler-wayland.desktop"
+
+	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"
 }