9 files changed, 30 insertions, 9 deletions
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index d256bf3e8c03..c5ef9eb94983 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/pypy/Manifest b/dev-lang/pypy/Manifest
index f6826af68cc7..421c9c74cc00 100644
--- a/dev-lang/pypy/Manifest
+++ b/dev-lang/pypy/Manifest
@@ -12,5 +12,5 @@ EBUILD pypy-2.7.7.3.17.ebuild 7390 BLAKE2B b840b2c94b60e9d39aae7d5062c56f398428e
 EBUILD pypy-2.7.7.3.19.ebuild 7392 BLAKE2B 4b35786d65011016b75f0e173c047582b025d4f7f89f9f86e2c7fd7dcfb388b77a31f6f515393a47101756999ee495b7620de43c4275732d221ba964b066c412 SHA512 45baadb55e445268f792ff4bf75d40e611482e5c68635e411266d10c899de08d784e4ec6137a951b7e43ad9e2c2aae2f5c1818d686cfeba684bf07acbfba8c34
 EBUILD pypy-3.10.7.3.17_p4.ebuild 7140 BLAKE2B db6bfe1c3d44cdf9f4a1639c6bf8e35253c0ac3687f3a1315bfd52ca82c4a6fa0c3626c2aad938f8bcf2b2b6851db6fa1ed5f1847a891a08800040e0e4c27ea4 SHA512 efe64c07cfbdcb2fafbbbb93adeda1fd3ba22164130cb908d8bf26d0d82713fca179463f44673fb262573dca96a468573b53e67ab97d3f51563e23888afadfff
 EBUILD pypy-3.10.7.3.19_p1.ebuild 7156 BLAKE2B a7fe73c92496bda2a55a45cea4cb8a22df0d736571c9e616d4852d06128259326b66961169f7241a40aad26df17e336234947f0cd50dc81061e0936f5def653a SHA512 c3faeb02451b5cf360df330446468da253201fe5e234f055bf627dbcd72aae47d59049dd38cfafc0fcbe8ddc3df7147625bbfef5a3061e8d5a54bea861d0334f
-EBUILD pypy-3.11.7.3.19_p4.ebuild 7092 BLAKE2B 8d4ae9c0cc4a63598eecf8b7235bb9b98564ba658046abeae26b63109a86d921e4e867eb373c592aa65ded09c725c341be4ca6f467794d7de2b1f8d9d7118cc5 SHA512 4a533c9c434bebd91c69d8389f9231c8760a9a57a25827720924459ee14737d5a29a481c9071c71b67c3c799180048e4ded046fcd8db39cec20ebff73fa7dc31
+EBUILD pypy-3.11.7.3.19_p4-r1.ebuild 7108 BLAKE2B 95193522904c4fbf328320216c44b325e81902bbe5e6e06a489ea32276342d6a4ad7812a150aafc1b549dff48c9e7608d4e6c9dc42d3648c4d17f86b5f6d1978 SHA512 837f0f743512358cd5d3b3ccd6a56f1893dbe660a8bf17cdb639ff25c2b4aa32cd1c9510ff1e6ea31d8074e1655d1042ee63cc3e058be167e73b9cc25f83521d
 MISC metadata.xml 1124 BLAKE2B f1d09d26175cf20d1440a9a83352cf6f2f2e514d35d95116caf4a5ee86547f0165a6369e7a6b129ded75d28ba5a0c1c8f4da7d664d7c1e3c1e95153593057b3c SHA512 ae95400c9a1efc75372201c2353b128302355d1d087094953d73c325fa72bc24662d31c7287ae6a2583448ac345bb60744ac19391e07f8da8ef0327627e0e462
