gentoo resync : 09.07.2022

18 files changed, 114 insertions, 199 deletions

diff --git a/dev-php/Manifest.gz b/dev-php/Manifest.gz
index c8df51f7f564..881c86f872a1 100644
--- a/dev-php/Manifest.gz
+++ b/dev-php/Manifest.gz
diff --git a/dev-php/igbinary/Manifest b/dev-php/igbinary/Manifest
index ccee313fe5b8..7239e747677e 100644
--- a/dev-php/igbinary/Manifest
+++ b/dev-php/igbinary/Manifest
@@ -1,6 +1,3 @@
-DIST igbinary-3.2.6.tar.gz 245899 BLAKE2B 05fd24a640ab9e1f2402645bf322b0a959be69c068ff203552f2806240d8504f1ff3c7b209d9b050ba7815a90bcec2aab823a24a2a2a1cc149da90d25166f18a SHA512 b6c9e7b68716052d93a8535af4666fa3d5b4071bc181819cdc0ecd7f8e1c099001905ff2134eec6343daa77102a423ad0903f8800808c30806d3cb7faa4c7a06
 DIST igbinary-3.2.7.tar.gz 248481 BLAKE2B 40936fb78b9f01d717daac78f8b707f902d78714e5202fbb1344042c2d30a3b723f9c5b6fd982f7a5002aab65e414ba7f9bda354fec4db82ba3f03fc09663a43 SHA512 1bdb60fa4ac76ef405b55b4a7e7f07c73ccc945a3fad8635934cf83a05ae554ac1a0b64c4b55229f0bd2a3269189d3266a492b064a0338fdb2bf4dfe5c3733e4
-EBUILD igbinary-3.2.6-r1.ebuild 566 BLAKE2B 7dfbe7ab2945586b159753612baeb9dbe07f5e41c04c99bc888e10f154569146529d1ce25b95baa329d4afc65d307ac3b2b9377353c80e1eb3fdd7ff70b534fa SHA512 2470943b3436b16ddf619ee0537fba243f2610553fb0fa29c3c585c24b5a09613c97bab7d90a067eb0467ac309e8300ddb412b05de73f28a4e3a43f22e8acf48
-EBUILD igbinary-3.2.6.ebuild 555 BLAKE2B 4679ab3040fcad9b0b896f3198add1dbcd22e790e942ece5456c9399f7894ee19027f58d6ebce174ad7308e18d4f9a30eb1e2c24bb686fc58f12b9e6118794a7 SHA512 5dc5484ac731591ddc78089372cc3e2d1938b686d9d7f049cece0d6a2cec92f7decf5e2e9e2b30579888605fbf3c75c4dc8fa5ac91cab03dc4cdc3105a086530
 EBUILD igbinary-3.2.7.ebuild 562 BLAKE2B 1ff5c7f0e86bb6ba895bffe2ffd5e798b93f2fc1764aba33b30569195b62128022820d7855a4db5bdf16571bbf1488a5cf5c5bf80c911e99562468faafd12e9f SHA512 fe3053117ba45fe64840b638c5b1376b200da61f44533e8f6a54127adb244da2299d3d81a6963c3149d29aae6a2ce53851530ed399abad64ea61977a320dfbf0
 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
deleted file mode 100644
index eecc1a37e244..000000000000
--- a/dev-php/igbinary/igbinary-3.2.6-r1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# 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/igbinary/igbinary-3.2.6.ebuild b/dev-php/igbinary/igbinary-3.2.6.ebuild
deleted file mode 100644
index c3306aa89d1c..000000000000
--- a/dev-php/igbinary/igbinary-3.2.6.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# 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"
-
-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-apcu/Manifest b/dev-php/pecl-apcu/Manifest
index ec92504de5ee..d6d54005cfcb 100644
--- a/dev-php/pecl-apcu/Manifest
+++ b/dev-php/pecl-apcu/Manifest
@@ -1,7 +1,3 @@
-DIST apcu-5.1.19.tgz 96583 BLAKE2B 330c08a4e557691d0b402111877b3caf56b211256db17cce52a76aeefce7237505eca4ecd71f3770ef3c405182a1604a92cc458cb9bca435b42370fe917e21a7 SHA512 45077e3bd0eac207539e2eafe21968c71f49b8c8920168dbafa87961b041f1d348b6bf1c130104744bc541e1f690854f0a29062e9520db81c04edeee3ef2ed99
-DIST apcu-5.1.20.tgz 96727 BLAKE2B b8223856e0aaa52f90dffa674bbd9b047caa8c91d81b637eafc2f59fbbfdfe0d6ce30e990a87cb4833e895fcfd944f7d57eb6f7356b3e2361d6be5a535bb3a63 SHA512 3e10b7e5dc7481b1250610ef83954875f427b9114d6b232bad9064fc33d8c8906bcc317f94a6cfc9f76c720fa06a44270d259cf2ceef6c1ec9dcadc49254ee1b
 DIST apcu-5.1.21.tgz 92516 BLAKE2B 32d73b89bde9ef4eb01c9ad766930e87300b86776c95929607a8aaefba5043e3a7947d064416ac083ff38876fdb41bb03dab1552ac000082e54f809269b4c925 SHA512 a6ffe8349760d27cde0d86017a59a68e9639bf385e606622d807094f4e5fb305bb25b9ce00077d0856f4d223d44329f7a6314c229b62c78d8e2b085593c92bb3
