gentoo auto-resync : 10:03:2024 - 00:44:50

3 files changed, 38 insertions, 2 deletions

diff --git a/dev-build/automake/Manifest b/dev-build/automake/Manifest
index 4615755567b2..c812db88f4a6 100644
--- a/dev-build/automake/Manifest
+++ b/dev-build/automake/Manifest
@@ -6,10 +6,11 @@ AUX automake-1.16.5-fix-instmany-python.sh-test.patch 676 BLAKE2B b4368612ef22de
 AUX automake-1.16.5-fix-py-compile-basedir.sh-test.patch 1084 BLAKE2B 12cef1fb8287ae77a180611d8f8bfa18da1e7cb6e473bcc7b55a4b01ee7ee052863ce156820916b08a193d0b1e2c85580bcd68301c3780865c08d5b274f3af0a SHA512 ef9af5b799c0f7341dfeac5358a05dbcc7547e1d98661e37185b3b3d24971c8db690e9ddf0b471db96254c44ff4ce878c7951e5b5afe96942d5ce21f998ba294
 AUX automake-1.16.5-parallel-build.patch 2142 BLAKE2B 68f6664b563f07d7d3a4abcee006955f5fab4611834be80ba856a70a1d2a58d848abacfe259c0dbf7b60945d52b8fab90b538d0054145001b8ac446c2d2ea749 SHA512 1128cbd5766658258c164825a49f7cd03362187640102c1f581ecb3d1552408b22677deaf5dd538d1527dbfcac658545d786637c252a595fb81ceb7c10f82492
 AUX automake-1.16.5-py3-compile.patch 2517 BLAKE2B 35ba0af05e84c632b1e2b0e68376316b1ae3eb190521243fd02b3a78d9c13c2fd2853e052af214da8a6fc8139745bbf5f55af34ec5d00a39a99623fbc72c57f4 SHA512 50d7c7f36762abc148a692198da437394890f85ff1c2820c03d5120fbb351253b245e47e6e1b0f8a9a4f532f4e92c3e11524a3d24a9626b7eaa6c7f94216990d
+AUX automake-1.16.5-py312.patch 1102 BLAKE2B 31b63e6945e1c1b731cd27bd3108269baf0fcddc6862b9a06cb3008eb2155fd44f9f602601387785f8b1d50e13881ae1bfa6086acfef11a9b9e34f81d3b916f9 SHA512 c5747b466141d885650932a741499c5140e3d9fa1bcd0343c615672fe4ae107b7d6d3b8b7b3903a7d83faefd82ca3d79cb9f7a1e745d360ec03d89ac0591cd23
 DIST automake-1.11.6.tar.xz 1092908 BLAKE2B 17254d81d6920c32aa877b6c892025de8e4060b8bcbe50fff841ada513dd462ddde8fc6838b4976098a812f8fda047e7186cb62cea8175df615dde75a9959144 SHA512 6e4cdf69f07734954f770fd4a7211a8c9dc69fe25a7746bd3c1e01d3139c94cab2900399e87371548833e99687e0d2b59c5e746ab2fdfbc7d47f2c1d439137ba
 DIST automake-1.16.5-tests-c99.patch.xz 7176 BLAKE2B 1fa1d3a499bacc5da9ee9d8ea6cb63d9ab91646a708a53d9bb08eef65fe02a6ab34ff95737042348ea7572bd70c6c7467e260d9441239a00c3571d25d73085f0 SHA512 0065b809219257cbce3c6f6f88459b91a5a29272e0027698e06246181357ffe8d5d40057086438f891d821836441a5a96f2568d52dcd3b5acb80e4d4968cbaf9
 DIST automake-1.16.5.tar.xz 1601740 BLAKE2B 87408abc57e1d4317a2b518fb3606d0f6d156522e7333016dd84747cd8922f27ef7fcc93220b11f794ce52bf8fd9a788d0166a4d1964d7c283905f269977ac7c SHA512 3084ae543aa3fb5a05104ffb2e66cfa9a53080f2343c44809707fd648516869511500dba50dae67ff10f92a1bf3b5a92b2a0fa01cda30adb69b9da03994d9d88
 EBUILD automake-1.11.6-r4.ebuild 2205 BLAKE2B aaa67917d5b192613f8ad1584f9b4beef2c69ee2433db94dbc289d5fb6791f41f2762e6f088ef4a2456e39c2448de97c61bfc5c84c247581802fc122307e2931 SHA512 697e10303e70987f1d5be84775b191e0b6e95b761a408f06c754398fc73e548a01c0f83a8d89b778499f1a9f9a36f84d0c1ca5b858c22591f95c05d279574f38
