gentoo resync : 01.10.2021

20 files changed, 398 insertions, 144 deletions

diff --git a/dev-php/Manifest.gz b/dev-php/Manifest.gz
index 1c620585adf1..459d5827fe4f 100644
--- a/dev-php/Manifest.gz
+++ b/dev-php/Manifest.gz
diff --git a/dev-php/igbinary/Manifest b/dev-php/igbinary/Manifest
index 6046009e41e2..1a77b7879ef9 100644
--- a/dev-php/igbinary/Manifest
+++ b/dev-php/igbinary/Manifest
@@ -1,14 +1,5 @@
-DIST igbinary-3.1.5.tar.gz 216569 BLAKE2B 3aa453fc0669c331202f38d41a80fa34332033d272a7b6e523988923d84a1e93967e4d588ac32d4a2ac3ed5d0bc832bf0380293604f67350557628ecbcded91a SHA512 af0e473673e624635cad44a6f34aa2e4d655e8f2dc3df8a9e0cf9b241ef1f53c627edb508b5bb41c7f8925c2256a4a4d0b4c083227564212cb7747a810dfc83d
 DIST igbinary-3.1.6.tar.gz 220415 BLAKE2B 62bc77d5b3ecbccb9e928e30f33a598630d3ee9f394f4e78c0978b316d4dbc29656f98773e9ff6bd6b9cd4961f4e00c6c760b1a07234849736d4e0d9e3199d5b SHA512 55f7fd1a6e2a422cf04e944c4c15126167c4aab6d4f5f1e6af8be6c345ec6ff0c25d7ea8c023062bdd4882484cede155ea7a598666e4616985873a32a0a272d1
-DIST igbinary-3.2.1.tar.gz 227265 BLAKE2B 4eda60b49a2f1e3e822a0fbff8f23cd546517a51193f0f4f2d4646f99888552aad1877f80a67f0d655e0a51771c539efe5b0d8b5c8ce7d88c8403305dc7570df SHA512 fdab404eb6ab8e64c0d3b92c1c12e796a182a90084acc78a31a31dece62075d310d298c545d149d10b188f0467108a0429ee750747e073fa7fba752162b64eb4
-DIST igbinary-3.2.2.tar.gz 242955 BLAKE2B 479f1b79c84b3979659a1d596f78345e6c75e9444971b547e8f1a3fe9b4aec3ba321d7a325b734f069fb1d4cb0b5c4ea5ae6586d5e50026698dc6aaa2e972bbd SHA512 d9fd460e6d62c8ca86de0e99681714ae45b2f7c66ff76279cd376582f9e8e932e8fa0ee37c25fde82390643a543fefc3ba5cbf181d5ffa31a3ab8301c092e0ff
-DIST igbinary-3.2.4.tar.gz 245458 BLAKE2B f52f01ace2c24b9bc0c64b3421609ff390e10c1825e09b2bc7a294e902975988e4e9c658e87404f496d63701fc98c7aa2626ce3bb88871f429d7cda6b96092b9 SHA512 0f1d482f4615f8ec9b269d74e48f6b74b0e276b237a190e40ffc643afd6129d9e01be3375864e6e0be1b9666a75ca0e2a6a2dbf571384bfdffe497316168da78
 DIST igbinary-3.2.6.tar.gz 245899 BLAKE2B 05fd24a640ab9e1f2402645bf322b0a959be69c068ff203552f2806240d8504f1ff3c7b209d9b050ba7815a90bcec2aab823a24a2a2a1cc149da90d25166f18a SHA512 b6c9e7b68716052d93a8535af4666fa3d5b4071bc181819cdc0ecd7f8e1c099001905ff2134eec6343daa77102a423ad0903f8800808c30806d3cb7faa4c7a06
-EBUILD igbinary-3.1.5.ebuild 597 BLAKE2B 8f09f317dfc74612c30bdf35905411ad3c26077c02579b8fafedf2cd79d0aaf95ef275e0396dace13d0ae733d7cdf5b29cd9f5c419845c942ee49df44e9a2470 SHA512 b352c8647cf6faa2c7fc223d5b78514225bf04c308cf4e802f6c6305fe4b4470db33af634a34fbc3c67849ba933aad9b4ac77113eac940e4a7eff40e55ce7225
-EBUILD igbinary-3.1.6-r1.ebuild 599 BLAKE2B 7052c71b8fb7bafc0e694c75104487c988f73cc30ecd5dbf9f0c72354a11239b4c66927522a01b2e726aa722f4892c91fbd63ca854f0452fb9d47bb896a8cca6 SHA512 d181b6f2524d497af0216da5c26b58fa2af4c6c057eeab8f9a4820d18db21b6596820fab7cf405dfd6008e4d3ee15c591f934a2f6bf92dacb0dbb1df362a317e
 EBUILD igbinary-3.1.6.ebuild 595 BLAKE2B 5cd27a7fec301252289616350fb56f599fa9f1d5e660fb8cf140be2e3c737b1151bb66f857fa7e47c942742441f65cc3e63a4a76f0d5061e29da3592f9e207a8 SHA512 4c1636cd05f1d1eb86a136cf044138029e7c3124c67ab8089b388bd07aca1ea801d4b7cb4914d61fe17b3ad2fe0c03f5574c2d588f1a8a8b1edad2de1ef45e4a