-EBUILD pecl-apcu-5.1.19.ebuild 1379 BLAKE2B c35394d62233ba369b1ddc761ac97a3f8c67d6e3ca96e8da01c6e9d196fe133e91b034f15a24e43802c53586fdd1d6e24085cbd46a695f3c9ce2f150b0699898 SHA512 2d23cbbccc66e43338b5ca5ef61b8457ccb6aeec1a89cfc79a94ac8851c006d4877a8187c4e9244164dc1e80a96e92f25518a13f1048652ab03cb0aa87d1ecf8
-EBUILD pecl-apcu-5.1.20.ebuild 1387 BLAKE2B 2a37b104188decca39d9ac9d0b453282b97258c55eca44849051432b1fc7817bfd47ad9ad36c9079d251bc584ed62487376a8079c0eb36643533ac771a3600de SHA512 8897d25c134c1c90736d5d5ea49925e4f6ed55e1d95bb659d4a17029bd5ab0a0fecbbab467307a44deb5d7cd72fb827117d25925751d0d28ccbcb6cabbcd5d34
 EBUILD pecl-apcu-5.1.21.ebuild 1377 BLAKE2B 8cf95367e4f9026d8b74cdb72858b0973dfef273aa96e6e829fff094d1bb1b3fa2d488f8e8ba27be371d98f1bd280f683a42b8150eb6415563bd8f154bf75f4e SHA512 6af888ef45a5b5623a7238c9b132477d2a439ec91b2892655be95c149524ac2dce688de3547c80786b61c85797aeee601da5056ce03b03c49acfc79c38159f32
 MISC metadata.xml 541 BLAKE2B 533f563e606b35d23c766aa177ea80b56b17ff352e907f2aed65c82be8bb6b01bcb61d69c6be6560b8e975ac279cf3a00ba5976d4a50c0f3ae68677ae7557cd8 SHA512 5dde6ecb39edb11fc4222cf869449f43fe3923623cea2a8ee4d4a4b8d7bf11bcc6d40f135cb5dc4cc81b161ed50489230bba443274c914d0015046ea44c868d8
