gentoo resync : 27.10.2021

16 files changed, 81 insertions, 146 deletions

diff --git a/app-dicts/Manifest.gz b/app-dicts/Manifest.gz
index 458f525ef472..4c5c1c019aea 100644
--- a/app-dicts/Manifest.gz
+++ b/app-dicts/Manifest.gz
diff --git a/app-dicts/myspell-ca/Manifest b/app-dicts/myspell-ca/Manifest
index 0e352f1e06ab..666bf6290f49 100644
--- a/app-dicts/myspell-ca/Manifest
+++ b/app-dicts/myspell-ca/Manifest
@@ -1,5 +1,3 @@
-DIST myspell-ca-2.3.0.oxt 441719 BLAKE2B 4f58648eac1f77a6e1e2cc571a2528d474c961ce15cab00b822638937bfe450330f4decc8744284b66e5e2b5d58ccf2b03110303d86286e1aa5e7508fd2362a8 SHA512 77513fa6b2d819963bc03aece59aeb2fe6df7674c0fea4fa9a406e6c27efdfbca3ebfc4b36aca4275d79f09678ab58a56c3d6470a815a2192b2ffc4e01c779bf
 DIST myspell-ca-3.0.6.oxt 1729644 BLAKE2B d20655f9f3533aa280706463b9db0263e30294e3ca9468dad4f3f9273ff19d91d65c247e7a5ab954d9497f7f1f388129ca596759067c718899575e92110ff778 SHA512 4d5b867bd1a923bb2d52fba4b30d73f9e5b4d441c78c77aa88b0d67cf9d7ebef9cac0f0ea1addbaf873b6395590a1295fc43f7a9a0567af79f351d1dc2618259
-EBUILD myspell-ca-2.3.0.ebuild 677 BLAKE2B 1ff958ef4d7e519e82fbbc5f83c63b328abfd35be5122f8f4e12c290bff78e01aca04ba890f0943173503f9dc602bee92a387a31aa56bcd6f9ece9ba1ca7a7a3 SHA512 b38fc4deb4639a3b6186b35b93f48ade2cf42fe4dd0f5a431e390cef663c89f639d6737416e85cc3f5f20c2e57fa467f29efe0224ccaaa196bd73753ec5b2303
 EBUILD myspell-ca-3.0.6.ebuild 1102 BLAKE2B 17dd9bb35eb59483c2eb79f0b9b587ce31245e9350e157521a4f7f8b742b08f5f73c7c84891fccac07546af4849f2cbe866ad59642c33ebcb7a54fcaf9e35357 SHA512 0b6bd69166ac54f001a1cf5bfb7beb2a0146c7fcb322b59f929da47bf22ed81429addc780e5062043e86328afae3f64ff6873eadb4d8d2abf3a680e1bc32251a
 MISC metadata.xml 434 BLAKE2B e98e3af7d90546b1c388e24c2d791cdd32f07cde9150c79637d8805780202518a6ca6dfe6fa8e89bd2e6f8ca4b08234c03903644db3705be2d0df5cc36afbd44 SHA512 303e0ef4f85b81518360bfb7d19500a5c11c865e4ac765bc58f13f5aaaf5f5218f634e546740e40492f23256d4dccdecc996a90a6d79856c28ed15b4ee884842
diff --git a/app-dicts/myspell-ca/myspell-ca-2.3.0.ebuild b/app-dicts/myspell-ca/myspell-ca-2.3.0.ebuild
deleted file mode 100644
index 31c6b74e741a..000000000000
--- a/app-dicts/myspell-ca/myspell-ca-2.3.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MYSPELL_DICT=(
-	"ca_ES.aff"
-	"ca_ES.dic"
-)
-
-inherit myspell-r2
-
-DESCRIPTION="Catalan dictionaries for myspell/hunspell"
-HOMEPAGE="https://www.softcatala.org"
-SRC_URI="http://www.softcatala.org/diccionaris/actualitzacions/OOo/catalan.oxt -> ${P}.oxt"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
-
-src_prepare() {
-	default
-	# rename to conform the common naming scheme
-	mv catalan.aff ca_ES.aff || die
-	mv catalan.dic ca_ES.dic || die
-
-	# remove licenses
-	rm -rf LICENSES-en.txt LLICENCIES-ca.txt || die
-}
diff --git a/app-dicts/myspell-fr/Manifest b/app-dicts/myspell-fr/Manifest
index 65e1d7f70846..cf55d11e8700 100644
--- a/app-dicts/myspell-fr/Manifest
+++ b/app-dicts/myspell-fr/Manifest
@@ -1,9 +1,5 @@
 DIST lo-oo-ressources-linguistiques-fr-v5-7.oxt 3419712 BLAKE2B e74657424b460b222b68a2753a21bfdbcaec8ad60e02014bb6b49b3f4bb9f2b7c8b26a0d73bdd83b28d52a70b3c2656b1112f028107598a16e642b3262bff3e1 SHA512 9406fdb7401908ed7a9797735ac9f7b9769373ddc0f016b310344f85d36ae48853ab9300bcae9ac290442f482318ab1b743983d359679e9a7c9f211b4ab35405
