diff --git a/app-editors/visual-studio-code-bin/Manifest b/app-editors/visual-studio-code-bin/Manifest
index 2d95781b35..7fb67bb69e 100644
--- a/app-editors/visual-studio-code-bin/Manifest
+++ b/app-editors/visual-studio-code-bin/Manifest
@@ -1,3 +1,3 @@
-DIST visual-studio-code-bin-1.53.1-amd64.tar.gz 95346424 BLAKE2B 445381f3b3bf33630e2122694209e0c03174a2b89452f58b40e0def3bbb5ff0fb45bd92319ed23725c6cec0babda4710e04cfa6f2eb33f3bc5194bd9d64eeeba SHA512 1e724628ee638448057187d428aea5cb9bde6b520fd0096271817d0bb31170337e6c7cf310aec40cb52e1710d367e1826808f763b59930cf887d5d968d9d39ce
-DIST visual-studio-code-bin-1.53.1-arm.tar.gz 86669259 BLAKE2B cfcab961a380e8df261481092b254ef84a8947bf414d1dcba53a220fa832ca64e3ac3cdec384a4bc20bb1a949ba7e2b9b4bd7cf512d148cc647ef58775004896 SHA512 f4e45be370268edebae87adf1668b807d3d710765737939b83ab4bb3aaafa90ea779df1da750cd03aaecce382684d57f5bf53751b428daa73725e2da272b340b
-DIST visual-studio-code-bin-1.53.1-arm64.tar.gz 99860337 BLAKE2B 25ad2fc03f234323e9b9b45bafeb118c46108e8438f2fe9d512fb5929b9c2f6dcbd7256938bc5885dc26cd8e1c3c25155e16684d7ce35d68c40506c394d6109a SHA512 4a57df63f0f1d532f5c145723012850e9f3a6dfc1807f418b015a176e27eed3a580a4eac1db518b10a5e50901eae6c4949f781dab447c5a9dcf2eb4664cc1950
+DIST visual-studio-code-bin-1.53.2-amd64.tar.gz 95471832 BLAKE2B 361ca289d7daa0c41dee6d56594f2be43c918206edc8d4d771566ad580ce9dfbcb4f49056729750460ce71873b6de16bd174a502c4bb7c77eccf2d24469e194a SHA512 e13a1e620273680335c19ffa93a8788ed765e30173f62b042c3cdd86695b85198aea0ca6a5f764cc3efe572c052172019ad9236365247532f446bed9d6f2e110
+DIST visual-studio-code-bin-1.53.2-arm.tar.gz 86787362 BLAKE2B 45322a4195d8bdcf708ea5890a0242d0d570825c32edc7f9eeff3e6d02a5229e537eb0a8734bb1e38441edd1bb8038188dd08def868e1842feef047063ad00e1 SHA512 19c86982d00fc90848643aaf02fea99ce8a82ab48adaf0129fbc019f9220c377471b5d126e1161f129b31ff8fef0f9bc97494bb16ee4b4a8ef70e57b37ee7e43
+DIST visual-studio-code-bin-1.53.2-arm64.tar.gz 99978014 BLAKE2B c20c4663dfa0ef71bf8e3f78aab9a36adb3a265e270f26c6f3fc22cc47c89f7f443a99b3e549568b8a39ead09c112542fc2784bdc45ec85b77724dec5562e9c4 SHA512 e27950ec1fc2e80192f4e3f27d53a69f34499f11d0fc26564420eb90f349fc6f14e721732cb2d213a451d5c8ba80ce0605107e27ab1a134dbc378159216726fe
diff --git a/app-editors/visual-studio-code-bin/visual-studio-code-bin-1.53.1.ebuild b/app-editors/visual-studio-code-bin/visual-studio-code-bin-1.53.2.ebuild
similarity index 100%
rename from app-editors/visual-studio-code-bin/visual-studio-code-bin-1.53.1.ebuild
rename to app-editors/visual-studio-code-bin/visual-studio-code-bin-1.53.2.ebuild
diff --git a/app-editors/vscodium-bin/Manifest b/app-editors/vscodium-bin/Manifest
index 86b8d22afc..d805c6557e 100644
--- a/app-editors/vscodium-bin/Manifest
+++ b/app-editors/vscodium-bin/Manifest
@@ -1,6 +1,9 @@
 DIST VSCodium-linux-arm64-1.52.1.tar.gz 99006948 BLAKE2B 933e5b283e011873b7da60a838e7778d8ff1cf69006e5bf370fdeba7aa6709c2b8ea427936d353c75c0331d1a78defb7c0983d73d59c71163cde6ca32cf1ac32 SHA512 e96c79b1176a07f6cbd1a1d30d4a4d0d66d519d854bc0aa0e24e9baa4b0f6fe959e12b4888330188210957763febc644601f958b635deaa7e900f55f0eb5550f
 DIST VSCodium-linux-arm64-1.53.0.tar.gz 103943330 BLAKE2B 0a21141faf6d36a7021714f53bf3ccda09e747bf493f0beb4e28e62a33f29299ef5705231069741579be5748144e4d597e818935cef883ac0d34eb4be9501c5e SHA512 fa0373ca303a6a03cf6e0b9dab6d8127b58e9f3dcd6363b99c401206726cd9eea3ac7b9bca37cc25ad388b4c4333679591bc93a19494ffc07d29172117967835
