6 files changed, 136 insertions, 2 deletions
diff --git a/app-dicts/Manifest.gz b/app-dicts/Manifest.gz
index f899a20b264b..9a8abbcb9931 100644
--- a/app-dicts/Manifest.gz
+++ b/app-dicts/Manifest.gz
diff --git a/app-dicts/myspell-en/Manifest b/app-dicts/myspell-en/Manifest
index 446c816068d0..991ec5cda210 100644
--- a/app-dicts/myspell-en/Manifest
+++ b/app-dicts/myspell-en/Manifest
@@ -1,7 +1,9 @@
 DIST dict-en-20210601.oxt 6104083 BLAKE2B 192252e85918d3d47167ff9243f70178bc548de3e93152c4139e64ffb013e147fda1fa9c7741ce7bf74b149ec0ab6e001760990cd1ee33dad06fd5e3813ef591 SHA512 c9d791a12aa97d6c2a0928f9f500b22492208b415f877d6b5bd192b5da4c243c32b8d0b7af6b3f5cbfefe6b1c695626db204fc29a922dc4b083538ed144cb472
 DIST dict-en-20220701_lo.oxt 6124450 BLAKE2B 0fcd479efcbe9cbf6d2e7d479cb070b32bcf62d6ab6154e64c27d155dbc6d9e7521aee4a76e08288b77b583a7f3273f7817694a3b7fe194861ac64b785188ce8 SHA512 3df04d9ff2edf12d1d717a6b95893cf69e394fe2cbdcba77d0c804b37500feeaf42379d743f3c21cb9c8f8ae17ad2eb990806ea3f9fc8af954bd7b89f3253a4d
 DIST dict-en-20220801_lo.oxt 6098496 BLAKE2B 38d216627665aac750528f29eef09baee43bc4cddfe931f8b6a4fa69442fa0489dc89a996850d93a4fc955953e6d33f7950f2efa2549932dbdb862bb07505ac1 SHA512 4ec52df3fafe6432b522f0b2912b3c046820518fd11079ae46506fc120943c31df46820164c7a786881797ae3508263d34e26c6226d23b861097926d7dd396e4
+DIST dict-en-20220901_lo.oxt 6098929 BLAKE2B 61b5e20b567561b7418ad9a932bf14dcd2048a874330faa86e10ae456b360ba287030a7c33146447134e20c10084e5f77d986e8bce87f215447a06cd492e8fc2 SHA512 d3f6decbd55956176651813dd8a9364bb8c8b296645c215deebf556f0ddf0e6a61da306c12d01943a8dddf2f765b577d40d55d24e1bbdf08803ac501814364b2
 EBUILD myspell-en-20210601-r2.ebuild 1429 BLAKE2B 5b654120f1f628ca0229f282cf613bf310830e411591ade2e5e31619e310c8ef133f6a6b0494b724747634f90ea96e42193976d2a4b844f5fcde4244f7874347 SHA512 843d033ac853bb550c66765308ba496025324de03672646e739d5823a6578b5ba37185439bafdc78452c77a28998bacf259f6aa638f27c3e3978832dd7168072
 EBUILD myspell-en-20220701.ebuild 1450 BLAKE2B 76118715d711c875072ba3e25ca5618f541327d86f4db829d9eb4b077cb47416ac67367750968856282c8544792eea0739044a0ba90ba0c6ae1367bfe57475a1 SHA512 edb283647733f7ff88d9b22fe58269ed555b0875a8545c69b52e7b088b2c4c770670b0e01dc19521c58f958504907b23c6589de1bcdff58108b09669d9797563
 EBUILD myspell-en-20220801.ebuild 1450 BLAKE2B db8e88e09edf216cfe547d9244727969d089d3eb147ae22943e2b8637c7f07f9a4cce05ac85fc9398664ab58762ca19637692b46b0df08eec46038944a2accd5 SHA512 5be0c0c5b46e93c98b050f566abf56ba39613b95d9aefe528b9191e8ef4f7705f99ebcdc97e79f797a8a9ca67572de834b840312ae572abd424ee23b2edbfe2f
+EBUILD myspell-en-20220901.ebuild 1453 BLAKE2B 80c6c2a0db86cde44f1301a2e92bd06c6b87204de10e494dc4f77d087dcbb197bb1a444b27d216749b9d1eb8248093f3151611d5473c1a269a2248004a30ddc2 SHA512 cda4b416615ccd7fbae13bd2e3132150bb80aafa9ef9906bec224a3f01418803522d4511c73ab8050287de60fcf36ff4e73cd47e6e78d83035b6003f601061ad
 MISC metadata.xml 422 BLAKE2B 2a08cd9598f852c8ef8a83649d7ac8c8617eb2d5dbe160c5bc21457c412b51ff8fe0c7413238252333e9622e0bc367b9e5b33d5d8051bed9c53a1287296f8385 SHA512 ebc962ac0a2aa0cda987269d52b5dd9607e59aecc73ec265dc6f0b4469827502482dc5c18f5b9122831ed554b852a823c7fb31d58beb5b2a8e14cd16ee12c474
