Update pypy

[yosifkit]

Changes:

• docker-library/pypy@b1bf196: Merge pull request Add Debian Trixie (remove Bullseye) pypy#92 from infosiftr/trixie
• docker-library/pypy@8908818: Add Debian Trixie (remove Bullseye)

[github-actions]

Diff for 47101a2:

diff --git a/_bashbrew-cat b/_bashbrew-cat
index e412112..9c5ed8b 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -2,25 +2,25 @@ Maintainers: Tianon Gravi <[email protected]> (@tianon), Joseph Ferguson <yosi
 GitRepo: https://github.com/docker-library/pypy.git
 
 Tags: 2.7-7.3.20-bookworm, 2.7-7.3-bookworm, 2.7-7-bookworm, 2.7-bookworm, 2-7.3.20-bookworm, 2-7.3-bookworm, 2-7-bookworm, 2-bookworm
-SharedTags: 2.7-7.3.20, 2.7-7.3, 2.7-7, 2.7, 2-7.3.20, 2-7.3, 2-7, 2
 Architectures: amd64, arm64v8, i386
-GitCommit: 29ecc5a68bdd0a4643ca2b5495956f541a3ceb72
+GitCommit: 8908818e3c253a09864223f7c148db765684135f
 Directory: 2.7/bookworm
 
-Tags: 2.7-7.3.20-bullseye, 2.7-7.3-bullseye, 2.7-7-bullseye, 2.7-bullseye, 2-7.3.20-bullseye, 2-7.3-bullseye, 2-7-bullseye, 2-bullseye
+Tags: 2.7-7.3.20-slim, 2.7-7.3-slim, 2.7-7-slim, 2.7-slim, 2-7.3.20-slim, 2-7.3-slim, 2-7-slim, 2-slim, 2.7-7.3.20-slim-trixie, 2.7-7.3-slim-trixie, 2.7-7-slim-trixie, 2.7-slim-trixie, 2-7.3.20-slim-trixie, 2-7.3-slim-trixie, 2-7-slim-trixie, 2-slim-trixie
 Architectures: amd64, arm64v8, i386
-GitCommit: 29ecc5a68bdd0a4643ca2b5495956f541a3ceb72
-Directory: 2.7/bullseye
+GitCommit: 8908818e3c253a09864223f7c148db765684135f
+Directory: 2.7/slim-trixie
 
-Tags: 2.7-7.3.20-slim, 2.7-7.3-slim, 2.7-7-slim, 2.7-slim, 2-7.3.20-slim, 2-7.3-slim, 2-7-slim, 2-slim, 2.7-7.3.20-slim-bookworm, 2.7-7.3-slim-bookworm, 2.7-7-slim-bookworm, 2.7-slim-bookworm, 2-7.3.20-slim-bookworm, 2-7.3-slim-bookworm, 2-7-slim-bookworm, 2-slim-bookworm
+Tags: 2.7-7.3.20-slim-bookworm, 2.7-7.3-slim-bookworm, 2.7-7-slim-bookworm, 2.7-slim-bookworm, 2-7.3.20-slim-bookworm, 2-7.3-slim-bookworm, 2-7-slim-bookworm, 2-slim-bookworm
 Architectures: amd64, arm64v8, i386
-GitCommit: 29ecc5a68bdd0a4643ca2b5495956f541a3ceb72
+GitCommit: 8908818e3c253a09864223f7c148db765684135f
 Directory: 2.7/slim-bookworm
 
-Tags: 2.7-7.3.20-slim-bullseye, 2.7-7.3-slim-bullseye, 2.7-7-slim-bullseye, 2.7-slim-bullseye, 2-7.3.20-slim-bullseye, 2-7.3-slim-bullseye, 2-7-slim-bullseye, 2-slim-bullseye
+Tags: 2.7-7.3.20-trixie, 2.7-7.3-trixie, 2.7-7-trixie, 2.7-trixie, 2-7.3.20-trixie, 2-7.3-trixie, 2-7-trixie, 2-trixie
+SharedTags: 2.7-7.3.20, 2.7-7.3, 2.7-7, 2.7, 2-7.3.20, 2-7.3, 2-7, 2
 Architectures: amd64, arm64v8, i386