+DIST VSCodium-linux-arm64-1.53.1.tar.gz 103872235 BLAKE2B 6c6cba021047f7e52b2dbfe754e4835ac2948a2bbdd56844d801a10fb97be421a6f411ebe5c619b5ac7dba66e4df785fdf133ec058d914c60befe825e314ea1b SHA512 40362151925df2be4ce8e71d7288fe3f7186e94b96904095a1b2c19a3643b911f86f289b3ff2c35749fe8a760fcfc272200793da2280ee1a37b8aa3ab335f1e3
 DIST VSCodium-linux-armhf-1.52.1.tar.gz 85288104 BLAKE2B 3df56d4708f44e5029a9cfed05185957951ead696885f16e8d3da8587f812f9e088e37e2b355157989a0e272661f367a1bd2d70cfbc7953a1f07f166b7b8292d SHA512 ffd5b2b476896d4aed67ed0bd157ca14819f493534c9e15eba247998becb06042c6c0caa88ee2db7e76529da252dac57c43c86371430b57a5819ce392cdcdcb5
 DIST VSCodium-linux-armhf-1.53.0.tar.gz 88824725 BLAKE2B 1664b45e747eb288788b7ea7816ca26e6ce28da6bb73929ba81d68a1d646a950312f1939dd0bdf2919bf0cce4de3fed00538c448724412077aa905eecaf38068 SHA512 44112551c22b591f326eb2fe1f1fb53aafdb3bd9b8e987494cf0dd2f2684d0e10841e0e5f7f148581c0f0d87f725c496de9198b7859692ec32a92d33b8160367
+DIST VSCodium-linux-armhf-1.53.1.tar.gz 88817109 BLAKE2B 62774e0597fd318451deca29edf1b8c85fc25b2b039298129a96b75faffd50c1c263ff22bcab7ae3c445b90fdf39f0830ded6f176fb504eb9db28b09bbc68aa4 SHA512 ec8832656133e224da6bc100a06eebb3c7613026c6f558817f422ccbe44e7f6721a650cf4fc985ca74f5ca9b7b28fb48706d3f74bfd3dff69875ce58639126b9
 DIST VSCodium-linux-x64-1.52.1.tar.gz 96026417 BLAKE2B 0d06ddef0de3af3d22de4757bd5b81742cdfb6605192c61374857fdacfd8df374adf180aaa1f31f0397ead97e7f668320125ef1f806c71689348ac4a3c8bab8d SHA512 9a60f6821e7a796eaca842817fd3853c8099d74418ccabeacabed01c4f7b46b49c52bb11a032c317c27e3cef7ef2c49d2cf967ca2d2d79013790994a6aa9159f
 DIST VSCodium-linux-x64-1.53.0.tar.gz 99375183 BLAKE2B 451a49ef357d4a23b419e2d3d19c0215002f2d722cc05e0461d189c942200954f9064989d60770e1bf95c8c86153d4b833918587e664836696d96ea640531144 SHA512 36964c259ea826729ddd8993e88580dfcf54301bd103c9656f12c7cdf3fe5f815ad324779cdb0615a6d259935bc58a787426493790a72619575aaa330a779198
