diff --git a/common/shlibs b/common/shlibs
index 828c6aa855e040..c0ab6926bfbc2b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4545,3 +4545,4 @@ libflashrom.so.1 flashrom-1.4.0_1
 libpyside6.so.6.7 libpyside6-6.7.2_1
 libpyside6qml.so.6.7 libpyside6-6.7.2_1
 libshiboken6.so.6.7 libshiboken6-6.7.2_1
+libGeographicLib.so.26 libgeographic-2.3_1
diff --git a/srcpkgs/composer8.1/template b/srcpkgs/composer8.1/template
index a7c8180604be46..cacec133a903cc 100644
--- a/srcpkgs/composer8.1/template
+++ b/srcpkgs/composer8.1/template
@@ -1,17 +1,17 @@
 # Template file for 'composer8.1'
 pkgname=composer8.1
-version=2.7.7
+version=2.8.3
 revision=1
 build_style=fetch
 depends="php8.1"
 short_desc="Dependency manager for PHP"
-maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://getcomposer.org/"
 changelog="https://raw.githubusercontent.com/composer/composer/main/CHANGELOG.md"
 distfiles="https://github.com/composer/composer/releases/download/${version}/composer.phar
  https://raw.githubusercontent.com/composer/composer/main/LICENSE"
-checksum="aab940cd53d285a54c50465820a2080fcb7182a4ba1e5f795abfb10414a4b4be
+checksum="8323b4105c6e166d47c9db93209370083f9e421743636e108c37d8c1126386ef
  7855ac293067aebe7e51afdd23b9dea54b8be24187dbecc9b9142581c37f596c"
 alternatives="composer:composer:/usr/bin/composer8.1"
 
diff --git a/srcpkgs/composer8.2/template b/srcpkgs/composer8.2/template
index 50336e8687051a..879074ccddcfd2 100644
--- a/srcpkgs/composer8.2/template
+++ b/srcpkgs/composer8.2/template
@@ -1,17 +1,17 @@
 # Template file for 'composer8.2'
 pkgname=composer8.2
-version=2.7.7
+version=2.8.3
 revision=1
 build_style=fetch
 depends="php8.2"
 short_desc="Dependency manager for PHP"
-maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://getcomposer.org/"
 changelog="https://raw.githubusercontent.com/composer/composer/main/CHANGELOG.md"
 distfiles="https://github.com/composer/composer/releases/download/${version}/composer.phar
  https://raw.githubusercontent.com/composer/composer/main/LICENSE"
-checksum="aab940cd53d285a54c50465820a2080fcb7182a4ba1e5f795abfb10414a4b4be
+checksum="8323b4105c6e166d47c9db93209370083f9e421743636e108c37d8c1126386ef
  7855ac293067aebe7e51afdd23b9dea54b8be24187dbecc9b9142581c37f596c"
 alternatives="composer:composer:/usr/bin/composer8.2"
 
diff --git a/srcpkgs/composer8.3/template b/srcpkgs/composer8.3/template
index 3574c288855f2c..ebeeeececa1a1d 100644
--- a/srcpkgs/composer8.3/template
+++ b/srcpkgs/composer8.3/template
@@ -1,17 +1,17 @@
 # Template file for 'composer8.3'
 pkgname=composer8.3
-version=2.7.7
+version=2.8.3
 revision=1
 build_style=fetch
 depends="php8.3"
 short_desc="Dependency manager for PHP"
-maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://getcomposer.org/"
 changelog="https://raw.githubusercontent.com/composer/composer/main/CHANGELOG.md"
 distfiles="https://github.com/composer/composer/releases/download/${version}/composer.phar
  https://raw.githubusercontent.com/composer/composer/main/LICENSE"
-checksum="aab940cd53d285a54c50465820a2080fcb7182a4ba1e5f795abfb10414a4b4be
+checksum="8323b4105c6e166d47c9db93209370083f9e421743636e108c37d8c1126386ef
  7855ac293067aebe7e51afdd23b9dea54b8be24187dbecc9b9142581c37f596c"
 alternatives="composer:composer:/usr/bin/composer8.3"
 