-EBUILD automake-1.16.5-r2.ebuild 3759 BLAKE2B 5917d198be66399c9624a39950a1720330101571dd264edf93fc155a722243c2f662515865ee8809f225ec63aa96bb600d06fecbe0dcae5b55e7e046122bbd6c SHA512 b705e0811569f8108eb857ef95abf67c0ef731a22d6a476d691b73693398d6babffbc320b2adf8f02ce6ea04844b28034d67f97d6439772e234f94ef4c22eff5
+EBUILD automake-1.16.5-r2.ebuild 3799 BLAKE2B 5df0de857161e1c32a674984f7990549a6e774c6c9b6d74733d1e43f8fa0e8d615218b12ed179ba35a8727f4449238321a092a735edea3ef64f1a9fe1d81156c SHA512 596dedc07aceff1d887e5c068f59d470c34f2ed1f06e8f6959c63df91a8b6409b111fbf6e0dbf33874a1cf68987b82feaf37abf5f7e9e249388d21d8c4a25497
 EBUILD automake-9999.ebuild 3315 BLAKE2B 6c637905a158c864885f1d5a6e3a6eac6e36dddbc2410c5e865b775c1c1ab55ceac72819290a87bafa26966f23e5a27ba3d62cba03629189f2f4ed9e28c497da SHA512 7912f410dbf56bc14897680bf287a14e42bec1a6873ed4605552d471886e294f5a1a4a7c327df5ba59c4c81c3279eaa5834bd1a7363e9db650988361ee540a4b
 MISC metadata.xml 363 BLAKE2B 7cbff34d075f5fb5d8391bbc978f9236a6aa1903a697fac7bc52bdf98baebf7053ad4fb4231f4d2b327decce840e47fccf11a28411e9cd12647fa5ab7698f0f5 SHA512 c40b7d0d1986ac70deafd644669caa695279b4bba94b2bd5ab9a9dc8c14cb246b83dc6f19811210559fb9e0e85c7703a2599d910c8fe7a31bff01be10f6dfed7
diff --git a/dev-build/automake/automake-1.16.5-r2.ebuild b/dev-build/automake/automake-1.16.5-r2.ebuild
index ce41b4760596..d4553e58b66f 100644
--- a/dev-build/automake/automake-1.16.5-r2.ebuild
+++ b/dev-build/automake/automake-1.16.5-r2.ebuild
@@ -8,7 +8,7 @@ EAPI=7
 # on new automake (major) releases, as well as the dependency in RDEPEND below too.
 # * Update _WANT_AUTOMAKE and _automake_atom case statement in autotools.eclass.
 
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit python-any-r1
 
@@ -69,6 +69,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.16.5-fix-py-compile-basedir.sh-test.patch
 	"${FILESDIR}"/${PN}-1.16.5-apostrophe-in-tests.patch
 	"${FILESDIR}"/${PN}-1.16.5-parallel-build.patch
+	"${FILESDIR}"/${PN}-1.16.5-py312.patch
 	"${WORKDIR}"/${PN}-1.16.5-tests-c99.patch
 )
 
diff --git a/dev-build/automake/files/automake-1.16.5-py312.patch b/dev-build/automake/files/automake-1.16.5-py312.patch
new file mode 100644
index 000000000000..124403f1db2b
--- /dev/null
+++ b/dev-build/automake/files/automake-1.16.5-py312.patch
@@ -0,0 +1,34 @@
+https://git.savannah.gnu.org/cgit/automake.git/commit/?id=f1112a88d2361eb2ba5cedf49995ac75879059d9
+
+From f1112a88d2361eb2ba5cedf49995ac75879059d9 Mon Sep 17 00:00:00 2001
+From: Bogdan <bogdro_rep@gmx.us>
+Date: Sun, 28 Jan 2024 18:12:50 -0800
+Subject: [PATCH] test: another check for PEP-3147 induced by Python 3.12.1.
+
+Fix for more of https://bugs.gnu.org/68119.
+
+* t/ax/am-test-lib.sh (python_has_pep3147) <am_pep3147_tag>:
+check sys.implementation.cache_tag as well as the (old)
+imp.get_tag. For Python 3.12.1.
+---
+ t/ax/am-test-lib.sh | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/t/ax/am-test-lib.sh b/t/ax/am-test-lib.sh
+index fbbb79005..d61fd6662 100644
+--- a/t/ax/am-test-lib.sh
++++ b/t/ax/am-test-lib.sh
+@@ -635,6 +635,10 @@ python_has_pep3147 ()
+     am_pep3147_tag=$($PYTHON -c 'import imp; print(imp.get_tag())') \
+       || am_pep3147_tag=none
+   fi
++  if test "$am_pep3147_tag" = "none"; then
++    am_pep3147_tag=$($PYTHON -c 'import sys; print(sys.implementation.cache_tag)') \
++      || am_pep3147_tag=none
++  fi
+   test $am_pep3147_tag != none
+ }
+ am_pep3147_tag=
+-- 
+2.44.0
+