+DIST VSCodium-linux-x64-1.53.1.tar.gz 99374765 BLAKE2B f99bef342689e718df8c2f79f8429383653816c71fef59fc2b4d048860efb8bb68ebc40bb052ce56d86e150e3dbfc4cd600b6bbf54642df888e7da77969067b1 SHA512 0911b512da2deb4777ec7e11f4e8066b184331218b00c3c54f785be5acfd139ef8e68140da36842dd8afc4563b7c93127382d2062e79b317c9d1d74ad9bc6834
diff --git a/app-editors/vscodium-bin/vscodium-bin-1.53.1.ebuild b/app-editors/vscodium-bin/vscodium-bin-1.53.1.ebuild
new file mode 100644
index 0000000000..862b3ce544
--- /dev/null
+++ b/app-editors/vscodium-bin/vscodium-bin-1.53.1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop pax-utils xdg
+
+MY_PN="${PN/-bin}"
+
+DESCRIPTION="Free/Libre Open Source Software Binaries of VSCode"
+HOMEPAGE="https://vscodium.com"
+SRC_URI="
+	amd64? (
+		https://github.com/VSCodium/${MY_PN}/releases/download/${PV}/VSCodium-linux-x64-${PV}.tar.gz
+	)
+	arm? (
+		https://github.com/VSCodium/${MY_PN}/releases/download/${PV}/VSCodium-linux-armhf-${PV}.tar.gz
+	)
+	arm64? (
+		https://github.com/VSCodium/${MY_PN}/releases/download/${PV}/VSCodium-linux-arm64-${PV}.tar.gz
+	)
+"
+
+RESTRICT="bindist strip test"
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~arm ~arm64"
+IUSE="libsecret"
+
+RDEPEND="
+	app-accessibility/at-spi2-atk
+	dev-libs/nss
+	media-libs/libpng:0/16
+	x11-libs/cairo
+	x11-libs/gtk+:3
+	x11-libs/libXScrnSaver
+	x11-libs/libXtst
+	x11-libs/libnotify
+	x11-libs/pango
+	libsecret? ( app-crypt/libsecret[crypt]	)
+	amd64? ( sys-apps/ripgrep )
+	arm64? ( sys-apps/ripgrep )
+"
+
+S="${WORKDIR}"
+
+src_prepare() {
+	default
+
+	# Unbundle ripgrep on amd64 & arm64
+	if use amd64 || use arm64; then
+		rm "resources/app/node_modules.asar.unpacked/vscode-ripgrep/bin/rg" || die
+	fi
+}
+
+src_install() {
+	pax-mark m codium
+	insinto "/opt/${MY_PN}"
+	doins -r *
+	dosym "../../opt/${MY_PN}/bin/codium" "usr/bin/codium"
+
+	domenu "${FILESDIR}/codium.desktop"
+	domenu "${FILESDIR}/codium-url-handler.desktop"
+
+	fperms +x /opt/${MY_PN}/{,bin/}codium
+	fperms +x /opt/${MY_PN}/chrome-sandbox
+	fperms -R +x /opt/${MY_PN}/resources/app/out/vs/base/node
+
+	if use amd64 || use arm64; then
+		dosym "../../../../../../../usr/bin/rg" "${EPREFIX}/opt/${MY_PN}/resources/app/node_modules.asar.unpacked/vscode-ripgrep/bin/rg"
+	fi
+
+	dodoc resources/app/LICENSE.txt resources/app/ThirdPartyNotices.txt
+	newicon resources/app/resources/linux/code.png ${MY_PN}.png
+}
diff --git a/dev-vcs/gitqlient/Manifest b/dev-vcs/gitqlient/Manifest
index df05a28ccd..acd973ffd4 100644
--- a/dev-vcs/gitqlient/Manifest
+++ b/dev-vcs/gitqlient/Manifest
@@ -1,3 +1,4 @@
 DIST QLogger-d33cb64.tar.gz 15378 BLAKE2B adb5bed0c9cc3692b384542306466046242ff50d0c7dd176f439172047991ce4252e315e8289524a9e346abc225aeb9ca89b958f00cd11710294b2885ca0f69d SHA512 bec4785dcdb4cf3434621f68830628c737ee0664223228ec68f09991b5a2090eac024fbce86d6d0614d8a709efd55e0f126c1bbf8451c1c100080df3b8cdd17f
 DIST gitqlient-1.2.0.tar.gz 3768498 BLAKE2B 0daa49b79c6390e367b24d8843f37c6a633d1e12c8e3d2b7d3245fb06ea0f89c6fb3b360fdc3dfaae13568d36a413353c67fbb29e60f19221341dcb71469491a SHA512 4dd4a21a7b222c6d7586bcbf5eec26f321fc18dd6ef52507a4eb4004675b04f437f8801c817a12f16f5b5ea9b3c2e2930f445e8bb09e64d33b89f69dbf310c74
