gentoo resync : 05.12.2021

42 files changed, 632 insertions, 245 deletions

diff --git a/dev-php/Manifest.gz b/dev-php/Manifest.gz
index 48820707ba23..89e6ca96ff11 100644
--- a/dev-php/Manifest.gz
+++ b/dev-php/Manifest.gz
diff --git a/dev-php/composer/Manifest b/dev-php/composer/Manifest
index c77ab4f8f3ba..3ac1d22d6a23 100644
--- a/dev-php/composer/Manifest
+++ b/dev-php/composer/Manifest
@@ -6,6 +6,7 @@ DIST composer-2.0.14.tar.gz 498661 BLAKE2B 0b454ed6a00b5cab169a4ff82e9a3d7ceb0d8
 DIST composer-2.1.1.tar.gz 513391 BLAKE2B 9177eb7d1acfb3557dde0382e0d0b6fd367a16f4c2de30739c40a1fae396e7f188173c5ef9356c6f55922457ea52c7c3e19e9040c37e86fdb4575016aac07808 SHA512 22105ab3f831ab89cf80e247c6e6f6263f3116a24394b9367b7e7c1e1aebfdcf9bb833add4763c34c621714dd8f22c87327ccf6c8eeef113f753ba800a111a5c
 DIST composer-2.1.10.tar.gz 533734 BLAKE2B d5ea19e81e71c009062fbca43bd33b5e4e6d60049444a1f46cebeb7dabf239726e83d9a1d68deecac0a172d2e8a6946bde1ea7b304f95acacd539759e90f8a9f SHA512 179d40b4f56b7559d377936f5fa712ee733b5c3b503a7988eba4fd411d8eca7f4070108e3cdfc68b17b2acd8da296dbe1d46f984aefe9867acf0f7f650238315
 DIST composer-2.1.11.tar.gz 534246 BLAKE2B fc4ff9ef3c0c3a58ef3dcf76e527f6208d8592aaf518b3ffacd9af4210060734f2d73d64e3d8d9b2de0c43280641cb064c76f7e7984dc0c5d71d7092a0373188 SHA512 e4cd092cd10b570fda597d50dd8c4b751e4c05cca9b3436e8badca31bd115e5748b3a09ca26c566cdd3e18703a7aaa6e60c62873140c7925c6db28651f5a128c
+DIST composer-2.1.12.tar.gz 535017 BLAKE2B 1eb0f7266f81efacbb0a9607828ebd8baf7147a161c478c75968ac02b5e32688601a8be53ef03f66162847b3e2f15b47398f6f57b7e3d9da7743d34c1a19cd7c SHA512 5848a686568cf2bf587b4f4c21fc095b2e6578c2a4897329411e473ce6250e6304726a47078f70f19fb168359fb991109ec975241b868f8b71dcf30c32a888c5
 DIST composer-2.1.2.tar.gz 513790 BLAKE2B cc1c807ae4d69537541acf3ec384dbad64bf3196067c5ad016b03903e9b47460a6757c0fe692600f3042650c030b323f0a0b5ef4c3933049899843cbdc8266dc SHA512 1835daeb943af2ff58e5f5b3966b59356c14ac740689779c05fa0021174a7d0ac2a45aae7f54fade0695ca7eedf59f7ac4c9c14ae4aa1e4a5fbfb1650aae8ca9
 DIST composer-2.1.3.tar.gz 514147 BLAKE2B 3abf64aceea5b95b72419b60fc74d23e42c652036690c2e31b4250eb4a0e3607a1b4080745642fb085be75dd1174073164f9a8a1422745b4bff5887df694fd99 SHA512 d3214f39651e323b419979ed150d5239f992a6b643048a73a777ece0a1b3d5e3dc2c58a5084b3e825834acc258c18947b0c6461c47960a10552617c8f541df86
 DIST composer-2.1.5.tar.gz 515243 BLAKE2B 078b14727aba1d6278e046e0a1a7b90edae6532ae5874093824db39bb10a0f663543944fe0bb17ddad3dbf40736eef1bb1a8049f5e4dd557f6f01e0d854c213b SHA512 cd4f166d3d1ca7edc8b473ac47775caca98dc2a8bc758b34e6fdd4669ffbe0aa71f900a366e40ff73f830aa602377a5ef3f40022006138e216f0127c75120b96
@@ -18,6 +19,7 @@ EBUILD composer-2.0.14.ebuild 2228 BLAKE2B befd0486765faf001bcf4f2cb98ceea1d4535
 EBUILD composer-2.1.1.ebuild 2228 BLAKE2B befd0486765faf001bcf4f2cb98ceea1d4535ceb142e6bca6ded35413a5e8c42009850e902b49fe59418b69e76e5043f0d7f585a2a61888b98d9e82edf80a0b9 SHA512 e007b668692c68b321be874639cf77366d81172b1314e316f04e785e4ba9e065785d95509d24624eadab38ee8ce154ec0f5797438a7b7dfc59fc85dac092f5a6
 EBUILD composer-2.1.10.ebuild 2228 BLAKE2B ebf3d7fe1a1d890650a861bc5a08878501e7a8994cd12c1e2b55e632293f7e004f28bd490ef40ecbd8268ab625ca56c4caa69791a36dd4549b5106dcf2923dd2 SHA512 62afde69ee98ab14cc9bbb90df16ca70927fa1cbbd0c69ceb3bc2a9bd237aa8a3eb96f2acfdc88244d2e5e5d7c9ee32776764cc4750f1619e7c4296ca57737b8
 EBUILD composer-2.1.11.ebuild 2228 BLAKE2B ebf3d7fe1a1d890650a861bc5a08878501e7a8994cd12c1e2b55e632293f7e004f28bd490ef40ecbd8268ab625ca56c4caa69791a36dd4549b5106dcf2923dd2 SHA512 62afde69ee98ab14cc9bbb90df16ca70927fa1cbbd0c69ceb3bc2a9bd237aa8a3eb96f2acfdc88244d2e5e5d7c9ee32776764cc4750f1619e7c4296ca57737b8
+EBUILD composer-2.1.12.ebuild 2228 BLAKE2B ebf3d7fe1a1d890650a861bc5a08878501e7a8994cd12c1e2b55e632293f7e004f28bd490ef40ecbd8268ab625ca56c4caa69791a36dd4549b5106dcf2923dd2 SHA512 62afde69ee98ab14cc9bbb90df16ca70927fa1cbbd0c69ceb3bc2a9bd237aa8a3eb96f2acfdc88244d2e5e5d7c9ee32776764cc4750f1619e7c4296ca57737b8
 EBUILD composer-2.1.2.ebuild 2228 BLAKE2B befd0486765faf001bcf4f2cb98ceea1d4535ceb142e6bca6ded35413a5e8c42009850e902b49fe59418b69e76e5043f0d7f585a2a61888b98d9e82edf80a0b9 SHA512 e007b668692c68b321be874639cf77366d81172b1314e316f04e785e4ba9e065785d95509d24624eadab38ee8ce154ec0f5797438a7b7dfc59fc85dac092f5a6
 EBUILD composer-2.1.3.ebuild 2228 BLAKE2B befd0486765faf001bcf4f2cb98ceea1d4535ceb142e6bca6ded35413a5e8c42009850e902b49fe59418b69e76e5043f0d7f585a2a61888b98d9e82edf80a0b9 SHA512 e007b668692c68b321be874639cf77366d81172b1314e316f04e785e4ba9e065785d95509d24624eadab38ee8ce154ec0f5797438a7b7dfc59fc85dac092f5a6
 EBUILD composer-2.1.5.ebuild 2228 BLAKE2B a0655fea3563734d657745a9fa9c8f785cf234d879033f43a4e98d333dfe51d011401db8fb7d16cad3191c86bb330ddaad759a3600c6dd8668bc4963c0adb253 SHA512 e5490a298b4a5ca5133ace4bf3ca317ea1b35b212b2574d0e8fd1dcc22226cdd32849f57c0a26f0be03586c602c9d3f4b70442bb1b9316984276aaaac120b635
