diff --git a/app-crypt/yubioath-desktop/Manifest b/app-crypt/yubioath-desktop/Manifest
index b78cd40ad..e79f64209 100644
--- a/app-crypt/yubioath-desktop/Manifest
+++ b/app-crypt/yubioath-desktop/Manifest
@@ -1,2 +1,2 @@
 DIST yubioath-desktop-5.0.1.tar.gz 4847220 BLAKE2B 987145338b934a49236325a6fe5c7ad1bc996d09ef29da66681bc3cc9c59ef7ca34d009015e974c256cc5dcdc5cc3e898f0eef246ed8ae2add308fd411386e7b SHA512 e1d8749641a59726d73547a4eb219162d0d654fbbf04f1d6302bc5c097ccde69f15f39b16b631ee8e4d19fab0cf1b01130f5afe3e1b2905103f676c6db7070e8
-DIST yubioath-desktop-5.0.2_p20200211.tar.gz 4860697 BLAKE2B 75fb055454f58e0715a00848458e211c3df1b0cc1f3e4fadfd7cf43f92bed0d22601e75f41ae99aaea124cfd44cf28933ec73545c88ccd4e50c170c79ba500f1 SHA512 a914ca41028f43687d27eb7fb0f10acafbd53c815a5e4820e582ffde8fdc18576fe08ed2f52c804ffeda960ee26f38edf253428694e2be4f1265e8e9f4e1fab3
+DIST yubioath-desktop-5.0.2.tar.gz 4857630 BLAKE2B 13edc3a34bc0d4296bbfc026d0c6d8f322d0558e0fd83a88e085eb8569074a5bf34e246419a5bc59c4d74739452a9a01198129f22613d7dfc3ded56e0ad201df SHA512 a488e5c46de81acfd2da3ce0dec5edfafd809613fcd4a5712ae3968d7e266cc89ed9826b617d3bf6234d4089f5982e735d75e2dea6be000625c878ccb585e2d8
diff --git a/app-crypt/yubioath-desktop/yubioath-desktop-5.0.2_p20200211.ebuild b/app-crypt/yubioath-desktop/yubioath-desktop-5.0.2.ebuild
similarity index 83%
rename from app-crypt/yubioath-desktop/yubioath-desktop-5.0.2_p20200211.ebuild
rename to app-crypt/yubioath-desktop/yubioath-desktop-5.0.2.ebuild
index 918d078a9..88a94f1c9 100644
--- a/app-crypt/yubioath-desktop/yubioath-desktop-5.0.2_p20200211.ebuild
+++ b/app-crypt/yubioath-desktop/yubioath-desktop-5.0.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit eutils desktop python-single-r1 qmake-utils xdg-utils
 
@@ -14,11 +14,10 @@ if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/Yubico/yubioath-desktop"
 else
-	HASH_COMMIT="fa6b365ebc1c10b337a201cb97fdd6caf069bcf1"
-	SRC_URI="https://github.com/Yubico/yubioath-desktop/archive/${HASH_COMMIT}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/Yubico/yubioath-desktop/archive/${P}.tar.gz"
 
 	KEYWORDS="~amd64"
-	S="${WORKDIR}/${PN}-${HASH_COMMIT}"
+	S="${WORKDIR}/${PN}-${P}"
 fi
 
 SLOT="0"
