diff --git a/x11-misc/simpleswitcher/simpleswitcher-20191008.ebuild b/x11-misc/simpleswitcher/simpleswitcher-20191008.ebuild
index e7051abca7cf6..830edeee59d4f 100644
--- a/x11-misc/simpleswitcher/simpleswitcher-20191008.ebuild
+++ b/x11-misc/simpleswitcher/simpleswitcher-20191008.ebuild
@@ -1,29 +1,28 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 inherit toolchain-funcs
 
 SSHASH="7230421aa2e3364e3b4620f1ea3760f8f810b1a5"
 DESCRIPTION="lightweight EWMH window switcher with features and looks of dmenu"
 HOMEPAGE="https://github.com/seanpringle/simpleswitcher"
 SRC_URI="https://github.com/seanpringle/simpleswitcher/archive/${SSHASH}.tar.gz -> ${P}-${SSHASH}.tar.gz"
+S="${WORKDIR}/${PN}-${SSHASH}"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
+BDEPEND="virtual/pkgconfig"
 RDEPEND="
 	x11-libs/libX11
 	x11-libs/libXft
 	x11-libs/libXinerama
 	x11-libs/libXres
 "
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
-S=${WORKDIR}/${PN}-${SSHASH}
+DEPEND="${RDEPEND}"
 
 src_compile() {
 	tc-export CC
diff --git a/x11-misc/simpleswitcher/simpleswitcher-99999999.ebuild b/x11-misc/simpleswitcher/simpleswitcher-99999999.ebuild
index 24730fddec456..c4313820fcfdd 100644
--- a/x11-misc/simpleswitcher/simpleswitcher-99999999.ebuild
+++ b/x11-misc/simpleswitcher/simpleswitcher-99999999.ebuild
@@ -1,7 +1,8 @@
-# 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 toolchain-funcs
 
 DESCRIPTION="lightweight EWMH window switcher with features and looks of dmenu"
@@ -10,18 +11,15 @@ EGIT_REPO_URI="https://github.com/seanpringle/simpleswitcher"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS=""
 
+BDEPEND="virtual/pkgconfig"
 RDEPEND="
 	x11-libs/libX11
 	x11-libs/libXft
 	x11-libs/libXinerama
 	x11-libs/libXres
 "
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
+DEPEND="${RDEPEND}"
 
 src_compile() {
 	tc-export CC