diff --git a/dev-php/composer/composer-2.1.12.ebuild b/dev-php/composer/composer-2.1.12.ebuild
new file mode 100644
index 000000000000..1eb058b7a474
--- /dev/null
+++ b/dev-php/composer/composer-2.1.12.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+DESCRIPTION="Dependency Manager for PHP"
+HOMEPAGE="https://github.com/composer/composer"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="dev-php/theseer-Autoload"
+
+RDEPEND="dev-lang/php:*[curl]
+	>=dev-php/ca-bundle-1.0
+	dev-php/fedora-autoloader
+	>=dev-php/jsonlint-1.4
+	>=dev-php/json-schema-5.2.11
+	>=dev-php/metadata-minifier-1.0
+	>=dev-php/phar-utils-1.0
+	>=dev-php/psr-log-1.0
+	>=dev-php/reactphp-promise-2.7
+	>=dev-php/semver-3.0
+	>=dev-php/spdx-licenses-1.2
+	>=dev-php/symfony-console-2.8.52
+	>=dev-php/symfony-filesystem-2.8.52
+	>=dev-php/symfony-finder-2.8.52
+	>=dev-php/symfony-process-2.8.52
+	>=dev-php/xdebug-handler-2"
+
+src_prepare() {
+	default
+
+	mkdir vendor || die
+
+	phpab \
+		--output vendor/autoload.php \
+		--template "${FILESDIR}"/autoload.php.tpl \
+		--basedir src \
+		src \
+		|| die
+
+	cat >> vendor/autoload.php <<EOF || die "failed to extend autoload.php"
+
+// Dependencies
+\Fedora\Autoloader\Dependencies::required([
+	'/usr/share/php/Composer/CaBundle/autoload.php',
+	'/usr/share/php/Composer/MetadataMinifier/autoload.php',
+	'/usr/share/php/Composer/Semver/autoload.php',
+	'/usr/share/php/Composer/Spdx/autoload.php',
+	'/usr/share/php/Composer/XdebugHandler/autoload.php',
+	'/usr/share/php/JsonSchema/autoload.php',
+	'/usr/share/php/Psr/Log/autoload.php',
+	'/usr/share/php/Seld/JsonLint/autoload.php',
+	'/usr/share/php/Seld/PharUtils/autoload.php',
+	'/usr/share/php/Symfony/Component/Console/autoload.php',
+	'/usr/share/php/Symfony/Component/Filesystem/autoload.php',
+	'/usr/share/php/Symfony/Component/Finder/autoload.php',
+	'/usr/share/php/Symfony/Component/Process/autoload.php',
+	'/usr/share/php/React/Promise/autoload.php'
+]);
+EOF
+}
+
+src_install() {
+	insinto "/usr/share/${PN}"
+
+	# Composer expects the LICENSE file to be there, and the
+	# easiest thing to do is to give it what it wants.
+	doins -r LICENSE res src vendor
+
+	exeinto "/usr/share/${PN}/bin"
+	doexe "bin/${PN}"
+	dosym "../share/${PN}/bin/${PN}" "/usr/bin/${PN}"
+
+	dodoc CHANGELOG.md README.md doc/*.md
+	dodoc -r doc/articles doc/faqs
+}
diff --git a/dev-php/igbinary/Manifest b/dev-php/igbinary/Manifest
index fd5ff5fa35ee..1cc93673b010 100644
--- a/dev-php/igbinary/Manifest
+++ b/dev-php/igbinary/Manifest
@@ -1,3 +1,4 @@
 DIST igbinary-3.2.6.tar.gz 245899 BLAKE2B 05fd24a640ab9e1f2402645bf322b0a959be69c068ff203552f2806240d8504f1ff3c7b209d9b050ba7815a90bcec2aab823a24a2a2a1cc149da90d25166f18a SHA512 b6c9e7b68716052d93a8535af4666fa3d5b4071bc181819cdc0ecd7f8e1c099001905ff2134eec6343daa77102a423ad0903f8800808c30806d3cb7faa4c7a06
+EBUILD igbinary-3.2.6-r1.ebuild 566 BLAKE2B 7dfbe7ab2945586b159753612baeb9dbe07f5e41c04c99bc888e10f154569146529d1ce25b95baa329d4afc65d307ac3b2b9377353c80e1eb3fdd7ff70b534fa SHA512 2470943b3436b16ddf619ee0537fba243f2610553fb0fa29c3c585c24b5a09613c97bab7d90a067eb0467ac309e8300ddb412b05de73f28a4e3a43f22e8acf48
 EBUILD igbinary-3.2.6.ebuild 555 BLAKE2B 4679ab3040fcad9b0b896f3198add1dbcd22e790e942ece5456c9399f7894ee19027f58d6ebce174ad7308e18d4f9a30eb1e2c24bb686fc58f12b9e6118794a7 SHA512 5dc5484ac731591ddc78089372cc3e2d1938b686d9d7f049cece0d6a2cec92f7decf5e2e9e2b30579888605fbf3c75c4dc8fa5ac91cab03dc4cdc3105a086530
 MISC metadata.xml 332 BLAKE2B dd842052dec2b48669fb7d85ee2637132f64d64d56ac9ece1394222211f3cc1a698e0d5e4dda6d4d5289a4debfe7a44c0c776ec2399d3384874be03278995af2 SHA512 0e2d8ac966bb0f3e40fcf96e0ff93ebd9353a0629129e14f9be2186fe7fc3db8cb5fafc3af795b59005332d66085f1636df62b5454998cb9bd09bfacc1ced0a6
diff --git a/dev-php/igbinary/igbinary-3.2.6-r1.ebuild b/dev-php/igbinary/igbinary-3.2.6-r1.ebuild
new file mode 100644
index 000000000000..eecc1a37e244
--- /dev/null
+++ b/dev-php/igbinary/igbinary-3.2.6-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2021 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 php8-1"
+
+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/pecl-amqp/Manifest b/dev-php/pecl-amqp/Manifest
index a518840d3e47..f08fa8eea1c6 100644
--- a/dev-php/pecl-amqp/Manifest
+++ b/dev-php/pecl-amqp/Manifest
@@ -1,5 +1,7 @@
 DIST amqp-1.10.2.tgz 107350 BLAKE2B dd32873d5288ced2ef2c05e6b131f35c31a3514a98d5d3cb8784a989ca1d8637c5ddc7ffa2d73f5bfc2daa4fe718ecf1f08c7ceae64d2e613ef430d18161393b SHA512 a17176bcc02d35a9686d3ca120cca98d808b2a896733f41a28b5d29d43127a0a45b012bc6566de3604f41b8bcc453408a37a8254bcf47e940ebe12bb6f4d4265
+DIST amqp-1.11.0RC1.tgz 108361 BLAKE2B f8b0eadb9af8b7e0bdb0dac948f4705ed6ff09c210c6ec9c4a6d5ed2707f9a04ce43fee5e3631815c3c0a3aa7e05ebee0fabf74c39fb586372b5796dc83f7203 SHA512 c12a43126e4ad1418d43a07aa2400fb9d9506181912ed4e0892aba078147384afe083051e034b3941eb5e0d40241c92eec2de64d5dd17b60b3c11c876662f0aa
 DIST amqp-1.11.0beta.tgz 108054 BLAKE2B 821359d165f4152e423164692b7f7faf367ae33674fd9dd08e4fa91e7b0f33924a81c81e54153e4bcd76336059691751d331059e6f61b34612aea68b4571d6b4 SHA512 e2625cf5e4f1614911d824aa8ab40600502847847808104f101fa409ad0a5df3007594e8a012620bb3ae26632fe20068905100cc2dac35973f9b8e5457d41768
 EBUILD pecl-amqp-1.10.2.ebuild 557 BLAKE2B c32568d1c6a914a39b7e5840289057d6d8a2056350859a57549b109382afa8663145e60e5e06cc8672d9b5e47ec9b6a2b59276ca21e8fd8e74eec4a4c21dba2b SHA512 62a21d29c718ca3a092cfc888e24866a2c7c6edf19d49e49d6668239d28eb873babf0313e90a8692d8c54707e38ba8b546b0716fc582b263445eb07dccb1ed7e
 EBUILD pecl-amqp-1.11.0_beta.ebuild 550 BLAKE2B cdd0ebbc4b9a9d888a99b5a153d9b2543c421b8903be8945183207742dfcb8f0b02550a1c884a79fa41067249afdbc9f9262e39e7d756dbff6b9708cb993777a SHA512 76fd139dd5ece75d38fb3f149973bb4ee0562c7a9b4595fdc919c82dfda1d0df90f26ef84a2711a25281063128bc298b6dc2130692885fdbc607b5a1b437d33c
+EBUILD pecl-amqp-1.11.0_rc1.ebuild 675 BLAKE2B dd5e2f78b9827c7c9c57be89e22a13a0e8dea29bb35fd37a88dbf17395139168d22d96b666818652be57e34e60ef023e0cfde823c0ee47b50f97d17b0dd4c755 SHA512 574ededb94a78a84963de3facb18ad382c1e68b59a7f371e655b1a2b5a67963a33d583bb54aa9d66d1ed3c73dc21675a7f0bbb49642499607cc386dc5e6822c1
 MISC metadata.xml 240 BLAKE2B f60f325331d493a555e53c29c7cf2742a415356da28a467505f1441f3fd790fd0d59050df84854bdc379d19d94a46121216479807975a2922d5a2fefde83416b SHA512 fada9d69055f2be962b95aac82f260ec5db7a3f4392d10f0458a1d125938fa17539f7ec486000f3a95cff85a3fbb6bbf1f6f4fe6c2de7aa420a7543a3e89d03e
diff --git a/dev-php/pecl-amqp/pecl-amqp-1.11.0_rc1.ebuild b/dev-php/pecl-amqp/pecl-amqp-1.11.0_rc1.ebuild
new file mode 100644
index 000000000000..a25f1b277b3e
--- /dev/null
+++ b/dev-php/pecl-amqp/pecl-amqp-1.11.0_rc1.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 php8-1"
+MY_P="${PN/pecl-/}-${PV/_rc/RC}"
+PHP_EXT_S="${WORKDIR}/${MY_P}"
+PHP_EXT_PECL_FILENAME="${MY_P}.tgz"
+
+inherit php-ext-pecl-r3
+
+KEYWORDS="~amd64 ~x86"
+
+DESCRIPTION="PHP Bindings for AMQP 0-9-1 compatible brokers"
+LICENSE="PHP-3.01"
+SLOT="0"
+IUSE=""
+
+S="${PHP_EXT_S}"
+
+# Tests require running rabbitmq-server on localhost which requires epmd
+# which only accepts /var/run/epmd.pid as pidfile.
+RESTRICT="test"
+
+BDEPEND="virtual/pkgconfig"
+RDEPEND=">=net-libs/rabbitmq-c-0.5.2:=[ssl]"
+DEPEND="${RDEPEND}"
+PHP_EXT_ECONF_ARGS=()
diff --git a/dev-php/pecl-dbase/Manifest b/dev-php/pecl-dbase/Manifest
index edd3c5a2ca25..84adc6c8738d 100644
--- a/dev-php/pecl-dbase/Manifest
+++ b/dev-php/pecl-dbase/Manifest
@@ -1,5 +1,3 @@
-DIST dbase-7.0.1.tgz 33588 BLAKE2B 50cc5b4e0096dbdd7067e9c05cb7b580ff5a9d548ec6acb8a777fa3ba62ac4fa06b30e040bdec2a77b87736cdd0684a662aab344db11806e6ca2c6824cee6908 SHA512 8aa743545e807773be6a3f74cd9ae686a982a5455e494ff2bc0e3fe6f1fdf25574702054253eaefc55a6e9529b3e70c8390a02bd317b74db17bfe6b7797d4ba2
-DIST dbase-7.1.0.tgz 36986 BLAKE2B d5baa2165f41afcfe4faee60565ee1003abe069e2fff0b84421926c3436e1af20fa1e6d7a8641d2984399328e76a1e0555572b766c9c1d938d82ed546b25a750 SHA512 3adf45dbaa183933761065d8320c556585878514684bb3e848b8fc4d9bbaa9808f74994b4c49f0e107c10baee4ab54eb5b85b721002873dc6c978332400fae4c
-EBUILD pecl-dbase-7.0.1.ebuild 337 BLAKE2B 7b6d332b6236fa1dac0cfe5fda5df822e3884d52a4126ff4e32a522a25f3160acc3202faa5045cc36364f1e061002a208dda611b0c3cc981a68533bbecc9f249 SHA512 6a7a4d56e2c6837f063e7d89ecc7e33221c5d9733f42d8040d377a02826795a22a8232a9efcf16de71c41c1742b606875c0811eefc024997739b2ffd8f035046
-EBUILD pecl-dbase-7.1.0.ebuild 449 BLAKE2B 6251218134646c01d0ac30ab5a864f4a433ab9a7d83d57d70685b72ed6616d6535280170f8985cc2da7c5750a08f3e6a0962f1445c6287dc7f6667ea7fc87783 SHA512 cfc3dc17edc7ffca87afa8e0115d035db28c5715718ad42adc4944af4566936af419ee2bf4ac6d4f8dead0b34f6668d78c566f31e1337a41d85f7a1eae5ff46a
+DIST dbase-7.1.1.tgz 37583 BLAKE2B 7131e6219aa263259e7892b8a4bb29051bf3b9688532e73c77032f6d0ef86c94bc6a4f75461c8901995383e86fcc4828d175132064cb181e3de9f9e57f502282 SHA512 bdcd0be903fec5760e23ba9cbaef9a0f21c8a5388c7ccee56b4932a0cbb1e35ec5424f1130fd94068c4074d38c4ecc387ff93f7f01f6249fce7a64af494af0bc
+EBUILD pecl-dbase-7.1.1.ebuild 321 BLAKE2B e51cc76aa3d838e2286e72894b4e5cddfc7773cf96c4d6d8f80000beb0d8fe490f121e39fd4696321f6f2a62f6263eac6c5dd3ec50f1a6cc04980eab978a265d SHA512 646935a22fcd8bd86956b3e5f53afc7492c2e2c337472a499c77211bea6b672b82103a7ba4c8eac3585bcbc08605fec5a26e72d94e31db0b9ca2b4378d45adee
 MISC metadata.xml 240 BLAKE2B f60f325331d493a555e53c29c7cf2742a415356da28a467505f1441f3fd790fd0d59050df84854bdc379d19d94a46121216479807975a2922d5a2fefde83416b SHA512 fada9d69055f2be962b95aac82f260ec5db7a3f4392d10f0458a1d125938fa17539f7ec486000f3a95cff85a3fbb6bbf1f6f4fe6c2de7aa420a7543a3e89d03e
diff --git a/dev-php/pecl-dbase/pecl-dbase-7.1.0.ebuild b/dev-php/pecl-dbase/pecl-dbase-7.1.0.ebuild
deleted file mode 100644
index b288ecca45e0..000000000000
--- a/dev-php/pecl-dbase/pecl-dbase-7.1.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-USE_PHP="php7-2 php7-3 php7-4 php8-0"
-
-MY_PV="${PV/_rc/RC}"
-PHP_EXT_PECL_FILENAME="dbase-${MY_PV}.tgz"
-
-inherit php-ext-pecl-r3
-
-KEYWORDS="~amd64 ~x86"
-
-DESCRIPTION="dBase database file access functions"
-LICENSE="PHP-3.01"
-SLOT="7"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PHP_EXT_PECL_FILENAME%.tgz}"
-PHP_EXT_S="${S}"
diff --git a/dev-php/pecl-dbase/pecl-dbase-7.0.1.ebuild b/dev-php/pecl-dbase/pecl-dbase-7.1.1.ebuild
index e39dbd9f0ad1..12af13520d4a 100644
--- a/dev-php/pecl-dbase/pecl-dbase-7.0.1.ebuild
+++ b/dev-php/pecl-dbase/pecl-dbase-7.1.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-USE_PHP="php7-2 php7-3 php7-4"
+USE_PHP="php7-3 php7-4 php8-0 php8-1"
 
 inherit php-ext-pecl-r3
 
@@ -16,4 +16,3 @@ IUSE=""
 
 DEPEND=""
 RDEPEND="${DEPEND}"
-PHP_EXT_ECONF_ARGS=( )
diff --git a/dev-php/pecl-dio/Manifest b/dev-php/pecl-dio/Manifest
index b5be9a091840..a1dc7bbc77db 100644
--- a/dev-php/pecl-dio/Manifest
+++ b/dev-php/pecl-dio/Manifest
@@ -1,3 +1,3 @@
 DIST dio-0.2.0.tgz 37328 BLAKE2B e7ad6be1a4c957c155753e834d79f51b985578a03781ddbc66f05961dc270d58b20abcc74c64a0e9744d5cfbb6e545c1a7ac2bc1d54009c74f26bf786587ef49 SHA512 172c2a2a84d348d684d84ca94f23b767952461ca848cd114e899ea3fd39503a35ac0624a2a774b9dc6fd2d463d3f6aa6937e780e2faa6a0955a8594aad27ec8b
-EBUILD pecl-dio-0.2.0-r1.ebuild 417 BLAKE2B 1541835c23ded156e87bef4076e30e01fdf1e255d95cd9ffdbfd5bb4efd735de20df1c46006cee479b11a46db57a8320d5dfe2bb8b46158ca2e6cf3f045a38dd SHA512 0969d9f15b4de7f7c1f6413d94bfce8be4ef3887f14adabe5f3cec0a112a00f31ad8085d002b79e3ddf9d811d4d564dedd65c8d4fbbc94f17d8684368b4920fe
+EBUILD pecl-dio-0.2.0-r1.ebuild 341 BLAKE2B 5f129d05008e50390fa2e9c9835a7f22bd5a0ea799877226bc0da1de4a30139fae587bc7026ee41560dfd4d0b58ae53d8605972e25c0f5b6109e2dfa77faaabc SHA512 ab4bd8d309d00900d586da16ee4f60a4c6d2bc1748ff05c4ab3cfd1d6b2b92ca285f1a248b50f5961185b49b74b07a9b1da8273c6115a8d811b03d57934ab181
 MISC metadata.xml 236 BLAKE2B 55612da78a71f8cee31c387a5862636996734210d765fac66d8c7706acc5151e6a9e7ff5123aeb097c911495c6220ba3b5d2f1355f46e8ab6bdb240e1697e26d SHA512 2782b20a65dca663ff7c64b7e67db05641abed478fd5996e5750b2e52ba870829f89125baa8967dd29fd20ef9b46ad233b0dd08801308b7756717ec2f292446c
diff --git a/dev-php/pecl-dio/pecl-dio-0.2.0-r1.ebuild b/dev-php/pecl-dio/pecl-dio-0.2.0-r1.ebuild
index cb33182010a9..b4005f5700b0 100644
--- a/dev-php/pecl-dio/pecl-dio-0.2.0-r1.ebuild
+++ b/dev-php/pecl-dio/pecl-dio-0.2.0-r1.ebuild
@@ -7,10 +7,7 @@ PHP_EXT_NAME="dio"
 PHP_EXT_INI="yes"
 PHP_EXT_ZENDEXT="no"
 
-USE_PHP="php7-3 php7-4 php8-0"
-
-MY_PV=${PV/_rc/RC}
-PHP_EXT_S="${WORKDIR}/${PN/pecl-/}-${MY_PV}"
+USE_PHP="php7-3 php7-4 php8-0 php8-1"
 
 inherit php-ext-pecl-r3
 
@@ -20,5 +17,3 @@ DESCRIPTION="Direct I/O functions for PHP"
 LICENSE="PHP-3.01"
 SLOT="0"
 IUSE=""
-
-S="${PHP_EXT_S}"
diff --git a/dev-php/pecl-eio/Manifest b/dev-php/pecl-eio/Manifest
index 8efb925ca4f6..045aebbaa14b 100644
--- a/dev-php/pecl-eio/Manifest
+++ b/dev-php/pecl-eio/Manifest
@@ -1,5 +1,7 @@
 DIST eio-2.0.4.tgz 74118 BLAKE2B 0228f0ca91ed6410614242e7ea1ddadaa1d1aa8211b3ea6f730c0711e4339bc158d661c5addee685d750a51e654874d35a04cf011d2a02ad06ab3f249b893753 SHA512 a74464752af5792c527b9149a7edff574952cac0b5b09e1e7ff3b7c0a2cc88ab171d916d94d508b9f92aa40bd5262a5b9f8d4ba239908f13ebcb89c6513da4d0
 DIST eio-3.0.0RC2.tgz 89591 BLAKE2B 7923f8715870cfd744148980e3ad6de8373384d85e45abc687be2cde22fd425a33b8c80fbd1226e23dbac417533826dfbf639fed751bfc2a88e118750e38d626 SHA512 23e7d88720222ac3f58015ba140e3338e100cf72cf64276fd7e0f0d63a5e50f878ab0a4a742eac7b51484c56ee438fcc3f7cbf7b1da5db44e0178a5098a4a6ae
+DIST eio-3.0.0RC4.tgz 89689 BLAKE2B 2b8cc414d212ec7d3345621a1190ef4e2b2a286ea76569dd39f6a1ce9a77e77bbb6959d9d25be59ab4fea617cb4c16bfcc726d6d1c8aee0dfa87c2cdcbd9f095 SHA512 126f189eb1ccce6093c764b9910bd844561ff644efeaeb762dd5eccb34122b0012160168f223f46d82dd6bf55ebcd1561c96bc69c408b2c8a37c0d2a04d619e4
 EBUILD pecl-eio-2.0.4-r1.ebuild 493 BLAKE2B db326dd5383340a4f28028c490dc977b8e86e403c4cc10fe3d23cdc0fed8a84c084a5e7c4be8a37a894fa608ba623ab724a83eeb64de110a781cb16271994e28 SHA512 0ce554142872b0b4955e8744b9c9caeedae295a1d731b5738e517f69d08482e5317b2f556fa01dc052c28080e5fd05d1190ca4aeaa439894671b3486cf7bd7af
 EBUILD pecl-eio-3.0.0_rc2.ebuild 651 BLAKE2B a1fca0bc26b3003372376151ab0b36452c2c583c4ede5b58ef0b647eb61fad38923adc7e93975e1c24a6c59f63dca4e21b59ac6327c39c185a64f75c101fb660 SHA512 229f43452c8024d306a53a6b177600908ef5aa67828fe96d2351bf00b2e022aa94b86834eec323d6084c9f1bd1475d0119ed64cc5ee8f736e93ecce1e9d8bac9
+EBUILD pecl-eio-3.0.0_rc4.ebuild 658 BLAKE2B 27b172f8e0ae03863962bf05aab1f6d0e48f01b7005a840144475f971722c69e1aef45c8e10cfe5b06476eabe7a879f75967faedf681f36f09d37b9b41bd5421 SHA512 acc4a84e2a6ec6877df860f831c81cf47c2ba236d1724196cb8365fee26c68e7aaf750bbe12f3f1000b8291e4aeffc962d2fe4e27e45bf5ec346ed5756ab9458
 MISC metadata.xml 385 BLAKE2B 63de7ce6ae855744677719a828b3d791946bd31c48fd8fc9994b2e6fbe61fa3b393d8dab2cbd7b0fbd3614e8529834a6f1560321924065b03c465e3fd1174447 SHA512 0717a10ff4f43b8b769f5d9d61deeab733ef796a60ebc0a8c7fef4156682431664271cc02e2f18f0d643971bae5cb652c525fb6782fa4df7f67dc98e6e6c3d53
diff --git a/dev-php/pecl-eio/pecl-eio-3.0.0_rc4.ebuild b/dev-php/pecl-eio/pecl-eio-3.0.0_rc4.ebuild
new file mode 100644
index 000000000000..bbaf407e9f1b
--- /dev/null
+++ b/dev-php/pecl-eio/pecl-eio-3.0.0_rc4.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+MY_PN="${PN/pecl-}"
+MY_PV="${PV/_rc/RC}"
+MY_P="${MY_PN}-${MY_PV}"
+PHP_EXT_NAME="eio"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+PHP_EXT_PECL_FILENAME="${MY_P}.tgz"
+PHP_EXT_S="${WORKDIR}/${MY_P}"
+DOCS=( README.md )
+
+USE_PHP="php7-3 php7-4 php8-0 php8-1"
+inherit php-ext-pecl-r3
+
+KEYWORDS="~amd64 ~x86"
+LICENSE="PHP-3.01"
+
+DESCRIPTION="PHP wrapper for libeio library"
+LICENSE="PHP-3"
+SLOT="0"
+IUSE="debug"
+
+S="${PHP_EXT_S}"
+
+src_configure() {
+	local PHP_EXT_ECONF_ARGS=("--with-eio" "$(use_enable debug eio-debug)" )
+	php-ext-source-r3_src_configure
+}
diff --git a/dev-php/pecl-geoip/Manifest b/dev-php/pecl-geoip/Manifest
index 12e0934e2fcc..7f26aa0a4d01 100644
--- a/dev-php/pecl-geoip/Manifest
+++ b/dev-php/pecl-geoip/Manifest
@@ -1,6 +1,7 @@
 AUX fix-failing-tests-1.1.1.patch 1250 BLAKE2B 587561ec400fe54b21333d09d2ad721b66c321de5a9c1823c0cb9706e63c41a24f81e53eb9fb92bc1f33bc867e141e8f29c26abc1452058dc387d29a53b0c7bc SHA512 9e3c93b337c38feaec29001a5a5b243f376bc7a32caaafa848b51daa3f0efbdecf407de6c8f304801ad106aa0e4906513588c42aa19bc6d5b261ccd6cb00b652
+AUX fix-failing-tests-php8-1-1.1.1.patch 2463 BLAKE2B 8afb78f9e4c6c6c0cc7935401f1376c3bdcd587b1d84ddc7511c5d16dc97623c63115fca4e7fd05c13c932b7a9df9202645185b303abd372348571aaf7ec55c0 SHA512 138ab76ebd9526fa795c7122d10496b790a0a1c35f52942f3b90a59e59522d32a6109648913e0cacf83dea0f7e72919558346acd759c275b113bdba868b4daf9
 AUX php8-support-1.1.1.patch 3017 BLAKE2B a3a200c6f9b081a1776a39a11cbcc1d547b5a1fa945e13436175e3e4834e5e83ad5980ed8b5d0e0b2f3c6fc31d8011a995cba98e3681ea2be22df55391767026 SHA512 80e234a37deb2a5ba075979aacb5f4a343ff2e938b42e398b1cb8fe98cc13cc70a2b9b1118e155a4ebc80783743e2f85ad09b1d48735112e807e902095d92035
 DIST geoip-1.1.1.tgz 13004 BLAKE2B fe073b9459c434751ea0291ce6802041db47254f9d2d5b930db51751b3a66ce5cf925dc4bd07764920748b1735f26ba8bd136654e08ed9c24ac3b520e842f45d SHA512 395715297726aa8e7ed71297d403bea9cb08417a03adfca29dc6ea68bbc738c176f71ea621f9026109e07cd5a2adc647e2af8e140e18a6af1c8f0fe4ed1a9c6b
 EBUILD pecl-geoip-1.1.1-r4.ebuild 439 BLAKE2B bc68853acc3e32b5a5e5f2b1c0485d346a93a7976735aaa8cbf0e9a94cacb7185083d89f670a8200167254d764d8255dceae1d5be14aaac593c2731f33f9a2f5 SHA512 2dfb9075f54995b439bf67642d2babb448d271c6cde649e8302e4ca7f51c1f5a029114a923131ec1c7c6699428db5128256fb382e6e911fd2e0ab87cc7748f6e
-EBUILD pecl-geoip-1.1.1-r5.ebuild 489 BLAKE2B 33b7073fe499d84d64df5dd07139a350e60bef86bd9f3bae5db8854faeb8a36c2c7286dabd3bcd9b3b53da63da3128aed44246631e70e26eb4efb8390b9c1472 SHA512 9cec410429e6ed5f24d55e71aa7b8a62cd722952acdfced25f0f97e006acc5d81a0b2d976bb67200709665b65a0f17770a7ba7d01ce3846a3a0914134ebb8974
+EBUILD pecl-geoip-1.1.1-r5.ebuild 541 BLAKE2B 13808da76505886faf7f8a32fc009795e58dacc3ce9a878f586abefb31c37cdfea1a97574d49923272378f52690fbdbaba4dffaa9418d3b695f330ad5e2556b1 SHA512 207605da880c707e3b7ec25e59ba2b3e1d239d9bcc72c82860ef32719b3017a84194d07a56ee8292a2238482b469d46fd2cb721292cd9fd67d4d674e3ec22d57
 MISC metadata.xml 240 BLAKE2B f60f325331d493a555e53c29c7cf2742a415356da28a467505f1441f3fd790fd0d59050df84854bdc379d19d94a46121216479807975a2922d5a2fefde83416b SHA512 fada9d69055f2be962b95aac82f260ec5db7a3f4392d10f0458a1d125938fa17539f7ec486000f3a95cff85a3fbb6bbf1f6f4fe6c2de7aa420a7543a3e89d03e
diff --git a/dev-php/pecl-geoip/files/fix-failing-tests-php8-1-1.1.1.patch b/dev-php/pecl-geoip/files/fix-failing-tests-php8-1-1.1.1.patch
new file mode 100644
index 000000000000..a2f8353b438c
--- /dev/null
+++ b/dev-php/pecl-geoip/files/fix-failing-tests-php8-1-1.1.1.patch
@@ -0,0 +1,71 @@
+diff --git a/tests/014.phpt b/tests/014.phpt
+index 40f3ef8..93bc1f7 100644
+--- a/tests/014.phpt
++++ b/tests/014.phpt
+@@ -8,10 +8,9 @@ Checking timezone info with (some) empty fields
+ <?php
+ 
+ var_dump(geoip_time_zone_by_country_and_region('US','MA'));
+-var_dump(geoip_time_zone_by_country_and_region('US',NULL));
++var_dump(geoip_time_zone_by_country_and_region('US',''));
+ var_dump(geoip_time_zone_by_country_and_region('DE'));
+-var_dump(geoip_time_zone_by_country_and_region(NULL,''));
+-var_dump(geoip_time_zone_by_country_and_region(NULL,NULL));
++var_dump(geoip_time_zone_by_country_and_region('',''));
+ 
+ ?>
+ --EXPECTF--
+@@ -21,6 +20,3 @@ string(%d) "Europe/%s"
+ 
+ Warning: geoip_time_zone_by_country_and_region(): You need to specify at least the country code. in %s on line %d
+ bool(false)
+-
+-Warning: geoip_time_zone_by_country_and_region(): You need to specify at least the country code. in %s on line %d
+-bool(false)
+diff --git a/tests/016.phpt b/tests/016.phpt
+index 83c5250..9b2f056 100644
+--- a/tests/016.phpt
++++ b/tests/016.phpt
+@@ -8,10 +8,8 @@ Checking geoip_region_name_by_code with (some) empty fields
+ <?php
+ 
+ var_dump(geoip_region_name_by_code('CA',''));
+-var_dump(geoip_region_name_by_code('CA',NULL));
+ var_dump(geoip_region_name_by_code('CA',1));
+ var_dump(geoip_region_name_by_code('','QC'));
+-var_dump(geoip_region_name_by_code(NULL,'QC'));
+ var_dump(geoip_region_name_by_code(1,'QC'));
+ 
+ ?>
+@@ -19,12 +17,6 @@ var_dump(geoip_region_name_by_code(1,'QC'));
+ 
+ Warning: geoip_region_name_by_code(): You need to specify the country and region codes. in %s on line %d
+ bool(false)
+-
+-Warning: geoip_region_name_by_code(): You need to specify the country and region codes. in %s on line %d
+-bool(false)
+-bool(false)
+-
+-Warning: geoip_region_name_by_code(): You need to specify the country and region codes. in %s on line %d
+ bool(false)
+ 
+ Warning: geoip_region_name_by_code(): You need to specify the country and region codes. in %s on line %d
+diff --git a/tests/019.phpt b/tests/019.phpt
+new file mode 100644
+index 0000000..9493ea3
+--- /dev/null
++++ b/tests/019.phpt
+@@ -0,0 +1,13 @@
++--TEST--
++Checking geoip_country_code_by_name_v6 (if IPv6 DB installed)
++--SKIPIF--
++<?php if (!extension_loaded("geoip") || !defined("GEOIP_COUNTRY_EDITION_V6") || !geoip_db_avail(GEOIP_COUNTRY_EDITION_V6)) print "skip"; ?>
++--INI--
++--FILE--
++<?php
++
++var_dump( geoip_country_code_by_name_v6('2001:4860:4860::8888') );
++
++?>
++--EXPECT--
++string(2) "US"
diff --git a/dev-php/pecl-geoip/pecl-geoip-1.1.1-r5.ebuild b/dev-php/pecl-geoip/pecl-geoip-1.1.1-r5.ebuild
index f5bbf1f24038..d7d644983bb4 100644
--- a/dev-php/pecl-geoip/pecl-geoip-1.1.1-r5.ebuild
+++ b/dev-php/pecl-geoip/pecl-geoip-1.1.1-r5.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 PHP_EXT_NAME="geoip"
 DOCS="README ChangeLog"
-USE_PHP="php7-2 php7-3 php7-4 php8-0"
+USE_PHP="php7-3 php7-4 php8-0 php8-1"
 
 inherit php-ext-pecl-r3
 
@@ -22,4 +22,5 @@ RDEPEND="${DEPEND}"
 PATCHES=(
 	"${FILESDIR}/fix-failing-tests-1.1.1.patch"
 	"${FILESDIR}/php8-support-1.1.1.patch"
+	"${FILESDIR}/fix-failing-tests-php8-1-1.1.1.patch"
 )
diff --git a/dev-php/pecl-gnupg/Manifest b/dev-php/pecl-gnupg/Manifest
index 51dac310bf42..6ba8ed943bd3 100644
--- a/dev-php/pecl-gnupg/Manifest
+++ b/dev-php/pecl-gnupg/Manifest
@@ -1,3 +1,4 @@
+AUX php-8.1-support-1.5.0.patch 2427 BLAKE2B a33bbc7eadcc4555db41e37311978c7052af7a62f3b864fbf42d2099b26cb5837e0a33a6d5486131fd3e0d5d95f1dd0ce9b28db17d9f2372872714c018a68ef7 SHA512 991fd8c0d3e07097e3d73a1ddbba165e7afaa938d8dc25ba5c803a17a65d6022634a010388ac356a58efb6f41c2ef4eef50c4ec89efdb3ab9a87af32e23847fb
 DIST gnupg-1.5.0.tgz 37045 BLAKE2B 61031a493fc460b102c0a2e831e7523c4eeafc203d51a40d8aa902992740d96e3f1f46437a51a65dceefa283845d00d0b39db90163b7901a29cd133ddfc34d7c SHA512 1b4f9a39a2c585c5f8d749f8e2e2256d9765480ef8ef93c24c538b2f1284dacf8e9f71a42f96fa3150ace1a6ff37256a7a849f29a3e57332fe3b05656e4199cc
-EBUILD pecl-gnupg-1.5.0.ebuild 520 BLAKE2B 2cb55233be9dadb82cd4a391f45886aecd73663b0976dd29bfa4f865f51a5f364f1a50ff17aa25bdf35d3df136cc6d170c42b8ceb629ec8bab286664f02f1365 SHA512 e7353fed5f3ad02b2efe7f60b227690237fa459aaccbf2cbf71b5b904364ffe27dd03ddda617fb5dcbcb2cb7cd2a9de304bbdc5d35a4139bb3d6554485d3d512
+EBUILD pecl-gnupg-1.5.0.ebuild 582 BLAKE2B 6bf106749361f308941c26ab58dbd356a1fd6eef372b39f76debbb25f4777cbea86727d363b2b132fc4cc1c2887b38493c65b6a6ec00e9b624e67ad618b1fde2 SHA512 5dd45badea874360de67d29703236bd4fafab52f72ca04ae2c0013d3186bd859116805566efe496317919a363d74ca5b656c5859791c43748a72674a87b12344
 MISC metadata.xml 236 BLAKE2B 55612da78a71f8cee31c387a5862636996734210d765fac66d8c7706acc5151e6a9e7ff5123aeb097c911495c6220ba3b5d2f1355f46e8ab6bdb240e1697e26d SHA512 2782b20a65dca663ff7c64b7e67db05641abed478fd5996e5750b2e52ba870829f89125baa8967dd29fd20ef9b46ad233b0dd08801308b7756717ec2f292446c
diff --git a/dev-php/pecl-gnupg/files/php-8.1-support-1.5.0.patch b/dev-php/pecl-gnupg/files/php-8.1-support-1.5.0.patch
new file mode 100644
index 000000000000..c755ccd0c5b8
--- /dev/null
+++ b/dev-php/pecl-gnupg/files/php-8.1-support-1.5.0.patch
@@ -0,0 +1,55 @@
+diff --git a/phpc.h b/phpc.h
+index 4b55747..70fb317 100644
+--- a/phpc/phpc.h
++++ b/phpc/phpc.h
+@@ -51,6 +51,12 @@
+ 	memcpy(&PHPC_OBJ_GET_HANDLER_VAR_NAME(_name), \
+ 		zend_get_std_object_handlers(), sizeof(zend_object_handlers))
+ 
++/* for arginfo */
++#ifndef ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX
++#define ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(name, return_reference, required_num_args, type, allow_null) \
++        ZEND_BEGIN_ARG_INFO_EX(name, 0, return_reference, required_num_args)
++#endif
++
+ /* ZEND_ACC_CTOR and ZEND_ACC_DTOR is removed in 7.4 */
+ #ifndef ZEND_ACC_CTOR
+ #define ZEND_ACC_CTOR 0
+diff --git a/gnupg_keylistiterator.c b/gnupg_keylistiterator.c
+index 215aaa0..9b285ee 100644
+--- a/gnupg_keylistiterator.c
++++ b/gnupg_keylistiterator.c
+@@ -90,14 +90,28 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_gnupg_void_iterator_method, 0, 0, 0)
+ ZEND_END_ARG_INFO()
+ /* }}} */
+ 
++ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_gnupg_current, 0, 0, IS_MIXED, 0)
++ZEND_END_ARG_INFO()
++
++#define arginfo_gnupg_key arginfo_gnupg_current
++
++ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_gnupg_valid, 0, 0, _IS_BOOL, 0)
++ZEND_END_ARG_INFO()
++
++ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_gnupg_next, 0, 0, IS_VOID, 0)
++ZEND_END_ARG_INFO()
++
++#define arginfo_gnupg_rewind  arginfo_gnupg_next
++
++
+ /* {{{ method list gnupg_keylistiterator */
+ static zend_function_entry gnupg_keylistiterator_methods[] = {
+ 	PHP_ME(gnupg_keylistiterator, __construct, arginfo_gnupg_void_iterator_method, ZEND_ACC_PUBLIC)
+-	PHP_ME(gnupg_keylistiterator, current, arginfo_gnupg_void_iterator_method, ZEND_ACC_PUBLIC)
+-	PHP_ME(gnupg_keylistiterator, key, arginfo_gnupg_void_iterator_method, ZEND_ACC_PUBLIC)
+-	PHP_ME(gnupg_keylistiterator, next, arginfo_gnupg_void_iterator_method, ZEND_ACC_PUBLIC)
+-	PHP_ME(gnupg_keylistiterator, rewind, arginfo_gnupg_void_iterator_method, ZEND_ACC_PUBLIC)
+-	PHP_ME(gnupg_keylistiterator, valid, arginfo_gnupg_void_iterator_method, ZEND_ACC_PUBLIC)
++	PHP_ME(gnupg_keylistiterator, current, arginfo_gnupg_current, ZEND_ACC_PUBLIC)
++	PHP_ME(gnupg_keylistiterator, key, arginfo_gnupg_key, ZEND_ACC_PUBLIC)
++	PHP_ME(gnupg_keylistiterator, next, arginfo_gnupg_next, ZEND_ACC_PUBLIC)
++	PHP_ME(gnupg_keylistiterator, rewind, arginfo_gnupg_rewind, ZEND_ACC_PUBLIC)
++	PHP_ME(gnupg_keylistiterator, valid, arginfo_gnupg_valid, ZEND_ACC_PUBLIC)
+ 	PHPC_FE_END
+ };
+ /* }}} */
diff --git a/dev-php/pecl-gnupg/pecl-gnupg-1.5.0.ebuild b/dev-php/pecl-gnupg/pecl-gnupg-1.5.0.ebuild
index b489fe2f6453..8d3304139c7a 100644
--- a/dev-php/pecl-gnupg/pecl-gnupg-1.5.0.ebuild
+++ b/dev-php/pecl-gnupg/pecl-gnupg-1.5.0.ebuild
@@ -10,7 +10,7 @@ PHP_EXT_ZENDEXT="no"
 PHP_EXT_PECL_FILENAME="${MY_P}.tgz"
 PHP_EXT_S="${WORKDIR}/${MY_P}"
 
