diff --git a/packages/asciidoc/build.sh b/packages/asciidoc/build.sh
index 5d0c308fad..f76fc50d72 100644
--- a/packages/asciidoc/build.sh
+++ b/packages/asciidoc/build.sh
@@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="Text document format for short documents, articles, book
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION="10.2.0"
-TERMUX_PKG_REVISION=2
+TERMUX_PKG_REVISION=3
 TERMUX_PKG_SRCURL=https://github.com/asciidoc/asciidoc-py3/archive/${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=684ea53c1f5b71d6d1ac6086bbc96906b1f709ecc7ab536615b0f0c9e1baa3cc
 TERMUX_PKG_AUTO_UPDATE=true
@@ -11,22 +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
-
-_PYTHON_VERSION=$(. $TERMUX_SCRIPTDIR/packages/python/build.sh; echo $_MAJOR_VERSION)
-
-termux_step_pre_configure() {
-	termux_setup_python_crossenv
-	pushd $TERMUX_PYTHON_CROSSENV_SRCDIR
-	_CROSSENV_PREFIX=$TERMUX_PKG_BUILDDIR/python-crossenv-prefix
-	python${_PYTHON_VERSION} -m crossenv \
-		$TERMUX_PREFIX/bin/python${_PYTHON_VERSION} \
-		${_CROSSENV_PREFIX}
-	popd
-	. ${_CROSSENV_PREFIX}/bin/activate
-	build-pip install wheel
-}
-
-termux_step_make_install() {
-	export PYTHONPATH=$TERMUX_PREFIX/lib/python${_PYTHON_VERSION}/site-packages
-	pip install --no-deps . --prefix $TERMUX_PREFIX
-}
+TERMUX_PKG_PYTHON_COMMON_DEPS="wheel"
diff --git a/packages/asciinema/build.sh b/packages/asciinema/build.sh
index 3a521b2e00..6eb7483c2e 100644
--- a/packages/asciinema/build.sh
+++ b/packages/asciinema/build.sh
@@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="Record and share your terminal sessions, the right way"
 TERMUX_PKG_LICENSE="GPL-3.0"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION=2.2.0
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_REVISION=2
 TERMUX_PKG_SRCURL=https://github.com/asciinema/asciinema/archive/v${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=cce6f0ed6bcf47d54fe5caae14862bfb5a2e39eec1b3b467a8ed1050c298d0ec
 TERMUX_PKG_AUTO_UPDATE=true
@@ -12,26 +12,8 @@ TERMUX_PKG_DEPENDS="python, ncurses-utils"
 TERMUX_PKG_BUILD_IN_SRC=true
 TERMUX_PKG_PLATFORM_INDEPENDENT=true
 TERMUX_PKG_HAS_DEBUG=false
-
-_PYTHON_VERSION=$(. $TERMUX_SCRIPTDIR/packages/python/build.sh; echo $_MAJOR_VERSION)
-
-termux_step_pre_configure() {
-	termux_setup_python_crossenv
-	pushd $TERMUX_PYTHON_CROSSENV_SRCDIR
-	_CROSSENV_PREFIX=$TERMUX_PKG_BUILDDIR/python-crossenv-prefix
-	python${_PYTHON_VERSION} -m crossenv \
-		$TERMUX_PREFIX/bin/python${_PYTHON_VERSION} \
-		${_CROSSENV_PREFIX}
-	popd
-	. ${_CROSSENV_PREFIX}/bin/activate
-	build-pip install wheel
-}
+TERMUX_PKG_PYTHON_COMMON_DEPS="wheel"
 
 termux_step_make() {
 	return
 }
-
-termux_step_make_install() {
-	export PYTHONPATH=$TERMUX_PREFIX/lib/python${_PYTHON_VERSION}/site-packages
-	pip install --no-deps . --prefix $TERMUX_PREFIX
-}
diff --git a/packages/borgbackup/build.sh b/packages/borgbackup/build.sh
index e51e345a6e..fb9bbfa414 100644
--- a/packages/borgbackup/build.sh
+++ b/packages/borgbackup/build.sh
@@ -3,32 +3,11 @@ TERMUX_PKG_DESCRIPTION="Deduplicating and compressing backup program"
 TERMUX_PKG_LICENSE="BSD 3-Clause"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION=1.1.17
-TERMUX_PKG_REVISION=9
+TERMUX_PKG_REVISION=10
 TERMUX_PKG_SRCURL=https://github.com/borgbackup/borg/releases/download/${TERMUX_PKG_VERSION}/borgbackup-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=7ab924fc017b24929bedceba0dcce16d56f9868bf9b5050d2aae2eb080671674
 # Cannot be updated to 1.2.0 (or newer) as it requires external python package
 #TERMUX_PKG_AUTO_UPDATE=true
 TERMUX_PKG_DEPENDS="libacl, liblz4, openssl, python, xxhash, zstd"
 TERMUX_PKG_BUILD_IN_SRC=true
-
-_PYTHON_VERSION=$(. $TERMUX_SCRIPTDIR/packages/python/build.sh; echo $_MAJOR_VERSION)
-
-termux_step_pre_configure() {
-	termux_setup_python_crossenv
-	pushd $TERMUX_PYTHON_CROSSENV_SRCDIR
-	_CROSSENV_PREFIX=$TERMUX_PKG_BUILDDIR/python-crossenv-prefix
-	python${_PYTHON_VERSION} -m crossenv \
-		$TERMUX_PREFIX/bin/python${_PYTHON_VERSION} \
-		${_CROSSENV_PREFIX}
-	popd
-	. ${_CROSSENV_PREFIX}/bin/activate
-
-	build-pip install Cython wheel
-
-	LDFLAGS+=" -lpython${_PYTHON_VERSION}"
-}
-
-termux_step_make_install() {
-	export PYTHONPATH=$TERMUX_PREFIX/lib/python${_PYTHON_VERSION}/site-packages
-	pip install --no-deps . --prefix $TERMUX_PREFIX
-}
+TERMUX_PKG_PYTHON_COMMON_DEPS="Cython, wheel"
diff --git a/packages/dbus-python/build.sh b/packages/dbus-python/build.sh
index bb6c8e2beb..74a0ddf499 100644
--- a/packages/dbus-python/build.sh
+++ b/packages/dbus-python/build.sh
@@ -3,10 +3,11 @@ TERMUX_PKG_DESCRIPTION="Python bindings for D-Bus"
 TERMUX_PKG_LICENSE="MIT"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION=1.3.2
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_REVISION=2
 TERMUX_PKG_SRCURL=https://dbus.freedesktop.org/releases/dbus-python/dbus-python-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=ad67819308618b5069537be237f8e68ca1c7fcc95ee4a121fe6845b1418248f8
 TERMUX_PKG_DEPENDS="dbus, glib, python"
+TERMUX_PKG_PYTHON_COMMON_DEPS="wheel"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 -Dpython=python
 "
@@ -14,18 +15,4 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 termux_step_pre_configure() {
 	# Force using Meson
 	rm -f configure
-
-	_PYTHON_VERSION=$(. $TERMUX_SCRIPTDIR/packages/python/build.sh; echo $_MAJOR_VERSION)
-
-	termux_setup_python_crossenv
-	pushd $TERMUX_PYTHON_CROSSENV_SRCDIR
-	_CROSSENV_PREFIX=$TERMUX_PKG_BUILDDIR/python-crossenv-prefix
-	python${_PYTHON_VERSION} -m crossenv \
-		$TERMUX_PREFIX/bin/python${_PYTHON_VERSION} \
-		${_CROSSENV_PREFIX}
-	popd
-	. ${_CROSSENV_PREFIX}/bin/activate
-	build-pip install wheel
-
-	LDFLAGS+=" -lpython${_PYTHON_VERSION}"
 }
diff --git a/packages/electrum/build.sh b/packages/electrum/build.sh
index 0b8b2319d1..10fb4f4614 100644
--- a/packages/electrum/build.sh
+++ b/packages/electrum/build.sh
@@ -3,38 +3,21 @@ TERMUX_PKG_DESCRIPTION="Electrum is a lightweight Bitcoin wallet"
 TERMUX_PKG_LICENSE="MIT"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION=4.3.3
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://download.electrum.org/$TERMUX_PKG_VERSION/Electrum-$TERMUX_PKG_VERSION.tar.gz
 TERMUX_PKG_SHA256=34f5c67db1234fd97cf199c66c3704dfea06c53853cd6ed87deb01cecb06b1b7
 TERMUX_PKG_DEPENDS="python, libsecp256k1"
-_PKG_PYTHON_DEPENDS="'qrcode' 'protobuf<4,>=3.12' 'qdarkstyle>=2.7' 'aiorpcx<0.23,>=0.22.0' 'aiohttp<4.0.0,>=3.3.0' 'aiohttp_socks>=0.3' 'certifi' 'bitstring' 'attrs>=19.2.0' 'dnspython>=2.0'"
+TERMUX_PKG_PYTHON_TARGET_DEPS="'qrcode', 'protobuf<4,>=3.12', 'qdarkstyle>=2.7', 'aiorpcx<0.23,>=0.22.0', 'aiohttp<4.0.0,>=3.3.0', 'aiohttp_socks>=0.3', 'certifi', 'bitstring', 'attrs>=19.2.0', 'dnspython>=2.0'"
 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)"