diff --git a/srcpkgs/gotk3/template b/srcpkgs/gotk3/template
new file mode 100644
index 00000000000000..9251f723521280
--- /dev/null
+++ b/srcpkgs/gotk3/template
@@ -0,0 +1,23 @@
+# Template file for 'gotk3'
+pkgname=gotk3
+version=0.6.3
+revision=1
+#archs="i686 x86_64"
+#build_wrksrc=
+build_style=go
+go_import_path="github.com/gotk3/gotk3"
+#configure_args=""
+#make_build_args=""
+#make_install_args=""
+#conf_files=""
+#make_dirs="/var/log/dir 0755 root root"
+hostmakedepends=""
+makedepends="gtk+3-devel glib-devel cairo-devel"
+depends=""
+short_desc="Go bindings for GTK3"
+maintainer="zenobit <zenobit@disroot.org>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/gotk3/gotk3"
+#changelog=""
+distfiles="https://github.com/gotk3/gotk3/archive/refs/tags/v${version}.tar.gz"
+checksum=cf233b835b1fdd23afa393d1e7483c44a57ab7729afe3a72e7ae3ded2b27a0c8
diff --git a/srcpkgs/libgeographic/template b/srcpkgs/libgeographic/template
new file mode 100644
index 00000000000000..70a417f9266cda
--- /dev/null
+++ b/srcpkgs/libgeographic/template
@@ -0,0 +1,22 @@
+# Template file for 'libgeographic'
+pkgname=libgeographic
+version=2.3
+revision=1
+#archs="i686 x86_64"
+#build_wrksrc=
+build_style=cmake
+configure_args="-DCMAKE_INSTALL_PREFIX=/usr -DBUILD_BOTH_LIBS=ON"
+#make_build_args=""
+#make_install_args=""
+#conf_files=""
+#make_dirs="/var/log/dir 0755 root root"
+hostmakedepends="make cmake gcc pkg-config"
+#makedepends=""
+#depends=""
+short_desc="Geographic library"
+maintainer="zenobit <zenobit@disroot.org>"
+license="GPL-3.0-or-later"
+homepage="https://geographiclib.sourceforge.io/"
+#changelog=""
+distfiles="https://sourceforge.net/projects/geographiclib/files/distrib-C%2B%2B/GeographicLib-${version}.tar.gz"
+checksum=3114847839453ee6bbe2228e41dc73cad6de6160055442b747adc9c76f0a3198
diff --git a/srcpkgs/nwg-bar/template b/srcpkgs/nwg-bar/template
new file mode 100644
index 00000000000000..41788e4bc6a0fe
--- /dev/null
+++ b/srcpkgs/nwg-bar/template
@@ -0,0 +1,23 @@
+# Template file for 'nwg-bar'
+pkgname=nwg-bar
+version=0.1.6
+revision=1
+#archs="i686 x86_64"
+#build_wrksrc=
+build_style=go
+go_import_path=github.com/nwg-piotr/nwg-bar
+#configure_args=""
+#make_build_args=""
+#make_install_args=""
+#conf_files=""
+#make_dirs="/var/log/dir 0755 root root"
+hostmakedepends="pkg-config"
+makedepends="python3-gobject-devel gtk+3-devel gtk-layer-shell-devel"
+depends="gtk-layer-shell gtk+3 zlib pango libharfbuzz atk cairo gdk-pixbuf glib gtk-layer-shell fontconfig freetype glibc"
+short_desc="GTK3-based button bar for wlroots-based compositors"
+maintainer="zenobit <zenobit@disroot.org>"
+license="MIT"
+homepage="https://github.com/nwg-piotr/nwg-bar"
+#changelog=""
+distfiles="https://github.com/nwg-piotr/nwg-bar/archive/refs/tags/v${version}.tar.gz"
+checksum=badc232f9eef1a225776c7f0fe2534b49ac0a957f1a81dc24acb8f341b7719d4
diff --git a/srcpkgs/nwg-clipman/template b/srcpkgs/nwg-clipman/template
new file mode 100644
index 00000000000000..e834f4e9c0e9a6
--- /dev/null
+++ b/srcpkgs/nwg-clipman/template
@@ -0,0 +1,22 @@
+# Template file for 'nwg-clipman'
+pkgname=nwg-clipman
+version=0.2.3
+revision=1
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="cliphist gtk-layer-shell gtk+3 python3 python3-gobject xdg-utils wl-clipboard"
+checkdepends="python3-wheel"
+short_desc="GTK3-based GUI for cliphist - nwg-shell clipboard manager"
+maintainer="zenobit <zenobit@disroot.org>"
+license="MIT"
+homepage="https://github.com/nwg-piotr/nwg-clipman"
+#changelog=""
+distfiles="https://github.com/nwg-piotr/nwg-clipman/archive/refs/tags/v${version}.tar.gz"
+checksum=5a7aaff9d6668117977741cbc2b772fa0bcb6696289857579b645b23b57ef4bf
+
+post_install() {
+	vinstall nwg-clipman.svg 644 /usr/share/pixmaps
+	vinstall nwg-clipman.desktop 644 /usr/share/applications
+	vinstall README.md 644 /usr/share/doc/nwg-clipman
+	vlicense LICENSE
+}
diff --git a/srcpkgs/nwg-displays/template b/srcpkgs/nwg-displays/template
new file mode 100644
index 00000000000000..266a3adecc7c93
--- /dev/null
+++ b/srcpkgs/nwg-displays/template
@@ -0,0 +1,17 @@
+# Template file for 'nwg-displays'
+pkgname=nwg-displays
+version=0.3.22
+revision=1
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+short_desc="Intuitive GUI to manage multiple displays for wayland"
+maintainer="zenobit <zenobit@disroot.org>"
+license="MIT"
+homepage="https://nwg-piotr.github.io/nwg-shell/nwg-displays"
+#changelog=""
+distfiles="https://github.com/nwg-piotr/nwg-displays/archive/refs/tags/v${version}.tar.gz"
+checksum=143b034902200aabeb07ac7331066972127298654ea14d68b4f68fb7c38583da
+
+post_install() {
+	vlicense LICENSE
+}
diff --git a/srcpkgs/nwg-dock-hyprland/template b/srcpkgs/nwg-dock-hyprland/template
new file mode 100644
index 00000000000000..e2328614acbe62
--- /dev/null
+++ b/srcpkgs/nwg-dock-hyprland/template
@@ -0,0 +1,22 @@
+# Template file for 'nwg-dock-hyprland'
+pkgname=nwg-dock-hyprland
+version=0.3.0
+revision=1
+#archs="i686 x86_64"
+#build_wrksrc=
+build_style=go
+go_import_path="nwg-dock-hyprland"
+hostmakedepends="pkg-config"
+makedepends="gtk+3-devel gtk-layer-shell-devel"
+depends="nwg-drawer glibc gtk+3 zlib pango libharfbuzz atk cairo gdk-pixbuf glib gtk-layer-shell fontconfig freetype"
+short_desc="GTK3-based dock for Hyprland"
+maintainer="zenobit <zenobit@disroot.org>"
+license="MIT"
+homepage="https://nwg-piotr.github.io/nwg-shell/nwg-dock-hyprland"
+#changelog=""
+distfiles="https://github.com/nwg-piotr/nwg-dock-hyprland/archive/refs/tags/v${version}.tar.gz"
+checksum=a9a6a36f76a1174fc04cf068ef5db9be4287f907bd32b8a5ab3b3647072ed76d
+
+post_install() {
+	vlicense LICENSE
+}
diff --git a/srcpkgs/nwg-dock/template b/srcpkgs/nwg-dock/template
new file mode 100644
index 00000000000000..60c7a0e4c8b478
--- /dev/null
+++ b/srcpkgs/nwg-dock/template
@@ -0,0 +1,22 @@
+# Template file for 'nwg-dock'
+pkgname=nwg-dock
+version=0.4.1
+revision=1
+#archs="i686 x86_64"
+#build_wrksrc=
+build_style=go
+go_import_path="github.com/nwg-piotr/nwg-dock"
+hostmakedepends="pkg-config"
+makedepends="gtk+3-devel gtk-layer-shell-devel"
+depends="nwg-drawer gtk-layer-shell"
+short_desc="GTK3-based dock for sway"
+maintainer="zenobit <zenobit@disroot.org>"
+license="MIT"
+homepage="https://nwg-piotr.github.io/nwg-shell/nwg-dock"
+#changelog=""
+distfiles="https://github.com/nwg-piotr/nwg-dock/archive/refs/tags/v${version}.tar.gz"
+checksum=c392d4267971db557be1aef5dd48a8f901c2743e4b7a445f242bc96036518436
+
+post_install() {
+	vlicense LICENSE
+}
diff --git a/srcpkgs/nwg-drawer/template b/srcpkgs/nwg-drawer/template
new file mode 100644
index 00000000000000..9d38b534791b3e
--- /dev/null
+++ b/srcpkgs/nwg-drawer/template
@@ -0,0 +1,19 @@
+# Template file for 'nwg-drawer'
+pkgname=nwg-drawer
+version=0.5.2
+revision=1
+build_style=go
+go_import_path=github.com/nwg-piotr/nwg-drawer
+hostmakedepends="pkg-config"
+makedepends="cairo-devel gdk-pixbuf-devel gtk+3-devel gtk-layer-shell-devel pango-devel"
+short_desc="Application drawer for wlroots-based Wayland compositors"
+maintainer="zenobit <zenobit@disroot.org>"
+license="MIT"
+homepage="https://nwg-piotr.github.io/nwg-shell/nwg-drawer"
+#changelog=""
+distfiles="https://github.com/nwg-piotr/nwg-drawer/archive/refs/tags/v${version}.tar.gz"
+checksum=7fc913001bf49a6856b09f47d192bcd806d7737fe6b64fee0876a4dd15a43f07
+
+post_install() {
+	vlicense LICENSE
+}
diff --git a/srcpkgs/nwg-hello/template b/srcpkgs/nwg-hello/template
new file mode 100644
index 00000000000000..03dff86afda406
--- /dev/null
+++ b/srcpkgs/nwg-hello/template
@@ -0,0 +1,15 @@
+# Template file for 'nwg-hello'
+pkgname=nwg-hello
+version=0.3.0
+revision=1
+build_style=python3-module
+hostmakedepends="pkg-config"
+makedepends="python3-build python3-installer python3-wheel python3-setuptools"
+depends="python3 greetd gtk+ gtk-layer-shell"
+short_desc="GTK3-based greeter for greetd written in python"
+maintainer="zenobit <zenobit@disroot.org>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/nwg-piotr/nwg-hello"
+#changelog=""
+distfiles="https://github.com/nwg-piotr/nwg-hello/archive/refs/tags/v${version}.tar.gz"
+checksum=d12c2785f6212951e980e76384f26065b7616b0eb2d3af4859079a158f9eb04c
diff --git a/srcpkgs/nwg-icon-picker/template b/srcpkgs/nwg-icon-picker/template
new file mode 100644
index 00000000000000..97cbf72689c964
--- /dev/null
+++ b/srcpkgs/nwg-icon-picker/template
@@ -0,0 +1,21 @@
+# Template file for 'nwg-icon-picker'
+pkgname=nwg-icon-picker
+version=0.1.1
+revision=1
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="gtk+3 python3 python3-gobject"
+short_desc="GTK icon chooser with a text search option"
+maintainer="zenobit <zenobit@disroot.org>"
+license="MIT"
+homepage="https://github.com/nwg-piotr/nwg-icon-picker"
+#changelog=""
+distfiles="https://github.com/nwg-piotr/nwg-icon-picker/archive/refs/tags/v${version}.tar.gz"
+checksum=264df7a4fa3ab8e9bfeecb2505b5ef4c58d3b5f9d1e7d8e1255f95f4bc869ffc
+
+post_install() {
+	vinstall nwg-icon-picker.svg 644 /usr/share/pixmaps
+	vinstall nwg-icon-picker.desktop 644 /usr/share/applications
+	vinstall README.md 644 /usr/share/doc/nwg-icon-picker
+	vlicense LICENSE
+}
diff --git a/srcpkgs/nwg-menu/template b/srcpkgs/nwg-menu/template
new file mode 100644
index 00000000000000..3049358e6ca8c8
--- /dev/null
+++ b/srcpkgs/nwg-menu/template
@@ -0,0 +1,28 @@
+# Template file for 'nwg-menu'
+pkgname=nwg-menu
+version=0.1.6
+revision=1
+build_style=go
+go_import_path=github.com/nwg-piotr/nwg-menu
+hostmakedepends="pkg-config"
+makedepends="cairo-devel gdk-pixbuf-devel glib-devel gtk+3-devel gtk-layer-shell-devel pango-devel"
+depends="gtk+3 gtk-layer-shell"
+short_desc="MenuStart plugin to nwg-panel, also capable of working standalone"
+maintainer="zenobit <zenobit@disroot.org>"
+license="MIT"
+homepage="https://nwg-piotr.github.io/nwg-shell/nwg-menu"
+#changelog=""
+distfiles="https://github.com/nwg-piotr/nwg-menu/archive/refs/tags/v${version}.tar.gz"
+checksum=b6ef6d3d957257788bceadb1a09c174d4db5afa93a4dc90fe1aa04723d96266b
+
+post_install() {
+	for dir in desktop-directories/*.directory; do
+		vinstall ${dir} 644 /usr/share/nwg-menu/desktop-directories
+	done
+
+	vinstall menu-start.css 644 /usr/share/nwg-menu
+	vbin nwg-menu
+
+	vinstall README.md 644 /usr/share/doc/nwg-menu
+	vlicense LICENSE
+}
diff --git a/srcpkgs/nwg-panel/template b/srcpkgs/nwg-panel/template
new file mode 100644
index 00000000000000..a87a3088061869
--- /dev/null
+++ b/srcpkgs/nwg-panel/template
@@ -0,0 +1,17 @@
+# Template file for 'nwg-panel'
+pkgname=nwg-panel
+version=0.9.51
+revision=1
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+short_desc="GTK3-based panel for sway and Hyprland Wayland compositors"
+maintainer="zenobit <zenobit@disroot.org>"
+license="MIT"
+homepage="https://nwg-piotr.github.io/nwg-shell/nwg-panel"
+#changelog=""
+distfiles="https://github.com/nwg-piotr/nwg-panel/archive/refs/tags/v${version}.tar.gz"
+checksum=5a9bbb5053b10525b5131eed5b6578ac3061462a8fe5c27678846d8921beffe8
+
+post_install() {
+	vlicense LICENSE
+}
diff --git a/srcpkgs/nwg-readme-browser/template b/srcpkgs/nwg-readme-browser/template
new file mode 100644
index 00000000000000..f12e45cf310e75
--- /dev/null
+++ b/srcpkgs/nwg-readme-browser/template
@@ -0,0 +1,17 @@
+# Template file for 'nwg-readme-browser'
+pkgname=nwg-readme-browser
+version=0.1.5
+revision=1
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+short_desc="WebKitGTK-based README file browser"
+maintainer="zenobit <zenobit@disroot.org>"
+license="MIT"
+homepage="https://nwg-piotr.github.io/nwg-shell/nwg-readme-browser"
+#changelog=""
+distfiles="https://github.com/nwg-piotr/nwg-readme-browser/archive/refs/tags/v${version}.tar.gz"
+checksum=e12eb2affc9683a5ae13ec1509b0927e8d0d76e2fc89c3b1966019aeb772ddce
+
+post_install() {
+	vlicense LICENSE
+}
diff --git a/srcpkgs/nwg-shell-config/template b/srcpkgs/nwg-shell-config/template
new file mode 100644
index 00000000000000..60dda67952cc0b
--- /dev/null
+++ b/srcpkgs/nwg-shell-config/template
@@ -0,0 +1,24 @@
+# Template file for 'nwg-shell-config'
+pkgname=nwg-shell-config
+version=0.5.51
+revision=1
+build_style=python3-module
+hostmakedepends="python3-setuptools python3-geopy"
+makedepends="python3-gobject-devel gtk+3-devel gtk-layer-shell-devel"
+checkdepends=""
+depends=""
+short_desc="Graphical user interface for configuring sway and Hyprland"
+maintainer="zenobit <zenobit@disroot.org>"
+license="MIT"
+homepage="https://nwg-piotr.github.io/nwg-shell/nwg-shell-config"
+#changelog=""
+distfiles="https://github.com/nwg-piotr/nwg-shell-config/archive/refs/tags/v${version}.tar.gz"
+checksum=f2a7fa3a798dc3794104192f2e2300dfc92d839bb981527e0907f315a154988d
+
+do_install() {
+	python3 setup.py install --optimize=1
+}
+
+post_install() {
+	vlicense LICENSE
+}
diff --git a/srcpkgs/nwg-shell/template b/srcpkgs/nwg-shell/template
new file mode 100644
index 00000000000000..0d98eecab0d1bf
--- /dev/null
+++ b/srcpkgs/nwg-shell/template
@@ -0,0 +1,37 @@
+# Template file for 'nwg-shell'
+pkgname=nwg-shell
+version=0.5.42
+revision=1
+build_style=python3-pep517
+hostmakedepends="go python3-setuptools python3-geopy python3-wheel"
+makedepends="python3-gobject-devel gtk+3-devel gtk-layer-shell-devel"
+checkdepends="python3-wheel python3-pytest"
+depends="azote gnome-themes-extra grim gtklock ImageMagick jq
+ libayatana-appindicator network-manager-applet nwg-bar nwg-clipman
+ nwg-displays nwg-dock nwg-dock-hyprland nwg-drawer nwg-look nwg-menu
+ nwg-readme-browser nwg-shell-config papirus-icon-theme playerctl
+ polkit-gnome python3-geopy python3-yaml slurp swappy sway swaybg 
+ swayidle swaylock SwayNotificationCenter dejavu-fonts-ttf wl-clipboard wlsunset
+ xorg-server-xwayland"
+# nwg-shell-wallpapers 
+short_desc="GTK3-based shell for sway and Hyprland Wayland compositors"
+maintainer="zenobit <zenobit@disroot.org>"
+license="MIT"
+homepage="https://nwg-piotr.github.io/nwg-shell"
+#changelog=""
+distfiles="https://github.com/nwg-piotr/nwg-shell/archive/refs/tags/v${version}.tar.gz"
+checksum=79864c0de0c506176a5bbca229d8cb9014fb801ecada30c629dda90925cacbfd
+
+do_install() {
+	python3 setup.py install --optimize=1
+}
+
+post_install() {
+	#for file in scripts/*; do
+	#	vbin ${file}
+	#done
+	#vinstall nwg-shell.jpg 644 /usr/share/backgrounds
+	#vinstall nwg-readme.desktop 644 /usr/share/applications
+	vinstall README.md 644 /usr/share/doc/nwg-shell
+	vlicense LICENSE
+}
diff --git a/srcpkgs/nwg/template b/srcpkgs/nwg/template
new file mode 100644
index 00000000000000..050d80cb309070
--- /dev/null
+++ b/srcpkgs/nwg/template
@@ -0,0 +1,10 @@
+# Template file for 'nwg'
+pkgname=nwg
+version=0.1
+revision=2
+build_style=meta
+depends="azote gtklock nwg-dock-hyprland nwg-hello nwg-shell nwg-shell-config nwg-displays nwg-drawer nwg-launchers nwg-look nwg-menu nwg-panel nwg-readme-browser SwayNotificationCenter wlsunset gtk-layer-shell python3-i3ipc python3-psutil python3-geopy python3-dbus python3-netifaces brightnessctl ddcutil playerctl wlr-randr bluez-utils"
+short_desc="Meta-package for the nwg-shell project"
+maintainer="zenobit <zenobit@disroot.org>"
+license="GPL-3.0-or-later"
+homepage="https://nwg-piotr.github.io/nwg-shell"
diff --git a/srcpkgs/php8.1-apcu/template b/srcpkgs/php8.1-apcu/template
index 5a3529209a44fe..3c9fa3bc471dd9 100644
--- a/srcpkgs/php8.1-apcu/template
+++ b/srcpkgs/php8.1-apcu/template
@@ -1,7 +1,7 @@
 # Template file for 'php8.1-apcu'
 pkgname=php8.1-apcu
-version=5.1.23
-revision=2
+version=5.1.24
+revision=1
 build_style=gnu-configure
 configure_args="--with-php-config=/usr/bin/php-config8.1"
 make_check_target=test
@@ -13,7 +13,7 @@ maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
 license="PHP-3.01"
 homepage="https://pecl.php.net/package/APCu"
 distfiles="https://pecl.php.net/get/apcu-${version}.tgz"
-checksum=67ee7464ccad2335c3fa4aeb0b8edbcf6d8344feea7922620c6a13015d604482
+checksum=5c28a55b27082c69657e25b7ecf553e2cf6b74ec3fa77d6b76f4fb982e001e43
 
 pre_configure() {
 	phpize8.1
diff --git a/srcpkgs/php8.1-ast/template b/srcpkgs/php8.1-ast/template
index b1306a30c210c1..0c3ebcfff1622b 100644
--- a/srcpkgs/php8.1-ast/template
+++ b/srcpkgs/php8.1-ast/template
@@ -1,6 +1,6 @@
 # Template file for 'php8.1-ast'
 pkgname=php8.1-ast
-version=1.1.1
+version=1.1.2
 revision=1
 build_style=gnu-configure
 configure_args="--with-php-config=/usr/bin/php-config8.1"
@@ -14,7 +14,7 @@ maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
 license="BSD-3-Clause"
 homepage="https://github.com/nikic/php-ast"
 distfiles="https://pecl.php.net/get/ast-${version}.tgz"
-checksum=0c55e09a4da43b9cc1da72ecb4ae892941f73e157b73d46326bc6a5ed7fc44b1
+checksum=8742427ff7c07ba93f940968f7363972ea040d97d847da3b79b4283c2a369dea
 make_check_pre="env NO_INTERACTION=1"
 
 pre_configure() {
diff --git a/srcpkgs/php8.1-igbinary/template b/srcpkgs/php8.1-igbinary/template
index 3d43405c3a6bb5..d36a839daf69f0 100644
--- a/srcpkgs/php8.1-igbinary/template
+++ b/srcpkgs/php8.1-igbinary/template
@@ -1,6 +1,6 @@
 # Template file for 'php8.1-igbinary'
 pkgname=php8.1-igbinary
-version=3.2.15
+version=3.2.16
 revision=1
 build_style=gnu-configure
 configure_args="--with-php-config=/usr/bin/php-config8.1"
@@ -12,7 +12,7 @@ maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
 license="BSD-3-Clause"
 homepage="https://github.com/igbinary/igbinary/"
 distfiles="https://pecl.php.net/get/igbinary-${version}.tgz"
-checksum=eff099b0343b45fbe9765d4b3d441064ddefbbf9cfb7198487de9bda6b8f4907
+checksum=8bf25d465abc7973d9e2c9a3039a5f8eea635b23bc1477017ff3999ff95836da
 
 pre_configure() {
 	phpize8.1
diff --git a/srcpkgs/php8.1-mongodb/template b/srcpkgs/php8.1-mongodb/template
index 26bcb6e1771fe1..be1d62581d5b24 100644
--- a/srcpkgs/php8.1-mongodb/template
+++ b/srcpkgs/php8.1-mongodb/template
@@ -1,6 +1,6 @@
 # Template file for 'php8.1-mongodb'
 pkgname=php8.1-mongodb
-version=1.19.3
+version=1.20.0
 revision=1
 build_style=gnu-configure
 configure_args="--with-php-config=/usr/bin/php-config8.1"
@@ -13,7 +13,7 @@ license="Apache-2.0"
 homepage="https://pecl.php.net/package/mongodb"
 changelog="https://pecl.php.net/package-changelog.php?package=mongodb"
 distfiles="https://pecl.php.net/get/mongodb-$version.tgz"
-checksum=a9e17b024971b78c896413b46722444e5c0d004e3de271490c9d3d55e34268e9
+checksum=01e87973fe7e54aac52054ec4a99cdd439ed5c01f7e5b8ea0a57031850d8e75a
 
 pre_configure() {
 	phpize8.1
diff --git a/srcpkgs/php8.1-redis/template b/srcpkgs/php8.1-redis/template
index e3be7b990c51d0..e08cf5582915a1 100644
--- a/srcpkgs/php8.1-redis/template
+++ b/srcpkgs/php8.1-redis/template
@@ -1,6 +1,6 @@
 # Template file for 'php8.1-redis'
 pkgname=php8.1-redis
-version=6.0.2
+version=6.1.0
 revision=1
 build_style=gnu-configure
 configure_args="--with-php-config=/usr/bin/php-config8.1"
@@ -12,7 +12,7 @@ maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
 license="PHP-3.01"
 homepage="https://pecl.php.net/package/redis"
 distfiles="https://pecl.php.net/get/redis-$version.tgz"
-checksum=01aeccb0e14f897fe56f0509be6e6991ff0ad459f9d34e95e4556d02699b9a03
+checksum=f10405f639fe415e9ed4ec99538e72c90694d8dbd62868edcfcd6a453466b48c
 
 pre_configure() {
 	phpize8.1
diff --git a/srcpkgs/php8.1/patches/cross-configure.patch b/srcpkgs/php8.1/patches/cross-configure.patch
new file mode 100644
index 00000000000000..c6977514ceba71
--- /dev/null
+++ b/srcpkgs/php8.1/patches/cross-configure.patch
@@ -0,0 +1,26 @@
+diff --git a/ext/pdo_pgsql/config.m4 b/ext/pdo_pgsql/config.m4
+index 80ffd97..d8cad47 100644
+--- a/ext/pdo_pgsql/config.m4
++++ b/ext/pdo_pgsql/config.m4
+@@ -20,7 +20,7 @@ if test "$PHP_PDO_PGSQL" != "no"; then
+     fi
+   done
+ 
+-  if test -n "$PG_CONFIG"; then
++  if test -n "$PG_CONFIG" && test "x$cross_compiling" != "xyes"; then
+     AC_MSG_RESULT([$PG_CONFIG])
+     PGSQL_INCLUDE=`$PG_CONFIG --includedir`
+     PGSQL_LIBDIR=`$PG_CONFIG --libdir`
+diff --git a/ext/pgsql/config.m4 b/ext/pgsql/config.m4
+index 669a9f7..7e5bf7f 100644
+--- a/ext/pgsql/config.m4
++++ b/ext/pgsql/config.m4
+@@ -18,7 +18,7 @@ if test "$PHP_PGSQL" != "no"; then
+     fi
+   done
+ 
+-  if test -n "$PG_CONFIG"; then
++  if test -n "$PG_CONFIG" && test "x$cross_compiling" != "xyes"; then
+     AC_MSG_RESULT([$PG_CONFIG])
+     PGSQL_INCLUDE=`$PG_CONFIG --includedir`
+     PGSQL_LIBDIR=`$PG_CONFIG --libdir`
diff --git a/srcpkgs/php8.2/patches/php-ltmain-sysroot-support.patch b/srcpkgs/php8.1/patches/cross-ltmain-sysroot-support.patch
similarity index 75%
rename from srcpkgs/php8.2/patches/php-ltmain-sysroot-support.patch
rename to srcpkgs/php8.1/patches/cross-ltmain-sysroot-support.patch
index bbe0a514a9e8ac..a6447ac150221e 100644
--- a/srcpkgs/php8.2/patches/php-ltmain-sysroot-support.patch
+++ b/srcpkgs/php8.1/patches/cross-ltmain-sysroot-support.patch
@@ -1,3 +1,12 @@
+PHP's phpize is based on a very old libtool to generate build files for its
+extensions. This libtool does not support .la files with '=' to support
+sysroot.
+
+In order to support more PHP extension cross compilation this modifies
+ltmain.sh to support such path. This is a bit hackish has it only get sysroot
+from the used toolchain; the proper way to fix that is to have PHP developpers
+to update the autotools file used to build there extensions.
+
 --- a/build/ltmain.sh	2021-09-09 15:19:14.822208365 +0200
 +++ b/build/ltmain.sh	2021-09-09 15:47:55.397011151 +0200
 @@ -2375,6 +2375,13 @@ EOF
diff --git a/srcpkgs/php8.1/patches/php-pear-cross.patch b/srcpkgs/php8.1/patches/cross-pear.patch
similarity index 100%
rename from srcpkgs/php8.1/patches/php-pear-cross.patch
rename to srcpkgs/php8.1/patches/cross-pear.patch
diff --git a/srcpkgs/php8.1/patches/php-phar-cross.patch b/srcpkgs/php8.1/patches/cross-phar.patch
similarity index 100%
rename from srcpkgs/php8.1/patches/php-phar-cross.patch
rename to srcpkgs/php8.1/patches/cross-phar.patch
diff --git a/srcpkgs/php8.1/patches/php-phpize-sysroot-support.patch b/srcpkgs/php8.1/patches/cross-phpize-sysroot-support.patch
similarity index 100%
rename from srcpkgs/php8.1/patches/php-phpize-sysroot-support.patch
rename to srcpkgs/php8.1/patches/cross-phpize-sysroot-support.patch
diff --git a/srcpkgs/php8.1/patches/php-706-crypt.patch b/srcpkgs/php8.1/patches/musl-crypt.patch
similarity index 80%
rename from srcpkgs/php8.1/patches/php-706-crypt.patch
rename to srcpkgs/php8.1/patches/musl-crypt.patch
index 254f1d2187c24e..b83a7ab9bc1e49 100644
--- a/srcpkgs/php8.1/patches/php-706-crypt.patch
+++ b/srcpkgs/php8.1/patches/musl-crypt.patch
@@ -1,3 +1,6 @@
+TODO: This is apparently needed on musl, not sure what the error is, might be
+something to dig in to.
+
 --- a/ext/standard/crypt.c	2016-04-28 14:13:00.000000000 -0400
 +++ b/ext/standard/crypt.c	2016-04-28 21:45:24.340955313 -0400
 @@ -267,6 +267,12 @@
diff --git a/srcpkgs/php8.1/patches/php-cross-config.patch b/srcpkgs/php8.1/patches/php-cross-config.patch
deleted file mode 100644
index 169c43f1df9324..00000000000000
--- a/srcpkgs/php8.1/patches/php-cross-config.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/configure b/configure
-index e4b82d1..1a8678f 100755
---- a/configure
-+++ b/configure
-@@ -62424,7 +62424,7 @@ printf %s "checking for pg_config... " >&6; }
-     fi
-   done
- 
--  if test -n "$PG_CONFIG"; then
-+  if test -n "$PG_CONFIG" && test "x$cross_compiling" != "xyes"; then
-     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PG_CONFIG" >&5
- printf "%s\n" "$PG_CONFIG" >&6; }
-     PGSQL_INCLUDE=`$PG_CONFIG --includedir`
-@@ -63948,7 +63948,7 @@ printf %s "checking for pg_config... " >&6; }
-     fi
-   done
- 
--  if test -n "$PG_CONFIG"; then
-+  if test -n "$PG_CONFIG" && test "x$cross_compiling" != "xyes"; then
-     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PG_CONFIG" >&5
- printf "%s\n" "$PG_CONFIG" >&6; }
-     PGSQL_INCLUDE=`$PG_CONFIG --includedir`
diff --git a/srcpkgs/php8.1/patches/fix-manpages.patch b/srcpkgs/php8.1/patches/php8.1-fix-manpages.patch
similarity index 100%
rename from srcpkgs/php8.1/patches/fix-manpages.patch
rename to srcpkgs/php8.1/patches/php8.1-fix-manpages.patch
diff --git a/srcpkgs/php8.1/patches/php.ini.patch b/srcpkgs/php8.1/patches/php8.1-ini.patch
similarity index 100%
rename from srcpkgs/php8.1/patches/php.ini.patch
rename to srcpkgs/php8.1/patches/php8.1-ini.patch
diff --git a/srcpkgs/php8.1/template b/srcpkgs/php8.1/template
index 71285aa82815b9..6e95ccdcd9cab3 100644
--- a/srcpkgs/php8.1/template
+++ b/srcpkgs/php8.1/template
@@ -1,15 +1,15 @@
 # Template file for 'php8.1'
 # rebuild php8.1-apcu and php8.1-imagick when updating this package
 pkgname=php8.1
-version=8.1.29
+version=8.1.31
 revision=1
 _php_version=8.1
-hostmakedepends="bison pkg-config apache-devel"
+hostmakedepends="bison pkg-config apache-devel autoconf"
 makedepends="apache-devel enchant2-devel freetds-devel freetype-devel gdbm-devel
  gmp-devel libcurl-devel libjpeg-turbo-devel libmariadbclient-devel
  libsodium-devel libtidy5-devel libxslt-devel libzip-devel net-snmp-devel
  postgresql-libs-devel readline-devel sqlite-devel unixodbc-devel pcre2-devel
- libffi-devel oniguruma-devel gd-devel"
+ libffi-devel oniguruma-devel gd-devel acl-devel"
 short_desc="HTML-embedded scripting language"
 maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
 license="PHP-3.01"
@@ -18,9 +18,12 @@ changelog="https://raw.githubusercontent.com/php/php-src/php-${version}/NEWS"
 # this is the source where the www.php.net code pulls the tarballs it serves
 # at https://www.php.net/distributions/
 distfiles="https://github.com/php/web-php-distributions/raw/master/php-${version}.tar.gz"
-checksum=8b2609bf1d3173aa38269a9af21532c65f730aadd3051f9aae011eea9e246de5
+checksum=618923b407c4575bfee085f00c4aaa16a5cc86d4b1eb893c0f352d61541bbfb1
 provides="php-runtime-${version}_1"
 
+system_accounts="_phpfpm"
+_phpfpm_homedir="/var/empty"
+
 conf_files="/etc/php${_php_version}/php.ini"
 
 lib32disabled=yes
@@ -50,6 +53,10 @@ alternatives="
  php:phar.phar.1:/usr/share/man/man1/phar${_php_version}.phar.1
  php:php.1:/usr/share/man/man1/php${_php_version}.1"
 
+do_configure() {
+	autoconf -f
+}
+
 do_build() {
 	local _phpconfig="--srcdir=.. \
 		--config-cache \
@@ -140,8 +147,9 @@ do_build() {
 		--host=${XBPS_CROSS_TRIPLET} \
 		--enable-cgi \
 		--enable-fpm \
-		--with-fpm-user=http \
-		--with-fpm-group=http \
+		--with-fpm-user=_phpfpm \
+		--with-fpm-group=_phpfpm \
+		--with-fpm-acl \
 		--enable-embed=shared \
 		${_phpextensions}
 	make ${makejobs} ${_make_env}
diff --git a/srcpkgs/php8.2-apcu/template b/srcpkgs/php8.2-apcu/template
index 367d9d565ed93a..a569487593212b 100644
--- a/srcpkgs/php8.2-apcu/template
+++ b/srcpkgs/php8.2-apcu/template
@@ -1,7 +1,7 @@
 # Template file for 'php8.2-apcu'
 pkgname=php8.2-apcu
-version=5.1.23
-revision=2
+version=5.1.24
+revision=1
 build_style=gnu-configure
 configure_args="--with-php-config=/usr/bin/php-config8.2"
 make_check_target=test
@@ -13,7 +13,7 @@ maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
 license="PHP-3.01"
 homepage="https://pecl.php.net/package/APCu"
 distfiles="https://pecl.php.net/get/apcu-${version}.tgz"
-checksum=67ee7464ccad2335c3fa4aeb0b8edbcf6d8344feea7922620c6a13015d604482
+checksum=5c28a55b27082c69657e25b7ecf553e2cf6b74ec3fa77d6b76f4fb982e001e43
 
 pre_configure() {
 	phpize8.2
diff --git a/srcpkgs/php8.2-ast/template b/srcpkgs/php8.2-ast/template
index fccc6bc98ad09c..338032e937e923 100644
--- a/srcpkgs/php8.2-ast/template
+++ b/srcpkgs/php8.2-ast/template
@@ -1,6 +1,6 @@
 # Template file for 'php8.2-ast'
 pkgname=php8.2-ast
-version=1.1.1
+version=1.1.2
 revision=1
 build_style=gnu-configure
 configure_args="--with-php-config=/usr/bin/php-config8.2"
@@ -14,7 +14,7 @@ maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
 license="BSD-3-Clause"
 homepage="https://github.com/nikic/php-ast"
 distfiles="https://pecl.php.net/get/ast-${version}.tgz"
-checksum=0c55e09a4da43b9cc1da72ecb4ae892941f73e157b73d46326bc6a5ed7fc44b1
+checksum=8742427ff7c07ba93f940968f7363972ea040d97d847da3b79b4283c2a369dea
 make_check_pre="env NO_INTERACTION=1"
 
 pre_configure() {
diff --git a/srcpkgs/php8.2-igbinary/template b/srcpkgs/php8.2-igbinary/template
index 89ce91a138308a..b14765bc68cbb1 100644
--- a/srcpkgs/php8.2-igbinary/template
+++ b/srcpkgs/php8.2-igbinary/template
@@ -1,6 +1,6 @@
 # Template file for 'php8.2-igbinary'
 pkgname=php8.2-igbinary
-version=3.2.15
+version=3.2.16
 revision=1
 build_style=gnu-configure
 configure_args="--with-php-config=/usr/bin/php-config8.2"
@@ -12,7 +12,7 @@ maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
 license="BSD-3-Clause"
 homepage="https://github.com/igbinary/igbinary/"
 distfiles="https://pecl.php.net/get/igbinary-${version}.tgz"
-checksum=eff099b0343b45fbe9765d4b3d441064ddefbbf9cfb7198487de9bda6b8f4907
+checksum=8bf25d465abc7973d9e2c9a3039a5f8eea635b23bc1477017ff3999ff95836da
 
 pre_configure() {
 	phpize8.2
diff --git a/srcpkgs/php8.2-mongodb/template b/srcpkgs/php8.2-mongodb/template
index a4be31856d089a..1fbb21a83bcc58 100644
--- a/srcpkgs/php8.2-mongodb/template
+++ b/srcpkgs/php8.2-mongodb/template
@@ -1,6 +1,6 @@
 # Template file for 'php8.2-mongodb'
 pkgname=php8.2-mongodb
-version=1.19.3
+version=1.20.0
 revision=1
 build_style=gnu-configure
 configure_args="--with-php-config=/usr/bin/php-config8.2"
@@ -13,7 +13,7 @@ license="Apache-2.0"
 homepage="https://pecl.php.net/package/mongodb"
 changelog="https://pecl.php.net/package-changelog.php?package=mongodb"
 distfiles="https://pecl.php.net/get/mongodb-$version.tgz"
-checksum=a9e17b024971b78c896413b46722444e5c0d004e3de271490c9d3d55e34268e9
+checksum=01e87973fe7e54aac52054ec4a99cdd439ed5c01f7e5b8ea0a57031850d8e75a
 
 pre_configure() {
 	phpize8.2
diff --git a/srcpkgs/php8.2-redis/template b/srcpkgs/php8.2-redis/template
index cfc4d58070f433..972689c26c1cfd 100644
--- a/srcpkgs/php8.2-redis/template
+++ b/srcpkgs/php8.2-redis/template
@@ -1,6 +1,6 @@
 # Template file for 'php8.2-redis'
 pkgname=php8.2-redis
-version=6.0.2
+version=6.1.0
 revision=1
 build_style=gnu-configure
 configure_args="--with-php-config=/usr/bin/php-config8.2"
@@ -12,7 +12,7 @@ maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
 license="PHP-3.01"
 homepage="https://pecl.php.net/package/redis"
 distfiles="https://pecl.php.net/get/redis-$version.tgz"
-checksum=01aeccb0e14f897fe56f0509be6e6991ff0ad459f9d34e95e4556d02699b9a03
+checksum=f10405f639fe415e9ed4ec99538e72c90694d8dbd62868edcfcd6a453466b48c
 
 pre_configure() {
 	phpize8.2
diff --git a/srcpkgs/php8.2/patches/ac_fn_c_try_run_cross.patch b/srcpkgs/php8.2/patches/ac_fn_c_try_run_cross.patch
deleted file mode 100644
index 2205168a7868e7..00000000000000
--- a/srcpkgs/php8.2/patches/ac_fn_c_try_run_cross.patch
+++ /dev/null
@@ -1,166 +0,0 @@
-diff --git a/configure b/configure
-index 88b317c..fdb8e73 100755
---- a/configure
-+++ b/configure
-@@ -2600,7 +2600,13 @@ $as_echo "$ac_try_echo"; } >&5
- esac
- eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
- $as_echo "$ac_try_echo"; } >&5
--  (eval "$ac_try") 2>&5
-+  if test "$cross_compiling" = "yes"; then
-+    # Use qemu-user-static to run the executable
-+    qemu_exec="QEMU_LD_PREFIX=${XBPS_CROSS_BASE} qemu-${XBPS_TARGET_QEMU_MACHINE}-static"
-+    (eval "$qemu_exec $ac_try") 2>&5
-+  else
-+    (eval "$ac_try") 2>&5
-+  fi
-   ac_status=$?
-   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-   test $ac_status = 0; }; }
-@@ -37619,12 +37619,6 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
- 
--  if test "$cross_compiling" = yes; then :
--
--    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--$as_echo "no" >&6; }
--
--else
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
-@@ -37662,7 +37656,6 @@ $as_echo "no" >&6; }
- fi
- rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-   conftest.$ac_objext conftest.beam conftest.$ac_ext
--fi
- 
-   ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
-@@ -37686,12 +37679,6 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
- 
--  if test "$cross_compiling" = yes; then :
--
--    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--$as_echo "no" >&6; }
--
--else
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
-@@ -37729,7 +37716,6 @@ $as_echo "no" >&6; }
- fi
- rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-   conftest.$ac_objext conftest.beam conftest.$ac_ext
--fi
- 
-   ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
-@@ -37753,12 +37739,6 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
- 
--  if test "$cross_compiling" = yes; then :
--
--    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--$as_echo "no" >&6; }
--
--else
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
-@@ -37796,7 +37776,6 @@ $as_echo "no" >&6; }
- fi
- rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-   conftest.$ac_objext conftest.beam conftest.$ac_ext
--fi
- 
-   ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
-@@ -37820,12 +37799,6 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
- 
--  if test "$cross_compiling" = yes; then :
--
--    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--$as_echo "no" >&6; }
--
--else
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
-@@ -37863,7 +37836,6 @@ $as_echo "no" >&6; }
- fi
- rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-   conftest.$ac_objext conftest.beam conftest.$ac_ext
--fi
- 
-   ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
-@@ -37887,12 +37859,6 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
- 
--  if test "$cross_compiling" = yes; then :
--
--    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--$as_echo "no" >&6; }
--
--else
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
-@@ -37930,7 +37896,6 @@ $as_echo "no" >&6; }
- fi
- rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-   conftest.$ac_objext conftest.beam conftest.$ac_ext
--fi
- 
-   ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
-@@ -37954,12 +37919,6 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
- 
--  if test "$cross_compiling" = yes; then :
--
--    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--$as_echo "no" >&6; }
--
--else
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
-@@ -37997,7 +37956,6 @@ $as_echo "no" >&6; }
- fi
- rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-   conftest.$ac_objext conftest.beam conftest.$ac_ext
--fi
- 
-   ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
-@@ -38021,12 +37979,6 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
- 
--  if test "$cross_compiling" = yes; then :
--
--    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--$as_echo "no" >&6; }
--
--else
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
-@@ -38064,7 +38016,6 @@ $as_echo "no" >&6; }
- fi
- rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-   conftest.$ac_objext conftest.beam conftest.$ac_ext
--fi
- 
-   ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
diff --git a/srcpkgs/php8.2/patches/cross-configure.patch b/srcpkgs/php8.2/patches/cross-configure.patch
new file mode 100644
index 00000000000000..c6977514ceba71
--- /dev/null
+++ b/srcpkgs/php8.2/patches/cross-configure.patch
@@ -0,0 +1,26 @@
+diff --git a/ext/pdo_pgsql/config.m4 b/ext/pdo_pgsql/config.m4
+index 80ffd97..d8cad47 100644
+--- a/ext/pdo_pgsql/config.m4
++++ b/ext/pdo_pgsql/config.m4
+@@ -20,7 +20,7 @@ if test "$PHP_PDO_PGSQL" != "no"; then
+     fi
+   done
+ 
+-  if test -n "$PG_CONFIG"; then
++  if test -n "$PG_CONFIG" && test "x$cross_compiling" != "xyes"; then
+     AC_MSG_RESULT([$PG_CONFIG])
+     PGSQL_INCLUDE=`$PG_CONFIG --includedir`
+     PGSQL_LIBDIR=`$PG_CONFIG --libdir`
+diff --git a/ext/pgsql/config.m4 b/ext/pgsql/config.m4
+index 669a9f7..7e5bf7f 100644
+--- a/ext/pgsql/config.m4
++++ b/ext/pgsql/config.m4
+@@ -18,7 +18,7 @@ if test "$PHP_PGSQL" != "no"; then
+     fi
+   done
+ 
+-  if test -n "$PG_CONFIG"; then
++  if test -n "$PG_CONFIG" && test "x$cross_compiling" != "xyes"; then
+     AC_MSG_RESULT([$PG_CONFIG])
+     PGSQL_INCLUDE=`$PG_CONFIG --includedir`
+     PGSQL_LIBDIR=`$PG_CONFIG --libdir`
diff --git a/srcpkgs/php8.2/patches/cross-gdImageCreateFrom.patch b/srcpkgs/php8.2/patches/cross-gdImageCreateFrom.patch
new file mode 100644
index 00000000000000..1f35f9482f98c6
--- /dev/null
+++ b/srcpkgs/php8.2/patches/cross-gdImageCreateFrom.patch
@@ -0,0 +1,66 @@
+Copied and modified library macros from /usr/share/autoconf/autoconf/general.m4
+with support for using qemu-user-static to execute when cross compiling.
+
+diff --git a/ext/gd/config.m4 b/ext/gd/config.m4
+index b31c9b2..e5e2d9f 100644
+--- a/ext/gd/config.m4
++++ b/ext/gd/config.m4
+@@ -147,6 +147,40 @@ dnl that gd defines "junk" versions of each gdImageCreateFromFoo function
+ dnl even when it does not support the Foo format. Those junk functions
+ dnl display a warning but eventually return normally, making a simple link
+ dnl or run test insufficient.
++
++AC_DEFUN([_AC_DO_TOKENS_QEMU],
++[{
++  if test "$cross_compiling" = "yes"; then
++    ac_try='QEMU_LD_PREFIX=${XBPS_CROSS_BASE} qemu-${XBPS_TARGET_QEMU_MACHINE}-static $1'
++  else
++    ac_try='$1'
++  fi
++  _AC_DO([$ac_try]); }])
++
++m4_define([_AC_RUN_IFELSE_QEMU_BODY],
++[  AS_LINENO_PUSH([$[]1])
++  AS_IF([_AC_DO_VAR(ac_link) && _AC_DO_TOKENS_QEMU(./conftest$ac_exeext)],
++      [ac_retval=0],
++      [AS_ECHO(["$as_me: program exited with status $ac_status"]) >&AS_MESSAGE_LOG_FD
++       _AC_MSG_LOG_CONFTEST
++       ac_retval=$ac_status])
++  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
++  AS_LINENO_POP
++  AS_SET_STATUS([$ac_retval])
++])
++
++AC_DEFUN([_AC_RUN_IFELSE_QEMU],
++[AC_REQUIRE_SHELL_FN([ac_fn_]_AC_LANG_ABBREV[_try_run_qemu],
++  [AS_FUNCTION_DESCRIBE([ac_fn_]_AC_LANG_ABBREV[_try_run_qemu], [LINENO],
++    [Try to run conftest.$ac_ext, and return whether this succeeded.
++     Assumes that executables *can* be run.])],
++  [$0_BODY])]dnl
++[m4_ifvaln([$1], [AC_LANG_CONFTEST([$1])])]dnl
++[AS_IF([ac_fn_[]_AC_LANG_ABBREV[]_try_run_qemu "$LINENO"], [$2], [$3])
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
++  conftest.$ac_objext conftest.beam[]m4_ifval([$1], [ conftest.$ac_ext])[]dnl
++])
++
+ AC_DEFUN([PHP_GD_CHECK_FORMAT],[
+   old_LIBS="${LIBS}"
+   LIBS="${LIBS} ${GD_SHARED_LIBADD}"
+@@ -154,7 +188,7 @@ AC_DEFUN([PHP_GD_CHECK_FORMAT],[
+   CFLAGS="${CFLAGS} ${GDLIB_CFLAGS}"
+   AC_MSG_CHECKING([for working gdImageCreateFrom$1 in libgd])
+   AC_LANG_PUSH([C])
+-  AC_RUN_IFELSE([AC_LANG_SOURCE([
++  _AC_RUN_IFELSE_QEMU([AC_LANG_SOURCE([
+ #include <stdio.h>
+ #include <unistd.h>
+ #include <gd.h>
+@@ -178,8 +212,6 @@ int main(int argc, char** argv) {
+     AC_DEFINE($2, 1, [Does gdImageCreateFrom$1 work?])
+   ],[
+     AC_MSG_RESULT([no])
+-  ],[
+-    AC_MSG_RESULT([no])
+   ])
+   AC_LANG_POP([C])
+   CFLAGS="${old_CFLAGS}"
diff --git a/srcpkgs/php8.3/patches/php-ltmain-sysroot-support.patch b/srcpkgs/php8.2/patches/cross-ltmain-sysroot-support.patch
similarity index 75%
rename from srcpkgs/php8.3/patches/php-ltmain-sysroot-support.patch
rename to srcpkgs/php8.2/patches/cross-ltmain-sysroot-support.patch
index bbe0a514a9e8ac..a6447ac150221e 100644
--- a/srcpkgs/php8.3/patches/php-ltmain-sysroot-support.patch
+++ b/srcpkgs/php8.2/patches/cross-ltmain-sysroot-support.patch
@@ -1,3 +1,12 @@
+PHP's phpize is based on a very old libtool to generate build files for its
+extensions. This libtool does not support .la files with '=' to support
+sysroot.
+
+In order to support more PHP extension cross compilation this modifies
+ltmain.sh to support such path. This is a bit hackish has it only get sysroot
+from the used toolchain; the proper way to fix that is to have PHP developpers
+to update the autotools file used to build there extensions.
+
 --- a/build/ltmain.sh	2021-09-09 15:19:14.822208365 +0200
 +++ b/build/ltmain.sh	2021-09-09 15:47:55.397011151 +0200
 @@ -2375,6 +2375,13 @@ EOF
diff --git a/srcpkgs/php8.2/patches/php-pear-cross.patch b/srcpkgs/php8.2/patches/cross-pear.patch
similarity index 100%
rename from srcpkgs/php8.2/patches/php-pear-cross.patch
rename to srcpkgs/php8.2/patches/cross-pear.patch
diff --git a/srcpkgs/php8.2/patches/php-phar-cross.patch b/srcpkgs/php8.2/patches/cross-phar.patch
similarity index 100%
rename from srcpkgs/php8.2/patches/php-phar-cross.patch
rename to srcpkgs/php8.2/patches/cross-phar.patch
diff --git a/srcpkgs/php8.2/patches/php-phpize-sysroot-support.patch b/srcpkgs/php8.2/patches/cross-phpize-sysroot-support.patch
similarity index 100%
rename from srcpkgs/php8.2/patches/php-phpize-sysroot-support.patch
rename to srcpkgs/php8.2/patches/cross-phpize-sysroot-support.patch
diff --git a/srcpkgs/php8.2/patches/php-706-crypt.patch b/srcpkgs/php8.2/patches/musl-crypt.patch
similarity index 80%
rename from srcpkgs/php8.2/patches/php-706-crypt.patch
rename to srcpkgs/php8.2/patches/musl-crypt.patch
index 254f1d2187c24e..b83a7ab9bc1e49 100644
--- a/srcpkgs/php8.2/patches/php-706-crypt.patch
+++ b/srcpkgs/php8.2/patches/musl-crypt.patch
@@ -1,3 +1,6 @@
+TODO: This is apparently needed on musl, not sure what the error is, might be
+something to dig in to.
+
 --- a/ext/standard/crypt.c	2016-04-28 14:13:00.000000000 -0400
 +++ b/ext/standard/crypt.c	2016-04-28 21:45:24.340955313 -0400
 @@ -267,6 +267,12 @@
diff --git a/srcpkgs/php8.2/patches/php-cross-config.patch b/srcpkgs/php8.2/patches/php-cross-config.patch
deleted file mode 100644
index 21c5e1923b2504..00000000000000
--- a/srcpkgs/php8.2/patches/php-cross-config.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/configure b/configure
-index 88b317c..816799f 100755
---- a/configure
-+++ b/configure
-@@ -61564,7 +61564,7 @@ $as_echo_n "checking for pg_config... " >&6; }
-     fi
-   done
- 
--  if test -n "$PG_CONFIG"; then
-+  if test -n "$PG_CONFIG" && test "x$cross_compiling" != "xyes"; then
-     { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PG_CONFIG" >&5
- $as_echo "$PG_CONFIG" >&6; }
-     PGSQL_INCLUDE=`$PG_CONFIG --includedir`
-@@ -63090,7 +63090,7 @@ $as_echo_n "checking for pg_config... " >&6; }
-     fi
-   done
- 
--  if test -n "$PG_CONFIG"; then
-+  if test -n "$PG_CONFIG" && test "x$cross_compiling" != "xyes"; then
-     { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PG_CONFIG" >&5
- $as_echo "$PG_CONFIG" >&6; }
-     PGSQL_INCLUDE=`$PG_CONFIG --includedir`
diff --git a/srcpkgs/php8.2/patches/fix-manpages.patch b/srcpkgs/php8.2/patches/php8.2-fix-manpages.patch
similarity index 100%
rename from srcpkgs/php8.2/patches/fix-manpages.patch
rename to srcpkgs/php8.2/patches/php8.2-fix-manpages.patch
diff --git a/srcpkgs/php8.2/patches/php.ini.patch b/srcpkgs/php8.2/patches/php8.2-ini.patch
similarity index 100%
rename from srcpkgs/php8.2/patches/php.ini.patch
rename to srcpkgs/php8.2/patches/php8.2-ini.patch
diff --git a/srcpkgs/php8.2/template b/srcpkgs/php8.2/template
index 4fe20834f2b2d8..9d9c9edf218817 100644
--- a/srcpkgs/php8.2/template
+++ b/srcpkgs/php8.2/template
@@ -1,16 +1,16 @@
 # Template file for 'php8.2'
 # rebuild php8.2-apcu and php8.2-imagick when updating this package
 pkgname=php8.2
-version=8.2.22
+version=8.2.26
 revision=1
 _php_version=8.2
 build_helper="qemu"
-hostmakedepends="bison pkg-config apache-devel"
+hostmakedepends="bison pkg-config apache-devel autoconf"
 makedepends="apache-devel enchant2-devel freetds-devel freetype-devel gdbm-devel
  gmp-devel libcurl-devel libjpeg-turbo-devel libmariadbclient-devel
  libsodium-devel libtidy5-devel libxslt-devel libzip-devel net-snmp-devel
  postgresql-libs-devel readline-devel sqlite-devel unixodbc-devel pcre2-devel
- libffi-devel oniguruma-devel gd-devel"
+ libffi-devel oniguruma-devel gd-devel acl-devel"
 short_desc="HTML-embedded scripting language"
 maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
 license="PHP-3.01"
@@ -19,9 +19,12 @@ changelog="https://raw.githubusercontent.com/php/php-src/php-${version}/NEWS"
 # this is the source where the www.php.net code pulls the tarballs it serves
 # at https://www.php.net/distributions/
 distfiles="https://github.com/php/web-php-distributions/raw/master/php-${version}.tar.gz"
-checksum=44197016c9eeed5c50523e20eb44adc4dd9d84ac08bdf9e46077e775d467d7d0
+checksum=04e47b46b347ed6404dcc9e9989486710b075eafc8490500fd271aeeac5d83cb
 provides="php-runtime-${version}_1"
 
+system_accounts="_phpfpm"
+_phpfpm_homedir="/var/empty"
+
 conf_files="/etc/php${_php_version}/php.ini"
 
 lib32disabled=yes
@@ -47,6 +50,10 @@ alternatives="
  php:phar.phar.1:/usr/share/man/man1/phar${_php_version}.phar.1
  php:php.1:/usr/share/man/man1/php${_php_version}.1"
 
+do_configure() {
+	autoconf -f
+}
+
 do_build() {
 	local _phpconfig="--srcdir=.. \
 		--config-cache \
@@ -137,8 +144,9 @@ do_build() {
 		--host=${XBPS_CROSS_TRIPLET} \
 		--enable-cgi \
 		--enable-fpm \
-		--with-fpm-user=http \
-		--with-fpm-group=http \
+		--with-fpm-user=_phpfpm \
+		--with-fpm-group=_phpfpm \
+		--with-fpm-acl \
 		--enable-embed=shared \
 		${_phpextensions}
 	make ${makejobs} ${_make_env}
diff --git a/srcpkgs/php8.3-apcu/template b/srcpkgs/php8.3-apcu/template
index c5fc94508c4ba1..7fe5dd283ee360 100644
--- a/srcpkgs/php8.3-apcu/template
+++ b/srcpkgs/php8.3-apcu/template
@@ -1,7 +1,7 @@
 # Template file for 'php8.3-apcu'
 pkgname=php8.3-apcu
-version=5.1.23
-revision=2
+version=5.1.24
+revision=1
 build_style=gnu-configure
 configure_args="--with-php-config=/usr/bin/php-config8.3"
 make_check_target=test
@@ -13,7 +13,7 @@ maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
 license="PHP-3.01"
 homepage="https://pecl.php.net/package/APCu"
 distfiles="https://pecl.php.net/get/apcu-${version}.tgz"
-checksum=67ee7464ccad2335c3fa4aeb0b8edbcf6d8344feea7922620c6a13015d604482
+checksum=5c28a55b27082c69657e25b7ecf553e2cf6b74ec3fa77d6b76f4fb982e001e43
 
 pre_configure() {
 	phpize8.3
diff --git a/srcpkgs/php8.3-ast/template b/srcpkgs/php8.3-ast/template
index c2764714bb268e..585e1daaf13da9 100644
--- a/srcpkgs/php8.3-ast/template
+++ b/srcpkgs/php8.3-ast/template
@@ -1,6 +1,6 @@
 # Template file for 'php8.3-ast'
 pkgname=php8.3-ast
-version=1.1.1
+version=1.1.2
 revision=1
 build_style=gnu-configure
 configure_args="--with-php-config=/usr/bin/php-config8.3"
@@ -14,7 +14,7 @@ maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
 license="BSD-3-Clause"
 homepage="https://github.com/nikic/php-ast"
 distfiles="https://pecl.php.net/get/ast-${version}.tgz"
-checksum=0c55e09a4da43b9cc1da72ecb4ae892941f73e157b73d46326bc6a5ed7fc44b1
+checksum=8742427ff7c07ba93f940968f7363972ea040d97d847da3b79b4283c2a369dea
 make_check_pre="env NO_INTERACTION=1"
 
 pre_configure() {
diff --git a/srcpkgs/php8.3-igbinary/template b/srcpkgs/php8.3-igbinary/template
index 1475cb74adffb0..8482d3aa6de247 100644
--- a/srcpkgs/php8.3-igbinary/template
+++ b/srcpkgs/php8.3-igbinary/template
@@ -1,6 +1,6 @@
 # Template file for 'php8.3-igbinary'
 pkgname=php8.3-igbinary
-version=3.2.15
+version=3.2.16
 revision=1
 build_style=gnu-configure
 configure_args="--with-php-config=/usr/bin/php-config8.3"
@@ -12,7 +12,7 @@ maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
 license="BSD-3-Clause"
 homepage="https://github.com/igbinary/igbinary/"
 distfiles="https://pecl.php.net/get/igbinary-${version}.tgz"
-checksum=eff099b0343b45fbe9765d4b3d441064ddefbbf9cfb7198487de9bda6b8f4907
+checksum=8bf25d465abc7973d9e2c9a3039a5f8eea635b23bc1477017ff3999ff95836da
 
 pre_configure() {
 	phpize8.3
diff --git a/srcpkgs/php8.3-mongodb/template b/srcpkgs/php8.3-mongodb/template
index 41aa7ad7a40c5e..d91306793b42fa 100644
--- a/srcpkgs/php8.3-mongodb/template
+++ b/srcpkgs/php8.3-mongodb/template
@@ -1,6 +1,6 @@
 # Template file for 'php8.3-mongodb'
 pkgname=php8.3-mongodb
-version=1.19.3
+version=1.20.0
 revision=1
 build_style=gnu-configure
 configure_args="--with-php-config=/usr/bin/php-config8.3"
@@ -13,7 +13,7 @@ license="Apache-2.0"
 homepage="https://pecl.php.net/package/mongodb"
 changelog="https://pecl.php.net/package-changelog.php?package=mongodb"
 distfiles="https://pecl.php.net/get/mongodb-$version.tgz"
-checksum=a9e17b024971b78c896413b46722444e5c0d004e3de271490c9d3d55e34268e9
+checksum=01e87973fe7e54aac52054ec4a99cdd439ed5c01f7e5b8ea0a57031850d8e75a
 
 pre_configure() {
 	phpize8.3
diff --git a/srcpkgs/php8.3-redis/template b/srcpkgs/php8.3-redis/template
index c6331d3a67074a..c840602764bb69 100644
--- a/srcpkgs/php8.3-redis/template
+++ b/srcpkgs/php8.3-redis/template
@@ -1,6 +1,6 @@
 # Template file for 'php8.3-redis'
 pkgname=php8.3-redis
-version=6.0.2
+version=6.1.0
 revision=1
 build_style=gnu-configure
 configure_args="--with-php-config=/usr/bin/php-config8.3"
@@ -12,7 +12,7 @@ maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
 license="PHP-3.01"
 homepage="https://pecl.php.net/package/redis"
 distfiles="https://pecl.php.net/get/redis-$version.tgz"
-checksum=01aeccb0e14f897fe56f0509be6e6991ff0ad459f9d34e95e4556d02699b9a03
+checksum=f10405f639fe415e9ed4ec99538e72c90694d8dbd62868edcfcd6a453466b48c
 
 pre_configure() {
 	phpize8.3
diff --git a/srcpkgs/php8.3/patches/ac_fn_c_try_run_cross.patch b/srcpkgs/php8.3/patches/ac_fn_c_try_run_cross.patch
deleted file mode 100644
index e0a5d3cf2b1789..00000000000000
--- a/srcpkgs/php8.3/patches/ac_fn_c_try_run_cross.patch
+++ /dev/null
@@ -1,176 +0,0 @@
-diff --git a/configure b/configure
-index b6c740b..550e313 100755
---- a/configure
-+++ b/configure
-@@ -2600,7 +2600,13 @@ printf "%s\n" "$ac_try_echo"; } >&5
- esac
- eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
- printf "%s\n" "$ac_try_echo"; } >&5
--  (eval "$ac_try") 2>&5
-+  if test "$cross_compiling" = "yes"; then
-+    # Use qemu-user-static to run the executable
-+    qemu_exec="QEMU_LD_PREFIX=${XBPS_CROSS_BASE} qemu-${XBPS_TARGET_QEMU_MACHINE}-static"
-+    (eval "$qemu_exec $ac_try") 2>&5
-+  else
-+    (eval "$ac_try") 2>&5
-+  fi
-   ac_status=$?
-   printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-   test $ac_status = 0; }; }
-@@ -39741,13 +39741,6 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
- 
--  if test "$cross_compiling" = yes
--then :
--
--    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
--printf "%s\n" "no" >&6; }
--
--else $as_nop
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
-@@ -39786,7 +39779,6 @@ printf "%s\n" "no" >&6; }
- fi
- rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-   conftest.$ac_objext conftest.beam conftest.$ac_ext
--fi
- 
-   ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
-@@ -39810,13 +39802,6 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
- 
--  if test "$cross_compiling" = yes
--then :
--
--    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
--printf "%s\n" "no" >&6; }
--
--else $as_nop
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
-@@ -39855,7 +39840,6 @@ printf "%s\n" "no" >&6; }
- fi
- rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-   conftest.$ac_objext conftest.beam conftest.$ac_ext
--fi
- 
-   ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
-@@ -39879,13 +39863,6 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
- 
--  if test "$cross_compiling" = yes
--then :
--
--    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
--printf "%s\n" "no" >&6; }
--
--else $as_nop
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
-@@ -39924,7 +39901,6 @@ printf "%s\n" "no" >&6; }
- fi
- rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-   conftest.$ac_objext conftest.beam conftest.$ac_ext
--fi
- 
-   ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
-@@ -39948,13 +39924,6 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
- 
--  if test "$cross_compiling" = yes
--then :
--
--    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
--printf "%s\n" "no" >&6; }
--
--else $as_nop
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
-@@ -39993,7 +39962,6 @@ printf "%s\n" "no" >&6; }
- fi
- rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-   conftest.$ac_objext conftest.beam conftest.$ac_ext
--fi
- 
-   ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
-@@ -40017,13 +39985,6 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
- 
--  if test "$cross_compiling" = yes
--then :
--
--    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
--printf "%s\n" "no" >&6; }
--
--else $as_nop
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
-@@ -40062,7 +40023,6 @@ printf "%s\n" "no" >&6; }
- fi
- rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-   conftest.$ac_objext conftest.beam conftest.$ac_ext
--fi
- 
-   ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
-@@ -40086,13 +40046,6 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
- 
--  if test "$cross_compiling" = yes
--then :
--
--    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
--printf "%s\n" "no" >&6; }
--
--else $as_nop
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
-@@ -40131,7 +40084,6 @@ printf "%s\n" "no" >&6; }
- fi
- rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-   conftest.$ac_objext conftest.beam conftest.$ac_ext
--fi
- 
-   ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
-@@ -40155,13 +40107,6 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
- 
--  if test "$cross_compiling" = yes
--then :
--
--    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
--printf "%s\n" "no" >&6; }
--
--else $as_nop
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
-@@ -40200,7 +40145,6 @@ printf "%s\n" "no" >&6; }
- fi
- rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-   conftest.$ac_objext conftest.beam conftest.$ac_ext
--fi
- 
-   ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
-   ac_status=$?
-   printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-   test $ac_status = 0; }; }
diff --git a/srcpkgs/php8.3/patches/cross-configure.patch b/srcpkgs/php8.3/patches/cross-configure.patch
new file mode 100644
index 00000000000000..c6977514ceba71
--- /dev/null
+++ b/srcpkgs/php8.3/patches/cross-configure.patch
@@ -0,0 +1,26 @@
+diff --git a/ext/pdo_pgsql/config.m4 b/ext/pdo_pgsql/config.m4
+index 80ffd97..d8cad47 100644
+--- a/ext/pdo_pgsql/config.m4
++++ b/ext/pdo_pgsql/config.m4
+@@ -20,7 +20,7 @@ if test "$PHP_PDO_PGSQL" != "no"; then
+     fi
+   done
+ 
+-  if test -n "$PG_CONFIG"; then
++  if test -n "$PG_CONFIG" && test "x$cross_compiling" != "xyes"; then
+     AC_MSG_RESULT([$PG_CONFIG])
+     PGSQL_INCLUDE=`$PG_CONFIG --includedir`
+     PGSQL_LIBDIR=`$PG_CONFIG --libdir`
+diff --git a/ext/pgsql/config.m4 b/ext/pgsql/config.m4
+index 669a9f7..7e5bf7f 100644
+--- a/ext/pgsql/config.m4
++++ b/ext/pgsql/config.m4
+@@ -18,7 +18,7 @@ if test "$PHP_PGSQL" != "no"; then
+     fi
+   done
+ 
+-  if test -n "$PG_CONFIG"; then
++  if test -n "$PG_CONFIG" && test "x$cross_compiling" != "xyes"; then
+     AC_MSG_RESULT([$PG_CONFIG])
+     PGSQL_INCLUDE=`$PG_CONFIG --includedir`
+     PGSQL_LIBDIR=`$PG_CONFIG --libdir`
diff --git a/srcpkgs/php8.3/patches/cross-gdImageCreateFrom.patch b/srcpkgs/php8.3/patches/cross-gdImageCreateFrom.patch
new file mode 100644
index 00000000000000..1f35f9482f98c6
--- /dev/null
+++ b/srcpkgs/php8.3/patches/cross-gdImageCreateFrom.patch
@@ -0,0 +1,66 @@
+Copied and modified library macros from /usr/share/autoconf/autoconf/general.m4
+with support for using qemu-user-static to execute when cross compiling.
+
+diff --git a/ext/gd/config.m4 b/ext/gd/config.m4
+index b31c9b2..e5e2d9f 100644
+--- a/ext/gd/config.m4
++++ b/ext/gd/config.m4
+@@ -147,6 +147,40 @@ dnl that gd defines "junk" versions of each gdImageCreateFromFoo function
+ dnl even when it does not support the Foo format. Those junk functions
+ dnl display a warning but eventually return normally, making a simple link
+ dnl or run test insufficient.
++
++AC_DEFUN([_AC_DO_TOKENS_QEMU],
++[{
++  if test "$cross_compiling" = "yes"; then
++    ac_try='QEMU_LD_PREFIX=${XBPS_CROSS_BASE} qemu-${XBPS_TARGET_QEMU_MACHINE}-static $1'
++  else
++    ac_try='$1'
++  fi
++  _AC_DO([$ac_try]); }])
++
++m4_define([_AC_RUN_IFELSE_QEMU_BODY],
++[  AS_LINENO_PUSH([$[]1])
++  AS_IF([_AC_DO_VAR(ac_link) && _AC_DO_TOKENS_QEMU(./conftest$ac_exeext)],
++      [ac_retval=0],
++      [AS_ECHO(["$as_me: program exited with status $ac_status"]) >&AS_MESSAGE_LOG_FD
++       _AC_MSG_LOG_CONFTEST
++       ac_retval=$ac_status])
++  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
++  AS_LINENO_POP
++  AS_SET_STATUS([$ac_retval])
++])
++
++AC_DEFUN([_AC_RUN_IFELSE_QEMU],
++[AC_REQUIRE_SHELL_FN([ac_fn_]_AC_LANG_ABBREV[_try_run_qemu],
++  [AS_FUNCTION_DESCRIBE([ac_fn_]_AC_LANG_ABBREV[_try_run_qemu], [LINENO],
++    [Try to run conftest.$ac_ext, and return whether this succeeded.
++     Assumes that executables *can* be run.])],
++  [$0_BODY])]dnl
++[m4_ifvaln([$1], [AC_LANG_CONFTEST([$1])])]dnl
++[AS_IF([ac_fn_[]_AC_LANG_ABBREV[]_try_run_qemu "$LINENO"], [$2], [$3])
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
++  conftest.$ac_objext conftest.beam[]m4_ifval([$1], [ conftest.$ac_ext])[]dnl
++])
++
+ AC_DEFUN([PHP_GD_CHECK_FORMAT],[
+   old_LIBS="${LIBS}"
+   LIBS="${LIBS} ${GD_SHARED_LIBADD}"
+@@ -154,7 +188,7 @@ AC_DEFUN([PHP_GD_CHECK_FORMAT],[
+   CFLAGS="${CFLAGS} ${GDLIB_CFLAGS}"
+   AC_MSG_CHECKING([for working gdImageCreateFrom$1 in libgd])
+   AC_LANG_PUSH([C])
+-  AC_RUN_IFELSE([AC_LANG_SOURCE([
++  _AC_RUN_IFELSE_QEMU([AC_LANG_SOURCE([
+ #include <stdio.h>
+ #include <unistd.h>
+ #include <gd.h>
+@@ -178,8 +212,6 @@ int main(int argc, char** argv) {
+     AC_DEFINE($2, 1, [Does gdImageCreateFrom$1 work?])
+   ],[
+     AC_MSG_RESULT([no])
+-  ],[
+-    AC_MSG_RESULT([no])
+   ])
+   AC_LANG_POP([C])
+   CFLAGS="${old_CFLAGS}"
diff --git a/srcpkgs/php8.1/patches/php-ltmain-sysroot-support.patch b/srcpkgs/php8.3/patches/cross-ltmain-sysroot-support.patch
similarity index 75%
rename from srcpkgs/php8.1/patches/php-ltmain-sysroot-support.patch
rename to srcpkgs/php8.3/patches/cross-ltmain-sysroot-support.patch
index bbe0a514a9e8ac..a6447ac150221e 100644
--- a/srcpkgs/php8.1/patches/php-ltmain-sysroot-support.patch
+++ b/srcpkgs/php8.3/patches/cross-ltmain-sysroot-support.patch
@@ -1,3 +1,12 @@
+PHP's phpize is based on a very old libtool to generate build files for its
+extensions. This libtool does not support .la files with '=' to support
+sysroot.
+
+In order to support more PHP extension cross compilation this modifies
+ltmain.sh to support such path. This is a bit hackish has it only get sysroot
+from the used toolchain; the proper way to fix that is to have PHP developpers
+to update the autotools file used to build there extensions.
+
 --- a/build/ltmain.sh	2021-09-09 15:19:14.822208365 +0200
 +++ b/build/ltmain.sh	2021-09-09 15:47:55.397011151 +0200
 @@ -2375,6 +2375,13 @@ EOF
diff --git a/srcpkgs/php8.3/patches/php-pear-cross.patch b/srcpkgs/php8.3/patches/cross-pear.patch
similarity index 100%
rename from srcpkgs/php8.3/patches/php-pear-cross.patch
rename to srcpkgs/php8.3/patches/cross-pear.patch
diff --git a/srcpkgs/php8.3/patches/php-phar-cross.patch b/srcpkgs/php8.3/patches/cross-phar.patch
similarity index 100%
rename from srcpkgs/php8.3/patches/php-phar-cross.patch
rename to srcpkgs/php8.3/patches/cross-phar.patch
diff --git a/srcpkgs/php8.3/patches/php-phpize-sysroot-support.patch b/srcpkgs/php8.3/patches/cross-phpize-sysroot-support.patch
similarity index 100%
rename from srcpkgs/php8.3/patches/php-phpize-sysroot-support.patch
rename to srcpkgs/php8.3/patches/cross-phpize-sysroot-support.patch
diff --git a/srcpkgs/php8.3/patches/php-706-crypt.patch b/srcpkgs/php8.3/patches/musl-crypt.patch
similarity index 80%
rename from srcpkgs/php8.3/patches/php-706-crypt.patch
rename to srcpkgs/php8.3/patches/musl-crypt.patch
index 254f1d2187c24e..b83a7ab9bc1e49 100644
--- a/srcpkgs/php8.3/patches/php-706-crypt.patch
+++ b/srcpkgs/php8.3/patches/musl-crypt.patch
@@ -1,3 +1,6 @@
+TODO: This is apparently needed on musl, not sure what the error is, might be
+something to dig in to.
+
 --- a/ext/standard/crypt.c	2016-04-28 14:13:00.000000000 -0400
 +++ b/ext/standard/crypt.c	2016-04-28 21:45:24.340955313 -0400
 @@ -267,6 +267,12 @@
diff --git a/srcpkgs/php8.3/patches/php-cross-config.patch b/srcpkgs/php8.3/patches/php-cross-config.patch
deleted file mode 100644
index c84e44974362fd..00000000000000
--- a/srcpkgs/php8.3/patches/php-cross-config.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/configure b/configure
-index d317fd7..5560d75 100755
---- a/configure
-+++ b/configure
-@@ -60896,7 +60896,7 @@ $as_echo_n "checking for pg_config... " >&6; }
-     fi
-   done
- 
--  if test -n "$PG_CONFIG"; then
-+  if test -n "$PG_CONFIG" && test "x$cross_compiling" != "xyes"; then
-     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PG_CONFIG" >&5
- $as_echo "$PG_CONFIG" >&6; }
-     PGSQL_INCLUDE=`$PG_CONFIG --includedir`
-@@ -62422,7 +62422,7 @@ $as_echo_n "checking for pg_config... " >&6; }
-     fi
-   done
- 
--  if test -n "$PG_CONFIG"; then
-+  if test -n "$PG_CONFIG" && test "x$cross_compiling" != "xyes"; then
-     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PG_CONFIG" >&5
- $as_echo "$PG_CONFIG" >&6; }
-     PGSQL_INCLUDE=`$PG_CONFIG --includedir`
diff --git a/srcpkgs/php8.3/patches/fix-manpages.patch b/srcpkgs/php8.3/patches/php8.3-fix-manpages.patch
similarity index 100%
rename from srcpkgs/php8.3/patches/fix-manpages.patch
rename to srcpkgs/php8.3/patches/php8.3-fix-manpages.patch
diff --git a/srcpkgs/php8.3/patches/php.ini.patch b/srcpkgs/php8.3/patches/php8.3-ini.patch
similarity index 100%
rename from srcpkgs/php8.3/patches/php.ini.patch
rename to srcpkgs/php8.3/patches/php8.3-ini.patch
diff --git a/srcpkgs/php8.3/template b/srcpkgs/php8.3/template
index 9a415922f01fc9..433314bae525a5 100644
--- a/srcpkgs/php8.3/template
+++ b/srcpkgs/php8.3/template
@@ -1,16 +1,16 @@
 # Template file for 'php8.3'
 # rebuild php8.3-apcu and php8.3-imagick when updating this package
 pkgname=php8.3
-version=8.3.10
+version=8.3.14
 revision=1
 _php_version=8.3
 build_helper="qemu"
-hostmakedepends="bison pkg-config apache-devel"
+hostmakedepends="bison pkg-config apache-devel autoconf"
 makedepends="apache-devel enchant2-devel freetds-devel freetype-devel gdbm-devel
  gmp-devel libcurl-devel libjpeg-turbo-devel libmariadbclient-devel
  libsodium-devel libtidy5-devel libxslt-devel libzip-devel net-snmp-devel
  postgresql-libs-devel readline-devel sqlite-devel unixodbc-devel pcre2-devel
- libffi-devel oniguruma-devel gd-devel"
+ libffi-devel oniguruma-devel gd-devel acl-devel"
 short_desc="HTML-embedded scripting language"
 maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
 license="PHP-3.01"
@@ -19,9 +19,12 @@ changelog="https://raw.githubusercontent.com/php/php-src/php-${version}/NEWS"
 # this is the source where the www.php.net code pulls the tarballs it serves
 # at https://www.php.net/distributions/
 distfiles="https://github.com/php/web-php-distributions/raw/master/php-${version}.tar.gz"
-checksum=d0b4dd5ff465053248fd28dacf2fe0bed79deaaef657890cecb6bfcb73996dcd
+checksum=e4ee602c31e2f701c9f0209a2902dd4802727431246a9155bf56dda7bcf7fb4a
 provides="php-runtime-${version}_1"
 
+system_accounts="_phpfpm"
+_phpfpm_homedir="/var/empty"
+
 conf_files="/etc/php${_php_version}/php.ini"
 
 lib32disabled=yes
@@ -47,6 +50,10 @@ alternatives="
  php:phar.phar.1:/usr/share/man/man1/phar${_php_version}.phar.1
  php:php.1:/usr/share/man/man1/php${_php_version}.1"
 
+do_configure() {
+	autoconf -f
+}
+
 do_build() {
 	local _phpconfig="--srcdir=.. \
 		--config-cache \
@@ -137,8 +144,9 @@ do_build() {
 		--host=${XBPS_CROSS_TRIPLET} \
 		--enable-cgi \
 		--enable-fpm \
-		--with-fpm-user=http \
-		--with-fpm-group=http \
+		--with-fpm-user=_phpfpm \
+		--with-fpm-group=_phpfpm \
+		--with-fpm-acl \
 		--enable-embed=shared \
 		${_phpextensions}
 	make ${makejobs} ${_make_env}
diff --git a/srcpkgs/python3-dasbus/template b/srcpkgs/python3-dasbus/template
new file mode 100644
index 00000000000000..5fd0f9976ea557
--- /dev/null
+++ b/srcpkgs/python3-dasbus/template
@@ -0,0 +1,16 @@
+# Template file for 'python3-dasbus'
+pkgname=python3-dasbus
+version=1.7
+revision=1
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+#makedepends=""
+depends="python3 python3-gobject"
+checkdepends="python3-pytest"
+short_desc="DBus library in Python 3"
+maintainer="zenobit <zenobit@disroot.org>"
+license="LGPL-2.1-only"
+homepage="https://github.com/dasbus-project/dasbus"
+#changelog=""
+distfiles="https://github.com/dasbus-project/dasbus/archive/refs/tags/v${version}.tar.gz"
+checksum=442a8df9330d4f55704c92cbed066cf0918378418be89d6fff67721d3cba5590
diff --git a/srcpkgs/python3-geographiclib/template b/srcpkgs/python3-geographiclib/template
new file mode 100644
index 00000000000000..a8eb028aa45ce7
--- /dev/null
+++ b/srcpkgs/python3-geographiclib/template
@@ -0,0 +1,30 @@
+# Template file for 'python3-geographiclib'
+pkgname=python3-geographiclib
+version=2.0
+revision=1
+#archs="i686 x86_64"
+#build_wrksrc=
+build_style=python3-pep517
+#configure_args=""
+#make_build_args=""
+#make_install_args=""
+#conf_files=""
+#make_dirs="/var/log/dir 0755 root root"
+hostmakedepends="cmake gcc make python3-setuptools"
+makedepends=""
+depends=""
+short_desc="Python implementation of the geodesic routines"
+maintainer="zenobit <zenobit@disroot.org>"
+license="MIT"
+homepage="https://geographiclib.sourceforge.io/"
+#changelog=""
+distfiles="https://github.com/geographiclib/geographiclib-python/archive/refs/tags/v${version}.tar.gz"
+checksum=3756afaaa5ca79e153827a2da972180bf045bd89c8415d643d9645f52f2cadef
+
+do_install() {
+	pip install geographiclib
+}
+
+post_install() {
+	vlicence LICENSE
+}
diff --git a/srcpkgs/python3-geopy/template b/srcpkgs/python3-geopy/template
new file mode 100644
index 00000000000000..0efc836c0c2bf6
--- /dev/null
+++ b/srcpkgs/python3-geopy/template
@@ -0,0 +1,13 @@
+# Template file for 'python3-geopy'
+pkgname=python3-geopy
+version=2.4.1
+revision=1
+build_style=python3-module
+hostmakedepends="python3-setuptools python3-wheel python3-pip python3-pytest python3-docutils"
+short_desc="Geocoding library for Python"
+maintainer="zenobit <zenobit@disroot.org>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/geopy/geopy"
+#changelog=""
+distfiles="https://github.com/geopy/geopy/archive/refs/tags/${version}.tar.gz"
+checksum=a231629d166b58b0d557fc453374374d1fe0f3aff205b34bd8196e62ec285c55