diff --git a/packages/2ping/build.sh b/packages/2ping/build.sh
index ed4f382e6d..fac11bd2e4 100644
--- a/packages/2ping/build.sh
+++ b/packages/2ping/build.sh
@@ -9,7 +9,7 @@ TERMUX_PKG_SHA256=0f85dc21be1266daccfbba903819ca8935ebdbe002b1e0305bfda258af44fd
 TERMUX_PKG_DEPENDS="python"
 TERMUX_PKG_PLATFORM_INDEPENDENT=true
 TERMUX_PKG_BUILD_IN_SRC=true
-TERMUX_PKG_PYTHON_COMMON_DEPS="wheel"
+TERMUX_PKG_PYTHON_COMMON_BUILD_DEPS="wheel"
 
 termux_step_post_make_install() {
 	install -Dm600 -t $TERMUX_PREFIX/share/man/man1 doc/2ping.1
diff --git a/packages/asciidoc/build.sh b/packages/asciidoc/build.sh
index 6347d302ce..4b1888bdf4 100644
--- a/packages/asciidoc/build.sh
+++ b/packages/asciidoc/build.sh
@@ -11,4 +11,4 @@ TERMUX_PKG_DEPENDS="docbook-xsl, libxml2-utils, python, xsltproc"
 TERMUX_PKG_SUGGESTS="w3m"
 TERMUX_PKG_PLATFORM_INDEPENDENT=true
 TERMUX_PKG_BUILD_IN_SRC=true
-TERMUX_PKG_PYTHON_COMMON_DEPS="wheel"
+TERMUX_PKG_PYTHON_COMMON_BUILD_DEPS="wheel"
diff --git a/packages/borgbackup/build.sh b/packages/borgbackup/build.sh
index 724e3b725f..2a50d60dfa 100644
--- a/packages/borgbackup/build.sh
+++ b/packages/borgbackup/build.sh
@@ -7,7 +7,7 @@ TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://github.com/borgbackup/borg/releases/download/${TERMUX_PKG_VERSION}/borgbackup-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=79bbfa745d1901d685973584bd2d16a350686ddd176f6a2244490fb01996441f
 TERMUX_PKG_DEPENDS="libacl, liblz4, openssl, python, python-pip, xxhash, zstd"
-TERMUX_PKG_PYTHON_COMMON_DEPS="build, Cython, pkgconfig, setuptools, setuptools-scm, wheel"
+TERMUX_PKG_PYTHON_COMMON_BUILD_DEPS="build, Cython, pkgconfig, setuptools, setuptools-scm, wheel"
 TERMUX_PKG_PYTHON_TARGET_DEPS="'msgpack==1.0.8', packaging"
 TERMUX_PKG_AUTO_UPDATE=true
 
diff --git a/packages/dbus-python/build.sh b/packages/dbus-python/build.sh
index 4123b556df..19aa3f7c7d 100644
--- a/packages/dbus-python/build.sh
+++ b/packages/dbus-python/build.sh
@@ -9,7 +9,7 @@ TERMUX_PKG_SHA256=da4ee9bbb9eb901d463a7cc9f99dfdbe6c751c8b48b29b78d378985a3c9656
 TERMUX_PKG_AUTO_UPDATE=true
 TERMUX_PKG_UPDATE_TAG_TYPE=newest-tag
 TERMUX_PKG_DEPENDS="dbus, glib, python"
-TERMUX_PKG_PYTHON_COMMON_DEPS="wheel"
+TERMUX_PKG_PYTHON_COMMON_BUILD_DEPS="wheel"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 -Dpython=python
 "
diff --git a/packages/electrum/build.sh b/packages/electrum/build.sh
index ba8de7824f..db31443395 100644
--- a/packages/electrum/build.sh
+++ b/packages/electrum/build.sh
@@ -17,5 +17,5 @@ TERMUX_PKG_BUILD_IN_SRC=true
 TERMUX_PKG_PLATFORM_INDEPENDENT=true
 # asciinema previously contained some files that python packages have in common
 TERMUX_PKG_CONFLICTS="asciinema (<< 1.4.0-1)"
-TERMUX_PKG_PYTHON_COMMON_DEPS="wheel"
+TERMUX_PKG_PYTHON_COMMON_BUILD_DEPS="wheel"
 TERMUX_PKG_SERVICE_SCRIPT=("electrum" 'exec electrum daemon 2>&1')
diff --git a/packages/fetchmail/build.sh b/packages/fetchmail/build.sh
index f7f1758837..90c2d91542 100644
--- a/packages/fetchmail/build.sh
+++ b/packages/fetchmail/build.sh
@@ -10,4 +10,4 @@ TERMUX_PKG_AUTO_UPDATE=true
 TERMUX_PKG_DEPENDS="openssl"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--with-ssl=$TERMUX_PREFIX"
 TERMUX_PKG_RM_AFTER_INSTALL="lib/python${TERMUX_PYTHON_VERSION}/site-packages/__pycache__"
-TERMUX_PKG_PYTHON_COMMON_DEPS="wheel"
+TERMUX_PKG_PYTHON_COMMON_BUILD_DEPS="wheel"
diff --git a/packages/gobject-introspection/build.sh b/packages/gobject-introspection/build.sh
index 08037666bb..eab45c4a78 100644
--- a/packages/gobject-introspection/build.sh
+++ b/packages/gobject-introspection/build.sh
@@ -9,7 +9,7 @@ TERMUX_PKG_DEPENDS="glib, libffi"
 TERMUX_PKG_SUGGESTS="g-ir-scanner"
 TERMUX_PKG_VERSIONED_GIR=false
 TERMUX_PKG_DISABLE_GIR=false
-TERMUX_PKG_PYTHON_COMMON_DEPS="packaging, wheel"
+TERMUX_PKG_PYTHON_COMMON_BUILD_DEPS="packaging, wheel"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 -Dcairo_libname=libcairo-gobject.so
 -Dpython=python
diff --git a/packages/gst-python/build.sh b/packages/gst-python/build.sh
index 1bcf5e3951..29157a7836 100644
--- a/packages/gst-python/build.sh
+++ b/packages/gst-python/build.sh
@@ -7,7 +7,7 @@ TERMUX_PKG_SRCURL=https://gstreamer.freedesktop.org/src/gst-python/gst-python-${
 TERMUX_PKG_SHA256=6fd89a8e8b0cb8455f40794e4cdfc5993bdedb07ea660dac54ba88e294319805
 TERMUX_PKG_AUTO_UPDATE=true
 TERMUX_PKG_DEPENDS="gst-plugins-base, gst-plugins-bad, gstreamer, pygobject, python"
-TERMUX_PKG_PYTHON_COMMON_DEPS="wheel"
+TERMUX_PKG_PYTHON_COMMON_BUILD_DEPS="wheel"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 -Dtests=disabled
 "
diff --git a/packages/libarrow-cpp/build.sh b/packages/libarrow-cpp/build.sh
index 3754f4a62a..fc8229c96b 100644
--- a/packages/libarrow-cpp/build.sh
+++ b/packages/libarrow-cpp/build.sh
@@ -9,7 +9,7 @@ TERMUX_PKG_SHA256=8a95e6c7b9bec2bc0058feb73efe38ad6cfd49a0c7094db29b37ecaa8ab160
 TERMUX_PKG_AUTO_UPDATE=true
 TERMUX_PKG_DEPENDS="abseil-cpp, apache-orc, libandroid-execinfo, libc++, liblz4, libprotobuf, libre2, libsnappy, thrift, utf8proc, zlib, zstd"
 TERMUX_PKG_BUILD_DEPENDS="boost, boost-headers, rapidjson"
-TERMUX_PKG_PYTHON_COMMON_DEPS="build, 'Cython>=3.1', numpy, setuptools, setuptools-scm, wheel"
+TERMUX_PKG_PYTHON_COMMON_BUILD_DEPS="build, 'Cython>=3.1', numpy, setuptools, setuptools-scm, wheel"
 TERMUX_PKG_BREAKS="libarrow-python (<< ${TERMUX_PKG_VERSION})"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 -DARROW_BUILD_STATIC=OFF
diff --git a/packages/libplacebo/build.sh b/packages/libplacebo/build.sh
index d56fa62304..400aa0ed07 100644
--- a/packages/libplacebo/build.sh
+++ b/packages/libplacebo/build.sh
@@ -10,7 +10,7 @@ TERMUX_PKG_SRCURL="https://github.com/haasn/libplacebo/archive/refs/tags/v$TERMU
 TERMUX_PKG_SHA256=716954501d9b76e6906fddda66febc5886493d0673dd265ec1e6e52f4e5cd7c6
 TERMUX_PKG_DEPENDS="littlecms, glslang, python, vulkan-icd"
 TERMUX_PKG_BUILD_DEPENDS="libglvnd-dev, vulkan-headers"
-TERMUX_PKG_PYTHON_COMMON_DEPS="glad2"
+TERMUX_PKG_PYTHON_COMMON_BUILD_DEPS="glad2"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 -Dvulkan=enabled
 -Dglslang=enabled
diff --git a/packages/libtorrent-rasterbar/build.sh b/packages/libtorrent-rasterbar/build.sh
index a3bae948e3..ad676aad19 100644
--- a/packages/libtorrent-rasterbar/build.sh
+++ b/packages/libtorrent-rasterbar/build.sh
@@ -9,7 +9,7 @@ TERMUX_PKG_SHA256=f0db58580f4f29ade6cc40fa4ba80e2c9a70c90265cd77332d3cdec37ecf1e
 TERMUX_PKG_AUTO_UPDATE=true
 TERMUX_PKG_DEPENDS="boost, libc++, openssl, python"
 TERMUX_PKG_BUILD_DEPENDS="boost-headers"
-TERMUX_PKG_PYTHON_COMMON_DEPS="wheel"
+TERMUX_PKG_PYTHON_COMMON_BUILD_DEPS="wheel"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 -DCMAKE_INSTALL_LIBDIR=$TERMUX__PREFIX__LIB_SUBDIR
 -DCMAKE_INSTALL_INCLUDEDIR=$TERMUX__PREFIX__INCLUDE_SUBDIR
diff --git a/packages/libunbound/build.sh b/packages/libunbound/build.sh
index 75492d60e9..87fd9cd942 100644
--- a/packages/libunbound/build.sh
+++ b/packages/libunbound/build.sh
@@ -12,8 +12,8 @@ TERMUX_PKG_BUILD_DEPENDS="python, swig"
 TERMUX_PKG_BREAKS="unbound (<< 1.17.1-1)"
 TERMUX_PKG_REPLACES="unbound (<< 1.17.1-1)"
 TERMUX_PKG_BUILD_IN_SRC=true
-TERMUX_PKG_PYTHON_COMMON_DEPS="wheel"
-TERMUX_PKG_PYTHON_BUILD_DEPS="swig"
+TERMUX_PKG_PYTHON_COMMON_BUILD_DEPS="wheel"
+TERMUX_PKG_PYTHON_CROSS_BUILD_DEPS="swig"
 
 # `pythonmodule` makes core lib/libunbound.so depend on python. Do not enable it.
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
diff --git a/packages/manim/build.sh b/packages/manim/build.sh
index a43cbf0fc1..1beb65bc07 100644
--- a/packages/manim/build.sh
+++ b/packages/manim/build.sh
@@ -8,7 +8,7 @@ TERMUX_PKG_SRCURL="https://github.com/ManimCommunity/manim/archive/refs/tags/v$T
 TERMUX_PKG_SHA256=e61992a84c684702ce732e66ae46f85341ebe4cb208f8a4c5cb33ce9ea070f02
 TERMUX_PKG_DEPENDS="ffmpeg, libcairo, pango, xorgproto, python-numpy, python-pillow, python-pip, pycairo, python-scipy, python-skia-pathops"
 TERMUX_PKG_SUGGESTS="texlive-installer"
-TERMUX_PKG_PYTHON_COMMON_DEPS="poetry"
+TERMUX_PKG_PYTHON_COMMON_BUILD_DEPS="poetry"
 TERMUX_PKG_BUILD_IN_SRC=true
 TERMUX_PKG_AUTO_UPDATE=true
 TERMUX_PKG_EXCLUDED_ARCHES="arm, i686"
diff --git a/packages/matplotlib/build.sh b/packages/matplotlib/build.sh
index 8a29aaaf83..b00658d0b4 100644
--- a/packages/matplotlib/build.sh
+++ b/packages/matplotlib/build.sh
@@ -21,7 +21,7 @@ TERMUX_PKG_SHA256=dbc50c7b15bb8d7dbe51a27a58322ed73f09291772d9e3184f03f11c576693
 TERMUX_PKG_AUTO_UPDATE=true
 TERMUX_PKG_DEPENDS="freetype, libc++, patchelf, ninja, python, python-contourpy, python-numpy, python-pillow, python-pip"
 _NUMPY_VERSION=$(. $TERMUX_SCRIPTDIR/packages/python-numpy/build.sh; echo $TERMUX_PKG_VERSION)
-TERMUX_PKG_PYTHON_COMMON_DEPS="build, 'meson-python>=0.13.1', wheel, 'numpy==$_NUMPY_VERSION', 'pybind11>=2.6.0', 'setuptools>=64', 'setuptools_scm>=7'"
+TERMUX_PKG_PYTHON_COMMON_BUILD_DEPS="build, 'meson-python>=0.13.1', wheel, 'numpy==$_NUMPY_VERSION', 'pybind11>=2.6.0', 'setuptools>=64', 'setuptools_scm>=7'"
 
 TERMUX_MESON_WHEEL_CROSSFILE="$TERMUX_PKG_TMPDIR/wheel-cross-file.txt"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
diff --git a/packages/nala/build.sh b/packages/nala/build.sh
index 95e0ea86b2..b3399cd03d 100644
--- a/packages/nala/build.sh
+++ b/packages/nala/build.sh
@@ -11,7 +11,7 @@ TERMUX_PKG_PLATFORM_INDEPENDENT=true
 TERMUX_PKG_BUILD_IN_SRC=true
 TERMUX_PKG_AUTO_UPDATE=true
 TERMUX_PKG_UPDATE_TAG_TYPE="newest-tag"
-TERMUX_PKG_PYTHON_COMMON_DEPS="poetry"
+TERMUX_PKG_PYTHON_COMMON_BUILD_DEPS="poetry"
 TERMUX_PKG_PYTHON_TARGET_DEPS="anyio, httpx, jsbeautifier, pexpect, python-debian, rich, tomli, typer, typing-extensions"
 TERMUX_PKG_PYTHON_RUNTIME_DEPS="nala, python-debian"
 
diff --git a/packages/panda3d/build.sh b/packages/panda3d/build.sh
index 5d7410d19d..a602fa03ec 100644
--- a/packages/panda3d/build.sh
+++ b/packages/panda3d/build.sh
@@ -8,7 +8,7 @@ TERMUX_PKG_SHA256=25d04b2b6ab2c45a0b0cc3ba7a01aa66aabc0e4473b2aa83038e1d61ce1ece
 TERMUX_PKG_AUTO_UPDATE=true
 TERMUX_PKG_DEPENDS="libc++, python"
 TERMUX_PKG_BUILD_DEPENDS="libandroid-glob"
-TERMUX_PKG_PYTHON_COMMON_DEPS="wheel"
+TERMUX_PKG_PYTHON_COMMON_BUILD_DEPS="wheel"
 TERMUX_PKG_BUILD_IN_SRC=true
 
 termux_step_pre_configure() {
diff --git a/packages/pybind11/build.sh b/packages/pybind11/build.sh
index 6098fbc0fb..921e2a4165 100644
--- a/packages/pybind11/build.sh
+++ b/packages/pybind11/build.sh
@@ -9,5 +9,5 @@ TERMUX_PKG_SHA256=741633da746b7c738bb71f1854f957b9da660bcd2dce68d71949037f0969d0
 TERMUX_PKG_AUTO_UPDATE=true
 TERMUX_PKG_DEPENDS="python"
 TERMUX_PKG_BUILD_DEPENDS="boost, eigen"
-TERMUX_PKG_PYTHON_COMMON_DEPS="setuptools"
+TERMUX_PKG_PYTHON_COMMON_BUILD_DEPS="setuptools"
 TERMUX_CMAKE_BUILD="Unix Makefiles"
diff --git a/packages/pycairo/build.sh b/packages/pycairo/build.sh
index dbf9f1666b..8699446c06 100644
--- a/packages/pycairo/build.sh
+++ b/packages/pycairo/build.sh
@@ -7,4 +7,4 @@ TERMUX_PKG_SRCURL=https://github.com/pygobject/pycairo/releases/download/v${TERM
 TERMUX_PKG_SHA256=f3f7fde97325cae80224c09f12564ef58d0d0f655da0e3b040f5807bd5bd3142
 TERMUX_PKG_AUTO_UPDATE=true
 TERMUX_PKG_DEPENDS="libcairo, python"
-TERMUX_PKG_PYTHON_COMMON_DEPS="wheel"
+TERMUX_PKG_PYTHON_COMMON_BUILD_DEPS="wheel"
diff --git a/packages/pygobject/build.sh b/packages/pygobject/build.sh
index a1d0ead08b..91227fc641 100644
--- a/packages/pygobject/build.sh
+++ b/packages/pygobject/build.sh
@@ -10,7 +10,7 @@ TERMUX_PKG_DEPENDS="glib, gobject-introspection, libcairo, libffi, pycairo, pyth
 TERMUX_PKG_BUILD_DEPENDS="g-ir-scanner"
 TERMUX_PKG_VERSIONED_GIR=false
 TERMUX_PKG_DISABLE_GIR=false
-TERMUX_PKG_PYTHON_COMMON_DEPS="wheel"
+TERMUX_PKG_PYTHON_COMMON_BUILD_DEPS="wheel"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 -Dpycairo=enabled
 -Dtests=false
diff --git a/packages/python-apsw/build.sh b/packages/python-apsw/build.sh
index 4e4500b63e..044405c9f2 100644
--- a/packages/python-apsw/build.sh
+++ b/packages/python-apsw/build.sh
@@ -7,7 +7,7 @@ TERMUX_PKG_SRCURL=https://github.com/rogerbinns/apsw/releases/download/${TERMUX_
 TERMUX_PKG_SHA256=15b69c57358624d8fef1c37ecaa536691cbb39db824fd41a11021c2f3197a7fb
 TERMUX_PKG_AUTO_UPDATE=true
 TERMUX_PKG_DEPENDS="libsqlite, python"
-TERMUX_PKG_PYTHON_COMMON_DEPS="wheel"
+TERMUX_PKG_PYTHON_COMMON_BUILD_DEPS="wheel"
 TERMUX_PKG_BUILD_IN_SRC=true
 
 termux_step_post_get_source() {
diff --git a/packages/python-apt/build.sh b/packages/python-apt/build.sh
index d700df070b..1292d8f1bf 100644
--- a/packages/python-apt/build.sh
+++ b/packages/python-apt/build.sh
@@ -8,7 +8,7 @@ TERMUX_PKG_SHA256=daf46b0ed85061ccee64c3aa3004c695b33047f9f62f0de7863966c287731d
 TERMUX_PKG_DEPENDS="apt, libandroid-support, libc++, python"
 TERMUX_PKG_BUILD_IN_SRC=true
 TERMUX_PKG_AUTO_UPDATE=true
-TERMUX_PKG_PYTHON_COMMON_DEPS="wheel"
+TERMUX_PKG_PYTHON_COMMON_BUILD_DEPS="wheel"
 
 termux_pkg_auto_update() {
 	# based on scripts/updates/api/termux_repology_api_get_latest_version.sh
diff --git a/packages/python-bcrypt/build.sh b/packages/python-bcrypt/build.sh
index b359f2e198..ec74981290 100644
--- a/packages/python-bcrypt/build.sh
+++ b/packages/python-bcrypt/build.sh
@@ -9,7 +9,7 @@ TERMUX_PKG_SHA256=f748f7c2d6fd375cc93d3fba7ef4a9e3a092421b8dbf34d8d4dc06be9492df
 TERMUX_PKG_AUTO_UPDATE=true
 TERMUX_PKG_DEPENDS="python, python-pip"
 TERMUX_PKG_BUILD_DEPENDS="openssl"
-TERMUX_PKG_PYTHON_COMMON_DEPS="wheel, setuptools-rust"
+TERMUX_PKG_PYTHON_COMMON_BUILD_DEPS="wheel, setuptools-rust"
 TERMUX_PKG_BUILD_IN_SRC=true
 
 termux_step_pre_configure() {
diff --git a/packages/python-brotli/build.sh b/packages/python-brotli/build.sh
index 4089aa85a1..89f3e59ffb 100644
--- a/packages/python-brotli/build.sh
+++ b/packages/python-brotli/build.sh
@@ -6,7 +6,7 @@ TERMUX_PKG_VERSION="1.2.0"
 TERMUX_PKG_SRCURL=https://github.com/google/brotli/archive/refs/tags/v$TERMUX_PKG_VERSION.tar.gz
 TERMUX_PKG_SHA256=816c96e8e8f193b40151dad7e8ff37b1221d019dbcb9c35cd3fadbfe6477dfec
 TERMUX_PKG_DEPENDS="python, python-pip"
-TERMUX_PKG_PYTHON_COMMON_DEPS="wheel"
+TERMUX_PKG_PYTHON_COMMON_BUILD_DEPS="wheel"
 TERMUX_PKG_BUILD_IN_SRC=true
 TERMUX_PKG_AUTO_UPDATE=true
 
diff --git a/packages/python-contourpy/build.sh b/packages/python-contourpy/build.sh
index fbadde9132..5fe717926b 100644
--- a/packages/python-contourpy/build.sh
+++ b/packages/python-contourpy/build.sh
@@ -7,9 +7,9 @@ TERMUX_PKG_REVISION=2
 TERMUX_PKG_SRCURL=git+https://github.com/contourpy/contourpy
 TERMUX_PKG_DEPENDS="python, python-numpy, python-pip"
 TERMUX_PKG_BUILD_DEPENDS="pybind11"
-TERMUX_PKG_PYTHON_COMMON_DEPS="wheel, meson-python, build"
+TERMUX_PKG_PYTHON_COMMON_BUILD_DEPS="wheel, meson-python, build"
 _NUMPY_VERSION=$(. $TERMUX_SCRIPTDIR/packages/python-numpy/build.sh; echo $TERMUX_PKG_VERSION)
-TERMUX_PKG_PYTHON_BUILD_DEPS="'numpy==$_NUMPY_VERSION'"
+TERMUX_PKG_PYTHON_CROSS_BUILD_DEPS="'numpy==$_NUMPY_VERSION'"
 TERMUX_PKG_AUTO_UPDATE=true
 TERMUX_PKG_UPDATE_TAG_TYPE="latest-release-tag"
 TERMUX_MESON_WHEEL_CROSSFILE="$TERMUX_PKG_TMPDIR/wheel-cross-file.txt"
diff --git a/packages/python-cryptography/build.sh b/packages/python-cryptography/build.sh
index c1a93df009..4b65647a25 100644
--- a/packages/python-cryptography/build.sh
+++ b/packages/python-cryptography/build.sh
@@ -11,8 +11,8 @@ TERMUX_PKG_AUTO_UPDATE=true
 TERMUX_PKG_DEPENDS="openssl, python, python-pip"
 TERMUX_PKG_BUILD_IN_SRC=true
 TERMUX_PKG_UPDATE_TAG_TYPE="newest-tag"
-TERMUX_PKG_PYTHON_COMMON_DEPS="wheel, maturin"
-TERMUX_PKG_PYTHON_BUILD_DEPS="'cffi>=1.12'"
+TERMUX_PKG_PYTHON_COMMON_BUILD_DEPS="wheel, maturin"
+TERMUX_PKG_PYTHON_CROSS_BUILD_DEPS="'cffi>=1.12'"
 TERMUX_PKG_PYTHON_TARGET_DEPS="'cffi>=1.12'"
 
 termux_step_configure() {
diff --git a/packages/python-greenlet/build.sh b/packages/python-greenlet/build.sh
index 787fce748b..fcf9ded463 100644
--- a/packages/python-greenlet/build.sh
+++ b/packages/python-greenlet/build.sh
@@ -11,5 +11,5 @@ TERMUX_PKG_SHA256=5d854395dc71b38a22e7e25467e7fc66e6a6fe538165318416cd2bb892692c
 TERMUX_PKG_AUTO_UPDATE=true
 TERMUX_PKG_UPDATE_TAG_TYPE="newest-tag"
 TERMUX_PKG_DEPENDS="libc++, python, python-pip"
-TERMUX_PKG_PYTHON_COMMON_DEPS="wheel"
+TERMUX_PKG_PYTHON_COMMON_BUILD_DEPS="wheel"
 TERMUX_PKG_BUILD_IN_SRC=true
diff --git a/packages/python-grpcio/build.sh b/packages/python-grpcio/build.sh
index b912e88725..598922c1e4 100644
--- a/packages/python-grpcio/build.sh
+++ b/packages/python-grpcio/build.sh
@@ -9,7 +9,7 @@ TERMUX_PKG_AUTO_UPDATE=true
 TERMUX_PKG_UPDATE_TAG_TYPE="latest-release-tag"
 TERMUX_PKG_DEPENDS="abseil-cpp, c-ares, ca-certificates, libc++, libre2, openssl, python, python-pip, zlib"
 TERMUX_PKG_BUILD_DEPENDS="gflags, gflags-static"
-TERMUX_PKG_PYTHON_COMMON_DEPS="wheel, setuptools, 'Cython>=3.0.0'"
+TERMUX_PKG_PYTHON_COMMON_BUILD_DEPS="wheel, setuptools, 'Cython>=3.0.0'"
 TERMUX_PKG_BUILD_IN_SRC=true
 
 termux_step_pre_configure() {
diff --git a/packages/python-lameenc/build.sh b/packages/python-lameenc/build.sh
index 9875ca0dfc..bbe030f223 100644
--- a/packages/python-lameenc/build.sh
+++ b/packages/python-lameenc/build.sh
@@ -8,7 +8,7 @@ TERMUX_PKG_SRCURL=https://github.com/chrisstaite/lameenc/archive/refs/tags/v${TE
 TERMUX_PKG_SHA256=3f1994d4b14680a186b6f2b92af4bff30b0e262d043774fe411ddf3481547750
 TERMUX_PKG_AUTO_UPDATE=true
 TERMUX_PKG_DEPENDS="libandroid-support, libmp3lame, python"
-TERMUX_PKG_PYTHON_COMMON_DEPS="setuptools-scm, wheel"
+TERMUX_PKG_PYTHON_COMMON_BUILD_DEPS="setuptools-scm, wheel"
 TERMUX_PKG_BUILD_IN_SRC=true
 
 termux_step_pre_configure() {
diff --git a/packages/python-libsass/build.sh b/packages/python-libsass/build.sh
index aa3d03fe3e..36cecd80ec 100644
--- a/packages/python-libsass/build.sh
+++ b/packages/python-libsass/build.sh
@@ -8,7 +8,7 @@ TERMUX_PKG_SRCURL=https://github.com/sass/libsass-python/archive/refs/tags/${TER
 TERMUX_PKG_SHA256=4bff7819756f52f6e4592f03f205104d1ca431088d9452aed5042f89a36f9873
 TERMUX_PKG_AUTO_UPDATE=true
 TERMUX_PKG_DEPENDS="libsass, python"
-TERMUX_PKG_PYTHON_COMMON_DEPS="wheel"
+TERMUX_PKG_PYTHON_COMMON_BUILD_DEPS="wheel"
 TERMUX_PKG_BUILD_IN_SRC=true
 
 termux_step_pre_configure() {
diff --git a/packages/python-llvmlite/build.sh b/packages/python-llvmlite/build.sh
index 5b868ef777..b8b202604f 100644
--- a/packages/python-llvmlite/build.sh
+++ b/packages/python-llvmlite/build.sh
@@ -18,7 +18,7 @@ TERMUX_PKG_SHA256=(
 	6898f963c8e938981e6c4a302e83ec5beb4630147c7311183cf61069af16333d
 )
 TERMUX_PKG_DEPENDS="libc++, libffi, python, python-pip"
-TERMUX_PKG_PYTHON_COMMON_DEPS="wheel"
+TERMUX_PKG_PYTHON_COMMON_BUILD_DEPS="wheel"
 TERMUX_PKG_BUILD_IN_SRC=true
 TERMUX_PKG_AUTO_UPDATE=true
 TERMUX_PKG_HOSTBUILD=true
diff --git a/packages/python-lxml/build.sh b/packages/python-lxml/build.sh
index c3fa144c6d..13fe37a146 100644
--- a/packages/python-lxml/build.sh
+++ b/packages/python-lxml/build.sh
@@ -6,7 +6,7 @@ TERMUX_PKG_VERSION="6.0.2"
 TERMUX_PKG_SRCURL=https://github.com/lxml/lxml/releases/download/lxml-$TERMUX_PKG_VERSION/lxml-$TERMUX_PKG_VERSION.tar.gz
 TERMUX_PKG_SHA256=cd79f3367bd74b317dda655dc8fcfa304d9eb6e4fb06b7168c5cf27f96e0cd62
 TERMUX_PKG_DEPENDS="libxml2, libxslt, python, python-pip"
-TERMUX_PKG_PYTHON_COMMON_DEPS="wheel"
+TERMUX_PKG_PYTHON_COMMON_BUILD_DEPS="wheel"
 TERMUX_PKG_BUILD_IN_SRC=true
 TERMUX_PKG_AUTO_UPDATE=true
 TERMUX_PKG_UPDATE_VERSION_REGEXP="\d+\.\d+\.\d+$"
diff --git a/packages/python-msgpack/build.sh b/packages/python-msgpack/build.sh
index ea5dd393fc..dc9f45e35d 100644
--- a/packages/python-msgpack/build.sh
+++ b/packages/python-msgpack/build.sh
@@ -9,7 +9,7 @@ TERMUX_PKG_SRCURL=https://pypi.org/packages/source/m/msgpack/msgpack-${TERMUX_PK
 TERMUX_PKG_SHA256=3b60763c1373dd60f398488069bcdc703cd08a711477b5d480eecc9f9626f47e
 TERMUX_PKG_AUTO_UPDATE=true
 TERMUX_PKG_DEPENDS="libc++, python"
-TERMUX_PKG_PYTHON_COMMON_DEPS="build, Cython, setuptools, wheel"
+TERMUX_PKG_PYTHON_COMMON_BUILD_DEPS="build, Cython, setuptools, wheel"
 
 termux_step_make() {
 	PYTHONPATH='' python -m build -w -n -x "$TERMUX_PKG_SRCDIR"
diff --git a/packages/python-numpy/build.sh b/packages/python-numpy/build.sh
index 32c860b5df..482f759ef2 100644
--- a/packages/python-numpy/build.sh
+++ b/packages/python-numpy/build.sh
@@ -9,7 +9,7 @@ TERMUX_PKG_SRCURL=git+https://github.com/numpy/numpy
 TERMUX_PKG_DEPENDS="libc++, libopenblas, python"
 TERMUX_PKG_AUTO_UPDATE=false
 TERMUX_PKG_UPDATE_TAG_TYPE="latest-release-tag"
-TERMUX_PKG_PYTHON_COMMON_DEPS="wheel, 'Cython>=0.29.34,<3.1', 'meson-python>=0.15.0,<0.16.0', build"
+TERMUX_PKG_PYTHON_COMMON_BUILD_DEPS="wheel, 'Cython>=0.29.34,<3.1', 'meson-python>=0.15.0,<0.16.0', build"
 
 TERMUX_MESON_WHEEL_CROSSFILE="$TERMUX_PKG_TMPDIR/wheel-cross-file.txt"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
diff --git a/packages/python-onnxruntime/build.sh b/packages/python-onnxruntime/build.sh
index cba610bb6e..5dcdd300bb 100644
--- a/packages/python-onnxruntime/build.sh
+++ b/packages/python-onnxruntime/build.sh
@@ -6,7 +6,7 @@ TERMUX_PKG_VERSION="1.23.2"
 TERMUX_PKG_SRCURL=git+https://github.com/microsoft/onnxruntime
 TERMUX_PKG_DEPENDS="abseil-cpp, libc++, protobuf, libre2, python, python-numpy, python-pip"
 TERMUX_PKG_BUILD_IN_SRC=true
-TERMUX_PKG_PYTHON_COMMON_DEPS="wheel, build, packaging"
+TERMUX_PKG_PYTHON_COMMON_BUILD_DEPS="wheel, build, packaging"
 TERMUX_PKG_AUTO_UPDATE=true
 TERMUX_PKG_UPDATE_TAG_TYPE="latest-release-tag"
 
diff --git a/packages/python-pip/build.sh b/packages/python-pip/build.sh
index 083becd1eb..86213fbf99 100644
--- a/packages/python-pip/build.sh
+++ b/packages/python-pip/build.sh
@@ -13,7 +13,7 @@ TERMUX_PKG_ANTI_BUILD_DEPENDS="clang"
 TERMUX_PKG_BREAKS="python (<< 3.11.1-1)"
 TERMUX_PKG_PLATFORM_INDEPENDENT=true
 TERMUX_PKG_BUILD_IN_SRC=true
-TERMUX_PKG_PYTHON_COMMON_DEPS="docutils, myst_parser, sphinx_copybutton, sphinx_inline_tabs, sphinxcontrib.towncrier, completion"
+TERMUX_PKG_PYTHON_COMMON_BUILD_DEPS="docutils, myst_parser, sphinx_copybutton, sphinx_inline_tabs, sphinxcontrib.towncrier, completion"
 
 termux_step_post_make_install() {
 	if [ ! -e "$TERMUX_PYTHON_HOME/site-packages/pip-$TERMUX_PKG_VERSION.dist-info" ]; then
diff --git a/packages/python-sabyenc3/build.sh b/packages/python-sabyenc3/build.sh
index a6fce836c1..86bff90109 100644
--- a/packages/python-sabyenc3/build.sh
+++ b/packages/python-sabyenc3/build.sh
@@ -9,7 +9,7 @@ TERMUX_PKG_AUTO_UPDATE=true
 TERMUX_PKG_DEPENDS="libc++, python"
 TERMUX_PKG_BUILD_DEPENDS="libcpufeatures"
 TERMUX_PKG_BUILD_IN_SRC=true
-TERMUX_PKG_PYTHON_COMMON_DEPS="wheel"
+TERMUX_PKG_PYTHON_COMMON_BUILD_DEPS="wheel"
 
 termux_step_pre_configure() {
 	export CXXFLAGS+=" -fPIC -I$TERMUX_PREFIX/include/ndk_compat"
diff --git a/packages/python-scipy/build.sh b/packages/python-scipy/build.sh
index a7c21ada66..81cd455fc0 100644
--- a/packages/python-scipy/build.sh
+++ b/packages/python-scipy/build.sh
@@ -7,9 +7,9 @@ TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=git+https://github.com/scipy/scipy
 TERMUX_PKG_DEPENDS="libc++, libopenblas, python, python-numpy, python-pip"
 TERMUX_PKG_BUILD_DEPENDS="python-numpy-static, pybind11"
-TERMUX_PKG_PYTHON_COMMON_DEPS="wheel, 'Cython>=3.0.8', meson-python, build"
+TERMUX_PKG_PYTHON_COMMON_BUILD_DEPS="wheel, 'Cython>=3.0.8', meson-python, build"
 _NUMPY_VERSION=$(. $TERMUX_SCRIPTDIR/packages/python-numpy/build.sh; echo $TERMUX_PKG_VERSION)
-TERMUX_PKG_PYTHON_BUILD_DEPS="pythran, 'numpy==$_NUMPY_VERSION'"
+TERMUX_PKG_PYTHON_CROSS_BUILD_DEPS="pythran, 'numpy==$_NUMPY_VERSION'"
 TERMUX_PKG_AUTO_UPDATE=true
 TERMUX_PKG_UPDATE_TAG_TYPE="latest-release-tag"
 
diff --git a/packages/python-skia-pathops/build.sh b/packages/python-skia-pathops/build.sh
index e472695f10..e4b2ef164a 100644
--- a/packages/python-skia-pathops/build.sh
+++ b/packages/python-skia-pathops/build.sh
@@ -8,7 +8,7 @@ _SUFFIX='post1'
 TERMUX_PKG_SRCURL=https://github.com/fonttools/skia-pathops/archive/refs/tags/v${TERMUX_PKG_VERSION}.${_SUFFIX}.tar.gz
 TERMUX_PKG_SHA256=88bd5872bb96e19108ff7265cae2e1708f5e7f335b39ebfdd023940970e1d54c
 TERMUX_PKG_DEPENDS="libc++, python, python-pip"
-TERMUX_PKG_PYTHON_COMMON_DEPS="setuptools, wheel, setuptools_scm, 'Cython>=0.28.4'"
+TERMUX_PKG_PYTHON_COMMON_BUILD_DEPS="setuptools, wheel, setuptools_scm, 'Cython>=0.28.4'"
 TERMUX_PKG_BUILD_IN_SRC=true
 
 _SKIA_REPO_URL=git+https://skia.googlesource.com/skia.git
diff --git a/packages/python-tflite-runtime/build.sh b/packages/python-tflite-runtime/build.sh
index 340e0152fe..9dd00a0ed3 100644
--- a/packages/python-tflite-runtime/build.sh
+++ b/packages/python-tflite-runtime/build.sh
@@ -8,7 +8,7 @@ TERMUX_PKG_SRCURL=git+https://github.com/tensorflow/tensorflow
 TERMUX_PKG_AUTO_UPDATE=true
 TERMUX_PKG_DEPENDS="python, python-numpy, python-pip"
 TERMUX_PKG_UPDATE_TAG_TYPE="latest-release-tag"
-TERMUX_PKG_PYTHON_COMMON_DEPS="setuptools, wheel, pybind11"
+TERMUX_PKG_PYTHON_COMMON_BUILD_DEPS="setuptools, wheel, pybind11"
 TERMUX_PKG_HOSTBUILD=true
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 -DCMAKE_POLICY_VERSION_MINIMUM=3.5
diff --git a/packages/python-tldp/build.sh b/packages/python-tldp/build.sh
index cc65f4f7b3..58ddfb5df4 100644
--- a/packages/python-tldp/build.sh
+++ b/packages/python-tldp/build.sh
@@ -9,7 +9,7 @@ TERMUX_PKG_SHA256=bae313095b877b4272ddccaabd70efcbc526e2c1036f63fb665ec7ce10c94c
 TERMUX_PKG_AUTO_UPDATE=true
 TERMUX_PKG_UPDATE_METHOD=repology
 TERMUX_PKG_DEPENDS="python, python-pip"
-TERMUX_PKG_PYTHON_COMMON_DEPS="wheel"
+TERMUX_PKG_PYTHON_COMMON_BUILD_DEPS="wheel"
 TERMUX_PKG_PYTHON_TARGET_DEPS="networkx, nose"
 TERMUX_PKG_PLATFORM_INDEPENDENT=true
 TERMUX_PKG_BUILD_IN_SRC=true
diff --git a/packages/python-torch/build.sh b/packages/python-torch/build.sh
index b25b1ef64a..91c85eb2b3 100644
--- a/packages/python-torch/build.sh
+++ b/packages/python-torch/build.sh
@@ -9,8 +9,8 @@ TERMUX_PKG_UPDATE_TAG_TYPE="latest-release-tag"
 TERMUX_PKG_DEPENDS="abseil-cpp, libc++, libopenblas, libprotobuf, python, python-numpy, python-pip"
 TERMUX_PKG_BUILD_DEPENDS="vulkan-headers, vulkan-loader-android"
 TERMUX_PKG_HOSTBUILD=true
-TERMUX_PKG_PYTHON_COMMON_DEPS="wheel, pyyaml, typing_extensions"
-TERMUX_PKG_PYTHON_BUILD_DEPS="numpy"
+TERMUX_PKG_PYTHON_COMMON_BUILD_DEPS="wheel, pyyaml, typing_extensions"
+TERMUX_PKG_PYTHON_CROSS_BUILD_DEPS="numpy"
 # USE_DISTRIBUTED=ON fixes
 # ModuleNotFoundError: No module named 'torch._C._distributed_c10d'; 'torch._C' is not a package
 # in
diff --git a/packages/python-torchaudio/build.sh b/packages/python-torchaudio/build.sh
index 756ae5d1c1..8e0139d60d 100644
--- a/packages/python-torchaudio/build.sh
+++ b/packages/python-torchaudio/build.sh
@@ -7,7 +7,7 @@ TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL="https://github.com/pytorch/audio/archive/refs/tags/v${TERMUX_PKG_VERSION}.tar.gz"
 TERMUX_PKG_SHA256=590492c90552959b3df6f601eb733135064bf2d9e53c516adcf6845a4e545662
 TERMUX_PKG_DEPENDS="libc++, python, python-pip, python-torch, python-torchcodec"
-TERMUX_PKG_PYTHON_COMMON_DEPS="wheel, setuptools"
+TERMUX_PKG_PYTHON_COMMON_BUILD_DEPS="wheel, setuptools"
 
 termux_step_pre_configure() {
 	termux_setup_cmake
diff --git a/packages/python-torchcodec/build.sh b/packages/python-torchcodec/build.sh
index ddd9a2640b..43a9fcea8a 100644
--- a/packages/python-torchcodec/build.sh
+++ b/packages/python-torchcodec/build.sh
@@ -8,7 +8,7 @@ TERMUX_PKG_SRCURL="https://github.com/pytorch/torchcodec/archive/refs/tags/v${TE
 TERMUX_PKG_SHA256=3a66ca7086369b90ee1dcc88ef0407360a065e1ee827105edbbe5b9ba9b7b666
 TERMUX_PKG_DEPENDS="ffmpeg, google-glog, libc++, python, python-pip, python-torch"
 TERMUX_PKG_BUILD_DEPENDS="pybind11"
-TERMUX_PKG_PYTHON_COMMON_DEPS="build"
+TERMUX_PKG_PYTHON_COMMON_BUILD_DEPS="build"
 
 termux_step_pre_configure() {
 	termux_setup_cmake
diff --git a/packages/python-xlib/build.sh b/packages/python-xlib/build.sh
index fe942af983..f82d59251b 100644
--- a/packages/python-xlib/build.sh
+++ b/packages/python-xlib/build.sh
@@ -8,7 +8,7 @@ TERMUX_PKG_SRCURL=https://github.com/python-xlib/python-xlib/archive/refs/tags/$
 TERMUX_PKG_SHA256=e10d1b49655800bffe0fbb5eb31eeef915a4421952ef006d468d53d34901f6f8
 TERMUX_PKG_AUTO_UPDATE=true
 TERMUX_PKG_DEPENDS="python, python-pip"
-TERMUX_PKG_PYTHON_COMMON_DEPS="wheel"
+TERMUX_PKG_PYTHON_COMMON_BUILD_DEPS="wheel"
 TERMUX_PKG_PYTHON_TARGET_DEPS="'six>=1.10.0'"
 TERMUX_PKG_PLATFORM_INDEPENDENT=true
 TERMUX_PKG_BUILD_IN_SRC=true
diff --git a/packages/python-yt-dlp/build.sh b/packages/python-yt-dlp/build.sh
index e1290f1dc3..94a684fdaa 100644
--- a/packages/python-yt-dlp/build.sh
+++ b/packages/python-yt-dlp/build.sh
@@ -8,7 +8,7 @@ TERMUX_PKG_SRCURL=https://github.com/yt-dlp/yt-dlp/archive/refs/tags/$TERMUX_PKG
 TERMUX_PKG_SHA256=10bec5b2bfb367263e7e46ddb69187204506f9d67b7f01bb499d07fa0d54d4b7
 TERMUX_PKG_DEPENDS="libc++, libexpat, openssl, python, python-brotli, python-pip, python-pycryptodomex"
 TERMUX_PKG_RECOMMENDS="ffmpeg, yt-dlp-ejs"
-TERMUX_PKG_PYTHON_COMMON_DEPS="hatchling, wheel"
+TERMUX_PKG_PYTHON_COMMON_BUILD_DEPS="hatchling, wheel"
 TERMUX_PKG_BUILD_IN_SRC=true
 TERMUX_PKG_HOSTBUILD=true
 TERMUX_PKG_AUTO_UPDATE=true
diff --git a/packages/ranger/build.sh b/packages/ranger/build.sh
index dbac636d4a..d55ca9d279 100644
--- a/packages/ranger/build.sh
+++ b/packages/ranger/build.sh
@@ -8,7 +8,7 @@ TERMUX_PKG_SHA256=7ad75e0d1b29087335fbb1691b05a800f777f4ec9cba84faa19355075d7f0f
 TERMUX_PKG_AUTO_UPDATE=true
 TERMUX_PKG_UPDATE_TAG_TYPE="newest-tag"
 TERMUX_PKG_DEPENDS="python, file"
-TERMUX_PKG_PYTHON_COMMON_DEPS="wheel"
+TERMUX_PKG_PYTHON_COMMON_BUILD_DEPS="wheel"
 TERMUX_PKG_BUILD_IN_SRC=true
 TERMUX_PKG_PLATFORM_INDEPENDENT=true
 
diff --git a/packages/rdiff-backup/build.sh b/packages/rdiff-backup/build.sh
index c0d0d6d088..5743bb2a1d 100644
--- a/packages/rdiff-backup/build.sh
+++ b/packages/rdiff-backup/build.sh
@@ -8,7 +8,7 @@ TERMUX_PKG_SRCURL=https://github.com/rdiff-backup/rdiff-backup/releases/download
 TERMUX_PKG_SHA256=d0778357266bc6513bb7f75a4570b29b24b2760348bbf607babfc3a6f09458cf
 TERMUX_PKG_AUTO_UPDATE=true
 TERMUX_PKG_DEPENDS="librsync, python, python-pip"
-TERMUX_PKG_PYTHON_COMMON_DEPS="wheel"
+TERMUX_PKG_PYTHON_COMMON_BUILD_DEPS="wheel"
 TERMUX_PKG_BUILD_IN_SRC=true
 
 termux_step_make() {
diff --git a/packages/recoll/build.sh b/packages/recoll/build.sh
index 51b3e4d98a..f8072e29bd 100644
--- a/packages/recoll/build.sh
+++ b/packages/recoll/build.sh
@@ -7,7 +7,7 @@ TERMUX_PKG_SRCURL=https://www.recoll.org/recoll-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=7509b58c4547e3700b0329c3d3366ca8f843bc35eea2293cc47e36e1becd7ea2
 TERMUX_PKG_AUTO_UPDATE=true
 TERMUX_PKG_DEPENDS="aspell, file, libc++, libiconv, libxapian, libxml2, libxslt, zlib"
-TERMUX_PKG_PYTHON_COMMON_DEPS="wheel"
+TERMUX_PKG_PYTHON_COMMON_BUILD_DEPS="wheel"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 -Dpython-chm=false
 -Dpython-aspell=false
diff --git a/packages/ruff/build.sh b/packages/ruff/build.sh
index c60e4e0488..1ab21f674e 100644
--- a/packages/ruff/build.sh
+++ b/packages/ruff/build.sh
@@ -7,7 +7,7 @@ TERMUX_PKG_SRCURL="https://github.com/charliermarsh/ruff/archive/refs/tags/$TERM
 TERMUX_PKG_SHA256=9294a2ff12994e710aa01fe37d22159b4d6d45ed309af7a9d10e71ca7313e0b8
 TERMUX_PKG_AUTO_UPDATE=true
 TERMUX_PKG_BUILD_IN_SRC=true
-TERMUX_PKG_PYTHON_COMMON_DEPS="maturin"
+TERMUX_PKG_PYTHON_COMMON_BUILD_DEPS="maturin"
 
 termux_step_pre_configure() {
 	termux_setup_rust
diff --git a/packages/tinysparql/build.sh b/packages/tinysparql/build.sh
index 9b55add1af..c8aa1120a8 100644
--- a/packages/tinysparql/build.sh
+++ b/packages/tinysparql/build.sh
@@ -7,7 +7,7 @@ TERMUX_PKG_SRCURL="https://github.com/GNOME/tinysparql/archive/refs/tags/${TERMU
 TERMUX_PKG_SHA256=37a987a4b59dd20b671eb21791a8d37d3c6d1172906f70edcee7889547986956
 TERMUX_PKG_DEPENDS="libicu, dbus, pygobject, python, json-glib, libxml2, sqlite"
 TERMUX_PKG_BUILD_DEPENDS="g-ir-scanner, icu-devtools, libsoup3, asciidoc, xorgproto, valac, gettext, libstemmer, binutils"
-TERMUX_PKG_PYTHON_COMMON_DEPS="docutils, setuptools"
+TERMUX_PKG_PYTHON_COMMON_BUILD_DEPS="docutils, setuptools"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 -Ddocs=false
 -Dbash_completion=false
@@ -17,8 +17,6 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 -Dtests=false
 -Doverride_sqlite_version_check=true
 "
-# Temporary - remove after the merge of https://github.com/termux/termux-packages/pull/23652
-TERMUX_PKG_RM_AFTER_INSTALL="lib/python$TERMUX_PYTHON_VERSION/site-packages/asciidoc/__pycache__"
 
 termux_step_post_get_source() {
 	rm -f subprojects/*.wrap
diff --git a/packages/vapoursynth/build.sh b/packages/vapoursynth/build.sh
index 8f7576c0a9..252b3ab730 100644
--- a/packages/vapoursynth/build.sh
+++ b/packages/vapoursynth/build.sh
@@ -6,7 +6,7 @@ TERMUX_PKG_VERSION="73"
 TERMUX_PKG_SRCURL="https://github.com/vapoursynth/vapoursynth/archive/refs/tags/R${TERMUX_PKG_VERSION}.tar.gz"
 TERMUX_PKG_SHA256=1bb8ffe31348eaf46d8f541b138f0136d10edaef0c130c1e5a13aa4a4b057280
 TERMUX_PKG_DEPENDS="libzimg, python"
-TERMUX_PKG_PYTHON_COMMON_DEPS="Cython"
+TERMUX_PKG_PYTHON_COMMON_BUILD_DEPS="Cython"
 TERMUX_PKG_BUILD_IN_SRC=true
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" --disable-x86-asm"
 TERMUX_PKG_AUTO_UPDATE=true
diff --git a/packages/yt-dlp-ejs/build.sh b/packages/yt-dlp-ejs/build.sh
index c6c7a0862f..d270295d19 100644
--- a/packages/yt-dlp-ejs/build.sh
+++ b/packages/yt-dlp-ejs/build.sh
@@ -6,7 +6,7 @@ TERMUX_PKG_VERSION="0.3.2"
 TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL="https://github.com/yt-dlp/ejs/releases/download/$TERMUX_PKG_VERSION/yt_dlp_ejs-$TERMUX_PKG_VERSION.tar.gz"
 TERMUX_PKG_SHA256=31a41292799992bdc913e03c9fac2a8c90c82a5cbbc792b2e3373b01da841e3e
-TERMUX_PKG_PYTHON_COMMON_DEPS="build, hatchling, hatch-vcs"
+TERMUX_PKG_PYTHON_COMMON_BUILD_DEPS="build, hatchling, hatch-vcs"
 TERMUX_PKG_PLATFORM_INDEPENDENT=true
 TERMUX_PKG_BUILD_IN_SRC=true
 TERMUX_PKG_AUTO_UPDATE=true
diff --git a/x11-packages/audiotube/build.sh b/x11-packages/audiotube/build.sh
index 30d17f52e8..6bfe82cf9c 100644
--- a/x11-packages/audiotube/build.sh
+++ b/x11-packages/audiotube/build.sh
@@ -9,7 +9,7 @@ TERMUX_PKG_SHA256=5549c2adcf877bf768776a4ffc83945a76a519a422b337758b4afa96f9c17c
 TERMUX_PKG_AUTO_UPDATE=true
 TERMUX_PKG_DEPENDS="futuresql, gst-plugins-bad, gst-plugins-good, gst-plugins-ugly, kf6-kcoreaddons, kf6-kcrash, kf6-ki18n, kf6-kiconthemes, kf6-kirigami, kf6-kwindowsystem, kf6-purpose, kirigami-addons, libc++, python, python-pip, qt6-qtbase, qt6-qtdeclarative, qt6-qtimageformats, qt6-qtmultimedia, qt6-qtsvg, python-yt-dlp"
 TERMUX_PKG_BUILD_DEPENDS="extra-cmake-modules, pybind11, qcoro, qcoro-static"
-TERMUX_PKG_PYTHON_COMMON_DEPS="ytmusicapi"
+TERMUX_PKG_PYTHON_COMMON_BUILD_DEPS="ytmusicapi"
 TERMUX_PKG_PYTHON_TARGET_DEPS="ytmusicapi"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 -DCMAKE_SYSTEM_NAME=Linux
diff --git a/x11-packages/gjots2/build.sh b/x11-packages/gjots2/build.sh
index 9d0eb71ac1..da70146956 100644
--- a/x11-packages/gjots2/build.sh
+++ b/x11-packages/gjots2/build.sh
@@ -7,6 +7,6 @@ TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://sourceforge.net/projects/gjots2/files/gjots2/${TERMUX_PKG_VERSION}/gjots2-${TERMUX_PKG_VERSION}.tgz
 TERMUX_PKG_SHA256=815d66f3d344ffb3dca4d8d4a1e69229160cee9c9d940d50d899d2b5ec5d9e11
 TERMUX_PKG_DEPENDS="gtksourceview4, pygobject, python"
-TERMUX_PKG_PYTHON_COMMON_DEPS="wheel"
+TERMUX_PKG_PYTHON_COMMON_BUILD_DEPS="wheel"
 TERMUX_PKG_PLATFORM_INDEPENDENT=true
 TERMUX_PKG_BUILD_IN_SRC=true
diff --git a/x11-packages/gnumeric/build.sh b/x11-packages/gnumeric/build.sh
index c4820052ed..11597af064 100644
--- a/x11-packages/gnumeric/build.sh
+++ b/x11-packages/gnumeric/build.sh
@@ -9,7 +9,7 @@ TERMUX_PKG_SHA256=cb3750b176d641f9423df721b831658c829557552f8887fedf8a53d907eceb
 TERMUX_PKG_AUTO_UPDATE=true
 TERMUX_PKG_DEPENDS="atk, gdk-pixbuf, glib, goffice, gtk3, libcairo, libgsf, libxml2, pango, zlib"
 TERMUX_PKG_BUILD_DEPENDS="g-ir-scanner"
-TERMUX_PKG_PYTHON_COMMON_DEPS="wheel"
+TERMUX_PKG_PYTHON_COMMON_BUILD_DEPS="wheel"
 TERMUX_PKG_RECOMMENDS="gnumeric-help"
 TERMUX_PKG_SUGGESTS="glpk"
 TERMUX_PKG_VERSIONED_GIR=false
diff --git a/x11-packages/godot/build.sh b/x11-packages/godot/build.sh
index b6266ea556..c7e30a0aa1 100644
--- a/x11-packages/godot/build.sh
+++ b/x11-packages/godot/build.sh
@@ -7,7 +7,7 @@ TERMUX_PKG_SRCURL=https://github.com/godotengine/godot/archive/refs/tags/$TERMUX
 TERMUX_PKG_SHA256=c62a6eafc4a2de44fda3ad2db6dbe989726cd4c37537e0af119eeb6886fe49f2
 TERMUX_PKG_DEPENDS="brotli, ca-certificates, fontconfig, freetype, glu, libandroid-execinfo, libc++, libenet, libgraphite, libjpeg-turbo, libogg, libtheora, libvorbis, libvpx, libwebp, libwslay, libxcursor, libxi, libxinerama, libxkbcommon, libxrandr, mbedtls, miniupnpc, opengl, opusfile, pcre2, sdl3, speechd, zlib, zstd"
 TERMUX_PKG_BUILD_DEPENDS="pulseaudio, yasm"
-TERMUX_PKG_PYTHON_COMMON_DEPS="scons"
+TERMUX_PKG_PYTHON_COMMON_BUILD_DEPS="scons"
 TERMUX_PKG_AUTO_UPDATE=true
 TERMUX_PKG_UPDATE_VERSION_REGEXP='\d+\.\d+(\.\d+)?(?=-stable)'
 TERMUX_PKG_BUILD_IN_SRC=true
diff --git a/x11-packages/kitty/build.sh b/x11-packages/kitty/build.sh
index 0b59e1e781..09e82a45e0 100644
--- a/x11-packages/kitty/build.sh
+++ b/x11-packages/kitty/build.sh
@@ -8,7 +8,7 @@ TERMUX_PKG_SHA256=93fcba4984a97ccb7d811f487a818d406e681912b6bbb8f0ca426103ddce7c
 # fontconfig is dlopen(3)ed:
 TERMUX_PKG_DEPENDS="dbus, fontconfig, harfbuzz, libpng, librsync, libx11, libxkbcommon, littlecms, ncurses, opengl, openssl, python, xxhash, zlib"
 TERMUX_PKG_BUILD_DEPENDS="libxcursor, libxi, libxinerama, libxrandr, simde, xorgproto"
-TERMUX_PKG_PYTHON_COMMON_DEPS="wheel"
+TERMUX_PKG_PYTHON_COMMON_BUILD_DEPS="wheel"
 TERMUX_PKG_BUILD_IN_SRC=true
 TERMUX_PKG_HOSTBUILD=true
 TERMUX_PKG_RM_AFTER_INSTALL="
diff --git a/x11-packages/libncnn/build.sh b/x11-packages/libncnn/build.sh
index b23c61334e..b1560be257 100644
--- a/x11-packages/libncnn/build.sh
+++ b/x11-packages/libncnn/build.sh
@@ -9,7 +9,7 @@ TERMUX_PKG_SHA256=b3190d1b6beae3aac30fa99f4d3fd89a2b47a010b888d2d2389189784743a6
 TERMUX_PKG_AUTO_UPDATE=false
 TERMUX_PKG_DEPENDS="abseil-cpp, glslang, libc++, libandroid-stub, libprotobuf, python-pip, python-numpy, python-opencv-python, vulkan-loader"
 TERMUX_PKG_BUILD_DEPENDS="vulkan-headers, vulkan-loader-android"
-TERMUX_PKG_PYTHON_COMMON_DEPS="wheel, pybind11"
+TERMUX_PKG_PYTHON_COMMON_BUILD_DEPS="wheel, pybind11"
 TERMUX_PKG_BUILD_IN_SRC=true
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 -DNCNN_AVX=OFF
diff --git a/x11-packages/opencv/build.sh b/x11-packages/opencv/build.sh
index 11ab27e5d8..9bb7506a82 100644
--- a/x11-packages/opencv/build.sh
+++ b/x11-packages/opencv/build.sh
@@ -14,7 +14,7 @@ TERMUX_PKG_SHA256=(
 TERMUX_PKG_AUTO_UPDATE=true
 TERMUX_PKG_DEPENDS="abseil-cpp, ffmpeg, libc++, libjpeg-turbo, libopenblas, libpng, libprotobuf, libtiff, libwebp, openjpeg, openjpeg-tools, qt6-qtbase, qt6-qt5compat, zlib"
 TERMUX_PKG_BUILD_DEPENDS="python-numpy-static"
-TERMUX_PKG_PYTHON_COMMON_DEPS="Cython, wheel"
+TERMUX_PKG_PYTHON_COMMON_BUILD_DEPS="Cython, wheel"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 -DCMAKE_INSTALL_LIBDIR=$TERMUX__PREFIX__LIB_SUBDIR
 -DCMAKE_INSTALL_INCLUDEDIR=$TERMUX__PREFIX__INCLUDE_SUBDIR
diff --git a/x11-packages/pyqt5/build.sh b/x11-packages/pyqt5/build.sh
index 57db7cd1e3..ba943b25c6 100644
--- a/x11-packages/pyqt5/build.sh
+++ b/x11-packages/pyqt5/build.sh
@@ -11,7 +11,7 @@ TERMUX_PKG_BUILD_DEPENDS="qt5-qtbase-cross-tools, qt5-qtdeclarative-cross-tools,
 # sip version 6.13 has this error:
 # AttributeError: 'ScopedName' object has no attribute 'types'
 # if that error disappears in the future, sip can be unpinned
-TERMUX_PKG_PYTHON_COMMON_DEPS="wheel, 'sip>=6.6.2,<6.13.0', 'PyQt-builder>=1.14.1,<2'"
+TERMUX_PKG_PYTHON_COMMON_BUILD_DEPS="wheel, 'sip>=6.6.2,<6.13.0', 'PyQt-builder>=1.14.1,<2'"
 TERMUX_PKG_PYTHON_TARGET_DEPS="'PyQt5-sip>=12.13,<13'"
 TERMUX_PKG_BUILD_IN_SRC=true
 TERMUX_PKG_EXTRA_MAKE_ARGS="
diff --git a/x11-packages/python-opencv-python/build.sh b/x11-packages/python-opencv-python/build.sh
index 2ad69372f3..2b6f97dcfe 100644
--- a/x11-packages/python-opencv-python/build.sh
+++ b/x11-packages/python-opencv-python/build.sh
@@ -8,7 +8,7 @@ TERMUX_PKG_REPOLOGY_METADATA_VERSION="$(. "$TERMUX_SCRIPTDIR/x11-packages/opencv
 TERMUX_PKG_SRCURL="https://github.com/opencv/opencv-python/archive/refs/tags/${TERMUX_PKG_VERSION}.tar.gz"
 TERMUX_PKG_SHA256=c1cfdef91a45468b1c4404af594e2286ce2bcd343fe318aae287997a395a6c90
 TERMUX_PKG_DEPENDS="opencv, opencv-python, python, python-pip"
-TERMUX_PKG_PYTHON_COMMON_DEPS="scikit-build"
+TERMUX_PKG_PYTHON_COMMON_BUILD_DEPS="scikit-build"
 TERMUX_PKG_BUILD_IN_SRC=true
 TERMUX_PKG_AUTO_UPDATE=true
 
diff --git a/x11-packages/python-pyqtwebengine/build.sh b/x11-packages/python-pyqtwebengine/build.sh
index ee3d7798bf..1c2cebf84a 100644
--- a/x11-packages/python-pyqtwebengine/build.sh
+++ b/x11-packages/python-pyqtwebengine/build.sh
@@ -8,7 +8,7 @@ TERMUX_PKG_SRCURL=https://files.pythonhosted.org/packages/source/P/PyQtWebEngine
 TERMUX_PKG_SHA256=f121ac6e4a2f96ac289619bcfc37f64e68362f24a346553f5d6c42efa4228a4d
 TERMUX_PKG_DEPENDS="libc++, pyqt5, python, python-pip, qt5-qtbase, qt5-qtwebengine"
 TERMUX_PKG_BUILD_DEPENDS="qt5-qtbase-cross-tools"
-TERMUX_PKG_PYTHON_COMMON_DEPS="wheel, PyQt-builder"
+TERMUX_PKG_PYTHON_COMMON_BUILD_DEPS="wheel, PyQt-builder"
 TERMUX_PKG_BUILD_IN_SRC=true
 TERMUX_PKG_EXTRA_MAKE_ARGS="
 --verbose
diff --git a/x11-packages/python-qscintilla/build.sh b/x11-packages/python-qscintilla/build.sh
index 8a2c205389..5fc57f2df1 100644
--- a/x11-packages/python-qscintilla/build.sh
+++ b/x11-packages/python-qscintilla/build.sh
@@ -9,7 +9,7 @@ TERMUX_PKG_SRCURL=https://www.riverbankcomputing.com/static/Downloads/QScintilla
 TERMUX_PKG_SHA256=dfe13c6acc9d85dfcba76ccc8061e71a223957a6c02f3c343b30a9d43a4cdd4d
 TERMUX_PKG_DEPENDS="libc++, pyqt5, python, python-pip, qscintilla (>= ${TERMUX_PKG_VERSION}), qt5-qtbase"
 TERMUX_PKG_BUILD_DEPENDS="qt5-qtbase-cross-tools"
-TERMUX_PKG_PYTHON_COMMON_DEPS="wheel, PyQt-builder"
+TERMUX_PKG_PYTHON_COMMON_BUILD_DEPS="wheel, PyQt-builder"
 TERMUX_PKG_BUILD_IN_SRC=true
 TERMUX_PKG_EXTRA_MAKE_ARGS="
 --verbose
diff --git a/x11-packages/xkeyboard-config/build.sh b/x11-packages/xkeyboard-config/build.sh
index 11e00098ea..5a8b3d1bb7 100644
--- a/x11-packages/xkeyboard-config/build.sh
+++ b/x11-packages/xkeyboard-config/build.sh
@@ -9,7 +9,7 @@ TERMUX_PKG_AUTO_UPDATE=true
 TERMUX_PKG_UPDATE_TAG_TYPE=newest-tag
 TERMUX_PKG_PLATFORM_INDEPENDENT=true
 TERMUX_PKG_BUILD_DEPENDS="python"
-TERMUX_PKG_PYTHON_COMMON_DEPS="StrEnum"
+TERMUX_PKG_PYTHON_COMMON_BUILD_DEPS="StrEnum"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 -Dcompat-rules=true
 -Dxorg-rules-symlinks=true