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

8 files changed, 54 insertions, 52 deletions

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"
 }