diff --git a/dev-php/pecl-apcu/pecl-apcu-5.1.19.ebuild b/dev-php/pecl-apcu/pecl-apcu-5.1.19.ebuild
deleted file mode 100644
index c7fb42739132..000000000000
--- a/dev-php/pecl-apcu/pecl-apcu-5.1.19.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PHP_EXT_NAME="apcu"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-DOCS=( NOTICE README.md TECHNOTES.txt )
-
-USE_PHP="php7-2 php7-3 php7-4 php8-0"
-
-inherit php-ext-pecl-r3
-
-KEYWORDS="amd64 arm64 x86"
-
-DESCRIPTION="Stripped down version of APC supporting only user cache"
-LICENSE="PHP-3.01"
-SLOT="7"
-
-LOCKS="pthreadmutex pthreadrw spinlock semaphore"
-
-LUSE=""
-for l in ${LOCKS}; do
-	LUSE+="lock-${l} "
-done
-
-IUSE="+mmap ${LUSE/lock-pthreadrw/+lock-pthreadrw}"
-
-REQUIRED_USE="^^ ( $LUSE )"
-
-src_prepare() {
-	php-ext-source-r3_src_prepare
-	# Remove broken tests from php 7.4 due to trivial output differences
-	if use php_targets_php7-4 ; then
-		php_init_slot_env "php7.4"
-		rm "${PHP_EXT_S}"/tests/apc_entry_00{2,3}.phpt || die
-	fi
-}
-
-src_configure() {
-	local PHP_EXT_ECONF_ARGS=(
-		--enable-apcu
-		$(use_enable mmap apcu-mmap)
-		$(use_enable lock-spinlock apcu-spinlocks)
-	)
-	# Broken upstream autoconf test disables if present at all
-	use lock-pthreadrw || PHP_EXT_ECONF_ARGS+=( --disable-apcu-rwlocks )
-
-	php-ext-source-r3_src_configure
-}
-
-src_install() {
-	php-ext-pecl-r3_src_install
-
-	insinto /usr/share/php7/apcu
-	doins apc.php
-}
-
-pkg_postinst() {
-	elog "The apc.php file shipped with this release of pecl-apcu was"
-	elog "installed to ${EPREFIX}/usr/share/php7/apcu/."
-}
diff --git a/dev-php/pecl-apcu/pecl-apcu-5.1.20.ebuild b/dev-php/pecl-apcu/pecl-apcu-5.1.20.ebuild
deleted file mode 100644
index ab9a31c49a50..000000000000
--- a/dev-php/pecl-apcu/pecl-apcu-5.1.20.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PHP_EXT_NAME="apcu"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-DOCS=( NOTICE README.md TECHNOTES.txt )
-
-USE_PHP="php7-2 php7-3 php7-4 php8-0"
-
-inherit php-ext-pecl-r3
-
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-DESCRIPTION="Stripped down version of APC supporting only user cache"
-LICENSE="PHP-3.01"
-SLOT="7"
-
-LOCKS="pthreadmutex pthreadrw spinlock semaphore"
-
-LUSE=""
-for l in ${LOCKS}; do
-	LUSE+="lock-${l} "
-done
-
-IUSE="+mmap ${LUSE/lock-pthreadrw/+lock-pthreadrw}"
-
-REQUIRED_USE="^^ ( $LUSE )"
-
-src_prepare() {
-	php-ext-source-r3_src_prepare
-	# Remove broken tests from php 7.4 due to trivial output differences
-	if use php_targets_php7-4 ; then
-		php_init_slot_env "php7.4"
-		rm "${PHP_EXT_S}"/tests/apc_entry_00{2,3}.phpt || die
-	fi
-}
-
-src_configure() {
-	local PHP_EXT_ECONF_ARGS=(
-		--enable-apcu
-		$(use_enable mmap apcu-mmap)
-		$(use_enable lock-spinlock apcu-spinlocks)
-	)
-	# Broken upstream autoconf test disables if present at all
-	use lock-pthreadrw || PHP_EXT_ECONF_ARGS+=( --disable-apcu-rwlocks )
-
-	php-ext-source-r3_src_configure
-}
-
-src_install() {
-	php-ext-pecl-r3_src_install
-
-	insinto /usr/share/php7/apcu
-	doins apc.php
-}
-
-pkg_postinst() {
-	elog "The apc.php file shipped with this release of pecl-apcu was"
-	elog "installed to ${EPREFIX}/usr/share/php7/apcu/."
-}
diff --git a/dev-php/pecl-event/Manifest b/dev-php/pecl-event/Manifest
index b7dba4894afe..ca621252aeb2 100644
--- a/dev-php/pecl-event/Manifest
+++ b/dev-php/pecl-event/Manifest
@@ -2,4 +2,4 @@ DIST event-3.0.2r1.tgz 198176 BLAKE2B ca93fa75fc1210476bddfafb89f9fd7a9a9ed9b230
 DIST event-3.0.6.tgz 198565 BLAKE2B a8629572f63c3c342f5a137c5eaaf1af6d22d5df192cd37c36453d67db28ee030c7be13a26653a0de8e4984c24f9e633f7b0e757457aa668e2ce694d36b89cea SHA512 a7c7b062e44409d8d7525b3bb5ec80916dfcb5cdc53088a486ae940fa3a0a7944ec30727cd96d4e125187b8fa2e3a0fce6fc8981f803ad416a2cc040b78f93eb
 EBUILD pecl-event-3.0.2_p1.ebuild 1269 BLAKE2B 6cc6a5c70379094e4aa9f3df93d39de2d7030647ab2af89d22a9ebd1892771a8c021c86cc834e601136a58a9efd5501ae117eeaa0d120aead660ce3ef657493c SHA512 129d9062f5bac4c4ef9bce744ad82eb01d3ca892726ac1f02282a5dff3799f9d7174afcccac30c13dc687edd7ad5c17176216333e943edb80bdd0d67da1ed276
 EBUILD pecl-event-3.0.6.ebuild 983 BLAKE2B f60772efaa5b3b0faad931ee2d47d250f46d1f7d7ecfcd3bc0815b0f40caa277f12407cd8944a41be14bb0c4ea0681193a1bfcbd8cbfcc683026f2f495926ca7 SHA512 4b7e2ea4f2bb310dc61a843e475b86921cde29e21f104599e6849fe46795b4ade9f0d9f694640c3e00541404f233205579e32518cf61830ddcbd8044461539f8