-GitCommit: 29ecc5a68bdd0a4643ca2b5495956f541a3ceb72
-Directory: 2.7/slim-bullseye
+GitCommit: 8908818e3c253a09864223f7c148db765684135f
+Directory: 2.7/trixie
 
 Tags: 2.7-7.3.20-windowsservercore-ltsc2022, 2.7-7.3-windowsservercore-ltsc2022, 2.7-7-windowsservercore-ltsc2022, 2.7-windowsservercore-ltsc2022, 2-7.3.20-windowsservercore-ltsc2022, 2-7.3-windowsservercore-ltsc2022, 2-7-windowsservercore-ltsc2022, 2-windowsservercore-ltsc2022
 SharedTags: 2.7-7.3.20, 2.7-7.3, 2.7-7, 2.7, 2-7.3.20, 2-7.3, 2-7, 2, 2.7-7.3.20-windowsservercore, 2.7-7.3-windowsservercore, 2.7-7-windowsservercore, 2.7-windowsservercore, 2-7.3.20-windowsservercore, 2-7.3-windowsservercore, 2-7-windowsservercore, 2-windowsservercore
@@ -37,16 +37,26 @@ Directory: 2.7/windows/windowsservercore-ltsc2025
 Constraints: windowsservercore-ltsc2025
 
 Tags: 3.11-7.3.20-bookworm, 3.11-7.3-bookworm, 3.11-7-bookworm, 3.11-bookworm, 3-7.3.20-bookworm, 3-7.3-bookworm, 3-7-bookworm, 3-bookworm, bookworm
-SharedTags: 3.11-7.3.20, 3.11-7.3, 3.11-7, 3.11, 3-7.3.20, 3-7.3, 3-7, 3, latest
 Architectures: amd64, arm64v8, i386
-GitCommit: b32ca0567b9856e21c607610254748a24439a956
+GitCommit: 8908818e3c253a09864223f7c148db765684135f
 Directory: 3.11/bookworm
 
-Tags: 3.11-7.3.20-slim, 3.11-7.3-slim, 3.11-7-slim, 3.11-slim, 3-7.3.20-slim, 3-7.3-slim, 3-7-slim, 3-slim, slim, 3.11-7.3.20-slim-bookworm, 3.11-7.3-slim-bookworm, 3.11-7-slim-bookworm, 3.11-slim-bookworm, 3-7.3.20-slim-bookworm, 3-7.3-slim-bookworm, 3-7-slim-bookworm, 3-slim-bookworm, slim-bookworm
+Tags: 3.11-7.3.20-slim, 3.11-7.3-slim, 3.11-7-slim, 3.11-slim, 3-7.3.20-slim, 3-7.3-slim, 3-7-slim, 3-slim, slim, 3.11-7.3.20-slim-trixie, 3.11-7.3-slim-trixie, 3.11-7-slim-trixie, 3.11-slim-trixie, 3-7.3.20-slim-trixie, 3-7.3-slim-trixie, 3-7-slim-trixie, 3-slim-trixie, slim-trixie
 Architectures: amd64, arm64v8, i386
-GitCommit: b32ca0567b9856e21c607610254748a24439a956
+GitCommit: 8908818e3c253a09864223f7c148db765684135f
+Directory: 3.11/slim-trixie
+
+Tags: 3.11-7.3.20-slim-bookworm, 3.11-7.3-slim-bookworm, 3.11-7-slim-bookworm, 3.11-slim-bookworm, 3-7.3.20-slim-bookworm, 3-7.3-slim-bookworm, 3-7-slim-bookworm, 3-slim-bookworm, slim-bookworm
+Architectures: amd64, arm64v8, i386
+GitCommit: 8908818e3c253a09864223f7c148db765684135f
 Directory: 3.11/slim-bookworm
 
+Tags: 3.11-7.3.20-trixie, 3.11-7.3-trixie, 3.11-7-trixie, 3.11-trixie, 3-7.3.20-trixie, 3-7.3-trixie, 3-7-trixie, 3-trixie, trixie
+SharedTags: 3.11-7.3.20, 3.11-7.3, 3.11-7, 3.11, 3-7.3.20, 3-7.3, 3-7, 3, latest
+Architectures: amd64, arm64v8, i386
+GitCommit: 8908818e3c253a09864223f7c148db765684135f
+Directory: 3.11/trixie
+
 Tags: 3.11-7.3.20-windowsservercore-ltsc2022, 3.11-7.3-windowsservercore-ltsc2022, 3.11-7-windowsservercore-ltsc2022, 3.11-windowsservercore-ltsc2022, 3-7.3.20-windowsservercore-ltsc2022, 3-7.3-windowsservercore-ltsc2022, 3-7-windowsservercore-ltsc2022, 3-windowsservercore-ltsc2022, windowsservercore-ltsc2022
 SharedTags: 3.11-7.3.20, 3.11-7.3, 3.11-7, 3.11, 3-7.3.20, 3-7.3, 3-7, 3, latest, 3.11-7.3.20-windowsservercore, 3.11-7.3-windowsservercore, 3.11-7-windowsservercore, 3.11-windowsservercore, 3-7.3.20-windowsservercore, 3-7.3-windowsservercore, 3-7-windowsservercore, 3-windowsservercore, windowsservercore
 Architectures: windows-amd64