+DIST gitqlient-1.3.0.tar.gz 4337675 BLAKE2B efa041cc863ea0c5820841804a32dab8e212979367cf9b59be163c7322183facadddd788fd077be0566eb8d906c47b9486036558de8f8ae9b2365d90c3069349 SHA512 8011426aed84a7611b3b2253b377fe66690b0ad2b54c1b6c85a85b1d1b9adabeea9fe0e763340d67f3139d4c43de7e368a0f2c4d9c9640d911aac3a48d111ebc
 DIST gitqlient-1.3.0_beta.tar.gz 4320202 BLAKE2B f45e615fd9d4ee8a90df872c40b1c1b4eaefd7612458cf51bbeb69a920f6ea00704de61ba2446f41d2d4f847919cb6b119b397e0a910bf4244bbf3bf41dfa98c SHA512 79ca8211eaa84016d9eb43dea6b1773fd11121e7b0c47152642a03ab0e3d37bafbfc2cc5749f4864d5877699333a47d5bf6afede85246365ce3d281857247637
diff --git a/dev-vcs/gitqlient/gitqlient-1.3.0.ebuild b/dev-vcs/gitqlient/gitqlient-1.3.0.ebuild
new file mode 100644
index 0000000000..e7561ccbe2
--- /dev/null
+++ b/dev-vcs/gitqlient/gitqlient-1.3.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop qmake-utils xdg
+
+MY_PN="GitQlient"
+MY_PV=$(ver_rs 3 -)
+
+DESCRIPTION="Multi-platform Git client written with Qt"
+HOMEPAGE="https://github.com/francescmm/GitQlient"
+
+SRC_URI="https://github.com/francescmm/${MY_PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64 ~x86"
+S="${WORKDIR}/${MY_PN}-${MY_PV}"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwebchannel:5
+	dev-qt/qtwebengine:5[widgets]
+	dev-qt/qtwidgets:5
+"
+
+RDEPEND="
+	${DEPEND}
+	dev-vcs/git
+"
+
+src_prepare() {
+	default
+	sed -i -e "/QMAKE_CXXFLAGS/s:-Werror::" -e "/^GQ_SHA/d" "${MY_PN}".pro || die
+
+	sed -i -e "s:Office:Development:" "${S}/src/resources/${PN}.desktop" || die
+}
+
+src_configure() {
+	eqmake5 PREFIX=/usr "${MY_PN}".pro
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+}
diff --git a/dev-vcs/gitqlient/gitqlient-9999.ebuild b/dev-vcs/gitqlient/gitqlient-9999.ebuild
index 747e15db3d..dad91e6c65 100644
--- a/dev-vcs/gitqlient/gitqlient-9999.ebuild
+++ b/dev-vcs/gitqlient/gitqlient-9999.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit git-r3 qmake-utils xdg
+inherit desktop git-r3 qmake-utils xdg
 
 MY_PN="GitQlient"
 
 DESCRIPTION="Multi-platform Git client written with Qt"
 HOMEPAGE="https://github.com/francescmm/GitQlient"
 
