update visual-studio-code and cleanup old versions

Signed-off-by: Samuel Bernardo <samuelbernardo.mail@gmail.com>

6 files changed, 22 insertions, 289 deletions

diff --git a/app-editors/visual-studio-code/Manifest b/app-editors/visual-studio-code/Manifest
index d43320c..6717762 100644
--- a/app-editors/visual-studio-code/Manifest
+++ b/app-editors/visual-studio-code/Manifest
@@ -1,21 +1,8 @@
 AUX visual-studio-code.desktop 219 BLAKE2B 76da7de95bb06cab2feaef664aee550b9ea68b58ecf3a9affa82fa11e1aeb8e754498cf1aa0b2dc18030fc2d800173c4b7ffd9c17dc0dc9de012fafd631d0060 SHA512 97b81eb1461225f5fef1187709387679d081e377897660e825a6ea356753b2c95e690552e5e75d76371126551786f36a43cd141b06c3cde436ccfb4a75347b03
 AUX visual-studio-code.png 30538 BLAKE2B 16cf4c0e8f6c59451e38049b2531b08cfac9c0ef570b0f4c28c16a51ebfa81e95db2c5286dd4c1ddb0fa535858f3373cff2f76a21a2859321cd80529c2d6ef52 SHA512 fabb74b9ab860d8003798ea85db2a3c79c1b683897acc5b580884a8946fa060276f8cdf459a9fb5fd9a560094b250838a3dfa2e5e5f8032601a155466dffa160