diff --git a/app-dicts/myspell-en/myspell-en-20220901.ebuild b/app-dicts/myspell-en/myspell-en-20220901.ebuild
new file mode 100644
index 000000000000..9081a26c25c6
--- /dev/null
+++ b/app-dicts/myspell-en/myspell-en-20220901.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit myspell-r2
+
+DESCRIPTION="English dictionaries for myspell/hunspell"
+HOMEPAGE="https://extensions.libreoffice.org/extensions/english-dictionaries"
+SRC_URI="https://extensions.libreoffice.org/assets/downloads/41/1662008134/dict-en-20220901_lo.oxt"
+
+LICENSE="BSD MIT LGPL-3+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+
+PLOCALES=( "en" "en-AU" "en-CA" "en-GB" "en-US" "en-ZA" )
+IUSE+="${PLOCALES[@]/#/l10n_}"
+REQUIRED_USE="|| ( ${IUSE[@]} )"
+
+src_prepare() {
+	if use l10n_en-GB || use l10n_en; then
+		MYSPELL_HYPH+=( "hyph_en_GB.dic" )
+	fi
+	if use l10n_en-US || use l10n_en; then
+		MYSPELL_THES+=(
+			"th_en_US_v2.dat"
+			"th_en_US_v2.idx"
+		)
+		MYSPELL_HYPH+=( "hyph_en_US.dic" )
+	fi
+
+	MYSPELL_DICT=( )
+	for lang in "${PLOCALES[@]}"; do
+		if [[ "${lang}" == "en" ]]; then
+			continue
+		fi
+		local mylinguas="${lang//-/_}"
+		if use "l10n_${lang}" || use l10n_en; then
+			MYSPELL_DICT+=( "${mylinguas}.aff" "${mylinguas}.dic" )
+		else
+			rm "README_${mylinguas}.txt" || die
+			if [[ ${lang} == "en-US" ]]; then
+				rm "README_hyph_en_US.txt" || die
+			fi
+			if [[ ${lang} == "en-GB" ]]; then
+				rm "README_hyph_en_GB.txt" || die
+				rm "README_en_GB_thes.txt" || die
+			fi
+		fi
+	done
+
+	default
+}
diff --git a/app-dicts/myspell-fr/Manifest b/app-dicts/myspell-fr/Manifest
index 5035b88ed9d7..ded5544a62c8 100644
--- a/app-dicts/myspell-fr/Manifest
+++ b/app-dicts/myspell-fr/Manifest
@@ -1,3 +1,5 @@
+DIST lo-oo-ressources-linguistiques-fr-v7.0.oxt 3231859 BLAKE2B 779ab784e8c654a09ad54a166ae61b6eb61a5e5ba81828e33db9d7980c7ebe03f4b80bdcbbf52f9a448e550c4ffa918221933935f4893860887e5fc78d4c1b59 SHA512 ef4828660839f238efeb6092ae8a0735383d4b88015bab2f26b150ce21c3bee92442bf5d6e9fd08fea3d4ece3afbc97057b0d126dac666611cfae12c1bada703
 DIST myspell-fr-7.0.tar.gz 3537269 BLAKE2B 4ed449860ed5c62ebe0669c513160c9380cb791f4eb0a4b9b8fb21ee6a0a845aabf3af1533a540d1697a2b9d980fc42a6ee60841da8149ba970eb34edd2f4e8a SHA512 af96495d8970d79283908226adc638a4cd387c94361bc9533df309a063eef53b625650ef5d899604b39cf6a2e97fcdc2200c914a252af425d55e4d076ce14ea7
+EBUILD myspell-fr-7.0-r1.ebuild 2351 BLAKE2B 353087efefb170dd63f97638b8341977a34b5a43e19a815cf365a93ab7ccfc4ccf206b79c9b848b46fd8dbb86b572ce424b8120c7efd0306c8c56043c313421f SHA512 11aa4dfdc111662030c543601c62b5f0b16248a59808c5c8f7f2311cc9fdeb45a456458cb1df87173da77afd044e77fe3ca739521f676f0f906cbdc23335f9c5
 EBUILD myspell-fr-7.0.ebuild 849 BLAKE2B 1d820ae370addb0a72d0b1c925dbd9f17d5335213716b8b33670e29cc549a326177a3f1131ff0ab2ea4c76991e2f25805722e2f615b74c435e1b8e8960630455 SHA512 b2595144f9912661530d7b97c1a98edf957abcfd5845e053e452a02b825079563e151821f6426cd68a3582d0dd110db017ef1a38f61b46c9750d300114299226
