Updating liguros repo21.1.2

87 files changed, 1802 insertions, 294 deletions

diff --git a/dev-php/File_Iterator/File_Iterator-2.0.2-r1.ebuild b/dev-php/File_Iterator/File_Iterator-2.0.2-r1.ebuild
index b2508d50cec0..32b850fac5c7 100644
--- a/dev-php/File_Iterator/File_Iterator-2.0.2-r1.ebuild
+++ b/dev-php/File_Iterator/File_Iterator-2.0.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> $
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-php/File_Iterator/metadata.xml b/dev-php/File_Iterator/metadata.xml
index e3348aad4d4c..dcba66bef21c 100644
--- a/dev-php/File_Iterator/metadata.xml
+++ b/dev-php/File_Iterator/metadata.xml
@@ -5,6 +5,7 @@
     <email>php-bugs@gentoo.org</email>
     <name>PHP</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="github">sebastianbergmann/php-file-iterator</remote-id>
   </upstream>
diff --git a/dev-php/PEAR-HTML_Template_Flexy/PEAR-HTML_Template_Flexy-1.3.13.ebuild b/dev-php/PEAR-HTML_Template_Flexy/PEAR-HTML_Template_Flexy-1.3.13.ebuild
index ba07b0168bb0..886594ab4ca6 100644
--- a/dev-php/PEAR-HTML_Template_Flexy/PEAR-HTML_Template_Flexy-1.3.13.ebuild
+++ b/dev-php/PEAR-HTML_Template_Flexy/PEAR-HTML_Template_Flexy-1.3.13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/dev-php/PEAR-Net_UserAgent_Detect/PEAR-Net_UserAgent_Detect-2.5.2-r1.ebuild b/dev-php/PEAR-Net_UserAgent_Detect/PEAR-Net_UserAgent_Detect-2.5.2-r1.ebuild
index 04a196c35c1a..06455300ebb7 100644
--- a/dev-php/PEAR-Net_UserAgent_Detect/PEAR-Net_UserAgent_Detect-2.5.2-r1.ebuild
+++ b/dev-php/PEAR-Net_UserAgent_Detect/PEAR-Net_UserAgent_Detect-2.5.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/dev-php/PHP_CodeCoverage/PHP_CodeCoverage-7.0.12.ebuild b/dev-php/PHP_CodeCoverage/PHP_CodeCoverage-7.0.12.ebuild
index e820503362c9..b4f5f302ad17 100644
--- a/dev-php/PHP_CodeCoverage/PHP_CodeCoverage-7.0.12.ebuild
+++ b/dev-php/PHP_CodeCoverage/PHP_CodeCoverage-7.0.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> $
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-php/PHP_CodeCoverage/metadata.xml b/dev-php/PHP_CodeCoverage/metadata.xml
index 2bfbd0636d8e..18ddf64d8680 100644
--- a/dev-php/PHP_CodeCoverage/metadata.xml
+++ b/dev-php/PHP_CodeCoverage/metadata.xml
@@ -5,6 +5,7 @@
 		<email>php-bugs@gentoo.org</email>
 		<name>PHP</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">sebastianbergmann/php-code-coverage</remote-id>
 	</upstream>
diff --git a/dev-php/PHP_Timer/PHP_Timer-2.1.2-r1.ebuild b/dev-php/PHP_Timer/PHP_Timer-2.1.2-r1.ebuild
index 73db2978201f..5ce35bafda96 100644
--- a/dev-php/PHP_Timer/PHP_Timer-2.1.2-r1.ebuild
+++ b/dev-php/PHP_Timer/PHP_Timer-2.1.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> $
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-php/PHP_Timer/metadata.xml b/dev-php/PHP_Timer/metadata.xml
index 35a2ee941e62..36c5afb0f910 100644
--- a/dev-php/PHP_Timer/metadata.xml
+++ b/dev-php/PHP_Timer/metadata.xml
@@ -5,6 +5,7 @@
 		<email>php-bugs@gentoo.org</email>
 		<name>PHP</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">sebastianbergmann/php-timer</remote-id>
 	</upstream>
diff --git a/dev-php/PHP_TokenStream/PHP_TokenStream-3.1.1.ebuild b/dev-php/PHP_TokenStream/PHP_TokenStream-3.1.1.ebuild
index 79236ade4a27..8988b643ece8 100644
--- a/dev-php/PHP_TokenStream/PHP_TokenStream-3.1.1.ebuild
+++ b/dev-php/PHP_TokenStream/PHP_TokenStream-3.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> $
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE="test"
 
 S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-php/doctrine-instantiator/doctrine-instantiator-1.3.1.ebuild b/dev-php/doctrine-instantiator/doctrine-instantiator-1.3.1.ebuild
index 6b79666dab62..32e5559d8548 100644
--- a/dev-php/doctrine-instantiator/doctrine-instantiator-1.3.1.ebuild
+++ b/dev-php/doctrine-instantiator/doctrine-instantiator-1.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/doctrine/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-php/doctrine-instantiator/metadata.xml b/dev-php/doctrine-instantiator/metadata.xml
index 8f8796b0d604..272ad263d2ab 100644
--- a/dev-php/doctrine-instantiator/metadata.xml
+++ b/dev-php/doctrine-instantiator/metadata.xml
@@ -5,8 +5,9 @@
 		<email>php-bugs@gentoo.org</email>
 		<name>PHP</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
-		<remote-id type="github">doctrine/</remote-id>
+		<remote-id type="github">doctrine/instantiator</remote-id>
 	</upstream>
 	<origin>gentoo-staging</origin>
 </pkgmetadata>
diff --git a/dev-php/fedora-autoloader/fedora-autoloader-1.0.1.ebuild b/dev-php/fedora-autoloader/fedora-autoloader-1.0.1.ebuild
index 144c288ef542..9e33ae0060b2 100644
--- a/dev-php/fedora-autoloader/fedora-autoloader-1.0.1.ebuild
+++ b/dev-php/fedora-autoloader/fedora-autoloader-1.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/php-fedora/autoloader/archive/${PV}.tar.gz -> ${P}.t
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 
 IUSE="test"
 
diff --git a/dev-php/fedora-autoloader/metadata.xml b/dev-php/fedora-autoloader/metadata.xml
index a30d168e72ad..95b4a4b82910 100644
--- a/dev-php/fedora-autoloader/metadata.xml
+++ b/dev-php/fedora-autoloader/metadata.xml
@@ -16,6 +16,7 @@
     Static PSR-4, PSR-0, and classmap autoloader.
     Includes loader for required and optional dependencies.
   </longdescription>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="github">php-fedora/autoloader</remote-id>
   </upstream>
