gentoo resync : 20.03.2022

3 files changed, 2 insertions, 41 deletions

diff --git a/dev-libs/voikko-fi/Manifest b/dev-libs/voikko-fi/Manifest
index e2338c9e8d55..b83f655aaa55 100644
--- a/dev-libs/voikko-fi/Manifest
+++ b/dev-libs/voikko-fi/Manifest
@@ -1,7 +1,4 @@
-DIST voikko-fi-2.4.tar.gz 701807 BLAKE2B 978871a733b12be53287ec2d4637428f6991cdb3098a97cc7fc673d7b1e1ac85eb6811653c1121a1f04b23f40e1b6ff6340a5514c2d1231cf7be37879c70cf20 SHA512 00098fd52d4f81b30fe7f0ecb97ee8f240d898dfd511da1fdc5e6fd7046f2bf94c0230dc733bc6034f178d56d26c3ee69965eb61c04fc7b30087131767701858
-DIST voikko-fi-2.4.tar.gz.asc 833 BLAKE2B f4f470118716cf3ad2348b8ae74f57d95a03adff3ffee66a1f09ae569e240a99ff08e026cd7bf575347ec9941bf6e0174c0b3b468a3434304dd8356db3e4d35d SHA512 bb68fe81c0d8cea206b93484d94d5bfc9a9272827616f3ce8016721027a736b190ae37679baed70df0350c3f84235fdb3d6a525d93123ff561ef6d83b7717562
 DIST voikko-fi-2.5.tar.gz 703898 BLAKE2B 596425311bcdbbf8af97bc32cd69c59cdfa56300afbce22501f084b138ffbd7a915f08628e40a832110e9d366d128747d7e7a0ebdfa38a7734c4f1c1cb303997 SHA512 6de3c6c13a9fb05a463a55177dc1707d5e4ca01c7ccf08e0f8ab73cb3a353ee4935adc23a1b5f6c5da568dbb075c081a700d8d46eb99b6bcbed0efb4d977f59a
 DIST voikko-fi-2.5.tar.gz.asc 833 BLAKE2B 329d442064adee3967b703e19edcdfb20a03e3337751282129e2816f265fcd4ada9c2ce82c146bcde8a644e47b462404ce9abf99f5bc6d2fe2f986f83b73d1e1 SHA512 ccdaa4e76b81f8ee8fcc20c1d870200a1255f9aa84c8dae139f343e8b2cc9ecefb38a16af8653e9c94a1e5cba25c850b8309d406e3d5b323864c8c0ad38979eb
-EBUILD voikko-fi-2.4.ebuild 868 BLAKE2B d7184dcceec265824877e5d6234f68877abb798d687557bd635e64cb5588bb9a99a6c142a76bc53f057339051aea940ec4520d9260ca2cca5e324c7ed7a7db63 SHA512 37027aa58408aa4538a8a2962807e3ae95e7fd8cd95d508253eefd224ff291f39fdfdd1149412f17364d254df703095198a5a6fe3c60decd71a0d6ff84db643d
-EBUILD voikko-fi-2.5.ebuild 870 BLAKE2B 7fc9b1968ea849a782f95e1273f7d8de8a3b40130bc49f10c870b4006242c4cdd5d22429f59892190d73ba51727f8425837f23614b387a594fd6c5088c820954 SHA512 62d5868ce4aa4c54c3b8f3c310b985f31c9c9390ed25df0ca63a988f73060d4b3ef84bfae1c3ba01d65fc1f4d9565edd94aff2b77de5c2f86bdec3822db257fc
+EBUILD voikko-fi-2.5.ebuild 868 BLAKE2B 9797e4c2f23e4311049b8ac2c3d90a0314c05c80cff1ed588d48959ec1967a30feded1b48296539294f26cdadc6acebb2d93acf5fdd3f3c00fb6f303886c7c3c SHA512 de14f929ef2bbd6f555abe3eba0ba19fb6dd01f4c2a4285ea98f198419a628765c4e059bb856ae3c97b19bd9cddb09f039bd065530822e72f55f0fd463474c82
 MISC metadata.xml 255 BLAKE2B 6fe10a1f843a8b2494606052a69206e32fdd5edf3ca6bdfb661cf6f8e39c0e16fb652acb8697d339770f3559c56a4ba964a0e959b3e0bb456d09ee7570f0d9e9 SHA512 235170971553178916cc484a07e1c665c94cd0a7ec442d2190d3608f7a3441dd2fe08fea666ca23d151077c10c908bc1da0e57355fab43be02711be35531b362
diff --git a/dev-libs/voikko-fi/voikko-fi-2.4.ebuild b/dev-libs/voikko-fi/voikko-fi-2.4.ebuild
deleted file mode 100644
index ec16f72b2f4c..000000000000
--- a/dev-libs/voikko-fi/voikko-fi-2.4.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
-
-PYTHON_COMPAT=( python3_{7..10} )
-PYTHON_REQ_USE="xml"
-
-inherit python-any-r1 verify-sig
-
-DESCRIPTION="Finnish dictionary for libvoikko based spell checkers (vvfst format)"
-HOMEPAGE="https://voikko.puimula.org/"
-SRC_URI="https://www.puimula.org/voikko-sources/${PN}/${P}.tar.gz
-	verify-sig? ( https://www.puimula.org/voikko-sources/voikko-fi/${P}.tar.gz.asc )"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-DEPEND="dev-libs/foma
-	dev-libs/libvoikko"
-RDEPEND="${DEPEND}"
-BDEPEND="${PYTHON_DEPS}
-	dev-libs/libvoikko
-	verify-sig? ( sec-keys/openpgp-keys-voikko )"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/voikko.asc
-
-src_compile() {
-	emake vvfst
-}
-
-src_install() {
-	emake DESTDIR="${D}/usr/share/voikko/" vvfst-install
-	einstalldocs
-}
diff --git a/dev-libs/voikko-fi/voikko-fi-2.5.ebuild b/dev-libs/voikko-fi/voikko-fi-2.5.ebuild
index 3b00b9ca71b0..2701c83b09d3 100644
--- a/dev-libs/voikko-fi/voikko-fi-2.5.ebuild
+++ b/dev-libs/voikko-fi/voikko-fi-2.5.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.puimula.org/voikko-sources/${PN}/${P}.tar.gz
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND="dev-libs/foma
 	dev-libs/libvoikko"