diff --git a/dev-util/omake/omake-0.10.2.ebuild b/dev-util/omake/omake-0.10.2.ebuild
index 68c914873e49c..c57efbad6a810 100644
--- a/dev-util/omake/omake-0.10.2.ebuild
+++ b/dev-util/omake/omake-0.10.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-inherit toolchain-funcs multilib epatch
+inherit epatch
 
 DESCRIPTION="Make replacement"
 HOMEPAGE="http://projects.camlcity.org/projects/omake.html"
diff --git a/dev-util/omake/omake-0.10.3.ebuild b/dev-util/omake/omake-0.10.3.ebuild
index 70fb8dfe6a18a..56f5309054d2f 100644
--- a/dev-util/omake/omake-0.10.3.ebuild
+++ b/dev-util/omake/omake-0.10.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-inherit toolchain-funcs multilib epatch
+inherit epatch
 
 DESCRIPTION="Make replacement"
 HOMEPAGE="http://projects.camlcity.org/projects/omake.html"
diff --git a/dev-util/omake/omake-0.9.8.6.0_rc1.ebuild b/dev-util/omake/omake-0.9.8.6.0_rc1.ebuild
index 253e4a5b8b1fc..dc22875577ccd 100644
--- a/dev-util/omake/omake-0.9.8.6.0_rc1.ebuild
+++ b/dev-util/omake/omake-0.9.8.6.0_rc1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-inherit toolchain-funcs multilib versionator epatch
+inherit epatch toolchain-funcs multilib versionator
 
 MY_PV=$(replace_version_separator 5 '.' "$(replace_version_separator 4 '-' )")
 DESCRIPTION="Make replacement"
@@ -25,7 +25,7 @@ RDEPEND="${DEPEND}"
 S=${WORKDIR}/${PN}-${MY_PV%-*}
 
 use_boolean() {
-	if use $1; then
+	if use ${1}; then
 		echo "true"
 	else
 		echo "false"