11 files changed, 2 insertions, 87 deletions
diff --git a/app-dicts/Manifest.gz b/app-dicts/Manifest.gz
index 9846b113d371..cc559f1459ee 100644
--- a/app-dicts/Manifest.gz
+++ b/app-dicts/Manifest.gz
diff --git a/app-dicts/canna-2ch/Manifest b/app-dicts/canna-2ch/Manifest
deleted file mode 100644
index 3ef44ca6963b..000000000000
--- a/app-dicts/canna-2ch/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX 052ch.dics.dir 64 BLAKE2B 2c5c8acf76dfc1afce87371dbb896411bb79064a09bddd5605e0ce642cc4bb60752944f2e6a93722cc51f10f37659300fe68a8edfd359ba2c5543ea5112360e3 SHA512 5b1bbcd84a1cb5ba6a16e3f980493a51c123e6286231e4e8a12042479930e4d48392a70edfdafce8a1c218639a19f0aa5ddf4d39d2290a12b6adaea291c0fb13
-DIST canna-2ch-20040519.tar.gz 53168 BLAKE2B 247b30f7a97258eac52f9a1d32bd2a785dcfaccd50430fd251a287a80b7a7ab12d1f2c4894d9eb026552f033854b50fbc967a50b66b84d3d5fe68e1954beb6fb SHA512 62b6f633fd0d345e09ce1e0603f61fe1363880ecdc72932e7a8d6d4c17a23be619a749974a3f54a78642396834888f628f047f1a88db3c8d36a758468bd6d296
-EBUILD canna-2ch-20040519.ebuild 648 BLAKE2B fbc0bc1a3c8c4019bbe66972524f7e775feb15b84b1f47f9a57ee851e21e8564a679c9ea412618d45b8a6172f9c6d662e7f07caa3aafbaecb0a25e9c6f36b765 SHA512 4963c5f74304ad3430575489664e273a3150331660373cd5db436e1d82a0c3e8669f01e4cf772d3174bd8cda34f938674e41108909c0483c9b6cfe38e06de3c0
-MISC metadata.xml 322 BLAKE2B 387badfc988d38cce4610565153297b4e346e4e7cba3de038b764c5d276accd880d1e53d1b4a5bc1059908f729f1b38cf93e74c1af2a8aa32f7ce8b5c6a95f19 SHA512 a922bc9b936b97ac46a995b11559345553fea4b9870d5e97afe1886a360e8820ae0fb6041f0d125310acbc786da0840152779d60e6131af665e7ee8440e680d2
diff --git a/app-dicts/canna-2ch/canna-2ch-20040519.ebuild b/app-dicts/canna-2ch/canna-2ch-20040519.ebuild
deleted file mode 100644
index 6dad34d3dab0..000000000000
--- a/app-dicts/canna-2ch/canna-2ch-20040519.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cannadic
-
-DESCRIPTION="Japanese Canna dictionary for 2channelers"
-HOMEPAGE="http://omaemona.sourceforge.net/packages/Canna"
-SRC_URI="https://dev.gentoo.org/~naota/files/${P}.tar.gz"
-S="${WORKDIR}/${PN}"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
-IUSE="canna"
-
-BDEPEND="canna? ( app-i18n/canna )"
-
-CANNADICS=( 2ch )
-DICSDIRFILE="${FILESDIR}"/052ch.dics.dir
-
-src_compile() {
-	# Anthy users do not need binary dictionary
-	if use canna; then
-		mkbindic nichan.ctd || die
-	fi
-}
diff --git a/app-dicts/canna-2ch/files/052ch.dics.dir b/app-dicts/canna-2ch/files/052ch.dics.dir
deleted file mode 100644
index 1ddc85d64336..000000000000
--- a/app-dicts/canna-2ch/files/052ch.dics.dir
+++ /dev/null
@@ -1,2 +0,0 @@
-nichan.cbd(nichan.mwd)		-2ch---
-nichan.cld(nichan.mwd)		-2ch---
diff --git a/app-dicts/canna-2ch/metadata.xml b/app-dicts/canna-2ch/metadata.xml
deleted file mode 100644
index 95f2f679f0e5..000000000000
--- a/app-dicts/canna-2ch/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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>
-</pkgmetadata>
diff --git a/app-dicts/canna-cannadic/Manifest b/app-dicts/canna-cannadic/Manifest
deleted file mode 100644
index 5906eb5493f0..000000000000
--- a/app-dicts/canna-cannadic/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX 05cannadic.dics.dir 101 BLAKE2B 7ab80f9b113dcf0f57774b4cff5f78aa3f8640208f70424fe963fd904aa58ec7be369161a409007dbb97ae727d345eaf4f58e2855e64900ffa412b7d4c76c0a4 SHA512 6edc05f44046021b78954b598cb1b23ab0dc270278af1e52c92c752f5a3b14170771fc83d682b3cbeb0dffcca9831f4f2ac2a9f9975dca72f3e2ab3b0a7dbda2
-DIST cannadic-0.95c.tar.gz 1028308 BLAKE2B 1da5594fa27522693141ee0dd4afbc1b78be3f5839f85624aeedcdbd1757c27b760f1f1fa165fb77812ed8e952e91747dd16ba135359dd86d3417a9e07d43c13 SHA512 46092c45a49c823ad41a4aed690981bd5885e257a3a4fc23077b2f87bdd131e93438e3989b4abddbc6db1e949c0c21d41db00fcc204b5425ab0b107669bc144a
-EBUILD canna-cannadic-0.95c.ebuild 550 BLAKE2B 9ab13f8504519a718ce067d9179350a8dfd4aa4772ece0f2f5236b819fafca6c4b37a8740b3566743caa0f56e57fea95915291425c73906ceada5c7ceefc22f9 SHA512 6bddda4692dc955ae4820924dea71da5456acd450333ccf83861c191f2f608de719a02a2cb337ff37398bebb8dd2a6f7c864a64881669592e9fd08bbf1783bcd
-MISC metadata.xml 240 BLAKE2B 3e01f599fdbafa5c02b594007c673bcfcccb41559bd2f42d7ea60a1f13932335cecf353c1216e8feba4bb091385b57f05c4c8b3c62eed6c7bea41e308fc6115c SHA512 12aaa73d9b690de68a5c7b20e214ceb099efa87884b784eafd994f26032b44dcb66e7feac8a5b1df7f349ac05c5a198a7593dff2cc686de158cb21e4c54f38dd
diff --git a/app-dicts/canna-cannadic/canna-cannadic-0.95c.ebuild b/app-dicts/canna-cannadic/canna-cannadic-0.95c.ebuild
deleted file mode 100644
index 2dfb22218416..000000000000
--- a/app-dicts/canna-cannadic/canna-cannadic-0.95c.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cannadic
-
-MY_P="${P/canna-/}"
-
-DESCRIPTION="Japanese dictionary as a supplement/replacement to Canna3.5b2"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
-
-BDEPEND="app-i18n/canna"
-
-CANNADICS=( gcanna gcannaf )
-DICSDIRFILE="${FILESDIR}"/05cannadic.dics.dir
-
-src_compile() {
-	emake maindic
-}
diff --git a/app-dicts/canna-cannadic/files/05cannadic.dics.dir b/app-dicts/canna-cannadic/files/05cannadic.dics.dir
deleted file mode 100644
index fbbd5b4cd819..000000000000
--- a/app-dicts/canna-cannadic/files/05cannadic.dics.dir
+++ /dev/null
@@ -1,3 +0,0 @@
-gcanna.cbd(gcanna.mwd)		-gcanna---
-gcanna.cld(gcanna.mwd)		-gcanna---
-gcannaf.ctd(.swd)		-gcannaf---
diff --git a/app-dicts/canna-cannadic/metadata.xml b/app-dicts/canna-cannadic/metadata.xml
deleted file mode 100644
index e1a49f498885..000000000000
--- a/app-dicts/canna-cannadic/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?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>
-</pkgmetadata>
diff --git a/app-dicts/myspell-en/Manifest b/app-dicts/myspell-en/Manifest
index 6abd5d130048..ad33f95652fa 100644
--- a/app-dicts/myspell-en/Manifest
+++ b/app-dicts/myspell-en/Manifest
@@ -3,5 +3,5 @@ DIST dict-en-20190101.oxt 6058651 BLAKE2B 617ded8d7df6e62767083be7b0651e1bd1e039
 DIST dict-en-20210601.oxt 6104083 BLAKE2B 192252e85918d3d47167ff9243f70178bc548de3e93152c4139e64ffb013e147fda1fa9c7741ce7bf74b149ec0ab6e001760990cd1ee33dad06fd5e3813ef591 SHA512 c9d791a12aa97d6c2a0928f9f500b22492208b415f877d6b5bd192b5da4c243c32b8d0b7af6b3f5cbfefe6b1c695626db204fc29a922dc4b083538ed144cb472
 EBUILD myspell-en-20170101.ebuild 894 BLAKE2B 72ac7b395b11a921c7b8587fb1f45065180b6e07a39584238724fdf803f3c14dabcb3842ad4749027be1808beb995ea417769cf0515d1755d9bcf8fabb78428e SHA512 4902c41f8e0fdeb6650faa4c6f1de459fc69fb0711ad8ce8b1253a9c644e455a0500baefce9838f98bde1eb100f53f867bcd4752ecf132ea4ceb23a55627fab5
 EBUILD myspell-en-20190101.ebuild 1462 BLAKE2B 3ff866f6234f137d86096dedbb361ce1576ff18625098b8e55db6766e5135bb26f87d4d04be352ecf9b49350011a1cf53eac3c016fae252b570a4e7fdc67ef47 SHA512 b4cb95cb61f09c5570bbc6fbc45d17dbb3273febba80cc5ee6e5bafebfd647a9cbbd7091f1b0eaefb82fe7f2fb31575267506aa7fb5ff5f3bb2b5f0c70b2303f