-USE_PHP="php7-3 php7-4 php8-0"
+USE_PHP="php7-3 php7-4 php8-0 php8-1"
 
 inherit php-ext-pecl-r3
 
@@ -24,3 +24,5 @@ IUSE=""
 
 DEPEND="app-crypt/gpgme app-crypt/gnupg"
 RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/php-8.1-support-1.5.0.patch" )
diff --git a/dev-php/pecl-lzf/Manifest b/dev-php/pecl-lzf/Manifest
index 9300d8acd69b..2a78c710ad7f 100644
--- a/dev-php/pecl-lzf/Manifest
+++ b/dev-php/pecl-lzf/Manifest
@@ -1,3 +1,3 @@
 DIST LZF-1.6.8.tgz 18071 BLAKE2B 83a12c44c02145baac75bc7b5172b09a6a15d4d02852f25d56ea97cf58a83709d59d56cb12be7df510fd687fd5ade760939527ee8151d3ecdb4407b7be2022e3 SHA512 c35543a40b2b44da4bd60e3142ba6ecf33e3460a8ea9f4f7fe6cdc4d728048593b33c423195d58707355975d655f614249642aff2d9b810af0e6a34d42fa1c43
-EBUILD pecl-lzf-1.6.8-r1.ebuild 362 BLAKE2B 5fdc958b627eedabaf9f571b2c28631156b53422dcc4c0c2362050fc8c94b1176ed0d1d40641e7f6bc602f9eb679a77c6d5cf110dfcbbde54e100c698d2bbe2b SHA512 546ad4a80e992e9d75c393de75d8f3c5e7d0e84e329fee3a621b6290ec2151502baf4a2fd12d3897e5130fcc18e88350f363b6c3da2e0f1a43f968909f4ef948
+EBUILD pecl-lzf-1.6.8-r1.ebuild 369 BLAKE2B 46a7c56ec46b55cc489b53b640bcda085f713869d5c4a9e300043b718d6cd0933edea7e0ee2297e440d574cd3f5b9df3a4fedabdbe3c74e2c4e91f531c158cf1 SHA512 cb500f90402fb3e130a6c0cb2168fc8eee0681f6af4e299612026c7bbd786ba93beb906d0fb587b8dd26a0fdf3a62b532f25d1eb67a955db254a6095e4354ef1
 MISC metadata.xml 236 BLAKE2B 55612da78a71f8cee31c387a5862636996734210d765fac66d8c7706acc5151e6a9e7ff5123aeb097c911495c6220ba3b5d2f1355f46e8ab6bdb240e1697e26d SHA512 2782b20a65dca663ff7c64b7e67db05641abed478fd5996e5750b2e52ba870829f89125baa8967dd29fd20ef9b46ad233b0dd08801308b7756717ec2f292446c