diff --git a/dev-php/geos-php/files/1.0.0/0001-fix-test-for-7.3-int-vs-integer.patch b/dev-php/geos-php/files/1.0.0/0001-fix-test-for-7.3-int-vs-integer.patch
new file mode 100644
index 000000000000..e08f1b739051
--- /dev/null
+++ b/dev-php/geos-php/files/1.0.0/0001-fix-test-for-7.3-int-vs-integer.patch
@@ -0,0 +1,34 @@
+From d9eb2378092d39678d1e2cf834c555f83d85b1a1 Mon Sep 17 00:00:00 2001
+From: Remi Collet <remi@remirepo.net>
+Date: Fri, 22 Jun 2018 11:43:23 +0200
+Subject: [PATCH 1/2] fix test for 7.3 (int vs integer)
+
+---
+ tests/004_WKBWriter.phpt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/tests/004_WKBWriter.phpt b/tests/004_WKBWriter.phpt
+index d2b3c85..3a72e2d 100644
+--- a/tests/004_WKBWriter.phpt
++++ b/tests/004_WKBWriter.phpt
+@@ -139,7 +139,7 @@ class WKBWriterTest extends GEOSTest
+             $writer->write(1);
+             $this->assertTrue(false);
+         } catch (ErrorException $e) {
+-            $this->assertContains('expects parameter 1 to be object, integer given', $e->getMessage());
++            $this->assertContains('expects parameter 1 to be object, int', $e->getMessage());
+         }
+     }
+ 
+@@ -151,7 +151,7 @@ class WKBWriterTest extends GEOSTest
+             $writer->writeHEX(1);
+             $this->assertTrue(false);
+         } catch (ErrorException $e) {
+-            $this->assertContains('expects parameter 1 to be object, integer given', $e->getMessage());
++            $this->assertContains('expects parameter 1 to be object, int', $e->getMessage());
+         }
+     }
+ }
+-- 
+2.14.4
+
diff --git a/dev-php/geos-php/files/1.0.0/0002-fix-error-message-with-php-7-Wformat-warnings-raised.patch b/dev-php/geos-php/files/1.0.0/0002-fix-error-message-with-php-7-Wformat-warnings-raised.patch
new file mode 100644
index 000000000000..78509b766224
--- /dev/null
+++ b/dev-php/geos-php/files/1.0.0/0002-fix-error-message-with-php-7-Wformat-warnings-raised.patch
@@ -0,0 +1,37 @@
+From f881f614f11472090394538d4424f408cb61d581 Mon Sep 17 00:00:00 2001
+From: Remi Collet <remi@remirepo.net>
+Date: Fri, 22 Jun 2018 11:44:27 +0200
+Subject: [PATCH 2/2] fix error message with php 7+ (-Wformat warnings raised
+ by 7.3)
+
+---
+ geos.c | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/geos.c b/geos.c
+index 2c81428..fc679e8 100755
+--- a/geos.c
++++ b/geos.c
+@@ -189,11 +189,19 @@ getRelay(zval* val, zend_class_entry* ce) {
+ 
+     if ( proxy->std.ce != ce ) {
+         php_error_docref(NULL TSRMLS_CC, E_ERROR,
++#if PHP_VERSION_ID >= 70000
++            "Relay object is not an %s", ZSTR_VAL(ce->name));
++#else
+             "Relay object is not an %s", ce->name);
++#endif
+     }
+     if ( ! proxy->relay ) {
+         php_error_docref(NULL TSRMLS_CC, E_ERROR,
++#if PHP_VERSION_ID >= 70000
++            "Relay object for object of type %s is not set", ZSTR_VAL(ce->name));
++#else
+             "Relay object for object of type %s is not set", ce->name);
++#endif
+     }
+     return proxy->relay;
+ }
+-- 
+2.14.4
+
diff --git a/dev-php/geos-php/files/1.0.0/0003-add-all-arginfo-and-fix-build-with-PHP-8-part2.patch b/dev-php/geos-php/files/1.0.0/0003-add-all-arginfo-and-fix-build-with-PHP-8-part2.patch
new file mode 100644
index 000000000000..a1ab29fb4a70
--- /dev/null
+++ b/dev-php/geos-php/files/1.0.0/0003-add-all-arginfo-and-fix-build-with-PHP-8-part2.patch
@@ -0,0 +1,422 @@
+From bfef69aca744295719dc8f859005ff83e17ac48c Mon Sep 17 00:00:00 2001
+From: Remi Collet <remi@remirepo.net>
+Date: Fri, 28 Aug 2020 15:21:36 +0200
+Subject: [PATCH] add all arginfo and fix build with PHP 8
+
+---
+ arginfo.h                | 319 +++++++++++++++++++++++++++++++++++++++
+ geos.c                   | 190 ++++++++++++-----------
+ php_geos.h               |   9 ++
+ tests/002_WKTWriter.phpt |   2 +
+ tests/003_WKTReader.phpt |   2 +
+ tests/004_WKBWriter.phpt |   6 +-
+ 6 files changed, 435 insertions(+), 93 deletions(-)
+ create mode 100644 arginfo.h
+
+diff --git a/geos.c b/geos.c
+index fc679e8..ffa27b8 100755
+--- a/geos.c
++++ b/geos.c
+@@ -32,6 +32,7 @@
+ 
+ /* Own stuff */
+ #include "php_geos.h"
++#include "arginfo.h"
+ 
+ static ZEND_DECLARE_MODULE_GLOBALS(geos);
+ static PHP_GINIT_FUNCTION(geos);
+@@ -84,18 +85,23 @@ PHP_FUNCTION(GEOSRelateMatch);
+ 
+ 
+ static zend_function_entry geos_functions[] = {
+-    PHP_FE(GEOSVersion, NULL)
+-    PHP_FE(GEOSPolygonize, NULL)
+-    PHP_FE(GEOSLineMerge, NULL)
++    PHP_FE(GEOSVersion, arginfo_GEOSVersion)
++    PHP_FE(GEOSPolygonize, arginfo_GEOSPolygonize)
++    PHP_FE(GEOSLineMerge, arginfo_GEOSLineMerge)
+ 
+ #   ifdef HAVE_GEOS_SHARED_PATHS
+-    PHP_FE(GEOSSharedPaths, NULL)
++    PHP_FE(GEOSSharedPaths, arginfo_GEOSSharedPaths)
+ #   endif
+ 
+ #   ifdef HAVE_GEOS_RELATE_PATTERN_MATCH
+-    PHP_FE(GEOSRelateMatch, NULL)
++    PHP_FE(GEOSRelateMatch, arginfo_GEOSRelateMatch)
+ #   endif
++
++#ifdef PHP_FE_END
++    PHP_FE_END
++#else
+     {NULL, NULL, NULL}
++#endif
+ };
+ 
+ zend_module_entry geos_module_entry = {
+@@ -428,142 +434,142 @@ PHP_METHOD(Geometry, clipByRect);
+ #endif
+ 
+ static zend_function_entry Geometry_methods[] = {
+-    PHP_ME(Geometry, __construct, NULL, 0)
+-    PHP_ME(Geometry, __toString, NULL, 0)
+-    PHP_ME(Geometry, project, NULL, 0)
+-    PHP_ME(Geometry, interpolate, NULL, 0)
+-    PHP_ME(Geometry, buffer, NULL, 0)
++    PHP_ME(Geometry, __construct, arginfo_Geometry_construct, 0)
++    PHP_ME(Geometry, __toString, arginfo_Geometry_toString, 0)
++    PHP_ME(Geometry, project, arginfo_Geometry_project, 0)
++    PHP_ME(Geometry, interpolate, arginfo_Geometry_interpolate, 0)
++    PHP_ME(Geometry, buffer, arginfo_Geometry_buffer, 0)
+ 
+ #   ifdef HAVE_GEOS_OFFSET_CURVE
+-    PHP_ME(Geometry, offsetCurve, NULL, 0)
++    PHP_ME(Geometry, offsetCurve, arginfo_Geometry_offsetCurve, 0)
+ #   endif
+ 
+-    PHP_ME(Geometry, envelope, NULL, 0)
+-    PHP_ME(Geometry, intersection, NULL, 0)
+-    PHP_ME(Geometry, convexHull, NULL, 0)
+-    PHP_ME(Geometry, difference, NULL, 0)
+-    PHP_ME(Geometry, symDifference, NULL, 0)
+-    PHP_ME(Geometry, boundary, NULL, 0)
+-    PHP_ME(Geometry, union, NULL, 0)
+-    PHP_ME(Geometry, pointOnSurface, NULL, 0)
+-    PHP_ME(Geometry, centroid, NULL, 0)
+-    PHP_ME(Geometry, relate, NULL, 0)
++    PHP_ME(Geometry, envelope, arginfo_Geometry_envelope, 0)
++    PHP_ME(Geometry, intersection, arginfo_Geometry_intersection, 0)
++    PHP_ME(Geometry, convexHull, arginfo_Geometry_convexHull, 0)
++    PHP_ME(Geometry, difference, arginfo_Geometry_difference, 0)
++    PHP_ME(Geometry, symDifference, arginfo_Geometry_symDifference, 0)
++    PHP_ME(Geometry, boundary, arginfo_Geometry_boundary, 0)
++    PHP_ME(Geometry, union, arginfo_Geometry_union, 0)
++    PHP_ME(Geometry, pointOnSurface, arginfo_Geometry_pointOnSurface, 0)
++    PHP_ME(Geometry, centroid, arginfo_Geometry_centroid, 0)
++    PHP_ME(Geometry, relate, arginfo_Geometry_relate, 0)
+ 
+ #   ifdef HAVE_GEOS_RELATE_BOUNDARY_NODE_RULE
+-    PHP_ME(Geometry, relateBoundaryNodeRule, NULL, 0)
++    PHP_ME(Geometry, relateBoundaryNodeRule, arginfo_Geometry_relateBoundaryNodeRule, 0)
+ #   endif
+ 
+-    PHP_ME(Geometry, simplify, NULL, 0)
+-    PHP_ME(Geometry, normalize, NULL, 0)
++    PHP_ME(Geometry, simplify, arginfo_Geometry_simplify, 0)
++    PHP_ME(Geometry, normalize, arginfo_Geometry_normalize, 0)
+ 
+ #   ifdef HAVE_GEOS_GEOM_SET_PRECISION
+-    PHP_ME(Geometry, setPrecision, NULL, 0)
++    PHP_ME(Geometry, setPrecision, arginfo_Geometry_setPrecision, 0)
+ #   endif
+ 
+ #   if HAVE_GEOS_GEOM_GET_PRECISION
+-    PHP_ME(Geometry, getPrecision, NULL, 0)
++    PHP_ME(Geometry, getPrecision, arginfo_Geometry_getPrecision, 0)
+ #   endif
+ 
+ #   ifdef HAVE_GEOS_GEOM_EXTRACT_UNIQUE_POINTS
+-    PHP_ME(Geometry, extractUniquePoints, NULL, 0)
++    PHP_ME(Geometry, extractUniquePoints, arginfo_Geometry_extractUniquePoints, 0)
+ #   endif
+ 
+-    PHP_ME(Geometry, disjoint, NULL, 0)
+-    PHP_ME(Geometry, touches, NULL, 0)
+-    PHP_ME(Geometry, intersects, NULL, 0)
+-    PHP_ME(Geometry, crosses, NULL, 0)
+-    PHP_ME(Geometry, within, NULL, 0)
+-    PHP_ME(Geometry, contains, NULL, 0)
+-    PHP_ME(Geometry, overlaps, NULL, 0)
++    PHP_ME(Geometry, disjoint, arginfo_Geometry_disjoint, 0)
++    PHP_ME(Geometry, touches, arginfo_Geometry_touches, 0)
++    PHP_ME(Geometry, intersects, arginfo_Geometry_intersects, 0)
++    PHP_ME(Geometry, crosses, arginfo_Geometry_crosses, 0)
++    PHP_ME(Geometry, within, arginfo_Geometry_within, 0)
++    PHP_ME(Geometry, contains, arginfo_Geometry_contains, 0)
++    PHP_ME(Geometry, overlaps, arginfo_Geometry_overlaps, 0)
+ 
+ #   ifdef HAVE_GEOS_COVERS
+-    PHP_ME(Geometry, covers, NULL, 0)
++    PHP_ME(Geometry, covers, arginfo_Geometry_covers, 0)
+ #   endif
+ 
+ #   ifdef HAVE_GEOS_COVERED_BY
+-    PHP_ME(Geometry, coveredBy, NULL, 0)
++    PHP_ME(Geometry, coveredBy, arginfo_Geometry_coveredBy, 0)
+ #   endif
+ 
+-    PHP_ME(Geometry, equals, NULL, 0)
+-    PHP_ME(Geometry, equalsExact, NULL, 0)
+-    PHP_ME(Geometry, isEmpty, NULL, 0)
++    PHP_ME(Geometry, equals, arginfo_Geometry_equals, 0)
++    PHP_ME(Geometry, equalsExact, arginfo_Geometry_equalsExact, 0)
++    PHP_ME(Geometry, isEmpty, arginfo_Geometry_isEmpty, 0)
+ 
+ #   ifdef HAVE_GEOS_IS_VALID_DETAIL
+-    PHP_ME(Geometry, checkValidity, NULL, 0)
++    PHP_ME(Geometry, checkValidity, arginfo_Geometry_checkValidity, 0)
+ #   endif
+ 
+-    PHP_ME(Geometry, isSimple, NULL, 0)
+-    PHP_ME(Geometry, isRing, NULL, 0)
+-    PHP_ME(Geometry, hasZ, NULL, 0)
++    PHP_ME(Geometry, isSimple, arginfo_Geometry_isSimple, 0)
++    PHP_ME(Geometry, isRing, arginfo_Geometry_isRing, 0)
++    PHP_ME(Geometry, hasZ, arginfo_Geometry_hasZ, 0)
+ 
+ #   ifdef HAVE_GEOS_IS_CLOSED
+-    PHP_ME(Geometry, isClosed, NULL, 0)
++    PHP_ME(Geometry, isClosed, arginfo_Geometry_isClosed, 0)
+ #   endif
+ 
+-    PHP_ME(Geometry, typeName, NULL, 0)
+-    PHP_ME(Geometry, typeId, NULL, 0)
+-    PHP_ME(Geometry, getSRID, NULL, 0)
+-    PHP_ME(Geometry, setSRID, NULL, 0)
+-    PHP_ME(Geometry, numGeometries, NULL, 0)
+-    PHP_ME(Geometry, geometryN, NULL, 0)
+-    PHP_ME(Geometry, numInteriorRings, NULL, 0)
++    PHP_ME(Geometry, typeName, arginfo_Geometry_typeName, 0)
++    PHP_ME(Geometry, typeId, arginfo_Geometry_typeId, 0)
++    PHP_ME(Geometry, getSRID, arginfo_Geometry_getSRID, 0)
++    PHP_ME(Geometry, setSRID, arginfo_Geometry_setSRID, 0)
++    PHP_ME(Geometry, numGeometries, arginfo_Geometry_numGeometries, 0)
++    PHP_ME(Geometry, geometryN, arginfo_Geometry_geometryN, 0)
++    PHP_ME(Geometry, numInteriorRings, arginfo_Geometry_numInteriorRings, 0)
+ 
+ #   ifdef HAVE_GEOS_GEOM_GET_NUM_POINTS
+-    PHP_ME(Geometry, numPoints, NULL, 0)
++    PHP_ME(Geometry, numPoints, arginfo_Geometry_numPoints, 0)
+ #   endif
+ 
+ #   ifdef HAVE_GEOS_GEOM_GET_X
+-    PHP_ME(Geometry, getX, NULL, 0)
++    PHP_ME(Geometry, getX, arginfo_Geometry_getX, 0)
+ #   endif
+ 
+ #   ifdef HAVE_GEOS_GEOM_GET_Y
+-    PHP_ME(Geometry, getY, NULL, 0)
++    PHP_ME(Geometry, getY, arginfo_Geometry_getY, 0)
+ #   endif
+ 
+-    PHP_ME(Geometry, interiorRingN, NULL, 0)
+-    PHP_ME(Geometry, exteriorRing, NULL, 0)
+-    PHP_ME(Geometry, numCoordinates, NULL, 0)
+-    PHP_ME(Geometry, dimension, NULL, 0)
++    PHP_ME(Geometry, interiorRingN, arginfo_Geometry_interiorRingN, 0)
++    PHP_ME(Geometry, exteriorRing, arginfo_Geometry_exteriorRing, 0)
++    PHP_ME(Geometry, numCoordinates, arginfo_Geometry_numCoordinates, 0)
++    PHP_ME(Geometry, dimension, arginfo_Geometry_dimension, 0)
+ 
+ #   ifdef HAVE_GEOS_GEOM_GET_COORDINATE_DIMENSION
+-    PHP_ME(Geometry, coordinateDimension, NULL, 0)
++    PHP_ME(Geometry, coordinateDimension, arginfo_Geometry_coordinateDimension, 0)
+ #   endif
+ 
+ #   ifdef HAVE_GEOS_GEOM_GET_POINT_N
+-    PHP_ME(Geometry, pointN, NULL, 0)
++    PHP_ME(Geometry, pointN, arginfo_Geometry_pointN, 0)
+ #   endif
+ 
+ #   ifdef HAVE_GEOS_GEOM_GET_START_POINT
+-    PHP_ME(Geometry, startPoint, NULL, 0)
++    PHP_ME(Geometry, startPoint, arginfo_Geometry_startPoint, 0)
+ #   endif
+ 
+ #   ifdef HAVE_GEOS_GEOM_GET_END_POINT
+-    PHP_ME(Geometry, endPoint, NULL, 0)
++    PHP_ME(Geometry, endPoint, arginfo_Geometry_endPoint, 0)
+ #   endif
+ 
+-    PHP_ME(Geometry, area, NULL, 0)
+-    PHP_ME(Geometry, length, NULL, 0)
+-    PHP_ME(Geometry, distance, NULL, 0)
+-    PHP_ME(Geometry, hausdorffDistance, NULL, 0)
++    PHP_ME(Geometry, area, arginfo_Geometry_area, 0)
++    PHP_ME(Geometry, length, arginfo_Geometry_length, 0)
++    PHP_ME(Geometry, distance, arginfo_Geometry_distance, 0)
++    PHP_ME(Geometry, hausdorffDistance, arginfo_Geometry_hausdorffDistance, 0)
+ 
+ #   if HAVE_GEOS_SNAP
+-    PHP_ME(Geometry, snapTo, NULL, 0)
++    PHP_ME(Geometry, snapTo, arginfo_Geometry_snapTo, 0)
+ #   endif
+ 
+ #   ifdef HAVE_GEOS_NODE
+-    PHP_ME(Geometry, node, NULL, 0)
++    PHP_ME(Geometry, node, arginfo_Geometry_node, 0)
+ #   endif
+ 
+ #   ifdef HAVE_GEOS_DELAUNAY_TRIANGULATION
+-    PHP_ME(Geometry, delaunayTriangulation, NULL, 0)
++    PHP_ME(Geometry, delaunayTriangulation, arginfo_Geometry_delaunayTriangulation, 0)
+ #   endif
+ 
+ #   ifdef HAVE_GEOS_VORONOI_DIAGRAM
+-    PHP_ME(Geometry, voronoiDiagram, NULL, 0)
++    PHP_ME(Geometry, voronoiDiagram, arginfo_Geometry_voronoiDiagram, 0)
+ #   endif
+ 
+ #   ifdef HAVE_GEOS_CLIP_BY_RECT
+-    PHP_ME(Geometry, clipByRect, NULL, 0)
++    PHP_ME(Geometry, clipByRect, arginfo_Geometry_clipByRect, 0)
+ #   endif
+ 
+     {NULL, NULL, NULL}
+@@ -2347,8 +2353,8 @@ PHP_METHOD(WKTReader, __construct);
+ PHP_METHOD(WKTReader, read);
+ 
+ static zend_function_entry WKTReader_methods[] = {
+-    PHP_ME(WKTReader, __construct, NULL, 0)
+-    PHP_ME(WKTReader, read, NULL, 0)
++    PHP_ME(WKTReader, __construct, arginfo_WKTReader_construct, 0)
++    PHP_ME(WKTReader, read, arginfo_WKTReader_read, 0)
+     {NULL, NULL, NULL}
+ };
+ 
+@@ -2457,27 +2463,27 @@ PHP_METHOD(WKTWriter, setOld3D);
+ #endif
+ 
+ static zend_function_entry WKTWriter_methods[] = {
+-    PHP_ME(WKTWriter, __construct, NULL, 0)
+-    PHP_ME(WKTWriter, write, NULL, 0)
++    PHP_ME(WKTWriter, __construct, arginfo_WKTWriter_construct, 0)
++    PHP_ME(WKTWriter, write, arginfo_WKTWriter_write, 0)
+ 
+ #   ifdef HAVE_GEOS_WKT_WRITER_SET_TRIM
+-    PHP_ME(WKTWriter, setTrim, NULL, 0)
++    PHP_ME(WKTWriter, setTrim, arginfo_WKTWriter_setTrim, 0)
+ #   endif
+ 
+ #   ifdef HAVE_GEOS_WKT_WRITER_SET_ROUNDING_PRECISION
+-    PHP_ME(WKTWriter, setRoundingPrecision, NULL, 0)
++    PHP_ME(WKTWriter, setRoundingPrecision, arginfo_WKTWriter_setRoundingPrecision, 0)
+ #   endif
+ 
+ #   ifdef HAVE_GEOS_WKT_WRITER_SET_OUTPUT_DIMENSION
+-    PHP_ME(WKTWriter, setOutputDimension, NULL, 0)
++    PHP_ME(WKTWriter, setOutputDimension, arginfo_WKTWriter_setOutputDimension, 0)
+ #   endif
+ 
+ #   ifdef HAVE_GEOS_WKT_WRITER_GET_OUTPUT_DIMENSION
+-    PHP_ME(WKTWriter, getOutputDimension, NULL, 0)
++    PHP_ME(WKTWriter, getOutputDimension, arginfo_WKTWriter_getOutputDimension, 0)
+ #   endif
+ 
+ #   ifdef HAVE_GEOS_WKT_WRITER_SET_OLD_3D
+-    PHP_ME(WKTWriter, setOld3D, NULL, 0)
++    PHP_ME(WKTWriter, setOld3D, arginfo_WKTWriter_setOld3D, 0)
+ #   endif
+ 
+     {NULL, NULL, NULL}
+@@ -2665,15 +2671,15 @@ PHP_METHOD(WKBWriter, write);
+ PHP_METHOD(WKBWriter, writeHEX);
+ 
+ static zend_function_entry WKBWriter_methods[] = {
+-    PHP_ME(WKBWriter, __construct, NULL, 0)
+-    PHP_ME(WKBWriter, getOutputDimension, NULL, 0)
+-    PHP_ME(WKBWriter, setOutputDimension, NULL, 0)
+-    PHP_ME(WKBWriter, getByteOrder, NULL, 0)
+-    PHP_ME(WKBWriter, setByteOrder, NULL, 0)
+-    PHP_ME(WKBWriter, getIncludeSRID, NULL, 0)
+-    PHP_ME(WKBWriter, setIncludeSRID, NULL, 0)
+-    PHP_ME(WKBWriter, write, NULL, 0)
+-    PHP_ME(WKBWriter, writeHEX, NULL, 0)
++    PHP_ME(WKBWriter, __construct, arginfo_WKBWriter_construct, 0)
++    PHP_ME(WKBWriter, getOutputDimension, arginfo_WKBWriter_getOutputDimension, 0)
++    PHP_ME(WKBWriter, setOutputDimension, arginfo_WKBWriter_setOutputDimension, 0)
++    PHP_ME(WKBWriter, getByteOrder, arginfo_WKBWriter_getByteOrder, 0)
++    PHP_ME(WKBWriter, setByteOrder, arginfo_WKBWriter_setByteOrder, 0)
++    PHP_ME(WKBWriter, getIncludeSRID, arginfo_WKBWriter_getIncludeSRID, 0)
++    PHP_ME(WKBWriter, setIncludeSRID, arginfo_WKBWriter_setIncludeSRID, 0)
++    PHP_ME(WKBWriter, write, arginfo_WKBWriter_write, 0)
++    PHP_ME(WKBWriter, writeHEX, arginfo_WKBWriter_writeHEX, 0)
+     {NULL, NULL, NULL}
+ };
+ 
+@@ -2904,9 +2910,9 @@ PHP_METHOD(WKBReader, read);
+ PHP_METHOD(WKBReader, readHEX);
+ 
+ static zend_function_entry WKBReader_methods[] = {
+-    PHP_ME(WKBReader, __construct, NULL, 0)
+-    PHP_ME(WKBReader, read, NULL, 0)
+-    PHP_ME(WKBReader, readHEX, NULL, 0)
++    PHP_ME(WKBReader, __construct, arginfo_WKBReader_construct, 0)
++    PHP_ME(WKBReader, read, arginfo_WKBReader_read, 0)
++    PHP_ME(WKBReader, readHEX, arginfo_WKBReader_readHEX, 0)
+     {NULL, NULL, NULL}
+ };
+ 
+diff --git a/php_geos.h b/php_geos.h
+index 5350541..0b8fdcb 100644
+--- a/php_geos.h
++++ b/php_geos.h
+@@ -48,6 +48,15 @@ extern zend_module_entry geos_module_entry;
+ #define GEOS_G(v) (geos_globals.v)
+ #endif
+ 
++/* for PHP 8 */
++#ifndef TSRMLS_D
++#define TSRMLS_D void
++#define TSRMLS_DC
++#define TSRMLS_C
++#define TSRMLS_CC
++#define TSRMLS_FETCH()
++#endif
++
+ ZEND_BEGIN_MODULE_GLOBALS(geos)
+ GEOSContextHandle_t handle;
+ ZEND_END_MODULE_GLOBALS(geos)
+diff --git a/tests/002_WKTWriter.phpt b/tests/002_WKTWriter.phpt
+index 6bb7253..3682a3a 100644
+--- a/tests/002_WKTWriter.phpt
++++ b/tests/002_WKTWriter.phpt
+@@ -25,6 +25,8 @@ class WKTWriterTest extends GEOSTest
+             $this->assertTrue(FALSE); # this is just to fail if we get here
+         } catch (Exception $e) {
+             $this->assertContains('expects parameter 1', $e->getMessage());
++        } catch (Error $e) {
++            $this->assertContains('Argument #1', $e->getMessage());
+         }
+ 
+         $g = $reader->read('POINT(6 7)');
+diff --git a/tests/003_WKTReader.phpt b/tests/003_WKTReader.phpt
+index 7bcbf54..fbd4fb1 100644
+--- a/tests/003_WKTReader.phpt
++++ b/tests/003_WKTReader.phpt
+@@ -99,6 +99,8 @@ class WKTReaderTest extends GEOSTest
+         } catch (Exception $e) {
+             $this->assertContains('expects exactly 1 parameter',
+                                   $e->getMessage());
++        } catch (Error $e) {
++            $this->assertContains('expects exactly 1 parameter', $e->getMessage());
+         }
+     }
+ }
+diff --git a/tests/004_WKBWriter.phpt b/tests/004_WKBWriter.phpt
+index 3a72e2d..3c13644 100644
+--- a/tests/004_WKBWriter.phpt
++++ b/tests/004_WKBWriter.phpt
+@@ -140,6 +140,8 @@ class WKBWriterTest extends GEOSTest
+             $this->assertTrue(false);
+         } catch (ErrorException $e) {
+             $this->assertContains('expects parameter 1 to be object, int', $e->getMessage());
++        } catch (Error $e) {
++            $this->assertContains('Argument #1', $e->getMessage());
+         }
+     }
+ 
+@@ -152,7 +154,9 @@ class WKBWriterTest extends GEOSTest
+             $this->assertTrue(false);
+         } catch (ErrorException $e) {
+             $this->assertContains('expects parameter 1 to be object, int', $e->getMessage());
+-        }
++        } catch (Error $e) {
++            $this->assertContains('Argument #1', $e->getMessage());
++	    }
+     }
+ }
+ 
+-- 
+2.25.4
+
diff --git a/dev-php/geos-php/files/1.0.0/0003-add-all-arginfo-and-fix-build-with-PHP-8.patch b/dev-php/geos-php/files/1.0.0/0003-add-all-arginfo-and-fix-build-with-PHP-8.patch
new file mode 100644
index 000000000000..7422a44203a4
--- /dev/null
+++ b/dev-php/geos-php/files/1.0.0/0003-add-all-arginfo-and-fix-build-with-PHP-8.patch
@@ -0,0 +1,341 @@
+From bfef69aca744295719dc8f859005ff83e17ac48c Mon Sep 17 00:00:00 2001
+From: Remi Collet <remi@remirepo.net>
+Date: Fri, 28 Aug 2020 15:21:36 +0200
+Subject: [PATCH] add all arginfo and fix build with PHP 8
+
+---
+ arginfo.h                | 319 +++++++++++++++++++++++++++++++++++++++
+ geos.c                   | 190 ++++++++++++-----------
+ php_geos.h               |   9 ++
+ tests/002_WKTWriter.phpt |   2 +
+ tests/003_WKTReader.phpt |   2 +
+ tests/004_WKBWriter.phpt |   6 +-
+ 6 files changed, 435 insertions(+), 93 deletions(-)
+ create mode 100644 arginfo.h
+
+diff --git a/arginfo.h b/arginfo.h
+new file mode 100644
+index 0000000..3bee988
+--- /dev/null
++++ b/arginfo.h
+@@ -0,0 +1,319 @@
++/* commonly used ones */
++
++ZEND_BEGIN_ARG_INFO_EX(arginfo_void, 0, 0, 0)
++ZEND_END_ARG_INFO()
++
++ZEND_BEGIN_ARG_INFO_EX(arginfo_geom, 0, 0, 1)
++    ZEND_ARG_INFO(0, geom)
++ZEND_END_ARG_INFO()
++
++ZEND_BEGIN_ARG_INFO_EX(arginfo_num, 0, 0, 1)
++    ZEND_ARG_INFO(0, num)
++ZEND_END_ARG_INFO()
++
++/* function arginfo */
++
++#define arginfo_GEOSVersion              arginfo_void
++
++#define arginfo_GEOSPolygonize           arginfo_geom
++#define arginfo_GEOSLineMerge            arginfo_geom
++
++#ifdef HAVE_GEOS_SHARED_PATHS
++ZEND_BEGIN_ARG_INFO_EX(arginfo_GEOSSharedPaths, 0, 0, 2)
++    ZEND_ARG_INFO(0, geom1)
++    ZEND_ARG_INFO(0, geom2)
++ZEND_END_ARG_INFO()
++#endif
++
++#ifdef HAVE_GEOS_RELATE_PATTERN_MATCH
++ZEND_BEGIN_ARG_INFO_EX(arginfo_GEOSRelateMatch, 0, 0, 2)
++    ZEND_ARG_INFO(0, maxtric)
++    ZEND_ARG_INFO(0, pattern)
++ZEND_END_ARG_INFO()
++#endif
++
++/* GEOSGeometry methods arginfo */
++
++#define arginfo_Geometry_construct       arginfo_void
++
++#define arginfo_Geometry_toString        arginfo_void
++
++ZEND_BEGIN_ARG_INFO_EX(arginfo_Geometry_project, 0, 0, 1)
++    ZEND_ARG_INFO(0, geom)
++    ZEND_ARG_INFO(0, normalized)
++ZEND_END_ARG_INFO()
++
++ZEND_BEGIN_ARG_INFO_EX(arginfo_Geometry_interpolate, 0, 0, 1)
++    ZEND_ARG_INFO(0, dist)
++    ZEND_ARG_INFO(0, normalized)
++ZEND_END_ARG_INFO()
++
++ZEND_BEGIN_ARG_INFO_EX(arginfo_Geometry_buffer, 0, 0, 1)
++    ZEND_ARG_INFO(0, dist)
++    ZEND_ARG_INFO(0, style)
++ZEND_END_ARG_INFO()
++
++#ifdef HAVE_GEOS_OFFSET_CURVE
++#define arginfo_Geometry_offsetCurve     arginfo_Geometry_buffer
++#endif
++
++#define arginfo_Geometry_envelope        arginfo_void
++
++#define arginfo_Geometry_intersection    arginfo_geom
++
++#define arginfo_Geometry_convexHull      arginfo_void
++
++#define arginfo_Geometry_difference      arginfo_geom
++
++#define arginfo_Geometry_symDifference   arginfo_geom
++
++#define arginfo_Geometry_boundary        arginfo_void
++
++ZEND_BEGIN_ARG_INFO_EX(arginfo_Geometry_union, 0, 0, 0)
++    ZEND_ARG_INFO(0, geom)
++ZEND_END_ARG_INFO()
++
++#define arginfo_Geometry_pointOnSurface  arginfo_void
++
++#define arginfo_Geometry_centroid        arginfo_void
++
++ZEND_BEGIN_ARG_INFO_EX(arginfo_Geometry_relate, 0, 0, 1)
++    ZEND_ARG_INFO(0, geom)
++    ZEND_ARG_INFO(0, pattern)
++ZEND_END_ARG_INFO()
++
++#ifdef HAVE_GEOS_RELATE_BOUNDARY_NODE_RULE
++ZEND_BEGIN_ARG_INFO_EX(arginfo_Geometry_relateBoundaryNodeRule, 0, 0, 2)
++    ZEND_ARG_INFO(0, geom)
++    ZEND_ARG_INFO(0, rule)
++ZEND_END_ARG_INFO()
++#endif
++
++ZEND_BEGIN_ARG_INFO_EX(arginfo_Geometry_simplify, 0, 0, 1)
++    ZEND_ARG_INFO(0, tolerance)
++    ZEND_ARG_INFO(0, preserveTopology)
++ZEND_END_ARG_INFO()
++
++#define arginfo_Geometry_normalize       arginfo_void
++
++#ifdef HAVE_GEOS_GEOM_SET_PRECISION
++ZEND_BEGIN_ARG_INFO_EX(arginfo_Geometry_setPrecision, 0, 0, 1)
++    ZEND_ARG_INFO(0, gridsize)
++    ZEND_ARG_INFO(0, flags)
++ZEND_END_ARG_INFO()
++#endif
++
++#ifdef HAVE_GEOS_GEOM_GET_PRECISION
++#define arginfo_Geometry_getPrecision    arginfo_void
++#endif
++
++#ifdef HAVE_GEOS_GEOM_EXTRACT_UNIQUE_POINTS
++#define arginfo_Geometry_extractUniquePoints arginfo_void
++#endif
++
++#define arginfo_Geometry_disjoint        arginfo_geom
++
++#define arginfo_Geometry_touches         arginfo_geom
++
++#define arginfo_Geometry_intersects      arginfo_geom
++
++#define arginfo_Geometry_crosses         arginfo_geom
++
++#define arginfo_Geometry_within          arginfo_geom
++
++#define arginfo_Geometry_contains        arginfo_geom
++
++#define arginfo_Geometry_overlaps        arginfo_geom
++
++#ifdef HAVE_GEOS_COVERS
++#define arginfo_Geometry_covers          arginfo_geom
++#endif
++
++#ifdef HAVE_GEOS_COVERED_BY
++#define arginfo_Geometry_coveredBy       arginfo_geom
++#endif
++
++#define arginfo_Geometry_equals          arginfo_geom
++
++#define arginfo_Geometry_equalsExact     arginfo_geom
++
++#define arginfo_Geometry_isEmpty         arginfo_void
++
++#ifdef HAVE_GEOS_IS_VALID_DETAIL
++ZEND_BEGIN_ARG_INFO_EX(arginfo_Geometry_checkValidity, 0, 0, 0)
++    ZEND_ARG_INFO(0, flags)
++ZEND_END_ARG_INFO()
++#endif
++
++#define arginfo_Geometry_isSimple        arginfo_void
++
++#define arginfo_Geometry_isRing          arginfo_void
++
++#define arginfo_Geometry_hasZ            arginfo_void
++
++
++#ifdef HAVE_GEOS_IS_CLOSED
++#define arginfo_Geometry_isClosed        arginfo_void
++#endif
++
++#define arginfo_Geometry_typeName        arginfo_void
++
++#define arginfo_Geometry_typeId          arginfo_void
++
++#define arginfo_Geometry_getSRID         arginfo_void
++
++ZEND_BEGIN_ARG_INFO_EX(arginfo_Geometry_setSRID, 0, 0, 0)
++    ZEND_ARG_INFO(0, srid)
++ZEND_END_ARG_INFO()
++
++#define arginfo_Geometry_numGeometries   arginfo_void
++
++#define arginfo_Geometry_geometryN       arginfo_num
++
++#define arginfo_Geometry_numInteriorRings arginfo_void
++
++#ifdef HAVE_GEOS_GEOM_GET_NUM_POINTS
++#define arginfo_Geometry_numPoints       arginfo_void
++#endif
++
++#ifdef HAVE_GEOS_GEOM_GET_X
++#define arginfo_Geometry_getX            arginfo_void
++#endif
++
++#ifdef HAVE_GEOS_GEOM_GET_Y
++#define arginfo_Geometry_getY            arginfo_void
++#endif
++
++#define arginfo_Geometry_interiorRingN   arginfo_num
++
++#define arginfo_Geometry_exteriorRing    arginfo_void
++
++#define arginfo_Geometry_numCoordinates  arginfo_void
++
++#define arginfo_Geometry_dimension       arginfo_void
++
++#ifdef HAVE_GEOS_GEOM_GET_COORDINATE_DIMENSION
++#define arginfo_Geometry_coordinateDimension arginfo_void
++#endif
++
++#ifdef HAVE_GEOS_GEOM_GET_POINT_N
++#define arginfo_Geometry_pointN          arginfo_num
++#endif
++
++#ifdef HAVE_GEOS_GEOM_GET_START_POINT
++#define arginfo_Geometry_startPoint      arginfo_void
++#endif
++
++#ifdef HAVE_GEOS_GEOM_GET_END_POINT
++#define arginfo_Geometry_endPoint        arginfo_void
++#endif
++
++#define arginfo_Geometry_area            arginfo_void
++
++#define arginfo_Geometry_length          arginfo_void
++
++#define arginfo_Geometry_distance        arginfo_geom
++
++#define arginfo_Geometry_hausdorffDistance arginfo_geom
++
++#ifdef HAVE_GEOS_SNAP
++ZEND_BEGIN_ARG_INFO_EX(arginfo_Geometry_snapTo, 0, 0, 2)
++    ZEND_ARG_INFO(0, geom)
++    ZEND_ARG_INFO(0, tolerance)
++ZEND_END_ARG_INFO()
++#endif
++
++#ifdef HAVE_GEOS_NODE
++#define arginfo_Geometry_node            arginfo_void
++#endif
++
++#ifdef HAVE_GEOS_DELAUNAY_TRIANGULATION
++ZEND_BEGIN_ARG_INFO_EX(arginfo_Geometry_delaunayTriangulation, 0, 0, 0)
++    ZEND_ARG_INFO(0, tolerance)
++    ZEND_ARG_INFO(0, edgeonly)
++ZEND_END_ARG_INFO()
++#endif
++
++#ifdef HAVE_GEOS_VORONOI_DIAGRAM
++ZEND_BEGIN_ARG_INFO_EX(arginfo_Geometry_voronoiDiagram, 0, 0, 0)
++    ZEND_ARG_INFO(0, tolerance)
++    ZEND_ARG_INFO(0, edgeonly)
++    ZEND_ARG_INFO(0, extent)
++ZEND_END_ARG_INFO()
++#endif
++
++#ifdef HAVE_GEOS_CLIP_BY_RECT
++ZEND_BEGIN_ARG_INFO_EX(arginfo_Geometry_clipByRect, 0, 0, 4)
++    ZEND_ARG_INFO(0, xmin)
++    ZEND_ARG_INFO(0, ymin)
++    ZEND_ARG_INFO(0, xmax)
++    ZEND_ARG_INFO(0, ymax)
++ZEND_END_ARG_INFO()
++#endif
++
++/* GEOSWKBReader methods arginfo */
++
++#define arginfo_WKBReader_construct      arginfo_void
++
++ZEND_BEGIN_ARG_INFO_EX(arginfo_WKBReader_read, 0, 0, 1)
++    ZEND_ARG_INFO(0, wkb)
++ZEND_END_ARG_INFO()
++
++#define arginfo_WKBReader_readHEX        arginfo_WKBReader_read
++
++/* GEOSWKTReader methods arginfo */
++
++#define arginfo_WKTReader_construct      arginfo_void
++
++ZEND_BEGIN_ARG_INFO_EX(arginfo_WKTReader_read, 0, 0, 1)
++    ZEND_ARG_INFO(0, wkt)
++ZEND_END_ARG_INFO()
++
++/* GEOSWKTWriter methods arginfo */
++
++#define arginfo_WKTWriter_construct      arginfo_void
++
++#define arginfo_WKTWriter_write          arginfo_geom
++
++#ifdef HAVE_GEOS_WKT_WRITER_SET_TRIM
++#define arginfo_WKTWriter_setTrim        arginfo_num
++#endif
++
++#ifdef HAVE_GEOS_WKT_WRITER_SET_ROUNDING_PRECISION
++#define arginfo_WKTWriter_setRoundingPrecision arginfo_num
++#endif
++
++#ifdef HAVE_GEOS_WKT_WRITER_SET_OUTPUT_DIMENSION
++#define arginfo_WKTWriter_setOutputDimension   arginfo_num
++#endif
++
++#ifdef HAVE_GEOS_WKT_WRITER_GET_OUTPUT_DIMENSION
++#define arginfo_WKTWriter_getOutputDimension arginfo_void
++#endif
++
++#ifdef HAVE_GEOS_WKT_WRITER_SET_OLD_3D
++ZEND_BEGIN_ARG_INFO_EX(arginfo_WKTWriter_setOld3D, 0, 0, 1)
++    ZEND_ARG_INFO(0, bval)
++ZEND_END_ARG_INFO()
++#endif
++
++/* GEOSWKTWriter methods arginfo */
++
++#define arginfo_WKBWriter_construct          arginfo_void
++
++#define arginfo_WKBWriter_getOutputDimension arginfo_void
++
++#define arginfo_WKBWriter_setOutputDimension arginfo_num
++
++#define arginfo_WKBWriter_getByteOrder       arginfo_void
++
++#define arginfo_WKBWriter_setByteOrder       arginfo_num
++
++#define arginfo_WKBWriter_setIncludeSRID     arginfo_num
++
++#define arginfo_WKBWriter_getIncludeSRID     arginfo_void
++
++#define arginfo_WKBWriter_write              arginfo_geom
++
++#define arginfo_WKBWriter_writeHEX           arginfo_geom
++
+
diff --git a/dev-php/geos-php/files/1.0.0/0004-fix-for-8.0.0RC1.patch b/dev-php/geos-php/files/1.0.0/0004-fix-for-8.0.0RC1.patch
new file mode 100644
index 000000000000..97592903b6cc
--- /dev/null
+++ b/dev-php/geos-php/files/1.0.0/0004-fix-for-8.0.0RC1.patch
@@ -0,0 +1,25 @@
+From 37ede013e720aed2ab4e7ce33699a86dd0ef3730 Mon Sep 17 00:00:00 2001
+From: Remi Collet <remi@remirepo.net>
+Date: Wed, 30 Sep 2020 09:17:54 +0200
+Subject: [PATCH 5/5] fix for 8.0.0RC1
+
+---
+ tests/003_WKTReader.phpt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/003_WKTReader.phpt b/tests/003_WKTReader.phpt
+index fbd4fb1..e02d1c8 100644
+--- a/tests/003_WKTReader.phpt
++++ b/tests/003_WKTReader.phpt
+@@ -100,7 +100,7 @@ class WKTReaderTest extends GEOSTest
+             $this->assertContains('expects exactly 1 parameter',
+                                   $e->getMessage());
+         } catch (Error $e) {
+-            $this->assertContains('expects exactly 1 parameter', $e->getMessage());
++            $this->assertContains('expects exactly 1', $e->getMessage());
+         }
+     }
+ }
+-- 
+2.25.4
+
diff --git a/dev-php/geos-php/files/1.0.0/0005-fix-all-zend_parse_parameters-call-to-use-zend_long.patch b/dev-php/geos-php/files/1.0.0/0005-fix-all-zend_parse_parameters-call-to-use-zend_long.patch
new file mode 100644
index 000000000000..14eae9d90790
--- /dev/null
+++ b/dev-php/geos-php/files/1.0.0/0005-fix-all-zend_parse_parameters-call-to-use-zend_long.patch
@@ -0,0 +1,123 @@
+From fcd7a35c1a9ca109fd50ee2660053423916b491b Mon Sep 17 00:00:00 2001
+From: Remi Collet <remi@remirepo.net>
+Date: Fri, 28 Aug 2020 15:36:40 +0200
+Subject: [PATCH 2/2] fix all zend_parse_parameters call to use zend_long
+
+---
+ geos.c | 23 ++++++++++++-----------
+ 1 file changed, 12 insertions(+), 11 deletions(-)
+
+diff --git a/geos.c b/geos.c
+index ffa27b8..0437523 100755
+--- a/geos.c
++++ b/geos.c
+@@ -78,6 +78,7 @@ PHP_FUNCTION(GEOSRelateMatch);
+ # define GEOS_PHP_ADD_ASSOC_ZVAL(a,k,v) add_assoc_zval((a), (k), (v))
+ # define GEOS_PHP_HASH_GET_CUR_KEY(s,k,i) zend_hash_get_current_key((s), (k), (i), 0)
+ # define zend_string char
++# define zend_long long
+ # define ZSTR_VAL(x) (x)
+ # define GEOS_PHP_HASH_GET_CUR_DATA(h,d) zend_hash_get_current_data((h),(void**)&(d))
+ # define GEOS_PHP_ZVAL zval **
+@@ -1281,7 +1282,7 @@ PHP_METHOD(Geometry, relateBoundaryNodeRule)
+     GEOSGeometry *other;
+     zval *zobj;
+     char* pat;
+-    long int bnr = GEOSRELATE_BNR_OGC;
++    zend_long bnr = GEOSRELATE_BNR_OGC;
+     char* retStr;
+ 
+     this = (GEOSGeometry*)getRelay(getThis(), Geometry_ce_ptr);
+@@ -1342,7 +1343,7 @@ PHP_METHOD(Geometry, setPrecision)
+ {
+     GEOSGeometry *this;
+     double gridSize;
+-    long int flags = 0;
++    zend_long flags = 0;
+     GEOSGeometry *ret;
+ 
+     this = (GEOSGeometry*)getRelay(getThis(), Geometry_ce_ptr);
+@@ -1756,7 +1757,7 @@ PHP_METHOD(Geometry, checkValidity)
+     zend_bool retBool;
+     char *reasonVal = NULL;
+     zval *locationVal = NULL;
+-    long int flags = 0;
++    zend_long flags = 0;
+ 
+     this = (GEOSGeometry*)getRelay(getThis(), Geometry_ce_ptr);
+ 
+@@ -1929,7 +1930,7 @@ PHP_METHOD(Geometry, getSRID)
+ PHP_METHOD(Geometry, setSRID)
+ {
+     GEOSGeometry *geom;
+-    long int srid;
++    zend_long srid;
+ 
+     geom = (GEOSGeometry*)getRelay(getThis(), Geometry_ce_ptr);
+ 
+@@ -1965,7 +1966,7 @@ PHP_METHOD(Geometry, geometryN)
+     GEOSGeometry *geom;
+     const GEOSGeometry *c;
+     GEOSGeometry *cc;
+-    long int num;
++    zend_long num;
+ 
+     geom = (GEOSGeometry*)getRelay(getThis(), Geometry_ce_ptr);
+ 
+@@ -2064,7 +2065,7 @@ PHP_METHOD(Geometry, interiorRingN)
+     GEOSGeometry *geom;
+     const GEOSGeometry *c;
+     GEOSGeometry *cc;
+-    long int num;
++    zend_long num;
+ 
+     geom = (GEOSGeometry*)getRelay(getThis(), Geometry_ce_ptr);
+ 
+@@ -2162,7 +2163,7 @@ PHP_METHOD(Geometry, pointN)
+ {
+     GEOSGeometry *geom;
+     GEOSGeometry *c;
+-    long int num;
++    zend_long num;
+ 
+     geom = (GEOSGeometry*)getRelay(getThis(), Geometry_ce_ptr);
+ 
+@@ -2586,7 +2587,7 @@ PHP_METHOD(WKTWriter, setTrim)
+ PHP_METHOD(WKTWriter, setRoundingPrecision)
+ {
+     GEOSWKTWriter *writer;
+-    long int prec;
++    zend_long prec;
+ 
+     writer = (GEOSWKTWriter*)getRelay(getThis(), WKTWriter_ce_ptr);
+ 
+@@ -2607,7 +2608,7 @@ PHP_METHOD(WKTWriter, setRoundingPrecision)
+ PHP_METHOD(WKTWriter, setOutputDimension)
+ {
+     GEOSWKTWriter *writer;
+-    long int dim;
++    zend_long dim;
+ 
+     writer = (GEOSWKTWriter*)getRelay(getThis(), WKTWriter_ce_ptr);
+ 
+@@ -2752,7 +2753,7 @@ PHP_METHOD(WKBWriter, getOutputDimension)
+ PHP_METHOD(WKBWriter, setOutputDimension)
+ {
+     GEOSWKBWriter *writer;
+-    long int dim;
++    zend_long dim;
+ 
+     writer = (GEOSWKBWriter*)getRelay(getThis(), WKBWriter_ce_ptr);
+ 
+@@ -2851,7 +2852,7 @@ PHP_METHOD(WKBWriter, getByteOrder)
+ PHP_METHOD(WKBWriter, setByteOrder)
+ {
+     GEOSWKBWriter *writer;
+-    long int dim;
++    zend_long dim;
+ 
+     writer = (GEOSWKBWriter*)getRelay(getThis(), WKBWriter_ce_ptr);
+ 
+-- 
+2.25.4
+
diff --git a/dev-php/geos-php/geos-php-1.0.0.ebuild b/dev-php/geos-php/geos-php-1.0.0-r1.ebuild
index bcd0bc9fe03a..e37462a2d190 100644
--- a/dev-php/geos-php/geos-php-1.0.0.ebuild
+++ b/dev-php/geos-php/geos-php-1.0.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -6,7 +6,7 @@ PHP_EXT_NAME="geos"
 PHP_EXT_INI="yes"
 PHP_EXT_ZENDEXT="no"
 
-USE_PHP="php5-6 php7-0 php7-1 php7-2 php7-3"
+USE_PHP="php7-3 php7-4 php8-0"
 
 MY_PV="${PV/_/}"
 MY_PV="${MY_PV/rc/RC}"
@@ -22,10 +22,15 @@ HOMEPAGE="https://trac.osgeo.org/geos"
 SRC_URI="https://git.osgeo.org/gitea/geos/php-geos/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
 RDEPEND="sci-libs/geos[-php(-)]"
-DEPEND="sci-libs/geos[-php(-)] test? ( dev-php/phpunit )"
+DEPEND="sci-libs/geos[-php(-)]"
 DOCS=( README.md CREDITS NEWS TODO )
+PATCHES=( "${FILESDIR}/${PV}" )
 PHP_EXT_ECONF_ARGS=()
+
+src_prepare() {
+	# Test always fails with geos-3.8 or greater
+	rm "${S}/tests/001_Geometry.phpt" || die
+	php-ext-source-r3_src_prepare
+}
diff --git a/dev-php/igbinary/Manifest b/dev-php/igbinary/Manifest
index efeea76c2b45..99d8c023c3d9 100644
--- a/dev-php/igbinary/Manifest
+++ b/dev-php/igbinary/Manifest
@@ -1,2 +1,3 @@
 DIST igbinary-3.1.5.tar.gz 216569 BLAKE2B 3aa453fc0669c331202f38d41a80fa34332033d272a7b6e523988923d84a1e93967e4d588ac32d4a2ac3ed5d0bc832bf0380293604f67350557628ecbcded91a SHA512 af0e473673e624635cad44a6f34aa2e4d655e8f2dc3df8a9e0cf9b241ef1f53c627edb508b5bb41c7f8925c2256a4a4d0b4c083227564212cb7747a810dfc83d
 DIST igbinary-3.1.6.tar.gz 220415 BLAKE2B 62bc77d5b3ecbccb9e928e30f33a598630d3ee9f394f4e78c0978b316d4dbc29656f98773e9ff6bd6b9cd4961f4e00c6c760b1a07234849736d4e0d9e3199d5b SHA512 55f7fd1a6e2a422cf04e944c4c15126167c4aab6d4f5f1e6af8be6c345ec6ff0c25d7ea8c023062bdd4882484cede155ea7a598666e4616985873a32a0a272d1
+DIST igbinary-3.2.1.tar.gz 227265 BLAKE2B 4eda60b49a2f1e3e822a0fbff8f23cd546517a51193f0f4f2d4646f99888552aad1877f80a67f0d655e0a51771c539efe5b0d8b5c8ce7d88c8403305dc7570df SHA512 fdab404eb6ab8e64c0d3b92c1c12e796a182a90084acc78a31a31dece62075d310d298c545d149d10b188f0467108a0429ee750747e073fa7fba752162b64eb4
diff --git a/dev-php/igbinary/igbinary-3.2.1.ebuild b/dev-php/igbinary/igbinary-3.2.1.ebuild
new file mode 100644
index 000000000000..8dbeefb1a06f
--- /dev/null
+++ b/dev-php/igbinary/igbinary-3.2.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PHP_EXT_NAME="${PN}"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+DOCS=( CREDITS NEWS README.md )
+PHP_EXT_ECONF_ARGS=( --enable-${PN} )
+
+USE_PHP="php7-3 php7-4 php8-0"
+
+inherit php-ext-source-r3
+
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+DESCRIPTION="A fast drop-in replacement for the standard PHP serialize"
+HOMEPAGE="https://github.com/igbinary/igbinary"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
diff --git a/dev-php/myclabs-deepcopy/metadata.xml b/dev-php/myclabs-deepcopy/metadata.xml
index 7c702d931700..f27937689464 100644
--- a/dev-php/myclabs-deepcopy/metadata.xml
+++ b/dev-php/myclabs-deepcopy/metadata.xml
@@ -5,6 +5,7 @@
 		<email>php-bugs@gentoo.org</email>
 		<name>PHP</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">myclabs/DeepCopy</remote-id>
 	</upstream>
diff --git a/dev-php/myclabs-deepcopy/myclabs-deepcopy-1.10.2.ebuild b/dev-php/myclabs-deepcopy/myclabs-deepcopy-1.10.2.ebuild
index 24bc536d4d03..b178b2cb055d 100644
--- a/dev-php/myclabs-deepcopy/myclabs-deepcopy-1.10.2.ebuild
+++ b/dev-php/myclabs-deepcopy/myclabs-deepcopy-1.10.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/myclabs/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 BDEPEND="dev-php/theseer-Autoload"
diff --git a/dev-php/pecl-dio/Manifest b/dev-php/pecl-dio/Manifest
index ba26a871bd88..e2cd6c2e2e75 100644
--- a/dev-php/pecl-dio/Manifest
+++ b/dev-php/pecl-dio/Manifest
@@ -1,2 +1 @@
-DIST dio-0.1.0.tgz 36960 BLAKE2B 0a2c1fd6289cc9606c44c81216ce8d0f63d4bbddfae554e65499f586f5aa17f419a048e97723ff365407260740d28e36ec5dae8a45e18422a7bd900ec88b60fd SHA512 6fca1c3f2d6247f5e0c52a27b49d80a6d13f9630772956ff7aa73ad45e445686502edd956346c43955cb2f858c0c0259af86c3f92b6f93309a2b90583ad8ea05
 DIST dio-0.2.0.tgz 37328 BLAKE2B e7ad6be1a4c957c155753e834d79f51b985578a03781ddbc66f05961dc270d58b20abcc74c64a0e9744d5cfbb6e545c1a7ac2bc1d54009c74f26bf786587ef49 SHA512 172c2a2a84d348d684d84ca94f23b767952461ca848cd114e899ea3fd39503a35ac0624a2a774b9dc6fd2d463d3f6aa6937e780e2faa6a0955a8594aad27ec8b
diff --git a/dev-php/pecl-dio/pecl-dio-0.1.0-r1.ebuild b/dev-php/pecl-dio/pecl-dio-0.2.0-r1.ebuild
index 7d9f4db0e722..cb33182010a9 100644
--- a/dev-php/pecl-dio/pecl-dio-0.1.0-r1.ebuild
+++ b/dev-php/pecl-dio/pecl-dio-0.2.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -7,7 +7,7 @@ PHP_EXT_NAME="dio"
 PHP_EXT_INI="yes"
 PHP_EXT_ZENDEXT="no"
 
-USE_PHP="php5-6 php7-1 php7-2 php7-3 php7-4"
+USE_PHP="php7-3 php7-4 php8-0"
 
 MY_PV=${PV/_rc/RC}
 PHP_EXT_S="${WORKDIR}/${PN/pecl-/}-${MY_PV}"
diff --git a/dev-php/pecl-dio/pecl-dio-0.2.0.ebuild b/dev-php/pecl-dio/pecl-dio-0.2.0.ebuild
deleted file mode 100644
index 38453c8973f0..000000000000
--- a/dev-php/pecl-dio/pecl-dio-0.2.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PHP_EXT_NAME="dio"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-
-USE_PHP="php5-6 php7-1 php7-2 php7-3 php7-4"
-
-MY_PV=${PV/_rc/RC}
-PHP_EXT_S="${WORKDIR}/${PN/pecl-/}-${MY_PV}"
-
-inherit php-ext-pecl-r3
-
-KEYWORDS="~amd64 ~x86"
-
-DESCRIPTION="Direct I/O functions for PHP"
-LICENSE="PHP-3.01"
-SLOT="0"
-IUSE=""
-
-S="${PHP_EXT_S}"
diff --git a/dev-php/pecl-lzf/Manifest b/dev-php/pecl-lzf/Manifest
index 2383f03c4d77..f9ab9348d2e9 100644
--- a/dev-php/pecl-lzf/Manifest
+++ b/dev-php/pecl-lzf/Manifest
@@ -1,2 +1 @@
-DIST LZF-1.6.7.tgz 17999 BLAKE2B c7ee3049d7bcc862a400edf56e19745667052c32b2d3faaa26cb55f811e6721b7140446e676467fa5cee3ea87a751b6b0a2a9c6df203227d1bd29f31842e8514 SHA512 920a7d3bd0f0c9f1019a3180e38482ead24610a4a235d967d1f4010101e6f777a2450d517f2d3440edb45bb6a7f6d1012124b1b59aa7c34f9a17fdc93613acab
 DIST LZF-1.6.8.tgz 18071 BLAKE2B 83a12c44c02145baac75bc7b5172b09a6a15d4d02852f25d56ea97cf58a83709d59d56cb12be7df510fd687fd5ade760939527ee8151d3ecdb4407b7be2022e3 SHA512 c35543a40b2b44da4bd60e3142ba6ecf33e3460a8ea9f4f7fe6cdc4d728048593b33c423195d58707355975d655f614249642aff2d9b810af0e6a34d42fa1c43
diff --git a/dev-php/pecl-lzf/pecl-lzf-1.6.7.ebuild b/dev-php/pecl-lzf/pecl-lzf-1.6.7.ebuild
deleted file mode 100644
index 192a06e95b05..000000000000
--- a/dev-php/pecl-lzf/pecl-lzf-1.6.7.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PHP_EXT_NAME="lzf"
-PHP_EXT_PECL_PKG="LZF"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-USE_PHP="php5-6 php7-1 php7-2 php7-3 php7-4"
-
-inherit php-ext-pecl-r3
-
-KEYWORDS="~amd64 ~x86"
-
-DESCRIPTION="This package handles LZF de/compression"
-LICENSE="PHP-3"
-SLOT="0"
-IUSE=""
diff --git a/dev-php/pecl-lzf/pecl-lzf-1.6.8.ebuild b/dev-php/pecl-lzf/pecl-lzf-1.6.8-r1.ebuild
index 15525c812da6..2cce616bb3dc 100644
--- a/dev-php/pecl-lzf/pecl-lzf-1.6.8.ebuild
+++ b/dev-php/pecl-lzf/pecl-lzf-1.6.8-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,7 +7,7 @@ PHP_EXT_NAME="lzf"
 PHP_EXT_PECL_PKG="LZF"
 PHP_EXT_INI="yes"
 PHP_EXT_ZENDEXT="no"
-USE_PHP="php5-6 php7-1 php7-2 php7-3 php7-4"
+USE_PHP="php7-3 php7-4 php8-0"
 
 inherit php-ext-pecl-r3
 
diff --git a/dev-php/pecl-memcached/Manifest b/dev-php/pecl-memcached/Manifest
index 042f38e9b179..64f9f062d021 100644
--- a/dev-php/pecl-memcached/Manifest
+++ b/dev-php/pecl-memcached/Manifest
@@ -1,2 +1 @@
-DIST memcached-3.1.3.tgz 82673 BLAKE2B ccb9267cbd974337b7cd8836ab6e35c4fd9398d731dcd333bcb664b91037d1775651e6bb5d00b602767834681289064ede678ea2e6e3641631bba4990a380dee SHA512 9c09648c26011c5e749bee1a556c976e6e5e648dc65580e7caa296dab79e3764edf1408f96edcaca5efb0229320c86fcfa0422e55d486beb6466892f7e08c4a3
 DIST memcached-3.1.5.tgz 83015 BLAKE2B 80f5cbed8e34f867962792d95d242015690f64ab3b462e09813a11b8b86234b0b05b0f6a78f7c6184482b66ba8015064b37f77bbb816a3aee2edd0ce97ab0cbc SHA512 87d5fd079fcaad81139785d6766da71b23a1a0fe907d4b22f3a787af148a20412c11df11c4d98c165241658baf0d87c8a6b29de15db07a0f9d1fabc8aec8f0e9
diff --git a/dev-php/pecl-memcached/pecl-memcached-3.1.3-r1.ebuild b/dev-php/pecl-memcached/pecl-memcached-3.1.3-r1.ebuild
deleted file mode 100644
index 755ce7ed1adf..000000000000
--- a/dev-php/pecl-memcached/pecl-memcached-3.1.3-r1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PHP_EXT_NAME="memcached"
-DOCS=( ChangeLog README.markdown )
-
-USE_PHP="php5-6 php7-1 php7-2 php7-3" # Pretend to support all four targets...
-inherit php-ext-pecl-r3
-USE_PHP="php7-1 php7-2 php7-3" # But only truly build for these three.
-
-DESCRIPTION="Interface PHP with memcached via libmemcached library"
-LICENSE="PHP-3"
-SLOT="7"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="igbinary json sasl +session test"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND=">=dev-libs/libmemcached-1.0.14[sasl?]
-	sys-libs/zlib
-"
-
-RDEPEND="
-	php_targets_php7-1? (
-		${COMMON_DEPEND} dev-lang/php:7.1[session?,json?]
-		igbinary? ( dev-php/igbinary[php_targets_php7-1(-)] )
-	)
-	php_targets_php7-2? (
-		${COMMON_DEPEND} dev-lang/php:7.2[session?,json?]
-		igbinary? ( dev-php/igbinary[php_targets_php7-2(-)] )
-	)
-	php_targets_php7-3? (
-		${COMMON_DEPEND} dev-lang/php:7.3[session?,json?]
-		igbinary? ( dev-php/igbinary[php_targets_php7-3(-)] )
-	)"
-DEPEND="${RDEPEND} test? ( net-misc/memcached )"
-RDEPEND="${RDEPEND} php_targets_php5-6? ( dev-php/pecl-memcached:0[php_targets_php5-6(-)] )"
-
-src_prepare() {
-	if use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3 ; then
-		php-ext-source-r3_src_prepare
-	else
-		default_src_prepare
-	fi
-}
-
-src_configure() {
-	local PHP_EXT_ECONF_ARGS="--enable-memcached
-		$(use_enable session memcached-session)
-		$(use_enable sasl memcached-sasl)
-		$(use_enable json memcached-json)
-		$(use_enable igbinary memcached-igbinary)"
-
-	php-ext-source-r3_src_configure
-}
-
-src_test() {
-	if use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3 ; then
-		local memcached_opts=( -d -P "${T}/memcached.pid" -p 11211 -l 127.0.0.1 )
-		[[ ${EUID} == 0 ]] && memcached_opts+=( -u portage )
-		memcached "${memcached_opts[@]}" || die "Can't start memcached test server"
-
-		local exit_status
-		php-ext-source-r3_src_test
-		exit_status=$?
-
-		kill "$(<"${T}/memcached.pid")"
-		return ${exit_status}
-	fi
-}
-
-src_install() {
-	if use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3 ; then
-		php-ext-source-r3_src_install
-	fi
-}
diff --git a/dev-php/pecl-rrd/files/2.0.1/0001-arginfo.patch b/dev-php/pecl-rrd/files/2.0.1/0001-arginfo.patch
new file mode 100644
index 000000000000..28496fe19c96
--- /dev/null
+++ b/dev-php/pecl-rrd/files/2.0.1/0001-arginfo.patch
@@ -0,0 +1,81 @@
+--- a/rrd.c	2020/09/23 07:41:40	350617
++++ b/rrd.c	2020/09/23 09:09:08	350618
+@@ -552,6 +552,9 @@
+ 	ZEND_ARG_INFO(0, file)
+ 	ZEND_ARG_INFO(0, options)
+ ZEND_END_ARG_INFO()
++
++ZEND_BEGIN_ARG_INFO(arginfo_rrd_void, 0)
++ZEND_END_ARG_INFO()
+ /* }}} */
+ 
+ /* {{{ */
+@@ -559,7 +562,7 @@
+ 	PHP_FE(rrd_update, arginfo_rrd_update)
+ 	PHP_FE(rrd_create, arginfo_rrd_create)
+ 	PHP_FE(rrd_graph, arginfo_rrd_graph)
+-	PHP_FE(rrd_error, NULL)
++	PHP_FE(rrd_error, arginfo_rrd_void)
+ 	PHP_FE(rrd_fetch, arginfo_rrd_fetch)
+ 	PHP_FE(rrd_first, arginfo_rrd_first)
+ 	PHP_FE(rrd_info, arginfo_rrd_info)
+@@ -569,9 +572,9 @@
+ 	PHP_FE(rrd_tune, arginfo_rrd_tune)
+ 	PHP_FE(rrd_xport, arginfo_rrd_xport)
+ #ifdef HAVE_RRDC_DISCONNECT
+-	PHP_FE(rrdc_disconnect, NULL)
++	PHP_FE(rrdc_disconnect, arginfo_rrd_void)
+ #endif
+-	PHP_FE(rrd_version, NULL)
++	PHP_FE(rrd_version, arginfo_rrd_void)
+ 	PHP_FE_END
+ };
+ /* }}} */
+--- a/rrd_create.c	2020/09/23 07:41:40	350617
++++ b/rrd_create.c	2020/09/23 09:09:08	350618
+@@ -323,10 +323,13 @@
+ 	ZEND_ARG_INFO(0, description)
+ ZEND_END_ARG_INFO()
+ 
++ZEND_BEGIN_ARG_INFO_EX(arginfo_rrdcreator_void, 0, 0, 0)
++ZEND_END_ARG_INFO()
++
+ /* class method table */
+ static zend_function_entry rrd_create_methods[] = {
+ 	PHP_ME(RRDCreator, __construct, arginfo_rrdcreator_construct, ZEND_ACC_PUBLIC)
+-	PHP_ME(RRDCreator, save, NULL, ZEND_ACC_PUBLIC)
++	PHP_ME(RRDCreator, save, arginfo_rrdcreator_void, ZEND_ACC_PUBLIC)
+ 	PHP_ME(RRDCreator, addDataSource, arginfo_rrdcreator_description, ZEND_ACC_PUBLIC)
+ 	PHP_ME(RRDCreator, addArchive, arginfo_rrdcreator_description, ZEND_ACC_PUBLIC)
+ 	PHP_FE_END
+--- a/rrd_graph.c	2020/09/23 07:41:40	350617
++++ b/rrd_graph.c	2020/09/23 09:09:08	350618
+@@ -140,6 +140,7 @@
+ 	array_init(&zv_argv);
+ 
+ 	ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL(obj->zv_arr_options), num_key, zs_key, zv_option_val) {
++		(void)num_key; /* to avoid -Wunused-but-set-variable */
+ 		smart_string option = {0}; /* one argument option */
+ 
+ 		/* option with string key means long option, hence they are used as
+@@ -356,6 +357,9 @@
+ /* }}} */
+ 
+ /* arguments */
++ZEND_BEGIN_ARG_INFO_EX(arginfo_rrd_void, 0, 0, 0)
++ZEND_END_ARG_INFO()
++
+ ZEND_BEGIN_ARG_INFO_EX(arginfo_rrd_path, 0, 0, 1)
+ 	ZEND_ARG_INFO(0, path)
+ ZEND_END_ARG_INFO()
+@@ -367,8 +371,8 @@
+ /* class method table */
+ static zend_function_entry rrd_graph_methods[] = {
+ 	PHP_ME(RRDGraph, __construct, arginfo_rrd_path, ZEND_ACC_PUBLIC)
+-	PHP_ME(RRDGraph, save, NULL, ZEND_ACC_PUBLIC)
+-	PHP_ME(RRDGraph, saveVerbose, NULL, ZEND_ACC_PUBLIC)
++	PHP_ME(RRDGraph, save, arginfo_rrd_void, ZEND_ACC_PUBLIC)
++	PHP_ME(RRDGraph, saveVerbose, arginfo_rrd_void, ZEND_ACC_PUBLIC)
+ 	PHP_ME(RRDGraph, setOptions, arginfo_rrd_options, ZEND_ACC_PUBLIC)
+ 	PHP_FE_END
+ };
diff --git a/dev-php/pecl-rrd/files/2.0.1/0002-relax-float-test-result.patch b/dev-php/pecl-rrd/files/2.0.1/0002-relax-float-test-result.patch
new file mode 100644
index 000000000000..b4a692fc3f5f
--- /dev/null
+++ b/dev-php/pecl-rrd/files/2.0.1/0002-relax-float-test-result.patch
@@ -0,0 +1,132 @@
+--- a/tests/rrd_010.phpt	2020/09/23 07:41:40	350617
++++ b/tests/rrd_010.phpt	2020/09/23 09:09:08	350618
+@@ -40,11 +40,11 @@
+       [920805900]=>
+       float(0)
+       [920806200]=>
+-      float(0.033333333333333)
++      float(0.03333333333%s)
+       [920806500]=>
+-      float(0.033333333333333)
++      float(0.03333333333%s)
+       [920806800]=>
+-      float(0.033333333333333)
++      float(0.03333333333%s)
+       [920807100]=>
+       float(0.02)
+       [920807400]=>
+@@ -52,20 +52,20 @@
+       [920807700]=>
+       float(0.02)
+       [920808000]=>
+-      float(0.013333333333333)
++      float(0.01333333333%s)
+       [920808300]=>
+-      float(0.016666666666667)
++      float(0.01666666666%s)
+     }
+     ["speed2"]=>
+     array(13) {
+       [920804700]=>
+       float(NAN)
+       [920805000]=>
+-      float(0.056666666666667)
++      float(0.05666666666%s)
+       [920805300]=>
+       float(0.02)
+       [920805600]=>
+-      float(0.0033333333333333)
++      float(0.00333333333%s)
+       [920805900]=>
+       float(0)
+       [920806200]=>
+@@ -73,7 +73,7 @@
+       [920806500]=>
+       float(0)
+       [920806800]=>
+-      float(0.066666666666667)
++      float(0.06666666666%s)
+       [920807100]=>
+       float(0.02)
+       [920807400]=>
+@@ -81,9 +81,9 @@
+       [920807700]=>
+       float(0.02)
+       [920808000]=>
+-      float(0.013333333333333)
++      float(0.01333333333%s)
+       [920808300]=>
+-      float(0.016666666666667)
++      float(0.01666666666%s)
+     }
+   }
+-}
+\ No newline at end of file
++}
+--- a/tests/rrd_012.phpt	2020/09/23 07:41:40	350617
++++ b/tests/rrd_012.phpt	2020/09/23 09:09:08	350618
+@@ -69,7 +69,7 @@
+   ["rra[1].xff"]=>
+   float(0.5)
+   ["rra[1].cdp_prep[0].value"]=>
+-  float(0.026666666666667)
++  float(0.02666666666%s)
+   ["rra[1].cdp_prep[0].unknown_datapoints"]=>
+   int(0)
+ }
+--- a/tests/rrd_017.phpt	2020/09/23 07:41:40	350617
++++ b/tests/rrd_017.phpt	2020/09/23 09:09:08	350618
+@@ -47,11 +47,11 @@
+         [920805900]=>
+         float(0)
+         [920806200]=>
+-        float(0.033333333333333)
++        float(0.0333333333%s)
+         [920806500]=>
+-        float(0.033333333333333)
++        float(0.0333333333%s)
+         [920806800]=>
+-        float(0.033333333333333)
++        float(0.0333333333%s)
+         [920807100]=>
+         float(0.02)
+         [920807400]=>
+@@ -59,9 +59,9 @@
+         [920807700]=>
+         float(0.02)
+         [920808000]=>
+-        float(0.013333333333333)
++        float(0.0133333333%s)
+         [920808300]=>
+-        float(0.016666666666667)
++        float(0.0166666666%s)
+       }
+     }
+     [1]=>
+@@ -81,11 +81,11 @@
+         [920805900]=>
+         float(0)
+         [920806200]=>
+-        float(33.333333333333)
++        float(33.333333333%s)
+         [920806500]=>
+-        float(33.333333333333)
++        float(33.333333333%s)
+         [920806800]=>
+-        float(33.333333333333)
++        float(33.333333333%s)
+         [920807100]=>
+         float(20)
+         [920807400]=>
+@@ -93,9 +93,9 @@
+         [920807700]=>
+         float(20)
+         [920808000]=>
+-        float(13.333333333333)
++        float(13.333333333%s)
+         [920808300]=>
+-        float(16.666666666667)
++        float(16.666666666%s)
+       }
+     }
+   }
diff --git a/dev-php/pecl-rrd/pecl-rrd-2.0.1-r3.ebuild b/dev-php/pecl-rrd/pecl-rrd-2.0.1-r3.ebuild
deleted file mode 100644
index 16e4bc484026..000000000000
--- a/dev-php/pecl-rrd/pecl-rrd-2.0.1-r3.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-# Define 5.6 here to have the {I,REQUIRED_}USE generated
-USE_PHP="php5-6 php7-1 php7-2 php7-3 php7-4"
-
-inherit php-ext-pecl-r3
-
-# But we really only build 7.0
-USE_PHP="php7-1 php7-2 php7-3 php7-4"
-
-DESCRIPTION="RRDtool bindings for PHP"
-LICENSE="BSD"
-SLOT="7"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="
-	php_targets_php7-1? ( net-analyzer/rrdtool[graph] )
-	php_targets_php7-2? ( net-analyzer/rrdtool[graph] )
-	php_targets_php7-3? ( net-analyzer/rrdtool[graph] )
-	php_targets_php7-4? ( net-analyzer/rrdtool[graph] )
-"
-RDEPEND="${DEPEND} php_targets_php5-6? ( ${CATEGORY}/${PN}:0 )"
-
-src_prepare() {
-	if use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3 || use php_targets_php7-4 ; then
-		php-ext-source-r3_src_prepare
-	else
-		default
-	fi
-}
-
-src_configure() {
-	if use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3 || use php_targets_php7-3 || use php_targets_php7-4 ; then
-		local PHP_EXT_ECONF_ARGS=()
-		php-ext-source-r3_src_configure
-	fi
-}
-
-src_install() {
-	if use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3 || use php_targets_php7-3 || use php_targets_php7-4 ; then
-		php-ext-pecl-r3_src_install
-	fi
-}
-
-src_test() {
-	local slot
-	if use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3 || use php_targets_php7-3 || use php_targets_php7-4 ; then
-		for slot in $(php_get_slots); do
-			php_init_slot_env "${slot}"
-			# Prepare test data
-			emake -C tests/data all
-			NO_INTERACTION="yes" emake test
-		done
-	fi
-}
diff --git a/dev-php/pecl-rrd/pecl-rrd-2.0.1-r4.ebuild b/dev-php/pecl-rrd/pecl-rrd-2.0.1-r4.ebuild
new file mode 100644
index 000000000000..7652ef702136
--- /dev/null
+++ b/dev-php/pecl-rrd/pecl-rrd-2.0.1-r4.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+USE_PHP="php7-3 php7-4 php8-0"
+
+inherit php-ext-pecl-r3
+
+DESCRIPTION="RRDtool bindings for PHP"
+LICENSE="BSD"
+SLOT="7"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="net-analyzer/rrdtool[graph(-)]"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${PV}" )
+PHP_EXT_ECONF_ARGS=()
+
+src_test() {
+	local slot
+	for slot in $(php_get_slots); do
+		php_init_slot_env "${slot}"
+		# Prepare test data
+		emake -C tests/data all
+		NO_INTERACTION="yes" emake test
+	done
+}
diff --git a/dev-php/pecl-ssh2/pecl-ssh2-9999.ebuild b/dev-php/pecl-ssh2/pecl-ssh2-9999.ebuild
index bbaca4c60d00..3d6ba5b1e14c 100644
--- a/dev-php/pecl-ssh2/pecl-ssh2-9999.ebuild
+++ b/dev-php/pecl-ssh2/pecl-ssh2-9999.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
 PHP_EXT_NAME="ssh2"
 
