gentoo resync : 20.06.2021

5 files changed, 14 insertions, 17 deletions

diff --git a/app-dicts/Manifest.gz b/app-dicts/Manifest.gz
index 1fa58c12b4f3..4bca9331a02e 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
index 48e1ae2f7ffd..3ef44ca6963b 100644
--- a/app-dicts/canna-2ch/Manifest
+++ b/app-dicts/canna-2ch/Manifest
@@ -1,4 +1,4 @@
 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 711 BLAKE2B 1a38e3f37ca19398279308b1ad91e09ccb54a9831c759c0ad21bb6daab46ea5c483737a9d11031fe4829db5d66a001696aa3da95c8c0ed4fafa4954b5e406b84 SHA512 d99adfe69e55c3a6a6223cb6ef66b33d0e459df30ff89ce942da29ec9d969b008cf4e79cd84f43fb3c3615cc051b1d08e1161274ac9e1c8b3a0d09007fc6c0ee
+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
index 773cca3f740b..6dad34d3dab0 100644
--- a/app-dicts/canna-2ch/canna-2ch-20040519.ebuild
+++ b/app-dicts/canna-2ch/canna-2ch-20040519.ebuild
@@ -1,25 +1,24 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+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"
-#SRC_URI="http://omaemona.sourceforge.net/packages/Canna/2ch.t"
+S="${WORKDIR}/${PN}"
 
 LICENSE="public-domain"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="canna"
 
-DEPEND="canna? ( app-i18n/canna )"
-S="${WORKDIR}/${PN}"
+BDEPEND="canna? ( app-i18n/canna )"
 
-CANNADICS="2ch"
-DICSDIRFILE="${FILESDIR}/052ch.dics.dir"
+CANNADICS=( 2ch )
+DICSDIRFILE="${FILESDIR}"/052ch.dics.dir
 
 src_compile() {
 	# Anthy users do not need binary dictionary
diff --git a/app-dicts/canna-cannadic/Manifest b/app-dicts/canna-cannadic/Manifest
index 119de4b46e1c..5906eb5493f0 100644
--- a/app-dicts/canna-cannadic/Manifest
+++ b/app-dicts/canna-cannadic/Manifest
@@ -1,4 +1,4 @@
 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 596 BLAKE2B a7caa3d5cb294a1ef8f32dfb97e42bae515f855070f6d2a7ffd07d281188ae05bf076ecc1bee9b9e3f5998b9e796ad6ee66de7f400aa52bcdc06990b60b712a7 SHA512 fa3fcaa0a12d784eb19b59195c5e30ff19fca71d2e80b6af7e2e5949ad02096e44db01397a75fda0eecf06345d618d5ecdf7404e7dd90c1685ddcc4acb0099fa
+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
index b42ea9c08fe7..2dfb22218416 100644
--- a/app-dicts/canna-cannadic/canna-cannadic-0.95c.ebuild
+++ b/app-dicts/canna-cannadic/canna-cannadic-0.95c.ebuild
@@ -1,27 +1,25 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=7
 
 inherit cannadic
 
 MY_P="${P/canna-/}"
 
 DESCRIPTION="Japanese dictionary as a supplement/replacement to Canna3.5b2"
-#HOMEPAGE="http://cannadic.oucrc.org/"
 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"
-IUSE=""
 
-DEPEND="app-i18n/canna"
-S="${WORKDIR}/${MY_P}"
+BDEPEND="app-i18n/canna"
 
-CANNADICS="gcanna gcannaf"
-DICSDIRFILE="${FILESDIR}/05cannadic.dics.dir"
+CANNADICS=( gcanna gcannaf )
+DICSDIRFILE="${FILESDIR}"/05cannadic.dics.dir
 
 src_compile() {
 	emake maindic