-DIST visual-studio-code-1.29.1-amd64.tar.gz 64558323 BLAKE2B ff4a160e0ded30d5996a96df301f0847d3f44f701fb1d53e98bccf44fb35ca65e3c603b5ccee6827dfb3379ccdc1c9b660cd853a9cf6d955d352109156fa9eff SHA512 efbea554e3306069cadf4256180cbd2059511b64d69aa28254960b2794602c3e5966b7dcb0a49e6c93692c96c89b4902532a414229493dd99788287cb93eb60a
-DIST visual-studio-code-1.29.1-x86.tar.gz 67518099 BLAKE2B b6604bfdd605a364f704e7fdb35eb196b0186f9a282972434a8c4af75d56d40962e0f384e3df7a28bf1e01f2c473f3bd4189aa90b05a70f99f184b5d155befd7 SHA512 de3b8e2ad1f52420539f077e46761776e0106d0af58336e8e9fbbd60f3559e0fa6a867a82962f262550bd0674f1323bd95c0e84840a14e5f5c1bafbd260be875
-DIST visual-studio-code-1.30.2-amd64.tar.gz 64974797 BLAKE2B 289dd69fac033b33bd4579c70481e802b97588d5ceb6db09043577c842f15af02c4bb600cb255d59bb4742810ff23f69f97360f76195953e14d4a12198a24b6e SHA512 3d9d9cdb4129c0a32a15a39337ccfe1f215870cda65f81616d9e5ae17dcadbee3a5afa118c96d26513dd215c5eb49e81bbc1ea4af46e0a02790d712c96fa96d1
-DIST visual-studio-code-1.30.2-x86.tar.gz 67934150 BLAKE2B 569614ecc3e7c7b45c534029b6895603ca759a5fcc1e0f8b408e5970613798fd4b55254cabc1003dc17dc7baedae73c4fdd7ce8fa7ec3b1a655b48d002777b43 SHA512 bf399d5c5ea423204d5674332117eca130e944c48e676ca37b0850318935bffc96b1de1404f1185ec904e9813d869a089208443188504d07389f2539f6ffa61b
-DIST visual-studio-code-1.31.0-amd64.tar.gz 67903602 BLAKE2B 9c11e519491bafa0253e564b4db1a15be7becd0c11e50ac6d0f6a1145d3e26cca75702c11d2ed964954d5a9b94fac87fa1aed439e625785cee9f2090c833ddd9 SHA512 9a3e5d1ccafe0261129522e9a7a7ee4729af618d54b6383383c0568814362241eb98a3d5995920c4e2e71f735d7d99253cdb2f0f14e675eb3801cef13dccb32d
-DIST visual-studio-code-1.31.0-x86.tar.gz 68895784 BLAKE2B e9e99cd32d60d40921428ba379f31b253c782a3ba4226eb32e12c014a536c39a6b0ee59e81d377b5e31377eacd97d56ea9e7f9d8f13ba72a63bf23a560828545 SHA512 93400394283a311879d1eb10e72ff0a40a948ca79128847c6739990b43cfa0da7d7ef42e480b0c1bf374b788d588b69b3d73b4063729e44a6275759ab0a1a197
-DIST visual-studio-code-1.32.1-amd64.tar.gz 68075602 BLAKE2B 6a275dafa9b72129c715a0b3b19f6de2366a564b92e0a58981f8a0bfe75ea59551fa6bda1b0e77433d5e7009bae5e756c702a3696c24bd4946dd160d4004c115 SHA512 105151ef0191c083570d2094fdc156ef776b6b048afe406b77a964fb05245ab4c1d156cf84be2ed118a417050216aa1aec3ebf024cb8ac9e12d3409518ae0792
-DIST visual-studio-code-1.32.1-x86.tar.gz 69072928 BLAKE2B 2f471ded483776f61dbfa28abc93a78e7f254d20bf75caec51c1c6fdb14186eaf31444c75c04da5965f06c55391937ebe4fd9ef8ca49bfb23742260c16dd00c3 SHA512 c27d3f5be88958da3da0281f74022c608116007610d01f030cf57c2e2031c267484306dc19a83835dec80b4fff4cbc4608173f68cbcda6e41c924ea7f4dfe8a0
-DIST visual-studio-code-1.33.0-amd64.tar.gz 68367968 BLAKE2B ce4daaef9ee12e48c7f26ae5e8746ebcdeb02307fb72cda63f748ec7266e6b4638d36ce036cd29e08510f6138decba9b642774529b762411ba14123044274a90 SHA512 88e066550141fa51c0f06a1c5445822f8759176d010c96e86d84cffc98e1f71e3903abfb780cdde676b16b3f5686063b84f51a9e46095bd6a2d22c90d4240dcd
-DIST visual-studio-code-1.33.0-x86.tar.gz 69349339 BLAKE2B 4fc34d79a77387d0e4448fb51b9624bf515b7bd25e503f1fa7acec78c83c964c8ccfe4fe1d4ad8b8a18490165defc4bc3eba79425972226eb019528582128580 SHA512 f30027f8a6b0eed93d1ec43abfd79af3ac4ac523f405f903f4cabec5903285fce73e3728713294a347ce81f192ef2bdb7c930f5c2e778a607e445ccd8ae131a3
 DIST visual-studio-code-1.35.1-amd64.tar.gz 68383648 BLAKE2B 27f6df0b5326999b10f5d601dc31a342c7a6b14dd338b7e4f5ecaa9a3b7dc26c2db1b1faba9a62357a6540f3400c7d43687af88ad07e6faa720fe0c2e201c6b9 SHA512 84959245e0adfec04fe31ff0f30862313dbc89291bf47772f784e29e17a6e955ec21f9a1d23f8f1b6717c747517063db2563650bb42a5094ee17dad131606b92
 DIST visual-studio-code-1.35.1-x86.tar.gz 69348209 BLAKE2B 40ae0b6ca47056b95c407e633df348aa1042b200b51b4287c9bf445a1f760a997ca060ce81e69f86ee9a17dad16f7f3d6ce2cc25d38d25913160557eb4f6964e SHA512 49920c90cdaedb8319efee655d353e9286e1d656860accf60f7e7753a69673aeac13f0c6b0e80632963c641f5be4d830612b5f81813e5aed0a4d0fc8159ca80b