-EGIT_BRANCH="develop"
+#EGIT_BRANCH="develop"
 EGIT_SUBMODULES=( QLogger )
 EGIT_REPO_URI="https://github.com/francescmm/${MY_PN}.git"
 SRC_URI=""
@@ -25,6 +25,8 @@ DEPEND="
 	dev-qt/qtgui:5
 	dev-qt/qtnetwork:5
 	dev-qt/qtsvg:5
+	dev-qt/qtwebchannel:5
+	dev-qt/qtwebengine:5[widgets]
 	dev-qt/qtwidgets:5
 "
 
@@ -37,7 +39,7 @@ src_prepare() {
 	default
 	sed -i -e "/QMAKE_CXXFLAGS/s:-Werror::" "${MY_PN}".pro || die
 
-	sed -i -e "s:Office:Development:" "${S}/src/resources/${PN}.desktop"
+	sed -i -e "s:Office:Development:" "${S}/src/resources/${PN}.desktop" || die
 }
 
 src_configure() {
diff --git a/net-misc/wsdd/wsdd-0.5.ebuild b/net-misc/wsdd/wsdd-0.5.ebuild
index 923d0d4905..05b681d166 100644
--- a/net-misc/wsdd/wsdd-0.5.ebuild
+++ b/net-misc/wsdd/wsdd-0.5.ebuild
@@ -1,8 +1,8 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2020-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_7 )
+PYTHON_COMPAT=( python3_{7,8,9} )
 PYTHON_REQ_USE="xml(+)"
 
 inherit python-r1 systemd
@@ -17,9 +17,9 @@ KEYWORDS="~amd64 ~arm ~x86"
 IUSE="samba"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-DEPEND="${PYTHON_DEPS}"
