gentoo auto-resync : 23:05:2024 - 00:06:39

7 files changed, 79 insertions, 6 deletions

diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz
index 325a69fa0db4..e5ce4a01cd34 100644
--- a/app-shells/Manifest.gz
+++ b/app-shells/Manifest.gz
diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest
index dddb29974732..c87415005bbc 100644
--- a/app-shells/bash/Manifest
+++ b/app-shells/bash/Manifest
@@ -452,8 +452,8 @@ EBUILD bash-4.2_p53.ebuild 5157 BLAKE2B 1a58f67c384b6ae781e48ddc2fb131086a23b449
 EBUILD bash-4.3_p48-r2.ebuild 6358 BLAKE2B 532802911ced386ccff0594e5eee739d0d5ebba7e0bf89c431e2769ca7b2dc48f77787f12bcb327f9d394d3bd80680889968c3708ff9f7e64615347fcfd521f5 SHA512 62ed893e23d65d17d0f83d812e616511b4ff2d69a52e6bffb3ed421bb339d18a213a2f1da0239b108e3e81cf0b2f61b4e0cf535964f40dc4577d0cff226fd9bd
 EBUILD bash-4.4_p23-r2.ebuild 6356 BLAKE2B 7501ac7628fcd2f35d9ca6c2153190d2524545f38a9eb793cd8b9d30ed5cb4ae11078cd7bc940fe3cda3f62797ed53de5ab82f726219c054cdc8779a011a8ea9 SHA512 9b9d12e1408944d18c698b0be9940618c059599138f10b20ed55dc69131aac900e3cae0e0b79a55e77d075f6a03c2970b6d22250afe5c7912c652800fe9a30ef
 EBUILD bash-5.0_p18-r2.ebuild 7680 BLAKE2B 6a615f5ef093b32e85bfe8a0fd270d9c636c5d178ba518a8382e1ad5f0a2e128ad85fec1c8441c416c836bdf83ad5ad0e154f79792a908fd6a97ef23750b1800 SHA512 43a8e61a3b754c5ff25a4c7c6c62c07be626c0e9c1515fcfa8a15e25a3b0aff9fa4d00275c2d64bcb506417a7babb6ee120cde118fd7c9255fade7245adeaaae
-EBUILD bash-5.1_p16-r10.ebuild 9783 BLAKE2B cbf1943aa04ff0b823b4fc7502865af2d5721efa18ac080753f2fe5c1ed10ec99927cf25175cf157ef89f2be2d17d18e7a500212bf8a4ab5b20430334777a583 SHA512 5fbe74971ac23adabc110882dfe62e70eabea5f8f99493c41ee87e8d78bcbe88cc07978f839d7d602081afda17e7b444054b0fccde3723df6e1b05eccc22d01a
-EBUILD bash-5.1_p16-r6.ebuild 8848 BLAKE2B 994e869b63c30c5a02c61a9f6f0a25137bba2582187163e0b72ecfcf46aa439527516c6e6b503b289dc8b78a3d5353c57d719c997a8587cf758d57e8f9241a98 SHA512 0fdf7410c8ac01ccd0c7638ca50365b734e99fe41056576101fe8ef0f27714e9f39a296ad97342289331730eb988e693b0dba56dc279c0d259758434d178a2a1
+EBUILD bash-5.1_p16-r10.ebuild 9934 BLAKE2B 693935e75c4d0c1283f66ca37f5b1a7e67b062ae9185549f56529b405ac5925ae49f94d69378c39b101c2cb96728cfb3d5ac2903332e272a75ae2c592d135c3a SHA512 541e3b27cff3c55105c24d74840617b846e7f475b12d192858f445ba47d9523589b5020b6904317704cf6e8bd63c6edf2d94e4cfd9a35e16c40055f5c82a44ca
+EBUILD bash-5.1_p16-r6.ebuild 8999 BLAKE2B e9208661767c61fbd9b06a61111db58908897bdb2d722b7ccbe5d79cd6d2e2543b6c1c89688e62f51ecdb36f107e74727dc6985396a20d8db8682c9036a6db7d SHA512 3fa9c420bbbc154569eb2a9ebb96681b4f10bb6cdbec43608d171f1d9c46a169d7f6cf8b3f419ff395ebe5dee852fa8c46ccd74c10ee9f0f10a6a281da679f5d
 EBUILD bash-5.2_p26-r3.ebuild 11328 BLAKE2B d40b46ee1d0ac919bfc2b5184846b1c82422ada48996dce84e2788562552b152f25a5bef16eae0ea4e172957ebf51f416048a03c39dc25c37e9c0186023e6068 SHA512 f1534854c7626071211cd59aecb78d9299bcff664bfc87a828835f9bd5904ea3c8bc0931ee8612c738a9cbef5e948806a72a6fd580cf0eed2789deaa3b4a3c8b
 EBUILD bash-5.3_alpha-r2.ebuild 11194 BLAKE2B 759992ec0a7cbae9dc1e2770981ae2872b0419e2e4a20c8c440efb7534efb4f0924478600409fb7976e1cb4eb1bf3f590c15c20817c7f21bb00c28349624ce7a SHA512 23677553a37876fb95fb9e8864a2ad75421e1b7b0081437288eb857fcf075428c80cfbe01550757a79b4421981fdc267c4c1dca8bb9e4986032f60d5fce4cde3
 EBUILD bash-9999.ebuild 11144 BLAKE2B acb7134a25d680e403e58c72a8675bbb40bf812f712e541cf15c4d6958e40d1f394ecd390137cd0f386b00b42a1f5dc1bbc5747fa1346b51f87ab0ce4da92965 SHA512 deac7d0ecf7b0fd74aa8ae080482d2567e35373f307263d7f8526f90fcb153b8c098957a0f639a99d6b7b895b5249a4a91a1313a3db37415894c8bfac61d686a