diff --git a/dev-lang/pypy/pypy-3.11.7.3.19_p4.ebuild b/dev-lang/pypy/pypy-3.11.7.3.19_p4-r1.ebuild
index ac3e0a019236..1f0343dc478f 100644
--- a/dev-lang/pypy/pypy-3.11.7.3.19_p4.ebuild
+++ b/dev-lang/pypy/pypy-3.11.7.3.19_p4-r1.ebuild
@@ -96,7 +96,7 @@ src_compile() {
 	[[ ${soabi} == ${SLOT#*/} ]] || die "update subslot to ${soabi}"
 
 	# Add epython.py to the distribution
-	echo 'EPYTHON="pypy3"' > lib-python/3/epython.py || die
+	echo "EPYTHON=\"pypy${PYVER}\"" > lib-python/3/epython.py || die
 
 	einfo "Generating caches and CFFI modules ..."
 
@@ -230,7 +230,7 @@ src_install() {
 		dosym pypy${PYVER} /usr/bin/pypy3
 
 		# install symlinks for python-exec
-		local EPYTHON=pypy3
+		local EPYTHON=pypy${PYVER}
 		local scriptdir=${D}$(python_get_scriptdir)
 		mkdir -p "${scriptdir}" || die
 		ln -s "../../../bin/pypy3" "${scriptdir}/python3" || die
diff --git a/dev-lang/python-exec/Manifest b/dev-lang/python-exec/Manifest
index d0c20eef3199..f0e688896b7a 100644
--- a/dev-lang/python-exec/Manifest
+++ b/dev-lang/python-exec/Manifest
@@ -1,3 +1,3 @@
 DIST python-exec-2.4.10.tar.bz2 84412 BLAKE2B 1fe79e0d31a48954959a5556f96c3868fcf762ebc473d17f03e78a95cca83ab40b4933b7e42bc5751b0546e6229f9fdde9171c3fcbdd184f993536f944870491 SHA512 8c7d3c6b1fa362c8c97ec74ee01b5a195dc409d883408033e9709773b6059deb5291f6e63df6d9a4e42a0951aad4a1d513d4baa00ad9ff3dce3e1d2d38b694e1
-EBUILD python-exec-2.4.10.ebuild 2030 BLAKE2B e1631288db4f6ba2b1e97124bce5c812cb6f8fe22d9b3a5f642bc059b4da8c3303376b6adf394d8d213ab02842fb825bb77f77f8f98c7c3d7ff930d04f1de79b SHA512 2dec08a49011399e4f130df622444965aa137a88ab9bd57a8b63af6245201d055e0f010994c72c28e3669d32a023a244e786e45be74f24405e0a0d1d815e5374
+EBUILD python-exec-2.4.10.ebuild 2039 BLAKE2B f6cb952914cd05e979f80757773b953696ff097da8bdb16f28aacadd5ba5326927d196ae996559669dea31ddf5624cefe55ff231721887c8cea1cd4d5c2117d5 SHA512 b4214090990a4dc30cf5951c4f487ed226d321ae18d444ba8dac44ec86165e1c4915c4835d342ecd602c2a3750b64e64cf28ad5e55ce4d826898d4e890954603
 MISC metadata.xml 792 BLAKE2B 523252765f0c1aeb4986e5f2acae02959e040cb7f9586f3b4391db730e1fcee3297dafbf05850cf2a6cbce34ab5168bbc965c2dd680b240f944b8199013ad914 SHA512 da707d555bc3f0c2d70a1fe3700c427091c3ca5e12c812714d5f3e13a518b5986bfd6a219820e35223e848e88098df81f5e4c80de33146ee3b273048e83c0521
diff --git a/dev-lang/python-exec/python-exec-2.4.10.ebuild b/dev-lang/python-exec/python-exec-2.4.10.ebuild
index b6be8d00291c..af542129b696 100644
--- a/dev-lang/python-exec/python-exec-2.4.10.ebuild
+++ b/dev-lang/python-exec/python-exec-2.4.10.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..13} pypy3 )
+PYTHON_COMPAT=( python3_{10..13} pypy3 pypy3_11 )
 
 inherit python-any-r1
 
diff --git a/dev-lang/uasm/Manifest b/dev-lang/uasm/Manifest
index ab271fa1a1c2..df4ef1e5726e 100644
--- a/dev-lang/uasm/Manifest
+++ b/dev-lang/uasm/Manifest
@@ -1,8 +1,9 @@
+AUX bool-fix.diff 460 BLAKE2B cd05fd13d6ca1403c689b91399bcca57b07d5e722d5741e8564b66809cc342dcabea0a64d657996910f6202895e61f109c1c2a4184943343895ad456af68ede0 SHA512 527d5012593fecdaaebf381120593b910f1d50507f4359b9f142da80f53c4803a75adc4627f720b835c1bc769bf3da1a1ef3a72ad995bdd524846bb8bf26e66b
 AUX build-fix.patch 4867 BLAKE2B 5f2058888b7014bae9fa014307aabcf07d6e802e215c996cc21e6575ae6b557b2a42f381b41b9f64abdaeab29caee9a3dc61b378b183f095b668da9e43010d39 SHA512 e5e22c4f0582a34f2528227cc757507b9348f641da73798f4d6488714edd83686242d4469b35ab706894a11c7765b392a518150106007b32bb4cffdb05cd1b22
 AUX makefile-dep-fix-2.57.patch 587 BLAKE2B 22d2689d341dee5781e0512eebcb0de3e88219927100ca168ea07934cbb3b2ee76b05a8743408877622b2f5038596ba2f2309046d2a2fd6cf4e3f5fe19ec5593 SHA512 efa90fcfcd7f30a74194f71aacf9d98cc101ee5915f85ba88df751a7b72697bd34ee94e09ceb354a443f70080f83df2efa07e8047f148dbb2664a2df1341bf6a
 AUX makefile-dep-fix.patch 543 BLAKE2B 3cc4a42448983442d1d39743d3757f8f3df80b0507036dce4204c43a199bc11d510ce165adbaa16c6e381813fbf4096dff4121456fcb653acf46a177f605ed86 SHA512 2f885cda5c583e1e5458c3da9f0c2c6755681f8e182d01ae575fb54f1ee37fa73edd768b78c9e013a4e051aed6b1cfc3f944ef34732c85de18075d4febd81931
 DIST uasm-2.56.2.tar.gz 1243830 BLAKE2B dcc0948d92cdd5972a6698e721a6ccc6a54926ef94778438cf9a88a6e41ebc652d5230003f689d4278bd1e48959dd04595c602427287a48c551d7b847be665f0 SHA512 1f6c1037909d012f3293985c4e0516f4b61497de23cac6bbb58db735efb512599c0bba5d60d8ce999e6afc57e44484a094bf10f0ee185a51afd826f5541c9337
 DIST uasm-2.57.tar.gz 1240492 BLAKE2B 65f3eda6519ecbf2b03c258751f131a48ba55fe558988bc24cddfe2f033cac5a0d79375a74813b825345474a8f0f5f7dd90c7d2fb1cb8b85c6ad23c70ec4f96e SHA512 588c158b34e0fc538f08a859822549fbd2e1f8548102bbbdea7099281ffaaf41b6d56f4f07f7333a7d714acbd6271b504dde2b24ad2e9790e93e78e6e516caa0
-EBUILD uasm-2.56.2.ebuild 941 BLAKE2B 18ac91415ba558f88e4d92d4c003c6004576002d6e98bc6839ca73ecc554879d8b8d62943ebfff3431fb3f314e7419093357e710982d3b1f86bb4362fb1adc65 SHA512 5a73e7a1c5ebdcf92f891054d615e49a6fb89c21c10293d7b38b49cc5dfdd24b149cdfd355b02b7f6944a45fd6c55b419caad27e4dad535fde34371310966a24
-EBUILD uasm-2.57.ebuild 1046 BLAKE2B ab2bb2adbd1d1fcd9606c495065d447471f9c3ad5fb5ed255d692ab2504bb4bc807938b67c23750e9a23a3506a2edea49bbd9978c8fbf4121d986702579e0227 SHA512 b5094025d66c1e82a9c72624280158b6553c62a3ab427c797186d0fa5e5dedc50f7d901dfb5b42c6aa0a03d82230541e12b0a1437aebfadaa1ceba5a02c8fcb9
+EBUILD uasm-2.56.2.ebuild 975 BLAKE2B 0669a1f50f53a85673135b2121152f8750c54fda8d98cc1a69e8c50c90940992f752b0d1a77b849354f83fe45cc8105641cff6bd8ab58dd8e966d4d8c9296253 SHA512 b44696b6d094c33f0100da38111d91268ffaa5cd56d772593b0335a4959b3baed7ae8bdd8bec2adb1fe01f402de28e1c6713d574395fd978cebd43109ef64637
+EBUILD uasm-2.57.ebuild 1075 BLAKE2B 665ebcc83bc24dc8bc397f3d65c0a25172562e4484a19605d4628ee641b81d6d57e84f303befe98e0369a9551a7c2021f580a034f32164353144d8d6c184a8a1 SHA512 91e1d88fef1b1f7fa5f918a9bdde405b2f40d2cd72f5b5ad18ec8553c383f2c73ad3685352eca141cbc1968213e3f13d24f299ff5b884ad7fa372fd775e000fa
 MISC metadata.xml 521 BLAKE2B c50616e7b6f6df5a3af6d3d0c72dd2d4dc4bbaa87eb525a0ec9af8b46ef913e710c97d3db01cacc42549175e6e8d20bbd557c24b789bf820f210b5c22e087d2f SHA512 213adb4bef7d55ec9369e7c09f83413d8b076d68524abb5cf52338a15ad99da534b97797128d5a5ac6d2460a03cf3c2f070baf27cfdb4cf70358f458141a8fd0
diff --git a/dev-lang/uasm/files/bool-fix.diff b/dev-lang/uasm/files/bool-fix.diff
new file mode 100644
index 000000000000..6071a0d42ba9
--- /dev/null
+++ b/dev-lang/uasm/files/bool-fix.diff
@@ -0,0 +1,18 @@
+https://bugs.gentoo.org/944192
+
+diff --git a/H/bool.h b/H/bool.h
+index fbf55c8..ddb7396 100644
+--- a/H/bool.h
++++ b/H/bool.h
+@@ -30,10 +30,7 @@
+ ****************************************************************************/
+ 
+ 
+-#if !defined( BOOL_DEFINED )  &&  !defined( bool ) && !(__WATCOMC__ >= 1070 && defined(__cplusplus))
+-    #define BOOL_DEFINED
+-    typedef unsigned char bool;
+-#endif
++#include <stdbool.h>
+ #ifndef TRUE
+     #define TRUE 1
+ #endif
diff --git a/dev-lang/uasm/uasm-2.56.2.ebuild b/dev-lang/uasm/uasm-2.56.2.ebuild
index 5a0d38620ed2..71f4e7f3518f 100644
--- a/dev-lang/uasm/uasm-2.56.2.ebuild
+++ b/dev-lang/uasm/uasm-2.56.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2024 Gentoo Authors
+# Copyright 2024-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -16,6 +16,7 @@ KEYWORDS="amd64"
 PATCHES=(
 	"${FILESDIR}/build-fix.patch"
 	"${FILESDIR}/makefile-dep-fix.patch"
+	"${FILESDIR}/bool-fix.diff"
 )
 
 src_prepare() {
diff --git a/dev-lang/uasm/uasm-2.57.ebuild b/dev-lang/uasm/uasm-2.57.ebuild
index bb8e70dfc0ff..4aff172e02f6 100644
--- a/dev-lang/uasm/uasm-2.57.ebuild
+++ b/dev-lang/uasm/uasm-2.57.ebuild
@@ -17,6 +17,7 @@ KEYWORDS="~amd64"
 PATCHES=(
 	"${FILESDIR}/build-fix.patch"
 	"${FILESDIR}/makefile-dep-fix-2.57.patch"
+	"${FILESDIR}/bool-fix.diff"
 )
 
 src_prepare() {