diff --git a/_bashbrew-list b/_bashbrew-list
index aeda99e..5aec244 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,72 +1,72 @@
 pypy:2
 pypy:2-7
 pypy:2-7-bookworm
-pypy:2-7-bullseye
 pypy:2-7-slim
 pypy:2-7-slim-bookworm
-pypy:2-7-slim-bullseye
+pypy:2-7-slim-trixie
+pypy:2-7-trixie
 pypy:2-7-windowsservercore
 pypy:2-7-windowsservercore-ltsc2022
 pypy:2-7-windowsservercore-ltsc2025
 pypy:2-7.3
 pypy:2-7.3-bookworm
-pypy:2-7.3-bullseye
 pypy:2-7.3-slim
 pypy:2-7.3-slim-bookworm
-pypy:2-7.3-slim-bullseye
+pypy:2-7.3-slim-trixie
+pypy:2-7.3-trixie
 pypy:2-7.3-windowsservercore
 pypy:2-7.3-windowsservercore-ltsc2022
 pypy:2-7.3-windowsservercore-ltsc2025
 pypy:2-7.3.20
 pypy:2-7.3.20-bookworm
-pypy:2-7.3.20-bullseye
 pypy:2-7.3.20-slim
 pypy:2-7.3.20-slim-bookworm
-pypy:2-7.3.20-slim-bullseye
+pypy:2-7.3.20-slim-trixie
+pypy:2-7.3.20-trixie
 pypy:2-7.3.20-windowsservercore
 pypy:2-7.3.20-windowsservercore-ltsc2022
 pypy:2-7.3.20-windowsservercore-ltsc2025
 pypy:2-bookworm
-pypy:2-bullseye
 pypy:2-slim
 pypy:2-slim-bookworm
-pypy:2-slim-bullseye
+pypy:2-slim-trixie
+pypy:2-trixie
 pypy:2-windowsservercore
 pypy:2-windowsservercore-ltsc2022
 pypy:2-windowsservercore-ltsc2025
 pypy:2.7
 pypy:2.7-7
 pypy:2.7-7-bookworm
-pypy:2.7-7-bullseye
 pypy:2.7-7-slim
 pypy:2.7-7-slim-bookworm
-pypy:2.7-7-slim-bullseye
+pypy:2.7-7-slim-trixie
+pypy:2.7-7-trixie
 pypy:2.7-7-windowsservercore
 pypy:2.7-7-windowsservercore-ltsc2022
 pypy:2.7-7-windowsservercore-ltsc2025
 pypy:2.7-7.3
 pypy:2.7-7.3-bookworm
-pypy:2.7-7.3-bullseye
 pypy:2.7-7.3-slim
 pypy:2.7-7.3-slim-bookworm
-pypy:2.7-7.3-slim-bullseye
+pypy:2.7-7.3-slim-trixie
+pypy:2.7-7.3-trixie
 pypy:2.7-7.3-windowsservercore
 pypy:2.7-7.3-windowsservercore-ltsc2022
 pypy:2.7-7.3-windowsservercore-ltsc2025
 pypy:2.7-7.3.20
 pypy:2.7-7.3.20-bookworm
-pypy:2.7-7.3.20-bullseye
 pypy:2.7-7.3.20-slim
 pypy:2.7-7.3.20-slim-bookworm
-pypy:2.7-7.3.20-slim-bullseye
+pypy:2.7-7.3.20-slim-trixie
+pypy:2.7-7.3.20-trixie
 pypy:2.7-7.3.20-windowsservercore
 pypy:2.7-7.3.20-windowsservercore-ltsc2022
 pypy:2.7-7.3.20-windowsservercore-ltsc2025
 pypy:2.7-bookworm
-pypy:2.7-bullseye
 pypy:2.7-slim
 pypy:2.7-slim-bookworm
-pypy:2.7-slim-bullseye
+pypy:2.7-slim-trixie
+pypy:2.7-trixie
 pypy:2.7-windowsservercore
 pypy:2.7-windowsservercore-ltsc2022
 pypy:2.7-windowsservercore-ltsc2025
@@ -75,6 +75,8 @@ pypy:3-7
 pypy:3-7-bookworm
 pypy:3-7-slim
 pypy:3-7-slim-bookworm
