gentoo resync : 12.05.2022

4 files changed, 3 insertions, 101 deletions

diff --git a/app-dicts/myspell-en/Manifest b/app-dicts/myspell-en/Manifest
index a242cb96775c..4e6e9e80ebcf 100644
--- a/app-dicts/myspell-en/Manifest
+++ b/app-dicts/myspell-en/Manifest
@@ -1,7 +1,3 @@
-DIST dict-en-20170101.oxt 5960816 BLAKE2B 65505ed6e8323f28377728ac29e550cf151688517b83209b055966be4e7e14465aacc1d1677d22bc005089d7623e78e63bf91dcdffcde3a790532dba87b54615 SHA512 fae05d3e4bdc9bbd5dda6eb2c0de2f5d0860973e75fe0931bcb0d0e0a5015fb6042beec7f811bee0011f519d13d0f3b52b09fbd906a75340bf311177885ccc1d
-DIST dict-en-20190101.oxt 6058651 BLAKE2B 617ded8d7df6e62767083be7b0651e1bd1e039f78ebb67e8371228805519195dd5acd4ca7d415a29b68697a369d070eafa5545d1b8bbcbab58774db61f03e8e5 SHA512 06e6a21b524c378041655cc44e04f26a35b16e1606a478c0702b96fcbeb86180593fc02d00cae8e05700ead0bd6568239434e8d3d733937587e7b009245dfe4c
 DIST dict-en-20210601.oxt 6104083 BLAKE2B 192252e85918d3d47167ff9243f70178bc548de3e93152c4139e64ffb013e147fda1fa9c7741ce7bf74b149ec0ab6e001760990cd1ee33dad06fd5e3813ef591 SHA512 c9d791a12aa97d6c2a0928f9f500b22492208b415f877d6b5bd192b5da4c243c32b8d0b7af6b3f5cbfefe6b1c695626db204fc29a922dc4b083538ed144cb472
-EBUILD myspell-en-20170101.ebuild 894 BLAKE2B 72ac7b395b11a921c7b8587fb1f45065180b6e07a39584238724fdf803f3c14dabcb3842ad4749027be1808beb995ea417769cf0515d1755d9bcf8fabb78428e SHA512 4902c41f8e0fdeb6650faa4c6f1de459fc69fb0711ad8ce8b1253a9c644e455a0500baefce9838f98bde1eb100f53f867bcd4752ecf132ea4ceb23a55627fab5
-EBUILD myspell-en-20190101.ebuild 1462 BLAKE2B 3ff866f6234f137d86096dedbb361ce1576ff18625098b8e55db6766e5135bb26f87d4d04be352ecf9b49350011a1cf53eac3c016fae252b570a4e7fdc67ef47 SHA512 b4cb95cb61f09c5570bbc6fbc45d17dbb3273febba80cc5ee6e5bafebfd647a9cbbd7091f1b0eaefb82fe7f2fb31575267506aa7fb5ff5f3bb2b5f0c70b2303f
-EBUILD myspell-en-20210601-r2.ebuild 1419 BLAKE2B c32973c47f47e69534ba2c53b6c2c4abed22f263fe19dbb96f53b553c791075eabc735050adb7856b972c23273ab049d26b21337b96b73286d5360e431bafaec SHA512 818d2322f214cc6de7e7a9fbd581394fb2381caa625269f10d9fb3badb1c869ecc3aff467941820a33fb499579d7beecf4a50b5d7fb0e6a4c5a6da204c0daa67
+EBUILD myspell-en-20210601-r2.ebuild 1425 BLAKE2B 7dcc5f1dc8efbe051e8344a7a64d3a9a4694f3a27c96012a37745cc434feb644d2bef7dda8c459afeb5d363c051b535658016bdd76d63dc3b5eacb68af86e96a SHA512 994eb5fba32acee2325f1ff61679e645f1735317da36fc1fb9ab07d82a1bf67dcdc49a3e819584dbc50f5b0a8deeb7bdc2dcfb60a6728f420162852fcfa8115c
 MISC metadata.xml 422 BLAKE2B 2a08cd9598f852c8ef8a83649d7ac8c8617eb2d5dbe160c5bc21457c412b51ff8fe0c7413238252333e9622e0bc367b9e5b33d5d8051bed9c53a1287296f8385 SHA512 ebc962ac0a2aa0cda987269d52b5dd9607e59aecc73ec265dc6f0b4469827502482dc5c18f5b9122831ed554b852a823c7fb31d58beb5b2a8e14cd16ee12c474
diff --git a/app-dicts/myspell-en/myspell-en-20170101.ebuild b/app-dicts/myspell-en/myspell-en-20170101.ebuild
deleted file mode 100644
index a258f8733421..000000000000
--- a/app-dicts/myspell-en/myspell-en-20170101.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PV="${PV:0:4}-${PV:4:2}.${PV:6:2}"
-
-MYSPELL_DICT=(
-	"en_AU.aff"
-	"en_AU.dic"
-	"en_CA.aff"
-	"en_CA.dic"
-	"en_GB.aff"
-	"en_GB.dic"
-	"en_US.aff"
-	"en_US.dic"
-	"en_ZA.aff"
-	"en_ZA.dic"
-)
-
-MYSPELL_HYPH=(
-	"hyph_en_GB.dic"
-)
-
-MYSPELL_THES=(
-	"th_en_US_v2.dat"
-	"th_en_US_v2.idx"
-)
-
-inherit myspell-r2
-
-DESCRIPTION="English dictionaries for myspell/hunspell"
-HOMEPAGE="https://extensions.libreoffice.org/extensions/english-dictionaries"
-SRC_URI="https://extensions.libreoffice.org/extensions/english-dictionaries/${MY_PV}/@@download/file/dict-en-${PV}.oxt"
-
-LICENSE="GPL-2 LGPL-2.1 Princeton myspell-en_CA-KevinAtkinson"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
diff --git a/app-dicts/myspell-en/myspell-en-20190101.ebuild b/app-dicts/myspell-en/myspell-en-20190101.ebuild
deleted file mode 100644
index ed8e6932e08a..000000000000
--- a/app-dicts/myspell-en/myspell-en-20190101.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-MY_PV="${PV:0:4}-${PV:4:2}.${PV:6:2}"
-
-inherit myspell-r2
-
-DESCRIPTION="English dictionaries for myspell/hunspell"
-HOMEPAGE="https://extensions.libreoffice.org/extensions/english-dictionaries"
-SRC_URI="https://extensions.libreoffice.org/extensions/english-dictionaries/${MY_PV}/@@download/file/dict-en-${PV}.oxt"
-
-LICENSE="BSD MIT LGPL-3+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-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"
-		)
-	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-en/myspell-en-20210601-r2.ebuild b/app-dicts/myspell-en/myspell-en-20210601-r2.ebuild
index f4ccd7d28f0b..8115dff41500 100644
--- a/app-dicts/myspell-en/myspell-en-20210601-r2.ebuild
+++ b/app-dicts/myspell-en/myspell-en-20210601-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://extensions.libreoffice.org/assets/downloads/41/dict-en-20210601
 
 LICENSE="BSD MIT LGPL-3+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~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_}"