gentoo resync : 25.10.2021

2 files changed, 28 insertions, 10 deletions

diff --git a/app-editors/vscode/Manifest b/app-editors/vscode/Manifest
index 30ac63940d85..61f36f462e0b 100644
--- a/app-editors/vscode/Manifest
+++ b/app-editors/vscode/Manifest
@@ -2,16 +2,16 @@ AUX vscode-url-handler-wayland.desktop 351 BLAKE2B 8b1d295572865fb25beeb14d9762c
 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
-DIST vscode-1.58.2-amd64.tar.gz 105591644 BLAKE2B bc130bfeab48f60f4149aa9d44aebbfba121cb629f1295acb23361a06e5071ddb2dc147c7d161b67f57d45fdb1337784a85bb4f08c6f82a48675c35be0037047 SHA512 00e4012d133e8755b13b1b0136078db872b7f202c59663ea46b137451338ca77f8020cc7fffa807ba5e5963105f0ce8ea0d2a0f29702078a64ace5743da6c83e
-DIST vscode-1.58.2-arm.tar.gz 96167069 BLAKE2B 1c19cf29c9419663216e3ccf521314e0102efcd18a69b0e3668259f8172a377300f1ca900e2d0cda325619a855fdcd6def5db34ebab0e6f79bc0ffd1cb2eb609 SHA512 32c4011c0a10827b73388b469246c179fc3aa06e883c1264f215cd96695821945401b4d0bfc7cf324768977eeb0c785ab4948fdb50899b26b9ca469087ab3b45
-DIST vscode-1.58.2-arm64.tar.gz 110942132 BLAKE2B 3fb2a83087789690ba930ae0910b931f8f2ed129049e536d172bd67be6d928afb2e17ba09756c1dd3f9c145354fa8eface31928f419f74df165bb0c60588dc57 SHA512 f1ae69955251b6e8e92eebf01edfd820cdbf06c887349ba1cb6db2ff8aee170183029a0f2b5075b8a07ed9a26e982b87d63fe0fe4a193fa71ff5ebb52fdf1221
 DIST vscode-1.59.1-amd64.tar.gz 106142213 BLAKE2B eed73d0e98ea0275ed005586f18e14b3671a4dea301f44f469798bae3c298d8eb7e819c896957f9a1cd3e978ce171ff9d3a7433ede540b0647cae735b2d53bcd SHA512 c7ae7417bd233498b6be0dbcbc67ee44283a14938bfecb3b61d224533a4edf31c291bebdb90e87d769cb52afb9ac17f2fb20ba64dab7773d1ce965aa9d7bfae6
 DIST vscode-1.59.1-arm.tar.gz 97705768 BLAKE2B daf2b56ecbf45b57d6b147e4b839000621e367caac66189151b9021ade6901941a8d641291a132d1c1bbdf40bb411bc65d8663743307e896670cfaf24d335feb SHA512 ade1499986a4cefad933cbcf9a073230e74b1a554248e41f1b58480d53b68f6ed0fa0e8faa6f52e59eebc94dcc5127bdbedf77deeab0b108ec7832c71cfd3f6f
 DIST vscode-1.59.1-arm64.tar.gz 111284699 BLAKE2B c349c47208a6caf868070f9bb5bb6b23ff6eaa11de8d754edf8bec8fdd6fdd81c0ff246829a7ef4a92697ecb6356b779456aa8c1781f50ca4c7891297788aa43 SHA512 27b8aeac5ed2bac8bc6dc502ca39cac94f7e8ea4ea6baedffaa3b44dea451738e798674976444268db5543b6a144d55cadd47ded755a66c484c4c05cd5d20ad8
 DIST vscode-1.60.2-amd64.tar.gz 105537736 BLAKE2B 395cbea3c7522749423d8b79d7461189dbb04b1d751bb4a70b6ce7782e971c1dac0e51cda91e961cab0fceeef16e073803d2f54bd6d8840596a2ea45f9f34369 SHA512 caf8acea129533a6cb5824d5ed97f9e9f740dcdc67c3a0c3cf778d58a8fddebe870892d25ad74116c5311a53497db933ff70e5e250480c3a0d76e5fc62733b02
 DIST vscode-1.60.2-arm.tar.gz 94232609 BLAKE2B eb896cc316dfc96d6d523d15da735b18eb6e6011d7ec92b5f9fa8732f574097579c8af4601312c831a9f4aa752087188e203b761e86df31b688838b45354deb1 SHA512 8261b71740344f927091dadd28bcb06d17b70551da0fd0b3c20378ec744cc31660ae32aadedd87a8942c410da381dbf7e023c27af913a62a1bba774d6de241ea
 DIST vscode-1.60.2-arm64.tar.gz 107827801 BLAKE2B aff930e81534972f2dc3d7d0d5cc489ec77818c0304859d64838317fbaf9225f4325a8b237268569f88eca7c76ea7a73275d90747b4485eff30d5f59a9cdd977 SHA512 cc50c7ec44d546b227c271f621be87120a1c36c2ed8236421e9c7227c1cb83bf970d5673191afc1383c4479393b5fae873fd6829179d1d9139b6c3ec32c5c1fd