+pypy:3-7-slim-trixie
+pypy:3-7-trixie
 pypy:3-7-windowsservercore
 pypy:3-7-windowsservercore-ltsc2022
 pypy:3-7-windowsservercore-ltsc2025
@@ -82,6 +84,8 @@ pypy:3-7.3
 pypy:3-7.3-bookworm
 pypy:3-7.3-slim
 pypy:3-7.3-slim-bookworm
+pypy:3-7.3-slim-trixie
+pypy:3-7.3-trixie
 pypy:3-7.3-windowsservercore
 pypy:3-7.3-windowsservercore-ltsc2022
 pypy:3-7.3-windowsservercore-ltsc2025
@@ -89,12 +93,16 @@ pypy:3-7.3.20
 pypy:3-7.3.20-bookworm
 pypy:3-7.3.20-slim
 pypy:3-7.3.20-slim-bookworm
+pypy:3-7.3.20-slim-trixie
+pypy:3-7.3.20-trixie
 pypy:3-7.3.20-windowsservercore
 pypy:3-7.3.20-windowsservercore-ltsc2022
 pypy:3-7.3.20-windowsservercore-ltsc2025
 pypy:3-bookworm
 pypy:3-slim
 pypy:3-slim-bookworm
+pypy:3-slim-trixie
+pypy:3-trixie
 pypy:3-windowsservercore
 pypy:3-windowsservercore-ltsc2022
 pypy:3-windowsservercore-ltsc2025
@@ -103,6 +111,8 @@ pypy:3.11-7
 pypy:3.11-7-bookworm
 pypy:3.11-7-slim
 pypy:3.11-7-slim-bookworm
+pypy:3.11-7-slim-trixie
+pypy:3.11-7-trixie
 pypy:3.11-7-windowsservercore
 pypy:3.11-7-windowsservercore-ltsc2022
 pypy:3.11-7-windowsservercore-ltsc2025
@@ -110,6 +120,8 @@ pypy:3.11-7.3
 pypy:3.11-7.3-bookworm
 pypy:3.11-7.3-slim
 pypy:3.11-7.3-slim-bookworm
+pypy:3.11-7.3-slim-trixie
+pypy:3.11-7.3-trixie
 pypy:3.11-7.3-windowsservercore
 pypy:3.11-7.3-windowsservercore-ltsc2022
 pypy:3.11-7.3-windowsservercore-ltsc2025
@@ -117,12 +129,16 @@ pypy:3.11-7.3.20
 pypy:3.11-7.3.20-bookworm
 pypy:3.11-7.3.20-slim
 pypy:3.11-7.3.20-slim-bookworm
+pypy:3.11-7.3.20-slim-trixie
+pypy:3.11-7.3.20-trixie
 pypy:3.11-7.3.20-windowsservercore
 pypy:3.11-7.3.20-windowsservercore-ltsc2022
 pypy:3.11-7.3.20-windowsservercore-ltsc2025
 pypy:3.11-bookworm
 pypy:3.11-slim
 pypy:3.11-slim-bookworm
+pypy:3.11-slim-trixie
+pypy:3.11-trixie
 pypy:3.11-windowsservercore
 pypy:3.11-windowsservercore-ltsc2022
 pypy:3.11-windowsservercore-ltsc2025
@@ -130,6 +146,8 @@ pypy:bookworm
 pypy:latest
 pypy:slim
 pypy:slim-bookworm
+pypy:slim-trixie
+pypy:trixie
 pypy:windowsservercore
 pypy:windowsservercore-ltsc2022
 pypy:windowsservercore-ltsc2025
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index 837236b..72a692c 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -1,10 +1,12 @@
 pypy:2-bookworm
-pypy:2-bullseye
 pypy:2-slim-bookworm
-pypy:2-slim-bullseye
+pypy:2-slim-trixie
+pypy:2-trixie
 pypy:2-windowsservercore-ltsc2022
 pypy:2-windowsservercore-ltsc2025
 pypy:bookworm
 pypy:slim-bookworm
+pypy:slim-trixie
+pypy:trixie
 pypy:windowsservercore-ltsc2022
 pypy:windowsservercore-ltsc2025
diff --git a/pypy_2-bookworm/Dockerfile b/pypy_2-bookworm/Dockerfile
index 6ea1cd4..86a146a 100644
--- a/pypy_2-bookworm/Dockerfile
+++ b/pypy_2-bookworm/Dockerfile
@@ -6,15 +6,6 @@
 
 FROM buildpack-deps:bookworm
 