-EBUILD visual-studio-code-1.29.1.ebuild 1563 BLAKE2B 171013c209e1ff92efbbe97c1783c1e560a6b01d7db94cd84ac661ec93dac88560d281935934077be2eba91242b1c6e50b0ca512e1d48c7f04b20ca321175eaf SHA512 e73a47a360462f55cebf4d04985e2dd15dd3529e82258853ea92aaeb27ceb0c26f15349119b1b97cd46c8106374de685ff7340f342e22bf032d6197ec9e61fb4
-EBUILD visual-studio-code-1.30.2.ebuild 1670 BLAKE2B 45afa7595abf46f34adb1f2e46ae7772ded0df0a3b485224ca361c8cf499f584c092bc378277d66a8c81a9da89a34d3995446e941dbced12352ec06be703f944 SHA512 c7562d5e9ef3d432c61bd306d24ed884e63b1264d0069588bd340ab73a8c76c99bec06df7ff6ba49433176d7dc20abaceb16351b43ed4963ec1b22221ba0bb5a
-EBUILD visual-studio-code-1.31.0.ebuild 1670 BLAKE2B 45afa7595abf46f34adb1f2e46ae7772ded0df0a3b485224ca361c8cf499f584c092bc378277d66a8c81a9da89a34d3995446e941dbced12352ec06be703f944 SHA512 c7562d5e9ef3d432c61bd306d24ed884e63b1264d0069588bd340ab73a8c76c99bec06df7ff6ba49433176d7dc20abaceb16351b43ed4963ec1b22221ba0bb5a
-EBUILD visual-studio-code-1.32.1.ebuild 1670 BLAKE2B 45afa7595abf46f34adb1f2e46ae7772ded0df0a3b485224ca361c8cf499f584c092bc378277d66a8c81a9da89a34d3995446e941dbced12352ec06be703f944 SHA512 c7562d5e9ef3d432c61bd306d24ed884e63b1264d0069588bd340ab73a8c76c99bec06df7ff6ba49433176d7dc20abaceb16351b43ed4963ec1b22221ba0bb5a
-EBUILD visual-studio-code-1.33.0.ebuild 1766 BLAKE2B 53a52a29f7d3ec11a4039f515a4b6c2adf2a874684d7b6f9a81aa22feee559bc5caf91ffaebd46997fc05ec4cb92ca784e7148c9f5c9fbe45717967dcdd0e0d4 SHA512 1b591e1d171a59394a74e03472a4a6b90b686bf76cf336348aded64037f868885a45773834d6c609a9e309519c7af01c1e91aa50cc49290887f3af80fd73ef04
+DIST visual-studio-code-1.36.0-amd64.tar.gz 77632421 BLAKE2B 14ed5b2a042d8b41375575203dfe97f460da0ea9c84d1fbdb3255aae8fab67d9d8c3416b423de31b5f3d32dff085953956c4522d4ec3dc8438a6d93185875391 SHA512 2a6e066311345ec000dbe51da1ac662fb4e04f73e907fe433d7e55b3b33a470d8363c1260f0b4b75f20a359a281e850e2136b28bae7eb2c2ce82d41f93b708e0
 EBUILD visual-studio-code-1.35.1.ebuild 1875 BLAKE2B 4dca47917b252db3b4cc98479c6177674cc9bdae00433babd9343f5360dc37ada490bd64822eeba86580be72fe1e57ecdcf6e9a1c3512697265126bc09c363ec SHA512 c971cdc405251d366dd18bca6ddd3471e8ea538eca5ec1f10d282b8be74068479f6e6151e33781bd33ad24ce5aa964c89ee61e158181b6ab601ea29e46a2dadb
+EBUILD visual-studio-code-1.36.0.ebuild 1811 BLAKE2B 2edf730fe4549c82414d1bfef20eae7c00063bd5c246a3d0b50224f3b2dd70a5ebda0d0c8c32a41e78695d87be9456cd58d5367184fd0fa5c816be17589391d3 SHA512 0bdd055c117a219f9d3721938c90fbd9dd7449fa582f457328fee42a86bb5f1256b08b3c4cfeb3396389f8f1e53b2ca3f13b8ef7b29e6b1c95606c954cd37f6f
 MISC metadata.xml 309 BLAKE2B 73c83a727af6c58aaac4474203ae062f7b93feade63573a5f6fe77b1d048069647dff9537a85a2d1b068ff224d8e189e34ae7a13971034075fad61e1269b3658 SHA512 7550b26c1e56caadc801d76a1069e23a05e9392c512599aaf34dae7267f3103611bcf8e4a4400b1ffca4afc7104feefba164a64559317e8637bcc636492671e3