-EBUILD vscode-1.58.2.ebuild 2498 BLAKE2B 6f0b4c2d4c6c9fc109fe05611d54bc953436e183cdcbd3f3fd4cba200ef35dcd60310a87d27a9282daab5bf738803f5c47ab9b64e4ad994673d815df469a1299 SHA512 e53bb2318c995aff9bc38444f4a09e726a6373b3737828b61c58dd638619a8ec877e754001ddc11a1bf8d869814bd0af098205a1199c967fbb79bed193767867
+DIST vscode-1.61.2-amd64.tar.gz 112814371 BLAKE2B c297d27f12dbbf5bb752076881ae28100d1b051d14528425f8227c5c70ce779ab8db93b960bd4d4ff9788fa2e63167c4253324ba4413b0975d41608c541c6303 SHA512 52c3b89612f2d2f72ea9de9449d191130a23a3dbae1f2876e1716773abe9b6c7064a8eb6053d6bc94438b6e3753df2f00ccc4452b2404fcb2c052ea6090d83cc
+DIST vscode-1.61.2-arm.tar.gz 94477034 BLAKE2B cecb63ed58a36fbbef13cf7de086f0f7f77efea03fc605801b3064c273736ea999b91ef84e0c900ca415955cd7a508d20c33e92a5acab0dcca388d9624743902 SHA512 9cfd10c4cc6d2e3eaa1323afc1b493448632f57681b1e7d595d7f52a7e7d4c4a2ce48d2e6b21b2380fb7be8d98d33d5848a91af178eed974f952bcd7cfbbcb3d
+DIST vscode-1.61.2-arm64.tar.gz 108043274 BLAKE2B f512c85102b3e3858a5ba8f2a63ec9fc7fdee77ffbe768287cd72e89103880002fd2ca77bc72f0210f2f4c0e4cec2b7708404e7db874d7c87d97b17361a26d4e SHA512 dcac0d56bde8b1fd855d386da77e164354f8c819e994d395cfd6b9cf50d5ac96421745c6efc20ec89448e6020b61b0d4ed482e74ecb39422a6acf3662f905dfa
 EBUILD vscode-1.59.1.ebuild 2642 BLAKE2B 201e0388f45fca6575b9dab19a6182ccd7505ffa4221c8b60903324dc5f8582539f123137c899350af6be583843354fee02a49295115eaee6f6e03fca4c33422 SHA512 efac4cd0f435dcb044b688ffe254e91b2d78a483b36d3b3ccd610dde9380f39f8dee1814297b807169ba1c8d450015390cf766497cf0b5be19aae309d59fdcb3
 EBUILD vscode-1.60.2.ebuild 3037 BLAKE2B 5f538f6e379ee8092b77f0c9384b3dceac812c5cda15e43d52490bd5ce1a4251502d3f8690292e4d146d3fc6f14721bf14c404555ba9f655e6cb21c6a05394d2 SHA512 f5732bd74dfea9254c64ae1e6f1b991540302953b6e5bc6d72159d9341ad94645ed899bc6b54482cae49d12e82bf76475caa6196ffcdd8103bcdd375bf1c54ba
+EBUILD vscode-1.61.2.ebuild 3037 BLAKE2B 5f538f6e379ee8092b77f0c9384b3dceac812c5cda15e43d52490bd5ce1a4251502d3f8690292e4d146d3fc6f14721bf14c404555ba9f655e6cb21c6a05394d2 SHA512 f5732bd74dfea9254c64ae1e6f1b991540302953b6e5bc6d72159d9341ad94645ed899bc6b54482cae49d12e82bf76475caa6196ffcdd8103bcdd375bf1c54ba
 MISC metadata.xml 947 BLAKE2B d2c522407289299e1398799f6187e1c0d6621dfe29c1dd0e9d88281eafe44f4b4b3a0edad920268d220375f9330f0a62c015fb1e5085decf5ca5e485a92cc204 SHA512 6b27ac42f3d67203c46996388f6700c007a299557808505179cfa42deeb71098bf3a257f23c11835389fd7a59180f3536e420ed6cdb93b274d47e4c84a25f738
diff --git a/app-editors/vscode/vscode-1.58.2.ebuild b/app-editors/vscode/vscode-1.61.2.ebuild
index 044c01c33002..dbed711c205a 100644
--- a/app-editors/vscode/vscode-1.58.2.ebuild
+++ b/app-editors/vscode/vscode-1.61.2.ebuild
@@ -39,18 +39,31 @@ SLOT="0"
 KEYWORDS="-* ~amd64 ~arm ~arm64"
 
 RDEPEND="
-	app-accessibility/at-spi2-atk
+	app-accessibility/at-spi2-atk:2
+	app-accessibility/at-spi2-core:2
 	app-crypt/libsecret[crypt]
+	dev-libs/atk
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/nspr
 	dev-libs/nss
 	media-libs/alsa-lib
-	media-libs/libpng:0/16
+	media-libs/mesa
+	sys-apps/dbus
 	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
 	x11-libs/gtk+:3
-	x11-libs/libnotify
+	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/libXScrnSaver
-	x11-libs/libXtst
+	x11-libs/libXrandr
+	x11-libs/libxshmfence
 	x11-libs/pango
 "
 
@@ -87,12 +100,17 @@ src_install() {
 	insinto "/opt/${PN}"
 	doins -r *
 	fperms +x /opt/${PN}/{,bin/}code
-	fperms +x /opt/${PN}/chrome-sandbox
+	fperms 4711 /opt/${PN}/chrome-sandbox
+	fperms 755 /opt/${PN}/resources/app/extensions/git/dist/askpass.sh
+	fperms 755 /opt/${PN}/resources/app/extensions/git/dist/askpass-empty.sh
 	fperms -R +x /opt/${PN}/resources/app/out/vs/base/node
 	fperms +x /opt/${PN}/resources/app/node_modules.asar.unpacked/vscode-ripgrep/bin/rg
 	dosym "../../opt/${PN}/bin/code" "usr/bin/vscode"
+	dosym "../../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"
 	newicon "resources/app/resources/linux/code.png" "vscode.png"
 }