-MISC metadata.xml 462 BLAKE2B 397d205a4e7427357ba567ce23219eb0dabfe1e80cd543603499d1172ab6e44070cadcda8adcdb506967595a02ac14212f900570f71507af6e5f1640bebadfe2 SHA512 a7dea9ba80d58b6ff4761c7446d349bc2fcd1562901568e05cffeb31bbff287d3fdbe7d0ee82af0d3cd91e76cc76cd992b6615cbca9ca8488a587918a2f057af
+MISC metadata.xml 664 BLAKE2B cf7f8cb25fee33ab477b7f172228dae753f82292cf8eecac36a26d15fd6bb844b3440632deaf6a072a252f901d4206233f138a7010c083213d355ee5abd80721 SHA512 dddc0fb3af21addc849aeb3d11d7ef67e1578fc8f2144fbe87a86046c27a3bb677b70836e2f1c5737432826438c86f123b6ff02455b66999aab896b724d70374
diff --git a/dev-php/pecl-event/metadata.xml b/dev-php/pecl-event/metadata.xml
index e88266cbe688..d2fc50b19cc3 100644
--- a/dev-php/pecl-event/metadata.xml
+++ b/dev-php/pecl-event/metadata.xml
@@ -1,15 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person" proxied="yes">
-<email>rrosmanov@gmail.com</email>
-<name>Ruslan Osmanov</name>
-</maintainer>
-<maintainer type="project" proxied="proxy">
-<email>proxy-maint@gentoo.org</email>
-<name>Proxy Maintainers</name>
-</maintainer>
-<use>
-<flag name="extra">Add support of the Libevent extra API</flag>
-</use>
+	<maintainer type="person" proxied="yes">
+		<email>rrosmanov@gmail.com</email>
+		<name>Ruslan Osmanov</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>php-bugs@gentoo.org</email>
+		<name>PHP</name>
+	</maintainer>
+	<use>
+		<flag name="extra">Add support of the Libevent extra API</flag>
+	</use>
+	<upstream>
+		<remote-id type="bitbucket">osmanov/pecl-event</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-php/pecl-http/Manifest b/dev-php/pecl-http/Manifest
index 69167660e1d5..7f4d8445cd10 100644
--- a/dev-php/pecl-http/Manifest
+++ b/dev-php/pecl-http/Manifest
@@ -1,10 +1,12 @@
 AUX pecl-http-3.2.4-curl-cookies.patch 7806 BLAKE2B 96bd439d3ccb16bc7a67e062dfe9ad66bdcd193553764e087dd938e3f76c05796bb09571d934658a8b5d6c22bf2db03c213731ab2f35d03a20902c24897625c6 SHA512 cbbb215f3f0c5527f318283db4984a63b830727727081834f3a3383576d581359cfc7865e35a3b0b6ea4693c7c91ff93570c3c8964a8cd7e5d593095b16f0d4a
 DIST pecl_http-3.2.4.tgz 220631 BLAKE2B 996236cf9dd2f7d9bfaf046306e99c3ccf778261df19df8fd828b5811798f784841d89a6890e7347bd20cc6da71c966ea3ac9b17bf058e0bb766db7e1a8a6c49 SHA512 59c41d57c94a6e50e2f0b261130a24791b2845246f783b55e7f644f9a897d3650da364c5b38a860761b4a23f9266ed05000d6348bae2a7941e59d6bf5fb61a9e
 DIST pecl_http-3.2.5.tgz 220593 BLAKE2B 3dfeefa69b0566f15f1dda73e7e4da2723033424e704039fbb42177e4996b434ea3450e40aa16844fe52c9fabac96d16ba5154a0112f00ff3838cf7bde149938 SHA512 13e99cd567a708cba56150a2127d060cdc78f9f5908371e5fb5fb3f02f27f8aa1b48c5eb147f61e9b5c9d5f2c627049f846d810f0135072cc9e4cd967e2bfa1d
