gentoo resync : 02.02.2022

4 files changed, 13 insertions, 16 deletions

diff --git a/dev-libs/marisa/Manifest b/dev-libs/marisa/Manifest
index 046a9aa3b9d6..8944f6b9ef19 100644
--- a/dev-libs/marisa/Manifest
+++ b/dev-libs/marisa/Manifest
@@ -2,7 +2,7 @@ AUX marisa-0.2.5-cpu_features_check.patch 4645 BLAKE2B 3ccd0b23d881d56d2341e1ed8
 AUX marisa-0.2.6-riscv_word_size.patch 486 BLAKE2B fef98bb16375bb482bfc5a219ecb61f9401e2bd560962f99e82c1725207c95a52c3ee9699d1fdc95bdfd972e15d6ca63e6c2e5c67938a385c592423205be8c08 SHA512 7da1120c5db4d8c902fd0bd16aa86f95cff09e8d81aa8d4140353eefbd2e3d7a100a9f38909193a5fd2333a652ce8b65198b0664792fe390790dd87883f6a7fa
 DIST marisa-0.2.5.tar.gz 167434 BLAKE2B 2b88e9f0060529c2180400290bb975a946666f58f77f7604cf3ea8ae0ad7e44e0d95e18c8911d9630561b9593eb2ec123b5c67d6d195dab480d86fe431ce2531 SHA512 62975a2dacd2a1072c990cd490f866cd5483c069c94a4706baf3ffc21ec43991583a8ef8721c3b841617b0654cbb894698c19759ff12b8887b6fd28939dfb547
 DIST marisa-0.2.6.tar.gz 168332 BLAKE2B 3b8a89a9a0b344d9de96edb5bf17c50db07da373e75eba098f48c9064321d579ac104db622608119377084c79165bf558c804eaff591903b67330b13bc8acf55 SHA512 c094e4b22e1457efdd20f2b978ee421b53e36ed94e4fdbd8944136c0ba23da4f6ba9fe3a2c64729c1426aee4dbe8098bfa5eebb943ae7fdaa4eec760485c564d
-EBUILD marisa-0.2.5.ebuild 2262 BLAKE2B 4b59b590907a1ce4426142ad0bcf0770e048f9cc56d41802fd44f78b1827e98feac6cb4391c58d6ad77487f391759adfc824d011592737fda04af10963e6f5b4 SHA512 cabdee55108d6d1ddafb9df2ba684da1ee838a99ff9f8bd7a5df5e4ae4341b20a84eac98ae9b0374db07aef1078040d6591e4310f184ab48d22ec8e1f2bbae1e
-EBUILD marisa-0.2.6.ebuild 2904 BLAKE2B 805572704ef2669dee3de403ae3f234cc22ec5aafda3c138b6107308d7ed06476ffd71a814d363f670605b277c423a1ba04ecee624ff19e429a5eff58b936fb3 SHA512 6084ca852d7c8df7d91f5605fe32db155f1ff93b7a421206fd6c0e3de16463cf45bf138852402c94c3c91f256ab5a544db0b69bcf6993d5fc248811c7a1ba3f5
-EBUILD marisa-9999.ebuild 2796 BLAKE2B aae358f1d13901cad56450e9173f8934fb690fa45ab154d39414830cce1755b320e106cddf6f1629c9aa1cdc1b2d822364ab7cb113423b8914c1e4f53a1cea07 SHA512 f0820a5257e3724ba8ec665187746f5a22595d0f07e6218b7ffc70608b1989dfa762fbdbd5f045479432ccb1df671d39a6e1435fa765fa96fafcb709fe7705a8
+EBUILD marisa-0.2.5.ebuild 2234 BLAKE2B 02ba56d816fab0c09264a98d4648060075504507028ff7e16da14c56b3863b5b9df3805ef1181d7330bf0bab94e182374444440e4c5f59e4bbd755b9c2c63a5d SHA512 a86361ab9bfe31aae2130a1e72498ca2096294442a27b2da8c81e68ab4f9e9a1c32d972f1f2b259ac5c3f4b141a473a0802fd6c70c0742695d51f73b4245430c
+EBUILD marisa-0.2.6.ebuild 2871 BLAKE2B 122e2fdbee0555fef41df4f69d07b70806da84aa1eecd930e2c70e5bca88080882db67c1e2380368425c333ec5a7ce5d27488cc2771ce1d9d116d8d4e0b425ae SHA512 3fbef4416cd17626d1a77c0013012ad42cb1ad9f1ad92cba89a1d41bc5b177b78cf1bb4919c52d8d9ef083f9b8f85438794d125f453de84870153618eb123c4c
+EBUILD marisa-9999.ebuild 2764 BLAKE2B d4c3df20f134dac32608de57e70c7a372cf21b6a153ae959eb764bbfe66880be164ea597b55a28d95a90d4e3f349c79c684c0340d01271549d5f8c75eee52e06 SHA512 71b497e8e551d5dee341a06c369fff566c7bdeb3cdd0fec282c7c2585be0e669575325374b00179f8a40267506675608c65810aaa7077025f209da438be20448
 MISC metadata.xml 466 BLAKE2B 52091b0a7fff43b807097f38ccc624057f7cc8becbbb8c4efd2a461d62fbf0bd1498497683ca3ed6b7730768d0fc94d461c983ab1deef8ac156ac3f1bd86c0e7 SHA512 b5914b5a81efb935857a7088421fe765d89a8101cd2a38568c8a9903957fa92482ec7882d4ce4e9555c467e14e2a1fca74b3966d71c541a42cbb0c2880331b12