diff --git a/app-shells/bash/bash-5.1_p16-r10.ebuild b/app-shells/bash/bash-5.1_p16-r10.ebuild
index 2f4a6284d0a0..9141fddae28e 100644
--- a/app-shells/bash/bash-5.1_p16-r10.ebuild
+++ b/app-shells/bash/bash-5.1_p16-r10.ebuild
@@ -88,6 +88,12 @@ BDEPEND="
 # EAPI 8 tries to append it but it doesn't exist here.
 QA_CONFIGURE_OPTIONS="--disable-static"
 
+QA_CONFIG_IMPL_DECL_SKIP+=(
+	# this is fixed in autoconf 2.71, used in bash 5.2. The check fails
+	# regardless of GCC version. bug #916480
+	makedev
+)
+
 PATCHES=(
 	#"${WORKDIR}"/${PN}-${GENTOO_PATCH_VER}/
 
diff --git a/app-shells/bash/bash-5.1_p16-r6.ebuild b/app-shells/bash/bash-5.1_p16-r6.ebuild
index 7af661f690f8..488dbff0dc94 100644
--- a/app-shells/bash/bash-5.1_p16-r6.ebuild
+++ b/app-shells/bash/bash-5.1_p16-r6.ebuild
@@ -96,6 +96,12 @@ BDEPEND="sys-devel/bison
 
 S="${WORKDIR}/${MY_P}"
 
+QA_CONFIG_IMPL_DECL_SKIP+=(
+	# this is fixed in autoconf 2.71, used in bash 5.2. The check fails
+	# regardless of GCC version. bug #916480
+	makedev
+)
+
 PATCHES=(
 	# Patches from Chet sent to bashbug ml
 	"${WORKDIR}"/${PN}-${GENTOO_PATCH_VER}-patches/${PN}-5.0-syslog-history-extern.patch
diff --git a/app-shells/thefuck/Manifest b/app-shells/thefuck/Manifest
index 3e8befe86e48..b21246db858d 100644
--- a/app-shells/thefuck/Manifest
+++ b/app-shells/thefuck/Manifest
@@ -1,4 +1,5 @@
+AUX thefuck-3.32-python-312.patch 1295 BLAKE2B 6d145af76bc32c28409baab02fb1752a8257577f92bb63a1768bbbc434030c899e2bcd19cfa618e07786b38c639b2b1abdc48fc04e29b66873e51bdf6104daae SHA512 6116d00ff864e929c37fcbf8dee645ffb952f4a364d6e8b25e1c6593f3e14e0be467ae70d7f0fac2ad8d4235f753241ec0036285b1f99b044deedc6f796da732
 DIST thefuck-3.32.tar.gz 1234795 BLAKE2B f62aca1601b2cec4cc14dc63f6d7e7fffc8ab0e1cf88e44c3170ec6744998e97e97813e9dc6aaccc0a850b0a15f958483da24bcf1d176e43bad1b2272272e7a0 SHA512 961b9b6dc374cc0b854698455f688cf110adb21cfebd4cb645eb5f1ce11c14de6699bb4d40de86a5f9461273cbfc2eea318a9d437f803dc578dd431966cf26c1
 EBUILD thefuck-3.32-r1.ebuild 1161 BLAKE2B 9b190c5abbbf52c2682b8ec9bd41e06806fe1284761640613a6430bb55cee1ee9c697462ea54eed3fc219001cefc21d29ac526928da5bd6bcd1fdd765d840a2d SHA512 c389ac15ad3887410709582a51f3737715e2b551d745d33a0864ad3db671585fa25dfc13c149e9cac8965bf67909815fda30f92360c8b7915c13fb34013dea0a
-EBUILD thefuck-3.32.ebuild 880 BLAKE2B 33d3844291aff718733891764bebe53b61a4fcf8b88676a4d8e2728aac6976746765668e94bb1243a89d8f0cf37eb8b11a04baa337bc555d783e725d9da88416 SHA512 a5ec9fe2764887c580e5d53a93ca2ca0e1f02102ac60e2bccdf0917db0111e9735332bc5ddcd88832138b84462c522d5db4e4dda68e0df2e41d28590480d9e99
+EBUILD thefuck-3.32-r2.ebuild 1348 BLAKE2B d21595bed625e6e60a5d4bd5383f13a4f96153b570fd080d3fb00b7bb20b1f3cc58736efa50611e919535d6f2dc40f5beff293e40b1138ef73b4436996da32b3 SHA512 105eb250a19f70364a1c9edda18106a1d116ae6e19a06c28e3d8e026976330ddb0709d40e62c9d090a80e1a31147b018b959df0a8c24f0595193194ff1e0dafc
 MISC metadata.xml 269 BLAKE2B 19b3e31874e41daeee0fcc465075c0519eb2e56df2eb93a93b48e1041459802d3e0312fc7298ed25742f7058dd0e24982c1da267a1cf65fdd9fbaced7d206e9c SHA512 a5cc8b5aa63bca75b9e84676d513003707cbbfc2ce2c51a989896032e7cc134b3759056fc9d4262545c442307267edd801dad16c392d48aa7bfed2a894f14733
diff --git a/app-shells/thefuck/files/thefuck-3.32-python-312.patch b/app-shells/thefuck/files/thefuck-3.32-python-312.patch
new file mode 100644
index 000000000000..96554b046dcd
--- /dev/null
+++ b/app-shells/thefuck/files/thefuck-3.32-python-312.patch
@@ -0,0 +1,45 @@
+https://github.com/nvbn/thefuck/commit/0420442e778dd7bc53bdbdb50278eea2c207dc74
+From: Pablo Santiago Blum de Aguiar <scorphus@gmail.com>
+Date: Mon, 10 Jul 2023 14:43:45 +0200
+Subject: [PATCH] #1248: Use imp only when importlib.util not available
+
+The imp module is deprecated and will be removed in Python 12.
+
+--- a/thefuck/conf.py
++++ b/thefuck/conf.py
+@@ -1,4 +1,3 @@
+-from imp import load_source
+ import os
+ import sys
+ from warnings import warn
+@@ -6,6 +5,17 @@
+ from . import const
+ from .system import Path
+ 
++try:
++    import importlib.util
++
++    def load_source(name, pathname, _file=None):
++        module_spec = importlib.util.spec_from_file_location(name, pathname)
++        module = importlib.util.module_from_spec(module_spec)
++        module_spec.loader.exec_module(module)
++        return module
++except ImportError:
++    from imp import load_source
++
+ 
+ class Settings(dict):
+     def __getattr__(self, item):
+--- a/thefuck/types.py
++++ b/thefuck/types.py
+@@ -1,9 +1,8 @@
+-from imp import load_source
+ import os
+ import sys
+ from . import logs
+ from .shells import shell
+-from .conf import settings
++from .conf import settings, load_source
+ from .const import DEFAULT_PRIORITY, ALL_ENABLED
+ from .exceptions import EmptyCommand
+ from .utils import get_alias, format_raw_script
diff --git a/app-shells/thefuck/thefuck-3.32.ebuild b/app-shells/thefuck/thefuck-3.32-r2.ebuild
index 078c37a9f1aa..e0aaf60c480d 100644
--- a/app-shells/thefuck/thefuck-3.32.ebuild
+++ b/app-shells/thefuck/thefuck-3.32-r2.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9,10} )
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit distutils-r1
 
@@ -13,7 +14,7 @@ SRC_URI="https://github.com/nvbn/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 
 RDEPEND="
 	dev-python/psutil[${PYTHON_USEDEP}]
@@ -28,8 +29,22 @@ DEPEND="
 	)
 "
 
+PATCHES=(
+	"${FILESDIR}"/${P}-python-312.patch
+)
+
 distutils_enable_tests pytest
 
+EPYTEST_DESELECT=(
+	# failing tests because of trying to access portage's home dir
+	tests/test_conf.py
+	tests/entrypoints/test_not_configured.py
+	tests/test_utils.py::test_get_all_executables_exclude_paths
+	tests/test_utils.py::TestCache
+	# These tests fail with py312; #929026
+	tests/test_utils.py::TestGetValidHistoryWithoutCurrent::test_get_valid_history_without_current
+)
+
 python_prepare_all() {
 	sed -i -e "/import pip/s/^/#/" -e "/pip.__version__/,+3 s/^/#/" setup.py || die
 	distutils-r1_python_prepare_all