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

8 files changed, 52 insertions, 50 deletions

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