diff --git a/dev-libs/marisa/marisa-0.2.5.ebuild b/dev-libs/marisa/marisa-0.2.5.ebuild
index bac968c1f7a8..af6c3b508d46 100644
--- a/dev-libs/marisa/marisa-0.2.5.ebuild
+++ b/dev-libs/marisa/marisa-0.2.5.ebuild
@@ -1,10 +1,9 @@
-# Copyright 2014-2020 Gentoo Authors
+# Copyright 2014-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-PYTHON_COMPAT=(python{3_7,3_8,3_9})
+PYTHON_COMPAT=( python{3_7,3_8,3_9} )
 DISTUTILS_OPTIONAL="1"
-DISTUTILS_USE_SETUPTOOLS="no"
 
 inherit autotools distutils-r1
 
diff --git a/dev-libs/marisa/marisa-0.2.6.ebuild b/dev-libs/marisa/marisa-0.2.6.ebuild
index c958dfd64c35..2f47a949a3cf 100644
--- a/dev-libs/marisa/marisa-0.2.6.ebuild
+++ b/dev-libs/marisa/marisa-0.2.6.ebuild
@@ -1,10 +1,9 @@
-# Copyright 2014-2021 Gentoo Authors
+# Copyright 2014-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
-PYTHON_COMPAT=( python3_{8,9} )
+EAPI="8"
+PYTHON_COMPAT=( python3_{8..10} )
 DISTUTILS_OPTIONAL="1"
-DISTUTILS_USE_SETUPTOOLS="no"
 
 inherit autotools distutils-r1 toolchain-funcs
 
@@ -24,7 +23,7 @@ fi
 
 LICENSE="|| ( BSD-2 LGPL-2.1+ )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
 IUSE="python static-libs"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
@@ -40,7 +39,7 @@ if [[ "${PV}" != "9999" ]]; then
 fi
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-0.2.6-riscv_word_size.patch
+	"${FILESDIR}/${PN}-0.2.6-riscv_word_size.patch"
 )
 
 src_prepare() {
diff --git a/dev-libs/marisa/marisa-9999.ebuild b/dev-libs/marisa/marisa-9999.ebuild
index 929e4c4fe299..0d1643f7630f 100644
--- a/dev-libs/marisa/marisa-9999.ebuild
+++ b/dev-libs/marisa/marisa-9999.ebuild
@@ -1,10 +1,9 @@
-# Copyright 2014-2020 Gentoo Authors
+# Copyright 2014-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
-PYTHON_COMPAT=(python{3_7,3_8,3_9})
+EAPI="8"
+PYTHON_COMPAT=( python3_{8..10} )
 DISTUTILS_OPTIONAL="1"
-DISTUTILS_USE_SETUPTOOLS="no"
 
 inherit autotools distutils-r1 toolchain-funcs