diff --git a/dev-php/pecl-lzf/pecl-lzf-1.6.8-r1.ebuild b/dev-php/pecl-lzf/pecl-lzf-1.6.8-r1.ebuild
index 2cce616bb3dc..87fa3d23cf24 100644
--- a/dev-php/pecl-lzf/pecl-lzf-1.6.8-r1.ebuild
+++ b/dev-php/pecl-lzf/pecl-lzf-1.6.8-r1.ebuild
@@ -7,7 +7,7 @@ PHP_EXT_NAME="lzf"
 PHP_EXT_PECL_PKG="LZF"
 PHP_EXT_INI="yes"
 PHP_EXT_ZENDEXT="no"
-USE_PHP="php7-3 php7-4 php8-0"
+USE_PHP="php7-3 php7-4 php8-0 php8-1"
 
 inherit php-ext-pecl-r3
 
diff --git a/dev-php/pecl-memcache/Manifest b/dev-php/pecl-memcache/Manifest
index d2d156c2b789..6c6cfa482db8 100644
--- a/dev-php/pecl-memcache/Manifest
+++ b/dev-php/pecl-memcache/Manifest
@@ -1,5 +1,7 @@
+AUX 8.0-patches-20211123.patch 5706 BLAKE2B 66b9671357963c0f7c0f32f3b578f4b38acda7024e8c33bb03e328b4177c20841b8318482122b343d407d6dc5e4182d8fc74ae3dfc186ad8d606372d024a4807 SHA512 6e66664ca4aa7d3578facbdad012506b3b12fdae7460c9cad5f515228f697e511bbb02fe7f9a2efcfc3066877688bd7092e81a26199d5e26097f365806079eab
 DIST memcache-4.0.5.2.tgz 75061 BLAKE2B fbf96fd182ff4b8764c4492edcdac53263176ebe6d63a27e9f3fb32110a016b221722c246e7c1ae49ee973a6e4cdff045876d1c6119f410f2fa3e796c0580e02 SHA512 93e163acf3a6c28f16b5f0982105f6f558cceeb314b3f09ad71655d8a5adf64d23959f1a2f3589eb7e7a7e18c88ba8132014e13f697a737cd570cf9405137384
 DIST memcache-8.0.tgz 78448 BLAKE2B fb2d68d5ff4c6343dd2e66ae5c3f84fed22455b8614dce04dde2e10c164bf1f8d276776b74beaa387dd794cf82f6b897a88c8bed058376b9032e0452c2e94b06 SHA512 d5eea13b85d8d35ef6aab8c5699bdcc4707cf8debf4052cbbeac26e7e2360a4d3d4e55e8bd0b40cf19fe014ba1fc42d5417deabbe22a199f0c6aa98b67d132d4