-DIST ooo-dictionnaire-fr-classique-reforme1990-v4.5.oxt 2271004 BLAKE2B 80c5c43a096c595e8cf5687336e69df5300bf52a84dbd331da6bada5b8bd430d94ac608cd51569ffceb63e3f4ee1f20ac3c7c2583ae02389805a6c1a841ce47b SHA512 7cfec4838551ff8a14db97cea08ae5280de4cd35ac1b49346484790dff18f156ef5cf2f05e90d61d1809e91780d77cfff3cf59d01f91f949580244e257a1c17b
-DIST ooo-dictionnaire-fr-classique-v4.5.oxt 2251909 BLAKE2B 3ea0901efcee126b2702efebe279cb32b0e496d6b92b8e2a9dd16671bd999b6357086faf99ced6db5f4babe726ee933f3f85858c84a80c8b656b945b23d2aaa7 SHA512 f45b1e12b24e2ef2a9e3944b310631ee5c52ef7cd94a9d2d461ec91b320b40e6d380db7820d386ad75627873b6033e80451b2371f0a42817ead77ce5f03edf77
-DIST ooo-dictionnaire-fr-moderne-v4.5.oxt 2248032 BLAKE2B 4e935186b621810f468e6915e61c7389aa95f8d8e00d8960bd1a9cb8622521669c6147c0b535fffa85a36abb9fcb739a45c00bd9036e5d019953c5b7d13321d5 SHA512 b493f0c57d3d48b93a2c0d9fbd065728ed011c68d11286def203a0b798fe02381acdb2927805475c69c1ff7d0a7ff53469e84581c4724dd57bf0211d85c52655
-DIST ooo-dictionnaire-fr-reforme1990-v4.5.oxt 2255388 BLAKE2B d804bb80698f1ffb8b77dc8c3efa0841437de1389a7fda870fbb4a71914c42055153ff92629481b3e669bec2fa00258b43ff3d92acf08335e11559bb5dec6fae SHA512 39630fb67ecd4afd528a8c255c405945d866e57fb2becc0e79b6c16ec0e0510101d106c0342dd43f26befd3dd0ca3e4094360aaa0d91a090ecdea49158383ed5
-EBUILD myspell-fr-4.5-r1.ebuild 1627 BLAKE2B 758f54a5cce10f057e8d6fa4f8312ce41c0fdcb4de597fd2048a72c00a94f36f9b5d7f20fba858da544da6ba142461ee41df046fbca1103ebf2e8a1a63769e9c SHA512 caf81dc783b034fad2615502cf3dad059e1e449e5b27369143a26058e8fcfab20abb706bad478ca1f467c43725ca577dbdb82dd34ab9d9405d525210f3be0f44
+DIST myspell-fr-7.0.tar.gz 3537269 BLAKE2B 4ed449860ed5c62ebe0669c513160c9380cb791f4eb0a4b9b8fb21ee6a0a845aabf3af1533a540d1697a2b9d980fc42a6ee60841da8149ba970eb34edd2f4e8a SHA512 af96495d8970d79283908226adc638a4cd387c94361bc9533df309a063eef53b625650ef5d899604b39cf6a2e97fcdc2200c914a252af425d55e4d076ce14ea7
 EBUILD myspell-fr-5.7-r1.ebuild 1067 BLAKE2B f3ca3e3c7fbb6cb77c877b13bbff4a0734011503944d176a3a1b4ce1f33927d1d6d1cb2cc6358b948a54d7377365dd347555eb31098a9ecf24bdeb16286a791c SHA512 7f5c1309b649845d0c5089da157212a6f5391c058cd2579dbda6bb566e41c215e511e2a5bfe24c4f168f0f6a0f4e12e282d79c3f9b6ee5f4652b86ef80d3617b