-# runtime dependencies
-RUN set -eux; \
-	apt-get update; \
-	apt-get install -y --no-install-recommends \
-		tcl \
-		tk \
-	; \
-	rm -rf /var/lib/apt/lists/*
-
 # http://bugs.python.org/issue19846
 # > At the moment, setting "LANG=C" on a Linux system *fundamentally breaks Python 3*, and that's not OK.
 ENV LANG C.UTF-8
@@ -47,12 +38,9 @@ RUN set -eux; \
 	savedAptMark="$(apt-mark showmanual)"; \
 	apt-get update; \
 	apt-get install -y --no-install-recommends \
-# sometimes "pypy" itself is linked against libexpat1 / libncurses5, sometimes they're ".so" files in "/opt/pypy/lib_pypy"
-		libexpat1 \
-		libncurses5 \
-		libncursesw6 \
-		libsqlite3-0 \
-# (so we'll add them temporarily, then use "ldd" later to determine which to keep based on usage per architecture)
+# sometimes "pypy" (or associated .so files) has dynamic links to different system libraries
+# we install them here, and then use "ldd" further down to only keep what we actually need (which might even differ per architecture)
+		libfreetype6 \
 	; \
 	\
 	wget -O pypy.tar.bz2 "$url" --progress=dot:giga; \
@@ -69,11 +57,14 @@ RUN set -eux; \
 	\
 	apt-mark auto '.*' > /dev/null; \
 	[ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null; \
+	export shellPid="$$"; \
 	find /opt/pypy -type f -executable -exec ldd '{}' ';' \
-		| awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \
+		| grep -vE 'lib(tcl|tk|X[a-z]*)[0-9]*[.]' \
+		| awk '/not found/ { print >> "/dev/stderr"; system("kill -9 -$shellPid") } /=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1 || index(so, "/opt/pypy/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \
 		| sort -u \
-		| xargs -r dpkg-query --search \
-		| cut -d: -f1 \
+		| xargs -rt dpkg-query --search \
+# https://manpages.debian.org/bookworm/dpkg/dpkg-query.1.en.html#S (we ignore diversions and it'll be really unusual for more than one package to provide any given .so file)
+		| awk 'sub(":$", "", $1) { print $1 }' \
 		| sort -u \
 		| xargs -r apt-mark manual \
 	; \
diff --git a/pypy_2-slim-bookworm/Dockerfile b/pypy_2-slim-bookworm/Dockerfile
index f6feb2c..3b0093e 100644
--- a/pypy_2-slim-bookworm/Dockerfile
+++ b/pypy_2-slim-bookworm/Dockerfile
@@ -45,12 +45,9 @@ RUN set -eux; \
 	apt-get install -y --no-install-recommends \
 		bzip2 \
 		wget \
-# sometimes "pypy" itself is linked against libexpat1 / libncurses5, sometimes they're ".so" files in "/opt/pypy/lib_pypy"
-		libexpat1 \
-		libncurses5 \
-		libncursesw6 \
-		libsqlite3-0 \
-# (so we'll add them temporarily, then use "ldd" later to determine which to keep based on usage per architecture)
+# sometimes "pypy" (or associated .so files) has dynamic links to different system libraries
+# we install them here, and then use "ldd" further down to only keep what we actually need (which might even differ per architecture)
+		libfreetype6 \
 	; \
 	\
 	wget -O pypy.tar.bz2 "$url" --progress=dot:giga; \
@@ -67,11 +64,14 @@ RUN set -eux; \
 	\
 	apt-mark auto '.*' > /dev/null; \
 	[ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null; \
+	export shellPid="$$"; \
 	find /opt/pypy -type f -executable -exec ldd '{}' ';' \
-		| awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \
+		| grep -vE 'lib(tcl|tk|X[a-z]*)[0-9]*[.]' \
+		| awk '/not found/ { print >> "/dev/stderr"; system("kill -9 -$shellPid") } /=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1 || index(so, "/opt/pypy/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \
 		| sort -u \
-		| xargs -r dpkg-query --search \
-		| cut -d: -f1 \
+		| xargs -rt dpkg-query --search \
+# https://manpages.debian.org/bookworm/dpkg/dpkg-query.1.en.html#S (we ignore diversions and it'll be really unusual for more than one package to provide any given .so file)
+		| awk 'sub(":$", "", $1) { print $1 }' \
 		| sort -u \
 		| xargs -r apt-mark manual \
 	; \
diff --git a/pypy_2-slim-bullseye/Dockerfile b/pypy_2-slim-trixie/Dockerfile
similarity index 76%
rename from pypy_2-slim-bullseye/Dockerfile
rename to pypy_2-slim-trixie/Dockerfile
index 8e3b9d2..0f2bedb 100644
--- a/pypy_2-slim-bullseye/Dockerfile
+++ b/pypy_2-slim-trixie/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM debian:bullseye-slim
+FROM debian:trixie-slim
 
 RUN set -eux; \
 	apt-get update; \
@@ -45,12 +45,9 @@ RUN set -eux; \
 	apt-get install -y --no-install-recommends \
 		bzip2 \
 		wget \
-# sometimes "pypy" itself is linked against libexpat1 / libncurses5, sometimes they're ".so" files in "/opt/pypy/lib_pypy"
-		libexpat1 \
-		libncurses5 \
-		libncursesw6 \
-		libsqlite3-0 \
-# (so we'll add them temporarily, then use "ldd" later to determine which to keep based on usage per architecture)
+# sometimes "pypy" (or associated .so files) has dynamic links to different system libraries
+# we install them here, and then use "ldd" further down to only keep what we actually need (which might even differ per architecture)
+		libfreetype6 \
 	; \
 	\
 	wget -O pypy.tar.bz2 "$url" --progress=dot:giga; \
@@ -67,11 +64,14 @@ RUN set -eux; \
 	\
 	apt-mark auto '.*' > /dev/null; \
 	[ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null; \
+	export shellPid="$$"; \
 	find /opt/pypy -type f -executable -exec ldd '{}' ';' \
-		| awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \
+		| grep -vE 'lib(tcl|tk|X[a-z]*)[0-9]*[.]' \
+		| awk '/not found/ { print >> "/dev/stderr"; system("kill -9 -$shellPid") } /=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1 || index(so, "/opt/pypy/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \
 		| sort -u \
-		| xargs -r dpkg-query --search \
-		| cut -d: -f1 \
+		| xargs -rt dpkg-query --search \
+# https://manpages.debian.org/bookworm/dpkg/dpkg-query.1.en.html#S (we ignore diversions and it'll be really unusual for more than one package to provide any given .so file)
+		| awk 'sub(":$", "", $1) { print $1 }' \
 		| sort -u \
 		| xargs -r apt-mark manual \
 	; \
diff --git a/pypy_2-bullseye/Dockerfile b/pypy_2-trixie/Dockerfile
similarity index 75%
rename from pypy_2-bullseye/Dockerfile
rename to pypy_2-trixie/Dockerfile
index d8a7f73..32f9177 100644
--- a/pypy_2-bullseye/Dockerfile
+++ b/pypy_2-trixie/Dockerfile
@@ -4,16 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM buildpack-deps:bullseye
-
-# runtime dependencies
-RUN set -eux; \
-	apt-get update; \
-	apt-get install -y --no-install-recommends \
-		tcl \
-		tk \
-	; \
-	rm -rf /var/lib/apt/lists/*
+FROM buildpack-deps:trixie
 
 # http://bugs.python.org/issue19846
 # > At the moment, setting "LANG=C" on a Linux system *fundamentally breaks Python 3*, and that's not OK.
@@ -47,12 +38,9 @@ RUN set -eux; \
 	savedAptMark="$(apt-mark showmanual)"; \
 	apt-get update; \
 	apt-get install -y --no-install-recommends \
-# sometimes "pypy" itself is linked against libexpat1 / libncurses5, sometimes they're ".so" files in "/opt/pypy/lib_pypy"
-		libexpat1 \
-		libncurses5 \
-		libncursesw6 \
-		libsqlite3-0 \
-# (so we'll add them temporarily, then use "ldd" later to determine which to keep based on usage per architecture)
+# sometimes "pypy" (or associated .so files) has dynamic links to different system libraries
+# we install them here, and then use "ldd" further down to only keep what we actually need (which might even differ per architecture)
+		libfreetype6 \
 	; \
 	\
 	wget -O pypy.tar.bz2 "$url" --progress=dot:giga; \
@@ -69,11 +57,14 @@ RUN set -eux; \
 	\
 	apt-mark auto '.*' > /dev/null; \
 	[ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null; \
+	export shellPid="$$"; \
 	find /opt/pypy -type f -executable -exec ldd '{}' ';' \
-		| awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \
+		| grep -vE 'lib(tcl|tk|X[a-z]*)[0-9]*[.]' \
+		| awk '/not found/ { print >> "/dev/stderr"; system("kill -9 -$shellPid") } /=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1 || index(so, "/opt/pypy/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \
 		| sort -u \
-		| xargs -r dpkg-query --search \
-		| cut -d: -f1 \
+		| xargs -rt dpkg-query --search \
+# https://manpages.debian.org/bookworm/dpkg/dpkg-query.1.en.html#S (we ignore diversions and it'll be really unusual for more than one package to provide any given .so file)
+		| awk 'sub(":$", "", $1) { print $1 }' \
 		| sort -u \
 		| xargs -r apt-mark manual \
 	; \
diff --git a/pypy_bookworm/Dockerfile b/pypy_bookworm/Dockerfile
index 6131b0d..93e5855 100644
--- a/pypy_bookworm/Dockerfile
+++ b/pypy_bookworm/Dockerfile
@@ -47,12 +47,9 @@ RUN set -eux; \
 	savedAptMark="$(apt-mark showmanual)"; \
 	apt-get update; \
 	apt-get install -y --no-install-recommends \
-# sometimes "pypy3" itself is linked against libexpat1 / libncurses5, sometimes they're ".so" files in "/opt/pypy/lib/pypy3.11"
-		libexpat1 \
-		libncurses5 \
-		libncursesw6 \
-		libsqlite3-0 \
-# (so we'll add them temporarily, then use "ldd" later to determine which to keep based on usage per architecture)
+# sometimes "pypy3" (or associated .so files) has dynamic links to different system libraries
+# we install them here, and then use "ldd" further down to only keep what we actually need (which might even differ per architecture)
+		libfontconfig1 \
 	; \
 	\
 	wget -O pypy.tar.bz2 "$url" --progress=dot:giga; \
@@ -88,11 +85,13 @@ RUN set -eux; \
 	\
 	apt-mark auto '.*' > /dev/null; \
 	[ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null; \
+	export shellPid="$$"; \
 	find /opt/pypy -type f -executable -exec ldd '{}' ';' \
-		| awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \
+		| awk '/not found/ { print >> "/dev/stderr"; system("kill -9 -$shellPid") } /=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1 || index(so, "/opt/pypy/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \
 		| sort -u \
-		| xargs -r dpkg-query --search \
-		| cut -d: -f1 \
+		| xargs -rt dpkg-query --search \
+# https://manpages.debian.org/bookworm/dpkg/dpkg-query.1.en.html#S (we ignore diversions and it'll be really unusual for more than one package to provide any given .so file)
+		| awk 'sub(":$", "", $1) { print $1 }' \
 		| sort -u \
 		| xargs -r apt-mark manual \
 	; \
diff --git a/pypy_slim-bookworm/Dockerfile b/pypy_slim-bookworm/Dockerfile
index 5c982ff..27b58d2 100644
--- a/pypy_slim-bookworm/Dockerfile
+++ b/pypy_slim-bookworm/Dockerfile
@@ -45,12 +45,9 @@ RUN set -eux; \
 	apt-get install -y --no-install-recommends \
 		bzip2 \
 		wget \
-# sometimes "pypy3" itself is linked against libexpat1 / libncurses5, sometimes they're ".so" files in "/opt/pypy/lib/pypy3.11"
-		libexpat1 \
-		libncurses5 \
-		libncursesw6 \
-		libsqlite3-0 \
-# (so we'll add them temporarily, then use "ldd" later to determine which to keep based on usage per architecture)
+# sometimes "pypy3" (or associated .so files) has dynamic links to different system libraries
+# we install them here, and then use "ldd" further down to only keep what we actually need (which might even differ per architecture)
+		libfontconfig1 \
 	; \
 	\
 	wget -O pypy.tar.bz2 "$url" --progress=dot:giga; \
@@ -90,11 +87,14 @@ RUN set -eux; \
 	\
 	apt-mark auto '.*' > /dev/null; \
 	[ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null; \
+	export shellPid="$$"; \
 	find /opt/pypy -type f -executable -exec ldd '{}' ';' \
-		| awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \
+		| grep -vE 'lib(tcl|tk|X[a-z]*)[0-9]*[.]' \
+		| awk '/not found/ { print >> "/dev/stderr"; system("kill -9 -$shellPid") } /=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1 || index(so, "/opt/pypy/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \
 		| sort -u \
-		| xargs -r dpkg-query --search \
-		| cut -d: -f1 \
+		| xargs -rt dpkg-query --search \
+# https://manpages.debian.org/bookworm/dpkg/dpkg-query.1.en.html#S (we ignore diversions and it'll be really unusual for more than one package to provide any given .so file)
+		| awk 'sub(":$", "", $1) { print $1 }' \
 		| sort -u \
 		| xargs -r apt-mark manual \
 	; \
diff --git a/pypy_slim-bookworm/Dockerfile b/pypy_slim-trixie/Dockerfile
similarity index 81%
copy from pypy_slim-bookworm/Dockerfile
copy to pypy_slim-trixie/Dockerfile
index 5c982ff..c906c6d 100644
--- a/pypy_slim-bookworm/Dockerfile
+++ b/pypy_slim-trixie/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM debian:bookworm-slim
+FROM debian:trixie-slim
 
 RUN set -eux; \
 	apt-get update; \
@@ -45,12 +45,9 @@ RUN set -eux; \
 	apt-get install -y --no-install-recommends \
 		bzip2 \
 		wget \
-# sometimes "pypy3" itself is linked against libexpat1 / libncurses5, sometimes they're ".so" files in "/opt/pypy/lib/pypy3.11"
-		libexpat1 \
-		libncurses5 \
-		libncursesw6 \
-		libsqlite3-0 \
-# (so we'll add them temporarily, then use "ldd" later to determine which to keep based on usage per architecture)
+# sometimes "pypy3" (or associated .so files) has dynamic links to different system libraries
+# we install them here, and then use "ldd" further down to only keep what we actually need (which might even differ per architecture)
+		libfontconfig1 \
 	; \
 	\
 	wget -O pypy.tar.bz2 "$url" --progress=dot:giga; \
@@ -90,11 +87,14 @@ RUN set -eux; \
 	\
 	apt-mark auto '.*' > /dev/null; \
 	[ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null; \
+	export shellPid="$$"; \
 	find /opt/pypy -type f -executable -exec ldd '{}' ';' \
-		| awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \
+		| grep -vE 'lib(tcl|tk|X[a-z]*)[0-9]*[.]' \
+		| awk '/not found/ { print >> "/dev/stderr"; system("kill -9 -$shellPid") } /=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1 || index(so, "/opt/pypy/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \
 		| sort -u \
-		| xargs -r dpkg-query --search \
-		| cut -d: -f1 \
+		| xargs -rt dpkg-query --search \
+# https://manpages.debian.org/bookworm/dpkg/dpkg-query.1.en.html#S (we ignore diversions and it'll be really unusual for more than one package to provide any given .so file)
+		| awk 'sub(":$", "", $1) { print $1 }' \
 		| sort -u \
 		| xargs -r apt-mark manual \
 	; \
diff --git a/pypy_bookworm/Dockerfile b/pypy_trixie/Dockerfile
similarity index 80%
copy from pypy_bookworm/Dockerfile
copy to pypy_trixie/Dockerfile
index 6131b0d..c5363d1 100644
--- a/pypy_bookworm/Dockerfile
+++ b/pypy_trixie/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM buildpack-deps:bookworm
+FROM buildpack-deps:trixie
 
 # runtime dependencies
 RUN set -eux; \
@@ -47,12 +47,9 @@ RUN set -eux; \
 	savedAptMark="$(apt-mark showmanual)"; \
 	apt-get update; \
 	apt-get install -y --no-install-recommends \
-# sometimes "pypy3" itself is linked against libexpat1 / libncurses5, sometimes they're ".so" files in "/opt/pypy/lib/pypy3.11"
-		libexpat1 \
-		libncurses5 \
-		libncursesw6 \
-		libsqlite3-0 \
-# (so we'll add them temporarily, then use "ldd" later to determine which to keep based on usage per architecture)
+# sometimes "pypy3" (or associated .so files) has dynamic links to different system libraries
+# we install them here, and then use "ldd" further down to only keep what we actually need (which might even differ per architecture)
+		libfontconfig1 \
 	; \
 	\
 	wget -O pypy.tar.bz2 "$url" --progress=dot:giga; \
@@ -88,11 +85,13 @@ RUN set -eux; \
 	\
 	apt-mark auto '.*' > /dev/null; \
 	[ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null; \
+	export shellPid="$$"; \
 	find /opt/pypy -type f -executable -exec ldd '{}' ';' \
-		| awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \
+		| awk '/not found/ { print >> "/dev/stderr"; system("kill -9 -$shellPid") } /=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1 || index(so, "/opt/pypy/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \
 		| sort -u \
-		| xargs -r dpkg-query --search \
-		| cut -d: -f1 \
+		| xargs -rt dpkg-query --search \
+# https://manpages.debian.org/bookworm/dpkg/dpkg-query.1.en.html#S (we ignore diversions and it'll be really unusual for more than one package to provide any given .so file)
+		| awk 'sub(":$", "", $1) { print $1 }' \
 		| sort -u \
 		| xargs -r apt-mark manual \
 	; \

Relevant Maintainers:

• pypy: @tianon @yosifkit

[tianon]

Hold till after the debian:trixie release image build.