-USE_PHP="php7-2 php7-3 php7-4"
+USE_PHP="php7-3 php7-4 php8-0"
 EGIT_REPO_URI="https://git.php.net/repository/pecl/networking/ssh2.git"
 
 inherit php-ext-source-r3 git-r3
diff --git a/dev-php/pecl-timezonedb/Manifest b/dev-php/pecl-timezonedb/Manifest
index f02e197d9ef6..b3702618eb5d 100644
--- a/dev-php/pecl-timezonedb/Manifest
+++ b/dev-php/pecl-timezonedb/Manifest
@@ -1,3 +1 @@
-DIST timezonedb-2019.3.tgz 413166 BLAKE2B 99542a2c0dc50d96316dc14b22c8a2404db07a88d3f46050a954f10bfb501cd81fb7161805a91336075d607ac106208285e6d2281a9ed68b344fd4837fabcb49 SHA512 8342a0ed83a52ade0415430751d4efeaa84fb72e7da3aec8921338e9dfbf37ff1f098f6b6e1ed9c8f1c9c62017a0fe9c14f86a53be72f8b9f1ec137fa45d057d
-DIST timezonedb-2020.1.tgz 413993 BLAKE2B 1f598269060c7f228d103549ac31429df3e31e68961fb41182101400c9f71ea8503cb11943732b49b749aa055e7eedfb4fd06e11cc11c1381bc69f294c3433b6 SHA512 31c38d5b25db921ec5be924ac85d9cf9dd2180c4e2d50e074a143dfdf9415a8c7579e96f7a768b305554bf1cb332b46f2c652fda7d2f1638502b995fc0679ca5
 DIST timezonedb-2020.4.tgz 414667 BLAKE2B 1a219a090ae33a9f3eef76ab52e2bafd453a1f1161bbeeb53ee995d090f3fdd03c7a658a93ade72e3e1ae61df9d646eaef85dd4cacb5cea45c00adcfac8d6651 SHA512 d5c41c76b4b0b033464a4f086072d061504fc439c910c47a7077a0586b308cc37a4202ff9f418a39cee63534d55136d15a173bb94923160c0fa16bb33ac89a09
