gentoo resync : 27.10.2021

3 files changed, 6 insertions, 69 deletions

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
-}