-
-_PYTHON_VERSION=$(. $TERMUX_SCRIPTDIR/packages/python/build.sh; echo $_MAJOR_VERSION)
-
-termux_step_pre_configure() {
-	termux_setup_python_crossenv
-	pushd $TERMUX_PYTHON_CROSSENV_SRCDIR
-	_CROSSENV_PREFIX=$TERMUX_PKG_BUILDDIR/python-crossenv-prefix
-	python${_PYTHON_VERSION} -m crossenv \
-		$TERMUX_PREFIX/bin/python${_PYTHON_VERSION} \
-		${_CROSSENV_PREFIX}
-	popd
-	. ${_CROSSENV_PREFIX}/bin/activate
-	build-pip install wheel
-}
-
-termux_step_make_install() {
-	export PYTHONPATH=$TERMUX_PREFIX/lib/python${_PYTHON_VERSION}/site-packages
-	PYTHONDONTWRITEBYTECODE=1 pip install --no-deps . --prefix $TERMUX_PREFIX
-}
+TERMUX_PKG_PYTHON_COMMON_DEPS="wheel"
 
 termux_step_create_debscripts() {
 	cat <<- EOF > ./postinst
 	#!$TERMUX_PREFIX/bin/sh
 	echo "Installing dependencies through pip..."
-	pip3 install ${_PKG_PYTHON_DEPENDS}
+	pip3 install ${TERMUX_PKG_PYTHON_TARGET_DEPS//, / }
 	EOF
 }
diff --git a/packages/fetchmail/build.sh b/packages/fetchmail/build.sh
index d7e587a781..f67b209ece 100644
--- a/packages/fetchmail/build.sh
+++ b/packages/fetchmail/build.sh
@@ -4,21 +4,10 @@ TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_LICENSE_FILE="COPYING"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION=6.4.35
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://sourceforge.net/projects/fetchmail/files/branch_${TERMUX_PKG_VERSION:0:3}/fetchmail-$TERMUX_PKG_VERSION.tar.xz
 TERMUX_PKG_SHA256=7b0b56cbc0fca854504f167795fab532d5a54d5a7d3b6e3e36a33f34a0960a01
 TERMUX_PKG_DEPENDS="openssl"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--with-ssl=$TERMUX_PREFIX"
-_PYTHON_VERSION=$(. $TERMUX_SCRIPTDIR/packages/python/build.sh; echo $_MAJOR_VERSION)
-TERMUX_PKG_RM_AFTER_INSTALL="lib/python${_PYTHON_VERSION}/site-packages/__pycache__"
-
-termux_step_pre_configure() {
-	termux_setup_python_crossenv
-	pushd $TERMUX_PYTHON_CROSSENV_SRCDIR
-	_CROSSENV_PREFIX=$TERMUX_PKG_BUILDDIR/python-crossenv-prefix
-	python${_PYTHON_VERSION} -m crossenv \
-		$TERMUX_PREFIX/bin/python${_PYTHON_VERSION} \
-		${_CROSSENV_PREFIX}
-	popd
-	. ${_CROSSENV_PREFIX}/bin/activate
-	build-pip install wheel
-}
+TERMUX_PKG_RM_AFTER_INSTALL="lib/python${TERMUX_PYTHON_VERSION}/site-packages/__pycache__"
+TERMUX_PKG_PYTHON_COMMON_DEPS="wheel"
diff --git a/packages/gobject-introspection/build.sh b/packages/gobject-introspection/build.sh
index 621dffb493..9e46ee82a3 100644
--- a/packages/gobject-introspection/build.sh
+++ b/packages/gobject-introspection/build.sh
@@ -4,12 +4,13 @@ TERMUX_PKG_LICENSE="LGPL-2.0, GPL-2.0"
 TERMUX_PKG_MAINTAINER="@termux"
 _MAJOR_VERSION=1.74
 TERMUX_PKG_VERSION=${_MAJOR_VERSION}.0
-TERMUX_PKG_REVISION=3
+TERMUX_PKG_REVISION=4
 TERMUX_PKG_SRCURL=https://download.gnome.org/sources/gobject-introspection/${_MAJOR_VERSION}/gobject-introspection-${TERMUX_PKG_VERSION}.tar.xz
 TERMUX_PKG_SHA256=347b3a719e68ba4c69ff2d57ee2689233ea8c07fc492205e573386779e42d653
 TERMUX_PKG_DEPENDS="glib, libffi"
 TERMUX_PKG_SUGGESTS="g-ir-scanner"
 TERMUX_PKG_DISABLE_GIR=false
+TERMUX_PKG_PYTHON_COMMON_DEPS="wheel"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 -Dcairo_libname=libcairo-gobject.so
 -Dpython=python
@@ -29,24 +30,12 @@ termux_step_pre_configure() {
 			"
 	fi
 
-	_PYTHON_VERSION=$(. $TERMUX_SCRIPTDIR/packages/python/build.sh; echo $_MAJOR_VERSION)
-
-	termux_setup_python_crossenv
-	pushd $TERMUX_PYTHON_CROSSENV_SRCDIR
-	_CROSSENV_PREFIX=$TERMUX_PKG_BUILDDIR/python-crossenv-prefix
-	python${_PYTHON_VERSION} -m crossenv \
-		$TERMUX_PREFIX/bin/python${_PYTHON_VERSION} \
-		${_CROSSENV_PREFIX}
-	popd
-	. ${_CROSSENV_PREFIX}/bin/activate
-	build-pip install wheel
-
 	echo "Applying meson-python.diff"
-	sed "s%@PYTHON_VERSION@%$_PYTHON_VERSION%g" \
+	sed "s%@PYTHON_VERSION@%$TERMUX_PYTHON_VERSION%g" \
 		$TERMUX_PKG_BUILDER_DIR/meson-python.diff | patch --silent -p1
 
 	CPPFLAGS+="
-		-I$TERMUX_PREFIX/include/python${_PYTHON_VERSION}
-		-I$TERMUX_PREFIX/include/python${_PYTHON_VERSION}/cpython
+		-I$TERMUX_PREFIX/include/python${TERMUX_PYTHON_VERSION}
+		-I$TERMUX_PREFIX/include/python${TERMUX_PYTHON_VERSION}/cpython
 		"
 }
diff --git a/packages/gst-python/build.sh b/packages/gst-python/build.sh
index a9faa9f616..63a5bd16de 100644
--- a/packages/gst-python/build.sh
+++ b/packages/gst-python/build.sh
@@ -3,25 +3,11 @@ TERMUX_PKG_DESCRIPTION="Python bindings for GStreamer"
 TERMUX_PKG_LICENSE="LGPL-2.1"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION=1.20.5
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://gstreamer.freedesktop.org/src/gst-python/gst-python-${TERMUX_PKG_VERSION}.tar.xz
 TERMUX_PKG_SHA256=27487652318659cfd7dc42784b713c78d29cc7a7df4fb397134c8c125f65e3b2
 TERMUX_PKG_DEPENDS="gst-plugins-base, gstreamer, pygobject, python"
+TERMUX_PKG_PYTHON_COMMON_DEPS="wheel"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 -Dtests=disabled
 "
-
-termux_step_pre_configure() {
-	_PYTHON_VERSION=$(. $TERMUX_SCRIPTDIR/packages/python/build.sh; echo $_MAJOR_VERSION)
-
-	termux_setup_python_crossenv
-	pushd $TERMUX_PYTHON_CROSSENV_SRCDIR
-	_CROSSENV_PREFIX=$TERMUX_PKG_BUILDDIR/python-crossenv-prefix
-	python${_PYTHON_VERSION} -m crossenv \
-		$TERMUX_PREFIX/bin/python${_PYTHON_VERSION} \
-		${_CROSSENV_PREFIX}
-	popd
-	. ${_CROSSENV_PREFIX}/bin/activate
-	build-pip install wheel
-
-	LDFLAGS+=" -lpython${_PYTHON_VERSION}"
-}
diff --git a/packages/libarrow-python/build.sh b/packages/libarrow-python/build.sh
index e8843b2bd8..1b852d8500 100644
--- a/packages/libarrow-python/build.sh
+++ b/packages/libarrow-python/build.sh
@@ -4,37 +4,24 @@ TERMUX_PKG_LICENSE="Apache-2.0"
 TERMUX_PKG_MAINTAINER="@termux"
 # Align the version with `libarrow-cpp` package.
 TERMUX_PKG_VERSION=10.0.1
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://github.com/apache/arrow/archive/refs/tags/apache-arrow-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=28c3e0402bc1c3c1e047b6e26cedb8d1d89b2b9497d576af24b0b700eef11701
 TERMUX_PKG_DEPENDS="libarrow-cpp, libc++, python"
 TERMUX_PKG_BUILD_DEPENDS="python-numpy"
-
-_PYTHON_VERSION=$(. $TERMUX_SCRIPTDIR/packages/python/build.sh; echo $_MAJOR_VERSION)
+TERMUX_PKG_PYTHON_COMMON_DEPS="Cython, wheel"
 
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 -DPYARROW_WITH_DATASET=ON
 -DPYARROW_WITH_HDFS=ON
 -DPYTHON_EXECUTABLE=python
--DPYTHON_INCLUDE_DIRS=$TERMUX_PREFIX/include/python${_PYTHON_VERSION}
+-DPYTHON_INCLUDE_DIRS=$TERMUX_PREFIX/include/python${TERMUX_PYTHON_VERSION}
 -DPYTHON_OTHER_LIBS=
--DNUMPY_INCLUDE_DIRS=$TERMUX_PREFIX/lib/python${_PYTHON_VERSION}/site-packages/numpy/core/include
+-DNUMPY_INCLUDE_DIRS=$TERMUX_PREFIX/lib/python${TERMUX_PYTHON_VERSION}/site-packages/numpy/core/include
 -DARROW_PKG_CONFIG_INCLUDEDIR=$TERMUX_PREFIX/include
 -DARROW_PKG_CONFIG_LIBDIR=$TERMUX_PREFIX/lib
 "
 
 termux_step_pre_configure() {
-	termux_setup_python_crossenv
-	pushd $TERMUX_PYTHON_CROSSENV_SRCDIR
-	_CROSSENV_PREFIX=$TERMUX_PKG_BUILDDIR/python-crossenv-prefix
-	python${_PYTHON_VERSION} -m crossenv \
-		$TERMUX_PREFIX/bin/python${_PYTHON_VERSION} \
-		${_CROSSENV_PREFIX}
-	popd
-	. ${_CROSSENV_PREFIX}/bin/activate
-
-	build-pip install Cython wheel
-
-	LDFLAGS+=" -lpython${_PYTHON_VERSION}"
-
 	TERMUX_PKG_SRCDIR+="/python/pyarrow/src"
 }
diff --git a/packages/libtorrent-rasterbar/build.sh b/packages/libtorrent-rasterbar/build.sh
index 424abf8b1d..3ef53bb8bf 100644
--- a/packages/libtorrent-rasterbar/build.sh
+++ b/packages/libtorrent-rasterbar/build.sh
@@ -8,24 +8,9 @@ TERMUX_PKG_SRCURL=https://github.com/arvidn/libtorrent/releases/download/v${TERM
 TERMUX_PKG_SHA256=09dd399b4477638cf140183f5f85d376abffb9c192bc2910002988e27d69e13e
 TERMUX_PKG_DEPENDS="boost, libc++, openssl, python"
 TERMUX_PKG_BUILD_DEPENDS="boost-headers"
+TERMUX_PKG_PYTHON_COMMON_DEPS="wheel"
 
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 -Dboost-python-module-name=python
 -Dpython-bindings=ON
 "
-
-termux_step_pre_configure() {
-	_PYTHON_VERSION=$(. $TERMUX_SCRIPTDIR/packages/python/build.sh; echo $_MAJOR_VERSION)
-
-	termux_setup_python_crossenv
-	pushd $TERMUX_PYTHON_CROSSENV_SRCDIR
-	_CROSSENV_PREFIX=$TERMUX_PKG_BUILDDIR/python-crossenv-prefix
-	python${_PYTHON_VERSION} -m crossenv \
-		$TERMUX_PREFIX/bin/python${_PYTHON_VERSION} \
-		${_CROSSENV_PREFIX}
-	popd
-	. ${_CROSSENV_PREFIX}/bin/activate
-	build-pip install wheel
-
-	LDFLAGS+=" -lpython${_PYTHON_VERSION}"
-}
diff --git a/packages/lilypond/build.sh b/packages/lilypond/build.sh
index ffba3b3046..a6f6733c36 100644
--- a/packages/lilypond/build.sh
+++ b/packages/lilypond/build.sh
@@ -5,10 +5,12 @@ TERMUX_PKG_LICENSE_FILE="COPYING, LICENSE, LICENSE.OFL"
 TERMUX_PKG_MAINTAINER="@termux"
 _MAJOR_VERSION=2.24
 TERMUX_PKG_VERSION=${_MAJOR_VERSION}.0
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://lilypond.org/download/sources/v${_MAJOR_VERSION}/lilypond-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=3cedbe3b92b02569e3a6f2f0674858967b3da278d70aa3e98aef5bdcd7f78b69
 TERMUX_PKG_DEPENDS="fontconfig, freetype, ghostscript, glib, guile, harfbuzz, libc++, pango, python, tex-gyre"
 TERMUX_PKG_BUILD_DEPENDS="flex"
+TERMUX_PKG_PYTHON_COMMON_DEPS="wheel"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 --disable-documentation
 --with-texgyre-dir=$TERMUX_PREFIX/share/fonts/tex-gyre
@@ -16,19 +18,6 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 GUILE_FLAVOR=guile-3.0
 "
 
-termux_step_pre_configure() {
-	_PYTHON_VERSION=$(. $TERMUX_SCRIPTDIR/packages/python/build.sh; echo $_MAJOR_VERSION)
-	termux_setup_python_crossenv
-	pushd $TERMUX_PYTHON_CROSSENV_SRCDIR
-	_CROSSENV_PREFIX=$TERMUX_PKG_BUILDDIR/python-crossenv-prefix
-	python${_PYTHON_VERSION} -m crossenv \
-		$TERMUX_PREFIX/bin/python${_PYTHON_VERSION} \
-		${_CROSSENV_PREFIX}
-	popd
-	. ${_CROSSENV_PREFIX}/bin/activate
-	build-pip install wheel
-}
-
 termux_step_post_make_install() {
 	pushd $TERMUX_PREFIX/share/lilypond
 	local dst
diff --git a/packages/matplotlib/build.sh b/packages/matplotlib/build.sh
index 050e3a4898..fab4e1a212 100644
--- a/packages/matplotlib/build.sh
+++ b/packages/matplotlib/build.sh
@@ -16,38 +16,18 @@ LICENSE/LICENSE_STIX
 LICENSE/LICENSE_YORICK"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION=3.6.3
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://github.com/matplotlib/matplotlib/archive/refs/tags/v${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=d39f9a93881b443bae6fbe73bf9c71dc2eb5b1921d9dcf1c97807f37728d459b
 TERMUX_PKG_DEPENDS="freetype, libc++, python, python-numpy, python-pillow"
-_PKG_PYTHON_DEPENDS="'contourpy>=1.0.1' 'cycler>=0.10' 'fonttools>=4.22.0' 'kiwisolver>=1.0.1' 'numpy>=1.19' 'packaging>=20.0' 'pyparsing>=2.2.1' 'python-dateutil>=2.7'"
+TERMUX_PKG_PYTHON_TARGET_DEPS="'contourpy>=1.0.1', 'cycler>=0.10', 'fonttools>=4.22.0', 'kiwisolver>=1.0.1', 'numpy>=1.19', 'packaging>=20.0', 'pyparsing>=2.2.1', 'python-dateutil>=2.7'"
 TERMUX_PKG_BUILD_IN_SRC=true
-
-_PYTHON_VERSION=$(. $TERMUX_SCRIPTDIR/packages/python/build.sh; echo $_MAJOR_VERSION)
-
-termux_step_pre_configure() {
-	termux_setup_python_crossenv
-	pushd $TERMUX_PYTHON_CROSSENV_SRCDIR
-	_CROSSENV_PREFIX=$TERMUX_PKG_BUILDDIR/python-crossenv-prefix
-	python${_PYTHON_VERSION} -m crossenv \
-		$TERMUX_PREFIX/bin/python${_PYTHON_VERSION} \
-		${_CROSSENV_PREFIX}
-	popd
-	. ${_CROSSENV_PREFIX}/bin/activate
-
-	build-pip install Cython numpy setuptools_scm setuptools_scm_git_archive wheel
-
-	LDFLAGS+=" -lpython${_PYTHON_VERSION} -lm"
-}
-
-termux_step_make_install() {
-	export PYTHONPATH=$TERMUX_PREFIX/lib/python${_PYTHON_VERSION}/site-packages
-	pip install --no-deps . --prefix $TERMUX_PREFIX
-}
+TERMUX_PKG_PYTHON_COMMON_DEPS="Cython, numpy, setuptools_scm, setuptools_scm_git_archive, wheel"
 
 termux_step_create_debscripts() {
 	cat <<- EOF > ./postinst
 	#!$TERMUX_PREFIX/bin/sh
 	echo "Installing dependencies through pip. This may take a while..."
-	MATHLIB="m" pip3 install ${_PKG_PYTHON_DEPENDS}
+	MATHLIB="m" pip3 install ${TERMUX_PKG_PYTHON_TARGET_DEPS//, / }
 	EOF
 }
diff --git a/packages/nala/build.sh b/packages/nala/build.sh
index 469eedbe5a..2c7598c78b 100644
--- a/packages/nala/build.sh
+++ b/packages/nala/build.sh
@@ -3,32 +3,21 @@ TERMUX_PKG_DESCRIPTION="Commandline frontend for the apt package manager"
 TERMUX_PKG_LICENSE="GPL-3.0"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION=0.12.1
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://gitlab.com/volian/nala/-/archive/v${TERMUX_PKG_VERSION}/nala-v${TERMUX_PKG_VERSION}.tar.bz2
 TERMUX_PKG_SHA256=98738c0cc98bc4b35a2c246632336febbfe7c9aaa210336f56f75baa219b3906
 TERMUX_PKG_DEPENDS="python-apt"
 TERMUX_PKG_PLATFORM_INDEPENDENT=true
 TERMUX_PKG_BUILD_IN_SRC=true
 TERMUX_PKG_AUTO_UPDATE=true
+TERMUX_PKG_PYTHON_COMMON_DEPS="poetry"
+TERMUX_PKG_PYTHON_TARGET_DEPS="anyio, httpx, jsbeautifier, pexpect, python-debian, rich, tomli, typer, typing-extensions"
 
 termux_step_pre_configure() {
 	rm -rf nala/__init__.py.orig
-
-	_PYTHON_VERSION=$(. $TERMUX_SCRIPTDIR/packages/python/build.sh; echo $_MAJOR_VERSION)
-
-	termux_setup_python_crossenv
-	pushd $TERMUX_PYTHON_CROSSENV_SRCDIR
-	_CROSSENV_PREFIX=$TERMUX_PKG_BUILDDIR/python-crossenv-prefix
-	python${_PYTHON_VERSION} -m crossenv \
-		$TERMUX_PREFIX/bin/python${_PYTHON_VERSION} \
-		${_CROSSENV_PREFIX}
-	popd
-	. ${_CROSSENV_PREFIX}/bin/activate
-
-	build-pip install poetry
 }
 
-termux_step_make_install() {
-	pip install . --no-deps --prefix $TERMUX_PREFIX
+termux_step_post_make_install() {
 	install -Dm600 -t $TERMUX_PREFIX/etc/nala debian/nala.conf
 }
 
@@ -39,6 +28,6 @@ termux_step_create_debscripts() {
 	mkdir -p $TERMUX_PREFIX/var/log/nala
 	mkdir -p $TERMUX_PREFIX/var/lock
 	echo "Installing dependencies through pip..."
-	pip3 install anyio httpx jsbeautifier pexpect python-debian rich tomli typer typing-extensions
+	pip3 install ${TERMUX_PKG_PYTHON_TARGET_DEPS//, / }
 	EOF
 }
diff --git a/packages/opencv/build.sh b/packages/opencv/build.sh
index 8958fe0bd6..dc76fe8744 100644
--- a/packages/opencv/build.sh
+++ b/packages/opencv/build.sh
@@ -3,10 +3,12 @@ TERMUX_PKG_DESCRIPTION="Open Source Computer Vision Library"
 TERMUX_PKG_LICENSE="Apache-2.0"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION=4.7.0
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://github.com/opencv/opencv/archive/${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=8df0079cdbe179748a18d44731af62a245a45ebf5085223dc03133954c662973
 TERMUX_PKG_DEPENDS="ffmpeg, libc++, libjpeg-turbo, libopenblas, libpng, libprotobuf, libtiff, libwebp, openjpeg, openjpeg-tools, zlib"
 TERMUX_PKG_BUILD_DEPENDS="python-numpy-static"
+TERMUX_PKG_PYTHON_COMMON_DEPS="Cython, wheel"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 -DANDROID_NO_TERMUX=OFF
 -DWITH_OPENEXR=OFF
@@ -38,22 +40,10 @@ termux_step_pre_configure() {
 		echo '!<arch>' > $_LIBRT_A
 	fi
 
-	# For Python bindings
-	_PYTHON_VERSION=$(. $TERMUX_SCRIPTDIR/packages/python/build.sh; echo $_MAJOR_VERSION)
-	termux_setup_python_crossenv
-	pushd $TERMUX_PYTHON_CROSSENV_SRCDIR
-	_CROSSENV_PREFIX=$TERMUX_PKG_BUILDDIR/python-crossenv-prefix
-	python${_PYTHON_VERSION} -m crossenv \
-		$TERMUX_PREFIX/bin/python${_PYTHON_VERSION} \
-		${_CROSSENV_PREFIX}
-	popd
-	. ${_CROSSENV_PREFIX}/bin/activate
-	build-pip install Cython wheel
-	LDFLAGS+=" -lpython${_PYTHON_VERSION}"
 	TERMUX_PKG_EXTRA_CONFIGURE_ARGS+="
 		-DPYTHON_DEFAULT_EXECUTABLE=python
-		-DPYTHON3_INCLUDE_PATH=$TERMUX_PREFIX/include/python${_PYTHON_VERSION}
-		-DPYTHON3_NUMPY_INCLUDE_DIRS=$TERMUX_PREFIX/lib/python${_PYTHON_VERSION}/site-packages/numpy/core/include
+		-DPYTHON3_INCLUDE_PATH=$TERMUX_PREFIX/include/python${TERMUX_PYTHON_VERSION}
+		-DPYTHON3_NUMPY_INCLUDE_DIRS=$TERMUX_PREFIX/lib/python${TERMUX_PYTHON_VERSION}/site-packages/numpy/core/include
 		"
 }
 
diff --git a/packages/panda3d/build.sh b/packages/panda3d/build.sh
index 40ae0d073e..77927182ee 100644
--- a/packages/panda3d/build.sh
+++ b/packages/panda3d/build.sh
@@ -3,24 +3,15 @@ TERMUX_PKG_DESCRIPTION="A framework for 3D rendering and game development for Py
 TERMUX_PKG_LICENSE="BSD 3-Clause"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION=1.10.13
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://github.com/panda3d/panda3d/archive/refs/tags/v${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=b865882d8cbb44e7a9b1e030ecc071e689391644eb68b0d8ed78b970e8d4d2c7
 TERMUX_PKG_DEPENDS="libc++, python"
 TERMUX_PKG_BUILD_DEPENDS="libandroid-glob"
+TERMUX_PKG_PYTHON_COMMON_DEPS="wheel"
 TERMUX_PKG_BUILD_IN_SRC=true
 
 termux_step_pre_configure() {
-	_PYTHON_VERSION=$(. $TERMUX_SCRIPTDIR/packages/python/build.sh; echo $_MAJOR_VERSION)
-	termux_setup_python_crossenv
-	pushd $TERMUX_PYTHON_CROSSENV_SRCDIR
-	_CROSSENV_PREFIX=$TERMUX_PKG_BUILDDIR/python-crossenv-prefix
-	python${_PYTHON_VERSION} -m crossenv \
-		$TERMUX_PREFIX/bin/python${_PYTHON_VERSION} \
-		${_CROSSENV_PREFIX}
-	popd
-	. ${_CROSSENV_PREFIX}/bin/activate
-	build-pip install wheel
-
 	CFLAGS+=" $CPPFLAGS"
 	CXXFLAGS+=" $CPPFLAGS"
 	LDFLAGS+=" -Wl,-rpath=$TERMUX_PREFIX/lib/panda3d"
diff --git a/packages/pycairo/build.sh b/packages/pycairo/build.sh
index 9aff4050fe..2213e4813c 100644
--- a/packages/pycairo/build.sh
+++ b/packages/pycairo/build.sh
@@ -3,22 +3,8 @@ TERMUX_PKG_DESCRIPTION="Python bindings for the cairo graphics library"
 TERMUX_PKG_LICENSE="LGPL-2.1"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION=1.23.0
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://github.com/pygobject/pycairo/releases/download/v${TERMUX_PKG_VERSION}/pycairo-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=9b61ac818723adc04367301317eb2e814a83522f07bbd1f409af0dada463c44c
 TERMUX_PKG_DEPENDS="libcairo, python"
-
-termux_step_pre_configure() {
-	_PYTHON_VERSION=$(. $TERMUX_SCRIPTDIR/packages/python/build.sh; echo $_MAJOR_VERSION)
-
-	termux_setup_python_crossenv
-	pushd $TERMUX_PYTHON_CROSSENV_SRCDIR
-	_CROSSENV_PREFIX=$TERMUX_PKG_BUILDDIR/python-crossenv-prefix
-	python${_PYTHON_VERSION} -m crossenv \
-		$TERMUX_PREFIX/bin/python${_PYTHON_VERSION} \
-		${_CROSSENV_PREFIX}
-	popd
-	. ${_CROSSENV_PREFIX}/bin/activate
-	build-pip install wheel
-
-	LDFLAGS+=" -lpython${_PYTHON_VERSION}"
-}
+TERMUX_PKG_PYTHON_COMMON_DEPS="wheel"
diff --git a/packages/pygobject/build.sh b/packages/pygobject/build.sh
index 2112d67e24..dd52404d49 100644
--- a/packages/pygobject/build.sh
+++ b/packages/pygobject/build.sh
@@ -4,11 +4,12 @@ TERMUX_PKG_LICENSE="LGPL-2.1"
 TERMUX_PKG_MAINTAINER="@termux"
 _MAJOR_VERSION=3.42
 TERMUX_PKG_VERSION=${_MAJOR_VERSION}.2
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_REVISION=2
 TERMUX_PKG_SRCURL=https://download.gnome.org/sources/pygobject/${_MAJOR_VERSION}/pygobject-${TERMUX_PKG_VERSION}.tar.xz
 TERMUX_PKG_SHA256=ade8695e2a7073849dd0316d31d8728e15e1e0bc71d9ff6d1c09e86be52bc957
 TERMUX_PKG_DEPENDS="glib, gobject-introspection, libcairo, libffi, pycairo, python"
 TERMUX_PKG_BUILD_DEPENDS="g-ir-scanner"
+TERMUX_PKG_PYTHON_COMMON_DEPS="wheel"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 -Dpycairo=enabled
 -Dtests=false
@@ -16,18 +17,4 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 
 termux_step_pre_configure() {
 	termux_setup_gir
-
-	_PYTHON_VERSION=$(. $TERMUX_SCRIPTDIR/packages/python/build.sh; echo $_MAJOR_VERSION)
-
-	termux_setup_python_crossenv
-	pushd $TERMUX_PYTHON_CROSSENV_SRCDIR
-	_CROSSENV_PREFIX=$TERMUX_PKG_BUILDDIR/python-crossenv-prefix
-	python${_PYTHON_VERSION} -m crossenv \
-		$TERMUX_PREFIX/bin/python${_PYTHON_VERSION} \
-		${_CROSSENV_PREFIX}
-	popd
-	. ${_CROSSENV_PREFIX}/bin/activate
-	build-pip install wheel
-
-	LDFLAGS+=" -lpython${_PYTHON_VERSION}"
 }
diff --git a/packages/python-apsw/build.sh b/packages/python-apsw/build.sh
index 041c00bfcc..58fda9f1b2 100644
--- a/packages/python-apsw/build.sh
+++ b/packages/python-apsw/build.sh
@@ -3,36 +3,17 @@ TERMUX_PKG_DESCRIPTION="Another Python SQLite Wrapper"
 TERMUX_PKG_LICENSE="ZLIB"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION=3.40.0.0
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://github.com/rogerbinns/apsw/archive/refs/tags/${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=c4ebd4c7008bcefe1112386496523bd8433035f9f8a8b1369b1c02923e763e73
 TERMUX_PKG_DEPENDS="libsqlite, python"
+TERMUX_PKG_PYTHON_COMMON_DEPS="wheel"
 TERMUX_PKG_BUILD_IN_SRC=true
 
-_PYTHON_VERSION=$(. $TERMUX_SCRIPTDIR/packages/python/build.sh; echo $_MAJOR_VERSION)
-
 termux_step_post_get_source() {
 	cp $TERMUX_PKG_BUILDER_DIR/setup.cfg ./
 }
 
-termux_step_pre_configure() {
-	termux_setup_python_crossenv
-	pushd $TERMUX_PYTHON_CROSSENV_SRCDIR
-	_CROSSENV_PREFIX=$TERMUX_PKG_BUILDDIR/python-crossenv-prefix
-	python${_PYTHON_VERSION} -m crossenv \
-		$TERMUX_PREFIX/bin/python${_PYTHON_VERSION} \
-		${_CROSSENV_PREFIX}
-	popd
-	. ${_CROSSENV_PREFIX}/bin/activate
-	build-pip install wheel
-
-	LDFLAGS+=" -lpython${_PYTHON_VERSION}"
-}
-
 termux_step_make() {
 	:
 }
-
-termux_step_make_install() {
-	export PYTHONPATH=$TERMUX_PREFIX/lib/python${_PYTHON_VERSION}/site-packages
-	pip install --no-deps . --prefix $TERMUX_PREFIX
-}
diff --git a/packages/python-bcrypt/build.sh b/packages/python-bcrypt/build.sh
index 1f27b2a596..9798a1799e 100644
--- a/packages/python-bcrypt/build.sh
+++ b/packages/python-bcrypt/build.sh
@@ -3,32 +3,19 @@ TERMUX_PKG_DESCRIPTION="Acceptable password hashing for your software and your s
 TERMUX_PKG_LICENSE="Apache-2.0"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION=4.0.1
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://pypi.io/packages/source/b/bcrypt/bcrypt-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=27d375903ac8261cfe4047f6709d16f7d18d39b1ec92aaf72af989552a650ebd
 TERMUX_PKG_DEPENDS="python"
 TERMUX_PKG_BUILD_DEPENDS="openssl"
+TERMUX_PKG_PYTHON_COMMON_DEPS="wheel, setuptools-rust"
 TERMUX_PKG_BUILD_IN_SRC=true
 
-_PYTHON_VERSION=$(. $TERMUX_SCRIPTDIR/packages/python/build.sh; echo $_MAJOR_VERSION)
-
 termux_step_pre_configure() {
 	termux_setup_rust
-
-	termux_setup_python_crossenv
-	pushd $TERMUX_PYTHON_CROSSENV_SRCDIR
-	_CROSSENV_PREFIX=$TERMUX_PKG_BUILDDIR/python-crossenv-prefix
-	python${_PYTHON_VERSION} -m crossenv \
-		$TERMUX_PREFIX/bin/python${_PYTHON_VERSION} \
-		${_CROSSENV_PREFIX}
-	popd
-	. ${_CROSSENV_PREFIX}/bin/activate
-
-	build-pip install wheel setuptools-rust
 }
 
-termux_step_make_install() {
+termux_step_post_configure() {
 	export CARGO_BUILD_TARGET=${CARGO_TARGET_NAME}
 	export PYO3_CROSS_LIB_DIR=$TERMUX_PREFIX/lib
-	export PYTHONPATH=$TERMUX_PREFIX/lib/python${_PYTHON_VERSION}/site-packages
-	pip install --no-deps . --prefix $TERMUX_PREFIX
 }
diff --git a/packages/python-numpy/build.sh b/packages/python-numpy/build.sh
index bdb980b6a4..c2b9f66dff 100644
--- a/packages/python-numpy/build.sh
+++ b/packages/python-numpy/build.sh
@@ -3,40 +3,19 @@ TERMUX_PKG_DESCRIPTION="The fundamental package for scientific computing with Py
 TERMUX_PKG_LICENSE="BSD 3-Clause"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION="1.24.1"
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=git+https://github.com/numpy/numpy
 TERMUX_PKG_DEPENDS="libandroid-complex-math, libc++, libopenblas, python"
 TERMUX_PKG_BUILD_IN_SRC=true
 TERMUX_PKG_AUTO_UPDATE=true
 TERMUX_PKG_UPDATE_TAG_TYPE="latest-release-tag"
-
+TERMUX_PKG_PYTHON_COMMON_DEPS="wheel, pybind11, Cython, pythran"
 TERMUX_PKG_RM_AFTER_INSTALL="
 bin/
 "
 
+LDFLAGS+="-landroid-complex-math -lm"
+
 termux_step_pre_configure() {
-	if $TERMUX_ON_DEVICE_BUILD; then
-		termux_error_exit "Package '$TERMUX_PKG_NAME' is not available for on-device builds."
-	fi
-	_PYTHON_VERSION=$(. $TERMUX_SCRIPTDIR/packages/python/build.sh; echo $_MAJOR_VERSION)
-}
-
-termux_step_configure() {
-	termux_setup_python_crossenv
-	pushd $TERMUX_PYTHON_CROSSENV_SRCDIR
-	_CROSSENV_PREFIX=$TERMUX_PKG_BUILDDIR/python-crossenv-prefix
-	python${_PYTHON_VERSION} -m crossenv \
-		$TERMUX_PREFIX/bin/python${_PYTHON_VERSION} \
-		${_CROSSENV_PREFIX}
-	popd
-	. ${_CROSSENV_PREFIX}/bin/activate
-	build-pip install wheel
-
-	LDFLAGS+=" -lpython${_PYTHON_VERSION} -landroid-complex-math -lm"
-
-	build-pip install pybind11 Cython pythran wheel
-}
-
-termux_step_make_install() {
-	export PYTHONPATH=$TERMUX_PREFIX/lib/python${_PYTHON_VERSION}/site-packages
-	MATHLIB="m" pip install --no-deps . --prefix $TERMUX_PREFIX
+	export MATHLIB="m"
 }
diff --git a/packages/python-pillow/build.sh b/packages/python-pillow/build.sh
index e32b4f36a1..0d11185863 100644
--- a/packages/python-pillow/build.sh
+++ b/packages/python-pillow/build.sh
@@ -3,27 +3,10 @@ TERMUX_PKG_DESCRIPTION="Python Imaging Library"
 TERMUX_PKG_LICENSE="custom"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION=9.4.0
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SHA256=494cee55efe8733d9744ba2d96fec067a15e22f37e6aefa14b01cc630e7cfb8c
 TERMUX_PKG_SRCURL=https://github.com/python-pillow/Pillow/archive/refs/tags/${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_DEPENDS="freetype, libimagequant, libjpeg-turbo, libraqm, libtiff, libwebp, libxcb, littlecms, openjpeg, python, zlib"
 TERMUX_PKG_LICENSE_FILE="LICENSE"
-
-termux_step_configure() {
-	_PYTHON_VERSION=$(. $TERMUX_SCRIPTDIR/packages/python/build.sh; echo $_MAJOR_VERSION)
-
-	termux_setup_python_crossenv
-	pushd $TERMUX_PYTHON_CROSSENV_SRCDIR
-	_CROSSENV_PREFIX=$TERMUX_PKG_BUILDDIR/python-crossenv-prefix
-	python${_PYTHON_VERSION} -m crossenv \
-		$TERMUX_PREFIX/bin/python${_PYTHON_VERSION} \
-		${_CROSSENV_PREFIX}
-	popd
-	. ${_CROSSENV_PREFIX}/bin/activate
-	build-pip install wheel
-
-	LDFLAGS+=" -lpython${_PYTHON_VERSION}"
-}
-
-termux_step_make_install() {
-	pip -v install --prefix $TERMUX_PREFIX $TERMUX_PKG_SRCDIR
-}
+TERMUX_PKG_PYTHON_COMMON_DEPS="wheel"
+TERMUX_PKG_BUILD_IN_SRC=true
diff --git a/packages/python-tldp/build.sh b/packages/python-tldp/build.sh
index 4c20c9c965..7d3f0cd2f1 100644
--- a/packages/python-tldp/build.sh
+++ b/packages/python-tldp/build.sh
@@ -3,37 +3,19 @@ TERMUX_PKG_DESCRIPTION="Tools for publishing from TLDP sources"
 TERMUX_PKG_LICENSE="MIT"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION=0.7.5
-TERMUX_PKG_REVISION=2
+TERMUX_PKG_REVISION=3
 TERMUX_PKG_SRCURL=https://github.com/tLDP/python-tldp/archive/refs/tags/tldp-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=bae313095b877b4272ddccaabd70efcbc526e2c1036f63fb665ec7ce10c94cde
 TERMUX_PKG_DEPENDS="python"
-_PKG_PYTHON_DEPENDS="networkx nose"
+TERMUX_PKG_PYTHON_COMMON_DEPS="wheel"
+TERMUX_PKG_PYTHON_TARGET_DEPS="networkx, nose"
 TERMUX_PKG_PLATFORM_INDEPENDENT=true
 TERMUX_PKG_BUILD_IN_SRC=true
 
-_PYTHON_VERSION=$(. $TERMUX_SCRIPTDIR/packages/python/build.sh; echo $_MAJOR_VERSION)
-
-termux_step_pre_configure() {
-	termux_setup_python_crossenv
-	pushd $TERMUX_PYTHON_CROSSENV_SRCDIR
-	_CROSSENV_PREFIX=$TERMUX_PKG_BUILDDIR/python-crossenv-prefix
-	python${_PYTHON_VERSION} -m crossenv \
-		$TERMUX_PREFIX/bin/python${_PYTHON_VERSION} \
-		${_CROSSENV_PREFIX}
-	popd
-	. ${_CROSSENV_PREFIX}/bin/activate
-	build-pip install wheel
-}
-
-termux_step_make_install() {
-	export PYTHONPATH=$TERMUX_PREFIX/lib/python${_PYTHON_VERSION}/site-packages
-	pip install --no-deps . --prefix $TERMUX_PREFIX
-}
-
 termux_step_create_debscripts() {
 	cat <<- EOF > ./postinst
 	#!$TERMUX_PREFIX/bin/sh
 	echo "Installing dependencies through pip..."
-	pip3 install ${_PKG_PYTHON_DEPENDS}
+	pip3 install ${TERMUX_PKG_PYTHON_TARGET_DEPS//, / }
 	EOF
 }
diff --git a/packages/ranger/build.sh b/packages/ranger/build.sh
index cc6536a8d2..84f9676ccb 100644
--- a/packages/ranger/build.sh
+++ b/packages/ranger/build.sh
@@ -3,32 +3,14 @@ TERMUX_PKG_DESCRIPTION="File manager with VI key bindings"
 TERMUX_PKG_LICENSE="GPL-3.0"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION=1.9.3
-TERMUX_PKG_REVISION=5
+TERMUX_PKG_REVISION=6
 TERMUX_PKG_SRCURL=https://github.com/ranger/ranger/archive/v${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=ce088a04c91c25263a9675dc5c43514b7ec1b38c8ea43d9a9d00923ff6cdd251
 TERMUX_PKG_DEPENDS="python, file"
+TERMUX_PKG_PYTHON_COMMON_DEPS="wheel"
 TERMUX_PKG_BUILD_IN_SRC=true
 TERMUX_PKG_PLATFORM_INDEPENDENT=true
 
-termux_step_pre_configure() {
-	_PYTHON_VERSION=$(. $TERMUX_SCRIPTDIR/packages/python/build.sh; echo $_MAJOR_VERSION)
-
-	termux_setup_python_crossenv
-	pushd $TERMUX_PYTHON_CROSSENV_SRCDIR
-	_CROSSENV_PREFIX=$TERMUX_PKG_BUILDDIR/python-crossenv-prefix
-	python${_PYTHON_VERSION} -m crossenv \
-		$TERMUX_PREFIX/bin/python${_PYTHON_VERSION} \
-		${_CROSSENV_PREFIX}
-	popd
-	. ${_CROSSENV_PREFIX}/bin/activate
-	build-pip install wheel
-}
-
 termux_step_make() {
 	echo Skipping make step...
 }
-
-termux_step_make_install() {
-	export PYTHONPATH=$TERMUX_PREFIX/lib/python${_PYTHON_VERSION}/site-packages
-	pip install --no-deps . --prefix $TERMUX_PREFIX
-}
diff --git a/packages/rdiff-backup/build.sh b/packages/rdiff-backup/build.sh
index b40e759d22..7e9443b5bc 100644
--- a/packages/rdiff-backup/build.sh
+++ b/packages/rdiff-backup/build.sh
@@ -3,33 +3,14 @@ TERMUX_PKG_DESCRIPTION="A utility for local/remote mirroring and incremental bac
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION="2.2.2"
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://github.com/rdiff-backup/rdiff-backup/releases/download/v${TERMUX_PKG_VERSION/\~/}/rdiff-backup-${TERMUX_PKG_VERSION/\~/}.tar.gz
 TERMUX_PKG_SHA256=4ce1ddd8ab15f4faed8cf547397b77ef10405c084bd61cb2a999f0ed1f78c1b9
 TERMUX_PKG_AUTO_UPDATE=true
 TERMUX_PKG_DEPENDS="librsync, python"
+TERMUX_PKG_PYTHON_COMMON_DEPS="wheel"
 TERMUX_PKG_BUILD_IN_SRC=true
 
-termux_step_pre_configure() {
-	_PYTHON_VERSION=$(. $TERMUX_SCRIPTDIR/packages/python/build.sh; echo $_MAJOR_VERSION)
-
-	termux_setup_python_crossenv
-	pushd $TERMUX_PYTHON_CROSSENV_SRCDIR
-	_CROSSENV_PREFIX=$TERMUX_PKG_BUILDDIR/python-crossenv-prefix
-	python${_PYTHON_VERSION} -m crossenv \
-		$TERMUX_PREFIX/bin/python${_PYTHON_VERSION} \
-		${_CROSSENV_PREFIX}
-	popd
-	. ${_CROSSENV_PREFIX}/bin/activate
-	build-pip install wheel
-
-	LDFLAGS+=" -lpython${_PYTHON_VERSION}"
-}
-
 termux_step_make() {
 	continue
 }
-
-termux_step_make_install() {
-	export PYTHONPATH=$TERMUX_PREFIX/lib/python${_PYTHON_VERSION}/site-packages
-	pip install --no-deps . --prefix $TERMUX_PREFIX
-}
diff --git a/packages/recoll/build.sh b/packages/recoll/build.sh
index 1f5570cb81..f373446b28 100644
--- a/packages/recoll/build.sh
+++ b/packages/recoll/build.sh
@@ -3,9 +3,11 @@ TERMUX_PKG_DESCRIPTION="Full-text search for your desktop"
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION=1.34.0
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://www.lesbonscomptes.com/recoll/recoll-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=7baeaac2c79dcbff6d866f986c2d538603f25378dd71862f2cb7e775c6594668
 TERMUX_PKG_DEPENDS="aspell, file, libc++, libiconv, libxapian, libxml2, libxslt, zlib"
+TERMUX_PKG_PYTHON_COMMON_DEPS="wheel"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 ac_cv_path_aspellProg=$TERMUX_PREFIX/bin/aspell
 --with-file-command=$TERMUX_PREFIX/bin/file
@@ -19,21 +21,10 @@ ac_cv_path_aspellProg=$TERMUX_PREFIX/bin/aspell
 termux_step_pre_configure() {
 	LDFLAGS+=" $($CC -print-libgcc-file-name)"
 	CXXFLAGS+=" -fPIC"
-	_PYTHON_VERSION=$(source $TERMUX_SCRIPTDIR/packages/python/build.sh; echo $_MAJOR_VERSION)
-	CPPFLAGS+=" -I${TERMUX_PREFIX}/include/python${_PYTHON_VERSION}/"
-
-	termux_setup_python_crossenv
-	pushd $TERMUX_PYTHON_CROSSENV_SRCDIR
-	_CROSSENV_PREFIX=$TERMUX_PKG_BUILDDIR/python-crossenv-prefix
-	python${_PYTHON_VERSION} -m crossenv \
-		$TERMUX_PREFIX/bin/python${_PYTHON_VERSION} \
-		${_CROSSENV_PREFIX}
-	popd
-	. ${_CROSSENV_PREFIX}/bin/activate
-	build-pip install wheel
+	CPPFLAGS+=" -I${TERMUX_PREFIX}/include/python${TERMUX_PYTHON_VERSION}/"
 
 	echo "Applying python-recoll-setup.py.in.diff"
-	sed "s|@PYTHON_VERSION@|${_PYTHON_VERSION}|g" \
+	sed "s|@PYTHON_VERSION@|${TERMUX_PYTHON_VERSION}|g" \
 		$TERMUX_PKG_BUILDER_DIR/python-recoll-setup.py.in.diff \
 		| patch --silent -p1
 }
diff --git a/packages/seafile-client/build.sh b/packages/seafile-client/build.sh
index 80390905af..5f156f0299 100644
--- a/packages/seafile-client/build.sh
+++ b/packages/seafile-client/build.sh
@@ -5,6 +5,7 @@ TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_LICENSE_FILE="LICENSE.txt"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION=8.0.10
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://github.com/haiwen/seafile/archive/v${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=bcfa6576a272486cf30b7fa2207992b01b071bcc5744f0923a0d924c0257b8a5
 TERMUX_PKG_AUTO_UPDATE=true
@@ -13,6 +14,7 @@ TERMUX_PKG_DEPENDS="glib, libcurl, libevent, libjansson, libsearpc, libsqlite, l
 TERMUX_PKG_BREAKS="seafile-client-dev, ccnet"
 TERMUX_PKG_REPLACES="seafile-client-dev, ccnet"
 TERMUX_PKG_BUILD_IN_SRC=true
+TERMUX_PKG_SETUP_PYTHON=true
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 --with-python_prefix=$TERMUX_PREFIX
 "
@@ -21,16 +23,6 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 termux_step_pre_configure() {
 	./autogen.sh
 	export CPPFLAGS="-I$TERMUX_PKG_SRCDIR/lib $CPPFLAGS"
-	local _PYTHON_VERSION=$(. $TERMUX_SCRIPTDIR/packages/python/build.sh; echo $_MAJOR_VERSION)
-
-	termux_setup_python_crossenv
-	pushd $TERMUX_PYTHON_CROSSENV_SRCDIR
-	_CROSSENV_PREFIX=$TERMUX_PKG_BUILDDIR/python-crossenv-prefix
-	python${_PYTHON_VERSION} -m crossenv \
-		$TERMUX_PREFIX/bin/python${_PYTHON_VERSION} \
-		${_CROSSENV_PREFIX}
-	popd
-	. ${_CROSSENV_PREFIX}/bin/activate
 }
 
 termux_step_post_configure() {
diff --git a/packages/speechd/build.sh b/packages/speechd/build.sh
index 715039f02d..708632b6e4 100644
--- a/packages/speechd/build.sh
+++ b/packages/speechd/build.sh
@@ -3,12 +3,13 @@ TERMUX_PKG_DESCRIPTION="Common interface to speech synthesis"
 TERMUX_PKG_LICENSE="LGPL-2.1, GPL-2.0"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION="0.11.4"
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_REVISION=2
 TERMUX_PKG_SHA256=628d4446894b47f0df099123924c1070180b5b5b09c5b637ebe80d8578fba92f
 TERMUX_PKG_SRCURL=https://github.com/brailcom/speechd/archive/${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_DEPENDS="dotconf, espeak, glib, libiconv, libltdl, libsndfile, pulseaudio, python, speechd-data"
 TERMUX_PKG_BUILD_DEPENDS="libiconv-static, libsndfile-static"
 TERMUX_PKG_AUTO_UPDATE=true
+TERMUX_PKG_SETUP_PYTHON=true
 
 # Fails to find generated headers
 TERMUX_PKG_BUILD_IN_SRC=true
@@ -26,20 +27,7 @@ TERMUX_PKG_RM_AFTER_INSTALL="bin/spd-conf"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS+="ac_cv_prog_HELP2MAN="
 
 termux_step_pre_configure() {
-	_PYTHON_VERSION=$(
-		source $TERMUX_SCRIPTDIR/packages/python/build.sh
-		echo $_MAJOR_VERSION
-	)
-	termux_setup_python_crossenv
-	pushd $TERMUX_PYTHON_CROSSENV_SRCDIR
-	_CROSSENV_PREFIX=$TERMUX_PKG_BUILDDIR/python-crossenv-prefix
-	python${_PYTHON_VERSION} -m crossenv \
-		$TERMUX_PREFIX/bin/python${_PYTHON_VERSION} \
-		${_CROSSENV_PREFIX}
-	popd
-	. ${_CROSSENV_PREFIX}/bin/activate
-
-	export am_cv_python_pythondir="${TERMUX_PREFIX}/lib/python${_PYTHON_VERSION}/site-packages"
+	export am_cv_python_pythondir="${TERMUX_PREFIX}/lib/python${TERMUX_PYTHON_VERSION}/site-packages"
 	export am_cv_python_pyexecdir="$am_cv_python_pythondir"
 	./build.sh
 }
diff --git a/packages/unbound/build.sh b/packages/unbound/build.sh
index f3a17c83c4..dfffe5a10d 100644
--- a/packages/unbound/build.sh
+++ b/packages/unbound/build.sh
@@ -7,6 +7,7 @@ TERMUX_PKG_SRCURL=https://nlnetlabs.nl/downloads/unbound/unbound-${TERMUX_PKG_VE
 TERMUX_PKG_SHA256=ee4085cecce12584e600f3d814a28fa822dfaacec1f94c84bfd67f8a5571a5f4
 TERMUX_PKG_DEPENDS="libevent, libexpat, libnghttp2, openssl, resolv-conf"
 TERMUX_PKG_BUILD_IN_SRC=true
+TERMUX_PKG_PYTHON_COMMON_DEPS="wheel"
 
 # `pythonmodule` makes core lib/libunbound.so depend on python. Do not enable it.
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
@@ -29,21 +30,6 @@ ac_cv_func_getpwnam=no
 --with-username=
 "
 
-termux_step_pre_configure() {
-	_PYTHON_VERSION=$(. $TERMUX_SCRIPTDIR/packages/python/build.sh; echo $_MAJOR_VERSION)
-	termux_setup_python_crossenv
-	pushd $TERMUX_PYTHON_CROSSENV_SRCDIR
-	_CROSSENV_PREFIX=$TERMUX_PKG_BUILDDIR/python-crossenv-prefix
-	python${_PYTHON_VERSION} -m crossenv \
-		$TERMUX_PREFIX/bin/python${_PYTHON_VERSION} \
-		${_CROSSENV_PREFIX}
-	popd
-	. ${_CROSSENV_PREFIX}/bin/activate
-	build-pip install wheel
-
-	export PYTHON_SITE_PKG=$TERMUX_PREFIX/lib/python${_PYTHON_VERSION}/site-packages
-}
-
 termux_step_post_massage() {
 	mkdir -p "$TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/var/run"
 }
diff --git a/x11-packages/gjots2/build.sh b/x11-packages/gjots2/build.sh
index 6da675a3e8..ca616fadd6 100644
--- a/x11-packages/gjots2/build.sh
+++ b/x11-packages/gjots2/build.sh
@@ -3,27 +3,10 @@ TERMUX_PKG_DESCRIPTION="A hierarchical note jotter"
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION=3.2.0
+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=accb68b9040642ba5c3924754c440efe7a1a07116b83bbc78a61b049b712259f
 TERMUX_PKG_DEPENDS="gtksourceview4, pygobject, python"
+TERMUX_PKG_PYTHON_COMMON_DEPS="wheel"
 TERMUX_PKG_PLATFORM_INDEPENDENT=true
 TERMUX_PKG_BUILD_IN_SRC=true
-
-termux_step_pre_configure() {
-	_PYTHON_VERSION=$(. $TERMUX_SCRIPTDIR/packages/python/build.sh; echo $_MAJOR_VERSION)
-
-	termux_setup_python_crossenv
-	pushd $TERMUX_PYTHON_CROSSENV_SRCDIR
-	_CROSSENV_PREFIX=$TERMUX_PKG_BUILDDIR/python-crossenv-prefix
-	python${_PYTHON_VERSION} -m crossenv \
-		$TERMUX_PREFIX/bin/python${_PYTHON_VERSION} \
-		${_CROSSENV_PREFIX}
-	popd
-	. ${_CROSSENV_PREFIX}/bin/activate
-	build-pip install wheel
-}
-
-termux_step_make_install() {
-	export PYTHONPATH=$TERMUX_PREFIX/lib/python${_PYTHON_VERSION}/site-packages
-	pip install --no-deps . --prefix $TERMUX_PREFIX
-}
diff --git a/x11-packages/gnumeric/build.sh b/x11-packages/gnumeric/build.sh
index a4ce6a3a25..13c041d4a4 100644
--- a/x11-packages/gnumeric/build.sh
+++ b/x11-packages/gnumeric/build.sh
@@ -4,11 +4,12 @@ TERMUX_PKG_LICENSE="GPL-2.0, GPL-3.0"
 TERMUX_PKG_MAINTAINER="@termux"
 _MAJOR_VERSION=1.12
 TERMUX_PKG_VERSION=${_MAJOR_VERSION}.53
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_REVISION=2
 TERMUX_PKG_SRCURL=https://download.gnome.org/sources/gnumeric/${_MAJOR_VERSION}/gnumeric-${TERMUX_PKG_VERSION}.tar.xz
 TERMUX_PKG_SHA256=5568e4c8dceabb9028f1361d1045522f95f0a71daa59e973cbdd2d39badd4f02
 TERMUX_PKG_DEPENDS="glib, goffice, gtk3, libcairo, libgsf, libxml2, pango, zlib"
 TERMUX_PKG_BUILD_DEPENDS="g-ir-scanner"
+TERMUX_PKG_PYTHON_COMMON_DEPS="wheel"
 TERMUX_PKG_RECOMMENDS="gnumeric-help"
 TERMUX_PKG_SUGGESTS="glpk"
 TERMUX_PKG_DISABLE_GIR=false
@@ -29,23 +30,12 @@ share/glib-2.0/schemas/gschemas.compiled
 termux_step_pre_configure() {
 	termux_setup_gir
 
-	_PYTHON_VERSION=$(. $TERMUX_SCRIPTDIR/packages/python/build.sh; echo $_MAJOR_VERSION)
-	termux_setup_python_crossenv
-	pushd $TERMUX_PYTHON_CROSSENV_SRCDIR
-	_CROSSENV_PREFIX=$TERMUX_PKG_BUILDDIR/python-crossenv-prefix
-	python${_PYTHON_VERSION} -m crossenv \
-		$TERMUX_PREFIX/bin/python${_PYTHON_VERSION} \
-		${_CROSSENV_PREFIX}
-	popd
-	. ${_CROSSENV_PREFIX}/bin/activate
-	build-pip install wheel
-
 	echo "Applying plugins-python-loader-Makefile.in.diff"
-	sed "s|@PYTHON_VERSION@|${_PYTHON_VERSION}|g" \
+	sed "s|@PYTHON_VERSION@|${TERMUX_PYTHON_VERSION}|g" \
 		$TERMUX_PKG_BUILDER_DIR/plugins-python-loader-Makefile.in.diff \
 		| patch --silent -p1
 
-	export PYTHON_GIOVERRIDESDIR=$TERMUX_PREFIX/lib/python${_PYTHON_VERSION}/site-packages/gi/overrides
+	export PYTHON_GIOVERRIDESDIR=$TERMUX_PREFIX/lib/python${TERMUX_PYTHON_VERSION}/site-packages/gi/overrides
 
 	CPPFLAGS+=" -D__USE_GNU"
 }
diff --git a/x11-packages/hexchat/build.sh b/x11-packages/hexchat/build.sh
index c2ae55f55d..14511e0e1d 100644
--- a/x11-packages/hexchat/build.sh
+++ b/x11-packages/hexchat/build.sh
@@ -3,9 +3,11 @@ TERMUX_PKG_DESCRIPTION="A popular and easy to use graphical IRC (chat) client"
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION=2.16.1
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://github.com/hexchat/hexchat/archive/v${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=f15bc487312a96a902e042e8f197a8494a29bcf4a00bbfd276a5e8154263bfe5
 TERMUX_PKG_DEPENDS="gdk-pixbuf, glib, gtk2, liblua53, libx11, openssl, pango, python"
+TERMUX_PKG_PYTHON_COMMON_DEPS="cffi"
 
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 -Dlibcanberra=disabled
@@ -17,18 +19,3 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 "
 
 TERMUX_PKG_RM_AFTER_INSTALL="share/locale"
-
-termux_step_pre_configure() {
-	local _PYTHON_VERSION=$(. $TERMUX_SCRIPTDIR/packages/python/build.sh; echo $_MAJOR_VERSION)
-
-	termux_setup_python_crossenv
-	pushd $TERMUX_PYTHON_CROSSENV_SRCDIR
-	_CROSSENV_PREFIX=$TERMUX_PKG_BUILDDIR/python-crossenv-prefix
-	python${_PYTHON_VERSION} -m crossenv \
-		$TERMUX_PREFIX/bin/python${_PYTHON_VERSION} \
-		${_CROSSENV_PREFIX}
-	popd
-	. ${_CROSSENV_PREFIX}/bin/activate
-
-	build-pip install cffi
-}
diff --git a/x11-packages/kitty/build.sh b/x11-packages/kitty/build.sh
index af0b210871..03bb6a22fd 100644
--- a/x11-packages/kitty/build.sh
+++ b/x11-packages/kitty/build.sh
@@ -5,11 +5,13 @@ TERMUX_PKG_MAINTAINER="@termux"
 # When updating the package, also update terminfo for kitty by updating
 # ncurses' kitty sources in main repo
 TERMUX_PKG_VERSION=0.26.5
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://github.com/kovidgoyal/kitty/releases/download/v${TERMUX_PKG_VERSION}/kitty-${TERMUX_PKG_VERSION}.tar.xz
 TERMUX_PKG_SHA256=5544a580314fec7711187ce28162909b5ecff6780071444fe96fb97f8be5c9ad
 # fontconfig is dlopen(3)ed:
 TERMUX_PKG_DEPENDS="dbus, fontconfig, harfbuzz, libpng, librsync, libx11, libxkbcommon, littlecms, mesa (>= 22.0.3), ncurses, openssl, python, zlib"
 TERMUX_PKG_BUILD_DEPENDS="libxcursor, libxi, libxinerama, libxrandr, xorgproto"
+TERMUX_PKG_PYTHON_COMMON_DEPS="wheel"
 TERMUX_PKG_BUILD_IN_SRC=true
 TERMUX_PKG_RM_AFTER_INSTALL="
 share/doc/kitty/html
@@ -23,17 +25,6 @@ termux_step_post_get_source() {
 }
 
 termux_step_pre_configure() {
-	_PYTHON_VERSION=$(. $TERMUX_SCRIPTDIR/packages/python/build.sh; echo $_MAJOR_VERSION)
-	termux_setup_python_crossenv
-	pushd $TERMUX_PYTHON_CROSSENV_SRCDIR
-	_CROSSENV_PREFIX=$TERMUX_PKG_BUILDDIR/python-crossenv-prefix
-	python${_PYTHON_VERSION} -m crossenv \
-		$TERMUX_PREFIX/bin/python${_PYTHON_VERSION} \
-		${_CROSSENV_PREFIX}
-	popd
-	. ${_CROSSENV_PREFIX}/bin/activate
-	build-pip install wheel
-
 	CFLAGS+=" $CPPFLAGS"
 
 	_NEED_DUMMY_LIBRT_A=
diff --git a/x11-packages/pyqt5/build.sh b/x11-packages/pyqt5/build.sh
index 87f65cae64..c4d8b83218 100644
--- a/x11-packages/pyqt5/build.sh
+++ b/x11-packages/pyqt5/build.sh
@@ -3,10 +3,13 @@ TERMUX_PKG_DESCRIPTION="Comprehensive Python Bindings for Qt v5"
 TERMUX_PKG_LICENSE="GPL-3.0"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION=5.15.7
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://ftp-osl.osuosl.org/pub/gentoo/distfiles/PyQt5-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=755121a52b3a08cb07275c10ebb96576d36e320e572591db16cfdbc558101594
 TERMUX_PKG_DEPENDS="libc++, python, qt5-qtbase, qt5-qtdeclarative, qt5-qtlocation, qt5-qtmultimedia, qt5-qtsensors, qt5-qtsvg, qt5-qttools, qt5-qtwebchannel, qt5-qtwebkit, qt5-qtwebsockets, qt5-qtx11extras, qt5-qtxmlpatterns"
 TERMUX_PKG_BUILD_DEPENDS="qt5-qtbase-cross-tools, qt5-qtdeclarative-cross-tools, qt5-qttools-cross-tools"
+TERMUX_PKG_PYTHON_COMMON_DEPS="wheel, PyQt-builder"
+TERMUX_PKG_PYTHON_TARGET_DEPS="PyQt5-sip"
 TERMUX_PKG_BUILD_IN_SRC=true
 TERMUX_PKG_EXTRA_MAKE_ARGS="
 --verbose
@@ -33,33 +36,21 @@ TERMUX_PKG_EXTRA_MAKE_ARGS="
 TERMUX_PKG_EXTRA_MAKE_ARGS+=" --disable=QtQuick"
 
 termux_step_pre_configure() {
-	_PYTHON_VERSION=$(. $TERMUX_SCRIPTDIR/packages/python/build.sh; echo $_MAJOR_VERSION)
-	termux_setup_python_crossenv
-	pushd $TERMUX_PYTHON_CROSSENV_SRCDIR
-	_CROSSENV_PREFIX=$TERMUX_PKG_BUILDDIR/python-crossenv-prefix
-	python${_PYTHON_VERSION} -m crossenv \
-		$TERMUX_PREFIX/bin/python${_PYTHON_VERSION} \
-		${_CROSSENV_PREFIX}
-	popd
-	. ${_CROSSENV_PREFIX}/bin/activate
-
-	build-pip install wheel PyQt-builder
-
 	local _cxx=$(basename $CXX)
 	local _bindir=$TERMUX_PKG_BUILDDIR/_wrapper/bin
 	mkdir -p ${_bindir}
 	sed -e 's|@CXX@|'"$(command -v $CXX)"'|g' \
 		-e 's|@TERMUX_PREFIX@|'"${TERMUX_PREFIX}"'|g' \
-		-e 's|@PYTHON_VERSION@|'"${_PYTHON_VERSION}"'|g' \
+		-e 's|@PYTHON_VERSION@|'"${TERMUX_PYTHON_VERSION}"'|g' \
 		$TERMUX_PKG_BUILDER_DIR/cxx-wrapper > ${_bindir}/${_cxx}
 	chmod 0700 ${_bindir}/${_cxx}
 	export PATH=${_bindir}:$PATH
 
-	TERMUX_PKG_EXTRA_MAKE_ARGS+=" --target-dir=$TERMUX_PREFIX/lib/python${_PYTHON_VERSION}/site-packages"
+	TERMUX_PKG_EXTRA_MAKE_ARGS+=" --target-dir=$PYTHONPATH"
 }
 
 termux_step_make() {
-	python ${_CROSSENV_PREFIX}/build/bin/sip-build \
+	python ${TERMUX_PYTHON_CROSSENV_PREFIX}/build/bin/sip-build \
 		--jobs ${TERMUX_MAKE_PROCESSES} \
 		${TERMUX_PKG_EXTRA_MAKE_ARGS}
 }
@@ -81,6 +72,6 @@ termux_step_create_debscripts() {
 	cat <<- EOF > ./postinst
 	#!$TERMUX_PREFIX/bin/sh
 	echo "Installing dependencies through pip..."
-	pip3 install PyQt5-sip
+	pip3 install $TERMUX_PKG_PYTHON_TARGET_DEPS
 	EOF
 }