diff --git a/dev-php/pecl-timezonedb/pecl-timezonedb-2019.3.ebuild b/dev-php/pecl-timezonedb/pecl-timezonedb-2019.3.ebuild
deleted file mode 100644
index ce13c87b5e74..000000000000
--- a/dev-php/pecl-timezonedb/pecl-timezonedb-2019.3.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PHP_EXT_NAME="timezonedb"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-
-USE_PHP="php5-6 php7-1 php7-2 php7-3 php7-4"
-
-inherit php-ext-pecl-r3
-
-DESCRIPTION="Timezone Database to be used with PHP's date and time functions"
-LICENSE="PHP-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE=""
-PHP_EXT_ECONF_ARGS=""
diff --git a/dev-php/pecl-timezonedb/pecl-timezonedb-2020.1.ebuild b/dev-php/pecl-timezonedb/pecl-timezonedb-2020.1.ebuild
deleted file mode 100644
index ce13c87b5e74..000000000000
--- a/dev-php/pecl-timezonedb/pecl-timezonedb-2020.1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PHP_EXT_NAME="timezonedb"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-
-USE_PHP="php5-6 php7-1 php7-2 php7-3 php7-4"
-
-inherit php-ext-pecl-r3
-
-DESCRIPTION="Timezone Database to be used with PHP's date and time functions"
-LICENSE="PHP-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE=""
-PHP_EXT_ECONF_ARGS=""
diff --git a/dev-php/pecl-yaml/Manifest b/dev-php/pecl-yaml/Manifest
index cb30afe67361..246e3c9e72ce 100644
--- a/dev-php/pecl-yaml/Manifest
+++ b/dev-php/pecl-yaml/Manifest
@@ -1 +1,2 @@
 DIST yaml-2.2.0.tgz 40716 BLAKE2B ef8e4082cf7aa3c6996d878f04b57438fc5fa4eb6672617685b3fd3ba535581329e8bb8d6b0644b97b2d64e951aea2d46d4e702acf02ac283d8e2b43fc82acba SHA512 3af6a0f2bcbab7d0ea21b81c2914a8c65393156b5a974448645ca079edbd616b5f46564e5f55a83d556f8e3fc38573a869f79c9eb3c2449e1c3d410ae32a6fb5