-EBUILD igbinary-3.2.1.ebuild 559 BLAKE2B bb66e2fb19636f4cd24c24643a629968af03f77b2444543997cef0c3576438ac2538e5880617a24ff0e57bb611a92fb797d305441877ebde4753ba144740e1de SHA512 65ae0c5964423f647d9b31515bf6377187352c6a77490eda0937a97771023d76cad304544dc7898003040bec6322484004f52a2c1ef20f85ef533c6144218df2
-EBUILD igbinary-3.2.2.ebuild 559 BLAKE2B 4c897036852ccc6c0b1528044f8a753ca2a25f5c637d593caea0c8312e4de75b36e5839445ff4bb9da111aa3292fcefe449648eaf6e5ac33250107094f080f41 SHA512 db78195cf2749499f0f6f38bc578175b7fc4a0612e99e331db7f0ac575804515b1a9ee067a04e8bfcd05cd844efaf76c7a7b11a0d7fa211861cfa4cd5a6a0aad
-EBUILD igbinary-3.2.4.ebuild 559 BLAKE2B 4c897036852ccc6c0b1528044f8a753ca2a25f5c637d593caea0c8312e4de75b36e5839445ff4bb9da111aa3292fcefe449648eaf6e5ac33250107094f080f41 SHA512 db78195cf2749499f0f6f38bc578175b7fc4a0612e99e331db7f0ac575804515b1a9ee067a04e8bfcd05cd844efaf76c7a7b11a0d7fa211861cfa4cd5a6a0aad
 EBUILD igbinary-3.2.6.ebuild 557 BLAKE2B 3a7bd3392bbf62629034acd9332ac298b3691d6b851c6a94ddbb21b64e35d794a15020ceae5d0b8cf23e50bdc8630f2456d0728e0601830d9eb21269e99c6a38 SHA512 d05640228b1a43058c6068bf470abc9bdd8e8078c7a3bcad56009cb8dc86ad5f1e71bfe8b284a8ee243aff711e9119a0877d628e9ef01ab8bb073edd1fb241ab
 MISC metadata.xml 332 BLAKE2B dd842052dec2b48669fb7d85ee2637132f64d64d56ac9ece1394222211f3cc1a698e0d5e4dda6d4d5289a4debfe7a44c0c776ec2399d3384874be03278995af2 SHA512 0e2d8ac966bb0f3e40fcf96e0ff93ebd9353a0629129e14f9be2186fe7fc3db8cb5fafc3af795b59005332d66085f1636df62b5454998cb9bd09bfacc1ced0a6
diff --git a/dev-php/igbinary/igbinary-3.1.5.ebuild b/dev-php/igbinary/igbinary-3.1.5.ebuild
deleted file mode 100644
index e56a7b7ca346..000000000000
--- a/dev-php/igbinary/igbinary-3.1.5.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PHP_EXT_NAME="${PN}"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-DOCS=( CREDITS NEWS README.md )
-PHP_EXT_ECONF_ARGS=( --enable-${PN} )
-
-USE_PHP="php7-1 php7-2 php7-3 php7-4"
-
-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"
-#IUSE=""
-
-#DEPEND=""
-#RDEPEND=""
diff --git a/dev-php/igbinary/igbinary-3.1.6-r1.ebuild b/dev-php/igbinary/igbinary-3.1.6-r1.ebuild
deleted file mode 100644
index 49b4f02bfb38..000000000000
--- a/dev-php/igbinary/igbinary-3.1.6-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PHP_EXT_NAME="${PN}"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-DOCS=( CREDITS NEWS README.md )
-PHP_EXT_ECONF_ARGS=( --enable-${PN} )
-
-USE_PHP="php7-2 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"
-#IUSE=""
-
-#DEPEND=""
-#RDEPEND=""
diff --git a/dev-php/igbinary/igbinary-3.2.1.ebuild b/dev-php/igbinary/igbinary-3.2.1.ebuild
deleted file mode 100644
index 8dbeefb1a06f..000000000000
--- a/dev-php/igbinary/igbinary-3.2.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PHP_EXT_NAME="${PN}"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-DOCS=( CREDITS NEWS README.md )
-PHP_EXT_ECONF_ARGS=( --enable-${PN} )
-
-USE_PHP="php7-3 php7-4 php8-0"
-
-inherit php-ext-source-r3
-
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-DESCRIPTION="A fast drop-in replacement for the standard PHP serialize"
-HOMEPAGE="https://github.com/igbinary/igbinary"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
diff --git a/dev-php/igbinary/igbinary-3.2.2.ebuild b/dev-php/igbinary/igbinary-3.2.2.ebuild
deleted file mode 100644
index a4b536d340b9..000000000000
--- a/dev-php/igbinary/igbinary-3.2.2.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/igbinary/igbinary-3.2.4.ebuild b/dev-php/igbinary/igbinary-3.2.4.ebuild
deleted file mode 100644
index a4b536d340b9..000000000000
--- a/dev-php/igbinary/igbinary-3.2.4.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/maxmind-db-reader/Manifest b/dev-php/maxmind-db-reader/Manifest
index b375223fd406..afea08292127 100644
--- a/dev-php/maxmind-db-reader/Manifest
+++ b/dev-php/maxmind-db-reader/Manifest
@@ -1,3 +1,5 @@
+DIST MaxMind-DB-Reader-php-1.10.1.tar.gz 23083 BLAKE2B f6684b07a184c4db7feebd9bf6b9afdc34c3de3b62bed59b2d01e1751eb996442d769576fbaa48e2bfa0572e80b2e0491d16d1cd9d89d35ca329e6dc17f74765 SHA512 841a03cf043ee0557e2157daee50d7f73211f5e665436eca8be6067d5357205093e40bb0402248fd6881d0d330feac96b298ec18763b8cb7d6d6392d54c59265
 DIST MaxMind-DB-Reader-php-1.6.0.tar.gz 20898 BLAKE2B cf6922bbd5b2c76fcb9b7a97299f0a73232686bf8facce39355f8a4cc55e98a4d8e64a51eae8427b5f14d6905d4cd85956effa5299cc493bd63708cf52ab30d0 SHA512 e8c0ccf2cfcedf7527b4e3f858d2ed0e70add60692fff4a65f08e5cb885516b7c2a3ceaa3c21713369cd8ffca2b671d764063236de1d729cfc5173f7d5dd4607