-EBUILD pecl-memcache-4.0.5.2-r1.ebuild 1805 BLAKE2B e32b359ffd8172d00d49d48b3ae4c4e24e8480dc435f1b16db4a93caf6d732ab78a9fc3381af89c976e499b910d07e6130f33ec5f7223002e4eec246d982cae5 SHA512 40fe55730d2dfddb278bc5a6ccc055dfe40a34a7ff780a29022a563e28adb3f054cb5e7d99010aa240827cd6558e9ce383f1d7b0c077e0afc81d71b39178ec4b
+EBUILD pecl-memcache-4.0.5.2-r1.ebuild 1885 BLAKE2B b7eb2414249e1f70cdaae0bc8b72e844d0af77630b9fe1eca66cd85d7ed3627877266712546638d212a940e1bac7c2f6f5f6e2d8df969434de08e4e2e1e7f2c2 SHA512 880c12ae73ca9d657471c322c89e2fc3e3a84facd213af91b03533d2a46173eeaa3698112698d8ca78c3a53f8fa0cd9bfc6182516e124bb7b88c1486d02789a7
+EBUILD pecl-memcache-8.0-r1.ebuild 1942 BLAKE2B 56b4ffb0ef6db116d9190b01bb1ec0b9a1841435afe36809f777882978fbcff2ddb4df0b2385c173634c5e7fb97abdbcf4e7616610768281779c9532b0bb0e9a SHA512 5e4409632b5e953f63df237ee428db8a41e668fb39149b2707d60ccc7d10e74a039ee935e05b7dde4c8cc253d35fed73fbe126b0f35546225caf5788a14a2ef6
 EBUILD pecl-memcache-8.0.ebuild 1755 BLAKE2B 0c765afbcdda82b52c5eac24b06dfbba5d2864a7f0673dc0c1cc88931ef9355a1b914ee97dedbc821a1213b5b564d59402525e0c8d77538a5d35911b55f29b61 SHA512 b32040a18f5b898afbb1cb8297e4de732973cb9c3863b7485dac2d05ab3b311351f2b3d9e6ad0608bdfce2ed54daa252557a91ee7ecc5bb37c2e802b45fbaa29
 MISC metadata.xml 240 BLAKE2B f60f325331d493a555e53c29c7cf2742a415356da28a467505f1441f3fd790fd0d59050df84854bdc379d19d94a46121216479807975a2922d5a2fefde83416b SHA512 fada9d69055f2be962b95aac82f260ec5db7a3f4392d10f0458a1d125938fa17539f7ec486000f3a95cff85a3fbb6bbf1f6f4fe6c2de7aa420a7543a3e89d03e