diff --git a/app-editors/visual-studio-code/visual-studio-code-1.29.1.ebuild b/app-editors/visual-studio-code/visual-studio-code-1.29.1.ebuild
deleted file mode 100644
index c69a5e9..0000000
--- a/app-editors/visual-studio-code/visual-studio-code-1.29.1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils pax-utils
-
-DESCRIPTION="Multiplatform Visual Studio Code from Microsoft"
-HOMEPAGE="https://code.visualstudio.com"
-BASE_URI="https://vscode-update.azurewebsites.net/${PV}"
-SRC_URI="
-	x86? ( ${BASE_URI}/linux-ia32/stable ->  ${P}-x86.tar.gz )
-	amd64? ( ${BASE_URI}/linux-x64/stable -> ${P}-amd64.tar.gz )
-	"
-RESTRICT="mirror strip bindist"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-
-DEPEND="
-	>=media-libs/libpng-1.2.46
-	>=x11-libs/gtk+-2.24.8-r1:2
-	x11-libs/cairo
-	gnome-base/gconf
-	x11-libs/libXtst
-"
-
-RDEPEND="
-	${DEPEND}
-	>=net-print/cups-2.0.0
-	x11-libs/libnotify
-	x11-libs/libXScrnSaver
-	app-crypt/libsecret[crypt]
-"
-
-QA_PRESTRIPPED="opt/${PN}/code"
-QA_PREBUILT="opt/${PN}/code"
-
-pkg_setup(){
-	use amd64 && S="${WORKDIR}/VSCode-linux-x64" || S="${WORKDIR}/VSCode-linux-ia32"
-}
-
-src_install(){
-	pax-mark m code
-	insinto "/opt/${PN}"
-	doins -r *
-	dosym "/opt/${PN}/bin/code" "/usr/bin/${PN}"
-	make_desktop_entry "${PN}" "Visual Studio Code" "${PN}" "Development;IDE"
-	doicon ${FILESDIR}/${PN}.png
-	fperms +x "/opt/${PN}/code"
-	fperms +x "/opt/${PN}/bin/code"
-	fperms +x "/opt/${PN}/libnode.so"
-	fperms +x "/opt/${PN}/resources/app/node_modules.asar.unpacked/vscode-ripgrep/bin/rg"
-	insinto "/usr/share/licenses/${PN}"
-	newins "resources/app/LICENSE.txt" "LICENSE"
-}
-
-pkg_postinst(){
-	elog "You may install some additional utils, so check them in:"
-	elog "https://code.visualstudio.com/Docs/setup#_additional-tools"
-}
diff --git a/app-editors/visual-studio-code/visual-studio-code-1.30.2.ebuild b/app-editors/visual-studio-code/visual-studio-code-1.30.2.ebuild
deleted file mode 100644
index 019c05b..0000000
--- a/app-editors/visual-studio-code/visual-studio-code-1.30.2.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils pax-utils
-
-DESCRIPTION="Multiplatform Visual Studio Code from Microsoft"
-HOMEPAGE="https://code.visualstudio.com"
-BASE_URI="https://vscode-update.azurewebsites.net/${PV}"
-SRC_URI="
-	x86? ( ${BASE_URI}/linux-ia32/stable ->  ${P}-x86.tar.gz )
-	amd64? ( ${BASE_URI}/linux-x64/stable -> ${P}-amd64.tar.gz )
-	"
-RESTRICT="mirror strip bindist"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="libsecret"
-
-DEPEND="
-	>=media-libs/libpng-1.2.46
-	>=x11-libs/gtk+-2.24.8-r1:2
-	x11-libs/cairo
-	gnome-base/gconf
-	x11-libs/libXtst
-"
-
-RDEPEND="
-	${DEPEND}
-	>=net-print/cups-2.0.0
-	x11-libs/libnotify
-	x11-libs/libXScrnSaver
-	dev-libs/nss
-	libsecret? ( app-crypt/libsecret[crypt] )
-"
-
-QA_PRESTRIPPED="opt/${PN}/code"
-QA_PREBUILT="opt/${PN}/code"
-
-pkg_setup(){
-	use amd64 && S="${WORKDIR}/VSCode-linux-x64" || S="${WORKDIR}/VSCode-linux-ia32"
-}
-
-src_install(){
-	pax-mark m code
-	insinto "/opt/${PN}"
-	doins -r *
-	dosym "/opt/${PN}/bin/code" "/usr/bin/${PN}"
-	make_desktop_entry "${PN}" "Visual Studio Code" "${PN}" "Development;IDE"
-	doicon ${FILESDIR}/${PN}.png
-	fperms +x "/opt/${PN}/code"
-	fperms +x "/opt/${PN}/bin/code"
-	fperms +x "/opt/${PN}/libnode.so"
-	fperms +x "/opt/${PN}/resources/app/node_modules.asar.unpacked/vscode-ripgrep/bin/rg"
-	fperms +x "/opt/${PN}/resources/app/extensions/git/dist/askpass.sh"
-	insinto "/usr/share/licenses/${PN}"
-	newins "resources/app/LICENSE.txt" "LICENSE"
-}
-
-pkg_postinst(){
-	elog "You may install some additional utils, so check them in:"
-	elog "https://code.visualstudio.com/Docs/setup#_additional-tools"
-}
diff --git a/app-editors/visual-studio-code/visual-studio-code-1.31.0.ebuild b/app-editors/visual-studio-code/visual-studio-code-1.31.0.ebuild
deleted file mode 100644
index 019c05b..0000000
--- a/app-editors/visual-studio-code/visual-studio-code-1.31.0.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils pax-utils
-
-DESCRIPTION="Multiplatform Visual Studio Code from Microsoft"
-HOMEPAGE="https://code.visualstudio.com"
-BASE_URI="https://vscode-update.azurewebsites.net/${PV}"
-SRC_URI="
-	x86? ( ${BASE_URI}/linux-ia32/stable ->  ${P}-x86.tar.gz )
-	amd64? ( ${BASE_URI}/linux-x64/stable -> ${P}-amd64.tar.gz )
-	"
-RESTRICT="mirror strip bindist"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="libsecret"
-
-DEPEND="
-	>=media-libs/libpng-1.2.46
-	>=x11-libs/gtk+-2.24.8-r1:2
-	x11-libs/cairo
-	gnome-base/gconf
-	x11-libs/libXtst
-"
-
-RDEPEND="
-	${DEPEND}
-	>=net-print/cups-2.0.0
-	x11-libs/libnotify
-	x11-libs/libXScrnSaver
-	dev-libs/nss
-	libsecret? ( app-crypt/libsecret[crypt] )
-"
-
-QA_PRESTRIPPED="opt/${PN}/code"
-QA_PREBUILT="opt/${PN}/code"
-
-pkg_setup(){
-	use amd64 && S="${WORKDIR}/VSCode-linux-x64" || S="${WORKDIR}/VSCode-linux-ia32"
-}
-
-src_install(){
-	pax-mark m code
-	insinto "/opt/${PN}"
-	doins -r *
-	dosym "/opt/${PN}/bin/code" "/usr/bin/${PN}"
-	make_desktop_entry "${PN}" "Visual Studio Code" "${PN}" "Development;IDE"
-	doicon ${FILESDIR}/${PN}.png
-	fperms +x "/opt/${PN}/code"
-	fperms +x "/opt/${PN}/bin/code"
-	fperms +x "/opt/${PN}/libnode.so"
-	fperms +x "/opt/${PN}/resources/app/node_modules.asar.unpacked/vscode-ripgrep/bin/rg"
-	fperms +x "/opt/${PN}/resources/app/extensions/git/dist/askpass.sh"
-	insinto "/usr/share/licenses/${PN}"
-	newins "resources/app/LICENSE.txt" "LICENSE"
-}
-
-pkg_postinst(){
-	elog "You may install some additional utils, so check them in:"
-	elog "https://code.visualstudio.com/Docs/setup#_additional-tools"
-}
diff --git a/app-editors/visual-studio-code/visual-studio-code-1.32.1.ebuild b/app-editors/visual-studio-code/visual-studio-code-1.32.1.ebuild
deleted file mode 100644
index 019c05b..0000000
--- a/app-editors/visual-studio-code/visual-studio-code-1.32.1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils pax-utils
-
-DESCRIPTION="Multiplatform Visual Studio Code from Microsoft"
-HOMEPAGE="https://code.visualstudio.com"
-BASE_URI="https://vscode-update.azurewebsites.net/${PV}"
-SRC_URI="
-	x86? ( ${BASE_URI}/linux-ia32/stable ->  ${P}-x86.tar.gz )
-	amd64? ( ${BASE_URI}/linux-x64/stable -> ${P}-amd64.tar.gz )
-	"
-RESTRICT="mirror strip bindist"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="libsecret"
-
-DEPEND="
-	>=media-libs/libpng-1.2.46
-	>=x11-libs/gtk+-2.24.8-r1:2
-	x11-libs/cairo
-	gnome-base/gconf
-	x11-libs/libXtst
-"
-
-RDEPEND="
-	${DEPEND}
-	>=net-print/cups-2.0.0
-	x11-libs/libnotify
-	x11-libs/libXScrnSaver
-	dev-libs/nss
-	libsecret? ( app-crypt/libsecret[crypt] )
-"
-
-QA_PRESTRIPPED="opt/${PN}/code"
-QA_PREBUILT="opt/${PN}/code"
-
-pkg_setup(){
-	use amd64 && S="${WORKDIR}/VSCode-linux-x64" || S="${WORKDIR}/VSCode-linux-ia32"
-}
-
-src_install(){
-	pax-mark m code
-	insinto "/opt/${PN}"
-	doins -r *
-	dosym "/opt/${PN}/bin/code" "/usr/bin/${PN}"
-	make_desktop_entry "${PN}" "Visual Studio Code" "${PN}" "Development;IDE"
-	doicon ${FILESDIR}/${PN}.png
-	fperms +x "/opt/${PN}/code"
-	fperms +x "/opt/${PN}/bin/code"
-	fperms +x "/opt/${PN}/libnode.so"
-	fperms +x "/opt/${PN}/resources/app/node_modules.asar.unpacked/vscode-ripgrep/bin/rg"
-	fperms +x "/opt/${PN}/resources/app/extensions/git/dist/askpass.sh"
-	insinto "/usr/share/licenses/${PN}"
-	newins "resources/app/LICENSE.txt" "LICENSE"
-}
-
-pkg_postinst(){
-	elog "You may install some additional utils, so check them in:"
-	elog "https://code.visualstudio.com/Docs/setup#_additional-tools"
-}
diff --git a/app-editors/visual-studio-code/visual-studio-code-1.33.0.ebuild b/app-editors/visual-studio-code/visual-studio-code-1.36.0.ebuild
index 2905116..d98249a 100644
--- a/app-editors/visual-studio-code/visual-studio-code-1.33.0.ebuild
+++ b/app-editors/visual-studio-code/visual-studio-code-1.36.0.ebuild
@@ -1,22 +1,24 @@
 # Copyright 1999-2019 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit eutils pax-utils
