diff --git a/app-dicts/canna-2ch/canna-2ch-20030827.ebuild b/app-dicts/canna-2ch/canna-2ch-20030827.ebuild
index 2cd3b357a3e3d..85ec43f9e43cd 100644
--- a/app-dicts/canna-2ch/canna-2ch-20030827.ebuild
+++ b/app-dicts/canna-2ch/canna-2ch-20030827.ebuild
@@ -1,7 +1,9 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-inherit cannadic eutils
+EAPI="6"
+
+inherit cannadic
 
 DESCRIPTION="Japanese Canna dictionary for 2channelers"
 HOMEPAGE="http://omaemona.sourceforge.net/packages/Canna"
@@ -14,21 +16,16 @@ KEYWORDS="alpha ~amd64 ppc ppc64 sparc x86"
 IUSE="canna"
 
 DEPEND="canna? ( app-i18n/canna )"
-RDEPEND=""
 S="${WORKDIR}/${PN}"
 
+PATCHES=( "${FILESDIR}/"${P}-canna36p4-gentoo.patch )
+
 CANNADICS="2ch"
 DICSDIRFILE="${FILESDIR}/052ch.dics.dir"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-canna36p4-gentoo.patch"
-}
-
 src_compile() {
 	# Anthy users do not need binary dictionary
-	if use canna ; then
+	if use canna; then
 		mkbindic nichan.ctd || die
 	fi
 }
diff --git a/app-dicts/canna-2ch/canna-2ch-20040519.ebuild b/app-dicts/canna-2ch/canna-2ch-20040519.ebuild
index f74c01b6acf3c..38918f7084df2 100644
--- a/app-dicts/canna-2ch/canna-2ch-20040519.ebuild
+++ b/app-dicts/canna-2ch/canna-2ch-20040519.ebuild
@@ -1,7 +1,9 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-inherit cannadic eutils
+EAPI="6"
+
+inherit cannadic
 
 DESCRIPTION="Japanese Canna dictionary for 2channelers"
 HOMEPAGE="http://omaemona.sourceforge.net/packages/Canna"
@@ -14,7 +16,6 @@ KEYWORDS="~alpha amd64 hppa ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="canna"
 
 DEPEND="canna? ( app-i18n/canna )"
-RDEPEND=""
 S="${WORKDIR}/${PN}"
 
 CANNADICS="2ch"
@@ -22,7 +23,7 @@ DICSDIRFILE="${FILESDIR}/052ch.dics.dir"
 
 src_compile() {
 	# Anthy users do not need binary dictionary
-	if use canna ; then
+	if use canna; then
 		mkbindic nichan.ctd || die
 	fi
 }
diff --git a/app-dicts/canna-2ch/metadata.xml b/app-dicts/canna-2ch/metadata.xml
index e4e50f32422d1..95f2f679f0e53 100644
--- a/app-dicts/canna-2ch/metadata.xml
+++ b/app-dicts/canna-2ch/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>cjk@gentoo.org</email>
-		<name>Cjk</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">omaemona</remote-id>
-	</upstream>
+  <maintainer type="project">
+    <email>cjk@gentoo.org</email>
+    <name>Cjk</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="sourceforge">omaemona</remote-id>
+  </upstream>
 </pkgmetadata>