diff --git a/dev-php/pecl-memcache/files/8.0-patches-20211123.patch b/dev-php/pecl-memcache/files/8.0-patches-20211123.patch
new file mode 100644
index 000000000000..9005ac5feef3
--- /dev/null
+++ b/dev-php/pecl-memcache/files/8.0-patches-20211123.patch
@@ -0,0 +1,204 @@
+diff --git a/Dockerfile b/Dockerfile
+index a52759e..506c28a 100644
+--- a/Dockerfile
++++ b/Dockerfile
+@@ -1,10 +1,13 @@
+ ARG PHP_IMAGE=php:8.0
+ FROM $PHP_IMAGE
+ 
++RUN docker-php-ext-configure pcntl --enable-pcntl \
++    && docker-php-ext-install -j$(nproc) pcntl
++
+ RUN apt-get update && apt-get install -y \ 
+ 	git \
+ 	zlib1g-dev \
+-	memcached ; 
++	memcached ;
+ 
+ COPY docker/host.conf /etc/host.conf
+ 
+diff --git a/README b/README
+index b36fa46..07f8f89 100644
+--- a/README
++++ b/README
+@@ -3,7 +3,7 @@ This is an official repository for pecl-memcache plugin since 2019.
+ This repository contains modified pecl-memcache plugin ported to PHP8,
+ which was originally developed for the need of hosting company in Slovakia (Websupport.sk). 
+ 
+-The latest release is 8.0 (released: 2020-12-06) with support for PHP 8.0.
++The latest release is 8.0 (released: 2020-12-06) with support for PHP 8.0 and unofficial support for PHP 7.3 and 7.4
+ 
+ Please use version 4.0.5.1 (released: 2020-12-19) for PHP 7.x from branch NON_BLOCKING_IO_php7.
+ 
+diff --git a/Vagrantfile b/Vagrantfile
+new file mode 100644
+index 0000000..8665890
+--- /dev/null
++++ b/Vagrantfile
+@@ -0,0 +1,17 @@
++# -*- mode: ruby -*-
++# vi: set ft=ruby :
++
++VAGRANTFILE_API_VERSION = '2'
++
++Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
++    config.vm.box = 'ubuntu/bionic64'
++
++    config.vm.provider :virtualbox do |vb|
++        vb.name = 'ext-memcache-dev'
++        vb.memory = 1024
++        vb.cpus = 2
++    end
++
++    config.vm.provision 'docker'
++
++end
+diff --git a/src/memcache.c b/src/memcache.c
+index 7c3a660..2cb675b 100644
+--- a/src/memcache.c
++++ b/src/memcache.c
+@@ -924,7 +924,7 @@ static void php_mmc_store(INTERNAL_FUNCTION_PARAMETERS, int op) /* {{{ */
+ 				continue;
+ 			}
+ 
+-			/* begin sending requests immediatly */
++			/* begin sending requests immediately */
+ 			mmc_pool_select(pool);
+ 		} ZEND_HASH_FOREACH_END();
+ 	}
+@@ -1089,7 +1089,7 @@ static void php_mmc_numeric(INTERNAL_FUNCTION_PARAMETERS, int deleted, int inver
+ 				continue;
+ 			}
+ 
+-			/* begin sending requests immediatly */
++			/* begin sending requests immediately */
+ 			mmc_pool_select(pool);
+ 		} ZEND_HASH_FOREACH_END();
+ 
+@@ -1319,8 +1319,9 @@ static void php_mmc_connect(INTERNAL_FUNCTION_PARAMETERS, zend_bool persistent)
+ 	size_t host_len;
+ 	zend_long tcp_port = MEMCACHE_G(default_port);
+ 	double timeout = MMC_DEFAULT_TIMEOUT;
++	zend_bool null_port;
+ 
+-	if (zend_parse_parameters(ZEND_NUM_ARGS(), "s|ld", &host, &host_len, &tcp_port, &timeout) == FAILURE) {
++	if (zend_parse_parameters(ZEND_NUM_ARGS(), "s|l!d", &host, &host_len, &tcp_port, &null_port, &timeout) == FAILURE) {
+ 		return;
+ 	}
+ 
+@@ -2492,7 +2493,7 @@ PHP_FUNCTION(memcache_flush)
+ 		pool->protocol->flush(request, delay);
+ 
+ 		if (mmc_pool_schedule(pool, pool->servers[i], request) == MMC_OK) {
+-			/* begin sending requests immediatly */
++			/* begin sending requests immediately */
+ 			mmc_pool_select(pool);
+ 		}
+ 	}
+diff --git a/src/memcache_pool.c b/src/memcache_pool.c
+index 733a0c5..e52389d 100644
+--- a/src/memcache_pool.c
++++ b/src/memcache_pool.c
+@@ -1303,7 +1303,7 @@ int mmc_pool_schedule_get(
+ 		pool->protocol->end_get(mmc->buildreq);
+ 		mmc_pool_schedule(pool, mmc, mmc->buildreq);
+ 
+-		/* begin sending requests immediatly */
++		/* begin sending requests immediately */
+ 		mmc_pool_select(pool);
+ 
+ 		mmc->buildreq = mmc_pool_request_get(
+diff --git a/src/memcache_session.c b/src/memcache_session.c
+index e4a80de..d3aab24 100644
+--- a/src/memcache_session.c
++++ b/src/memcache_session.c
+@@ -319,7 +319,7 @@ PS_READ_FUNC(memcache)
+ 			ZVAL_NULL(&addresult);
+ 
+ 			/* third request fetches the data, data is only valid if either of the lock requests succeeded */
+-			ZVAL_EMPTY_STRING(&dataresult);
++			ZVAL_NULL(&dataresult);
+ 
+ 			/* create requests */
+ 			if (php_mmc_session_read_request(pool, &zkey, lockparam, &addresult, dataparam, &lockrequest, &addrequest, &datarequest) != MMC_OK) {
+diff --git a/tests/redundancy_test.phpt b/tests/redundancy_test.phpt
+new file mode 100644
+index 0000000..fb5ab84
+--- /dev/null
++++ b/tests/redundancy_test.phpt
+@@ -0,0 +1,75 @@
++--TEST--
++redundancy test
++--SKIPIF--
++<?php include 'connect.inc'; if (!MEMCACHE_HAVE_SESSION) print 'skip not compiled with session support'; else if (!function_exists('pcntl_fork')) print 'skip not compiled with pcntl_fork() support'; ?>
++--FILE--
++<?php
++
++include 'connect.inc';
++
++$sid = md5(rand());
++
++ini_set('session.save_handler', 'memcache');
++ini_set('memcache.session_save_path', "tcp://$host:$port,tcp://$host2:$port2");
++ini_set('memcache.session_redundancy', 3);
++
++$memcache1 = test_connect1();
++$memcache2 = test_connect2();
++
++$pid = pcntl_fork();
++if (!$pid) {
++    // In child process
++    session_id($sid);
++    session_start();
++    if (!isset($_SESSION['counter']))
++        $_SESSION['counter'] = 0;
++    $_SESSION['counter'] += 1;
++    session_write_close();
++
++    exit(0);
++}
++pcntl_waitpid($pid, $status);
++
++$memcache1->flush();
++
++$pid = pcntl_fork();
++if (!$pid) {
++    // In child process
++    session_id($sid);
++    session_start();
++    if (!isset($_SESSION['counter']))
++        $_SESSION['counter'] = 0;
++    $_SESSION['counter'] += 1;
++    session_write_close();
++
++    exit(0);
++}
++pcntl_waitpid($pid, $status);
++
++$memcache2->flush();
++
++$pid = pcntl_fork();
++if (!$pid) {
++    // In child process
++    session_id($sid);
++    session_start();
++    if (!isset($_SESSION['counter']))
++        $_SESSION['counter'] = 0;
++    $_SESSION['counter'] += 1;
++    session_write_close();
++
++    exit(0);
++}
++pcntl_waitpid($pid, $status);
++
++
++session_id($sid);
++session_start();
++var_dump($_SESSION);
++
++?>
++--EXPECT--
++array(1) {
++  ["counter"]=>
++  int(3)
++}
diff --git a/dev-php/pecl-memcache/pecl-memcache-4.0.5.2-r1.ebuild b/dev-php/pecl-memcache/pecl-memcache-4.0.5.2-r1.ebuild
index 10134a07db4d..240a4d9d5754 100644
--- a/dev-php/pecl-memcache/pecl-memcache-4.0.5.2-r1.ebuild
+++ b/dev-php/pecl-memcache/pecl-memcache-4.0.5.2-r1.ebuild
@@ -9,7 +9,7 @@ PHP_EXT_NEEDED_USE="session(-)?"
 DOCS=( README example.php )
 HTML_DOCS=( memcache.php )
 
-USE_PHP="php7-3 php7-4 php8-0"
+USE_PHP="php7-3 php7-4 php8-0 php8-1"
 
 inherit php-ext-pecl-r3
 
@@ -25,6 +25,7 @@ IUSE="+session"
 DEPEND="php_targets_php7-3? ( sys-libs/zlib ) php_targets_php7-4? ( sys-libs/zlib )"
 RDEPEND="${DEPEND}
 	php_targets_php8-0? ( dev-php/pecl-memcache:8[php_targets_php8-0(-)?] )
+	php_targets_php8-1? ( dev-php/pecl-memcache:8[php_targets_php8-1(-)?] )
 "
 
 # The test suite requires memcached to be running.
diff --git a/dev-php/pecl-memcache/pecl-memcache-8.0-r1.ebuild b/dev-php/pecl-memcache/pecl-memcache-8.0-r1.ebuild
new file mode 100644
index 000000000000..ec0fa315424c
--- /dev/null
+++ b/dev-php/pecl-memcache/pecl-memcache-8.0-r1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PHP_EXT_NAME="memcache"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+PHP_EXT_NEEDED_USE="session(-)?"
+DOCS=( README example.php )
+HTML_DOCS=( memcache.php )
+
+USE_PHP="php7-3 php7-4 php8-0 php8-1"
+
+inherit php-ext-pecl-r3
+
+USE_PHP="php8-0 php8-1"
+
+KEYWORDS="~amd64 ~hppa ~ppc64 ~x86"
+
+DESCRIPTION="PHP extension for using memcached"
+LICENSE="PHP-3"
+SLOT="8"
+IUSE="+session"
+
+DEPEND="
+	php_targets_php8-0? ( sys-libs/zlib )
+	php_targets_php8-1? ( sys-libs/zlib )
+"
+RDEPEND="${DEPEND}
+	php_targets_php7-3? ( dev-php/pecl-memcache:7[php_targets_php7-3(-)?] )
+	php_targets_php7-4? ( dev-php/pecl-memcache:7[php_targets_php7-4(-)?] )
+"
+
+# The test suite requires memcached to be running.
+RESTRICT='test'
+PATCHES=( "${FILESDIR}/8.0-patches-20211123.patch" )
+
+src_prepare() {
+	if use php_targets_php8-0 || use php_targets_php8-1 ; then
+		php-ext-source-r3_src_prepare
+	else
+		default
+	fi
+}
+
+src_configure() {
+	if use php_targets_php8-0 || use php_targets_php8-1 ; then
+		local PHP_EXT_ECONF_ARGS=( --enable-memcache --with-zlib-dir="${EPREFIX}/usr" $(use_enable session memcache-session) )
+		php-ext-source-r3_src_configure
+	fi
+}
+
+src_install() {
+	if use php_targets_php8-0 || use php_targets_php8-1 ; then
+		php-ext-pecl-r3_src_install
+
+		php-ext-source-r3_addtoinifiles "memcache.allow_failover" "true"
+		php-ext-source-r3_addtoinifiles "memcache.max_failover_attempts" "20"
+		php-ext-source-r3_addtoinifiles "memcache.chunk_size" "32768"
+		php-ext-source-r3_addtoinifiles "memcache.default_port" "11211"
+		php-ext-source-r3_addtoinifiles "memcache.hash_strategy" "consistent"
+		php-ext-source-r3_addtoinifiles "memcache.hash_function" "crc32"
+		php-ext-source-r3_addtoinifiles "memcache.redundancy" "1"
+		php-ext-source-r3_addtoinifiles "memcache.session_redundancy" "2"
+		php-ext-source-r3_addtoinifiles "memcache.protocol" "ascii"
+	fi
+}
diff --git a/dev-php/pecl-memcached/Manifest b/dev-php/pecl-memcached/Manifest
index 3e731567ede1..6af284b18f3f 100644
--- a/dev-php/pecl-memcached/Manifest
+++ b/dev-php/pecl-memcached/Manifest
@@ -2,5 +2,5 @@ AUX 3.1.5-fix-tests.patch 1032 BLAKE2B 15b91b77b645ea298f2334df6d4a0b804735d38dc
 DIST memcached-3.1.5.tgz 83015 BLAKE2B 80f5cbed8e34f867962792d95d242015690f64ab3b462e09813a11b8b86234b0b05b0f6a78f7c6184482b66ba8015064b37f77bbb816a3aee2edd0ce97ab0cbc SHA512 87d5fd079fcaad81139785d6766da71b23a1a0fe907d4b22f3a787af148a20412c11df11c4d98c165241658baf0d87c8a6b29de15db07a0f9d1fabc8aec8f0e9
 DIST pecl-memcached-3.1.5_p20210807.tar.gz 99221 BLAKE2B 7a6a92701d17ce2c108cda862d52cebbae38e993e4182fd23ce78ea1cbebbdba6d46a71258b7dd388ff38f2b7b04c94ca822954ff931111fd9bfc64d578a6f26 SHA512 3c124f969efcd3bcc513e3e347828ac6e0a5540379f7d3a83c306d65a02ece3c76f87e3db52153c5d2f2c03c5fafb646f6b3b33c0b1d5afbb71ffa22d2df6f90
 EBUILD pecl-memcached-3.1.5-r1.ebuild 1582 BLAKE2B 7cb8c180c14bf80a1e4447bfde1c1087f483c582b3f748c819b2e1d9393e5eb5c8a3ac7c4c0cd99d8dd62ecfd2eb302cf83224fdf7de370d21e9a2520b6990cf SHA512 b9aa92fafe9a68a647e3e76212b40c36b65ebcfed423d82a22fe3aad146149a1d915a895cf77c06830b9a0bb589d992d4470e640365f3beb7f46d5c5b3e70662
-EBUILD pecl-memcached-3.1.5_p20210807.ebuild 2511 BLAKE2B 85175013cef923982265442f9551ed434c134a329aeae53c24580e921dc8284e9cb5a25b8ab974534983767e04e3834e3eaa4aed7d62d141fbe6d83080d5a95f SHA512 9c8fe68e8cc390820af6185c2bf4a4a8114c708d5410242c3cc29477b2a5a89f0330d6a9a9035113dd2cbf5428d7365f2f795589a32611823d11aaafae8e122b
+EBUILD pecl-memcached-3.1.5_p20210807.ebuild 2650 BLAKE2B 06d94ad81a17dd31d9b1988907cb540385ce816bf2b649f6cb5b1b9aca9b986996d1b6375f7168d096b7435ead2a5bf1f54eeb1a82bc3cf3e244f3548148b758 SHA512 946d76c95f96ca6e0d4b416f4c5d145eff164144c7aa71be7a3e0bdb077e7c99fadff9ee20bd2cc9d23c4690a1954c55e98071bb2fa52068c5c78ad7c7e321c5
 MISC metadata.xml 569 BLAKE2B 686b6c91f4d91fb82bd90b08af6627a8211e9676139417551e8a8425da410c15a77b79ff51760c2a16815c84c55c1e81ff462af17282ffa198db0829b20566c6 SHA512 8f3154fc7f3c9d1707b121ddc8d94d8d5570f7ca0cc93c0f732cda3ba6a756ed421a6facd96000ade0c22af9a78efbdd69ec118bd195c4c83fc523f2cd7e1cc7
diff --git a/dev-php/pecl-memcached/pecl-memcached-3.1.5_p20210807.ebuild b/dev-php/pecl-memcached/pecl-memcached-3.1.5_p20210807.ebuild
index 246535a68f31..baa39cff1a1b 100644
--- a/dev-php/pecl-memcached/pecl-memcached-3.1.5_p20210807.ebuild
+++ b/dev-php/pecl-memcached/pecl-memcached-3.1.5_p20210807.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 PHP_EXT_NAME="memcached"
 DOCS=( ChangeLog README.markdown )
 
-USE_PHP="php7-3 php7-4 php8-0"
+USE_PHP="php7-3 php7-4 php8-0 php8-1"
 inherit php-ext-pecl-r3
 
 DESCRIPTION="Interface PHP with memcached via libmemcached library"
@@ -34,7 +34,12 @@ RDEPEND="
 	php_targets_php8-0? (
 		${COMMON_DEPEND} dev-lang/php:8.0[session(-)?]
 		igbinary? ( dev-php/igbinary[php_targets_php8-0(-)] )
-	)"
+	)
+	php_targets_php8-1? (
+		${COMMON_DEPEND} dev-lang/php:8.1[session(-)?]
+		igbinary? ( dev-php/igbinary[php_targets_php8-1(-)] )
+	)
+"
 DEPEND="${RDEPEND} test? ( net-misc/memcached )"
 
 PATCHES=( "${FILESDIR}/3.1.5-fix-tests.patch" )
diff --git a/dev-php/pecl-mongodb/Manifest b/dev-php/pecl-mongodb/Manifest
index 7dc1b6878e76..d5d1a7c1a96e 100644
--- a/dev-php/pecl-mongodb/Manifest
+++ b/dev-php/pecl-mongodb/Manifest
@@ -5,7 +5,7 @@ DIST mongodb-1.8.0.tgz 1292928 BLAKE2B 3bd9e5eb6b981010637b9e478928fa21268e1d144
 DIST mongodb-1.8.1.tgz 1292453 BLAKE2B 25fe36b7d966a4dcf631764aeb93c09932cc0643e46fe5e594d9223a9d3f099b75211a813114c3e8cd4a1722da774b669ef968fdbb1d4877a81cf1f637890997 SHA512 a80682e3a90ead699a930185c3d10bc3a86b335b45891be6d41ef829fab6f2f2468adb5973735048fa98bb6aaa9c8568ba9f7df5709916d5b6f7676c77188d0c
 DIST mongodb-1.9.0.tgz 1300408 BLAKE2B 1cf6a43694e8113df8028c2663db8049421140d53124e6dcf8cb3e42daf961dc6a63cc930c765874eb1ccac13d419980d883e42ba33f3ea389b07ea006217432 SHA512 80ad3caddde045fe5e879167b2b4cfc27bdabf6d3667df4df73f33503c329b0d6bf4da6b287fe454301a9a390434eec19971059c6de8d4c9720a79fe7680366d
 DIST mongodb-1.9.1.tgz 1285984 BLAKE2B 7d3dd7635b97d142abdf0882d03f4b7a7b42b9720a8e790dae5d4cfcbee54a2f18d70641851baf9258e59ebe396336ae72956b9f6e09812f017850dbdcc3dd97 SHA512 e1ff9fba2268020862e917a38946a7f5f4cc5caf22b38e9ccf60b491cdee20f55b9643e8904cd934de48d31ca69b1c26dd86454f74572ce977669f908d4ffe51
-EBUILD pecl-mongodb-1.10.0.ebuild 1296 BLAKE2B 3114cfb08c6edf3e1401798f388972a4484a7e296311aa08d3bd8c7c78b32a7e4091b558ae2094ed8333675a068b58da40042d8fe844867309a7f2cc659c62a7 SHA512 f8432613fff1837ece832388bdc6f368981262d4e9e1c1c2b2465e7e1cc7467cc85922449167860e20916f51bc94bab9715aa3964262d6e7e9e3b37fa3a75899
+EBUILD pecl-mongodb-1.10.0.ebuild 1295 BLAKE2B 5e33ce53670fc4bf098e53f3408d702355d108291b0d41605f69d8894ffa0baee62574d3f89812a6f4cae24e77d0c56579a67652ffc6157b6208223a7c3b1d48 SHA512 70536cb7b0a21ae1a863c0679aa8547db16a6e80bcee9c818043907e57e136cc4ff0da565199d99ee9e8c77761f218ac845e4efd5c095e738ade2b24835ce2c0
 EBUILD pecl-mongodb-1.7.4.ebuild 1300 BLAKE2B e478faf0b45dd8ea97b1c80ebc809a09846d107de7b2332417ec8430631942173a48e8bc431d57692684dfcac49b3dff35fd56a021ec25673029e1b9e2c23ff9 SHA512 f1c9ed8e3e82a8025160f72c9e4ae54f268c74d807a7a6177cbdb3cc3339154630b9f72b7e525f7ccfa5a47ddf6689e4bd94653dbc73045daf0fcd81a73f6ee5
 EBUILD pecl-mongodb-1.7.5.ebuild 1302 BLAKE2B 8277a7c2a6a1431975e6f2f3e66d9478ace497d6c3ca56de7fcf80a9943858fb64607e1fe284766e768169bd8ba856c90acf7e19a5869bd5589ec44c3e9518dc SHA512 59d8252eb420f6f5f4cb76d6d86f79ea5076917b94cdac005915dae3837ea012e8d59f4db5e7447b86e34a468b32f6d90b43f44e1a28430be43a76d36cd69b60
 EBUILD pecl-mongodb-1.8.0.ebuild 1302 BLAKE2B fff7c8f4275a08a25c6b639c0492c21acf50a9a234db36664eb5a3d87dd30fd202c642a178d45d4c00f780fa416a0f2e03ce2ae9aee39895cd422fa6425e7d56 SHA512 f0d65b48091d508852d4a8134faf8ed59146469230ce22fbce0f9e040cf0f33bff9b01b98009d39c9ce1b76260f080685df327949d70b74484a4d1e4fd4dc012
diff --git a/dev-php/pecl-mongodb/pecl-mongodb-1.10.0.ebuild b/dev-php/pecl-mongodb/pecl-mongodb-1.10.0.ebuild
index ec9db151c530..5f074999796a 100644
--- a/dev-php/pecl-mongodb/pecl-mongodb-1.10.0.ebuild
+++ b/dev-php/pecl-mongodb/pecl-mongodb-1.10.0.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="MongoDB database driver for PHP"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="sasl test"
 
 PHP_DEPEND="
diff --git a/dev-php/pecl-oauth/Manifest b/dev-php/pecl-oauth/Manifest
index 5108706b4acb..cbbef5c3e3b8 100644
--- a/dev-php/pecl-oauth/Manifest
+++ b/dev-php/pecl-oauth/Manifest
@@ -1,3 +1,3 @@
 DIST oauth-2.0.7.tgz 78926 BLAKE2B 2fbe8f9c6df19790b9f617af64a04ed2387e904c3775753ac23fcf3f796007891a546ad6d5fae9b04cab707905f5ff3e9cc56b5c0b4bd1d9bab8745428c683f8 SHA512 261bbe6d1c4299f44ce40030b3959e26f2535c70d01b7a4e870d14c84b0a01e68484e61907554d720667fa08a2ec00b7d43cf2f523800c832f02b093e7b6534a
-EBUILD pecl-oauth-2.0.7.ebuild 682 BLAKE2B 3774fd14c1b7149041bd2368bde2ff893f30fdd90a6f91216fad5af6eac8a78c0e9817b2705d64eccfb7f28bd3df3ddb7e0c7ed49eca9b44ce7be0dafe9985d3 SHA512 e76e06531162d12ca3ed85a2665c0ac8947a20f80eb720a35fa52a45e4e7034018ef624edf760d971ce124adab5374126eec6274c426d003d6b43a080c578662
+EBUILD pecl-oauth-2.0.7.ebuild 631 BLAKE2B 38a5c70a826a86388420eec23dba7a46d1e55382ecce9de5ba3a06c34757225fd34843387f9659bfe84a182f8c3619e14c6e63588db4d92372509efbdc65583c SHA512 aa4adac7c21dcc112897e578cb8f505e58c88455975fcc59c1c5e3f46df8e89c334b9027eb376a3e22566e654973ac7c2bdb3004f8f609f197a11f9aae021b50
 MISC metadata.xml 240 BLAKE2B f60f325331d493a555e53c29c7cf2742a415356da28a467505f1441f3fd790fd0d59050df84854bdc379d19d94a46121216479807975a2922d5a2fefde83416b SHA512 fada9d69055f2be962b95aac82f260ec5db7a3f4392d10f0458a1d125938fa17539f7ec486000f3a95cff85a3fbb6bbf1f6f4fe6c2de7aa420a7543a3e89d03e
diff --git a/dev-php/pecl-oauth/pecl-oauth-2.0.7.ebuild b/dev-php/pecl-oauth/pecl-oauth-2.0.7.ebuild
index 775332d83c50..ff8cd5c97885 100644
--- a/dev-php/pecl-oauth/pecl-oauth-2.0.7.ebuild
+++ b/dev-php/pecl-oauth/pecl-oauth-2.0.7.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"
@@ -6,7 +6,7 @@ PHP_EXT_NAME="oauth"
 PHP_EXT_INI="yes"
 PHP_EXT_ZENDEXT="no"
 
-USE_PHP="php7-2 php7-3 php7-4 php8-0"
+USE_PHP="php7-3 php7-4 php8-0 php8-1"
 
 inherit php-ext-pecl-r3
 
@@ -20,7 +20,6 @@ IUSE="+curl examples"
 DEPEND="
 	dev-libs/libpcre:3=
 	curl? ( net-misc/curl:0= )
-	php_targets_php7-2? ( dev-lang/php:7.2[hash(-)] )
 	php_targets_php7-3? ( dev-lang/php:7.3[hash(-)] )
 "
 RDEPEND="${DEPEND}"
diff --git a/dev-php/pecl-pam/Manifest b/dev-php/pecl-pam/Manifest
index 4f8340254da1..8cd459a51e11 100644
--- a/dev-php/pecl-pam/Manifest
+++ b/dev-php/pecl-pam/Manifest
@@ -1,6 +1,3 @@
-AUX 1.0.3-php7.patch 3519 BLAKE2B 649f278a88e12ecbf895ab372aaa97c9f1f7cdcf4724eeda63368daefc89e89c3e5aae9e09cb7026058ca18aa4569423d75ee125795b56d8e2d372ccc93123f1 SHA512 9877b6bede71f402166253521aec667e4f9da99fbbf4fc0e74b9a5c48e498df717f869969b5d7a6432427a50030370771774f77ecb876ef133288eab174c9289
-DIST pam-1.0.3.tgz 6671 BLAKE2B f416fd0e47d3fda6a1d86e44a7ca17fc9a0428f976f18e2b663a2fd1e09b790cd069ca16d930d6dca6554762ca59bda987929e52365ed813949c1a93291c1dcc SHA512 3580582f1456b31be30a713cadaaca106527f2d4f3f12032b5d3617cc361aaf49539a9db3dd27221ce40320187abaac0f6ad4e23cdfe5eaa94436e3eaef3fb9c
 DIST pam-2.2.3.tgz 9422 BLAKE2B 4d10ad40bdfbaa54225723a46a78dbe1609d89cf75d0ca73345e3346fb437a5500e451357b3b0bbcce88c13f8a54dec5b39e9c0741a6e89c0b3936cbb05da91a SHA512 1adc72b1517e224f36f960134d3444d36e6fa5a6868ce4bc1b87edbbfb09406910774061988300094ebf637ee54c5f5a43e0c42c8e2ab78c81a0910063d48c51
-EBUILD pecl-pam-1.0.3-r3.ebuild 812 BLAKE2B 6d52c1f5d02e63635c002d83bdac8fc7511f7959de6a20a8d4058f9c5712ca56dd5789358eb1f48e478fde5b715be65351eeee791f84355bec3591f8f8db08d5 SHA512 84b7600da8c34fe1b8f0ce519fc6e47f0e3151e501340e9a7270b537a77619ff1d37b0eec1957d886ed5bb8afb8d69777b711cacb9f6d9a175e1d0976cbadec3
-EBUILD pecl-pam-2.2.3.ebuild 682 BLAKE2B 3ece15c40041c28cf9f3d3d4d9752401c62a577883e851618a72485c66bf4a0f9254969e2ac8e3a81ba86959fe80c2e84593740955dfc6480afa7d480276ad42 SHA512 38c1fd7a12bb5d2a183723992b8623ae18d543633dec16a616b76865ebce329092366808236f6cc537d35110da55bb20f6968b4a68448c616d4da06f11de9b4d
+EBUILD pecl-pam-2.2.3.ebuild 689 BLAKE2B e6818da986f4c2a5fc77736859e1bc96b1bfc33fe6142557e52112106a5202b14a2c35283f51b2617e9761e982337800d96b5fbe28eedc43343b92932355a5ee SHA512 ccb329ad044cdeec50af59bcc4403c9d5b39576dde37e85ffb6ed6cbeae1e0a5f2651fa18fbe3e4b6f01c1c3ae45b4a34a46cf20091ea630ddf5c6f875e95737
 MISC metadata.xml 240 BLAKE2B f60f325331d493a555e53c29c7cf2742a415356da28a467505f1441f3fd790fd0d59050df84854bdc379d19d94a46121216479807975a2922d5a2fefde83416b SHA512 fada9d69055f2be962b95aac82f260ec5db7a3f4392d10f0458a1d125938fa17539f7ec486000f3a95cff85a3fbb6bbf1f6f4fe6c2de7aa420a7543a3e89d03e
diff --git a/dev-php/pecl-pam/files/1.0.3-php7.patch b/dev-php/pecl-pam/files/1.0.3-php7.patch
deleted file mode 100644
index d56fffb08d38..000000000000
--- a/dev-php/pecl-pam/files/1.0.3-php7.patch
+++ /dev/null
@@ -1,118 +0,0 @@
---- a/pam.c	2016-12-01 14:29:27.453904230 -0500
-+++ b/pam.c	2016-12-01 14:27:26.496109755 -0500
-@@ -227,8 +227,13 @@
- PHP_FUNCTION(pam_auth)
- {
- 	char *username, *password;
-+#if PHP_MAJOR_VERSION >= 7
-+ 	size_t username_len, password_len;
-+	zval *status = NULL, *server, *remote_addr;
-+#else
- 	int username_len, password_len;
- 	zval *status = NULL, **server, **remote_addr;
-+#endif
- 	zend_bool checkacctmgmt = 1;
- 
- 	pam_auth_t userinfo = {NULL, NULL};
-@@ -248,22 +253,37 @@
- 		if (status) {
- 			spprintf(&error_msg, 0, "%s (in %s)", (char *) pam_strerror(pamh, result), "pam_start");
- 			zval_dtor(status);
-+#if PHP_MAJOR_VERSION >= 7
-+			ZVAL_STRING(status, error_msg);
-+			efree(error_msg);
-+#else
- 			ZVAL_STRING(status, error_msg, 0);
-+#endif
- 		}
- 		RETURN_FALSE;
- 	}
- 
-+#if PHP_MAJOR_VERSION >= 7
-+	if ((remote_addr = zend_hash_str_find(Z_ARR(PG(http_globals)[TRACK_VARS_SERVER]), "REMOTE_ADDR", sizeof("REMOTE_ADDR")-1)) != NULL && Z_TYPE_P(remote_addr) == IS_STRING) {
-+		pam_set_item(pamh, PAM_RHOST, Z_STRVAL_P(remote_addr));
-+#else
- 	if (zend_hash_find(&EG(symbol_table), "_SERVER", sizeof("_SERVER"), (void **)&server) == SUCCESS && Z_TYPE_PP(server) == IS_ARRAY) {
- 		if (zend_hash_find(Z_ARRVAL_PP(server), "REMOTE_ADDR", sizeof("REMOTE_ADDR"), (void **)&remote_addr) == SUCCESS && Z_TYPE_PP(remote_addr) == IS_STRING) {
- 			pam_set_item(pamh, PAM_RHOST, Z_STRVAL_PP(remote_addr));
- 		}
-+#endif
- 	}
- 
- 	if ((result = pam_authenticate(pamh, PAM_DISALLOW_NULL_AUTHTOK)) != PAM_SUCCESS) {
- 		if (status) {
- 			spprintf(&error_msg, 0, "%s (in %s)", (char *) pam_strerror(pamh, result), "pam_authenticate");
- 			zval_dtor(status);
-+#if PHP_MAJOR_VERSION >= 7
-+			ZVAL_STRING(status, error_msg);
-+			efree(error_msg);
-+#else
- 			ZVAL_STRING(status, error_msg, 0);
-+#endif
- 		}
- 		pam_end(pamh, PAM_SUCCESS);
- 		RETURN_FALSE;
-@@ -274,7 +294,12 @@
- 			if (status) {
- 				spprintf(&error_msg, 0, "%s (in %s)", (char *) pam_strerror(pamh, result), "pam_acct_mgmt");
- 				zval_dtor(status);
-+#if PHP_MAJOR_VERSION >= 7
-+				ZVAL_STRING(status, error_msg);
-+				efree(error_msg);
-+#else
- 				ZVAL_STRING(status, error_msg, 0);
-+#endif
- 			}
- 			pam_end(pamh, PAM_SUCCESS);
- 			RETURN_FALSE;
-@@ -291,7 +316,11 @@
- PHP_FUNCTION(pam_chpass)
- {
- 	char *username, *oldpass, *newpass;
-+#if PHP_MAJOR_VERSION >= 7
-+	size_t username_len, oldpass_len, newpass_len;
-+#else
- 	int username_len, oldpass_len, newpass_len;
-+#endif
- 	zval *status = NULL;
- 
- 	pam_chpass_t userinfo = {NULL, NULL, NULL, 0};
-@@ -312,7 +341,12 @@
- 		if (status) {
- 			spprintf(&error_msg, 0, "%s (in %s)", (char *) pam_strerror(pamh, result), "pam_start");
- 			zval_dtor(status);
-+#if PHP_MAJOR_VERSION >= 7
-+			ZVAL_STRING(status, error_msg);
-+			efree(error_msg);
-+#else
- 			ZVAL_STRING(status, error_msg, 0);
-+#endif
- 		}
- 		RETURN_FALSE;
- 	}
-@@ -321,7 +355,12 @@
- 		if (status) {
- 			spprintf(&error_msg, 0, "%s (in %s)", (char *) pam_strerror(pamh, result), "pam_authenticate");
- 			zval_dtor(status);
-+#if PHP_MAJOR_VERSION >= 7
-+			ZVAL_STRING(status, error_msg);
-+			efree(error_msg);
-+#else
- 			ZVAL_STRING(status, error_msg, 0);
-+#endif
- 		}
- 		pam_end(pamh, PAM_SUCCESS);
- 		RETURN_FALSE;
-@@ -331,7 +370,12 @@
- 		if (status) {
- 			spprintf(&error_msg, 0, "%s (in %s)", (char *) pam_strerror(pamh, result), "pam_chauthtok");
- 			zval_dtor(status);
-+#if PHP_MAJOR_VERSION >= 7
-+			ZVAL_STRING(status, error_msg);
-+			efree(error_msg);
-+#else
- 			ZVAL_STRING(status, error_msg, 0);
-+#endif
- 		}
- 		pam_end(pamh, PAM_SUCCESS);
- 		RETURN_FALSE;
diff --git a/dev-php/pecl-pam/pecl-pam-1.0.3-r3.ebuild b/dev-php/pecl-pam/pecl-pam-1.0.3-r3.ebuild
deleted file mode 100644
index 5827d6ef1d27..000000000000
--- a/dev-php/pecl-pam/pecl-pam-1.0.3-r3.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PHP_EXT_NAME="pam"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-DOCS=( README )
-
-USE_PHP="php7-2 php7-3 php7-4"
-
-inherit php-ext-pecl-r3 pam
-
-KEYWORDS="~amd64 ~x86"
-
-DESCRIPTION="This extension provides PAM (Pluggable Authentication Modules) integration"
-LICENSE="PHP-2.02"
-SLOT="0"
-IUSE="debug"
-
-DEPEND="sys-libs/pam"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${PV}-php7.patch" )
-
-src_prepare() {
-	#Fix DOS line endings
-	sed -i 's/\r$//' -- pam.c || die
-	php-ext-source-r3_src_prepare
-}
-
-src_configure() {
-	local PHP_EXT_ECONF_ARGS=( --with-pam=/usr $(use_enable debug) )
-	php-ext-source-r3_src_configure
-}
-
-src_install() {
-	pamd_mimic_system php auth account password
-	php-ext-pecl-r3_src_install
-}
diff --git a/dev-php/pecl-pam/pecl-pam-2.2.3.ebuild b/dev-php/pecl-pam/pecl-pam-2.2.3.ebuild
index 54ba34e572c7..58d800d7f8fa 100644
--- a/dev-php/pecl-pam/pecl-pam-2.2.3.ebuild
+++ b/dev-php/pecl-pam/pecl-pam-2.2.3.ebuild
@@ -9,7 +9,7 @@ PHP_EXT_ZENDEXT="no"
 PHP_EXT_ECONF_ARGS=( --with-pam=/usr )
 DOCS=( README )
 
-USE_PHP="php7-3 php7-4 php8-0"
+USE_PHP="php7-3 php7-4 php8-0 php8-1"
 
 inherit php-ext-pecl-r3 pam
 
diff --git a/dev-php/pecl-propro/Manifest b/dev-php/pecl-propro/Manifest
index eafee165cfb8..04bded9122a5 100644
--- a/dev-php/pecl-propro/Manifest
+++ b/dev-php/pecl-propro/Manifest
@@ -1,3 +1,3 @@
 DIST propro-2.1.0.tgz 14253 BLAKE2B 44c9bde831486fa41520ce75b313865b90a057acd0d566ae7e5c2aca97240e089580ca79ef04842a57a5d8eb76a179e57c505e977913567c1e97260f87fe2165 SHA512 94fc97f7bf17661ec7ecbe4d13b4fc98b8381469140d121fef49d32a4b767e956ed87b9f5bbb794f27ca47ce4b7b3125ea2b9091eb9d1f0a52b5c8f9df7ee145
-EBUILD pecl-propro-2.1.0.ebuild 913 BLAKE2B 548b68c4786747befd8bfb143d7406851870afdee8df88217a7a37c849f20a139f258d5c5d01079c19bc759429c4aef441296edebabb2ed03322fae2569b35ac SHA512 f1b96c94504ef9a11951039ede5df4d4228b9a919e29da3192162aa1f99626c989f9228c6433e8073944dc1c514ad3d90c8c981f674d98b4a263d56195d4cf20
+EBUILD pecl-propro-2.1.0.ebuild 390 BLAKE2B b6e9dad8c3ec6b05db58e3f392e661dfcb635b84017f5e8fd3a8a11bdf8230cee62d919ac974f5ad232a91931f41866a2763284f0185f181d34331b33ca215b7 SHA512 c47a2246ec796f8f891101aa4b56c096797a2b7f7c751d20b19079d2e7bd027976aa48644546b322c6f2d80e1807458aeef30a038b5b5884d75b09313d632fd2
 MISC metadata.xml 240 BLAKE2B f60f325331d493a555e53c29c7cf2742a415356da28a467505f1441f3fd790fd0d59050df84854bdc379d19d94a46121216479807975a2922d5a2fefde83416b SHA512 fada9d69055f2be962b95aac82f260ec5db7a3f4392d10f0458a1d125938fa17539f7ec486000f3a95cff85a3fbb6bbf1f6f4fe6c2de7aa420a7543a3e89d03e
diff --git a/dev-php/pecl-propro/pecl-propro-2.1.0.ebuild b/dev-php/pecl-propro/pecl-propro-2.1.0.ebuild
index cf9bab8e4729..6cb8ab9cf2ae 100644
--- a/dev-php/pecl-propro/pecl-propro-2.1.0.ebuild
+++ b/dev-php/pecl-propro/pecl-propro-2.1.0.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"
@@ -9,32 +9,13 @@ PHP_EXT_ZENDEXT="no"
 PHP_EXT_ECONF_ARGS=""
 PHP_INI_NAME="30-${PHP_EXT_NAME}"
 
-USE_PHP="php5-6 php7-1 php7-2 php7-3 php7-4"
+USE_PHP="php7-3 php7-4"
 
 inherit php-ext-pecl-r3
 
-# Only really build for 7.x
-USE_PHP="php7-1 php7-2 php7-3 php7-4"
-
 KEYWORDS="amd64 x86"
 
 DESCRIPTION="A reusable property proxy API for PHP"
 LICENSE="BSD-2"
 SLOT="7"
 IUSE=""
-
-RDEPEND="php_targets_php5-6? ( ${CATEGORY}/${PN}:0[php_targets_php5-6] )"
-
-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_src_prepare
-	fi
-}
-
-src_install() {
-	if use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3 || use php_targets_php7-4 ; then
-		php-ext-pecl-r3_src_install
-	fi
-}
diff --git a/dev-php/pecl-ps/Manifest b/dev-php/pecl-ps/Manifest
index deaf43c3fac5..5a2faf438e4f 100644
--- a/dev-php/pecl-ps/Manifest
+++ b/dev-php/pecl-ps/Manifest
@@ -2,5 +2,5 @@ AUX ps-1.4.4-fix-gd-detection.patch 230 BLAKE2B b052d4dbb6e802c9d25620dd2516b034
 DIST ps-1.4.1.tgz 578991 BLAKE2B 549fae78ffb6e91f39b6292d969b9b80adba1a5911fb52e99c5fcbc940b9470205556e3e11c2940fadc7cc084400bc08ae7255b79e175d705c9bacb8eb3d6e71 SHA512 e9eeb5ad1c9314af0fcfd33e461b560f6cc599a679bc0a5541994fa698e3da63b7cb523f617647bdb2ac1c8fc090263e314ddf956a1e6126f8813de92e49f3af
 DIST ps-1.4.4.tgz 637247 BLAKE2B 19dd32a2321fd53224c662e68603c7c330fcf8fe0d3e4e3d4a6e75e211c876225f1f6cf9325b117f7a3713abd87e6acfe25c4c9b0c161e6d6717f94cc90b7649 SHA512 42ab1fff661da68afb42d90dc7fb07761698f191beaf09b6dd4b2c3e7e67949ef06b2f6389738a462f58722f863c6b80f55a00a57dddc860250a4500cbfecf8b
 EBUILD pecl-ps-1.4.1-r1.ebuild 482 BLAKE2B d468f58e4169eb1902b75bc28061a9a4b2a0500fe1e8ae51b678c49a9624a1a3e0bdc36f4ff96e5436425e1c04141f57ad66b4b17659fac12a9a9bb59ec61340 SHA512 9d793f9bbb0d353602a1ba53f7e9e5f280f5bb9d7dc940ebea46710ec7480e481086cc028e6b05cd018476672e20efceb30e3c68350c8a0fc4f90f8b850eaffa
-EBUILD pecl-ps-1.4.4.ebuild 676 BLAKE2B c175b7b5b67fcbcd4b9e00f32f0df068d10733c66cc56f7486731056a7e97cce06da33f6ecbd59651e98dbeabc6379c146ca32f3b3571191c29a4cf9be2a6522 SHA512 74a4d60b775e6160786cc3d06b7f5812c1d2b1fbe5449f0b1b8b7d9138f344e45324604150864a8c84070cbc96a98a003d5b8c898660162135d1ee95d65bd288
+EBUILD pecl-ps-1.4.4.ebuild 683 BLAKE2B 4672023d236ebfa4380b927f5d041000d22d02498cc6a3aa017a6c477500e8e645d191d279b670b7211c4832a060eb91a84264886b2acd534028df864a9e4a53 SHA512 b759d49858432970debb16f7c04296ea8162fb9512c3b09c98afac892a91511478ef61d6d74d07183b4db8ddb049c793cc7459bbcc4b7ac5bb4587356120c064
 MISC metadata.xml 240 BLAKE2B f60f325331d493a555e53c29c7cf2742a415356da28a467505f1441f3fd790fd0d59050df84854bdc379d19d94a46121216479807975a2922d5a2fefde83416b SHA512 fada9d69055f2be962b95aac82f260ec5db7a3f4392d10f0458a1d125938fa17539f7ec486000f3a95cff85a3fbb6bbf1f6f4fe6c2de7aa420a7543a3e89d03e
diff --git a/dev-php/pecl-ps/pecl-ps-1.4.4.ebuild b/dev-php/pecl-ps/pecl-ps-1.4.4.ebuild
index e010eda79f51..ce633ab0c594 100644
--- a/dev-php/pecl-ps/pecl-ps-1.4.4.ebuild
+++ b/dev-php/pecl-ps/pecl-ps-1.4.4.ebuild
@@ -4,7 +4,7 @@
 EAPI="7"
 
 PHP_EXT_NAME="ps"
-USE_PHP="php7-3 php7-4 php8-0"
+USE_PHP="php7-3 php7-4 php8-0 php8-1"
 PHP_EXT_NEEDED_USE="gd(-)?"
 
 inherit php-ext-pecl-r3
diff --git a/dev-php/pecl-raphf/Manifest b/dev-php/pecl-raphf/Manifest
index 1b8b825fa0c5..1aa629f60fcb 100644
--- a/dev-php/pecl-raphf/Manifest
+++ b/dev-php/pecl-raphf/Manifest
@@ -1,3 +1,4 @@
 DIST raphf-2.0.1.tgz 16003 BLAKE2B 4eaf9f89e6572e17e0df347543dc99221f68d45103444f89e59862b9078574722278fbb1e2841b0a5952ffd6dfc4ea0fa81298f2014ffbe8a6b51ed6887f6692 SHA512 0a609fc21a62880963e7afb75297eb75a2598aab2c816cb61e84d665b0453e4952aa9bf25fe2c818cc94492a4b94aed965053c67899fdb984d88661364fffb1e
 EBUILD pecl-raphf-2.0.1-r1.ebuild 420 BLAKE2B 7deac6e0ddb8282c0056e9cc4dc443dd2b5d9ad6094b0a05a223c82a6ab10f3205d061888a2a6f14538308b26df5682d0541b8c750e0031a4fdcea99e569ef15 SHA512 b2619c92ee2090d6ac4315c23942be90c3a7e15e929638d2ce0eb1de6c2217b5ea8c6d35cc94f2e28c6cdf31fa85ebd4117a906b848720431da71da9030190bc
+EBUILD pecl-raphf-2.0.1-r2.ebuild 422 BLAKE2B e6578170ba92438351c244f4bd38e4f493dfa28e2a0d3a3ab61b8d06fa46c0610e361f85f5d6147fda1ac61d32394627ae2a2ae12023fa4e2313af6dce06922c SHA512 f9c36074aa6b63d7939de9e3b9e2a48f50bba03a265270d9f0b41c399b9d90fdb6228810e349be7bb8f3873f9751d5a3e3dcd218314f2520bf2d8774527fbd4a
 MISC metadata.xml 240 BLAKE2B f60f325331d493a555e53c29c7cf2742a415356da28a467505f1441f3fd790fd0d59050df84854bdc379d19d94a46121216479807975a2922d5a2fefde83416b SHA512 fada9d69055f2be962b95aac82f260ec5db7a3f4392d10f0458a1d125938fa17539f7ec486000f3a95cff85a3fbb6bbf1f6f4fe6c2de7aa420a7543a3e89d03e
diff --git a/dev-php/pecl-raphf/pecl-raphf-2.0.1-r2.ebuild b/dev-php/pecl-raphf/pecl-raphf-2.0.1-r2.ebuild
new file mode 100644
index 000000000000..6dc7cf9c239c
--- /dev/null
+++ b/dev-php/pecl-raphf/pecl-raphf-2.0.1-r2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PHP_EXT_NAME="raphf"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+PHP_EXT_ECONF_ARGS=""
+PHP_INI_NAME="30-${PHP_EXT_NAME}"
+
+USE_PHP="php7-3 php7-4 php8-0 php8-1"
+
+inherit php-ext-pecl-r3
+
+KEYWORDS="~amd64 ~x86"
+
+DESCRIPTION="A reusable, persistent handle and resource factory API"
+LICENSE="BSD-2"
+SLOT="7"
+IUSE=""