-EBUILD myspell-fr-5.7.ebuild 1012 BLAKE2B 545a2468cc2f82a06a00b246f0447a1ece07c6306937557213ebee8bf7b959ecaab6e9f07c982a47b80139b7a2ea920cc535bbb92193dfeb622165fb78690529 SHA512 56eb5eb2ec0ebaba43454469d4b901fa8816c32ea38b486a05c84f37ae98d98cdd0a48a0a84bad7cd68b607c6a882c7d8ca338215e628991378a22ee66b4d3de
+EBUILD myspell-fr-7.0.ebuild 849 BLAKE2B 8066ebf85c1d6df9d18232c4ecc41efb1f3013170f4d3e1e0ae26dc5a7f14697be73c59d07356fcc4f6ad285dd2023530c735c4385eb2db6c4ee1bdeab8ca9b2 SHA512 19303770dcc4e718890ec58c0f2b6dc8f140391501e369c5fd2d3484c99ef34a8771240d2f141bcbf1bfa078c4f0739fbca768c1065ed53b6e9295a82e23c1e0
 MISC metadata.xml 192 BLAKE2B fef49cb9e1dda8063c379e650d4897670410d2c0641f469b8a200d5e7ec8d3f505e692277d03b583790cb1340ece9c2e8f7e7c9ff5080d42a2e0ef3fc7138a44 SHA512 bece454b8da734c7a28ce25f8080b3fca56332e57cde854c50f0b884ba3836f1af7782a1ee9f63e6aeff4830e2bca71c5c466471fc82eee75339565aab6495d5