+DIST yaml-2.2.1.tgz 40977 BLAKE2B 110f77058ac2b1c26dcfb7df024bb37ee58c902fc2fe6ff1ba14d981a17591d6cfda157c79d8d991e8edda95818978b83a98ba7b873367788a64f6c1abd78196 SHA512 b171ca9ca108dc093fb0dda3bc9de821fdd8ddcf79d386baba02f367e331f42e6500f26e73577864cd5f8d12f8c9bfe01962fb8d1bb56fa26d6f0a1208ac5441
diff --git a/dev-php/pecl-yaml/pecl-yaml-2.2.1.ebuild b/dev-php/pecl-yaml/pecl-yaml-2.2.1.ebuild
new file mode 100644
index 000000000000..f05593acf494
--- /dev/null
+++ b/dev-php/pecl-yaml/pecl-yaml-2.2.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PV="${PV/_rc/RC}"
+PHP_EXT_PECL_FILENAME="yaml-${MY_PV}.tgz"
+PHP_EXT_NAME="yaml"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+DOCS=( CREDITS README )
+
+USE_PHP="php7-3 php7-4 php8-0"
+
+inherit php-ext-pecl-r3
+
+S="${WORKDIR}/yaml-${MY_PV}"
+PHP_EXT_S="${S}"
+
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+DESCRIPTION="YAML 1.1 (YAML Ain't Markup Language) serialization for PHP"
+LICENSE="MIT"
+SLOT="7"
+IUSE=""
+
+DEPEND=">=dev-libs/libyaml-0.1.0"
+RDEPEND="${DEPEND}"
+PHP_EXT_ECONF_ARGS=()
diff --git a/dev-php/pecl-yaz/files/1.2.3/0001-arginfo_php8-support.patch b/dev-php/pecl-yaz/files/1.2.3/0001-arginfo_php8-support.patch
new file mode 100644
index 000000000000..8cc9929f06c3
--- /dev/null
+++ b/dev-php/pecl-yaz/files/1.2.3/0001-arginfo_php8-support.patch
@@ -0,0 +1,245 @@
+From e629fb640e11f2358c04fe72d50afbd0a004596c Mon Sep 17 00:00:00 2001
+From: Remi Collet <remi@remirepo.net>
+Date: Wed, 23 Sep 2020 16:44:57 +0200
+Subject: [PATCH] add arginfo for all functions - drop support for PHP 4.x -
+ add compatibility with PHP 8
+
+---
+ .gitignore  |   2 +
+ package.xml |   2 +-
+ php_yaz.c   | 209 +++++++++++++++++++++++++++++++++++++++-------------
+ 3 files changed, 162 insertions(+), 51 deletions(-)
+
+diff --git a/php_yaz.c b/php_yaz.c
+index e157815..64b5079 100644
+--- a/php_yaz.c
++++ b/php_yaz.c
+@@ -18,6 +18,12 @@
+ 
+ #include "php_yaz.h"
+ 
++/* for PHP 8+ */
++#ifndef TSRMLS_CC
++#define TSRMLS_CC
++#define TSRMLS_DC
++#endif
++
+ #ifndef YAZ_VERSIONL
+ #error YAZ version 3.0.2 or later must be used.
+ #elif YAZ_VERSIONL < 0x030020
+@@ -138,62 +144,165 @@ static int le_link;
+ ZEND_GET_MODULE(yaz)
+ #endif
+ 
+-#ifdef ZEND_BEGIN_ARG_INFO
+-    ZEND_BEGIN_ARG_INFO(first_argument_force_ref, 0)
+-        ZEND_ARG_PASS_INFO(1)
+-    ZEND_END_ARG_INFO();
++ZEND_BEGIN_ARG_INFO_EX(arginfo_yaz_connect, 0, 0, 1)
++    ZEND_ARG_INFO(0, url)
++    ZEND_ARG_INFO(0, options)
++ZEND_END_ARG_INFO();
+ 
+-    ZEND_BEGIN_ARG_INFO(second_argument_force_ref, 0)
+-        ZEND_ARG_PASS_INFO(0)
+-        ZEND_ARG_PASS_INFO(1)
+-    ZEND_END_ARG_INFO();
+-
+-    ZEND_BEGIN_ARG_INFO(third_argument_force_ref, 0)
+-        ZEND_ARG_PASS_INFO(0)
+-        ZEND_ARG_PASS_INFO(0)
+-        ZEND_ARG_PASS_INFO(1)
+-    ZEND_END_ARG_INFO();
+-#else
+-static unsigned char first_argument_force_ref[] = {
+-        1, BYREF_FORCE };
+-static unsigned char second_argument_force_ref[] = {
+-        2, BYREF_NONE, BYREF_FORCE };
+-static unsigned char third_argument_force_ref[] = {
+-        3, BYREF_NONE, BYREF_NONE, BYREF_FORCE };
+-#endif
++ZEND_BEGIN_ARG_INFO_EX(arginfo_yaz_close, 0, 0, 1)
++    ZEND_ARG_INFO(0, id)
++ZEND_END_ARG_INFO();
++
++#define arginfo_yaz_present       arginfo_yaz_close
++
++#define arginfo_yaz_errno         arginfo_yaz_close
++
++#define arginfo_yaz_error         arginfo_yaz_close
++
++#define arginfo_yaz_addinfo       arginfo_yaz_close
++
++#define arginfo_yaz_es_result     arginfo_yaz_close
++
++ZEND_BEGIN_ARG_INFO_EX(arginfo_yaz_search, 0, 0, 3)
++    ZEND_ARG_INFO(0, id)
++    ZEND_ARG_INFO(0, type)
++    ZEND_ARG_INFO(0, query)
++ZEND_END_ARG_INFO();
++
++ZEND_BEGIN_ARG_INFO_EX(arginfo_yaz_wait, 0, 0, 0)
++    ZEND_ARG_INFO(1, options)
++ZEND_END_ARG_INFO();
++
++ZEND_BEGIN_ARG_INFO_EX(arginfo_yaz_hits, 0, 0, 1)
++    ZEND_ARG_INFO(0, id)
++    ZEND_ARG_INFO(1, searchresult)
++    ZEND_ARG_INFO(0, query)
++ZEND_END_ARG_INFO();
++
++ZEND_BEGIN_ARG_INFO_EX(arginfo_yaz_record, 0, 0, 3)
++    ZEND_ARG_INFO(0, id)
++    ZEND_ARG_INFO(0, pos)
++    ZEND_ARG_INFO(0, type)
++ZEND_END_ARG_INFO();
++
++ZEND_BEGIN_ARG_INFO_EX(arginfo_yaz_syntax, 0, 0, 2)
++    ZEND_ARG_INFO(0, id)
++    ZEND_ARG_INFO(0, syntax)
++ZEND_END_ARG_INFO();
++
++ZEND_BEGIN_ARG_INFO_EX(arginfo_yaz_element, 0, 0, 2)
++    ZEND_ARG_INFO(0, id)
++    ZEND_ARG_INFO(0, elementsetname)
++ZEND_END_ARG_INFO();
++
++ZEND_BEGIN_ARG_INFO_EX(arginfo_yaz_schema, 0, 0, 2)
++    ZEND_ARG_INFO(0, id)
++    ZEND_ARG_INFO(0, schema)
++ZEND_END_ARG_INFO();
++
++ZEND_BEGIN_ARG_INFO_EX(arginfo_yaz_set_option, 0, 0, 2)
++    ZEND_ARG_INFO(0, id)
++    ZEND_ARG_INFO(0, options_or_name)
++    ZEND_ARG_INFO(0, value)
++ZEND_END_ARG_INFO();
++
++ZEND_BEGIN_ARG_INFO_EX(arginfo_yaz_get_option, 0, 0, 2)
++    ZEND_ARG_INFO(0, id)
++    ZEND_ARG_INFO(0, name)
++ZEND_END_ARG_INFO();
++
++ZEND_BEGIN_ARG_INFO_EX(arginfo_yaz_range, 0, 0, 3)
++    ZEND_ARG_INFO(0, id)
++    ZEND_ARG_INFO(0, start)
++    ZEND_ARG_INFO(0, number)
++ZEND_END_ARG_INFO();
++
++ZEND_BEGIN_ARG_INFO_EX(arginfo_yaz_sort, 0, 0, 2)
++    ZEND_ARG_INFO(0, id)
++    ZEND_ARG_INFO(0, sortspec)
++ZEND_END_ARG_INFO();
++
++ZEND_BEGIN_ARG_INFO_EX(arginfo_yaz_itemorder, 0, 0, 2)
++    ZEND_ARG_INFO(0, id)
++    ZEND_ARG_INFO(0, package)
++ZEND_END_ARG_INFO();
++
++#define arginfo_yaz_ccl_conf      arginfo_yaz_itemorder
++
++#define arginfo_yaz_cql_conf      arginfo_yaz_itemorder
++
++ZEND_BEGIN_ARG_INFO_EX(arginfo_yaz_es, 0, 0, 3)
++    ZEND_ARG_INFO(0, id)
++    ZEND_ARG_INFO(0, type)
++    ZEND_ARG_INFO(0, package)
++ZEND_END_ARG_INFO();
++
++ZEND_BEGIN_ARG_INFO_EX(arginfo_yaz_scan, 0, 0, 3)
++    ZEND_ARG_INFO(0, id)
++    ZEND_ARG_INFO(0, type)
++    ZEND_ARG_INFO(0, query)
++    ZEND_ARG_INFO(0, flags)
++ZEND_END_ARG_INFO();
++
++ZEND_BEGIN_ARG_INFO_EX(arginfo_yaz_scan_result, 0, 0, 2)
++    ZEND_ARG_INFO(0, id)
++    ZEND_ARG_INFO(1, options)
++ZEND_END_ARG_INFO();
++
++ZEND_BEGIN_ARG_INFO_EX(arginfo_yaz_ccl_parse, 0, 0, 3)
++    ZEND_ARG_INFO(0, id)
++    ZEND_ARG_INFO(0, query)
++    ZEND_ARG_INFO(1, result)
++ZEND_END_ARG_INFO();
++
++ZEND_BEGIN_ARG_INFO_EX(arginfo_yaz_cql_parse, 0, 0, 4)
++    ZEND_ARG_INFO(0, id)
++    ZEND_ARG_INFO(0, cql)
++    ZEND_ARG_INFO(1, result)
++    ZEND_ARG_INFO(0, rev)
++ZEND_END_ARG_INFO();
++
++ZEND_BEGIN_ARG_INFO_EX(arginfo_databases, 0, 0, 2)
++    ZEND_ARG_INFO(0, id)
++    ZEND_ARG_INFO(0, package)
++ZEND_END_ARG_INFO();
+ 
+ 
+ zend_function_entry yaz_functions [] = {
+-	PHP_FE(yaz_connect, NULL)
+-	PHP_FE(yaz_close, NULL)
+-	PHP_FE(yaz_search, NULL)
+-	PHP_FE(yaz_wait, first_argument_force_ref)
+-	PHP_FE(yaz_errno, NULL)
+-	PHP_FE(yaz_error, NULL)
+-	PHP_FE(yaz_addinfo, NULL)
+-	PHP_FE(yaz_hits, second_argument_force_ref)
+-	PHP_FE(yaz_record, NULL)
+-	PHP_FE(yaz_syntax, NULL)
+-	PHP_FE(yaz_element, NULL)
+-	PHP_FE(yaz_range, NULL)
+-	PHP_FE(yaz_itemorder, NULL)
+-	PHP_FE(yaz_es_result, NULL)
+-	PHP_FE(yaz_scan, NULL)
+-	PHP_FE(yaz_scan_result, second_argument_force_ref)
+-	PHP_FE(yaz_present, NULL)
+-	PHP_FE(yaz_ccl_conf, NULL)
+-	PHP_FE(yaz_ccl_parse, third_argument_force_ref)
++	PHP_FE(yaz_connect, arginfo_yaz_connect)
++	PHP_FE(yaz_close, arginfo_yaz_close)
++	PHP_FE(yaz_search, arginfo_yaz_search)
++	PHP_FE(yaz_wait, arginfo_yaz_wait)
++	PHP_FE(yaz_errno, arginfo_yaz_errno)
++	PHP_FE(yaz_error, arginfo_yaz_error)
++	PHP_FE(yaz_addinfo, arginfo_yaz_addinfo)
++	PHP_FE(yaz_hits, arginfo_yaz_hits)
++	PHP_FE(yaz_record, arginfo_yaz_record)
++	PHP_FE(yaz_syntax, arginfo_yaz_syntax)
++	PHP_FE(yaz_element, arginfo_yaz_element)
++	PHP_FE(yaz_range, arginfo_yaz_range)
++	PHP_FE(yaz_itemorder, arginfo_yaz_itemorder)
++	PHP_FE(yaz_es_result, arginfo_yaz_es_result)
++	PHP_FE(yaz_scan, arginfo_yaz_scan)
++	PHP_FE(yaz_scan_result, arginfo_yaz_scan_result)
++	PHP_FE(yaz_present, arginfo_yaz_present)
++	PHP_FE(yaz_ccl_conf, arginfo_yaz_ccl_conf)
++	PHP_FE(yaz_ccl_parse, arginfo_yaz_ccl_parse)
+ #if YAZ_VERSIONL >= 0x050100
+-	PHP_FE(yaz_cql_parse, third_argument_force_ref)
+-	PHP_FE(yaz_cql_conf, NULL)
+-#endif
+-	PHP_FE(yaz_database, NULL)
+-	PHP_FE(yaz_sort, NULL)
+-	PHP_FE(yaz_schema, NULL)
+-	PHP_FE(yaz_set_option, NULL)
+-	PHP_FE(yaz_get_option, NULL)
+-	PHP_FE(yaz_es, NULL)
++	PHP_FE(yaz_cql_parse, arginfo_yaz_cql_parse)
++	PHP_FE(yaz_cql_conf, arginfo_yaz_cql_conf)
++#endif
++	PHP_FE(yaz_database, arginfo_databases)
++	PHP_FE(yaz_sort, arginfo_yaz_sort)
++	PHP_FE(yaz_schema, arginfo_yaz_schema)
++	PHP_FE(yaz_set_option, arginfo_yaz_set_option)
++	PHP_FE(yaz_get_option, arginfo_yaz_get_option)
++	PHP_FE(yaz_es, arginfo_yaz_es)
++#ifdef PHP_FE_END
++	PHP_FE_END
++#else
+ 	{NULL, NULL, NULL}
++#endif
+ };
+ 
+ static void get_assoc(INTERNAL_FUNCTION_PARAMETERS, zval *id, Yaz_Association *assocp)
diff --git a/dev-php/pecl-yaz/files/1.2.3/0002-arginfo-fixes.patch b/dev-php/pecl-yaz/files/1.2.3/0002-arginfo-fixes.patch
new file mode 100644
index 000000000000..53cde0a92769
--- /dev/null
+++ b/dev-php/pecl-yaz/files/1.2.3/0002-arginfo-fixes.patch
@@ -0,0 +1,39 @@
+From 323962299bae3b2085dde44790785a39878f5f9a Mon Sep 17 00:00:00 2001
+From: Adam Dickmeiss <adam@indexdata.dk>
+Date: Thu, 24 Sep 2020 19:45:58 +0200
+Subject: [PATCH] Fixes for arg info
+
+---
+ php_yaz.c | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/php_yaz.c b/php_yaz.c
+index 64b5079..de9693d 100644
+--- a/php_yaz.c
++++ b/php_yaz.c
+@@ -176,7 +176,6 @@ ZEND_END_ARG_INFO();
+ ZEND_BEGIN_ARG_INFO_EX(arginfo_yaz_hits, 0, 0, 1)
+     ZEND_ARG_INFO(0, id)
+     ZEND_ARG_INFO(1, searchresult)
+-    ZEND_ARG_INFO(0, query)
+ ZEND_END_ARG_INFO();
+ 
+ ZEND_BEGIN_ARG_INFO_EX(arginfo_yaz_record, 0, 0, 3)
+@@ -244,7 +243,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_yaz_scan, 0, 0, 3)
+     ZEND_ARG_INFO(0, flags)
+ ZEND_END_ARG_INFO();
+ 
+-ZEND_BEGIN_ARG_INFO_EX(arginfo_yaz_scan_result, 0, 0, 2)
++ZEND_BEGIN_ARG_INFO_EX(arginfo_yaz_scan_result, 0, 0, 1)
+     ZEND_ARG_INFO(0, id)
+     ZEND_ARG_INFO(1, options)
+ ZEND_END_ARG_INFO();
+@@ -264,7 +263,7 @@ ZEND_END_ARG_INFO();
+ 
+ ZEND_BEGIN_ARG_INFO_EX(arginfo_databases, 0, 0, 2)
+     ZEND_ARG_INFO(0, id)
+-    ZEND_ARG_INFO(0, package)
++    ZEND_ARG_INFO(0, databases)
+ ZEND_END_ARG_INFO();
+ 
+ 
diff --git a/dev-php/pecl-yaz/pecl-yaz-1.2.3-r1.ebuild b/dev-php/pecl-yaz/pecl-yaz-1.2.3-r1.ebuild
new file mode 100644
index 000000000000..1b66eaf384cc
--- /dev/null
+++ b/dev-php/pecl-yaz/pecl-yaz-1.2.3-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PHP_EXT_NAME="yaz"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+DOCS=( README )
+
+USE_PHP="php7-3 php7-4 php8-0"
+
+inherit php-ext-pecl-r3
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+DESCRIPTION="This extension implements a Z39.50 client for PHP using the YAZ toolkit"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+DEPEND=">=dev-libs/yaz-3.0.2:0="
+RDEPEND="${DEPEND}"
+
+# Needs network access
+RESTRICT="test"
+
+PHP_EXT_ECONF_ARGS="--with-yaz=/usr"
+
+PATCHES=( "${FILESDIR}/${PV}" )
diff --git a/dev-php/phar-io-manifest/metadata.xml b/dev-php/phar-io-manifest/metadata.xml
index d1e021e81a4b..5be0cf1503ba 100644
--- a/dev-php/phar-io-manifest/metadata.xml
+++ b/dev-php/phar-io-manifest/metadata.xml
@@ -5,6 +5,7 @@
 		<email>php-bugs@gentoo.org</email>
 		<name>PHP</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">phar-io/manifest</remote-id>
 	</upstream>