-# Samba is technically no requiredment of wsdd, but depend on it if the use flags is set.
-RDEPEND="${DEPEND} samba? ( net-fs/samba )"
+DEPEND=""
+# Samba is technically not a requirement of wsdd, but depend on it if the use flags is set.
+RDEPEND="${PYTHON_DEPS} samba? ( net-fs/samba )"
 BDEPEND=""
 
 src_install() {
diff --git a/net-misc/wsdd/wsdd-0.6.1.ebuild b/net-misc/wsdd/wsdd-0.6.1.ebuild
index f35381e5e6..05b681d166 100644
--- a/net-misc/wsdd/wsdd-0.6.1.ebuild
+++ b/net-misc/wsdd/wsdd-0.6.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2020-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 PYTHON_REQ_USE="xml(+)"
 
 inherit python-r1 systemd
@@ -17,9 +17,9 @@ KEYWORDS="~amd64 ~arm ~x86"
 IUSE="samba"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-DEPEND="${PYTHON_DEPS}"
-# Samba is technically no requiredment of wsdd, but depend on it if the use flags is set.
-RDEPEND="${DEPEND} samba? ( net-fs/samba )"
+DEPEND=""
+# Samba is technically not a requirement of wsdd, but depend on it if the use flags is set.
+RDEPEND="${PYTHON_DEPS} samba? ( net-fs/samba )"
 BDEPEND=""
 
 src_install() {
diff --git a/net-misc/wsdd/wsdd-0.6.2.ebuild b/net-misc/wsdd/wsdd-0.6.2.ebuild
index f35381e5e6..05b681d166 100644
--- a/net-misc/wsdd/wsdd-0.6.2.ebuild
+++ b/net-misc/wsdd/wsdd-0.6.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2020-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 PYTHON_REQ_USE="xml(+)"
 
 inherit python-r1 systemd
@@ -17,9 +17,9 @@ KEYWORDS="~amd64 ~arm ~x86"
 IUSE="samba"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-DEPEND="${PYTHON_DEPS}"
-# Samba is technically no requiredment of wsdd, but depend on it if the use flags is set.
-RDEPEND="${DEPEND} samba? ( net-fs/samba )"
+DEPEND=""
+# Samba is technically not a requirement of wsdd, but depend on it if the use flags is set.
+RDEPEND="${PYTHON_DEPS} samba? ( net-fs/samba )"
 BDEPEND=""
 
 src_install() {
diff --git a/net-misc/wsdd/wsdd-0.6.4.ebuild b/net-misc/wsdd/wsdd-0.6.4.ebuild
index f956899d8c..05b681d166 100644
--- a/net-misc/wsdd/wsdd-0.6.4.ebuild
+++ b/net-misc/wsdd/wsdd-0.6.4.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 PYTHON_REQ_USE="xml(+)"
 
 inherit python-r1 systemd
@@ -17,9 +17,9 @@ KEYWORDS="~amd64 ~arm ~x86"
 IUSE="samba"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-DEPEND="${PYTHON_DEPS}"
-# Samba is technically no requiredment of wsdd, but depend on it if the use flags is set.
-RDEPEND="${DEPEND} samba? ( net-fs/samba )"
+DEPEND=""
+# Samba is technically not a requirement of wsdd, but depend on it if the use flags is set.
+RDEPEND="${PYTHON_DEPS} samba? ( net-fs/samba )"
 BDEPEND=""
 
 src_install() {
diff --git a/net-misc/wsdd/wsdd-0.6.ebuild b/net-misc/wsdd/wsdd-0.6.ebuild
index f35381e5e6..05b681d166 100644
--- a/net-misc/wsdd/wsdd-0.6.ebuild
+++ b/net-misc/wsdd/wsdd-0.6.ebuild
@@ -1,8 +1,8 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2020-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 PYTHON_REQ_USE="xml(+)"
 
 inherit python-r1 systemd
@@ -17,9 +17,9 @@ KEYWORDS="~amd64 ~arm ~x86"
 IUSE="samba"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-DEPEND="${PYTHON_DEPS}"
-# Samba is technically no requiredment of wsdd, but depend on it if the use flags is set.
-RDEPEND="${DEPEND} samba? ( net-fs/samba )"
+DEPEND=""
+# Samba is technically not a requirement of wsdd, but depend on it if the use flags is set.
+RDEPEND="${PYTHON_DEPS} samba? ( net-fs/samba )"
 BDEPEND=""
 
 src_install() {
diff --git a/www-apps/code-server-bin/Manifest b/www-apps/code-server-bin/Manifest
index f6ffbcfe38..95b20ea427 100644
--- a/www-apps/code-server-bin/Manifest
+++ b/www-apps/code-server-bin/Manifest
@@ -1,6 +1,4 @@
-DIST code-server-3.6.1-linux-amd64.tar.gz 76288261 BLAKE2B 443135065cdab9e0477d9665e9e56d924bd9199ce19cfbdea1e811c2517e7e71beaf18a347a287d0013d7df655900fc08a8f7fcbfe402b1e22487a80876d1eaa SHA512 0e875dc78a2776897a5a1556183808da70c8a0b2e4d96653a419bdab08df6f3d10643f90f568edeafcb38c36bfefa9fe0a674ad020b5e08c17b2e0eece940bc1
-DIST code-server-3.6.1-linux-arm64.tar.gz 75331263 BLAKE2B c390e11b02472409ef0147f6dc5392f36eff93dd19a07e2eeed09a2626b541740c0191fdac0cca43e843b3195fc803921bf37b704b67a2e41fa0a531feca560c SHA512 badc150af52263232240edc16e960ac9e51b22e05bc96d81d11726e28d733b1d79139b0d85aa108011f2993c6a6e395134d2524e5fc13fe3b7dfeac24899eb75
-DIST code-server-3.8.0-linux-amd64.tar.gz 78942963 BLAKE2B 4c78ed40aec86a72dede21a82ae111884be5cba1958fb22d6353d63af98f6d3bab50c7ae1fa0b81079be6d035e84d873f4ebf00da76edaa15b2356e89b3d1261 SHA512 76cdbbdb63b3061ce9d1cb016466356d5184b83e742fc084d9a0376aa12dc9d68314061ea5cde93f6590b07862169cbd291f77b71dfadc4bee4140e277813ae8
-DIST code-server-3.8.0-linux-arm64.tar.gz 77939946 BLAKE2B c154561c308e5e233016f1b9b5f53647a2aaad12b73d27d1e84ee37234104048005b36cccdda5593973238ef279428b8f38309cad193a67afd87d77205eeb27c SHA512 0fe4a42eb1c50ae1d33f9c94e592ac8a3e69fad51abc1f5c90595a1588350e95f78bc2c44f728b3f155112f2db11e79b2227f2e847a45d58c87078d667119a1a
 DIST code-server-3.8.1-linux-amd64.tar.gz 78975468 BLAKE2B d4f6424108b0cd4cb46ba9597e02993fc704ee89d0757a575719592cfd7cc2b3e52fdb5fa09a55684999eafc33dcab4483c4339cc584a37bd19453022bff0b27 SHA512 4a530df07482c68ad40da11234835528819f93985895d79914ff14da792a83084c605cb6d34622e475efb51c2b5c1189a4de186734194c7df6685655cd5098e1
 DIST code-server-3.8.1-linux-arm64.tar.gz 78056961 BLAKE2B 0311b5a07d6047f8ff795a0001f04ad824a940e79d87b23d58cc0fa27d04e1653f33a19016406ffcabbd3dabe4df512ee27ad58b7b6dc341517cd7e6845540b7 SHA512 a08308531ff8665f3b83dd6f37a9d668aa73b08ae7652193dc8e842c76982864701989b1713246e3d64a87b0b942a1b426da0170841da17d6ca6782a78850111
+DIST code-server-3.9.0-linux-amd64.tar.gz 79632197 BLAKE2B cc0aa63cbeb5ff4d5a524c44554f72cdb4e0a8c48d6be8ac0942736994481fed3a5d30970091f1790b47edbae8e91a4c5ce50055761654f4129c583b0b930ea4 SHA512 46f9e24bdaef075f06ab487ada24910a6fdd7b68a23beddefd049ae4735e8cb16a6bccd014ac7227fe70df95aaf83e1e7a271a01c5b1efa0677f872c7484322e
+DIST code-server-3.9.0-linux-arm64.tar.gz 78939000 BLAKE2B fef14756b2d55cad2899dad7ec7332f753e18134f92c199f3e4d403880577c85a7772bdd56f71a0e8c3c38541e44a618fa9926b428a90f39f06c80ee6a5c4720 SHA512 e3f06076f70ceddd5a350e384c5fe1a8b23845a0ab6c6469ffabc2fe781cefd0bdbda6426196bee4e7cd6a2902b780b22aaae69fe25cf49b8e98374515ae055c
diff --git a/www-apps/code-server-bin/code-server-bin-3.8.0.ebuild b/www-apps/code-server-bin/code-server-bin-3.8.0.ebuild
deleted file mode 100644
index 97405ffe16..0000000000
--- a/www-apps/code-server-bin/code-server-bin-3.8.0.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN="${PN/-bin/}"
-MY_P="${MY_PN}-${PV}"
-BASE_URI="https://github.com/cdr/${MY_PN}/releases/download/v${PV}/${MY_P}-linux"
-
-inherit systemd
-
-DESCRIPTION="VS Code in the browser (binary version with unbundled node and ripgrep)"
-HOMEPAGE="https://coder.com/"
-SRC_URI="
-	amd64? ( ${BASE_URI}-amd64.tar.gz )
-	arm64? ( ${BASE_URI}-arm64.tar.gz )
-"
-
-RESTRICT="test"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~arm64"
-IUSE="gnome-keyring"
-
-# In case we ever make a non-"-binary" pkg
-DEPEND="
-	!www-apps/code-server
-"
-RDEPEND="
-	${DEPEND}
-	>=net-libs/nodejs-12.16.1:0/12[ssl]
-	sys-apps/ripgrep
-	gnome-keyring? (
-		app-crypt/libsecret
-	)
-"
-
-S="${WORKDIR}/${MY_P}-linux-${ARCH}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-node.patch"
-)
-
-DOCS=( README.md ThirdPartyNotices.txt )
-
-src_prepare() {
-	default
-
-	# We remove as much precompiled code as we can,
-	# node modules not written in JS cannot be removed
-	# thus "-bin".
-
-	# use system node
-	rm node || die
-	rm lib/node || die
-
-	# remove bundled ripgrep binary
-	rm lib/vscode/node_modules/vscode-ripgrep/bin/rg || die
-
-	# not needed
-	rm code-server || die
-	rm postinstall.sh || die
-	# already in /usr/portage/licenses/MIT
-	rm LICENSE.txt || die
-
-	if ! use gnome-keyring; then
-		rm -r ./lib/vscode/node_modules/keytar || die
-	fi
-}
-
-src_install() {
-	einstalldocs
-
-	insinto "/usr/lib/${MY_PN}"
-	doins -r .
-	fperms +x "${EPREFIX}/usr/lib/${MY_PN}/bin/${MY_PN}"
-	dosym "${EPREFIX}/usr/lib/${MY_PN}/bin/${MY_PN}" "${EPREFIX}/usr/bin/${MY_PN}"
-
-	dosym "${EPREFIX}/usr/bin/rg" "${EPREFIX}/usr/lib/${MY_PN}/lib/vscode/node_modules/vscode-ripgrep/bin/rg"
-
-	systemd_dounit "${FILESDIR}/${MY_PN}.service"
-}
-
-pkg_postinst() {
-	elog "When using code-server systemd service run it as a user"
-	elog "For example: 'systemctl --user enable --now code-server'"
-}
diff --git a/www-apps/code-server-bin/code-server-bin-3.6.1.ebuild b/www-apps/code-server-bin/code-server-bin-3.9.0.ebuild
similarity index 81%
rename from www-apps/code-server-bin/code-server-bin-3.6.1.ebuild
rename to www-apps/code-server-bin/code-server-bin-3.9.0.ebuild
index 97405ffe16..543e268b91 100644
--- a/www-apps/code-server-bin/code-server-bin-3.6.1.ebuild
+++ b/www-apps/code-server-bin/code-server-bin-3.9.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -51,20 +51,23 @@ src_prepare() {
 	# thus "-bin".
 
 	# use system node
-	rm node || die
-	rm lib/node || die
+	rm ./node ./lib/node \
+		|| die "failed to remove bundled nodejs"
 
 	# remove bundled ripgrep binary
-	rm lib/vscode/node_modules/vscode-ripgrep/bin/rg || die
+	rm ./lib/vscode/node_modules/vscode-ripgrep/bin/rg \
+		|| die "failed to remove bundled ripgrep"
 
 	# not needed
-	rm code-server || die
-	rm postinstall.sh || die
+	rm ./code-server || die
+	rm ./postinstall.sh || die
+
 	# already in /usr/portage/licenses/MIT
-	rm LICENSE.txt || die
+	rm ./LICENSE.txt || die
 
 	if ! use gnome-keyring; then
-		rm -r ./lib/vscode/node_modules/keytar || die
+		rm -r ./lib/vscode/node_modules/keytar \
+			|| die "failed to remove bundled keytar"
 	fi
 }