+inherit desktop pax-utils
 
-DESCRIPTION="Multiplatform Visual Studio Code from Microsoft"
+MY_PN="vscode"
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Multiplatform Visual Studio Code from Microsoft (binary version)"
 HOMEPAGE="https://code.visualstudio.com"
 BASE_URI="https://update.code.visualstudio.com/${PV}"
 SRC_URI="
-	x86? ( ${BASE_URI}/linux-ia32/stable ->  ${P}-x86.tar.gz )
 	amd64? ( ${BASE_URI}/linux-x64/stable -> ${P}-amd64.tar.gz )
 	"
 RESTRICT="mirror strip bindist"
 
-LICENSE="MIT"
+LICENSE="MS-vscode-EULA"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64"
 IUSE="global-menu libsecret qt5"
 
 DEPEND="
@@ -25,6 +27,7 @@ DEPEND="
 	x11-libs/cairo
 	gnome-base/gconf
 	x11-libs/libXtst
+	!app-editors/vscode
 "
 
 RDEPEND="
@@ -42,31 +45,32 @@ RDEPEND="
 	)
 "
 
-QA_PRESTRIPPED="opt/${PN}/code"
-QA_PREBUILT="opt/${PN}/code"
+DOCS=( resources/app/LICENSE.rtf )
+
+QA_PRESTRIPPED="opt/${MY_PN}/code"
+QA_PREBUILT="opt/${MY_PN}/code"
 
 pkg_setup(){
-	use amd64 && S="${WORKDIR}/VSCode-linux-x64" || S="${WORKDIR}/VSCode-linux-ia32"
+	use amd64 && S="${WORKDIR}/VSCode-linux-x64"
+	use x86 && S="${WORKDIR}/VSCode-linux-ia32"
 }
 
 src_install(){
 	pax-mark m code
 	insinto "/opt/${PN}"
 	doins -r *
-	dosym "/opt/${PN}/bin/code" "/usr/bin/${PN}"
-	make_desktop_entry "${PN}" "Visual Studio Code" "${PN}" "Development;IDE"
-	doicon ${FILESDIR}/${PN}.png
 	fperms +x "/opt/${PN}/code"
 	fperms +x "/opt/${PN}/bin/code"
-	fperms +x "/opt/${PN}/libnode.so"
+	#fperms +x "/opt/${PN}/libnode.so"
 	fperms +x "/opt/${PN}/resources/app/node_modules.asar.unpacked/vscode-ripgrep/bin/rg"
 	fperms +x "/opt/${PN}/resources/app/extensions/git/dist/askpass.sh"
-	insinto "/usr/share/licenses/${PN}"
-	newins "resources/app/LICENSE.rtf" "LICENSE"
+	dosym "/opt/${PN}/bin/code" "/usr/bin/${MY_PN}"
+	make_desktop_entry "${MY_PN}" "Visual Studio Code" "${MY_PN}" "Development;IDE"
+	newicon "resources/app/resources/linux/code.png" ${MY_PN}.png
+	einstalldocs
 }
 
 pkg_postinst(){
 	elog "You may install some additional utils, so check them in:"
 	elog "https://code.visualstudio.com/Docs/setup#_additional-tools"
 }
-