diff --git a/net-misc/whyblocked/whyblocked-0.15.0.ebuild b/net-misc/whyblocked/whyblocked-0.15.0.ebuild
index a50a6f2..a984152 100644
--- a/net-misc/whyblocked/whyblocked-0.15.0.ebuild
+++ b/net-misc/whyblocked/whyblocked-0.15.0.ebuild
@@ -19,15 +19,12 @@ else
 		https://schlomp.space/tastytea/whyblocked/archive/${PV}.tar.gz -> ${P}.tar.gz
 		https://schlomp.space/tastytea/xdgcfg/archive/${XDGCFG_PV}.tar.gz -> xdgcfg-${XDGCFG_PV}.tar.gz
 	"
+	S="${WORKDIR}/${PN}"
+	KEYWORDS="~amd64"
 fi
 
 LICENSE="GPL-3"
 SLOT="0"
-if [[ "${PV}" == "9999" ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64"
-fi
 IUSE="nls"
 
 RDEPEND="
@@ -43,10 +40,6 @@ DEPEND="
 	${RDEPEND}
 "
 
-if [[ "${PV}" != "9999" ]]; then
-	S="${WORKDIR}/${PN}"
-fi
-
 src_unpack() {
 	if [[ "${PV}" == "9999" ]]; then
 		git-r3_src_unpack
diff --git a/net-misc/whyblocked/whyblocked-9999-r8.ebuild b/net-misc/whyblocked/whyblocked-9999-r8.ebuild
index a50a6f2..a984152 100644
--- a/net-misc/whyblocked/whyblocked-9999-r8.ebuild
+++ b/net-misc/whyblocked/whyblocked-9999-r8.ebuild
@@ -19,15 +19,12 @@ else
 		https://schlomp.space/tastytea/whyblocked/archive/${PV}.tar.gz -> ${P}.tar.gz
 		https://schlomp.space/tastytea/xdgcfg/archive/${XDGCFG_PV}.tar.gz -> xdgcfg-${XDGCFG_PV}.tar.gz
 	"
+	S="${WORKDIR}/${PN}"
+	KEYWORDS="~amd64"
 fi
 
 LICENSE="GPL-3"
 SLOT="0"
-if [[ "${PV}" == "9999" ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64"
-fi
 IUSE="nls"
 
 RDEPEND="
@@ -43,10 +40,6 @@ DEPEND="
 	${RDEPEND}
 "
 
-if [[ "${PV}" != "9999" ]]; then
-	S="${WORKDIR}/${PN}"
-fi
-
 src_unpack() {
 	if [[ "${PV}" == "9999" ]]; then
 		git-r3_src_unpack