@@ -57,7 +56,7 @@ src_configure() {
 src_install() {
 	emake INSTALL_ROOT="${D}" install
 
-	domenu resources/com.yubico.yubioath.desktop
+	domenu resources/yubioath-desktop.desktop
 	doicon resources/icons/com.yubico.yubioath.png
 	doicon -s scalable resources/icons/com.yubico.yubioath.svg
 }
diff --git a/app-crypt/yubioath-desktop/yubioath-desktop-9999.ebuild b/app-crypt/yubioath-desktop/yubioath-desktop-9999.ebuild
deleted file mode 100644
index 918d078a9..000000000
--- a/app-crypt/yubioath-desktop/yubioath-desktop-9999.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit eutils desktop python-single-r1 qmake-utils xdg-utils
-
-DESCRIPTION="Library and tool for personalization of Yubico's YubiKey NEO"
-HOMEPAGE="https://developers.yubico.com/yubioath-desktop/ https://github.com/Yubico/yubioath-desktop"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/Yubico/yubioath-desktop"
-else
-	HASH_COMMIT="fa6b365ebc1c10b337a201cb97fdd6caf069bcf1"
-	SRC_URI="https://github.com/Yubico/yubioath-desktop/archive/${HASH_COMMIT}.tar.gz -> ${P}.tar.gz"
-
-	KEYWORDS="~amd64"
-	S="${WORKDIR}/${PN}-${HASH_COMMIT}"
-fi
-
-SLOT="0"
-LICENSE="BSD-2"
-
-DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtquickcontrols2:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	x11-libs/libdrm"
-
-RDEPEND="${DEPEND}
-	$(python_gen_cond_dep '>=app-crypt/yubikey-manager-2.1.1[${PYTHON_MULTI_USEDEP}]')
-	dev-python/pyotherside[${PYTHON_SINGLE_USEDEP}]"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	sed -i \
-		-e "s:python build_qrc.py:${PYTHON} build_qrc.py:" \
-		$(qmake-utils_find_pro_file) || die
-
-	python_fix_shebang "${S}"
-	default
-}
-
-src_configure() {
-	eqmake5 $(qmake-utils_find_pro_file)
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-
-	domenu resources/com.yubico.yubioath.desktop
-	doicon resources/icons/com.yubico.yubioath.png
-	doicon -s scalable resources/icons/com.yubico.yubioath.svg
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/app-editors/visual-studio-code/visual-studio-code-1.38.1.ebuild b/app-editors/visual-studio-code/visual-studio-code-1.38.1.ebuild
deleted file mode 100644
index 6cc3bf8d4..000000000
--- a/app-editors/visual-studio-code/visual-studio-code-1.38.1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# 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}"
-#	x86? ( ${BASE_URI}/linux-ia32/stable ->  ${P}-x86.tar.gz )
-SRC_URI="
-	amd64? ( ${BASE_URI}/linux-x64/stable -> ${P}-amd64.tar.gz )
-	"
-
-RESTRICT="mirror strip bindist"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="gnome-keyring"
-
-DEPEND=">=gnome-base/gconf-3.2.6-r4:2
-		>=media-libs/libpng-1.2.46:0
-		>=x11-libs/cairo-1.14.12:0
-		>=x11-libs/gtk+-2.24.31-r1:2
-		>=x11-libs/libXtst-1.2.3:0
-		"
-
-RDEPEND="
-	${DEPEND}
-	>=net-print/cups-2.1.4:0
-	>=x11-libs/libnotify-0.7.7:0
-	>=x11-libs/libXScrnSaver-1.2.2-r1:0
-	dev-libs/nss
-	gnome-keyring? ( 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(){
-	local DEST="/opt/${PN}"
-	pax-mark m code
-	insinto "${DEST}"
-	doins -r *
-	dosym "${DEST}/bin/code" "/usr/bin/${PN}"
-	dosym "${DEST}/bin/code" "/usr/bin/vscode"
-	make_desktop_entry "vscode" "Visual Studio Code" "${PN}" "Development;IDE"
-	doicon "${FILESDIR}/${PN}.png"
-	fperms +x "${DEST}/code"
-	fperms +x "${DEST}/bin/code"
-#	fperms +x "${DEST}/libnode.so"
-	fperms +x "${DEST}/resources/app/node_modules.asar.unpacked/vscode-ripgrep/bin/rg"
-	fperms +x "${DEST}/resources/app/extensions/git/dist/askpass.sh"
-	insinto "/usr/share/licenses/${PN}"
-	for i in resources/app/LICEN*;
-	do
-		newins "${i}" "`basename ${i}`"
-	done
-	for i in resources/app/licenses/*;
-	do
-		newins "${i}" "`basename ${i}`"
-	done
-}
-
-pkg_postinst(){
-	elog "You may install some additional utils, so check them in:"
-	elog "https://code.visualstudio.com/Docs/setup#_additional-tools"
-}