gentoo auto-resync : 13:02:2025 - 00:12:52

8 files changed, 282 insertions, 4 deletions

diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index ec1bef72e1b2..95e68ad831a5 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/logseq-desktop-bin/Manifest b/app-editors/logseq-desktop-bin/Manifest
index d3a4828b88ab..506e7a4bac38 100644
--- a/app-editors/logseq-desktop-bin/Manifest
+++ b/app-editors/logseq-desktop-bin/Manifest
@@ -1,5 +1,5 @@
 DIST logseq-desktop-bin-0.10.8.zip 189513360 BLAKE2B 851b9a5b8b7a5b1c94ecc71cab87dfe6b94a55f8c320b81e80647499741661e1f220b9077acb6f1cdd61e2a6c7dc646fb832cdc80e504a8a4015531d81875cee SHA512 64a31ce323d7f0e9640a6c1b386631b0a9571bf9677effc3e0d1fd0fb8e68da3b95d37ef1db97bb2c7a12f3c1a75de7db44af566fcdfa62eb8aa76390330bf42
 DIST logseq-desktop-bin-0.10.9.zip 188490864 BLAKE2B 83e1b94490a4295f5f2821e70e83c76b31ab19879fa800b1111643cc81622169031d8e2af18eddedeabe3c6ae2e4a575ec9cb0b50acab48aef711c5f4cd678c0 SHA512 8f93c498d64699dcf5c68e7dc800a0a96f667b7767683903ba38cd7dea9f4787b9ab03e83e75cbf6d0b3ba5e52b1442e29aad1383b14c3acdf67463cc7eae176
 EBUILD logseq-desktop-bin-0.10.8.ebuild 2447 BLAKE2B f9439ab702ea786d40013d5b94d6f868dea29c966d274321b9a8d322ab09289efe8abec02ed7ae91c053dcfe7f8ae16804d61c8700e7cdec957cf3d8f39cce88 SHA512 bcc40768817303465de105e9d37a0b68032b43bf4d977781856bf0cb6afb63b236d903f908e03373e29a018eeed97df6e6226bfd7ea2d89e07447573f19dd333
-EBUILD logseq-desktop-bin-0.10.9.ebuild 2447 BLAKE2B f9439ab702ea786d40013d5b94d6f868dea29c966d274321b9a8d322ab09289efe8abec02ed7ae91c053dcfe7f8ae16804d61c8700e7cdec957cf3d8f39cce88 SHA512 bcc40768817303465de105e9d37a0b68032b43bf4d977781856bf0cb6afb63b236d903f908e03373e29a018eeed97df6e6226bfd7ea2d89e07447573f19dd333
-MISC metadata.xml 329 BLAKE2B 74a2591f14fe7ddb0f786edec16cc6febf88ba1f84ea72b5d36ce7237aef4878e24b27a22f1a0562d4335ec1737ee99f16a2e5c8bc0bc090a1b4f68d6800c44c SHA512 cfd29744fcdb92629ae4492e3fa0f9f3f8539e212309e013b0567b7b50333ab1490498c7440d06c55531797a79ee783eb96fa7cc5128390b0e67b63b4bf2266d
+EBUILD logseq-desktop-bin-0.10.9-r1.ebuild 2614 BLAKE2B 8f58e52167536922178b13b52206714d8bd8a0a362769965fa6ed979d34479fbfea84901ad60a269d61febbbec517712b944165e96b833d89b5adfe9189ec13f SHA512 b1741abc36757693f880f4cda03dd70d121f1c87484d143ba336e82e77a81a2b29b57b4c0cfd928e84b0d504180ecb0d289fb935ee884befc0cb99c011c88680
+MISC metadata.xml 477 BLAKE2B ae87d50ec218d2d29b0d3e8b255e69b16d7ab3acdcab48d1e90145dc9ec3ae59703750a096543564c204c8c1ed8aca550dead1990853a1b60913bffc9c77098e SHA512 49edf106d29008c09bb3bb2092d2f6e0761baf4443c052d152eadc6a36b2013e17c07d58b92425c46884d1f7b47b0a864250fcffc64d449318160bbdb9d771cc
diff --git a/app-editors/logseq-desktop-bin/logseq-desktop-bin-0.10.9.ebuild b/app-editors/logseq-desktop-bin/logseq-desktop-bin-0.10.9-r1.ebuild
index bc4f1ec885d5..7cd17cd585ab 100644
--- a/app-editors/logseq-desktop-bin/logseq-desktop-bin-0.10.9.ebuild
+++ b/app-editors/logseq-desktop-bin/logseq-desktop-bin-0.10.9-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2023-2024 Gentoo Authors
+# Copyright 2023-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -19,6 +19,7 @@ S="${WORKDIR}/Logseq-linux-x64"
 LICENSE="AGPL-3"
 SLOT="0"
 KEYWORDS="-* ~amd64"