+DIST pecl_http-3.3.0.tgz 225653 BLAKE2B b8d3875b2716edda98a2f813e2f5947e65684da12be087b2ec51c405223574b2e44dee3ae0a653a538e9c3acafafcec1ff40778d45d8389b239a1ea4578c2831 SHA512 e774ba0514994f219cbd2d8bef872308be8617ea22894db72473042154842c62d918d4c0b87f8c592182fa81fd1487b672252d587857e1b306dce6d38e2f53fb
 DIST pecl_http-4.2.1.tgz 224452 BLAKE2B 58d2e1159aa64b9893b2b8b67c8444801308084ac13a743760c25cb3d0456fb586f69dc6b9e77db53341e4e9e45ce68f954c47b4e2663afe86de67d63db5e8e2 SHA512 2ad7e57fae313a7b46ba88e528e124ac9d83804827131a6ef478ccf3cf5883dec2d928b8ceb377ee7f5947c76f24d640d77533a9946612419e526786a79877e6
 DIST pecl_http-4.2.2.tgz 224436 BLAKE2B 26ef3bb38778f0374938ba3f3bddba37c3a2044c7b9ffe2aacbca2566251d26d37882bf66773b8ed62d46855e8f14ad9b577cdb1ef3db9eba9850c0b30e57284 SHA512 1203367d590c7d80ffe7a21e7ac352ba053e3daeb778bf99e08fc13582e665e1429f850e51e36304bdec15e6646b648f2c444b46fa263e5441d008ac41a00f4b
 EBUILD pecl-http-3.2.4-r1.ebuild 2227 BLAKE2B 0c0fbb0433464e8a81139c8d40757a70026fff21e236131db38ac6df70a7209107cf04573fc5aa3f7cbc1108899d05fa8783a592c47d37b24b24cf20a043413e SHA512 85abeab748a1cdeabbc85aac2b47bdc3ad4322c7a7c9637670836383a5c69f3f7335a3ccc757bf3597fa3da9ccfdf682868806a02ffbe56e951fbdd6c8ab7494
 EBUILD pecl-http-3.2.5.ebuild 2196 BLAKE2B b7e213c5bcd956c6125424737115ff9a1e16c5dba07e6f80c9c808e2d7be114569cc095cd2351b1fceceaea53290c1b24fa7588778b8991f91f44403790eac00 SHA512 95b0c2296b8cf17e5dd6f07ec8876745d8ef8fb9995994df88b1d7b9b09056f3566edf9a48148b9752dd8522703444cce8a43c19b9ee8c9ae4e5bb5e5ba1ebe0
+EBUILD pecl-http-3.3.0.ebuild 2138 BLAKE2B 8cdc24976e46aa726d082678b49ab81297f4d41092dd48e66c001ab8e0b0af75e715ca6ec3ec9e30088a5717ab0442c6048ec886fc50453e4a3bcb819d2630d2 SHA512 d861cdeb57d6ec1c2ae6ff0d8690a82b20e3839425975a8048b7bce701d303df00aabddfd8c625e52fecac2eba41aa087f44ec1bf9b228a85e22cf96ed82d658
 EBUILD pecl-http-4.2.1.ebuild 1828 BLAKE2B c9a009b2883f856958cc5343625a0e0989590c82696a3cd8be215631b522ecb1debd82491f636fede2f6694da5835d3251b8ffbf22364d8ba1c79578746f5795 SHA512 bde6bfd0a6a6e15a3f902298017f7a771ac6e36dbdff4a5bb24d7c37034727fafa2c6f443590397be4446288ec845ffb4b7bec559e54cd97293c6432e9599ea1
 EBUILD pecl-http-4.2.2.ebuild 2012 BLAKE2B 69a13eea3c000e9bf67600e5b1608f9d818287754dd47c449815cb4c200c5f26d34ad737c65fb4776f2e713f5a549acc22c4221d105c0c22cf70c1a59cb582da SHA512 0ac6d3f11f3d1c88da2090aa9a4c90ac53a20a1369942e1717f724773cde2a5d1c955ca6bcf22f441cf83aa70a3614d98c5d29dc18f59e32f8a18d0ad87ccbda