diff --git a/dev-php/phar-io-manifest/phar-io-manifest-1.0.3.ebuild b/dev-php/phar-io-manifest/phar-io-manifest-1.0.3.ebuild
index 53576524a259..22306e0b6d74 100644
--- a/dev-php/phar-io-manifest/phar-io-manifest-1.0.3.ebuild
+++ b/dev-php/phar-io-manifest/phar-io-manifest-1.0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/phar-io/manifest/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE="examples"
 
 S="${WORKDIR}/manifest-${PV}"
diff --git a/dev-php/phar-io-version/metadata.xml b/dev-php/phar-io-version/metadata.xml
index 74de25f61166..1e40b396714a 100644
--- a/dev-php/phar-io-version/metadata.xml
+++ b/dev-php/phar-io-version/metadata.xml
@@ -5,6 +5,7 @@
 		<email>php-bugs@gentoo.org</email>
 		<name>PHP</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">phar-io/version</remote-id>
 	</upstream>
diff --git a/dev-php/phar-io-version/phar-io-version-2.0.1.ebuild b/dev-php/phar-io-version/phar-io-version-2.0.1.ebuild
index 1ddbd002159e..122d7410f89f 100644
--- a/dev-php/phar-io-version/phar-io-version-2.0.1.ebuild
+++ b/dev-php/phar-io-version/phar-io-version-2.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/phar-io/version/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 S="${WORKDIR}/version-${PV}"
diff --git a/dev-php/phpspec-prophecy/metadata.xml b/dev-php/phpspec-prophecy/metadata.xml
index a3ac3af013bf..58eb64758b8b 100644
--- a/dev-php/phpspec-prophecy/metadata.xml
+++ b/dev-php/phpspec-prophecy/metadata.xml
@@ -5,6 +5,7 @@
 		<email>php-bugs@gentoo.org</email>
 		<name>PHP</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">phpspec/prophecy</remote-id>
 	</upstream>
