gentoo resync : 27.10.2021

3 files changed, 13 insertions, 6 deletions

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
 }