-MISC metadata.xml 240 BLAKE2B f60f325331d493a555e53c29c7cf2742a415356da28a467505f1441f3fd790fd0d59050df84854bdc379d19d94a46121216479807975a2922d5a2fefde83416b SHA512 fada9d69055f2be962b95aac82f260ec5db7a3f4392d10f0458a1d125938fa17539f7ec486000f3a95cff85a3fbb6bbf1f6f4fe6c2de7aa420a7543a3e89d03e
+MISC metadata.xml 318 BLAKE2B 42b746a7e1bece2295d3350d90feb75bde0fe414baaacc84b996483724f381a281299345debc2bf320488e3eaff141c1f12bbcc929de95a2fbc3caac2957cc06 SHA512 a47c085f27b112dce6f2fdabb1d14c5f9b65ce6453dc8500bc63be4862211ab83ace06ce7303afc4c65e2971cc6ddb468c1aea633f543399db57e1f9d4fb4017
diff --git a/dev-php/pecl-http/metadata.xml b/dev-php/pecl-http/metadata.xml
index 222c77f3742a..a6713ca675f7 100644
--- a/dev-php/pecl-http/metadata.xml
+++ b/dev-php/pecl-http/metadata.xml
@@ -5,4 +5,7 @@
 		<email>php-bugs@gentoo.org</email>
 		<name>PHP</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">m6w6/ext-http</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-php/pecl-http/pecl-http-3.3.0.ebuild b/dev-php/pecl-http/pecl-http-3.3.0.ebuild
new file mode 100644
index 000000000000..be789fd1c79e
--- /dev/null
+++ b/dev-php/pecl-http/pecl-http-3.3.0.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+PHP_EXT_NAME="http"
+PHP_EXT_PECL_PKG="pecl_http"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+PHP_INI_NAME="50-http"
+
+USE_PHP="php7-4 php8-0 php8-1"
+
+inherit php-ext-pecl-r3
+
+USE_PHP="php7-4"
+
+KEYWORDS="~amd64 ~x86"
+
+DESCRIPTION="Extended HTTP Support for PHP"
+LICENSE="BSD-2 MIT"
+SLOT="7"
+IUSE="ssl curl_ssl_gnutls curl_ssl_nss +curl_ssl_openssl"
+
+# Patch gets cookies working with curl 7.77, but further interop work was done later
+# Just set min version for this short time to live branch
+COMMON_DEPEND="app-arch/brotli:=
+	dev-libs/libevent
+	dev-php/pecl-propro:7[php_targets_php7-4(-)?]
+	>=dev-php/pecl-raphf-2.0.1:7[php_targets_php7-4(-)?]
+	net-dns/libidn2
+	sys-libs/zlib
+	ssl? ( >=net-misc/curl-7.77[ssl,curl_ssl_gnutls(-)=,curl_ssl_nss(-)=,curl_ssl_openssl(-)=] )
+	!ssl? ( >=net-misc/curl-7.77[-ssl] )
+"
+DEPEND="php_targets_php7-4? ( ${COMMON_DEPEND} dev-lang/php:7.4[session(-),iconv(-)] )"
+RDEPEND="${DEPEND}
+	php_targets_php8-0? ( dev-php/pecl-http:8[php_targets_php8-0(-)] )
+	php_targets_php8-1? ( dev-php/pecl-http:8[php_targets_php8-1(-)] )"
+
+PHP_EXT_ECONF_ARGS=( --with-http --without-http-shared-deps
+	--without-http-libidn-dir --without-http-libicu-dir
+	--without-http-libidnkit2-dir --without-http-libidnkit-dir )
+
+src_prepare() {
+	if use php_targets_php7-4 ; then
+		php-ext-source-r3_src_prepare
+	else
+		default_src_prepare
+	fi
+}
+
+src_install() {
+	if use php_targets_php7-4 ; then
+		php-ext-pecl-r3_src_install
+	fi
+}
+
+src_test() {
+	# Cannot use eclass function due to required modules
+	# All tests SKIP otherwise
+	for slot in $(php_get_slots); do
+		php_init_slot_env "${slot}"
+		# Link in required modules for testing
+		ln -s "${EXT_DIR}/propro.so" "modules/propro.so" || die
+		ln -s "${EXT_DIR}/raphf.so" "modules/raphf.so" || die
+		sed -i \
+			's/PHP_TEST_SHARED_EXTENSIONS)/PHP_TEST_SHARED_EXTENSIONS) -d extension=propro.so -d extension=raphf.so/' \
+			Makefile || die
+		SKIP_ONLINE_TESTS=yes NO_INTERACTION="yes" emake test
+		# Clean up testing links
+		rm modules/propro.so modules/raphf.so || die
+	done
+}
diff --git a/dev-php/pecl-mailparse/Manifest b/dev-php/pecl-mailparse/Manifest
index df3fc2c239b2..3a543b1dada0 100644
--- a/dev-php/pecl-mailparse/Manifest
+++ b/dev-php/pecl-mailparse/Manifest
@@ -1,5 +1,5 @@
 DIST mailparse-3.1.1.tgz 941192 BLAKE2B 00b5a506031cd03439e3d67172c17aeeb6af3b950694251f7654007642bf80fff3cda900fc97ba177b91ca970e47416132080793ce64d8038e7aecbf2fdaf6c0 SHA512 01ddb8d4d27a74c14f70b02b49322c60fc79affab374205fee91b9da21e5148e08dba024f6bc620e4f26c2c937675e09092c52ca69172d2f7797c3e2bf374bee
 DIST mailparse-3.1.3.tgz 943785 BLAKE2B 03cb7d4d4ac78d04f710155fdd9282250dc686dbab3a6d9dfb8e3ff82fda07faf02680ad86a810cd7ee2f38c8980fbdc9ad67399f3164506e523a98ce3ffb0a9 SHA512 93659e479d8ab61ae473f6dc002b7198903eebdcfb4aa515e76952f5050fd1a815baccfcb57bd32fb9be6108dfed6dc73172067a58c9e6098058999bb3802000
 EBUILD pecl-mailparse-3.1.1.ebuild 492 BLAKE2B a0beb3508e7d216b889015a393d4ce5f11bceb65910306e3bf1bae303c06e18a9b0f8fdf568877a032e1518f1c8274b2695c083ac4b4cc7fa60946537a6be558 SHA512 3b585bd494f72d10fcf2a4e0be4418d531ca6d02a2ebc98bdb4710e49d6251b7f5cfb2bdf946a0b3c329b8ce9f65de8c28b5d6d2023ef24272e6b0f5f8fa5680