diff --git a/dev-php/phpspec-prophecy/phpspec-prophecy-1.10.3-r1.ebuild b/dev-php/phpspec-prophecy/phpspec-prophecy-1.10.3-r1.ebuild
index 3dad3fd76a4c..0b396d498f72 100644
--- a/dev-php/phpspec-prophecy/phpspec-prophecy-1.10.3-r1.ebuild
+++ b/dev-php/phpspec-prophecy/phpspec-prophecy-1.10.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/${MY_VENDOR}/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 S="${WORKDIR}/prophecy-${PV}"
diff --git a/dev-php/phpunit/metadata.xml b/dev-php/phpunit/metadata.xml
index fdfc45e18015..9424a4546bcb 100644
--- a/dev-php/phpunit/metadata.xml
+++ b/dev-php/phpunit/metadata.xml
@@ -5,6 +5,7 @@
 		<email>php-bugs@gentoo.org</email>
 		<name>PHP</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">sebastianbergmann/phpunit</remote-id>
 	</upstream>
diff --git a/dev-php/phpunit/phpunit-8.5.11.ebuild b/dev-php/phpunit/phpunit-8.5.11.ebuild
index 27257dd7656d..5d87e3517972 100644
--- a/dev-php/phpunit/phpunit-8.5.11.ebuild
+++ b/dev-php/phpunit/phpunit-8.5.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/sebastianbergmann/${PN}/archive/${PV}.tar.gz -> ${P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 
 BDEPEND="dev-php/theseer-Autoload"
 
@@ -36,7 +36,9 @@ RDEPEND="dev-php/fedora-autoloader
 		dev-lang/php:7.4[cli(-),json(-),unicode(-),xml(-),xmlwriter(-)]
 		dev-lang/php:7.3[cli(-),json(-),unicode(-),xml(-),xmlwriter(-)]
 		dev-lang/php:7.2[cli(-),json(-),unicode(-),xml(-),xmlwriter(-)]
-	)"
+	)
+	!dev-php/phpunit-mock-objects
+"
 
 src_prepare() {
 	default
diff --git a/dev-php/sebastian-comparator/metadata.xml b/dev-php/sebastian-comparator/metadata.xml
index 3bf47ef60938..341e0a838a5c 100644
--- a/dev-php/sebastian-comparator/metadata.xml
+++ b/dev-php/sebastian-comparator/metadata.xml
@@ -5,8 +5,9 @@
 		<email>php-bugs@gentoo.org</email>
 		<name>PHP</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
-		<remote-id type="github">sebastianbergmann/</remote-id>
+		<remote-id type="github">sebastianbergmann/comparator</remote-id>
 	</upstream>
 	<origin>gentoo-staging</origin>
 </pkgmetadata>
diff --git a/dev-php/sebastian-comparator/sebastian-comparator-3.0.2.ebuild b/dev-php/sebastian-comparator/sebastian-comparator-3.0.2.ebuild
index 6a72c10c4c37..1967df759685 100644
--- a/dev-php/sebastian-comparator/sebastian-comparator-3.0.2.ebuild
+++ b/dev-php/sebastian-comparator/sebastian-comparator-3.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> $
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-php/sebastian-diff/metadata.xml b/dev-php/sebastian-diff/metadata.xml
index 6d3d4fdf3087..d59503672107 100644
--- a/dev-php/sebastian-diff/metadata.xml
+++ b/dev-php/sebastian-diff/metadata.xml
@@ -5,6 +5,7 @@
 		<email>php-bugs@gentoo.org</email>
 		<name>PHP</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">sebastianbergmann/diff</remote-id>
 	</upstream>
diff --git a/dev-php/sebastian-diff/sebastian-diff-3.0.2.ebuild b/dev-php/sebastian-diff/sebastian-diff-3.0.2.ebuild
index 50d48dc717ed..5fa9f76c31c8 100644
--- a/dev-php/sebastian-diff/sebastian-diff-3.0.2.ebuild
+++ b/dev-php/sebastian-diff/sebastian-diff-3.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> $
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-php/sebastian-environment/metadata.xml b/dev-php/sebastian-environment/metadata.xml
index 3bf47ef60938..548fa55cacd0 100644
--- a/dev-php/sebastian-environment/metadata.xml
+++ b/dev-php/sebastian-environment/metadata.xml
@@ -5,8 +5,9 @@
 		<email>php-bugs@gentoo.org</email>
 		<name>PHP</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
-		<remote-id type="github">sebastianbergmann/</remote-id>
+		<remote-id type="github">sebastianbergmann/environment</remote-id>
 	</upstream>
 	<origin>gentoo-staging</origin>
 </pkgmetadata>
diff --git a/dev-php/sebastian-environment/sebastian-environment-4.2.3.ebuild b/dev-php/sebastian-environment/sebastian-environment-4.2.3.ebuild
index e9350c665068..3813f97d805c 100644
--- a/dev-php/sebastian-environment/sebastian-environment-4.2.3.ebuild
+++ b/dev-php/sebastian-environment/sebastian-environment-4.2.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> $
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-php/sebastian-exporter/metadata.xml b/dev-php/sebastian-exporter/metadata.xml
index 3bf47ef60938..1eef817a9012 100644
--- a/dev-php/sebastian-exporter/metadata.xml
+++ b/dev-php/sebastian-exporter/metadata.xml
@@ -5,8 +5,9 @@
 		<email>php-bugs@gentoo.org</email>
 		<name>PHP</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
-		<remote-id type="github">sebastianbergmann/</remote-id>
+		<remote-id type="github">sebastianbergmann/exporter</remote-id>
 	</upstream>
 	<origin>gentoo-staging</origin>
 </pkgmetadata>
diff --git a/dev-php/sebastian-exporter/sebastian-exporter-3.1.2.ebuild b/dev-php/sebastian-exporter/sebastian-exporter-3.1.2.ebuild
index 05fd48dc1ca7..7de2b3bc07d0 100644
--- a/dev-php/sebastian-exporter/sebastian-exporter-3.1.2.ebuild
+++ b/dev-php/sebastian-exporter/sebastian-exporter-3.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> $
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-php/sebastian-global-state/metadata.xml b/dev-php/sebastian-global-state/metadata.xml
index 3bf47ef60938..6c1a8481eb93 100644
--- a/dev-php/sebastian-global-state/metadata.xml
+++ b/dev-php/sebastian-global-state/metadata.xml
@@ -5,8 +5,9 @@
 		<email>php-bugs@gentoo.org</email>
 		<name>PHP</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
-		<remote-id type="github">sebastianbergmann/</remote-id>
+		<remote-id type="github">sebastianbergmann/global-state</remote-id>
 	</upstream>
 	<origin>gentoo-staging</origin>
 </pkgmetadata>
diff --git a/dev-php/sebastian-global-state/sebastian-global-state-3.0.0.ebuild b/dev-php/sebastian-global-state/sebastian-global-state-3.0.0.ebuild
index f2aaba7905c9..707301722613 100644
--- a/dev-php/sebastian-global-state/sebastian-global-state-3.0.0.ebuild
+++ b/dev-php/sebastian-global-state/sebastian-global-state-3.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> $
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-php/sebastian-object-enumerator/metadata.xml b/dev-php/sebastian-object-enumerator/metadata.xml
index 3bf47ef60938..c736b27c77da 100644
--- a/dev-php/sebastian-object-enumerator/metadata.xml
+++ b/dev-php/sebastian-object-enumerator/metadata.xml
@@ -5,8 +5,9 @@
 		<email>php-bugs@gentoo.org</email>
 		<name>PHP</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
-		<remote-id type="github">sebastianbergmann/</remote-id>
+		<remote-id type="github">sebastianbergmann/object-enumerator</remote-id>
 	</upstream>
 	<origin>gentoo-staging</origin>
 </pkgmetadata>
diff --git a/dev-php/sebastian-object-enumerator/sebastian-object-enumerator-3.0.3.ebuild b/dev-php/sebastian-object-enumerator/sebastian-object-enumerator-3.0.3.ebuild
index c0b63b0beb3e..90dcda08ea79 100644
--- a/dev-php/sebastian-object-enumerator/sebastian-object-enumerator-3.0.3.ebuild
+++ b/dev-php/sebastian-object-enumerator/sebastian-object-enumerator-3.0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> $
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-php/sebastian-object-reflector/metadata.xml b/dev-php/sebastian-object-reflector/metadata.xml
index 2cec1aaa56e9..e2f79e06ad66 100644
--- a/dev-php/sebastian-object-reflector/metadata.xml
+++ b/dev-php/sebastian-object-reflector/metadata.xml
@@ -5,6 +5,7 @@
 		<email>php-bugs@gentoo.org</email>
 		<name>PHP</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">sebastianbergmann/version</remote-id>
 	</upstream>
diff --git a/dev-php/sebastian-object-reflector/sebastian-object-reflector-1.1.1.ebuild b/dev-php/sebastian-object-reflector/sebastian-object-reflector-1.1.1.ebuild
index 56dd2650e473..fc8ff64226f6 100644
--- a/dev-php/sebastian-object-reflector/sebastian-object-reflector-1.1.1.ebuild
+++ b/dev-php/sebastian-object-reflector/sebastian-object-reflector-1.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> $
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-php/sebastian-recursion-context/metadata.xml b/dev-php/sebastian-recursion-context/metadata.xml
index 3bf47ef60938..734af21c84bf 100644
--- a/dev-php/sebastian-recursion-context/metadata.xml
+++ b/dev-php/sebastian-recursion-context/metadata.xml
@@ -5,8 +5,9 @@
 		<email>php-bugs@gentoo.org</email>
 		<name>PHP</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
-		<remote-id type="github">sebastianbergmann/</remote-id>
+		<remote-id type="github">sebastianbergmann/recursion-context</remote-id>
 	</upstream>
 	<origin>gentoo-staging</origin>
 </pkgmetadata>
diff --git a/dev-php/sebastian-recursion-context/sebastian-recursion-context-3.0.0.ebuild b/dev-php/sebastian-recursion-context/sebastian-recursion-context-3.0.0.ebuild
index 830d78275012..fc0a0fd747d0 100644
--- a/dev-php/sebastian-recursion-context/sebastian-recursion-context-3.0.0.ebuild
+++ b/dev-php/sebastian-recursion-context/sebastian-recursion-context-3.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> $
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-php/sebastian-resource-operations/metadata.xml b/dev-php/sebastian-resource-operations/metadata.xml
index 3bf47ef60938..a001bc310cd7 100644
--- a/dev-php/sebastian-resource-operations/metadata.xml
+++ b/dev-php/sebastian-resource-operations/metadata.xml
@@ -5,8 +5,9 @@
 		<email>php-bugs@gentoo.org</email>
 		<name>PHP</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
-		<remote-id type="github">sebastianbergmann/</remote-id>
+		<remote-id type="github">sebastianbergmann/resource-operations</remote-id>
 	</upstream>
 	<origin>gentoo-staging</origin>
 </pkgmetadata>
diff --git a/dev-php/sebastian-resource-operations/sebastian-resource-operations-2.0.1.ebuild b/dev-php/sebastian-resource-operations/sebastian-resource-operations-2.0.1.ebuild
index 678588caefb6..e79868e3a85c 100644
--- a/dev-php/sebastian-resource-operations/sebastian-resource-operations-2.0.1.ebuild
+++ b/dev-php/sebastian-resource-operations/sebastian-resource-operations-2.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> $
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-php/sebastian-type/metadata.xml b/dev-php/sebastian-type/metadata.xml
index a036b877938f..41bf9cc8b2b0 100644
--- a/dev-php/sebastian-type/metadata.xml
+++ b/dev-php/sebastian-type/metadata.xml
@@ -5,6 +5,7 @@
 		<email>php-bugs@gentoo.org</email>
 		<name>PHP</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">sebastianbergmann/type</remote-id>
 	</upstream>
diff --git a/dev-php/sebastian-type/sebastian-type-1.1.3.ebuild b/dev-php/sebastian-type/sebastian-type-1.1.3.ebuild
index f3e2397ed3a3..4de318935931 100644
--- a/dev-php/sebastian-type/sebastian-type-1.1.3.ebuild
+++ b/dev-php/sebastian-type/sebastian-type-1.1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> $
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-php/smarty/Manifest b/dev-php/smarty/Manifest
index 8a87b2c43603..97154d28eb53 100644
--- a/dev-php/smarty/Manifest
+++ b/dev-php/smarty/Manifest
@@ -1,2 +1,3 @@
 DIST manual-en.3.1.14.zip 408414 BLAKE2B 03d4e7a386eb3bd5b19e5c555ec34b86812838a5b5fac8ec0ab9701fba89a5867714da57d950f68224a89bbe2267c18d638ee850681860de309c74bbfb3d0a0b SHA512 d384e3856b45ed3f992f3732a5465120abe9fb947cdf13ff67a9c4264f72987d24885ee61cd7309b728e64cdfe4f34c3e7f757096d35de56d962f3b78def9e58
 DIST smarty-3.1.33.tar.gz 249999 BLAKE2B 1e174b190238c8b20d5dae9c0c9fdf264c4716ba850599a2a028fe6c307eb3d9d2611e3b928efb9471e051496e4e31502458cd7a71a9318e012d5af7eca2c50e SHA512 443473cf12c7e053744daef7a70d4172979d760278aa1593216d0b70f0c12ca2b48eb79486a1c10a1cf2264da671804b94ee9d538b9013ff0bdc42e28639ca5d
+DIST smarty-3.1.36.tar.gz 264169 BLAKE2B 56c1f361b5aa1fedca13546c717b85f6b54555761f45ba60959358433638714ec5136ad7b506696be3fa96fef14a29fb584e490e7a627ba9a1fd7d65e05cac42 SHA512 242014d4b39d162683bece8e8e29f1913f902c334a6ee0a4c84c1cfb7e06d1e0d7990b63833c8ffa7c4604306b5159caf00bcf2a4c0b6b379bf26768da75148d
diff --git a/dev-php/smarty/smarty-3.1.36.ebuild b/dev-php/smarty/smarty-3.1.36.ebuild
new file mode 100644
index 000000000000..358ecbf11f61
--- /dev/null
+++ b/dev-php/smarty/smarty-3.1.36.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DOC_PV="3.1.14"
+
+DESCRIPTION="A template engine for PHP"
+HOMEPAGE="https://www.smarty.net/"
+SRC_URI="https://github.com/smarty-php/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	doc? ( https://www.smarty.net/files/docs/manual-en.${DOC_PV}.zip )"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc"
+
+BDEPEND="doc? ( app-arch/unzip )"
+
+# PHP unicode support is detected at runtime, and the cached templates
+# that smarty generates depend on it. If, later on, PHP is reinstalled
+# without unicode support, all of the previously-generated cached
+# templates will begin to throw 500 errrors for missing mb_foo
+# functions. See bug #532618.
+RDEPEND="dev-lang/php:*[unicode]"
+
+src_install() {
+	insinto "/usr/share/php/${PN}"
+	doins -r libs/*
+
+	local DOCS=( *.txt README README.md )
+	local HTML_DOCS
+	use doc && HTML_DOCS="${WORKDIR}/manual-en/"*
+	einstalldocs
+}
+
+pkg_postinst() {
+	elog "${PN} has been installed in /usr/share/php/${PN}/."
+	elog
+	elog 'To use it in your scripts, include the Smarty.class.php file'
+	elog "from the \"${PN}\" directory; for example,"
+	elog
+	elog "  require('${PN}/Smarty.class.php');"
+	elog
+	elog 'After that, the Smarty class will be available to you.'
+}
diff --git a/dev-php/theseer-Autoload/metadata.xml b/dev-php/theseer-Autoload/metadata.xml
index 67f8c28dcf27..6fc9b273df5b 100644
--- a/dev-php/theseer-Autoload/metadata.xml
+++ b/dev-php/theseer-Autoload/metadata.xml
@@ -5,6 +5,7 @@
 		<email>php-bugs@gentoo.org</email>
 		<name>PHP</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">theseer/Autoload</remote-id>
 	</upstream>
diff --git a/dev-php/theseer-Autoload/theseer-Autoload-1.26.0.ebuild b/dev-php/theseer-Autoload/theseer-Autoload-1.26.0.ebuild
index 01afc209be05..aea089e67f8c 100644
--- a/dev-php/theseer-Autoload/theseer-Autoload-1.26.0.ebuild
+++ b/dev-php/theseer-Autoload/theseer-Autoload-1.26.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/theseer/${MY_PN}/archive/1.26.0.tar.gz -> ${P}.tar.g
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-php/theseer-DirectoryScanner/metadata.xml b/dev-php/theseer-DirectoryScanner/metadata.xml
index 04854adb1308..f98703d86999 100644
--- a/dev-php/theseer-DirectoryScanner/metadata.xml
+++ b/dev-php/theseer-DirectoryScanner/metadata.xml
@@ -5,6 +5,7 @@
 		<email>php-bugs@gentoo.org</email>
 		<name>PHP</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">theseer/DirectoryScanner</remote-id>
 	</upstream>
diff --git a/dev-php/theseer-DirectoryScanner/theseer-DirectoryScanner-1.3.2.ebuild b/dev-php/theseer-DirectoryScanner/theseer-DirectoryScanner-1.3.2.ebuild
index beb2fd3ab07f..6fc0f450ae6b 100644
--- a/dev-php/theseer-DirectoryScanner/theseer-DirectoryScanner-1.3.2.ebuild
+++ b/dev-php/theseer-DirectoryScanner/theseer-DirectoryScanner-1.3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/theseer/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 
 RDEPEND="dev-lang/php:*"
 
diff --git a/dev-php/theseer-tokenizer/metadata.xml b/dev-php/theseer-tokenizer/metadata.xml
index 0ec9ecaeef62..e885d03ff007 100644
--- a/dev-php/theseer-tokenizer/metadata.xml
+++ b/dev-php/theseer-tokenizer/metadata.xml
@@ -5,6 +5,7 @@
 		<email>php-bugs@gentoo.org</email>
 		<name>PHP</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">theseer/tokenizer</remote-id>
 	</upstream>
diff --git a/dev-php/theseer-tokenizer/theseer-tokenizer-1.2.0.ebuild b/dev-php/theseer-tokenizer/theseer-tokenizer-1.2.0.ebuild
index 20e9ed3dcae2..9fe1250bc9a8 100644
--- a/dev-php/theseer-tokenizer/theseer-tokenizer-1.2.0.ebuild
+++ b/dev-php/theseer-tokenizer/theseer-tokenizer-1.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/theseer/tokenizer/archive/${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-php/xdebug/Manifest b/dev-php/xdebug/Manifest
index cc14e8baedb3..4e8a20cd5a84 100644
--- a/dev-php/xdebug/Manifest
+++ b/dev-php/xdebug/Manifest
@@ -4,3 +4,4 @@ DIST xdebug-2.9.6.tar.gz 436208 BLAKE2B 00cfb42c41bfb44f285b97779d6ba625641fc344
 DIST xdebug-2.9.7.tar.gz 437517 BLAKE2B 6d3cb615b6b75354e5dc993a2de9f90b5865ee1a98935c084a9d7a4e1d03cceb71278b06da1d5e47f2b4105937f6d24cb8d767c7179fa55798e61a599e173c13 SHA512 ec23f7b5b2e2b109a753e12f1cb01377db52716600fbb31ca5b9a749e9d98e0eb60942b272c25a42efcb56add016310c79eda2c7385a3e0fc18e563f2f486d1e
 DIST xdebug-2.9.8.tar.gz 438295 BLAKE2B 8645052faceb354817ddb448f46af5b849507d31255b43ac59bcef4ece7837ef835ae2ad624ed8a95f8f98d552ef0e7195a4ade7df9176bc300d855a0156f405 SHA512 c431d51a0d9c5ac1c7fc529c2819db480cbfff6f65c35c3c0dbef4e78427aa28ede164f397f92c409e58e386a6be34ecd2ded0ee35e01df1cbf92a49fd2f2aab
 DIST xdebug-3.0.1.tar.gz 432140 BLAKE2B f326de9a24c7c766b0f49213625ab7c455f7fd564af1848f2acb728fe513457140ee9669a05ddf83fd4ca07ecd591896d06bd570b60319178b484eaa7664cf88 SHA512 c50dea2abcad9c7e78ad7b7600a71c1bf0543c5fa31280a41c2acad2423bb6af8160e9d6b1e653f350f20660cfb2d8e4de07ae8f1181a465cc858dec13331c67
+DIST xdebug-3.0.2.tar.gz 435761 BLAKE2B 0476d29b3a960d83fd0818098a3d076f48f4d67057a2b6ec79571b011a9f364b18d3319771ad18e7145aa0f0f45fab7ed13d814b863731abe1721aafa8b59408 SHA512 723e00885a49a5626870cc4cb0f7fd49a3173c8d4e9b4022009430fdeaa1b152828de18e6e7fa709be8bb11989c89dc2d9940de9cc3d592174b5dafbc3d2c52d
diff --git a/dev-php/xdebug/xdebug-3.0.2.ebuild b/dev-php/xdebug/xdebug-3.0.2.ebuild
new file mode 100644
index 000000000000..5c7410f4c1ab
--- /dev/null
+++ b/dev-php/xdebug/xdebug-3.0.2.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PHP_EXT_NAME="xdebug"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="yes"
+PHP_EXT_INIFILE="3.0-xdebug.ini"
+
+USE_PHP="php7-3 php7-4 php8-0"
+
+MY_PV="${PV/_/}"
+MY_PV="${MY_PV/rc/RC}"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+inherit php-ext-source-r3
+
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+
+DESCRIPTION="A PHP debugging and profiling extension"
+HOMEPAGE="https://xdebug.org/"
+# Using tarball from GitHub for tests
+#SRC_URI="https://pecl.php.net/get/${PN}-${MY_PV}.tgz"
+SRC_URI="https://github.com/xdebug/xdebug/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="Xdebug"
+SLOT="0"
+IUSE=""
+
+# Tests are known to fail
+RESTRICT="test"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+DOCS=( README.rst CREDITS )
+PHP_EXT_ECONF_ARGS=()
+
+src_test() {
+	local slot
+	for slot in $(php_get_slots); do
+		php_init_slot_env "${slot}"
+		TEST_PHP_EXECUTABLE="${PHPCLI}" \
+		TEST_PHP_CGI_EXECUTABLE="${PHPCGI}" \
+		TEST_PHPDBG_EXECUTABLE="${PHPCLI}dbg" \
+		 "${PHPCLI}" run-xdebug-tests.php
+	done
+}
+
+pkg_postinst() {
+	ewarn "We have set xdebug.mode to off, as xdebug can be"
+	ewarn "installed as a dependency, and not all users will want xdebug to be"
+	ewarn "enabled by default. If you want to enable it, you should edit the"
+	ewarn "ini file and set xdebug.mode to one or more modes e.g. develop,debug,trace"
+	elog ""
+	elog "The 3.0 major release changes many options."
+	elog "Review https://xdebug.org/docs/upgrade_guide for differences from 2.x"
+}
diff --git a/dev-php/zetacomponents-Base/metadata.xml b/dev-php/zetacomponents-Base/metadata.xml
index bd587e20bab4..a4c56e583025 100644
--- a/dev-php/zetacomponents-Base/metadata.xml
+++ b/dev-php/zetacomponents-Base/metadata.xml
@@ -5,6 +5,7 @@
 		<email>php-bugs@gentoo.org</email>
 		<name>PHP</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">zetacomponents/Base</remote-id>
 	</upstream>
diff --git a/dev-php/zetacomponents-Base/zetacomponents-Base-1.9.1.ebuild b/dev-php/zetacomponents-Base/zetacomponents-Base-1.9.1.ebuild
index a1c68a7472bd..70ba281e31d7 100644
--- a/dev-php/zetacomponents-Base/zetacomponents-Base-1.9.1.ebuild
+++ b/dev-php/zetacomponents-Base/zetacomponents-Base-1.9.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/zetacomponents/${MY_PN}/archive/${PV}.tar.gz -> ${P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 
 RDEPEND="dev-lang/php:*"
 
diff --git a/dev-php/zetacomponents-ConsoleTools/metadata.xml b/dev-php/zetacomponents-ConsoleTools/metadata.xml
index c9131c6e5b94..12e18b48281e 100644
--- a/dev-php/zetacomponents-ConsoleTools/metadata.xml
+++ b/dev-php/zetacomponents-ConsoleTools/metadata.xml
@@ -5,6 +5,7 @@
 		<email>php-bugs@gentoo.org</email>
 		<name>PHP</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">zetacomponents/ConsoleTools</remote-id>
 	</upstream>
diff --git a/dev-php/zetacomponents-ConsoleTools/zetacomponents-ConsoleTools-1.7.2.ebuild b/dev-php/zetacomponents-ConsoleTools/zetacomponents-ConsoleTools-1.7.2.ebuild
index 6bf3b6766748..1c8239d7c0b9 100644
--- a/dev-php/zetacomponents-ConsoleTools/zetacomponents-ConsoleTools-1.7.2.ebuild
+++ b/dev-php/zetacomponents-ConsoleTools/zetacomponents-ConsoleTools-1.7.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/zetacomponents/${MY_PN}/archive/${PV}.tar.gz -> ${P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 
 RDEPEND="dev-lang/php:*"