+IUSE="wayland"
 
 RESTRICT="mirror splitdebug"
 
@@ -84,7 +85,11 @@ src_install() {
 
 	dosym ../logseq-desktop/Logseq /opt/bin/logseq
 
-	make_desktop_entry "/opt/bin/logseq %U" Logseq logseq Office \
+	local exec_extra_flags=()
+	if use wayland; then
+		exec_extra_flags+=( "--ozone-platform-hint=auto" "--enable-wayland-ime" )
+	fi
+	make_desktop_entry "/opt/bin/logseq ${exec_extra_flags[*]} %U" Logseq logseq Office \
 		"StartupWMClass=logseq\nTerminal=false\nMimeType=x-scheme-handler/logseq"
 	# some releases do not have an icon included, but we dont fail if that happens
 	doicon resources/app/icons/logseq.png || true
diff --git a/app-editors/logseq-desktop-bin/metadata.xml b/app-editors/logseq-desktop-bin/metadata.xml
index 0a67e594f20b..882e3af69d3a 100644
--- a/app-editors/logseq-desktop-bin/metadata.xml
+++ b/app-editors/logseq-desktop-bin/metadata.xml
@@ -5,6 +5,9 @@
 		<email>mschiff@gentoo.org</email>
 		<name>Marc Schiffbauer</name>
 	</maintainer>
+	<use>
+		<flag name="wayland">Run in wayland mode under wayland sessions, xwayland otherwise. This flag doesn't affect x11 sessions.</flag>
+	</use>
 	<upstream>
 		<remote-id type="github">logseq/logseq</remote-id>
 	</upstream>
diff --git a/app-editors/neovim/Manifest b/app-editors/neovim/Manifest
index 87fc703d1e8d..fbc0309e295c 100644
--- a/app-editors/neovim/Manifest
+++ b/app-editors/neovim/Manifest
@@ -5,9 +5,11 @@ AUX sysinit.vim 3131 BLAKE2B 0c64d5750f2db149308021549b327d0835b20bd4cf07f9eafd4
 DIST neovim-0.10.1.tar.gz 12796966 BLAKE2B 85d98abe03f69ab03d09dc1b39783974af392f707deddef4640b6953ad574f9a455897217c2431c6c2fadb56568b55ac18ed06bbfcc7bbe1c6ab013991e99ee6 SHA512 37e9d45041b059a26fe02717eae7cdbde58f0a35560c590764f5888de67cfa04bee76d6b359ab14b020ac5a661d64908960283347381d334106308504c0df908
 DIST neovim-0.10.2.tar.gz 12801272 BLAKE2B 0cba241ec6466639044decf26728b6c17c3be7970c85b6938fceb05c329d2832c8c46d0113d83aedee458991e4cb27dfad67b3d7b84080a23035ca85ccd57e36 SHA512 6478c53bddff0bf042388464fa1c5114e8fe75c7c41b22e5426783bd2f8406bd3297ffd4bc895ea13e573f0cd28a64755c1f5c063531bb8de477c4e439384418
 DIST neovim-0.10.3.tar.gz 12804352 BLAKE2B 4196154a1f2415f72ed4cdebbde67804212d9be0f364fdb4c053ba0fb608eddad457fd360d7ce764615651288f5890b3283b180fc2ed726208a19fbc6c9fb9c4 SHA512 f1286c42bf0a119fea4575ae64043e43f36cd569d339ced15700c45441e8d8952ea7eac2250063a5aff4552632f0ca7696b442d4d8ffa4f5fce25ddbee0e861b
+DIST neovim-0.10.4.tar.gz 12808381 BLAKE2B 5dae3cef173431ca39320e4640661457e25e9508feee23bb076d82ab3a5934df1961cb63f7329bba7dc0d41bb4e6e889a4cf58754812d1af074a21fc36cdc1c5 SHA512 8dadc24edaaa27e6ecd4db6c19d0183868a8d2809ba122110685f340341d951772ac2eb0c5f7a7ab5f87d3d5d8ae5e81f156c61f04f6d4ebbaa17cd35fb70b64
 EBUILD neovim-0.10.1-r1.ebuild 3554 BLAKE2B e09720f5c77fd83007375227b31d38228bc4dfa5b17235ac906ffdea99e1a06b794949f7cd6250d3c87b6bb9952c311c84cfdf2b8b4b8a93f28e91b7cdeb5ef6 SHA512 a9b43b4c12622c2638bc0bf72144fcf734fb46f197c241ceb9a59c9ee53ac6e979184b88d23031e31172544404e2c1da6fc1d5b7114f1ea714018c7defd232d2
 EBUILD neovim-0.10.2-r1.ebuild 3475 BLAKE2B 4272d7a26931c9c0067054d3055102d3a1148381f5dd11e1865c47b7c2c815d7626b79ab51c355290fc0e4d5880310435161390d3d73e843070bedcb09da201b SHA512 51f83cedbda106411dd337ee31bd545887c3ff07211d2c5b621018c9aa6305cc658aebe2397fa3013349de4809ac911888ecd720e5da67de052d9cf8ed2081a9
 EBUILD neovim-0.10.2.ebuild 3554 BLAKE2B e09720f5c77fd83007375227b31d38228bc4dfa5b17235ac906ffdea99e1a06b794949f7cd6250d3c87b6bb9952c311c84cfdf2b8b4b8a93f28e91b7cdeb5ef6 SHA512 a9b43b4c12622c2638bc0bf72144fcf734fb46f197c241ceb9a59c9ee53ac6e979184b88d23031e31172544404e2c1da6fc1d5b7114f1ea714018c7defd232d2
 EBUILD neovim-0.10.3.ebuild 3555 BLAKE2B 03ad18fda4756e29d3a8994f48047e8420fe817b8998b8dcff204efe7bf96b7c87ae3246508c2aa5d4e7c015aa228a747eb9e020136e0bffe9c3fcb61d949652 SHA512 e9cc2e2f6bce8afab5871e1f451a62b4413f7ad7658778b0b8e77865b5a75118fdce3e675d08a7380f46a9ef5f10acba3b0d5132017728a4b95ef2adb15991ab
+EBUILD neovim-0.10.4.ebuild 3475 BLAKE2B ed2dcf8c72c1ff3ba5973dd6100bfe9b119be5c4d94c5255c325f6681bc5a5a0c3962d1a563d014093949c5a4063400877962b2b6f3b47a51a3d29c9cd2d5ca1 SHA512 e9afb95bcda93c6b75f1b2c6ab7266d332316ba0e319c7ff7cf2e1d7509fb05a8d5a853d4a67c17b8a0036809d64f9a83e21835309f73e0c9d6d6646bc7c5ba0
 EBUILD neovim-9999.ebuild 3475 BLAKE2B 7264295dc68f17a4651ea57dc586e8aeab089608a45b6baae9cca9dd70a1a222a9a03a90ce87c06646785d5f6795ceddb4359f924c934ab2fad692ce877a3538 SHA512 785b9e27e26f905be4b30b44f8dcb84ab0ad4d84dba53e1da77495261becab4b45ebd927a3e7eed5db4f110660680e7789db9082063a1de56553c673f5592708
 MISC metadata.xml 678 BLAKE2B 45ead4b7163d0750477ac40d5aeaa3baee2cc9f2b90d6fee9d9c18c3433a6eecdcdb16665218538ddb644d2701eff02d397e44c0b84d21b1571ce7ee99354333 SHA512 faef3288490a32cf7fed881d6f35430fcc4f74a38881aee4162b2729472152f56cd2818e093d4cf832d3b74781598050300e4bcc85b0e996fb9b2d8d2da43bac
diff --git a/app-editors/neovim/neovim-0.10.4.ebuild b/app-editors/neovim/neovim-0.10.4.ebuild
new file mode 100644
index 000000000000..9a7069ff488d
--- /dev/null
+++ b/app-editors/neovim/neovim-0.10.4.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# RelWithDebInfo sets -Og -g
+CMAKE_BUILD_TYPE=Release
+LUA_COMPAT=( lua5-{1..2} luajit )
+inherit cmake lua-single optfeature xdg
+
+DESCRIPTION="Vim-fork focused on extensibility and agility"
+HOMEPAGE="https://neovim.io"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/neovim/neovim.git"
+else
+	SRC_URI="https://github.com/neovim/neovim/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~x64-macos"
+fi
+
+LICENSE="Apache-2.0 vim"
+SLOT="0"
+IUSE="+nvimpager test"
+
+# Upstream say the test library needs LuaJIT
+# https://github.com/neovim/neovim/blob/91109ffda23d0ce61cec245b1f4ffb99e7591b62/CMakeLists.txt#L377
+REQUIRED_USE="${LUA_REQUIRED_USE} test? ( lua_single_target_luajit )"
+# TODO: Get tests running
+RESTRICT="!test? ( test ) test"
+
+# Upstream build scripts invoke the Lua interpreter
+BDEPEND="${LUA_DEPS}
+	>=dev-util/gperf-3.1
+	>=sys-devel/gettext-0.20.1
+	virtual/libiconv
+	virtual/libintl
+	virtual/pkgconfig
+"
+# Check https://github.com/neovim/neovim/blob/master/third-party/CMakeLists.txt for
+# new dependency bounds and so on on bumps (obviously adjust for right branch/tag).
+# List of required tree-sitter parsers is taken from cmake.deps/deps.txt
+DEPEND="${LUA_DEPS}
+	>=dev-lua/luv-1.45.0[${LUA_SINGLE_USEDEP}]
+	$(lua_gen_cond_dep '
+		dev-lua/lpeg[${LUA_USEDEP}]
+		dev-lua/mpack[${LUA_USEDEP}]
+	')
+	$(lua_gen_cond_dep '
+		dev-lua/LuaBitOp[${LUA_USEDEP}]
+	' lua5-{1,2})
+	>=dev-libs/libutf8proc-2.9.0:=
+	>=dev-libs/libuv-1.46.0:=
+	>=dev-libs/libvterm-0.3.3
+	>=dev-libs/msgpack-3.0.0:=
+	>=dev-libs/tree-sitter-0.22.6:=
+	=dev-libs/tree-sitter-c-0.21*
+	=dev-libs/tree-sitter-lua-0.1*
+	=dev-libs/tree-sitter-markdown-0.2*
+	=dev-libs/tree-sitter-query-0.4*
+	=dev-libs/tree-sitter-vim-0.4*
+	=dev-libs/tree-sitter-vimdoc-3*
+	>=dev-libs/unibilium-2.0.0:0=
+"
+RDEPEND="
+	${DEPEND}
+	app-eselect/eselect-vi
+"
+BDEPEND+="
+	test? (
+		$(lua_gen_cond_dep 'dev-lua/busted[${LUA_USEDEP}]')
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.9.0-cmake_lua_version.patch"
+	"${FILESDIR}/${PN}-9999-cmake-darwin.patch"
+)
+
+src_prepare() {
+	# Use our system vim dir
+	sed -e "/^# define SYS_VIMRC_FILE/s|\$VIM|${EPREFIX}/etc/vim|" \
+		-i src/nvim/globals.h || die
+
+	# https://forums.gentoo.org/viewtopic-p-8750050.html
+	xdg_environment_reset
+	cmake_src_prepare
+}
+
+src_configure() {
+	# TODO: Investigate USE_BUNDLED, doesn't seem to be needed right now
+	local mycmakeargs=(
+		# appends -flto
+		-DENABLE_LTO=OFF
+		-DPREFER_LUA=$(usex lua_single_target_luajit no "$(lua_get_version)")
+		-DLUA_PRG="${LUA}"
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	# install a default configuration file
+	insinto /etc/vim
+	doins "${FILESDIR}"/sysinit.vim
+
+	# symlink tree-sitter parsers
+	dodir /usr/share/nvim/runtime
+	for parser in c lua markdown query vim vimdoc; do
+		dosym ../../../../$(get_libdir)/libtree-sitter-${parser}.so /usr/share/nvim/runtime/parser/${parser}.so
+	done
+
+	# conditionally install a symlink for nvimpager
+	if use nvimpager; then
+		dosym ../share/nvim/runtime/macros/less.sh /usr/bin/nvimpager
+	fi
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	optfeature "clipboard support" x11-misc/xsel x11-misc/xclip gui-apps/wl-clipboard
+	optfeature "Python plugin support" dev-python/pynvim
+	optfeature "Ruby plugin support" dev-ruby/neovim-ruby-client
+	optfeature "remote/nvr support" dev-python/neovim-remote
+}
diff --git a/app-editors/vscode/Manifest b/app-editors/vscode/Manifest
index b131efdf8678..e1cc58598ac0 100644
--- a/app-editors/vscode/Manifest
+++ b/app-editors/vscode/Manifest
@@ -7,6 +7,10 @@ DIST vscode-1.96.4-arm64.tar.gz 145445086 BLAKE2B 4caddcccb57e9e8623cbcf03f4fb9d
 DIST vscode-1.97.0-amd64.tar.gz 150727110 BLAKE2B 6203cafb733a251618830d46901bc5be50c137e575ec0955141d1bfaad778d9e2fe01d45866e0d3bcfeb7759f869544fa64ef09eecc2980a2e10a10df9f14e2e SHA512 518dbc3d17455c0096f8b21b47549c429745c818cfc938711cb6af1f325ea126ab7c9b80e3cb1e43f596854c4ddbecf2279e7cbe6b8e0bf692569800956ebf73
 DIST vscode-1.97.0-arm.tar.gz 134802622 BLAKE2B 82668537dfac9347f2ea0ee63838c7973a6636c968cec3a00ab59f67e6177c272fd5790c8e0e888fefee3ba52cde14705c4debf8ce248809a51044fabd378603 SHA512 9b7b7b10b711355cc3f3034161190984aa2d164438d15d584f00d13559d8ddb3cac0d3dde208c694553997c17cc26510c89c96366d9d156a9f4918b594b633ca
 DIST vscode-1.97.0-arm64.tar.gz 146745694 BLAKE2B b5a63442a9894949cdd92aee42fc7a8532b7d798d47d0d1aa37fd60a78b9e51aef8bab216c75ad9be0aa25f5efc0635de8abc40fc09b33557de3d82ae2e7fd65 SHA512 43b432617d6fe5c586c1af68e6bf49587c6196868e9bb1d6b0782a95f489ef23745ce7b3e6516f9464ecfd602f5fc77b102bce511f123eb6bb3bdca9987a305f
+DIST vscode-1.97.1-amd64.tar.gz 150733407 BLAKE2B d2100a17d2ce027bdb734049a5ac3a63405a01cb3835419c2f7c942b102020dd0879263171586a95b0f7470e1d55ef779487a19a43b40e73d70234b857131603 SHA512 959e5d9e649befa2b72d15cf1e8fe839eea99eb237727e00c0fdc78c04437d404770e27d31ca28dca31242f6a306dd6862424e1abb3be289c1d1a3c692bf9035
+DIST vscode-1.97.1-arm.tar.gz 134817766 BLAKE2B 7513e1781682c80bbd1ffd4a27a261ee9bd5cd351dd50a5adfb6e5a075820ebc8ad8269f75ad532878778230c3ec58cc0bb5483c34156dd9fe1115ecbb55d003 SHA512 7ad5f8c3ebdec00c3335ac000e97a825abbe2fe7f5ac4f6fa4f74330a0f3a4d9a1203f43d527cb545dc2cf7ef9ef742fcb3116a91e508e5af63653d3c9a0cd13
+DIST vscode-1.97.1-arm64.tar.gz 146757140 BLAKE2B b295f1332bb934c867bdb5f8e15b8e702f17ae786d7c945e386c03d4ca6ec8d681f4b44bc8f7fedd1428e575f84f54ccd02d5be1e678d008cc70a532705e3cad SHA512 db35c677b057d380893000c83fa42304e8758c00cd0348acda5e37eafb301d1848851ee9c734fea09e5650cbd396512806e4daa4be7ca9b1c0ee4598f77ed365
 EBUILD vscode-1.96.4.ebuild 3209 BLAKE2B 85c101cc8d9ac0a112bf05d3d3afa7da8199f591d5cf6a57e282d41f41de8847edf2b25332f2449ec02d26d73c041d06979c7c17f9bc89eef371ed442852e372 SHA512 54061161d63591821a564cee0eb3608cbdd4f02472c77bc61ed89b30390b429ba5528e2790598c8c9b415feeda5e3132a4d736be12df7e92e5fe55aa17524a76
 EBUILD vscode-1.97.0.ebuild 3209 BLAKE2B 85c101cc8d9ac0a112bf05d3d3afa7da8199f591d5cf6a57e282d41f41de8847edf2b25332f2449ec02d26d73c041d06979c7c17f9bc89eef371ed442852e372 SHA512 54061161d63591821a564cee0eb3608cbdd4f02472c77bc61ed89b30390b429ba5528e2790598c8c9b415feeda5e3132a4d736be12df7e92e5fe55aa17524a76
+EBUILD vscode-1.97.1.ebuild 3209 BLAKE2B 85c101cc8d9ac0a112bf05d3d3afa7da8199f591d5cf6a57e282d41f41de8847edf2b25332f2449ec02d26d73c041d06979c7c17f9bc89eef371ed442852e372 SHA512 54061161d63591821a564cee0eb3608cbdd4f02472c77bc61ed89b30390b429ba5528e2790598c8c9b415feeda5e3132a4d736be12df7e92e5fe55aa17524a76
 MISC metadata.xml 1319 BLAKE2B 02076564e7b3b37433125cdcada4445311f03699bc7adb00f60af4f73f2fa9ebb90b805885198bd7cbdc54b779fa259d56c3142b30d595eaed278130081d8ca7 SHA512 d0922226274b1686ea14c8ca4e5835f6b30399bd71372bde4ac7e4eee4301ccca7fc32472d6ac0bd598b0459ebc33a59d346a21f5fa2d39cac4ed197682354e0
diff --git a/app-editors/vscode/vscode-1.97.1.ebuild b/app-editors/vscode/vscode-1.97.1.ebuild
new file mode 100644
index 000000000000..04f694acb893
--- /dev/null
+++ b/app-editors/vscode/vscode-1.97.1.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2025 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
+
+	sed "s|@exec_extra_flags@|${EXEC_EXTRA_FLAGS[*]}|g" \
+		"${FILESDIR}/code-open-in-new-window.desktop" \
+		> "${T}/code-open-in-new-window.desktop" || die
+
+	domenu "${T}/code.desktop"
+	domenu "${T}/code-url-handler.desktop"
+	domenu "${T}/code-open-in-new-window.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"
+	optfeature "Live Share" dev-libs/icu
+}