-EBUILD pecl-mailparse-3.1.3.ebuild 492 BLAKE2B f213192c7654c7bdd68a4da72a238876ed60b966bc9bf1930f6057ddc6b22830399282d8c5dc065c1198cae64d49c9548ff339c379aab9b8d5e272ab008767fb SHA512 b57735b7831226cb8ff51c9bba58d413af7b2d9ffb4cf379a717066a66dcbbd4a5912cfb92d8466c676cd56482215eb3ba71fb6dca309d375dc16a9ce92fc454
-MISC metadata.xml 240 BLAKE2B f60f325331d493a555e53c29c7cf2742a415356da28a467505f1441f3fd790fd0d59050df84854bdc379d19d94a46121216479807975a2922d5a2fefde83416b SHA512 fada9d69055f2be962b95aac82f260ec5db7a3f4392d10f0458a1d125938fa17539f7ec486000f3a95cff85a3fbb6bbf1f6f4fe6c2de7aa420a7543a3e89d03e
+EBUILD pecl-mailparse-3.1.3.ebuild 488 BLAKE2B 9e27d662beb636999f5ef7b3af2e8c6c9de40b386a717017e6b57b30bc7b53b4356edc74c78d834ff7890356b61c2f99caba8a2fac62834b3801d10b55688750 SHA512 65b5c72300315be8568c701431c0da512cd9e87c4cc6df574a9a1fdc1e7afe2f6a04b98867678053f11fd2187abba569e55bc162293101409c9d699398388678
+MISC metadata.xml 328 BLAKE2B ecc91fef2e9d4c34bc55d8326b50837f3177704b1180c16ce7909c0b93d5c5ce4ce02dfc283e378c248232d218d01434241794ee5886645e6294a8635b67d178 SHA512 b2d46eaee31deccdf478c8023ba5b190d446142084264cb328ea36c430f42c9b623e97171de2736e3979fad99f160bf15025d524a67fc912c2bf42e2f8e51cb6
diff --git a/dev-php/pecl-mailparse/metadata.xml b/dev-php/pecl-mailparse/metadata.xml
index 222c77f3742a..0e51a348d85f 100644
--- a/dev-php/pecl-mailparse/metadata.xml
+++ b/dev-php/pecl-mailparse/metadata.xml
@@ -5,4 +5,7 @@
 		<email>php-bugs@gentoo.org</email>
 		<name>PHP</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">php/pecl-mail-mailparse</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-php/pecl-mailparse/pecl-mailparse-3.1.3.ebuild b/dev-php/pecl-mailparse/pecl-mailparse-3.1.3.ebuild
index 369af592dbe1..fc03e67dc29a 100644
--- a/dev-php/pecl-mailparse/pecl-mailparse-3.1.3.ebuild
+++ b/dev-php/pecl-mailparse/pecl-mailparse-3.1.3.ebuild
@@ -14,7 +14,7 @@ DOCS=( README.md )
 
 inherit php-ext-pecl-r3
 
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 
 DESCRIPTION="PHP extension for parsing and working with RFC822 and MIME compliant messages"
 LICENSE="PHP-3.01"