+EBUILD maxmind-db-reader-1.10.1.ebuild 2218 BLAKE2B 53715ff00f7ecec725b560307356dc21fd4a129e4627395d2287b8d81bf9ac5d2c298bc677c05229c8fb12eaa4de5b6c4d18521457fdc176a1a6bdeb32258f85 SHA512 b0c330ccbd69d88f84629efa93d89400518d550a91b1e0b3dca55e9946d047943c7a3de023287a08e4e038d678d9577aa15269d1d448aa2918d9629078b97976
 EBUILD maxmind-db-reader-1.6.0.ebuild 2218 BLAKE2B dca404bcaa496d72cce3bd8055728bdf5f69a6028dd9afeb3c358affa5636a745e36afa42a2eb505c96781bbc0d00535c4df197b4deffb899161a03b76fcd131 SHA512 8243d5a307ac4d3be45dc60c064a9285fbeafb74b847f75152863d9c97393f41b3268c7eec89725beae525435abfaa94a540a3ec04272b92136698050e4b7b54
 MISC metadata.xml 586 BLAKE2B 69b8c42dc80e3b164f2287e0c65732ad0d5bc53ab1062e651dd85e21d5fdfb6a1e9990cd4d78077f2dcf73e2c8689e7be6a34c11cfd3ed8690a41a8a737e6246 SHA512 5604ac300486eaeb0bfd52d5a95438843b031eef15162438374e6126ace92327a64cb692a549d301f245fd6622856e973c9dbde60d2dcd398c667a9f8fa1fd5b
diff --git a/dev-php/maxmind-db-reader/maxmind-db-reader-1.10.1.ebuild b/dev-php/maxmind-db-reader/maxmind-db-reader-1.10.1.ebuild
new file mode 100644
index 000000000000..509cad6088ee
--- /dev/null
+++ b/dev-php/maxmind-db-reader/maxmind-db-reader-1.10.1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+MY_PN="MaxMind-DB-Reader-php"
+MY_P="${MY_PN}-${PV}"
+S="${WORKDIR}/${MY_P}"
+PHP_EXT_S="${S}/ext"
+PHP_EXT_NAME="maxminddb"
+PHP_EXT_OPTIONAL_USE="extension"
+
+USE_PHP="php7-3 php7-4 php8-0"
+
+inherit php-ext-source-r3
+
+DESCRIPTION="PHP reader for the MaxMind database format"
+HOMEPAGE="https://github.com/maxmind/MaxMind-DB-Reader-php"
+SRC_URI="https://github.com/maxmind/${MY_PN}/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="extension test"
+RESTRICT="!test? ( test )"
+
+DEPEND="extension? ( dev-libs/libmaxminddb )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	# We need to call eapply_user ourselves, because it may be skipped
+	# if either the "extension" USE flag is not set, or if the user's
+	# PHP_TARGETS is essentially empty. In the latter case, the eclass
+	# src_prepare does nothing. We only call the eclass phase conditionally
+	# because the correct version of e.g. "phpize" may not be there
+	# unless USE=extension is set.
+	if use extension ; then
+		php-ext-source-r3_src_prepare
+	else
+		default
+	fi
+}
+
+src_configure() {
+	# The eclass phase will try to run the ./configure script even if it
+	# doesn't exist (in contrast to the default src_configure), so we
+	# need to skip it if the eclass src_prepare (that creates said
+	# script) is not run.
+	use extension && php-ext-source-r3_src_configure
+}
+
+src_compile() {
+	# Avoids the same problem as in src_configure.
+	use extension && php-ext-source-r3_src_compile
+}
+
+src_install() {
+	dodoc CHANGELOG.md README.md
+	insinto /usr/share/php
+	doins -r src/MaxMind
+	insinto /usr/share/php/MaxMind/Db
+	doins autoload.php
+
+	use extension && php-ext-source-r3_src_install
+}
+
+src_test() {
+	# The PHP API has its own set of tests that isn't shipped with the
+	# release tarballs at the moment (github issues 55).
+	use extension && php-ext-source-r3_src_test
+}
+
+pkg_postinst() {
+	elog "${PN} has been installed in /usr/share/php/MaxMind/Db/."
+	elog "To use it in a script, require('MaxMind/Db/autoload.php'),"
+	elog "and then most of the examples in the documentation should"
+	elog "work without further modification."
+}
diff --git a/dev-php/pecl-http/Manifest b/dev-php/pecl-http/Manifest
index 5d858307a2b6..be99011fd3da 100644
--- a/dev-php/pecl-http/Manifest
+++ b/dev-php/pecl-http/Manifest
@@ -1,4 +1,4 @@
-AUX pecl-http-3.2.4-curl-cookies.patch 502 BLAKE2B b2ac97150edc35e649bcf5674be59401753413bef6d920beee1f50b3a9f9519545fc3ceb5ed030ce28acf4469ab69323a96bc07cdc7a3993b0033f039964d9ca SHA512 19c24fe2701ec6bf360a9e780a3573ea5ce2aad519412d66c18b9c331083c50e4dbbc453d04e931c7df0b9016a4407f316646ab00537a538bb5fdc9d84a97e54
+AUX pecl-http-3.2.4-curl-cookies.patch 7806 BLAKE2B 96bd439d3ccb16bc7a67e062dfe9ad66bdcd193553764e087dd938e3f76c05796bb09571d934658a8b5d6c22bf2db03c213731ab2f35d03a20902c24897625c6 SHA512 cbbb215f3f0c5527f318283db4984a63b830727727081834f3a3383576d581359cfc7865e35a3b0b6ea4693c7c91ff93570c3c8964a8cd7e5d593095b16f0d4a
 DIST pecl_http-3.2.1.tgz 221244 BLAKE2B b6581829fb8a800e24ccedd4d0f3efbaf558850bdc356d27a6e1d1097a8e2cfc61963a1daccd1d0f269a7cef5b243d45cdfaff5138321fe20df615dde44d19e3 SHA512 e67d4b32ba6f524e3fcf65f5497b94275e1a4a14fce97c57afe366369f368b3acdbedf364ed73cf983fb2c5f57f498adaa1100e7c936f11cbc5de1caedad7b51
 DIST pecl_http-3.2.4.tgz 220631 BLAKE2B 996236cf9dd2f7d9bfaf046306e99c3ccf778261df19df8fd828b5811798f784841d89a6890e7347bd20cc6da71c966ea3ac9b17bf058e0bb766db7e1a8a6c49 SHA512 59c41d57c94a6e50e2f0b261130a24791b2845246f783b55e7f644f9a897d3650da364c5b38a860761b4a23f9266ed05000d6348bae2a7941e59d6bf5fb61a9e
 DIST pecl_http-4.2.1.tgz 224452 BLAKE2B 58d2e1159aa64b9893b2b8b67c8444801308084ac13a743760c25cb3d0456fb586f69dc6b9e77db53341e4e9e45ce68f954c47b4e2663afe86de67d63db5e8e2 SHA512 2ad7e57fae313a7b46ba88e528e124ac9d83804827131a6ef478ccf3cf5883dec2d928b8ceb377ee7f5947c76f24d640d77533a9946612419e526786a79877e6
