gentoo auto-resync : 27:09:2022 - 15:10:20

3 files changed, 81 insertions, 2 deletions

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 )