diff --git a/dev-php/pecl-ssh2/Manifest b/dev-php/pecl-ssh2/Manifest
index 5550c2fd126e..ccc6a8d24699 100644
--- a/dev-php/pecl-ssh2/Manifest
+++ b/dev-php/pecl-ssh2/Manifest
@@ -1,4 +1,4 @@
 DIST ssh2-1.3.1.tgz 33838 BLAKE2B 05976ad143563fd9d51be3f8e23b5b22099e351d6f252b612aa1dcb56648dc337b623d2cddf7b9079f3e07c879ca69215a1987cd6f4326f97ba134e13c6d28e7 SHA512 c74d4f699853148b53cdca0eaf8837bfdbdd21d185761606acadf2442e84dbefdb00cde207e0ce4794ae1e4f8692a38ed903b6d11fdc57bca7b54a4250da9a76
 EBUILD pecl-ssh2-1.3.1.ebuild 452 BLAKE2B c6a590ad15c9bcc6ae442a043b068e9f88d0e3ac4045b9c44f219fd9a18f98befc384fd1d513076c8f186df042076b626709109e9ce4fb458405081a1d36fb53 SHA512 103b73ce6f098782fc7a7b49644ccc6558cf0a9ad71f1556b002c76775969bb1cab7c7f450ef8dbd220b9067ea9745d32871617262a54ca71693c6284b850e34
-EBUILD pecl-ssh2-9999.ebuild 470 BLAKE2B df043a226f20088177b0734bcb88d4096fde26ddfcc9a328746c729a4d64aa6e9423bb027e096aa19ead8ec27532874e804cc72be78dd6ef7fc65b61449d832d SHA512 46e54835cf0b3c793eb821113d318b0a797409dc19833922369608eb42c7a877c039fb36243796cc69afcc9308f35832a8f8378b3715704642953d3e4b63e359
-MISC metadata.xml 236 BLAKE2B 55612da78a71f8cee31c387a5862636996734210d765fac66d8c7706acc5151e6a9e7ff5123aeb097c911495c6220ba3b5d2f1355f46e8ab6bdb240e1697e26d SHA512 2782b20a65dca663ff7c64b7e67db05641abed478fd5996e5750b2e52ba870829f89125baa8967dd29fd20ef9b46ad233b0dd08801308b7756717ec2f292446c
+EBUILD pecl-ssh2-9999.ebuild 462 BLAKE2B f0466ea16231a2c178d7647adce889e9cc20ab97c7c1f96cc952d1b4c7bdcd8d843bf6bc74969769b2262744339b560a7f2c8a402666712e39d46110e0970440 SHA512 e7ff6dcc7c43c3e298757e7157c08a314d9e04bffe6775973b099b88514eafe7a4bdea4f3d7cb69c4d4e709d22946c8744295c7af0854ccd289c5ebb32fbf733
+MISC metadata.xml 322 BLAKE2B 0576bb512c57e5e2809e3ec24de126d1f42823c1780fedae5cf2998a8074f60a6ee0aae29d8086c01c490623065d0adfd0a18568637875ff46408127a38aec60 SHA512 26fea3796f479e95df152a2d305b5ee50c0e3c44d3d0923dd0451e643ba93788f7d0e31f1d576f3d3fd90880550be4bde81b17ccc13268afa41ba566e7dbf43d
diff --git a/dev-php/pecl-ssh2/metadata.xml b/dev-php/pecl-ssh2/metadata.xml
index 77793b997e9e..4d08220c3f76 100644
--- a/dev-php/pecl-ssh2/metadata.xml
+++ b/dev-php/pecl-ssh2/metadata.xml
@@ -5,4 +5,7 @@
 	<email>php-bugs@gentoo.org</email>
 	<name>PHP</name>
 </maintainer>
+<upstream>
+	<remote-id type="github">php/pecl-networking-ssh2</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/dev-php/pecl-ssh2/pecl-ssh2-9999.ebuild b/dev-php/pecl-ssh2/pecl-ssh2-9999.ebuild
index 3d6ba5b1e14c..b5c9256a3d98 100644
--- a/dev-php/pecl-ssh2/pecl-ssh2-9999.ebuild
+++ b/dev-php/pecl-ssh2/pecl-ssh2-9999.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI="8"
 
 PHP_EXT_NAME="ssh2"
 
-USE_PHP="php7-3 php7-4 php8-0"
-EGIT_REPO_URI="https://git.php.net/repository/pecl/networking/ssh2.git"
+USE_PHP="php7-4 php8-0 php8-1"
+EGIT_REPO_URI="https://github.com/php/pecl-networking-ssh2.git"
 
 inherit php-ext-source-r3 git-r3