diff --git a/dev-php/pecl-http/files/pecl-http-3.2.4-curl-cookies.patch b/dev-php/pecl-http/files/pecl-http-3.2.4-curl-cookies.patch
index 3c124b4624a6..2f3a7c73a240 100644
--- a/dev-php/pecl-http/files/pecl-http-3.2.4-curl-cookies.patch
+++ b/dev-php/pecl-http/files/pecl-http-3.2.4-curl-cookies.patch
@@ -1,11 +1,242 @@
---- a/src/php_http_client_curl.c	2021-01-13 10:34:34.000000000 -0500
-+++ b/src/php_http_client_curl.c	2021-09-22 10:38:58.854615743 -0400
-@@ -834,7 +834,7 @@
+diff --git a/autoconf/pecl/libbrotli.m4 b/autoconf/pecl/libbrotli.m4
+index f8916e2..575f635 100644
+--- a/autoconf/pecl/libbrotli.m4
++++ b/autoconf/pecl/libbrotli.m4
+@@ -1,5 +1,11 @@
+ 
+ AC_DEFUN([PECL_CHECK_LIBBROTLI], [
++	dnl config.m4 calls PECL_CHECK_DONE once more
++	PECL_COUNT_CHECKS([+1])
++	PECL_SAVE_ENV([CPPFLAGS], [libbrotli])
++	PECL_SAVE_ENV([LDFLAGS], [libbrotli])
++	PECL_SAVE_ENV([LIBS], [libbrotli])
++
+ 	PECL_CHECK_LIBBROTLI_COMMON([$1], [$2])
+ 	PECL_CHECK_DONE(libbrotlicommon, [$PECL_VAR([HAVE_LIBBROTLI_COMMON])])
+ 	PECL_CHECK_LIBBROTLI_DEC([$1], [$2])
+diff --git a/autoconf/pecl/libcurl.m4 b/autoconf/pecl/libcurl.m4
+index 4d99207..8de9499 100644
+--- a/autoconf/pecl/libcurl.m4
++++ b/autoconf/pecl/libcurl.m4
+@@ -160,6 +160,26 @@ AC_DEFUN([PECL_HAVE_LIBCURL_SSL], [dnl
+ 				fi
+ 			fi
+ 		])
++
++		PECL_HAVE_CONST([curl/curl.h], [CURL_LOCK_DATA_SSL_SESSION], int, [
++			AC_CACHE_CHECK([whether curl_share accepts CURL_LOCK_DATA_SSL_SESSION], PECL_CACHE_VAR([LIBCURL_SHARE_SSL]), [
++				PECL_CACHE_VAR([LIBCURL_SHARE_SSL])=
++				AC_TRY_RUN([
++					#include <curl/curl.h>
++					int main(int argc, char *argv[]) {
++						CURLSH *ch = curl_share_init();
++						return curl_share_setopt(ch, CURLSHOPT_SHARE, CURL_LOCK_DATA_SSL_SESSION);
++					}
++				], [
++					PECL_CACHE_VAR([LIBCURL_SHARE_SSL])=yes
++				], [
++					PECL_CACHE_VAR([LIBCURL_SHARE_SSL])=no
++				])
++			])
++			if test "$PECL_CACHE_VAR([LIBCURL_SHARE_SSL])" = yes; then
++				PECL_DEFINE([HAVE_LIBCURL_SHARE_SSL], [1])
++			fi
++		])
+ 	])
+ ])
+ dnl
+diff --git a/autoconf/pecl/pecl.m4 b/autoconf/pecl/pecl.m4
+index ffa45ac..d8735b0 100644
+--- a/autoconf/pecl/pecl.m4
++++ b/autoconf/pecl/pecl.m4
+@@ -70,6 +70,12 @@ AC_DEFUN([PECL_RESTORE_ENV], [
+ 	$1=$PECL_SAVE_VAR([$2_$1])
+ ])
+ dnl
++dnl PECL_COUNT_CHECKS(incdec)
++dnl
++AC_DEFUN([PECL_COUNT_CHECKS], [
++	PECL_VAR([_checks])=$(($PECL_VAR([_checks])$1))
++])
++dnl
+ dnl PECL_EVAL_LIBLINE(libline)
+ dnl
+ AC_DEFUN([PECL_EVAL_LIBLINE], [
+@@ -244,6 +250,7 @@ dnl
+ dnl PECL_CHECK_CUSTOM(name, path, header, lib, version)
+ dnl
+ AC_DEFUN([PECL_CHECK_CUSTOM], [
++	PECL_COUNT_CHECKS([+1])
+ 	PECL_SAVE_ENV([CPPFLAGS], [$1])
+ 	PECL_SAVE_ENV([LDFLAGS], [$1])
+ 	PECL_SAVE_ENV([LIBS], [$1])
+@@ -260,10 +267,10 @@ AC_DEFUN([PECL_CHECK_CUSTOM], [
+ 		done
+ 	])
+ 	if test -n "$PECL_CACHE_VAR([$1_prefix])"; then
+-		CPPFLAGS="-I$PECL_CACHE_VAR([$1_prefix])/include"
+-		LDFLAGS="-L$PECL_CACHE_VAR([$1_prefix])/$PHP_LIBDIR"
+-		LIBS="-l$4"
+-		PECL_EVAL_LIBLINE([$LDFLAGS $LIBS])
++		CPPFLAGS="$CPPFLAGS -I$PECL_CACHE_VAR([$1_prefix])/include"
++		LDFLAGS="$LDFLAGS -L$PECL_CACHE_VAR([$1_prefix])/$PHP_LIBDIR"
++		LIBS="$LIBS -l$4"
++		dnl PECL_EVAL_LIBLINE([$LDFLAGS $LIBS])
+ 		
+ 		AC_CACHE_VAL(PECL_CACHE_VAR([$1_version]), [
+ 			pushd $PECL_CACHE_VAR([$1_prefix]) >/dev/null
+@@ -288,11 +295,11 @@ dnl
+ dnl PECL_CHECK_CONFIG(name, prog-config, version-flag, cppflags-flag, ldflags-flag, libs-flag)
+ dnl
+ AC_DEFUN([PECL_CHECK_CONFIG], [
++	PECL_COUNT_CHECKS([+1])
+ 	PECL_SAVE_ENV([CPPFLAGS], [$1])
+ 	PECL_SAVE_ENV([LDFLAGS], [$1])
+ 	PECL_SAVE_ENV([LIBS], [$1])
+ 
+-
+ 	AC_MSG_CHECKING([for $1])
+ 	ifelse($2, [$PKG_CONFIG $1], [
+ 		AC_CACHE_VAL(PECL_CACHE_VAR([$1_exists]), [
+@@ -311,20 +318,22 @@ AC_DEFUN([PECL_CHECK_CONFIG], [
+ 		AC_CACHE_VAL(PECL_CACHE_VAR([$1_cppflags]), [
+ 			PECL_CACHE_VAR([$1_cppflags])=$($2 $4)
+ 		])
+-		CPPFLAGS=$PECL_CACHE_VAR([$1_cppflags])
++		CPPFLAGS="$CPPFLAGS $PECL_CACHE_VAR([$1_cppflags])"
+ 		AC_CACHE_VAL(PECL_CACHE_VAR([$1_ldflags]), [
+ 			PECL_CACHE_VAR([$1_ldflags])=$($2 $5)
+ 		])
+-		LDFLAGS=$PECL_CACHE_VAR([$1_ldflags])
++		LDFLAGS="$LDFLAGS $PECL_CACHE_VAR([$1_ldflags])"
+ 		AC_CACHE_VAL(PECL_CACHE_VAR([$1_libs]), [
+ 			PECL_CACHE_VAR([$1_libs])=$($2 $6)
+ 		])
+-		LIBS=$PECL_CACHE_VAR([$1_libs])
+-		PECL_EVAL_LIBLINE([$LDFLAGS $LIBS])
++		LIBS="$LIBS $PECL_CACHE_VAR([$1_libs])"
++		dnl PECL_EVAL_LIBLINE([$LDFLAGS $LIBS])
+ 	ifelse($2, [$PKG_CONFIG $1], [
+ 		fi
+ 	])
+ 
++	AC_MSG_RESULT([${PECL_CHECKED_VERSION([$1]):-no}])
++
+ 	if test -n "$PECL_CHECKED_VERSION([$1])"; then
+ 		PECL_VAR([HAVE_$1])=true
+ 		PECL_DEFINE([HAVE_$1])
+@@ -332,8 +341,6 @@ AC_DEFUN([PECL_CHECK_CONFIG], [
+ 	else
+ 		PECL_VAR([HAVE_$1])=false
+ 	fi
+-
+-	AC_MSG_RESULT([${PECL_CHECKED_VERSION([$1]):-no}])
+ ])
+ dnl
+ dnl PECL_CHECK_PKGCONFIG(pkg[, additional-pkg-config-path])
+@@ -355,9 +362,25 @@ dnl
+ dnl PECL_CHECK_DONE(name, success[, incline, libline])
+ dnl
+ AC_DEFUN([PECL_CHECK_DONE], [
+-	if $2; then
+-		incline=$CPPFLAGS
+-		libline="$LDFLAGS $LIBS"
++	PECL_COUNT_CHECKS([-1])
++	success=$2
++	if $success && test -n "$LDFLAGS$LIBS"; then
++		AC_MSG_CHECKING([whether $1 can be linked])
++		AC_TRY_LINK([], [], [success=yes], [success=no])
++		AC_MSG_RESULT([$success])
++		if ! $success; then
++			AC_MSG_WARN([$1 was found, but fails to link with:])
++			AC_MSG_WARN([    LDFLAGS='$LDFLAGS'])
++			AC_MSG_WARN([    LIBS='$LIBS'])
++			AC_MSG_WARN([Missing or updated library paths?])
++		fi
++	fi
++	if $success; then
++		_cppflags=$PECL_SAVE_VAR([$1_CPPFLAGS])
++		_ldflags=$PECL_SAVE_VAR([$1_LDFLAGS])
++		_libs=$PECL_SAVE_VAR([$1_LIBS])
++		incline=${CPPFLAGS:${#_cppflags}}
++		libline=["${LDFLAGS:${#_ldflags}} ${LIBS:${#_libs}}"]
+ 		PECL_DEFINE([HAVE_$1])
+ 	else
+ 		incline=$3
+diff --git a/config9.m4 b/config9.m4
+index ef7d33e..695701b 100644
+--- a/config9.m4
++++ b/config9.m4
+@@ -24,6 +24,8 @@ if test "$PHP_HTTP" != "no"; then
+ 		AC_CHECK_LIB(nsl, getdomainname)
+ 	])
+ 	AC_CHECK_FUNCS(mbrtowc mbtowc iswalnum inet_pton)
++
++	CFLAGS="$CFLAGS -Wno-strict-prototypes"
+ 
+ 	dnl ZLIB
+ 	PHP_ARG_WITH([http-zlib-dir], [whether/where to check for zlib],
+diff --git a/src/php_http_client_curl.c b/src/php_http_client_curl.c
+index 0e79f19..8898b5d 100644
+--- a/src/php_http_client_curl.c
++++ b/src/php_http_client_curl.c
+@@ -17,6 +17,8 @@
+ 
+ #if PHP_HTTP_HAVE_LIBCURL
+ 
++#define DEBUG_COOKIES 0
++
+ #if PHP_HTTP_HAVE_LIBCURL_OPENSSL
+ #	include <openssl/ssl.h>
+ #endif
+@@ -834,6 +836,9 @@ static ZEND_RESULT_CODE php_http_curle_option_set_cookiesession(php_http_option_
+ 		return FAILURE;
+ 	}
+ 	if (Z_TYPE_P(val) == IS_TRUE) {
++#if DEBUG_COOKIES
++		fprintf(stderr, "CURLOPT_COOKIELIST: SESS\n");
++#endif
+ 		if (CURLE_OK != curl_easy_setopt(ch, CURLOPT_COOKIELIST, "SESS")) {
+ 			return FAILURE;
+ 		}
+@@ -856,9 +861,19 @@ static ZEND_RESULT_CODE php_http_curle_option_set_cookiestore(php_http_option_t
  	} else {
  		storage->cookiestore = NULL;
  	}
 -	if (	CURLE_OK != curl_easy_setopt(ch, CURLOPT_COOKIEFILE, storage->cookiestore)
-+	if (	CURLE_OK != curl_easy_setopt(ch, CURLOPT_COOKIEFILE, storage->cookiestore ? storage->cookiestore : "")
- 		||	CURLE_OK != curl_easy_setopt(ch, CURLOPT_COOKIEJAR, storage->cookiestore)
- 	) {
+-		||	CURLE_OK != curl_easy_setopt(ch, CURLOPT_COOKIEJAR, storage->cookiestore)
+-	) {
++
++#if DEBUG_COOKIES
++	fprintf(stderr, "CURLOPT_COOKIEFILE: %s\n", cookiestore);
++#endif
++	// does NOT enable ch->data.cookies until transfer; adds to ch->stsate.cookielist
++	if (CURLE_OK != curl_easy_setopt(ch, CURLOPT_COOKIEFILE, storage->cookiestore ? storage->cookiestore : "")) {
++		return FAILURE;
++	}
++#if DEBUG_COOKIES
++	fprintf(stderr, "CURLOPT_COOKIEJAR: %s\n", cookiestore);
++#endif
++	// enables ch->data.cookies
++	if (CURLE_OK != curl_easy_setopt(ch, CURLOPT_COOKIEJAR, storage->cookiestore)) {
  		return FAILURE;
+ 	}
+ 
+@@ -1919,7 +1934,7 @@ static ZEND_RESULT_CODE php_http_curlm_option_set_share_cookies(php_http_option_
+ 	return SUCCESS;
+ }
+ 
+-#if PHP_HTTP_CURL_VERSION(7,23,0)
++#if PHP_HTTP_HAVE_LIBCURL_SHARE_SSL
+ static ZEND_RESULT_CODE php_http_curlm_option_set_share_ssl(php_http_option_t *opt, zval *value, void *userdata)
+ {
+ 	php_http_client_t *client = userdata;
+@@ -1994,7 +2009,7 @@ static void php_http_curlm_options_init(php_http_options_t *registry)
+ 		opt->setter = php_http_curlm_option_set_share_cookies;
+ 		ZVAL_TRUE(&opt->defval);
+ 	}
+-#if PHP_HTTP_CURL_VERSION(7,23,0)
++#if PHP_HTTP_HAVE_LIBCURL_SHARE_SSL
+ 	if ((opt = php_http_option_register(registry, ZEND_STRL("share_ssl"), 0, _IS_BOOL))) {
+ 		opt->setter = php_http_curlm_option_set_share_ssl;
+ 		ZVAL_TRUE(&opt->defval);
diff --git a/dev-php/pecl-ps/Manifest b/dev-php/pecl-ps/Manifest
index 53fbed64a4c4..deaf43c3fac5 100644
--- a/dev-php/pecl-ps/Manifest
+++ b/dev-php/pecl-ps/Manifest
@@ -1,3 +1,6 @@
+AUX ps-1.4.4-fix-gd-detection.patch 230 BLAKE2B b052d4dbb6e802c9d25620dd2516b03492a7493518af5d26a97b58b7a2990c558ec64cc3a6eb36aa62d93829e040980c11e56b3133bb345eb8cb7795e71a1f6c SHA512 b9ed97bf9fe8b841b4d25870db036b95f1a744f5d9fc0d59b89f43f76e23dd27d2cca877086b7e66b8dfddbd0fc0fbdf34ba490c9546c54087772d9e0eeb1537
 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
 MISC metadata.xml 240 BLAKE2B f60f325331d493a555e53c29c7cf2742a415356da28a467505f1441f3fd790fd0d59050df84854bdc379d19d94a46121216479807975a2922d5a2fefde83416b SHA512 fada9d69055f2be962b95aac82f260ec5db7a3f4392d10f0458a1d125938fa17539f7ec486000f3a95cff85a3fbb6bbf1f6f4fe6c2de7aa420a7543a3e89d03e
diff --git a/dev-php/pecl-ps/files/ps-1.4.4-fix-gd-detection.patch b/dev-php/pecl-ps/files/ps-1.4.4-fix-gd-detection.patch
new file mode 100644
index 000000000000..282bc7a34106
--- /dev/null
+++ b/dev-php/pecl-ps/files/ps-1.4.4-fix-gd-detection.patch
@@ -0,0 +1,11 @@
+--- a/config.m4
++++ b/config.m4
+@@ -38,7 +38,7 @@
+ PHP_ARG_ENABLE([gd],
+   [for GD support],
+   [AS_HELP_STRING([--enable-gd],
+-    [Include GD support])])
++    [Include GD support])], no, no)
+ 
+ if test "$PHP_GD" != "no"; then
+ 
diff --git a/dev-php/pecl-ps/pecl-ps-1.4.4.ebuild b/dev-php/pecl-ps/pecl-ps-1.4.4.ebuild
new file mode 100644
index 000000000000..e010eda79f51
--- /dev/null
+++ b/dev-php/pecl-ps/pecl-ps-1.4.4.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PHP_EXT_NAME="ps"
+USE_PHP="php7-3 php7-4 php8-0"
+PHP_EXT_NEEDED_USE="gd(-)?"
+
+inherit php-ext-pecl-r3
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+DESCRIPTION="PHP extension for creating PostScript files"
+LICENSE="BSD"
+SLOT="7"
+IUSE="examples gd"
+
+DEPEND="dev-libs/pslib gd? ( media-libs/gd:2= )"
+RDEPEND="${DEPEND}"
+PATCHES=( "${FILESDIR}/ps-1.4.4-fix-gd-detection.patch" )
+
+src_configure() {
+	PHP_EXT_ECONF_ARGS=( $(use_enable gd) )
+	php-ext-source-r3_src_configure
+}
+
+src_test() {
+	# tests/004.phpt depends on set numeric format
+	LC_ALL=C php-ext-pecl-r3_src_test
+}
diff --git a/dev-php/pecl-uploadprogress/Manifest b/dev-php/pecl-uploadprogress/Manifest
index b8ab8b3318f7..fd3b8669855e 100644
--- a/dev-php/pecl-uploadprogress/Manifest
+++ b/dev-php/pecl-uploadprogress/Manifest
@@ -1,3 +1,5 @@
 DIST uploadprogress-1.1.3.tgz 14798 BLAKE2B 5edda3e8672bb0e0829d100284240fcceac26be695386225a18446c742f59edfd906a9ae2f17b594816d3cddea02eb648db01a3352d7f8bd764ad2f6b2e03628 SHA512 2202f419be852a71eadae47eaa83909a032e5a6bbe4ce17ae5d45ea4e9f6d9c9edceb2111630d1f0e277b531d463accf540288ecbcca9bf154fe01754f225686
+DIST uploadprogress-2.0.1.tgz 19459 BLAKE2B 10143285da73a2fe1854c68d5f20ac6543695ccdf47835ff16f39b69e357e2ca32d2560ca1ced9238c6d21fb29379817b8a682d6aa24bf8c83b563127d2745a9 SHA512 81c846ea6e87c7c0621c22ee903b0937d533285bd0e3195de85803321260d4562e4c598332591afc7e985da57ed9422e37ed1c2927090474ddb7ec27314f1ae0
 EBUILD pecl-uploadprogress-1.1.3-r1.ebuild 465 BLAKE2B 106c1056a3e4351751eb813c6b15f859c66c2b32ee285ac5d6e8fa256418ec7a4bbfa4d4d1793e6998f9ad7d862e36e23ffc3d95965370e7b7e47ef821cff822 SHA512 11ce4c9bde42e1357f11cc2f9fa5e8bf405944ea755c8f09ceb8a3898440c5381b89374ea63298842113bc90ef1837c72bd7fde2f874f46060c2870d67a24a7f
-MISC metadata.xml 668 BLAKE2B 17c5fb43d503899adf2c878fd275d6fd597816395493a81198861f9d451cb1fffb7b9d456e2eee2899dd78297f41097ce63efae005ac3c2bb84bff8bf18d1790 SHA512 45813ee640897cc867eee595ff72c162e8564f172502a9f8c882346a5503a570bc3c7332f83bc5791316e6d1b59263affbeee4581c2406f7290ae2516b5a6aca
+EBUILD pecl-uploadprogress-2.0.1.ebuild 670 BLAKE2B d75e0c1f4b813f6ea285b9f9faa92d777a6beb7b9b7626fc0f359a5f1b119715e58e8da7db97095a482cc89afb1da4aa994d84ed182018788ea6aa3f51c8d79c SHA512 2fe1826005d5f2958268ab2e3346f30d08fed1b1aba9760a1a8bf0777220a66e36b2b4a7a938e46e44640030782a76dcf668f3eeabc2c3624c98189a4df7716f
+MISC metadata.xml 709 BLAKE2B a3e91fd98c74c0f7b7286cd7d3070a495eab7c585f4d9981bedc90734665ba60d1db391a641aa9dfb60fcdb3c5748c9f65016ddf5cd9756c7e5caf021a65e3ff SHA512 eab0d79c1f912399fe60a673e6378f61cd5c4c0842d496c59fd300e2a037bfa1e0cbee0d9c330b81200c52944595d95fcc23c21c171172687330d21a8ff53a33
diff --git a/dev-php/pecl-uploadprogress/metadata.xml b/dev-php/pecl-uploadprogress/metadata.xml
index ed31cf5f5236..bde040ec7af5 100644
--- a/dev-php/pecl-uploadprogress/metadata.xml
+++ b/dev-php/pecl-uploadprogress/metadata.xml
@@ -11,8 +11,8 @@
   </maintainer>
   <longdescription lang="en">
     An extension to track the progress of a file upload. See
-    http://svn.php.net/viewvc/pecl/uploadprogress/trunk/examples/ for
-    an example. It is only known to work on apache with mod_php; other
-    SAPI implementations unfortunately still have issues.
+    https://github.com/php/pecl-php-uploadprogress/tree/master/examples for
+    examples. It is known to work on apache with mod_php and, beginning with 2.0,
+    php-fpm with apache and nginx; other servers and SAPIs are not known to work.
 </longdescription>
 </pkgmetadata>
diff --git a/dev-php/pecl-uploadprogress/pecl-uploadprogress-2.0.1.ebuild b/dev-php/pecl-uploadprogress/pecl-uploadprogress-2.0.1.ebuild
new file mode 100644
index 000000000000..6bc6174856b0
--- /dev/null
+++ b/dev-php/pecl-uploadprogress/pecl-uploadprogress-2.0.1.ebuild
@@ -0,0 +1,21 @@
+# 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"
+PHP_EXT_SAPIS="apache2 fpm"
+
+inherit php-ext-pecl-r3
+
+DESCRIPTION="An extension to track progress of a file upload"
+LICENSE="PHP-3.01"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples"
+
+RDEPEND="
+	php_targets_php7-3? ( || ( dev-lang/php:7.3[apache2(-),fileinfo(-)] dev-lang/php:7.3[fileinfo(-),fpm(-)] ) )
+	php_targets_php7-4? ( || ( dev-lang/php:7.4[apache2(-),fileinfo(-)] dev-lang/php:7.4[fileinfo(-),fpm(-)] ) )
+	php_targets_php8-0? ( || ( dev-lang/php:8.0[apache2(-),fileinfo(-)] dev-lang/php:8.0[fileinfo(-),fpm(-)] ) )
+"
diff --git a/dev-php/swoole-async/Manifest b/dev-php/swoole-async/Manifest
index dce4e8cb3808..9360dcb68916 100644
--- a/dev-php/swoole-async/Manifest
+++ b/dev-php/swoole-async/Manifest
@@ -1,5 +1,5 @@
 DIST swoole-async-4.4.12.tar.gz 417674 BLAKE2B 77a96f53b1b159b558eb4759fe172e4a3b8f2648cd9f49252d89508eb56b4d342b178fa3c84d6a425c300a286063b4d32a05d09a3da4f3769be4c25a9800783c SHA512 adfb761803e5ec93c30aa2a4bbc312a2f43287a54cd237c0a87237dfcbfe1e6daa3d57ec2cdf15720202aa9a7830ed67ab2efdf2f7dd81989c3693e91bc22143
 DIST swoole-async-4.4.16.tar.gz 419094 BLAKE2B 7b93a0d2eb8a9597a68871783c60746c832b2eb1dce89a0f82ca6df2ee20151f910ad4f8ebb6a453bea3b7c2cc274266614f147b34c21a089ff9cc4ca0f73d1c SHA512 cf4bfc3c86740e343774b2cddc0ef2386f522e7929c160bc10d47ebe0b8f8d63dbcc82e70b7f3f30e7f7c102ebd42b02cddf4c3e1a0289f0e45147ddbd9aa546
-EBUILD swoole-async-4.4.12.ebuild 1057 BLAKE2B d27170880db3dd533f0bf66b08e2656bc4694a4ed38a3e45b7aad1db5ed94b205633ce4041486c87697a29eed857c930d77f208fca94d5e29ee29de51c5e57a7 SHA512 edb52f3826228bd5a20d316f62467bef487792ed081934d9dd71d02a411bfc7ddc61fc696e4f70d3cf99f2a182b6033e8242f9553ed2b365a009f121b8a2686d
-EBUILD swoole-async-4.4.16.ebuild 1057 BLAKE2B 8688cb941e2f0acd5ca924d4adbe8d563770e3ad6df48619999858c33bdb0e301f18af277485d9adf56624330b608ada599a30a87d0ea29e002d7975021c7be1 SHA512 65ae560828a28c0e4f0780a4492d3b4749b2a5056492e91bbe91d27afd5ae67c905be4c7cd93a42ffc382f72a95c6a1d53a8aebf35b2b0cd7fa1ce1508c5369b
+EBUILD swoole-async-4.4.12-r1.ebuild 1216 BLAKE2B 70a272e3491417a22a33fd4a80c25839962ae76b10e39ad664000c184fd1b04eda181f11b66abf3bd6ab9f88b4da2d34df7e1ec71be217d3793309c521d2f4c4 SHA512 14513fdf8efcd3543ee92d311129edea2c2d80e18a9ecd3fbacd1c0c3e188cf2c6f1dec23e2a60989a349cdd91542875424de6e6d4ddef1cf6d3bcee4733a060
+EBUILD swoole-async-4.4.16-r1.ebuild 1216 BLAKE2B 70a272e3491417a22a33fd4a80c25839962ae76b10e39ad664000c184fd1b04eda181f11b66abf3bd6ab9f88b4da2d34df7e1ec71be217d3793309c521d2f4c4 SHA512 14513fdf8efcd3543ee92d311129edea2c2d80e18a9ecd3fbacd1c0c3e188cf2c6f1dec23e2a60989a349cdd91542875424de6e6d4ddef1cf6d3bcee4733a060
 MISC metadata.xml 248 BLAKE2B 23d890183d0685ae23ea7d370f1ba3fdc379ffdf11239eb61bcda5104dda906654f7dc238ecb01d345cbf790df9fb41ff32b4bef16ed2c26f468aee8f2c6b7b5 SHA512 f75afe21947c53da964b12c9917864186a17dab1c34e68f28cf50549c52c24477bcf57c569d0ff5a7558cd1fc10afd52677da658e6c903ff95d83de7b807936b
diff --git a/dev-php/swoole-async/swoole-async-4.4.12.ebuild b/dev-php/swoole-async/swoole-async-4.4.12-r1.ebuild
index 845bfc568cc0..aa4fbdf97a3a 100644
--- a/dev-php/swoole-async/swoole-async-4.4.12.ebuild
+++ b/dev-php/swoole-async/swoole-async-4.4.12-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -26,7 +26,8 @@ SLOT="0"
 # Tests will require pre-configured endpoint
 RESTRICT="test"
 
-DEPEND=">=dev-php/swoole-4.3"
+# This will only compile with the same version of dev-php/swoole
+DEPEND="~dev-php/swoole-${PV}[php_targets_php7-1(-)?,php_targets_php7-2(-)?,php_targets_php7-3(-)?,php_targets_php7-4(-)?]"
 
 RDEPEND="${DEPEND}"
 
diff --git a/dev-php/swoole-async/swoole-async-4.4.16.ebuild b/dev-php/swoole-async/swoole-async-4.4.16-r1.ebuild
index 09b9d48a22e1..aa4fbdf97a3a 100644
--- a/dev-php/swoole-async/swoole-async-4.4.16.ebuild
+++ b/dev-php/swoole-async/swoole-async-4.4.16-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -26,7 +26,8 @@ SLOT="0"
 # Tests will require pre-configured endpoint
 RESTRICT="test"
 
-DEPEND=">=dev-php/swoole-4.3"
+# This will only compile with the same version of dev-php/swoole
+DEPEND="~dev-php/swoole-${PV}[php_targets_php7-1(-)?,php_targets_php7-2(-)?,php_targets_php7-3(-)?,php_targets_php7-4(-)?]"
 
 RDEPEND="${DEPEND}"