-EBUILD myspell-en-20210601-r1.ebuild 1382 BLAKE2B 8043bc9892152b7ec2efaf60b17a04f5a94a52b1d443bbafd2d444052c893fd041bbdd3ad279d8b61563e17e7dd88d6b023d34a2451a722c925cddad63779a84 SHA512 5a0ab74f186ee98dac2ecdc5862e04eb217172a291aa1a90c0640bf287f81c5c3cb3a66d5cd895493ed0f7ebbd463f6709f091dffd53c510a78013853e528834
+EBUILD myspell-en-20210601-r2.ebuild 1419 BLAKE2B c32973c47f47e69534ba2c53b6c2c4abed22f263fe19dbb96f53b553c791075eabc735050adb7856b972c23273ab049d26b21337b96b73286d5360e431bafaec SHA512 818d2322f214cc6de7e7a9fbd581394fb2381caa625269f10d9fb3badb1c869ecc3aff467941820a33fb499579d7beecf4a50b5d7fb0e6a4c5a6da204c0daa67
 MISC metadata.xml 421 BLAKE2B fb466302071e1dd8791daf82ab44cd37f896d1c47fb15c300cd08495d7777c6a980be2d765ab3af7b73e1a9813c4fae217486a0c6c72ff584d670ca201b53343 SHA512 6ab94a0265c95d3e55beb4f713add1f5e0da20d65250de3dcaf8b78e43d6b20b8d6b1c79d7c1204d774790423070b7f7056c86c36b08b7ff78b3fe52edb896d9
diff --git a/app-dicts/myspell-en/myspell-en-20210601-r1.ebuild b/app-dicts/myspell-en/myspell-en-20210601-r2.ebuild
index fca6fa3ff16d..f4ccd7d28f0b 100644
--- a/app-dicts/myspell-en/myspell-en-20210601-r1.ebuild
+++ b/app-dicts/myspell-en/myspell-en-20210601-r2.ebuild
@@ -26,6 +26,7 @@ src_prepare() {
 			"th_en_US_v2.dat"
 			"th_en_US_v2.idx"
 		)
+		MYSPELL_HYPH+=( "hyph_en_US.dic" )
 	fi
 
 	MYSPELL_DICT=( )