From 76e476f9cce20dccaa8c66cda93de1c436ff91a8 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Sat, 25 Jun 2022 18:22:28 +0200
Subject: [PATCH 1/9] openssl: update to 3.0.9

---
 common/shlibs                           |  4 +-
 srcpkgs/{libcrypto1.1 => libcrypto3.0}  |  0
 srcpkgs/{libssl1.1 => libssl3.0}        |  0
 srcpkgs/openssl/patches/ppc-auxv.patch  | 25 -------
 srcpkgs/openssl/patches/ppc64.patch     | 96 -------------------------
 srcpkgs/openssl/patches/xxx-ppcle.patch | 53 --------------
 srcpkgs/openssl/template                | 25 ++++---
 7 files changed, 14 insertions(+), 189 deletions(-)
 rename srcpkgs/{libcrypto1.1 => libcrypto3.0} (100%)
 rename srcpkgs/{libssl1.1 => libssl3.0} (100%)
 delete mode 100644 srcpkgs/openssl/patches/ppc-auxv.patch
 delete mode 100644 srcpkgs/openssl/patches/ppc64.patch
 delete mode 100644 srcpkgs/openssl/patches/xxx-ppcle.patch

diff --git a/common/shlibs b/common/shlibs
index df0384d3b218..4db0b01e62e3 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1779,8 +1779,8 @@ libid3.so id3lib-3.8.3_7
 libid3-3.8.so.3 id3lib-3.8.3_7
 libgirara-gtk3.so.3 girara-0.2.8_1
 libjq.so.1 jq-1.6_2
-libcrypto.so.1.1 libcrypto1.1-1.1.1f_1
-libssl.so.1.1 libssl1.1-1.1.1f_1
+libcrypto.so.3 libcrypto3.0-3.0.7_1
+libssl.so.3 libssl3.0-3.0.7_1
 libvamp-hostsdk.so.3 libvamp-plugin-sdk-2.2_6
 libportmidi.so portmidi-217_1
 libWildMidi.so.2 libwildmidi-0.4.3_1