-MISC metadata.xml 192 BLAKE2B fef49cb9e1dda8063c379e650d4897670410d2c0641f469b8a200d5e7ec8d3f505e692277d03b583790cb1340ece9c2e8f7e7c9ff5080d42a2e0ef3fc7138a44 SHA512 bece454b8da734c7a28ce25f8080b3fca56332e57cde854c50f0b884ba3836f1af7782a1ee9f63e6aeff4830e2bca71c5c466471fc82eee75339565aab6495d5
+MISC metadata.xml 352 BLAKE2B 21ac19359b4048c95725ce69660d8f7d0040ff7df6452ba32ee2a7b3eee74898cf187fd8855168de982b96cb2bf5fe47a66e66eb0d39cbce3e47d11d22004af5 SHA512 9dbfd10a5b77a87b6214993a0a4cfbc9424fae64c4f26a4ee6b3f8fffd70fa7542978eda190c2c5c876ed705bbbf47e3b235d6ee2317e5ecb1f2242297954e45
diff --git a/app-dicts/myspell-fr/metadata.xml b/app-dicts/myspell-fr/metadata.xml
index c3bda71eefca..70e5090ff2f8 100644
--- a/app-dicts/myspell-fr/metadata.xml
+++ b/app-dicts/myspell-fr/metadata.xml
@@ -2,5 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
-	<stabilize-allarches/>
+	<stabilize-allarches />
+	<upstream>
+		<doc lang="fr">https://grammalecte.net/documentation.php?prj=fr</doc>
+		<bugs-to>https://grammalecte.net/forum.php?prj=fr</bugs-to>
+	</upstream>
 </pkgmetadata>
diff --git a/app-dicts/myspell-fr/myspell-fr-7.0-r1.ebuild b/app-dicts/myspell-fr/myspell-fr-7.0-r1.ebuild
new file mode 100644
index 000000000000..519de154d577
--- /dev/null
+++ b/app-dicts/myspell-fr/myspell-fr-7.0-r1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MYSPELL_DICT=(
+	# Classique (the recommended variant)
+	# FR region hack to deal with LibreOffice bug, see src_prepare
+	"fr_FR.aff"
+	"fr_FR.dic"
+	# Reforme 1990 = the reformed orthography
+	"fr-1990.aff"
+	"fr-1990.dic"
+	# Toutes variantes = Classique + Reforme
+	"fr-ttsvars.aff"
+	"fr-ttsvars.dic"
+)
+
+MYSPELL_HYPH=(
+	# FR region hack to deal with LibreOffice bug, see src_prepare
+	"hyph_fr_FR.dic"
+)
+
+MYSPELL_THES=(
+	# FR region hack to deal with LibreOffice bug, see src_prepare
+	"th_fr_FR_v2.dat"
+	"th_fr_FR_v2.idx"
+)
+
+inherit myspell-r2
+
+DESCRIPTION="French dictionaries for myspell/hunspell"
+HOMEPAGE="https://grammalecte.net/home.php?prj=fr"
+SRC_URI="https://grammalecte.net/grammalecte/oxt/lo-oo-ressources-linguistiques-fr-v${PV}.oxt"
+
+LICENSE="MPL-2.0 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x86-linux"
+IUSE=""
+
+src_prepare() {
+	# Renaming so that variant subtags follow bcp47 rules
+	# <https://tools.ietf.org/html/rfc5646#section-2.1>,
+	# as this gives a nicer presentation in Firefox
+	# (due to it following bcp47 rules)
+	#
+	# fr-classique is recommended so rename to fr
+	mv fr-classique.aff fr.aff || die
+	mv fr-classique.dic fr.dic || die
+	# fr-reforme1990 changed to fr-1990 similarly to de-1901 and de-1996
+	mv fr-reforme1990.aff fr-1990.aff || die
+	mv fr-reforme1990.dic fr-1990.dic || die
+	# fr-toutesvariantes changed to fr-ttsvars until we find something better
+	mv fr-toutesvariantes.aff fr-ttsvars.aff || die
+	mv fr-toutesvariantes.dic fr-ttsvars.dic || die
+
+	# To deal with LibreOffice bug
+	# https://bugs.documentfoundation.org/show_bug.cgi?id=64830
+	# we need dictionary/thesaurus/hyphenation files named fr_FR
+	# (or should that be fr-FR?), so we rename the recommended one fr here.
+	# This is hopefully temporary, so we keep this separate from
+	# the bcp47-ification above.
+	mv fr.aff fr_FR.aff || die
+	mv fr.dic fr_FR.dic || die
+	mv hyph_fr.dic hyph_fr_FR.dic || die
+	# thes -> th and extra v2 suffix, again to appease LibreOffice
+	mv thes_fr.dat th_fr_FR_v2.dat || die
+	mv thes_fr.idx th_fr_FR_v2.idx || die
+
+	eapply_user
+}
+
+DOCS=( package-description.txt README_dict_fr.txt README_hyph_fr-2.9.txt README_hyph_fr-3.0.txt README_thes_fr.txt )