diff --git a/app-misc/cheat/cheat-3.9.0-r1.ebuild b/app-misc/cheat/cheat-3.9.0-r1.ebuild
index 5644e85494..ab71b1786c 100644
--- a/app-misc/cheat/cheat-3.9.0-r1.ebuild
+++ b/app-misc/cheat/cheat-3.9.0-r1.ebuild
@@ -99,6 +99,13 @@ BDEPEND="
 "
 RDEPEND="zsh-completion? ( !app-shells/zsh-completions )"
 
+src_test() {
+	# we can't use the default behavior
+	# since the check rule performs formatting
+	# with a non-standard go tool
+	emake test
+}
+
 src_install() {
 	dobin "dist/${PN}"
 	if use zsh-completion; then
diff --git a/media-video/kikoplay/kikoplay-0.6.1.ebuild b/media-video/kikoplay/kikoplay-0.6.1.ebuild
index 12ed8d4e08..05c327c60d 100644
--- a/media-video/kikoplay/kikoplay-0.6.1.ebuild
+++ b/media-video/kikoplay/kikoplay-0.6.1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI="7"
 
 GIT_PN="KikoPlay"
 
@@ -13,7 +13,7 @@ HOMEPAGE="
 	https://github.com/Protostars/KikoPlay
 "
 
-if [[ ${PV} == "9999" ]] ; then
+if [[ "${PV}" == "9999" ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/Protostars/${GIT_PN}.git"
 else
@@ -25,9 +25,12 @@ fi
 LICENSE="GPL-3"
 SLOT="0"
 
-#not available
-#	dev-lang/lua:5.3
+# Please unmask dev-lang/lua:5.3 in /etc/portage/package.unmask/lua
+# Waiting for dev-lang/lua:5.3 unmasked in ::gentoo
+# With out dev-lang/lua:5.3, this package can't work
+# See also: https://github.com/gentoo/guru/issues/9
 RDEPEND="
+	dev-lang/lua:5.3
 	dev-libs/qhttpengine:5
 	dev-qt/qtconcurrent:5
 	dev-qt/qtcore:5
diff --git a/media-video/kikoplay/kikoplay-9999.ebuild b/media-video/kikoplay/kikoplay-9999.ebuild
index 68d32c6109..05c327c60d 100644
--- a/media-video/kikoplay/kikoplay-9999.ebuild
+++ b/media-video/kikoplay/kikoplay-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI="7"
 
 GIT_PN="KikoPlay"
 
@@ -13,21 +13,24 @@ HOMEPAGE="
 	https://github.com/Protostars/KikoPlay
 "
 
-if [[ ${PV} == "9999" ]] ; then
+if [[ "${PV}" == "9999" ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/Protostars/${GIT_PN}.git"
 else
 	SRC_URI="https://github.com/Protostars/${GIT_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+	KEYWORDS="~amd64 ~arm ~m68k ~mips ~ppc ~ppc64 ~s390 ~x86"
 	S="${WORKDIR}/${GIT_PN}-${PV}"
 fi
 
 LICENSE="GPL-3"
 SLOT="0"
 
-#not available
-#	dev-lang/lua:5.3
+# Please unmask dev-lang/lua:5.3 in /etc/portage/package.unmask/lua
+# Waiting for dev-lang/lua:5.3 unmasked in ::gentoo
+# With out dev-lang/lua:5.3, this package can't work
+# See also: https://github.com/gentoo/guru/issues/9
 RDEPEND="
+	dev-lang/lua:5.3
 	dev-libs/qhttpengine:5
 	dev-qt/qtconcurrent:5
 	dev-qt/qtcore:5
diff --git a/profiles/package.mask b/profiles/package.mask
index e7631a9c36..1c7ef8267b 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,2 +1,4 @@
-#depend on lua5.3 that is not available
+# Huang Rui <vowstar@gmail.com> (2020-04-27)
+# Requires >=dev-lang/lua-5.3 which is masked
+# User should unmask dev-lang/lua-5.3 and media-video/kikoplay to install
 media-video/kikoplay
diff --git a/sci-electronics/kactus2/kactus2-3.8.0.ebuild b/sci-electronics/kactus2/kactus2-3.8.0.ebuild
index bc90e1b2a5..6e4e36c020 100644
--- a/sci-electronics/kactus2/kactus2-3.8.0.ebuild
+++ b/sci-electronics/kactus2/kactus2-3.8.0.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI="7"
 
 inherit xdg
 
@@ -11,7 +11,7 @@ HOMEPAGE="
 	https://github.com/kactus2/kactus2dev
 "
 
-if [[ ${PV} == "9999" ]] ; then
+if [[ "${PV}" == "9999" ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/${PN}/${PN}dev.git"
 else
diff --git a/sci-electronics/kactus2/kactus2-9999.ebuild b/sci-electronics/kactus2/kactus2-9999.ebuild
index 31f8ea4bcb..9841a91147 100644
--- a/sci-electronics/kactus2/kactus2-9999.ebuild
+++ b/sci-electronics/kactus2/kactus2-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI="7"
 
 inherit xdg
 
@@ -11,7 +11,7 @@ HOMEPAGE="
 	https://github.com/kactus2/kactus2dev
 "
 
-if [[ ${PV} == "9999" ]] ; then
+if [[ "${PV}" == "9999" ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/${PN}/${PN}dev.git"
 else
diff --git a/sci-electronics/verilator/verilator-4.032.ebuild b/sci-electronics/verilator/verilator-4.032.ebuild
index 7d157a4e4f..10df06610e 100644
--- a/sci-electronics/verilator/verilator-4.032.ebuild
+++ b/sci-electronics/verilator/verilator-4.032.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI="7"
 
 inherit autotools
 
 DESCRIPTION="The fast free Verilog/SystemVerilog simulator"
 HOMEPAGE="https://www.veripool.org/wiki/verilator"
 
-if [[ ${PV} == "9999" ]] ; then
+if [[ "${PV}" == "9999" ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://git.veripool.org/git/${PN}"
 else
diff --git a/sci-electronics/verilator/verilator-9999.ebuild b/sci-electronics/verilator/verilator-9999.ebuild
index 7d157a4e4f..10df06610e 100644
--- a/sci-electronics/verilator/verilator-9999.ebuild
+++ b/sci-electronics/verilator/verilator-9999.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI="7"
 
 inherit autotools
 
 DESCRIPTION="The fast free Verilog/SystemVerilog simulator"
 HOMEPAGE="https://www.veripool.org/wiki/verilator"
 
-if [[ ${PV} == "9999" ]] ; then
+if [[ "${PV}" == "9999" ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://git.veripool.org/git/${PN}"
 else