diff --git a/srcpkgs/libcrypto1.1 b/srcpkgs/libcrypto3.0
similarity index 100%
rename from srcpkgs/libcrypto1.1
rename to srcpkgs/libcrypto3.0
diff --git a/srcpkgs/libssl1.1 b/srcpkgs/libssl3.0
similarity index 100%
rename from srcpkgs/libssl1.1
rename to srcpkgs/libssl3.0
diff --git a/srcpkgs/openssl/patches/ppc-auxv.patch b/srcpkgs/openssl/patches/ppc-auxv.patch
deleted file mode 100644
index 274ac2d55998..000000000000
--- a/srcpkgs/openssl/patches/ppc-auxv.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff --git a/crypto/ppccap.c b/crypto/ppccap.c
-index eeaa47c..e6eeb14 100644
---- a/crypto/ppccap.c
-+++ b/crypto/ppccap.c
-@@ -207,17 +207,9 @@ size_t OPENSSL_instrument_bus2(unsigned int *out, size_t cnt, size_t max)
-         return 0;
- }
- 
--#if defined(__GLIBC__) && defined(__GLIBC_PREREQ)
--# if __GLIBC_PREREQ(2, 16)
--#  include <sys/auxv.h>
--#  define OSSL_IMPLEMENT_GETAUXVAL
--# elif defined(__ANDROID_API__)
--/* see https://developer.android.google.cn/ndk/guides/cpu-features */
--#  if __ANDROID_API__ >= 18
--#   include <sys/auxv.h>
--#   define OSSL_IMPLEMENT_GETAUXVAL
--#  endif
--# endif
-+#if defined(__linux__)
-+# include <sys/auxv.h>
-+# define OSSL_IMPLEMENT_GETAUXVAL
- #endif
- 
- #if defined(__FreeBSD__)
diff --git a/srcpkgs/openssl/patches/ppc64.patch b/srcpkgs/openssl/patches/ppc64.patch
deleted file mode 100644
index c75ceedba2c0..000000000000
--- a/srcpkgs/openssl/patches/ppc64.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-From 34ab13b7d8e3e723adb60be8142e38b7c9cd382a Mon Sep 17 00:00:00 2001
-From: Andy Polyakov <appro@openssl.org>
-Date: Sun, 5 May 2019 18:25:50 +0200
-Subject: [PATCH] crypto/perlasm/ppc-xlate.pl: add linux64v2 flavour
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This is a big endian ELFv2 configuration. ELFv2 was already being
-used for little endian, and big endian was traditionally ELFv1
-but there are practical configurations that use ELFv2 with big
-endian nowadays (Adélie Linux, Void Linux, possibly Gentoo, etc.)
-
-Reviewed-by: Paul Dale <paul.dale@oracle.com>
-Reviewed-by: Richard Levitte <levitte@openssl.org>
-(Merged from https://github.com/openssl/openssl/pull/8883)
----
- crypto/perlasm/ppc-xlate.pl | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/crypto/perlasm/ppc-xlate.pl b/crypto/perlasm/ppc-xlate.pl
-index e52f2f6ea62..5fcd0526dff 100755
---- a/crypto/perlasm/ppc-xlate.pl
-+++ b/crypto/perlasm/ppc-xlate.pl
-@@ -49,7 +49,7 @@
- 	/osx/		&& do { $name = "_$name";
- 				last;
- 			      };
--	/linux.*(32|64le)/
-+	/linux.*(32|64(le|v2))/
- 			&& do {	$ret .= ".globl	$name";
- 				if (!$$type) {
- 				    $ret .= "\n.type	$name,\@function";
-@@ -80,7 +80,7 @@
- };
- my $text = sub {
-     my $ret = ($flavour =~ /aix/) ? ".csect\t.text[PR],7" : ".text";
--    $ret = ".abiversion	2\n".$ret	if ($flavour =~ /linux.*64le/);
-+    $ret = ".abiversion	2\n".$ret	if ($flavour =~ /linux.*64(le|v2)/);
-     $ret;
- };
- my $machine = sub {
-@@ -186,7 +186,7 @@
- 
- # Some ABIs specify vrsave, special-purpose register #256, as reserved
- # for system use.
--my $no_vrsave = ($flavour =~ /aix|linux64le/);
-+my $no_vrsave = ($flavour =~ /aix|linux64(le|v2)/);
- my $mtspr = sub {
-     my ($f,$idx,$ra) = @_;
-     if ($idx == 256 && $no_vrsave) {
-@@ -318,7 +318,7 @@ sub vfour {
- 	if ($label) {
- 	    my $xlated = ($GLOBALS{$label} or $label);
- 	    print "$xlated:";
--	    if ($flavour =~ /linux.*64le/) {
-+	    if ($flavour =~ /linux.*64(le|v2)/) {
- 		if ($TYPES{$label} =~ /function/) {
- 		    printf "\n.localentry	%s,0\n",$xlated;
- 		}
-
-From 098404128383ded87ba390dd74ecd9e2ffa6f530 Mon Sep 17 00:00:00 2001
-From: Andy Polyakov <appro@openssl.org>
-Date: Sun, 5 May 2019 18:30:55 +0200
-Subject: [PATCH] Configure: use ELFv2 ABI on some ppc64 big endian systems
-
-If _CALL_ELF is defined to be 2, it's an ELFv2 system.
-Conditionally switch to the v2 perlasm scheme.
-
-Reviewed-by: Paul Dale <paul.dale@oracle.com>
-Reviewed-by: Richard Levitte <levitte@openssl.org>
-(Merged from https://github.com/openssl/openssl/pull/8883)
----
- Configure | 10 +++++++---
- 1 file changed, 7 insertions(+), 3 deletions(-)
-
-diff --git a/Configure b/Configure
-index 22082deb4c7..e303d98deb3 100755
---- a/Configure
-+++ b/Configure
-@@ -1402,8 +1402,15 @@
- my %predefined_C = compiler_predefined($config{CROSS_COMPILE}.$config{CC});
- my %predefined_CXX = $config{CXX}
-     ? compiler_predefined($config{CROSS_COMPILE}.$config{CXX})
-     : ();
- 
-+unless ($disabled{asm}) {
-+    # big endian systems can use ELFv2 ABI
-+    if ($target eq "linux-ppc64") {
-+        $target{perlasm_scheme} = "linux64v2" if ($predefined_C{_CALL_ELF} == 2);
-+    }
-+}
-+
- # Check for makedepend capabilities.
- if (!$disabled{makedepend}) {
-     if ($config{target} =~ /^(VC|vms)-/) {
diff --git a/srcpkgs/openssl/patches/xxx-ppcle.patch b/srcpkgs/openssl/patches/xxx-ppcle.patch
deleted file mode 100644
index 2498af968899..000000000000
--- a/srcpkgs/openssl/patches/xxx-ppcle.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-commit 56e07856a7a9f7ce3582b8cf3843f252691475a6
-Author: q66 <daniel@octaforge.org>
-Date:   Fri Mar 5 18:36:01 2021 +0100
-
-    add ppcle support
-
-diff --git Configurations/10-main.conf Configurations/10-main.conf
-index 8dc3e85..18f10c9 100644
---- a/Configurations/10-main.conf
-+++ b/Configurations/10-main.conf
-@@ -665,6 +665,11 @@ my %targets = (
-         perlasm_scheme   => "linux32",
-         lib_cppflags     => add("-DB_ENDIAN"),
-     },
-+    "linux-ppcle" => {
-+        inherit_from     => [ "linux-generic32", asm("ppc32_asm") ],
-+        perlasm_scheme   => "linux32le",
-+        lib_cppflags     => add("-DL_ENDIAN"),
-+    },
-     "linux-ppc64" => {
-         inherit_from     => [ "linux-generic64", asm("ppc64_asm") ],
-         cflags           => add("-m64"),
-diff --git config config
-index 26225ca..6a1e830 100755
---- a/config
-+++ b/config
-@@ -543,6 +543,7 @@ case "$GUESSOS" in
- 	fi
- 	;;
-   ppc64le-*-linux2) OUT="linux-ppc64le" ;;
-+  ppcle-*-linux2) OUT="linux-ppcle" ;;
-   ppc-*-linux2) OUT="linux-ppc" ;;
-   mips64*-*-linux2)
- 	echo "WARNING! If you wish to build 64-bit library, then you have to"
-diff --git crypto/poly1305/asm/poly1305-ppc.pl crypto/poly1305/asm/poly1305-ppc.pl
-index e5d6933..3283f6b 100755
---- a/crypto/poly1305/asm/poly1305-ppc.pl
-+++ b/crypto/poly1305/asm/poly1305-ppc.pl
-@@ -314,10 +314,10 @@ $code.=<<___;
- 	beq-	Lno_key
- ___
- $code.=<<___	if ($LITTLE_ENDIAN);
--	lw	$h0,0($inp)		# load key material
--	lw	$h1,4($inp)
--	lw	$h2,8($inp)
--	lw	$h3,12($inp)
-+	lwz	$h0,0($inp)		# load key material
-+	lwz	$h1,4($inp)
-+	lwz	$h2,8($inp)
-+	lwz	$h3,12($inp)
- ___
- $code.=<<___	if (!$LITTLE_ENDIAN);
- 	li	$h1,4
diff --git a/srcpkgs/openssl/template b/srcpkgs/openssl/template
index 79da0b051aad..1093f3ecbab6 100644
--- a/srcpkgs/openssl/template
+++ b/srcpkgs/openssl/template
@@ -1,6 +1,6 @@
 # Template file for 'openssl'
 pkgname=openssl
-version=1.1.1t
+version=3.0.9
 revision=1
 bootstrap=yes
 build_style=configure
@@ -14,10 +14,10 @@ make_check_target=test
 make_install_args="MANSUFFIX=ssl"
 short_desc="Toolkit for Secure Sockets Layer and Transport Layer Security"
 maintainer="John <me@johnnynator.dev>"
-license="OpenSSL"
+license="Apache-2.0"
 homepage="https://www.openssl.org"
 distfiles="https://www.openssl.org/source/openssl-${version}.tar.gz"
-checksum=8dee9b24bdb1dcbf0c3d1e9b02fb8f6bf22165e807f45adeb7c9677536859d3b
+checksum=eb1ab04781474360f77c318ab89d8c5a03abc38e63d65a603cabbf1b00a1dc90
 conf_files="/etc/ssl/openssl.cnf"
 replaces="libressl>=0"
 
@@ -28,7 +28,11 @@ if [ "$CHROOT_READY" ]; then
 	build_options_default="asm"
 else
 	# openssl-c_rehash depends on perl, ignore on bootstrap
-	subpackages="libcrypto1.1 libssl1.1 openssl-devel"
+	subpackages="libcrypto3.0 libssl3.0 openssl-devel"
+fi
+
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+	makedepends+=" libatomic-devel"
 fi
 
 case $XBPS_TARGET_MACHINE in
@@ -52,26 +56,21 @@ pre_build() {
 	make ${makejobs} depend
 }
 
-pre_check() {
-	# developer test, fails due to different nm output
-	rm -f test/recipes/01-test_symbol_presence.t
-}
-
 post_install() {
 	if [ ! "$CHROOT_READY" ]; then
 		rm -f "${DESTDIR}/usr/bin/c_rehash"
 	fi
 }
 
-libcrypto1.1_package() {
+libcrypto3.0_package() {
 	short_desc+=" - crypto library"
 	pkg_install() {
 		vmove "usr/lib/libcrypto.so.*"
-		vmove usr/lib/engines-1.1
+		vmove usr/lib/engines-3
 	}
 }
 
-libssl1.1_package() {
+libssl3.0_package() {
 	short_desc+=" - SSL/TLS library"
 	pkg_install() {
 		vmove "usr/lib/libssl.so.*"
@@ -87,7 +86,7 @@ openssl-c_rehash_package() {
 }
 
 openssl-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision} libssl1.1>=${version}_${revision} libcrypto1.1>=${version}_${revision}"
+	depends="${sourcepkg}>=${version}_${revision} libssl3.0>=${version}_${revision} libcrypto3.0>=${version}_${revision}"
 	replaces="libressl-devel>=0"
 	short_desc+=" - development files"
 	pkg_install() {

From 5c760d50d197392cd6a48539ac1c52e9311a965d Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Wed, 8 Feb 2023 18:03:53 -0500
Subject: [PATCH 2/9] racket: depend on libssl3.0

---
 srcpkgs/racket/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/racket/template b/srcpkgs/racket/template
index 2dc69c30c241..505f1d47920a 100644
--- a/srcpkgs/racket/template
+++ b/srcpkgs/racket/template
@@ -1,7 +1,7 @@
 # Template file for 'racket'
 pkgname=racket
 version=8.9
-revision=1
+revision=2
 archs="aarch64* armv6* armv7* i686* x86_64*"
 build_wrksrc=src
 build_style=gnu-configure
@@ -9,7 +9,7 @@ configure_args="--enable-useprefix --enable-curses"
 make_build_args="CC_FOR_BUILD=cc"
 hostmakedepends="liberation-fonts-ttf"
 makedepends="gtk+3-devel liblz4-devel ncurses-devel sqlite-devel zlib-devel"
-depends="gtk+3 libssl1.1"
+depends="gtk+3 libssl3.0"
 short_desc="Multi-paradigm programming language in the Lisp-Scheme family"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="LGPL-3.0-only, MIT"

From 4af73ef04230ce5af34699b18734cb258ccd2328 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Sat, 28 Jan 2023 16:58:32 -0500
Subject: [PATCH 3/9] git-crypt: update to 0.7.0, add CXXFLAG for openssl3

---
 srcpkgs/git-crypt/template | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/git-crypt/template b/srcpkgs/git-crypt/template
index f5c4c79b664d..211ab8a0adab 100644
--- a/srcpkgs/git-crypt/template
+++ b/srcpkgs/git-crypt/template
@@ -1,7 +1,7 @@
 # Template file for 'git-crypt'
 pkgname=git-crypt
-version=0.6.0
-revision=8
+version=0.7.0
+revision=1
 build_style=gnu-makefile
 make_use_env=yes
 make_build_args="ENABLE_MAN=yes"
@@ -13,7 +13,14 @@ maintainer="Andy Cobaugh <andrewcobaugh@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.agwa.name/projects/git-crypt/"
 distfiles="https://github.com/AGWA/git-crypt/archive/${version}.tar.gz"
-checksum=777c0c7aadbbc758b69aff1339ca61697011ef7b92f1d1ee9518a8ee7702bb78
+checksum=2210a89588169ae9a54988c7fdd9717333f0c6053ff704d335631a387bd3bcff
+
+do_build() {
+	make \
+		PREFIX=/usr prefix=/usr \
+		CXXFLAGS="$CXXFLAGS -DOPENSSL_API_COMPAT=0x30000000L" \
+		${makejobs} ${make_build_args} ${make_build_target}
+}
 
 post_install() {
 	vdoc README

From b41bca7fcce38f39c4da49a0bd1f5b51f75e4215 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Sat, 18 Feb 2023 12:12:50 +0100
Subject: [PATCH 4/9] git-brws: bump for openssl-3.0

---
 srcpkgs/git-brws/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/git-brws/template b/srcpkgs/git-brws/template
index b43b73e13c9f..f07bdb162deb 100644
--- a/srcpkgs/git-brws/template
+++ b/srcpkgs/git-brws/template
@@ -1,7 +1,7 @@
 # Template file for 'git-brws'
 pkgname=git-brws
 version=0.11.12
-revision=3
+revision=4
 build_style=cargo
 hostmakedepends="pkg-config"
 makedepends="openssl-devel"
@@ -14,12 +14,16 @@ checksum=3a4bbf93f0b16562260ca66c2b60c655d5bfc690d0229d11757be76d95cb81c5
 # Tests require git checkout and partially also GitHub tokens
 make_check=no
 
-pre_build() {
+post_patch() {
 	# fixes an indexmap error when cross compiling
 	cargo update --package autocfg:1.0.1 --precise 1.1.0
 
 	# fixes compilation on Rust 1.64 and higher
 	cargo update --package socket2:0.3.15 --precise 0.3.16
+
+	# required for openssl3 compat
+	cargo update --package openssl-sys:0.9.58 --precise 0.9.80
+	cargo update --package openssl:0.10.30 --precise 0.10.45
 }
 
 post_install() {

From c8096c934fbc776acb14f4add91a51b3699a4784 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Sat, 18 Feb 2023 12:13:51 +0100
Subject: [PATCH 5/9] signal-backup-decode: bump for openssl-3.0

---
 srcpkgs/signal-backup-decode/template | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/srcpkgs/signal-backup-decode/template b/srcpkgs/signal-backup-decode/template
index 8b528548fadd..6e5a442b8d3c 100644
--- a/srcpkgs/signal-backup-decode/template
+++ b/srcpkgs/signal-backup-decode/template
@@ -11,3 +11,9 @@ license="GPL-3.0-or-later"
 homepage="https://github.com/pajowu/signal-backup-decode"
 distfiles="${homepage}/archive/v${version}.tar.gz"
 checksum=e7727b6628004cd027e374bcd8a004d8c3e68b3ba03e82ce2c9e04ee58623ed2
+
+post_patch() {
+	# required for openssl3 compat
+	cargo update --package openssl-sys:0.9.60 --precise 0.9.80
+	cargo update --package openssl:0.10.32 --precise 0.10.45
+}

From 728cb6a82ecd4b37a6da63e72ee562021c344beb Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Mon, 20 Feb 2023 15:59:28 -0500
Subject: [PATCH 6/9] taisei: patch for openssl 3

---
 srcpkgs/taisei/patches/openssl1.patch | 95 +++++++++++++++++++++++++++
 srcpkgs/taisei/patches/openssl2.patch | 57 ++++++++++++++++
 srcpkgs/taisei/template               |  2 +-
 3 files changed, 153 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/taisei/patches/openssl1.patch
 create mode 100644 srcpkgs/taisei/patches/openssl2.patch

diff --git a/srcpkgs/taisei/patches/openssl1.patch b/srcpkgs/taisei/patches/openssl1.patch
new file mode 100644
index 000000000000..2a804bb7710f
--- /dev/null
+++ b/srcpkgs/taisei/patches/openssl1.patch
@@ -0,0 +1,95 @@
+diff --git a/src/util/sha256.c b/src/util/sha256.c
+index 15f4491ee..e01e32279 100644
+--- a/src/util/sha256.c
++++ b/src/util/sha256.c
+@@ -119,7 +119,7 @@ static void sha256_init(SHA256State *ctx)
+ 	ctx->state[7] = 0x5be0cd19;
+ }
+ 
+-SHA256State* sha256_new(void) {
++SHA256State *sha256_new(void) {
+ 	SHA256State *ctx = calloc(1, sizeof(*ctx));
+ 	sha256_init(ctx);
+ 	return ctx;
+@@ -129,8 +129,7 @@ void sha256_free(SHA256State *ctx) {
+ 	free(ctx);
+ }
+ 
+-void sha256_update(SHA256State *ctx, const sha256_byte_t data[], size_t len)
+-{
++void sha256_update(SHA256State *ctx, const sha256_byte_t data[], size_t len) {
+ 	sha256_word_t i;
+ 
+ 	for (i = 0; i < len; ++i) {
+@@ -144,8 +143,7 @@ void sha256_update(SHA256State *ctx, const sha256_byte_t data[], size_t len)
+ 	}
+ }
+ 
+-void sha256_final(SHA256State *ctx, sha256_byte_t hash[], size_t hashlen)
+-{
++void sha256_final(SHA256State *ctx, sha256_byte_t hash[], size_t hashlen) {
+ 	assert(hashlen >= SHA256_BLOCK_SIZE);
+ 
+ 	sha256_word_t i;
+@@ -201,8 +199,8 @@ void sha256_digest(const uint8_t *data, size_t len, uint8_t hash[SHA256_BLOCK_SI
+ 	sha256_final(&ctx, hash, hashlen);
+ }
+ 
+-void sha256_hexdigest(const uint8_t *data, size_t len, char hash[SHA256_BLOCK_SIZE*2+1], size_t hashlen) {
+-	assert(hashlen >= SHA256_BLOCK_SIZE * 2 + 1);
++void sha256_hexdigest(const uint8_t *data, size_t len, char hash[SHA256_HEXDIGEST_SIZE], size_t hashlen) {
++	assert(hashlen >= SHA256_HEXDIGEST_SIZE);
+ 
+ 	uint8_t digest[SHA256_BLOCK_SIZE];
+ 	sha256_digest(data, len, digest, sizeof(digest));
+diff --git a/src/util/sha256.h b/src/util/sha256.h
+index 191246c91..f501e2d98 100644
+--- a/src/util/sha256.h
++++ b/src/util/sha256.h
+@@ -11,16 +11,19 @@
+ 
+ #include "taisei.h"
+ 
+-#define SHA256_BLOCK_SIZE 32
++enum {
++	SHA256_BLOCK_SIZE = 32,
++	SHA256_HEXDIGEST_SIZE = SHA256_BLOCK_SIZE * 2 + 1,
++};
+ 
+ typedef struct SHA256State SHA256State;
+ 
+-SHA256State* sha256_new(void) attr_returns_allocated;
++SHA256State *sha256_new(void) attr_returns_allocated;
+ void sha256_update(SHA256State *state, const uint8_t *data, size_t len) attr_nonnull(1, 2);
+ void sha256_final(SHA256State *state, uint8_t hash[SHA256_BLOCK_SIZE], size_t hashlen) attr_nonnull(1, 2);
+ void sha256_free(SHA256State *state);
+ 
+ void sha256_digest(const uint8_t *data, size_t len, uint8_t hash[SHA256_BLOCK_SIZE], size_t hashlen);
+-void sha256_hexdigest(const uint8_t *data, size_t len, char hash[SHA256_BLOCK_SIZE*2+1], size_t hashlen);
++void sha256_hexdigest(const uint8_t *data, size_t len, char hash[SHA256_HEXDIGEST_SIZE], size_t hashlen);
+ 
+ #endif // IGUARD_util_sha256_h
+diff --git a/src/util/sha256_openssl.c b/src/util/sha256_openssl.c
+index b6f8e9039..0dc06e740 100644
+--- a/src/util/sha256_openssl.c
++++ b/src/util/sha256_openssl.c
+@@ -17,7 +17,7 @@ struct SHA256State {
+ 	SHA256_CTX context;
+ };
+ 
+-SHA256State* sha256_new(void) {
++SHA256State *sha256_new(void) {
+ 	SHA256State *st = calloc(1, sizeof(*st));
+ 	SHA256_Init(&st->context);
+ 	return st;
+@@ -45,8 +45,8 @@ void sha256_digest(const uint8_t *data, size_t len, uint8_t hash[SHA256_BLOCK_SI
+ 	SHA256_Final(hash, &ctx);
+ }
+ 
+-void sha256_hexdigest(const uint8_t *data, size_t len, char hash[SHA256_BLOCK_SIZE*2+1], size_t hashlen) {
+-	assert(hashlen >= SHA256_BLOCK_SIZE * 2 + 1);
++void sha256_hexdigest(const uint8_t *data, size_t len, char hash[SHA256_HEXDIGEST_SIZE], size_t hashlen) {
++	assert(hashlen >= SHA256_HEXDIGEST_SIZE);
+ 
+ 	uint8_t digest[SHA256_BLOCK_SIZE];
+ 	sha256_digest(data, len, digest, sizeof(digest));
diff --git a/srcpkgs/taisei/patches/openssl2.patch b/srcpkgs/taisei/patches/openssl2.patch
new file mode 100644
index 000000000000..c1b9f411badc
--- /dev/null
+++ b/srcpkgs/taisei/patches/openssl2.patch
@@ -0,0 +1,57 @@
+diff --git a/src/util/sha256_openssl.c b/src/util/sha256_openssl.c
+index 0dc06e740..c73d8e7fb 100644
+--- a/src/util/sha256_openssl.c
++++ b/src/util/sha256_openssl.c
+@@ -11,38 +11,34 @@
+ #include "sha256.h"
+ #include "util.h"
+ 
+-#include <openssl/sha.h>
+-
+-struct SHA256State {
+-	SHA256_CTX context;
+-};
++#include <openssl/evp.h>
+ 
+ SHA256State *sha256_new(void) {
+-	SHA256State *st = calloc(1, sizeof(*st));
+-	SHA256_Init(&st->context);
+-	return st;
++	EVP_MD_CTX *ctx = EVP_MD_CTX_new();
++	EVP_DigestInit(ctx, EVP_sha256());
++	return (SHA256State*)ctx;
+ }
+ 
+-void sha256_free(SHA256State *ctx) {
+-	free(ctx);
++void sha256_free(SHA256State *st) {
++	EVP_MD_CTX_free((EVP_MD_CTX*)st);
+ }
+ 
+-void sha256_update(SHA256State *ctx, const uint8_t *data, size_t len) {
+-    SHA256_Update(&ctx->context, data, len);
++void sha256_update(SHA256State *st, const uint8_t *data, size_t len) {
++	EVP_DigestUpdate((EVP_MD_CTX*)st, data, len);
+ }
+ 
+-void sha256_final(SHA256State *ctx, uint8_t hash[SHA256_BLOCK_SIZE], size_t hashlen) {
++void sha256_final(SHA256State *st, uint8_t hash[SHA256_BLOCK_SIZE], size_t hashlen) {
+ 	assert(hashlen >= SHA256_BLOCK_SIZE);
+-	SHA256_Final(hash, &ctx->context);
++	EVP_DigestFinalXOF((EVP_MD_CTX*)st, hash, hashlen);
+ }
+ 
+ void sha256_digest(const uint8_t *data, size_t len, uint8_t hash[SHA256_BLOCK_SIZE], size_t hashlen) {
+ 	assert(hashlen >= SHA256_BLOCK_SIZE);
+ 
+-	SHA256_CTX ctx;
+-	SHA256_Init(&ctx);
+-	SHA256_Update(&ctx, data, len);
+-	SHA256_Final(hash, &ctx);
++	SHA256State *st = sha256_new();
++	sha256_update(st, data, len);
++	sha256_final(st, hash, hashlen);
++	sha256_free(st);
+ }
+ 
+ void sha256_hexdigest(const uint8_t *data, size_t len, char hash[SHA256_HEXDIGEST_SIZE], size_t hashlen) {
diff --git a/srcpkgs/taisei/template b/srcpkgs/taisei/template
index d99720f499b6..52d2834a7166 100644
--- a/srcpkgs/taisei/template
+++ b/srcpkgs/taisei/template
@@ -1,7 +1,7 @@
 # Template file for 'taisei'
 pkgname=taisei
 version=1.3.2
-revision=1
+revision=2
 build_style=meson
 hostmakedepends="pkg-config python3-docutils"
 makedepends="SDL2_mixer-devel freetype-devel libwebp-devel libzip-devel cglm

From 83758e4edb648f242783031cdd5a5df64e94d5ee Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Wed, 22 Feb 2023 15:51:58 -0500
Subject: [PATCH 7/9] new package: openssl1.1-compat

---
 common/shlibs                                 |  2 +
 srcpkgs/libcrypto1.1                          |  1 +
 srcpkgs/libssl1.1                             |  1 +
 .../openssl1.1-compat/patches/ppc-auxv.patch  | 25 +++++
 srcpkgs/openssl1.1-compat/patches/ppc64.patch | 96 +++++++++++++++++++
 .../openssl1.1-compat/patches/xxx-ppcle.patch | 53 ++++++++++
 srcpkgs/openssl1.1-compat/template            | 81 ++++++++++++++++
 srcpkgs/openssl1.1-devel                      |  1 +
 8 files changed, 260 insertions(+)
 create mode 120000 srcpkgs/libcrypto1.1
 create mode 120000 srcpkgs/libssl1.1
 create mode 100644 srcpkgs/openssl1.1-compat/patches/ppc-auxv.patch
 create mode 100644 srcpkgs/openssl1.1-compat/patches/ppc64.patch
 create mode 100644 srcpkgs/openssl1.1-compat/patches/xxx-ppcle.patch
 create mode 100644 srcpkgs/openssl1.1-compat/template
 create mode 120000 srcpkgs/openssl1.1-devel

diff --git a/common/shlibs b/common/shlibs
index 4db0b01e62e3..8aabd30e2c2c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1779,6 +1779,8 @@ libid3.so id3lib-3.8.3_7
 libid3-3.8.so.3 id3lib-3.8.3_7
 libgirara-gtk3.so.3 girara-0.2.8_1
 libjq.so.1 jq-1.6_2
+libcrypto.so.1.1 libcrypto1.1-1.1.1f_1
+libssl.so.1.1 libssl1.1-1.1.1f_1
 libcrypto.so.3 libcrypto3.0-3.0.7_1
 libssl.so.3 libssl3.0-3.0.7_1
 libvamp-hostsdk.so.3 libvamp-plugin-sdk-2.2_6
diff --git a/srcpkgs/libcrypto1.1 b/srcpkgs/libcrypto1.1
new file mode 120000
index 000000000000..da943cea53f5
--- /dev/null
+++ b/srcpkgs/libcrypto1.1
@@ -0,0 +1 @@
+openssl1.1-compat/
\ No newline at end of file
diff --git a/srcpkgs/libssl1.1 b/srcpkgs/libssl1.1
new file mode 120000
index 000000000000..da943cea53f5
--- /dev/null
+++ b/srcpkgs/libssl1.1
@@ -0,0 +1 @@
+openssl1.1-compat/
\ No newline at end of file
diff --git a/srcpkgs/openssl1.1-compat/patches/ppc-auxv.patch b/srcpkgs/openssl1.1-compat/patches/ppc-auxv.patch
new file mode 100644
index 000000000000..274ac2d55998
--- /dev/null
+++ b/srcpkgs/openssl1.1-compat/patches/ppc-auxv.patch
@@ -0,0 +1,25 @@
+diff --git a/crypto/ppccap.c b/crypto/ppccap.c
+index eeaa47c..e6eeb14 100644
+--- a/crypto/ppccap.c
++++ b/crypto/ppccap.c
+@@ -207,17 +207,9 @@ size_t OPENSSL_instrument_bus2(unsigned int *out, size_t cnt, size_t max)
+         return 0;
+ }
+ 
+-#if defined(__GLIBC__) && defined(__GLIBC_PREREQ)
+-# if __GLIBC_PREREQ(2, 16)
+-#  include <sys/auxv.h>
+-#  define OSSL_IMPLEMENT_GETAUXVAL
+-# elif defined(__ANDROID_API__)
+-/* see https://developer.android.google.cn/ndk/guides/cpu-features */
+-#  if __ANDROID_API__ >= 18
+-#   include <sys/auxv.h>
+-#   define OSSL_IMPLEMENT_GETAUXVAL
+-#  endif
+-# endif
++#if defined(__linux__)
++# include <sys/auxv.h>
++# define OSSL_IMPLEMENT_GETAUXVAL
+ #endif
+ 
+ #if defined(__FreeBSD__)
diff --git a/srcpkgs/openssl1.1-compat/patches/ppc64.patch b/srcpkgs/openssl1.1-compat/patches/ppc64.patch
new file mode 100644
index 000000000000..c75ceedba2c0
--- /dev/null
+++ b/srcpkgs/openssl1.1-compat/patches/ppc64.patch
@@ -0,0 +1,96 @@
+From 34ab13b7d8e3e723adb60be8142e38b7c9cd382a Mon Sep 17 00:00:00 2001
+From: Andy Polyakov <appro@openssl.org>
+Date: Sun, 5 May 2019 18:25:50 +0200
+Subject: [PATCH] crypto/perlasm/ppc-xlate.pl: add linux64v2 flavour
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This is a big endian ELFv2 configuration. ELFv2 was already being
+used for little endian, and big endian was traditionally ELFv1
+but there are practical configurations that use ELFv2 with big
+endian nowadays (Adélie Linux, Void Linux, possibly Gentoo, etc.)
+
+Reviewed-by: Paul Dale <paul.dale@oracle.com>
+Reviewed-by: Richard Levitte <levitte@openssl.org>
+(Merged from https://github.com/openssl/openssl/pull/8883)
+---
+ crypto/perlasm/ppc-xlate.pl | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/crypto/perlasm/ppc-xlate.pl b/crypto/perlasm/ppc-xlate.pl
+index e52f2f6ea62..5fcd0526dff 100755
+--- a/crypto/perlasm/ppc-xlate.pl
++++ b/crypto/perlasm/ppc-xlate.pl
+@@ -49,7 +49,7 @@
+ 	/osx/		&& do { $name = "_$name";
+ 				last;
+ 			      };
+-	/linux.*(32|64le)/
++	/linux.*(32|64(le|v2))/
+ 			&& do {	$ret .= ".globl	$name";
+ 				if (!$$type) {
+ 				    $ret .= "\n.type	$name,\@function";
+@@ -80,7 +80,7 @@
+ };
+ my $text = sub {
+     my $ret = ($flavour =~ /aix/) ? ".csect\t.text[PR],7" : ".text";
+-    $ret = ".abiversion	2\n".$ret	if ($flavour =~ /linux.*64le/);
++    $ret = ".abiversion	2\n".$ret	if ($flavour =~ /linux.*64(le|v2)/);
+     $ret;
+ };
+ my $machine = sub {
+@@ -186,7 +186,7 @@
+ 
+ # Some ABIs specify vrsave, special-purpose register #256, as reserved
+ # for system use.
+-my $no_vrsave = ($flavour =~ /aix|linux64le/);
++my $no_vrsave = ($flavour =~ /aix|linux64(le|v2)/);
+ my $mtspr = sub {
+     my ($f,$idx,$ra) = @_;
+     if ($idx == 256 && $no_vrsave) {
+@@ -318,7 +318,7 @@ sub vfour {
+ 	if ($label) {
+ 	    my $xlated = ($GLOBALS{$label} or $label);
+ 	    print "$xlated:";
+-	    if ($flavour =~ /linux.*64le/) {
++	    if ($flavour =~ /linux.*64(le|v2)/) {
+ 		if ($TYPES{$label} =~ /function/) {
+ 		    printf "\n.localentry	%s,0\n",$xlated;
+ 		}
+
+From 098404128383ded87ba390dd74ecd9e2ffa6f530 Mon Sep 17 00:00:00 2001
+From: Andy Polyakov <appro@openssl.org>
+Date: Sun, 5 May 2019 18:30:55 +0200
+Subject: [PATCH] Configure: use ELFv2 ABI on some ppc64 big endian systems
+
+If _CALL_ELF is defined to be 2, it's an ELFv2 system.
+Conditionally switch to the v2 perlasm scheme.
+
+Reviewed-by: Paul Dale <paul.dale@oracle.com>
+Reviewed-by: Richard Levitte <levitte@openssl.org>
+(Merged from https://github.com/openssl/openssl/pull/8883)
+---
+ Configure | 10 +++++++---
+ 1 file changed, 7 insertions(+), 3 deletions(-)
+
+diff --git a/Configure b/Configure
+index 22082deb4c7..e303d98deb3 100755
+--- a/Configure
++++ b/Configure
+@@ -1402,8 +1402,15 @@
+ my %predefined_C = compiler_predefined($config{CROSS_COMPILE}.$config{CC});
+ my %predefined_CXX = $config{CXX}
+     ? compiler_predefined($config{CROSS_COMPILE}.$config{CXX})
+     : ();
+ 
++unless ($disabled{asm}) {
++    # big endian systems can use ELFv2 ABI
++    if ($target eq "linux-ppc64") {
++        $target{perlasm_scheme} = "linux64v2" if ($predefined_C{_CALL_ELF} == 2);
++    }
++}
++
+ # Check for makedepend capabilities.
+ if (!$disabled{makedepend}) {
+     if ($config{target} =~ /^(VC|vms)-/) {
diff --git a/srcpkgs/openssl1.1-compat/patches/xxx-ppcle.patch b/srcpkgs/openssl1.1-compat/patches/xxx-ppcle.patch
new file mode 100644
index 000000000000..2498af968899
--- /dev/null
+++ b/srcpkgs/openssl1.1-compat/patches/xxx-ppcle.patch
@@ -0,0 +1,53 @@
+commit 56e07856a7a9f7ce3582b8cf3843f252691475a6
+Author: q66 <daniel@octaforge.org>
+Date:   Fri Mar 5 18:36:01 2021 +0100
+
+    add ppcle support
+
+diff --git Configurations/10-main.conf Configurations/10-main.conf
+index 8dc3e85..18f10c9 100644
+--- a/Configurations/10-main.conf
++++ b/Configurations/10-main.conf
+@@ -665,6 +665,11 @@ my %targets = (
+         perlasm_scheme   => "linux32",
+         lib_cppflags     => add("-DB_ENDIAN"),
+     },
++    "linux-ppcle" => {
++        inherit_from     => [ "linux-generic32", asm("ppc32_asm") ],
++        perlasm_scheme   => "linux32le",
++        lib_cppflags     => add("-DL_ENDIAN"),
++    },
+     "linux-ppc64" => {
+         inherit_from     => [ "linux-generic64", asm("ppc64_asm") ],
+         cflags           => add("-m64"),
+diff --git config config
+index 26225ca..6a1e830 100755
+--- a/config
++++ b/config
+@@ -543,6 +543,7 @@ case "$GUESSOS" in
+ 	fi
+ 	;;
+   ppc64le-*-linux2) OUT="linux-ppc64le" ;;
++  ppcle-*-linux2) OUT="linux-ppcle" ;;
+   ppc-*-linux2) OUT="linux-ppc" ;;
+   mips64*-*-linux2)
+ 	echo "WARNING! If you wish to build 64-bit library, then you have to"
+diff --git crypto/poly1305/asm/poly1305-ppc.pl crypto/poly1305/asm/poly1305-ppc.pl
+index e5d6933..3283f6b 100755
+--- a/crypto/poly1305/asm/poly1305-ppc.pl
++++ b/crypto/poly1305/asm/poly1305-ppc.pl
+@@ -314,10 +314,10 @@ $code.=<<___;
+ 	beq-	Lno_key
+ ___
+ $code.=<<___	if ($LITTLE_ENDIAN);
+-	lw	$h0,0($inp)		# load key material
+-	lw	$h1,4($inp)
+-	lw	$h2,8($inp)
+-	lw	$h3,12($inp)
++	lwz	$h0,0($inp)		# load key material
++	lwz	$h1,4($inp)
++	lwz	$h2,8($inp)
++	lwz	$h3,12($inp)
+ ___
+ $code.=<<___	if (!$LITTLE_ENDIAN);
+ 	li	$h1,4
diff --git a/srcpkgs/openssl1.1-compat/template b/srcpkgs/openssl1.1-compat/template
new file mode 100644
index 000000000000..563baf5ef7f3
--- /dev/null
+++ b/srcpkgs/openssl1.1-compat/template
@@ -0,0 +1,81 @@
+# Template file for 'openssl1.1-compat'
+pkgname=openssl1.1-compat
+version=1.1.1t
+revision=1
+build_style=configure
+configure_script="./Configure"
+configure_args="--prefix=/usr --openssldir=/etc/ssl1.1 --libdir=lib
+ shared no-ssl3-method $(vopt_if asm ' ' 'no-asm')
+ -Wa,--noexecstack"
+make_cmd=make
+make_build_args='MAKEDEPPROG="$(CC)'
+make_check_target=test
+make_install_args="MANSUFFIX=ssl"
+hostmakedepends="perl"
+short_desc="Toolkit for Transport Layer Security (version 1.1)"
+maintainer="John <me@johnnynator.dev>"
+license="OpenSSL"
+homepage="https://www.openssl.org"
+distfiles="https://www.openssl.org/source/openssl-${version}.tar.gz"
+checksum=8dee9b24bdb1dcbf0c3d1e9b02fb8f6bf22165e807f45adeb7c9677536859d3b
+conf_files="/etc/ssl1.1/openssl.cnf"
+replaces="libressl>=0"
+conflicts="openssl>=3.0.8"
+
+build_options=asm
+build_options_default="asm"
+
+case $XBPS_TARGET_MACHINE in
+	x86_64*) configure_args+=" enable-ec_nistp_64_gcc_128 linux-x86_64";;
+	i686*) configure_args+=" linux-elf";;
+	aarch64*) configure_args+=" linux-aarch64";;
+	ppc64le*) configure_args+=" linux-ppc64le";;
+	ppc64*) configure_args+=" linux-ppc64";;
+	ppcle*) configure_args+=" linux-ppcle";;
+	ppc*) configure_args+=" linux-ppc";;
+	arm*) configure_args+=" linux-armv4";;
+	mips*) configure_args+=" linux-mips32 -mips32";;
+	*) broken="$XBPS_TARGET_MACHINE";;
+esac
+
+pre_configure() {
+	configure_args+=" ${CPPFLAGS} ${CFLAGS} ${LDFLAGS}"
+}
+
+pre_build() {
+	make ${makejobs} depend
+}
+
+post_install() {
+	rm -f "${DESTDIR}/usr/bin/c_rehash"
+}
+
+libcrypto1.1_package() {
+	short_desc+=" - crypto library"
+	pkg_install() {
+		vmove "usr/lib/libcrypto.so.*"
+		vmove usr/lib/engines-1.1
+	}
+}
+
+libssl1.1_package() {
+	short_desc+=" - SSL/TLS library"
+	pkg_install() {
+		vmove "usr/lib/libssl.so.*"
+	}
+}
+
+openssl1.1-devel_package() {
+	depends="libssl1.1>=${version}_${revision} libcrypto1.1>=${version}_${revision}"
+	replaces="libressl-devel>=0"
+	conflicts="openssl-devel>=3.0.8"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/share/man/man3
+		vmove usr/share/doc
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+	}
+}
diff --git a/srcpkgs/openssl1.1-devel b/srcpkgs/openssl1.1-devel
new file mode 120000
index 000000000000..da943cea53f5
--- /dev/null
+++ b/srcpkgs/openssl1.1-devel
@@ -0,0 +1 @@
+openssl1.1-compat/
\ No newline at end of file

From 6614c2c4ffe99c8d710c29a8fed3f2d57b265e13 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Tue, 7 Mar 2023 13:35:45 -0500
Subject: [PATCH 8/9] gcsf: build with openssl1.1-devel

---
 srcpkgs/gcsf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gcsf/template b/srcpkgs/gcsf/template
index 1733ecfe4ee4..ad3072eeb542 100644
--- a/srcpkgs/gcsf/template
+++ b/srcpkgs/gcsf/template
@@ -4,7 +4,7 @@ version=0.1.28
 revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
-makedepends="fuse-devel openssl-devel"
+makedepends="fuse-devel openssl1.1-devel"
 short_desc="FUSE file system based on Google Drive"
 maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="MIT"

From d598d4a985745bd73bdfaef87ef648d3beec2d37 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Thu, 9 Mar 2023 15:33:33 -0500
Subject: [PATCH 9/9] php8.0: remove (incompatible with openssl 3)

---
 srcpkgs/php8.0-apache                         |   1 -
 srcpkgs/php8.0-apcu/INSTALL.msg               |   3 -
 srcpkgs/php8.0-apcu/template                  |  28 --
 srcpkgs/php8.0-apcu/update                    |   2 -
 srcpkgs/php8.0-ast/INSTALL.msg                |   2 -
 srcpkgs/php8.0-ast/template                   |  27 --
 srcpkgs/php8.0-cgi                            |   1 -
 srcpkgs/php8.0-devel                          |   1 -
 srcpkgs/php8.0-embed                          |   1 -
 srcpkgs/php8.0-enchant                        |   1 -
 srcpkgs/php8.0-ffi                            |   1 -
 srcpkgs/php8.0-fpm                            |   1 -
 srcpkgs/php8.0-gd                             |   1 -
 srcpkgs/php8.0-igbinary/template              |  24 --
 srcpkgs/php8.0-imagick/INSTALL.msg            |   3 -
 ...le-libmagick-header-file-search-path.patch |  17 -
 srcpkgs/php8.0-imagick/template               |  28 --
 srcpkgs/php8.0-imagick/update                 |   1 -
 srcpkgs/php8.0-intl                           |   1 -
 srcpkgs/php8.0-ldap                           |   1 -
 srcpkgs/php8.0-mysql                          |   1 -
 srcpkgs/php8.0-odbc                           |   1 -
 srcpkgs/php8.0-pear                           |   1 -
 srcpkgs/php8.0-pgsql                          |   1 -
 srcpkgs/php8.0-phpdbg                         |   1 -
 srcpkgs/php8.0-snmp                           |   1 -
 srcpkgs/php8.0-sodium                         |   1 -
 srcpkgs/php8.0-sqlite                         |   1 -
 srcpkgs/php8.0-tidy                           |   1 -
 srcpkgs/php8.0-xsl                            |   1 -
 srcpkgs/php8.0/files/apache.conf              |  13 -
 srcpkgs/php8.0/files/php-fpm8.0/run           |   4 -
 .../dont-rely-on-libgd-constants.patch        |  60 ---
 srcpkgs/php8.0/patches/fix-manpages.patch     |  25 --
 srcpkgs/php8.0/patches/php-706-crypt.patch    |  15 -
 srcpkgs/php8.0/patches/php-cross-config.patch |  41 --
 srcpkgs/php8.0/patches/php-fpm.patch          |  13 -
 .../patches/php-ltmain-sysroot-support.patch  |  39 --
 .../php8.0/patches/php-opcache-cross.patch    |  14 -
 srcpkgs/php8.0/patches/php-pear-cross.patch   |  23 --
 srcpkgs/php8.0/patches/php-phar-cross.patch   |  29 --
 .../patches/php-phpize-sysroot-support.patch  |  28 --
 srcpkgs/php8.0/patches/php.ini.patch          |  24 --
 srcpkgs/php8.0/template                       | 366 ------------------
 srcpkgs/php8.0/update                         |   3 -
 srcpkgs/removed-packages/template             |   1 +
 46 files changed, 1 insertion(+), 852 deletions(-)
 delete mode 120000 srcpkgs/php8.0-apache
 delete mode 100644 srcpkgs/php8.0-apcu/INSTALL.msg
 delete mode 100644 srcpkgs/php8.0-apcu/template
 delete mode 100644 srcpkgs/php8.0-apcu/update
 delete mode 100644 srcpkgs/php8.0-ast/INSTALL.msg
 delete mode 100644 srcpkgs/php8.0-ast/template
 delete mode 120000 srcpkgs/php8.0-cgi
 delete mode 120000 srcpkgs/php8.0-devel
 delete mode 120000 srcpkgs/php8.0-embed
 delete mode 120000 srcpkgs/php8.0-enchant
 delete mode 120000 srcpkgs/php8.0-ffi
 delete mode 120000 srcpkgs/php8.0-fpm
 delete mode 120000 srcpkgs/php8.0-gd
 delete mode 100644 srcpkgs/php8.0-igbinary/template
 delete mode 100644 srcpkgs/php8.0-imagick/INSTALL.msg
 delete mode 100644 srcpkgs/php8.0-imagick/patches/0001-fix-cross-compile-libmagick-header-file-search-path.patch
 delete mode 100644 srcpkgs/php8.0-imagick/template
 delete mode 100644 srcpkgs/php8.0-imagick/update
 delete mode 120000 srcpkgs/php8.0-intl
 delete mode 120000 srcpkgs/php8.0-ldap
 delete mode 120000 srcpkgs/php8.0-mysql
 delete mode 120000 srcpkgs/php8.0-odbc
 delete mode 120000 srcpkgs/php8.0-pear
 delete mode 120000 srcpkgs/php8.0-pgsql
 delete mode 120000 srcpkgs/php8.0-phpdbg
 delete mode 120000 srcpkgs/php8.0-snmp
 delete mode 120000 srcpkgs/php8.0-sodium
 delete mode 120000 srcpkgs/php8.0-sqlite
 delete mode 120000 srcpkgs/php8.0-tidy
 delete mode 120000 srcpkgs/php8.0-xsl
 delete mode 100644 srcpkgs/php8.0/files/apache.conf
 delete mode 100755 srcpkgs/php8.0/files/php-fpm8.0/run
 delete mode 100644 srcpkgs/php8.0/patches/dont-rely-on-libgd-constants.patch
 delete mode 100644 srcpkgs/php8.0/patches/fix-manpages.patch
 delete mode 100644 srcpkgs/php8.0/patches/php-706-crypt.patch
 delete mode 100644 srcpkgs/php8.0/patches/php-cross-config.patch
 delete mode 100644 srcpkgs/php8.0/patches/php-fpm.patch
 delete mode 100644 srcpkgs/php8.0/patches/php-ltmain-sysroot-support.patch
 delete mode 100644 srcpkgs/php8.0/patches/php-opcache-cross.patch
 delete mode 100644 srcpkgs/php8.0/patches/php-pear-cross.patch
 delete mode 100644 srcpkgs/php8.0/patches/php-phar-cross.patch
 delete mode 100644 srcpkgs/php8.0/patches/php-phpize-sysroot-support.patch
 delete mode 100644 srcpkgs/php8.0/patches/php.ini.patch
 delete mode 100644 srcpkgs/php8.0/template
 delete mode 100644 srcpkgs/php8.0/update

diff --git a/srcpkgs/php8.0-apache b/srcpkgs/php8.0-apache
deleted file mode 120000
index 104f2d35908d..000000000000
--- a/srcpkgs/php8.0-apache
+++ /dev/null
@@ -1 +0,0 @@
-php8.0
\ No newline at end of file
diff --git a/srcpkgs/php8.0-apcu/INSTALL.msg b/srcpkgs/php8.0-apcu/INSTALL.msg
deleted file mode 100644
index 9da8a70ccc2b..000000000000
--- a/srcpkgs/php8.0-apcu/INSTALL.msg
+++ /dev/null
@@ -1,3 +0,0 @@
-To enable APCu add the following line to your php.ini:
-
-	extension=apcu.so
diff --git a/srcpkgs/php8.0-apcu/template b/srcpkgs/php8.0-apcu/template
deleted file mode 100644
index 67418074afb5..000000000000
--- a/srcpkgs/php8.0-apcu/template
+++ /dev/null
@@ -1,28 +0,0 @@
-# Template file for 'php8.0-apcu'
-pkgname=php8.0-apcu
-version=5.1.22
-revision=1
-build_style=gnu-configure
-configure_args="--with-php-config=/usr/bin/php-config8.0"
-make_check_target=test
-hostmakedepends="autoconf php8.0-devel"
-makedepends="php8.0-devel pcre2-devel"
-depends="php8.0"
-short_desc="In-memory key-value store for PHP"
-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=010a0d8fd112e1ed7a52a356191da3696a6b76319423f7b0dfdeaeeafcb41a1e
-
-pre_configure() {
-	phpize8.0
-}
-
-pre_install() {
-	make_install_args="INSTALL_ROOT=$DESTDIR"
-}
-
-post_install() {
-	rm -r $DESTDIR/usr/include
-}
diff --git a/srcpkgs/php8.0-apcu/update b/srcpkgs/php8.0-apcu/update
deleted file mode 100644
index ad899519e313..000000000000
--- a/srcpkgs/php8.0-apcu/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site="https://pecl.php.net/package/APCu"
-pattern="apcu-\K[\d\.]*(?=\.tgz)"
diff --git a/srcpkgs/php8.0-ast/INSTALL.msg b/srcpkgs/php8.0-ast/INSTALL.msg
deleted file mode 100644
index 0dd0b5df2d96..000000000000
--- a/srcpkgs/php8.0-ast/INSTALL.msg
+++ /dev/null
@@ -1,2 +0,0 @@
-To enable the ast extension please add the following to php.ini:
-	extension=ast.so 
diff --git a/srcpkgs/php8.0-ast/template b/srcpkgs/php8.0-ast/template
deleted file mode 100644
index 1b1c437c2e85..000000000000
--- a/srcpkgs/php8.0-ast/template
+++ /dev/null
@@ -1,27 +0,0 @@
-# Template file for 'php8.0-ast'
-pkgname=php8.0-ast
-version=1.1.0
-revision=1
-build_style=gnu-configure
-make_check_target="test"
-configure_args="--with-php-config=/usr/bin/php-config8.0"
-hostmakedepends="php8.0-devel autoconf"
-makedepends="php8.0-devel"
-depends="php8.0"
-checkdepends="${depends}"
-short_desc="Exposes the abstract syntax tree generated by PHP"
-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=ee3d4f67e24d82e4d340806a24052012e4954d223122949377665427443e6d13
-make_check_pre="env NO_INTERACTION=1"
-
-pre_configure() {
-	phpize8.0
-}
-
-do_install() {
-	make INSTALL_ROOT=${DESTDIR} install
-	vlicense LICENSE
-}
diff --git a/srcpkgs/php8.0-cgi b/srcpkgs/php8.0-cgi
deleted file mode 120000
index 104f2d35908d..000000000000
--- a/srcpkgs/php8.0-cgi
+++ /dev/null
@@ -1 +0,0 @@
-php8.0
\ No newline at end of file
diff --git a/srcpkgs/php8.0-devel b/srcpkgs/php8.0-devel
deleted file mode 120000
index 104f2d35908d..000000000000
--- a/srcpkgs/php8.0-devel
+++ /dev/null
@@ -1 +0,0 @@
-php8.0
\ No newline at end of file
diff --git a/srcpkgs/php8.0-embed b/srcpkgs/php8.0-embed
deleted file mode 120000
index 104f2d35908d..000000000000
--- a/srcpkgs/php8.0-embed
+++ /dev/null
@@ -1 +0,0 @@
-php8.0
\ No newline at end of file
diff --git a/srcpkgs/php8.0-enchant b/srcpkgs/php8.0-enchant
deleted file mode 120000
index 104f2d35908d..000000000000
--- a/srcpkgs/php8.0-enchant
+++ /dev/null
@@ -1 +0,0 @@
-php8.0
\ No newline at end of file
diff --git a/srcpkgs/php8.0-ffi b/srcpkgs/php8.0-ffi
deleted file mode 120000
index 104f2d35908d..000000000000
--- a/srcpkgs/php8.0-ffi
+++ /dev/null
@@ -1 +0,0 @@
-php8.0
\ No newline at end of file
diff --git a/srcpkgs/php8.0-fpm b/srcpkgs/php8.0-fpm
deleted file mode 120000
index 104f2d35908d..000000000000
--- a/srcpkgs/php8.0-fpm
+++ /dev/null
@@ -1 +0,0 @@
-php8.0
\ No newline at end of file
diff --git a/srcpkgs/php8.0-gd b/srcpkgs/php8.0-gd
deleted file mode 120000
index 104f2d35908d..000000000000
--- a/srcpkgs/php8.0-gd
+++ /dev/null
@@ -1 +0,0 @@
-php8.0
\ No newline at end of file
diff --git a/srcpkgs/php8.0-igbinary/template b/srcpkgs/php8.0-igbinary/template
deleted file mode 100644
index dcbb9ff045bf..000000000000
--- a/srcpkgs/php8.0-igbinary/template
+++ /dev/null
@@ -1,24 +0,0 @@
-# Template file for 'php8.0-igbinary'
-pkgname=php8.0-igbinary
-version=3.2.14
-revision=1
-build_style=gnu-configure
-configure_args="--with-php-config=/usr/bin/php-config8.0"
-hostmakedepends="autoconf php8.0-devel"
-makedepends="php8.0-devel"
-depends="php8.0"
-short_desc="Igbinary is a drop in replacement for the standard php serializer"
-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=6337147a4fb888072566674837bda9928ee06ee7f0114b4338b86c816232925d
-
-pre_configure() {
-	phpize8.0
-}
-
-do_install() {
-	make INSTALL_ROOT="${DESTDIR}" install
-	vlicense COPYING
-}
diff --git a/srcpkgs/php8.0-imagick/INSTALL.msg b/srcpkgs/php8.0-imagick/INSTALL.msg
deleted file mode 100644
index 00497519fcee..000000000000
--- a/srcpkgs/php8.0-imagick/INSTALL.msg
+++ /dev/null
@@ -1,3 +0,0 @@
-To enable the Imagick extension add the following line to your php.ini:
-
-	extension=imagick.so
diff --git a/srcpkgs/php8.0-imagick/patches/0001-fix-cross-compile-libmagick-header-file-search-path.patch b/srcpkgs/php8.0-imagick/patches/0001-fix-cross-compile-libmagick-header-file-search-path.patch
deleted file mode 100644
index 16b8aaa57371..000000000000
--- a/srcpkgs/php8.0-imagick/patches/0001-fix-cross-compile-libmagick-header-file-search-path.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/imagemagick.m4	2021-09-09 10:53:42.287881616 +0200
-+++ b/imagemagick.m4	2021-09-09 11:14:47.662312430 +0200
-@@ -167,6 +167,14 @@ AC_DEFUN([IM_FIND_IMAGEMAGICK],[
-   
-     AC_MSG_RESULT([user location ${IM_IMAGEMAGICK_PREFIX}/include/ImageMagick-${IM_MAJOR_VERSION}/wand/MagickWand.h])
- 
-+  elif test -r "${IM_IMAGEMAGICK_PREFIX}/include/ImageMagick-${IM_MAJOR_VERSION}/MagickWand/MagickWand.h"; then
-+
-+    IM_INCLUDE_FORMAT="MagickWand/MagickWand.h"
-+    IM_HEADER_STYLE="SEVEN"
-+    AC_DEFINE([IM_MAGICKWAND_HEADER_STYLE_SEVEN], [1], [ImageMagick 7.x style header])
-+
-+    AC_MSG_RESULT([${IM_PREFIX}/include/ImageMagick-${IM_MAJOR_VERSION}/MagickWand/MagickWand.h])
-+
-   elif test -r "${IM_PREFIX}/include/ImageMagick-${IM_MAJOR_VERSION}/MagickWand/MagickWand.h"; then
- 
-     IM_INCLUDE_FORMAT="MagickWand/MagickWand.h"
diff --git a/srcpkgs/php8.0-imagick/template b/srcpkgs/php8.0-imagick/template
deleted file mode 100644
index fe31cb060f30..000000000000
--- a/srcpkgs/php8.0-imagick/template
+++ /dev/null
@@ -1,28 +0,0 @@
-# Template file for 'php8.0-imagick'
-pkgname=php8.0-imagick
-version=3.7.0
-revision=2
-build_style=gnu-configure
-configure_args="--with-imagick=${XBPS_CROSS_BASE}/usr \
- --with-php-config=/usr/bin/php-config8.0"
-hostmakedepends="php8.0-devel autoconf pkg-config"
-makedepends="php8.0-devel pcre2-devel libmagick-devel"
-depends="php8.0"
-short_desc="Provides a PHP wrapper to the ImageMagick library"
-maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
-license="PHP-3.01"
-homepage="https://pecl.php.net/package/imagick"
-distfiles="https://pecl.php.net/get/imagick-$version.tgz"
-checksum=5a364354109029d224bcbb2e82e15b248be9b641227f45e63425c06531792d3e
-
-pre_configure() {
-	phpize8.0
-}
-
-pre_install() {
-	make_install_args="INSTALL_ROOT=$DESTDIR"
-}
-
-post_install() {
-	rm -r $DESTDIR/usr/include
-}
diff --git a/srcpkgs/php8.0-imagick/update b/srcpkgs/php8.0-imagick/update
deleted file mode 100644
index fb47044a964d..000000000000
--- a/srcpkgs/php8.0-imagick/update
+++ /dev/null
@@ -1 +0,0 @@
-pattern='<th.*Release \K[\d.]+(?=:</th>)'
diff --git a/srcpkgs/php8.0-intl b/srcpkgs/php8.0-intl
deleted file mode 120000
index 104f2d35908d..000000000000
--- a/srcpkgs/php8.0-intl
+++ /dev/null
@@ -1 +0,0 @@
-php8.0
\ No newline at end of file
diff --git a/srcpkgs/php8.0-ldap b/srcpkgs/php8.0-ldap
deleted file mode 120000
index 104f2d35908d..000000000000
--- a/srcpkgs/php8.0-ldap
+++ /dev/null
@@ -1 +0,0 @@
-php8.0
\ No newline at end of file
diff --git a/srcpkgs/php8.0-mysql b/srcpkgs/php8.0-mysql
deleted file mode 120000
index 104f2d35908d..000000000000
--- a/srcpkgs/php8.0-mysql
+++ /dev/null
@@ -1 +0,0 @@
-php8.0
\ No newline at end of file
diff --git a/srcpkgs/php8.0-odbc b/srcpkgs/php8.0-odbc
deleted file mode 120000
index 104f2d35908d..000000000000
--- a/srcpkgs/php8.0-odbc
+++ /dev/null
@@ -1 +0,0 @@
-php8.0
\ No newline at end of file
diff --git a/srcpkgs/php8.0-pear b/srcpkgs/php8.0-pear
deleted file mode 120000
index 104f2d35908d..000000000000
--- a/srcpkgs/php8.0-pear
+++ /dev/null
@@ -1 +0,0 @@
-php8.0
\ No newline at end of file
diff --git a/srcpkgs/php8.0-pgsql b/srcpkgs/php8.0-pgsql
deleted file mode 120000
index 104f2d35908d..000000000000
--- a/srcpkgs/php8.0-pgsql
+++ /dev/null
@@ -1 +0,0 @@
-php8.0
\ No newline at end of file
diff --git a/srcpkgs/php8.0-phpdbg b/srcpkgs/php8.0-phpdbg
deleted file mode 120000
index 104f2d35908d..000000000000
--- a/srcpkgs/php8.0-phpdbg
+++ /dev/null
@@ -1 +0,0 @@
-php8.0
\ No newline at end of file
diff --git a/srcpkgs/php8.0-snmp b/srcpkgs/php8.0-snmp
deleted file mode 120000
index 104f2d35908d..000000000000
--- a/srcpkgs/php8.0-snmp
+++ /dev/null
@@ -1 +0,0 @@
-php8.0
\ No newline at end of file
diff --git a/srcpkgs/php8.0-sodium b/srcpkgs/php8.0-sodium
deleted file mode 120000
index 104f2d35908d..000000000000
--- a/srcpkgs/php8.0-sodium
+++ /dev/null
@@ -1 +0,0 @@
-php8.0
\ No newline at end of file
diff --git a/srcpkgs/php8.0-sqlite b/srcpkgs/php8.0-sqlite
deleted file mode 120000
index 104f2d35908d..000000000000
--- a/srcpkgs/php8.0-sqlite
+++ /dev/null
@@ -1 +0,0 @@
-php8.0
\ No newline at end of file
diff --git a/srcpkgs/php8.0-tidy b/srcpkgs/php8.0-tidy
deleted file mode 120000
index 104f2d35908d..000000000000
--- a/srcpkgs/php8.0-tidy
+++ /dev/null
@@ -1 +0,0 @@
-php8.0
\ No newline at end of file
diff --git a/srcpkgs/php8.0-xsl b/srcpkgs/php8.0-xsl
deleted file mode 120000
index 104f2d35908d..000000000000
--- a/srcpkgs/php8.0-xsl
+++ /dev/null
@@ -1 +0,0 @@
-php8.0
\ No newline at end of file
diff --git a/srcpkgs/php8.0/files/apache.conf b/srcpkgs/php8.0/files/apache.conf
deleted file mode 100644
index 17a0ad5f6fa4..000000000000
--- a/srcpkgs/php8.0/files/apache.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-# Required modules: dir_module, php8.0_module
-
-<IfModule dir_module>
-	<IfModule php8.0_module>
-		DirectoryIndex index.php index.html
-		<FilesMatch "\.php$">
-			SetHandler application/x-httpd-php
-		</FilesMatch>
-		<FilesMatch "\.phps$">
-			SetHandler application/x-httpd-php-source
-		</FilesMatch>
-	</IfModule>
-</IfModule>
diff --git a/srcpkgs/php8.0/files/php-fpm8.0/run b/srcpkgs/php8.0/files/php-fpm8.0/run
deleted file mode 100755
index 9d61e0035983..000000000000
--- a/srcpkgs/php8.0/files/php-fpm8.0/run
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-exec 2>&1
-[ -r conf ] && . ./conf
-exec php-fpm8.0 --nodaemonize ${OPTS}
diff --git a/srcpkgs/php8.0/patches/dont-rely-on-libgd-constants.patch b/srcpkgs/php8.0/patches/dont-rely-on-libgd-constants.patch
deleted file mode 100644
index c9375e07ce4d..000000000000
--- a/srcpkgs/php8.0/patches/dont-rely-on-libgd-constants.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From b3646440b1808abf0874b6f89027ce53ec5da03f Mon Sep 17 00:00:00 2001
-From: Remi Collet <remi@php.net>
-Date: Mon, 13 Sep 2021 14:48:13 +0200
-Subject: [PATCH] Don't rely on libgd unused constants
-
----
- ext/gd/gd.c | 20 ++++++++++----------
- 1 file changed, 10 insertions(+), 10 deletions(-)
-
-diff --git a/ext/gd/gd.c b/ext/gd/gd.c
-index 287cb2f712f8..880d6dddc7d7 100644
---- a/ext/gd/gd.c
-+++ b/ext/gd/gd.c
-@@ -88,10 +88,10 @@
- #define M_PI 3.14159265358979323846
- #endif
- 
--/* workaround typo in system libgd 2.3.0 */
--#if defined(GD_FLIP_HORINZONTAL) && !defined(GD_FLIP_HORIZONTAL)
--#define GD_FLIP_HORIZONTAL GD_FLIP_HORINZONTAL
--#endif
-+/* don't used libgd constants, not used, so going to be removed */
-+#define PHP_GD_FLIP_HORIZONTAL 1
-+#define PHP_GD_FLIP_VERTICAL   2
-+#define PHP_GD_FLIP_BOTH       3
- 
- #ifdef HAVE_GD_FREETYPE
- static void php_imagettftext_common(INTERNAL_FUNCTION_PARAMETERS, int);
-@@ -400,9 +400,9 @@ PHP_MINIT_FUNCTION(gd)
- 	/* GD2 image format types */
- 	REGISTER_LONG_CONSTANT("IMG_GD2_RAW", GD2_FMT_RAW, CONST_CS | CONST_PERSISTENT);
- 	REGISTER_LONG_CONSTANT("IMG_GD2_COMPRESSED", GD2_FMT_COMPRESSED, CONST_CS | CONST_PERSISTENT);
--	REGISTER_LONG_CONSTANT("IMG_FLIP_HORIZONTAL", GD_FLIP_HORIZONTAL, CONST_CS | CONST_PERSISTENT);
--	REGISTER_LONG_CONSTANT("IMG_FLIP_VERTICAL", GD_FLIP_VERTICAL, CONST_CS | CONST_PERSISTENT);
--	REGISTER_LONG_CONSTANT("IMG_FLIP_BOTH", GD_FLIP_BOTH, CONST_CS | CONST_PERSISTENT);
-+	REGISTER_LONG_CONSTANT("IMG_FLIP_HORIZONTAL", PHP_GD_FLIP_HORIZONTAL, CONST_CS | CONST_PERSISTENT);
-+	REGISTER_LONG_CONSTANT("IMG_FLIP_VERTICAL", PHP_GD_FLIP_VERTICAL, CONST_CS | CONST_PERSISTENT);
-+	REGISTER_LONG_CONSTANT("IMG_FLIP_BOTH", PHP_GD_FLIP_BOTH, CONST_CS | CONST_PERSISTENT);
- 	REGISTER_LONG_CONSTANT("IMG_EFFECT_REPLACE", gdEffectReplace, CONST_CS | CONST_PERSISTENT);
- 	REGISTER_LONG_CONSTANT("IMG_EFFECT_ALPHABLEND", gdEffectAlphaBlend, CONST_CS | CONST_PERSISTENT);
- 	REGISTER_LONG_CONSTANT("IMG_EFFECT_NORMAL", gdEffectNormal, CONST_CS | CONST_PERSISTENT);
-@@ -3599,15 +3599,15 @@ PHP_FUNCTION(imageflip)
- 	im = php_gd_libgdimageptr_from_zval_p(IM);
- 
- 	switch (mode) {
--		case GD_FLIP_VERTICAL:
-+		case PHP_GD_FLIP_VERTICAL:
- 			gdImageFlipVertical(im);
- 			break;
- 
--		case GD_FLIP_HORIZONTAL:
-+		case PHP_GD_FLIP_HORIZONTAL:
- 			gdImageFlipHorizontal(im);
- 			break;
- 
--		case GD_FLIP_BOTH:
-+		case PHP_GD_FLIP_BOTH:
- 			gdImageFlipBoth(im);
- 			break;
- 
diff --git a/srcpkgs/php8.0/patches/fix-manpages.patch b/srcpkgs/php8.0/patches/fix-manpages.patch
deleted file mode 100644
index d956c2904653..000000000000
--- a/srcpkgs/php8.0/patches/fix-manpages.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-This patch fixes .so links in man pages.
-It's needed because of the configure option -
-
-    --program-suffix=${_php_version}
-
-The changes made by this patch should be the same as the changes made by this
-block of code -
-
-    _regexp='^[[:space:]]*\.so[[:space:]]'
-    for file in $(grep -l -e "$_regexp" -R .); do
-    	vsed -i "$file" -e "/$_regexp/"'s=^[[:space:]]*\.[^.]*=&'${_php_version}=
-    done
-
-Where _php_version is defined in the template file.
-
---- a/ext/phar/phar.phar.1.in
-+++ b/ext/phar/phar.phar.1.in
-@@ -1 +1 @@
--.so man1/phar.1
-+.so man1/phar8.0.1
---- a/sapi/cgi/php-cgi.1.in
-+++ b/sapi/cgi/php-cgi.1.in
-@@ -1 +1 @@
--.so man1/php.1
-+.so man1/php8.0.1
diff --git a/srcpkgs/php8.0/patches/php-706-crypt.patch b/srcpkgs/php8.0/patches/php-706-crypt.patch
deleted file mode 100644
index 254f1d2187c2..000000000000
--- a/srcpkgs/php8.0/patches/php-706-crypt.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- 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 @@
- 	}
- # elif defined(HAVE_CRYPT)
- 	crypt_res = crypt(password, salt);
-+	if (!crypt_res || (salt[0] == '*' && salt[1] == '0')) {
-+		return NULL;
-+	} else {
-+		result = zend_string_init(crypt_res, strlen(crypt_res), 0);
-+		return result;
-+	}
- # else
- #  error No crypt() implementation
- # endif
diff --git a/srcpkgs/php8.0/patches/php-cross-config.patch b/srcpkgs/php8.0/patches/php-cross-config.patch
deleted file mode 100644
index 24de8c58cbdd..000000000000
--- a/srcpkgs/php8.0/patches/php-cross-config.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- a/configure	2020-03-17 11:40:20.000000000 +0100
-+++ b/configure	2020-04-12 19:51:57.216350534 +0200
-@@ -6374,10 +6374,12 @@ IFS="- /.
-     as_fn_error $? "Please note that Apache version >= 2.0.44 is required" "$LINENO" 5
-   fi
- 
-+  APXS_PREFIX='$(INSTALL_ROOT)'/usr
-   APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR`
-   if test -z `$APXS -q SYSCONFDIR`; then
-     INSTALL_IT="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \
-                  $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
-+                       -S PREFIX='$APXS_PREFIX' \
-                        -i -n php"
-   else
-     APXS_SYSCONFDIR='$(INSTALL_ROOT)'`$APXS -q SYSCONFDIR`
-@@ -6385,6 +6387,7 @@ IFS="- /.
-                 \$(mkinstalldirs) '$APXS_SYSCONFDIR' && \
-                  $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
-                        -S SYSCONFDIR='$APXS_SYSCONFDIR' \
-+                       -S PREFIX='$APXS_PREFIX' \
-                        -i -a -n php"
-   fi
- 
-@@ -57170,7 +57173,7 @@ $as_echo_n "checking for pg_config... "
-     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`
-@@ -58821,7 +58824,7 @@ $as_echo_n "checking for pg_config... "
-     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.0/patches/php-fpm.patch b/srcpkgs/php8.0/patches/php-fpm.patch
deleted file mode 100644
index 5e55e179f8a4..000000000000
--- a/srcpkgs/php8.0/patches/php-fpm.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/sapi/fpm/Makefile.frag	2017-04-15 23:58:56.965737425 +0200
-+++ b/sapi/fpm/Makefile.frag	2017-04-16 00:00:57.814831649 +0200
-@@ -15,8 +15,8 @@ install-fpm: $(SAPI_FPM_PATH)
- 	else \
- 		echo "Installing PHP FPM defconfig:     $(INSTALL_ROOT)$(sysconfdir)/" && \
- 		$(mkinstalldirs) $(INSTALL_ROOT)$(sysconfdir)/php-fpm.d; \
--		$(INSTALL_DATA) sapi/fpm/php-fpm.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.conf.default; \
--		$(INSTALL_DATA) sapi/fpm/www.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.d/www.conf.default; \
-+		$(INSTALL_DATA) sapi/fpm/php-fpm.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.conf; \
-+		$(INSTALL_DATA) sapi/fpm/www.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.d/www.conf; \
- 	fi
- 	
- 	@echo "Installing PHP FPM man page:      $(INSTALL_ROOT)$(mandir)/man8/"
diff --git a/srcpkgs/php8.0/patches/php-ltmain-sysroot-support.patch b/srcpkgs/php8.0/patches/php-ltmain-sysroot-support.patch
deleted file mode 100644
index bbe0a514a9e8..000000000000
--- a/srcpkgs/php8.0/patches/php-ltmain-sysroot-support.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- 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
- 	*) . ./$lib ;;
- 	esac
- 
-+        newdependency_libs=
-+        for deplib in $dependency_libs; do
-+            deplib=$(echo "$deplib" | sed "s#^=\(.*\)#$(${CC} --print-sysroot)\1#")
-+            newdependency_libs="$newdependency_libs $deplib"
-+        done
-+        dependency_libs=${newdependency_libs}
-+
- 	if test "$linkmode,$pass" = "lib,link" ||
- 	   test "$linkmode,$pass" = "prog,scan" ||
- 	   { test "$linkmode" != prog && test "$linkmode" != lib; }; then
-@@ -5750,6 +5757,13 @@ fi\
- 	  case $host,$output,$installed,$module,$dlname in
- 	    *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
- 	  esac
-+
-+          newdependency_libs=
-+          for deplib in $dependency_libs; do
-+              deplib=$(echo "$deplib" | sed "s#^$(${CC} --print-sysroot)#=#")
-+              newdependency_libs="$newdependency_libs $deplib"
-+          done
-+
- 	  $echo > $output "\
- # $outputname - a libtool library file
- # Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
-@@ -5767,7 +5781,7 @@ library_names='$library_names'
- old_library='$old_library'
- 
- # Libraries that this one depends upon.
--dependency_libs='$dependency_libs'
-+dependency_libs='$newdependency_libs'
- 
- # Version information for $libname.
- current=$current
diff --git a/srcpkgs/php8.0/patches/php-opcache-cross.patch b/srcpkgs/php8.0/patches/php-opcache-cross.patch
deleted file mode 100644
index 5d8a8c5ceed5..000000000000
--- a/srcpkgs/php8.0/patches/php-opcache-cross.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/configure b/configure.new
-index 1159224b4c..29f763aa05 100755
---- a/configure
-+++ b/configure.new
-@@ -51689,7 +51689,8 @@ $as_echo "$have_shm_ipc" >&6; }
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mmap() using MAP_ANON shared memory support" >&5
- $as_echo_n "checking for mmap() using MAP_ANON shared memory support... " >&6; }
-   if test "$cross_compiling" = yes; then :
--  have_shm_mmap_anon=no
-+$as_echo "#define HAVE_SHM_MMAP_ANON 1" >>confdefs.h
-+  have_shm_mmap_anon=yes
- else
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
diff --git a/srcpkgs/php8.0/patches/php-pear-cross.patch b/srcpkgs/php8.0/patches/php-pear-cross.patch
deleted file mode 100644
index f9191a50a0b5..000000000000
--- a/srcpkgs/php8.0/patches/php-pear-cross.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/pear/Makefile.frag	2020-03-17 11:40:21.000000000 +0100
-+++ b/pear/Makefile.frag	2020-04-12 22:29:31.846943414 +0200
-@@ -8,9 +8,10 @@ FETCH = `which fetch 2>/dev/null`
- PEAR_PREFIX = -dp a${program_prefix}
- PEAR_SUFFIX = -ds a$(program_suffix)
- PEAR_INSTALLER_URL = https://pear.php.net/install-pear-nozlib.phar
-+PEAR_PHP ?= $(top_builddir)/sapi/cli/php
- 
- install-pear-installer: $(SAPI_CLI_PATH)
--	@$(top_builddir)/sapi/cli/php $(PEAR_INSTALL_FLAGS) pear/install-pear-nozlib.phar -d "$(peardir)" -b "$(bindir)" ${PEAR_PREFIX} ${PEAR_SUFFIX}
-+	@$(PEAR_PHP) $(PEAR_INSTALL_FLAGS) pear/install-pear-nozlib.phar -d "$(peardir)" -b "$(bindir)" ${PEAR_PREFIX} ${PEAR_SUFFIX}
- 
- install-pear:
- 	@echo "Installing PEAR environment:      $(INSTALL_ROOT)$(peardir)/"
-@@ -23,7 +24,7 @@ install-pear:
- 			elif test ! -z "$(FETCH)" && test -x "$(FETCH)"; then \
- 				"$(FETCH)" -o $(builddir)/ "${PEAR_INSTALLER_URL}"; \
- 			else \
--				$(top_builddir)/sapi/cli/php -n $(srcdir)/fetch.php "${PEAR_INSTALLER_URL}" $(builddir)/install-pear-nozlib.phar; \
-+				$(PEAR_PHP) -n $(srcdir)/fetch.php "${PEAR_INSTALLER_URL}" $(builddir)/install-pear-nozlib.phar; \
- 			fi \
- 		fi \
- 	fi
diff --git a/srcpkgs/php8.0/patches/php-phar-cross.patch b/srcpkgs/php8.0/patches/php-phar-cross.patch
deleted file mode 100644
index 1e4e627ec65b..000000000000
--- a/srcpkgs/php8.0/patches/php-phar-cross.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/ext/phar/Makefile.frag	2020-04-13 12:18:23.998801926 +0200
-+++ b/ext/phar/Makefile.frag	2020-04-13 12:20:58.031795293 +0200
-@@ -8,12 +8,14 @@ $(srcdir)/phar_path_check.c: $(srcdir)/p
- 
- pharcmd: $(builddir)/phar.php $(builddir)/phar.phar
- 
-+PHAR_PHP ?= $(top_builddir)/$(SAPI_CLI_PATH)
-+PHAR_PHP_MODULES ?= $(top_builddir)/modules
- PHP_PHARCMD_SETTINGS = -n -d 'open_basedir=' -d 'output_buffering=0' -d 'memory_limit=-1' -d phar.readonly=0
- PHP_PHARCMD_EXECUTABLE = ` \
--	if test -x "$(top_builddir)/$(SAPI_CLI_PATH)"; then \
--		$(top_srcdir)/build/shtool echo -n -- "$(top_builddir)/$(SAPI_CLI_PATH) -n"; \
-+	if test -x "$(PHAR_PHP)"; then \
-+		$(top_srcdir)/build/shtool echo -n -- "$(PHAR_PHP) -n"; \
- 		if test "x$(PHP_MODULES)" != "x"; then \
--		$(top_srcdir)/build/shtool echo -n -- " -d extension_dir=$(top_builddir)/modules"; \
-+		$(top_srcdir)/build/shtool echo -n -- " -d extension_dir=$(PHAR_PHP_MODULES)"; \
- 		for i in bz2 zlib phar; do \
- 			if test -f "$(top_builddir)/modules/$$i.la"; then \
- 				. $(top_builddir)/modules/$$i.la; $(top_srcdir)/build/shtool echo -n -- " -d extension=$$dlname"; \
-@@ -21,7 +23,7 @@ PHP_PHARCMD_EXECUTABLE = ` \
- 		done; \
- 		fi; \
- 	else \
--		$(top_srcdir)/build/shtool echo -n -- "$(PHP_EXECUTABLE)"; \
-+		$(top_srcdir)/build/shtool echo -n -- "$(PHAR_PHP)"; \
- 	fi;`
- PHP_PHARCMD_BANG = `$(top_srcdir)/build/shtool echo -n -- "$(INSTALL_ROOT)$(bindir)/$(program_prefix)php$(program_suffix)$(EXEEXT)";`
- 
diff --git a/srcpkgs/php8.0/patches/php-phpize-sysroot-support.patch b/srcpkgs/php8.0/patches/php-phpize-sysroot-support.patch
deleted file mode 100644
index 76cff3f81664..000000000000
--- a/srcpkgs/php8.0/patches/php-phpize-sysroot-support.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- a/scripts/phpize.m4	2020-03-17 11:40:21.000000000 +0100
-+++ b/scripts/phpize.m4	2020-04-15 12:27:36.400466387 +0200
-@@ -44,6 +44,12 @@ PHP_ARG_WITH([libdir],
-   [lib],
-   [no])
- 
-+PHP_ARG_WITH([sysroot],,
-+  [AS_HELP_STRING([--with-sysroot=NAME],
-+    [System sysroot])],
-+    [no],
-+    [no])
-+
- PHP_RUNPATH_SWITCH
- PHP_SHLIB_SUFFIX_NAMES
- 
-@@ -58,7 +64,11 @@ dnl For BC.
- PHP_CONFIG=$PHP_PHP_CONFIG
- prefix=`$PHP_CONFIG --prefix 2>/dev/null`
- phpincludedir=`$PHP_CONFIG --include-dir 2>/dev/null`
--INCLUDES=`$PHP_CONFIG --includes 2>/dev/null`
-+if test "x$PHP_SYSROOT" = xno; then :
-+	INCLUDES=`$PHP_CONFIG --includes 2>/dev/null`
-+else
-+	INCLUDES=`$PHP_CONFIG --includes 2>/dev/null | sed "s#-I#-I$PHP_SYSROOT#g"`
-+fi
- EXTENSION_DIR=`$PHP_CONFIG --extension-dir 2>/dev/null`
- PHP_EXECUTABLE=`$PHP_CONFIG --php-binary 2>/dev/null`
- 
diff --git a/srcpkgs/php8.0/patches/php.ini.patch b/srcpkgs/php8.0/patches/php.ini.patch
deleted file mode 100644
index 00428db5270d..000000000000
--- a/srcpkgs/php8.0/patches/php.ini.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git php.ini-production php.ini-production
-index 794d3e8ddb..c7acf9c883 100644
---- a/php.ini-production
-+++ b/php.ini-production
-@@ -729,7 +729,7 @@ default_charset = "UTF-8"
- ;;;;;;;;;;;;;;;;;;;;;;;;;
- 
- ; UNIX: "/path1:/path2"
--;include_path = ".:/php/includes"
-+include_path = ".:/usr/share/pear8.0"
- ;
- ; Windows: "\path1;\path2"
- ;include_path = ".;c:\php\includes"
-@@ -752,9 +752,7 @@ user_dir =
- 
- ; Directory in which the loadable extensions (modules) reside.
- ; http://php.net/extension-dir
--;extension_dir = "./"
--; On windows:
--;extension_dir = "ext"
-+extension_dir = "/usr/lib/php8.0/modules/"
- 
- ; Directory where the temporary files should be placed.
- ; Defaults to the system default (see sys_get_temp_dir)
diff --git a/srcpkgs/php8.0/template b/srcpkgs/php8.0/template
deleted file mode 100644
index be2dec51141e..000000000000
--- a/srcpkgs/php8.0/template
+++ /dev/null
@@ -1,366 +0,0 @@
-# Template file for 'php8.0'
-pkgname=php8.0
-version=8.0.28
-revision=2
-_php_version=8.0
-hostmakedepends="bison pkg-config apache-devel"
-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"
-short_desc="HTML-embedded scripting language"
-maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
-license="PHP-3.01"
-homepage="https://www.php.net"
-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=7432184eae01e4e8e39f03f80e8ec0ca2c8bfebc56e9a7b983541ca8805df22f
-
-conf_files="/etc/php${_php_version}/php.ini"
-
-lib32disabled=yes
-
-if [ -n "$CROSS_BUILD" ]; then
-	# phar and pear need php to build
-	hostmakedepends+=" php${_php_version}"
-	CFLAGS+=" -DHAVE_LIBDL
-		 -DHAVE_DLOPEN
-		 -DHAVE_DLSYM
-		 -DHAVE_SHM_IPC
-		 -DHAVE_SHM_MMAP_ANON
-		 -DHAVE_SHM_MMAP_ZERO
-		 -DHAVE_SHM_MMAP_POSIX
-		 -DHAVE_SHM_MMAP_FILE"
-fi
-
-alternatives="
- php:phar.phar:/usr/bin/phar${_php_version}.phar
- php:php:/usr/bin/php${_php_version}
- php:phar:/usr/bin/phar${_php_version}
- php:phar.1:/usr/share/man/man1/phar${_php_version}.1
- 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_build() {
-	local _phpconfig="--srcdir=.. \
-		--config-cache \
-		--prefix=/usr \
-		--sbindir=/usr/bin \
-		--sysconfdir=/etc/php${_php_version} \
-		--localstatedir=/var \
-		--with-layout=GNU \
-		--with-config-file-path=/etc/php${_php_version} \
-		--with-config-file-scan-dir=/etc/php${_php_version}/conf.d \
-		--disable-rpath \
-		--mandir=/usr/share/man \
-		--libdir=/usr/lib/php${_php_version} \
-		--datarootdir=/usr/share/php${_php_version} \
-		--datadir=/usr/share/php${_php_version} \
-		--program-suffix=${_php_version} \
-		--includedir=/usr/include/php${_php_version} \
-		"
-
-	local _phpextensions="--enable-bcmath=shared \
-		--enable-calendar=shared \
-		--enable-exif=shared \
-		--enable-ftp=shared \
-		--enable-intl=shared \
-		--enable-mbstring \
-		--enable-opcache \
-		--enable-pcntl \
-		--enable-phar=shared \
-		--enable-posix=shared \
-		--enable-shmop=shared \
-		--enable-soap=shared \
-		--enable-sockets=shared \
-		--enable-sysvmsg=shared \
-		--enable-sysvsem=shared \
-		--enable-sysvshm=shared \
-		--enable-mysqlnd \
-		--enable-gd=shared \
-		--with-external-gd \
-		--with-ffi=shared \
-		--with-bz2=shared,$XBPS_CROSS_BASE/usr/ \
-		--with-curl=shared \
-		--with-db4=$XBPS_CROSS_BASE/usr \
-		--with-enchant=shared,$XBPS_CROSS_BASE/usr \
-		--with-gdbm=$XBPS_CROSS_BASE/usr \
-		--with-gettext=shared \
-		--with-gmp=shared \
-		--with-iconv=shared \
-		--with-ldap=shared,$XBPS_CROSS_BASE/usr \
-		--with-ldap-sasl \
-		--with-sodium=shared \
-		--with-mhash \
-		--with-mysql-sock=/run/mysqld/mysqld.sock \
-		--with-mysqli=shared,mysqlnd \
-		--with-openssl=shared \
-		--with-external-pcre \
-		--with-pear=/usr/share/pear${_php_version}
-		--with-pdo-mysql=shared,mysqlnd \
-		--with-pdo-odbc=shared,unixODBC,$XBPS_CROSS_BASE/usr \
-		--with-pdo-pgsql=shared,$XBPS_CROSS_BASE/usr \
-		--with-pdo-sqlite=shared,$XBPS_CROSS_BASE/usr \
-		--with-pgsql=shared,$XBPS_CROSS_BASE/usr \
-		--with-readline=$XBPS_CROSS_BASE/usr \
-		--with-snmp=shared,$XBPS_CROSS_BASE/usr \
-		--with-sqlite3=shared,$XBPS_CROSS_BASE/usr \
-		--with-unixODBC=shared,$XBPS_CROSS_BASE/usr \
-		--with-xsl=shared,$XBPS_CROSS_BASE/usr \
-		--with-tidy=shared,$XBPS_CROSS_BASE/usr \
-		--with-zip=shared \
-		--with-zlib \
-		${configure_args} \
-		"
-	if [ -n "$CROSS_BUILD" ]; then
-		local _make_env="PHAR_PHP=/usr/bin/php${_php_version} PHAR_PHP_MODULES=/usr/lib/php${_php_version}/modules"
-	fi
-
-	EXTENSION_DIR="/usr/lib/php${_php_version}/modules"
-	export EXTENSION_DIR
-	PEAR_INSTALLDIR=/usr/share/pear${_php_version}
-	export PEAR_INSTALLDIR
-	EXTRA_LIBS="-ldl"
-	export EXTRA_LIBS
-
-	# cgi,cli,embed,fcgi,fpm
-	mkdir -p build
-	cd build
-	ln -s ${wrksrc}/configure
-	./configure ${_phpconfig} \
-		--host=${XBPS_CROSS_TRIPLET} \
-		--enable-cgi \
-		--enable-fpm \
-		--with-fpm-user=http \
-		--with-fpm-group=http \
-		--enable-embed=shared \
-		${_phpextensions}
-	make ${makejobs} ${_make_env}
-
-	# apache
-	# reuse the previous run; this will save us a lot of time
-	cp -a ${wrksrc}/build ${wrksrc}/build-apache
-	cd ${wrksrc}/build-apache
-	./configure ${_phpconfig} \
-		--host=${XBPS_CROSS_TRIPLET} \
-		--with-apxs2 \
-		${_phpextensions}
-	make ${makejobs} ${_make_env}
-}
-
-do_install() {
-	cd ${wrksrc}/build
-	local _env="INSTALL_ROOT=${DESTDIR}"
-	if [ -n "$CROSS_BUILD" ]; then
-		_env+=" PHAR_PHP=/usr/bin/php${_php_version}"
-	fi
-	make ${_env} install-{modules,cli,build,headers,programs,pharcmd}
-
-	# install php.ini
-	vinstall ${wrksrc}/php.ini-production 644 "etc/php${_php_version}" php.ini
-	# remove static modules
-	rm -f "${DESTDIR}/usr/lib/php${_php_version}/modules/*.a"
-}
-
-php8.0-devel_package() {
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove usr/include
-		vmove "usr/lib/php${_php_version}/build"
-		vmove "usr/bin/php-config${_php_version}"
-		vmove "usr/bin/phpize${_php_version}"
-		vmove "usr/share/man/man1/phpize${_php_version}.1"
-		vmove "usr/share/man/man1/php-config${_php_version}.1"
-	}
-}
-
-php8.0-phpdbg_package() {
-	short_desc+=" - interactive debugger"
-	depends="php${_php_version}>=${version}_${revision}"
-	pkg_install() {
-		cd ${wrksrc}/build
-		make INSTALL_ROOT=${PKGDESTDIR} install-phpdbg
-	}
-}
-
-php8.0-cgi_package() {
-	short_desc+=' - CGI and FCGI SAPI'
-	depends="php${_php_version}>=${version}_${revision}"
-	pkg_install() {
-		cd ${wrksrc}/build
-		make INSTALL_ROOT=${PKGDESTDIR} install-cgi
-	}
-}
-
-php8.0-apache_package() {
-	short_desc+=' - Apache SAPI'
-	depends="php${_php_version}>=${version}_${revision}"
-	conf_files="/etc/apache/extra/php${_php_version}_module.conf"
-	pkg_install() {
-		vinstall ${wrksrc}/build-apache/libs/libphp.so 755 usr/libexec/httpd/modules "libphp${_php_version}.so"
-		vinstall ${FILESDIR}/apache.conf 644 etc/apache/extra "php${_php_version}_module.conf"
-	}
-}
-
-php8.0-fpm_package() {
-	short_desc+=' - FastCGI Process Manager'
-	depends="php${_php_version}>=${version}_${revision}"
-	conf_files="/etc/php${_php_version}/php-fpm.conf /etc/php${_php_version}/php-fpm.d/*"
-	pkg_install() {
-		cd ${wrksrc}/build
-		make INSTALL_ROOT=${PKGDESTDIR} install-fpm
-		vsv "php-fpm${_php_version}"
-	}
-}
-
-php8.0-embed_package() {
-	lib32disabled=yes
-	depends="php${_php_version}>=${version}_${revision}"
-	short_desc+=' - Embed SAPI'
-	pkg_install() {
-		cd ${wrksrc}/build
-		make INSTALL_ROOT=${PKGDESTDIR} PHP_SAPI=embed install-sapi
-		mv ${PKGDESTDIR}/usr/lib/libphp.so ${PKGDESTDIR}/usr/lib/libphp${_php_version}.so
-	}
-}
-
-php8.0-pear_package() {
-	lib32disabled=yes
-	depends="php${_php_version}>=${version}_${revision}
-	 php${_php_version}>=devel-${version}_${revision} autoconf"
-	short_desc+=' - PHP Extension and Application Repository'
-	conf_files="/etc/php${_php_version}/pear.conf"
-	pkg_install() {
-		cd ${wrksrc}/build
-		local _env="INSTALL_ROOT=${PKGDESTDIR} PHP_PEAR_PHP_BIN=php${_php_version}"
-		if [ -n "$CROSS_BUILD" ]; then
-			_env+=" PEAR_PHP=/usr/bin/php${_php_version}"
-		fi
-		make install-pear ${_env}
-		rm -rf ${PKGDESTDIR}/.{channels,depdb,depdblock,filemap,lock,registry}
-		rm -rf ${PKGDESTDIR}/usr/share/pear/.{channels,depdb,depdblock,filemap,lock,registry}
-		mv ${PKGDESTDIR}/usr/bin/pear{,${_php_version}}
-		mv ${PKGDESTDIR}/usr/bin/peardev{,${_php_version}}
-		mv ${PKGDESTDIR}/usr/bin/pecl{,${_php_version}}
-	}
-}
-
-php8.0-enchant_package() {
-	lib32disabled=yes
-	depends="php${_php_version}>=${version}_${revision}"
-	short_desc+=' - enchant module'
-	pkg_install() {
-		vmove "usr/lib/php${_php_version}/modules/enchant.so"
-	}
-}
-
-php8.0-gd_package() {
-	lib32disabled=yes
-	depends="php${_php_version}>=${version}_${revision}"
-	short_desc+=' - gd module'
-	pkg_install() {
-		vmove "usr/lib/php${_php_version}/modules/gd.so"
-	}
-}
-
-php8.0-intl_package() {
-	lib32disabled=yes
-	depends="php${_php_version}>=${version}_${revision}"
-	short_desc+=' - Internationalization module'
-	pkg_install() {
-		vmove "usr/lib/php${_php_version}/modules/intl.so"
-	}
-}
-
-php8.0-ldap_package() {
-	lib32disabled=yes
-	depends="php${_php_version}>=${version}_${revision}"
-	short_desc+=' - LDAP module'
-	pkg_install() {
-		vmove "usr/lib/php${_php_version}/modules/ldap.so"
-	}
-}
-
-php8.0-mysql_package() {
-	lib32disabled=yes
-	depends="php${_php_version}>=${version}_${revision}"
-	short_desc+=' - MySQL modules'
-	pkg_install() {
-		vmove "usr/lib/php${_php_version}/modules/*mysql*.so"
-	}
-}
-
-php8.0-odbc_package() {
-	lib32disabled=yes
-	depends="php${_php_version}>=${version}_${revision}"
-	short_desc+=' - ODBC modules'
-	pkg_install() {
-		vmove "usr/lib/php${_php_version}/modules/*odbc.so"
-	}
-}
-
-php8.0-pgsql_package() {
-	lib32disabled=yes
-	depends="php${_php_version}>=${version}_${revision}"
-	short_desc+=' - PostgreSQL modules'
-	pkg_install() {
-		vmove "usr/lib/php${_php_version}/modules/*pgsql.so"
-	}
-}
-
-php8.0-snmp_package() {
-	lib32disabled=yes
-	depends="php${_php_version}>=${version}_${revision}"
-	short_desc+=' - snmp module'
-	pkg_install() {
-		vmove "usr/lib/php${_php_version}/modules/snmp.so"
-	}
-}
-
-php8.0-sqlite_package() {
-	lib32disabled=yes
-	depends="php${_php_version}>=${version}_${revision}"
-	short_desc+=' - sqlite module'
-	pkg_install() {
-		vmove "usr/lib/php${_php_version}/modules/*sqlite*.so"
-	}
-}
-
-php8.0-tidy_package() {
-	lib32disabled=yes
-	depends="php${_php_version}>=${version}_${revision}"
-	short_desc+=' - tidy HTML module'
-	pkg_install() {
-		vmove "usr/lib/php${_php_version}/modules/*tidy*.so"
-	}
-}
-
-php8.0-xsl_package() {
-	lib32disabled=yes
-	depends="php${_php_version}>=${version}_${revision}"
-	short_desc+=' - XSL module'
-	pkg_install() {
-		vmove "usr/lib/php${_php_version}/modules/xsl.so"
-	}
-}
-
-php8.0-sodium_package() {
-	lib32disabled=yes
-	depends="php${_php_version}>=${version}_${revision}"
-	short_desc+=' - sodium module'
-	pkg_install() {
-		vmove "usr/lib/php${_php_version}/modules/sodium.so"
-	}
-}
-
-php8.0-ffi_package() {
-	lib32disabled=yes
-	depends="php${_php_version}>=${version}_${revision}"
-	short_desc+=' - FFI module'
-	pkg_install() {
-		vmove "usr/lib/php${_php_version}/modules/ffi.so"
-	}
-}
diff --git a/srcpkgs/php8.0/update b/srcpkgs/php8.0/update
deleted file mode 100644
index 566cd8005690..000000000000
--- a/srcpkgs/php8.0/update
+++ /dev/null
@@ -1,3 +0,0 @@
-pkgname=php
-ignore="8.[1-9].*"
-site="https://www.php.net/distributions/"
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 9b0ce9c93fce..dff5293e88ab 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -388,6 +388,7 @@ replaces="
  pgadmin3<=1.22.2_14
  phonon-backend-gstreamer<=4.9.0_2
  phonon-backend-vlc<=0.9.1_3
+ php8.0<=8.0.28_1
  plex-media-player<=2.58.0_4
  plex-media-server<=1.15.3.876_4
  polkit-qt<=0.112.0_5