diff --git a/app-dicts/myspell-fr/myspell-fr-4.5-r1.ebuild b/app-dicts/myspell-fr/myspell-fr-4.5-r1.ebuild
deleted file mode 100644
index 3519f55e57ec..000000000000
--- a/app-dicts/myspell-fr/myspell-fr-4.5-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MYSPELL_DICT=(
-	"fr-moderne.aff"
-	"fr-moderne.dic"
-	"fr-classique.aff"
-	"fr-classique.dic"
-	"fr_FR.aff"
-	"fr_FR.dic"
-	"fr-reforme1990.aff"
-	"fr-reforme1990.dic"
-)
-
-MYSPELL_HYPH=(
-	"hyph_fr_FR_v3.dic"
-)
-
-MYSPELL_THES=(
-	"th_fr_FR_v3.dat"
-	"th_fr_FR_v3.idx"
-)
-
-inherit myspell-r2
-
-DESCRIPTION="French dictionaries for myspell/hunspell"
-HOMEPAGE="https://extensions.libreoffice.org/extension-center/dictionnaires-francais"
-SRC_URI="
-	https://extensions.libreoffice.org/extension-center/dictionnaires-francais/releases/${PV}/ooo-dictionnaire-fr-moderne-v${PV}.oxt
-	https://extensions.libreoffice.org/extension-center/dictionnaires-francais/releases/${PV}/ooo-dictionnaire-fr-classique-v${PV}.oxt
-	https://extensions.libreoffice.org/extension-center/dictionnaires-francais/releases/${PV}/ooo-dictionnaire-fr-classique-reforme1990-v${PV}.oxt
-	https://extensions.libreoffice.org/extension-center/dictionnaires-francais/releases/${PV}/ooo-dictionnaire-fr-reforme1990-v${PV}.oxt
-"
-
-LICENSE="GPL-2 LGPL-2.1 MPL-1.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~x86-linux"
-IUSE=""
-
-src_prepare() {
-	default
-	# the default should be classique+reforme1990
-	# renaming to fr_FR
-	mv fr-classique+reforme1990.aff fr_FR.aff || die
-	mv fr-classique+reforme1990.dic fr_FR.dic || die
-
-	# move the hyphen/thes to common used name
-	# versions determined from README files
-	mv hyph_fr.dic hyph_fr_FR_v3.dic || die
-	mv thes_fr.dat th_fr_FR_v3.dat || die
-	mv thes_fr.idx th_fr_FR_v3.idx || die
-}
diff --git a/app-dicts/myspell-fr/myspell-fr-5.7.ebuild b/app-dicts/myspell-fr/myspell-fr-7.0.ebuild
index 06041dd698cc..6cd0fb419882 100644
--- a/app-dicts/myspell-fr/myspell-fr-5.7.ebuild
+++ b/app-dicts/myspell-fr/myspell-fr-7.0.ebuild
@@ -10,8 +10,8 @@ MYSPELL_DICT=(
 	"fr-moderne.dic"
 	"fr-reforme1990.aff"
 	"fr-reforme1990.dic"
-	"fr-toutesvariantes.aff"
-	"fr-toutesvariantes.dic"
+	"fr_FR.aff"
+	"fr_FR.dic"
 )
 
 MYSPELL_HYPH=(
@@ -27,16 +27,11 @@ MYSPELL_THES=(
 inherit myspell-r2
 
 DESCRIPTION="French dictionaries for myspell/hunspell"
-HOMEPAGE="https://extensions.libreoffice.org/extension-center/dictionnaires-francais"
-SRC_URI="https://extensions.libreoffice.org/assets/downloads/z/lo-oo-ressources-linguistiques-fr-v5-7.oxt"
+HOMEPAGE="https://grammalecte.net/"
+SRC_URI="https://github.com/scardracs/gentoo-packages/releases/download/fr-20201207/${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2.1 MPL-1.1"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x86-linux"
 
 DOCS=( package-description.txt README_dict_fr.txt README_hyph_fr-2.9.txt README_hyph_fr-3.0.txt README_thes_fr.txt )
-
-src_prepare() {
-	default
-	rm -r french_flag_16.bmp french_flag.png || die
-}
diff --git a/app-dicts/myspell-it/Manifest b/app-dicts/myspell-it/Manifest
index 09d5a468d5a9..9b9605c8d90c 100644
--- a/app-dicts/myspell-it/Manifest
+++ b/app-dicts/myspell-it/Manifest
@@ -1,5 +1,3 @@
-DIST Dizionari.IT_20081129.oxt 1433036 BLAKE2B 0e0aa03fafa34957a00b054070de67aec3f742d4cf177c6185c8a6b8a4005ea94f4041fb2e29a0ab7fa87a7d04c5f2148f98bd446e196470104ccf1b3ad97a0c SHA512 f0576f62448d368680545a66bf99d3d44c75562a0b5bc72c9020cef707c5543182ea1f45934826970b9e3ea588b9f2e29686cd08f7b8fdddcfdbd067e6536071
 DIST myspell-it-20150925.oxt 1373663 BLAKE2B 89748d0dceca6a8f3aba7b76913693ac248f2a5c925e04b76e50f23edebd6b0194da72646837e806882ce6258784d5dfb6c212046f13315479603d953d95b769 SHA512 b48a5ac075b9a20b0370235cb4fc225c91a67e6311eb9e7a96b008ad5e64e56af3daf4b192d38d5892e8d23d5f6e0c962e35f8cfec11a97ed8708e29796e09d3
-EBUILD myspell-it-20081129-r2.ebuild 763 BLAKE2B b82fed87679986ca4ee15134e27f16a68f8595a0354c0b9bc822c5a81742ddd21b8fd35460580200db45a63afcd2e1cb371046d7f7c2930de316be2a3c6192dd SHA512 ae80fc0d5157ba64b1376db82b178f3ac1ee65b66d0e6d901272f46fa6793fdd0ca2e7e326e1d40c2eb48ad65aeecac56c7c063a7578b61aa33aab3440fcda07
 EBUILD myspell-it-20150925.ebuild 978 BLAKE2B deb63e34d45140aee1d56effea13a0523189db7d8abdab733eada668bf299234cd14892ee01c1723b6e4be80e0893bce902f08a41c7da45f624636d87b4cce3c SHA512 cd6639d2b5a49e19e872ade852e87792d6bb2d1b31e3825ebc2e6b1eb6c60d5ed205bbf8abedc77555340a7373430a50aa4cf0e3d7136dd71264e2ae2bfb4030
 MISC metadata.xml 192 BLAKE2B fef49cb9e1dda8063c379e650d4897670410d2c0641f469b8a200d5e7ec8d3f505e692277d03b583790cb1340ece9c2e8f7e7c9ff5080d42a2e0ef3fc7138a44 SHA512 bece454b8da734c7a28ce25f8080b3fca56332e57cde854c50f0b884ba3836f1af7782a1ee9f63e6aeff4830e2bca71c5c466471fc82eee75339565aab6495d5
diff --git a/app-dicts/myspell-it/myspell-it-20081129-r2.ebuild b/app-dicts/myspell-it/myspell-it-20081129-r2.ebuild
deleted file mode 100644
index 09c83e760086..000000000000
--- a/app-dicts/myspell-it/myspell-it-20081129-r2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MYSPELL_DICT=(
-	"it_IT.aff"
-	"it_IT.dic"
-)
-
-MYSPELL_HYPH=(
-	"hyph_it_IT.dic"
-)
-
-MYSPELL_THES=(
-	"th_it_IT.dat"
-	"th_it_IT.idx"
-)
-
-inherit myspell-r2
-
-DESCRIPTION="Italian dictionaries for myspell/hunspell"
-HOMEPAGE="https://sourceforge.net/projects/linguistico/"
-SRC_URI="mirror://sourceforge/linguistico/Dizionari.IT_${PV}.oxt"
-
-LICENSE="AGPL-3 GPL-3 LGPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
-
-src_prepare() {
-	default
-	# remove useless license files.
-	rm -r agpl3-en.txt gpl3-en.txt it_IT_license.txt \
-		lgpl3-en.txt th_it_IT_copyright_licenza.txt \
-		th_it_IT_lettera_in_inglese.txt || die
-}
diff --git a/app-dicts/myspell-large-en/Manifest b/app-dicts/myspell-large-en/Manifest
new file mode 100644
index 000000000000..daedae884e50
--- /dev/null
+++ b/app-dicts/myspell-large-en/Manifest
@@ -0,0 +1,6 @@
+DIST hunspell-en_AU-large-2020.12.07.zip 314019 BLAKE2B 91d7a7c925d24c27591e70df8f7db9dca469106fcb14dbeb8befb645befe345237b76d7f0f38027b2cb4c894ea53c2574c938341d890411d2648519dd9943c93 SHA512 020684f5d8abf227a6566ebfe7343ee51f7f79576a89e9955ca614b3847e2b7e7be48025b22265a4cb8f86e5e8cbb2620385b46104c3ffec5c604775dea0bec0
+DIST hunspell-en_CA-large-2020.12.07.zip 313409 BLAKE2B f2b6b9ece44c9c07f084d8af0deec96218390288ec7caf07316ef517042f4a3b0d581353d1635d4e2a2797867ed95a6e76325c42e3364a15db8a49a94f50ddff SHA512 a3c591d8593b3fb6d0c28c2764cb85dec6650073f7b6a1074e9d6f96cbb2194d4bd0cbd61be59ebe14f89e3f5d5d83f10706e69130ec5c7d90f088005de9b464
+DIST hunspell-en_GB-large-2020.12.07.zip 315876 BLAKE2B f71b304e97e10368180d0abb7b2304649c4e481848226d693768f54dca96b9f4f1e85e54efd052546236cbc94b5caba19df801d75c46ab20a68df98e7758aeb1 SHA512 a402c40717cd185ea8c14be2d4dc7df67580f197d276ae660a7cf478ae3e07e469c78271feb0c4c6b7c1c418bfb10e7f42c1e5f4b9635a4d3c47e1af4a747a4c
+DIST hunspell-en_US-large-2020.12.07.zip 312362 BLAKE2B f7ab7abb438806826408a5641b82094a69dc85c403389e6ea63d726c68dee49542e1b826f73261eef37cb53f291047d95b91011c501ee00e0e7fd62e301850d3 SHA512 b370fc77735666d9de1c0cc9a1028819974b254291a0aacbcf6037a8cbb23f75538f2130249a0bab46d32dbbd3e0788407c227423d375ef1430dff7a016092dc
+EBUILD myspell-large-en-20201207.ebuild 1280 BLAKE2B dfb8e86852075ec7fe980e97257306acf60ad7e7f5105da615e2fe0e418d2dc27ed8fdf44117254c85bd83db7f68565cfb9931b1c0541da1a3bfc7613fa8c039 SHA512 78566b05225a3ccae76afb76f85c022d96834347d62cc6c5b2fc7d5f15e5452a1b183d264ac176c2aedd36c736d79234882489973c55eecb0fef1f1b6b15253a
+MISC metadata.xml 367 BLAKE2B ba1f5365b9b1585d0ed0513fd8a7f3aef4cbdcced1257cdb3e0cd167845f04cc248160164f367f0268c4388ebbc618a85bc248355be0cdcfd3bb827875bf6cdb SHA512 b6022494b82fa7956d3f6320d170fff6433ccfb601c9107cb5f9a0a8419d3bfde4c2dc3eded7f0e6a8503ffb142d144d8cf983dd73cc7bdebeb9ab687efdd9e2
diff --git a/app-dicts/myspell-large-en/metadata.xml b/app-dicts/myspell-large-en/metadata.xml
new file mode 100644
index 000000000000..d8d2eab72daf
--- /dev/null
+++ b/app-dicts/myspell-large-en/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>onigino@protonmail.com</email>
+		<name>Gino McCarty</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-dicts/myspell-large-en/myspell-large-en-20201207.ebuild b/app-dicts/myspell-large-en/myspell-large-en-20201207.ebuild
new file mode 100644
index 000000000000..370675bf4c9a
--- /dev/null
+++ b/app-dicts/myspell-large-en/myspell-large-en-20201207.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PV=${PV:0:4}.${PV:4:2}.${PV:6:2}
+
+inherit myspell-r2
+
+DESCRIPTION="English Large dictionaries for myspell/hunspell"
+HOMEPAGE="https://sourceforge.net/projects/wordlist/"
+SRC_URI="
+	https://versaweb.dl.sourceforge.net/project/wordlist/speller/${MY_PV}/hunspell-en_AU-large-${MY_PV}.zip
+	https://versaweb.dl.sourceforge.net/project/wordlist/speller/${MY_PV}/hunspell-en_CA-large-${MY_PV}.zip
+	https://versaweb.dl.sourceforge.net/project/wordlist/speller/${MY_PV}/hunspell-en_GB-large-${MY_PV}.zip
+	https://versaweb.dl.sourceforge.net/project/wordlist/speller/${MY_PV}/hunspell-en_US-large-${MY_PV}.zip
+"
+
+LICENSE="myspell-en_CA-KevinAtkinson public-domain Princeton Ispell"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+PLOCALES=( "en" "en-AU" "en-CA" "en-GB" "en-US" )
+IUSE+="${PLOCALES[@]/#/l10n_}"
+REQUIRED_USE="|| ( ${IUSE[@]} )"
+
+src_prepare() {
+	default
+
+	MYSPELL_DICT=( )
+	for lang in "${PLOCALES[@]}"; do
+		if [[ "${lang}" == "en" ]]; then
+			continue
+		fi
+		local mylinguas="${lang//-/_}-large"
+		if use "l10n_${lang}" || use l10n_en; then
+			MYSPELL_DICT+=( "${mylinguas}.aff" "${mylinguas}.dic" )
+		else
+			rm "README_${mylinguas}.txt" || die
+		fi
+	done
+}
diff --git a/app-dicts/myspell-nn/Manifest b/app-dicts/myspell-nn/Manifest
index b38ed4da3268..3328b8d70a8b 100644
--- a/app-dicts/myspell-nn/Manifest
+++ b/app-dicts/myspell-nn/Manifest
@@ -1,3 +1,3 @@
 DIST no_NO-pack2-2.0.10.zip 3221701 BLAKE2B b064fa40f9ee6429d5309040270f9c5dea655a0f6810d2ed876345a031a12b7d6318ff4e7b9ff32b7ea4f3b4aea7d6679bd7d971bdbf5557dd9edfee28327211 SHA512 af7ee5c465035aa419c60ef8621d6697e86e5fbed39737e86565bb3fe4851ee35d57f832e56ef0d27ce9b26682d5b32ef2213dd6c3323074cde2784fb236298c
-EBUILD myspell-nn-2.0.10.ebuild 653 BLAKE2B bafbc5dcaffcc208b191d760ee462d6c49aa9a5216fb2297a863c2e787ac9f2b645b9c2e59077e8707b2d13afe8c3a1f8022f7f5870fa37db7f050974eadac7c SHA512 68cd268e826baf95f55f58d47b02cecc9d8aa9f057933c0305256aff81ab6a699edcc8ab93d0ef0457ccda521241b67e17cc1027c13106c3be752203587026e6
+EBUILD myspell-nn-2.0.10.ebuild 669 BLAKE2B 634a09db83baac85e0c3c89e4ecba68dc63c30bc866ac580d53974f4ad3b7a3659f868613e9d969f671e4c714734949e36197b30a1eb48dc4a340822b3f1d2da SHA512 d5dc58f67a0e316769e0c70a2b08109ba75cbae0f4fd3accd5e49d623c4a9453d0915fd05a157c753f71c43e37f3d4a317361e48efc47248f95c4ab430931d24
 MISC metadata.xml 192 BLAKE2B fef49cb9e1dda8063c379e650d4897670410d2c0641f469b8a200d5e7ec8d3f505e692277d03b583790cb1340ece9c2e8f7e7c9ff5080d42a2e0ef3fc7138a44 SHA512 bece454b8da734c7a28ce25f8080b3fca56332e57cde854c50f0b884ba3836f1af7782a1ee9f63e6aeff4830e2bca71c5c466471fc82eee75339565aab6495d5
diff --git a/app-dicts/myspell-nn/myspell-nn-2.0.10.ebuild b/app-dicts/myspell-nn/myspell-nn-2.0.10.ebuild
index ed8ef0842299..2a127c2f0469 100644
--- a/app-dicts/myspell-nn/myspell-nn-2.0.10.ebuild
+++ b/app-dicts/myspell-nn/myspell-nn-2.0.10.ebuild
@@ -20,7 +20,7 @@ MYSPELL_THES=(
 inherit myspell-r2
 
 DESCRIPTION="Norwegian dictionaries for myspell/hunspell"
-HOMEPAGE="http://spell-norwegian.alioth.debian.org/"
+HOMEPAGE="http://freshmeat.sourceforge.net/projects/spell-norwegian"
 SRC_URI="https://alioth.debian.org/frs/download.php/2357/no_NO-pack2-${PV}.zip"
 
 LICENSE="GPL-2"
diff --git a/app-dicts/myspell-ru/Manifest b/app-dicts/myspell-ru/Manifest
index ce61c6e8f0ce..2a66d3e6ddec 100644
--- a/app-dicts/myspell-ru/Manifest
+++ b/app-dicts/myspell-ru/Manifest
@@ -2,6 +2,6 @@ DIST dict_pack_ru-aot-0-4-0.oxt 1509261 BLAKE2B bdda8be3d0a9266285215ffaa4ad8916
 DIST dict_pack_ru-aot-0-4-3.oxt 1393032 BLAKE2B 8fa0587ae31a155631f799dc7c0214cab0f6c58a059d6948c540061afd7111eee26c18cc638a560928201ff718a638178cebcbd1b7eb17e65b45709217b47332 SHA512 17c0f4d75c397014e3fcb653c8e20d907d9acb2594ba9e43986312d1081f46638a0e3737cb1bf3932d602342f53add26f02efc4edb7e24dd29522aba901f240a
 DIST dict_pack_ru-aot-0.4.5.oxt 1584360 BLAKE2B 14282262644c8a2c1b1f7951f4c5e330213302d20b25f6fdcd431a72dbd0d42e47302402862b8bf5774d202b9c7975669cf395822d5926f6d6bf02f5a81cb342 SHA512 85391cbadbb152aecb30aee148ef936d950d1dc39d0722cc28650f50241cc0fae32c60ccc57d2a9fe8746dbb4df4579f5c002a6beefebd936322ed480aa13bd0
 EBUILD myspell-ru-20150711-r2.ebuild 826 BLAKE2B ec9c115a9cf016238bd0d2a53ed3a28af36d66d8439c7f79a769f267a40b65cfffad0a51f108e6ca5dba6fbec72002e7849cf5be32028a92ab3fb249e4066e74 SHA512 7f84b305b044091628c6f6a6ed11152c8c68b184b4ece332ca66987ee74ba4882dec292807ce644ab4e5506d0c034b7d1d0f1a176550a7d613533892c6b834dc
-EBUILD myspell-ru-20180627.ebuild 834 BLAKE2B 06a794f6a7bab75906c050c09afb5204eaa29fc71b4258f3818adf4b937a88cd8032e45eda9ce815c461e7e2c517697229d1e8568ab21423bb63559dd83f45c3 SHA512 f6065905df55d2dec7b115d8afca1307767e980be75b42dd841825cb76ed6226c8c98daf436af74d47526372197119a9c6c4306eeea26a9c775304a816d84328
-EBUILD myspell-ru-20200606.ebuild 725 BLAKE2B 1a7527d18fc383f5bdf23d95459d0809a15eb12e6a351a9803f834676316f99e33ad3643d99564e65255704eece0585bcf40c04313b2b8109d2301ed1a88b0c3 SHA512 41dabaf16cb16af8b5c6dbe01c1a1164db6c3b3148770e9f446070f901e225bd32b9d6d20e2c54a93fd10a0db478173863b06e08ee1202702c2284b327060b58
+EBUILD myspell-ru-20180627.ebuild 829 BLAKE2B 341a7b54543b8333aa84424cd2546e59cc13379ab857c547d63960fb7ce5ea13c87e7f7c021f4a7a50e6ee037c21b30a5a183c83aad8f82d59f38af480ac0682 SHA512 18aa4ddf09ae9098c19c867d07bfa625a00456496562f9cb8584bc1373b4ef7579d7226e56d35e74990eb6990da8d9560557be939047576372e573b7d0e11941
+EBUILD myspell-ru-20200606.ebuild 891 BLAKE2B bbc27b88b936a53b774f5eb4406fcd856b6fb3d481cf0e240c3f5b89af61cf017f40858975ec5c3fa7025a62537b00dfb1afba6199cf8d952fb2596021caa9be SHA512 a891835d31208ba31891a44f7a80f3310ed97915a3e2f849ab55b5e210466f14364834d7cca69fd3c116f1227f589c1ab80eaa0a6c4e71c93f0b61638b1f1f85
 MISC metadata.xml 434 BLAKE2B 0bf487809678fc0543bc448378f8292ece3c7dfaae2bbd5918664ae8f52ddc816d7027da331867ec62ced7f511c57903fa69ffe1f403bf2e08caefdb7cb7a774 SHA512 30af00095f40a17e28945d0dce52d48b6965adedb561a5bae903d1f72a42986da4ee030c57b36ca99c06a7eef58bd745ad0d096d277a212fd243974ecd2be2b8
diff --git a/app-dicts/myspell-ru/myspell-ru-20180627.ebuild b/app-dicts/myspell-ru/myspell-ru-20180627.ebuild
index a41fe7e0ea8f..251e7847e82c 100644
--- a/app-dicts/myspell-ru/myspell-ru-20180627.ebuild
+++ b/app-dicts/myspell-ru/myspell-ru-20180627.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://extensions.libreoffice.org/${EXT}/${DICT}/0-4.3/@@download/file
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc ~x86 ~amd64-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux"
 
 src_prepare() {
 	default
diff --git a/app-dicts/myspell-ru/myspell-ru-20200606.ebuild b/app-dicts/myspell-ru/myspell-ru-20200606.ebuild
index c055c318b0d1..0233c19ed472 100644
--- a/app-dicts/myspell-ru/myspell-ru-20200606.ebuild
+++ b/app-dicts/myspell-ru/myspell-ru-20200606.ebuild
@@ -5,20 +5,27 @@ EAPI=7
 
 MYSPELL_DICT=( ru_RU.{dic,aff} )
 MYSPELL_HYPH=( hyph_ru_RU.dic )
-MYSPELL_THES=( ru_th_aot.{dat,idx} )
+MYSPELL_THES=( th_ru_RU_v2.{dat,idx} )
 
 inherit myspell-r2
 
+EXT="extensions"
+DICT="russian-dictionary-pack"
+MY_PN="dict_pack_ru-aot"
+MY_PV="0.4.5"
+
 DESCRIPTION="Russian spellcheck dictionary based on works of AOT group for myspell/hunspell"
 HOMEPAGE="https://extensions.libreoffice.org/extensions/russian-dictionary-pack"
-SRC_URI="https://extensions.libreoffice.org/assets/downloads/48/dict_pack_ru-aot-0.4.5.oxt"
+SRC_URI="https://extensions.libreoffice.org/assets/downloads/48/${MY_PN}-${MY_PV}.oxt"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux"
 
 src_prepare() {
 	default
 	mv russian-aot.dic ru_RU.dic || die
 	mv russian-aot.aff ru_RU.aff || die
+	mv ru_th_aot.dat th_ru_RU_v2.dat || die
+	mv ru_th_aot.idx th_ru_RU_v2.idx || die
 }