gentoo resync : 20.03.2022

9 files changed, 25 insertions, 327 deletions

diff --git a/dev-php/swoole/Manifest b/dev-php/swoole/Manifest
index a92d30a83123..0b2571a41751 100644
--- a/dev-php/swoole/Manifest
+++ b/dev-php/swoole/Manifest
@@ -1,15 +1,7 @@
-DIST swoole-4.2.13.tgz 1305634 BLAKE2B bb30180f7ca7b024a2aab8aff1149f6b19035315c9518dfc9e9e2e02acde09aa4cd09fbe146aefd39fc09c25af68347a5c188ca8a21677926b1adea5b549858b SHA512 f2438ce761766d20a24279a2d6f2094c718324585b1d396344f64e8a4facc1cc025a3afb2deff3b1accd5266763bdaa0a2b15e831ea4b9bdb107c83b0046636d
-DIST swoole-4.4.12.tgz 1436554 BLAKE2B cc9e64e108aa9b393265708a6922f53824c2e9941c0f47f4f6aacf93239829381cdf4625af8f30e2ca8ceb1663047c6be8b2d7808dbc29d27100135288f7ac85 SHA512 8899bb048b85c048903c80fe1af045ea4f82a25b3b4fd9995d51c8a2ab144306f9f5651276776e3f6a29c83322fb0aeee2822d131247070fe9e2e87b26f2e0e9
-DIST swoole-4.4.14.tgz 1440095 BLAKE2B 8a893604a84f750b95bb63a3c6ce9869a80a700b58e744e0da588dcdb88b9d9ae8fa5b73548cc182e255d7fe4e49139c3da9bcec40a54af94c35d355ee4cbfe0 SHA512 73b598069d38dcc3201a31fdd93c1bcf0ce31ab5399bade8c31f6decae25ef6e9c0aefe0412409158c1dd0fe502751c8e669e0a34561cb1b36448366708572c6
-DIST swoole-4.4.15.tgz 1454897 BLAKE2B 38f804e5f2f41ba2bc32ac2e6fd7be3e03f7a361487d7dad41bdc2ee3f2489d41824f60a841de1e3dea0cbf105d11dc1b5c2225ae49a02155604bc09c990ed61 SHA512 5ad797b38a20cfa17b0aa1fc5ab4f6446b84debb38babc05630e07833895401c778f1c6cf9eb32d7204b02c0e170ba6e613f356a054baa29ac511c19ce59620f
 DIST swoole-4.4.16.tgz 1457270 BLAKE2B 4b65270aa1014ea68cadae8eb021d37498dc3fe0bf2d681c95bf7113928138bc26ab73f3be91185eb5ecebcb4940906814913c7908c87592aafd33fbc1820bf7 SHA512 7be4705967ed6b7a955f679f8c39585d34dc8c87ba608ac3ae2b0fc3cae9513d9639c8e9aac4278ce85acc215b500044626aab9b2aac725c9ffaef72dfb02dd7
-DIST swoole-4.4.19.tgz 1469420 BLAKE2B 0240b5fbd6a4625d426d0c960859b8215122fff10be9e70823eb32f196d3ec075a952dc133258b04c323439de982079f5acbab9039958c457aa18f1687118ce3 SHA512 be4671da9fdbf65daf6364e5eaca9b25fd3557bec848a04b636ace48c896d4dbf08f6e877d6166571aa966732a70037bf2d4ba2f302696dd2b1371e2de993106
 DIST swoole-4.5.9.tgz 1552445 BLAKE2B 602ce65f7b59a3c199d7718aeb941d1ebde7d59096335992c2278f7e330f7b48554a8418cc4014f6fcf47af92d315368a16c572055b1fd9575608c2559ed3107 SHA512 9154a2874480218aa3c8935979267efb92a3d5a4f1ba7dc071bf4c2b169d69e31a6ad7412785d00543dc5827ce2d6c5999b6cabea2089818f3f57acc26bcb31f
-EBUILD swoole-4.2.13.ebuild 1736 BLAKE2B db2e93920c5401e954aa99fa141dd99638e3332ac3ae7fa101f83d88f60da62f4c798826322cb2358a25770bd78968cc405c242204ee6f824d9dda9b973cd331 SHA512 f5f08fd2d4322971352698c0498e898ba8d4e4bc09f114a575eff79705a4435b4a48edc0045cdb75b811cc890e21dd3498696eccbef6ea17b8751c08896188be
-EBUILD swoole-4.4.12.ebuild 1817 BLAKE2B f422e201d77443e94d1448d6fc4402b7e6ed6449ee0c1efa748894289c740b7bda327cade26abe4306f71c5affeff8dc886c8eef8af2bbb3fe89381ca9093713 SHA512 c22f4597075a8b856ebe31917451586c1b3f6f687bb2a47c35cc3e5d83d0b427d02cfb81cd9ae2cfe89d282b682897896bb69fddf54f5da97ef291d5af057aed
-EBUILD swoole-4.4.14.ebuild 1817 BLAKE2B f422e201d77443e94d1448d6fc4402b7e6ed6449ee0c1efa748894289c740b7bda327cade26abe4306f71c5affeff8dc886c8eef8af2bbb3fe89381ca9093713 SHA512 c22f4597075a8b856ebe31917451586c1b3f6f687bb2a47c35cc3e5d83d0b427d02cfb81cd9ae2cfe89d282b682897896bb69fddf54f5da97ef291d5af057aed
-EBUILD swoole-4.4.15.ebuild 1817 BLAKE2B f422e201d77443e94d1448d6fc4402b7e6ed6449ee0c1efa748894289c740b7bda327cade26abe4306f71c5affeff8dc886c8eef8af2bbb3fe89381ca9093713 SHA512 c22f4597075a8b856ebe31917451586c1b3f6f687bb2a47c35cc3e5d83d0b427d02cfb81cd9ae2cfe89d282b682897896bb69fddf54f5da97ef291d5af057aed
-EBUILD swoole-4.4.16.ebuild 1817 BLAKE2B f422e201d77443e94d1448d6fc4402b7e6ed6449ee0c1efa748894289c740b7bda327cade26abe4306f71c5affeff8dc886c8eef8af2bbb3fe89381ca9093713 SHA512 c22f4597075a8b856ebe31917451586c1b3f6f687bb2a47c35cc3e5d83d0b427d02cfb81cd9ae2cfe89d282b682897896bb69fddf54f5da97ef291d5af057aed
-EBUILD swoole-4.4.19.ebuild 1817 BLAKE2B f422e201d77443e94d1448d6fc4402b7e6ed6449ee0c1efa748894289c740b7bda327cade26abe4306f71c5affeff8dc886c8eef8af2bbb3fe89381ca9093713 SHA512 c22f4597075a8b856ebe31917451586c1b3f6f687bb2a47c35cc3e5d83d0b427d02cfb81cd9ae2cfe89d282b682897896bb69fddf54f5da97ef291d5af057aed
-EBUILD swoole-4.5.9.ebuild 1559 BLAKE2B 8a6b91445f759407469793624f8d5fdbd86544b5fb79960bed2a90739f927c3f608332c6a0b807172811ff4dee311eded719bb26cd32ff612640a65ebd9d0c97 SHA512 99cbcc90b6212ee554ed01cc45ed0f6a5577a7e7cb119a49ca090d089c0e61845e27e60e666d0aba66ab2e8d5cd27e829101d324a1a735c8d241c61acab2fefa
-MISC metadata.xml 345 BLAKE2B 93874c9becdbcfbe4122294d05ab36bcc6de890f50b8dcaae013fdaafeb4576b571afc5803ba489443fea2cfd056eb3c425903556082fb66e5ab785d088e7f7c SHA512 d964074fe23255867bf0e40491d427c0c052c94882c928cdbbe2a2ef2b36a6f73733767ef5c46356369aa17f9ebd0f3be106a549adf621bf0a4bc63c8d6cb3d1
+DIST swoole-4.8.7.tgz 1851160 BLAKE2B 3e5c9d664f1897b7bd490a1e9dbc4c3c03117a18ae58586efe534c617578a7af5be779e6ca44a5bf2f782abc2eb57bc21e3dc4e3445c3299918bc189547dc75c SHA512 36f36aface71435233aaa8c81e023b813c6175d3ed00a9de20acb690b58b464d99670c3b96f247ab1147f95e099d44785d60d5f1e36f519ccfeb09b3bddba264
+EBUILD swoole-4.4.16.ebuild 1448 BLAKE2B 007138c93d0ce40e40f1b6a6b216475c4b12444a85f133d3904e19ef660941b1fab7bc85709a59bda427aca0e4378b9ee90796609e64b3696575a005257aaa34 SHA512 a7b819b601aa7b0df7b1cbe784a81c773d2e6eadddc0095a7350f60ab6399a2e22b59cdef2e8a1d6bf9cb7de64b622152620e8311d95d1a5b0f041b12a08c97b
+EBUILD swoole-4.5.9.ebuild 1558 BLAKE2B bd0ae9804f9988de63bd1ac01842d2ff736012a7602e6633d4439b2c061d479b0963c0e850ad96ebee9dd349e6028d006791eebc708d2650d238aef0a16645ce SHA512 73641d783c50c2ad69b35d67547292d343147ae4f085f0788906ce7fa7a8220a8244d757b03ba28ddf16cf8c8e79ab99cc2c65899b4ebba233dd39d100bf7b8c
+EBUILD swoole-4.8.7.ebuild 1653 BLAKE2B 62e4580753fcd6e82a85b583e02a454335affe49c4bc74c4c9695d243cdce9ec83d373af1ef3518ab36bb5ada8b3e76dee3c44d3fc67837e9faba5d169217292 SHA512 2ccdae316979ecc919c4bcda526fa06abe4b7416e062ba9c71b046a286fd16486796e0ca8bcec61608ad2c90a2692b4dbb0de065aace5e41a5e5a4b95f827200
+MISC metadata.xml 425 BLAKE2B e22c1dc7ced96324ae0be299115d702664cb05e990c299b25dd8d558c7ab8e2ceb93a7bb5ebe5fbcb6c8a29e971208024ac5e4c6f78708c7f255d7e99a01ae19 SHA512 02c341989d04d303904279e74aa2692c61b7e92402cd825ea68bbd67212e213d589bd67412da5314972b6e9f299b6e7eed0e6c7739c165a7718342cb1a60a0d6
diff --git a/dev-php/swoole/metadata.xml b/dev-php/swoole/metadata.xml
index a64ace0fb389..fa5b5ed25cfb 100644
--- a/dev-php/swoole/metadata.xml
+++ b/dev-php/swoole/metadata.xml
@@ -8,4 +8,7 @@
 <use>
 <flag name="http2">Add support for HTTP/2 protocol via <pkg>net-libs/nghttp2</pkg></flag>
 </use>
+<upstream>
+  <remote-id type="github">swoole/swoole-src</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/dev-php/swoole/swoole-4.2.13.ebuild b/dev-php/swoole/swoole-4.2.13.ebuild
deleted file mode 100644
index 5f7e9c4b7df3..000000000000
--- a/dev-php/swoole/swoole-4.2.13.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PHP_EXT_NAME="swoole"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-PHP_EXT_SAPIS="cli"
-DOCS=( README.md )
-
-USE_PHP="php7-1 php7-2 php7-3"
-
-inherit php-ext-pecl-r3
-
-HOMEPAGE="https://www.swoole.co.uk"
-KEYWORDS="amd64 ~x86"
-
-DESCRIPTION="Event-driven asynchronous & concurrent & coroutine networking engine"
-LICENSE="Apache-2.0"
-SLOT="0"
-# Tests can hang.  Disable until this no longer happens
-RESTRICT="test"
-
-DEPEND="
-	dev-libs/libaio
-	dev-libs/boost:0=
-	dev-libs/libpcre
-	http2? ( net-libs/nghttp2:0= )
-	ssl? ( dev-libs/openssl:0= )
-	php_targets_php7-1? ( dev-lang/php:7.1[cli,sockets?] )
-	php_targets_php7-2? ( dev-lang/php:7.2[cli,sockets?] )
-	php_targets_php7-3? ( dev-lang/php:7.3[cli,sockets?] )
-	mysql? (
-		php_targets_php7-1? ( dev-lang/php:7.1[mysql,mysqli(+)] )
-		php_targets_php7-2? ( dev-lang/php:7.2[mysql,mysqli(+)] )
-		php_targets_php7-3? ( dev-lang/php:7.3[mysql,mysqli(+)] )
-	)
-"
-
-RDEPEND="${DEPEND}"
-
-IUSE="debug http2 mysql sockets ssl"
-
-src_configure() {
-	# PostgreSQL disabled due to Gentoo's slot system
-	# JEMalloc not included as it refuses to find a ${ESYSROOT}/usr/includes/jemalloc subdirectory
-	local PHP_EXT_ECONF_ARGS=(
-		--enable-swoole
-		--disable-coroutine-postgresql
-		$(use_enable debug)
-		$(use_enable http2)
-		$(use_enable mysql mysqlnd)
-		$(use_enable ssl openssl)
-		$(use_with ssl openssl-dir "${ESYSROOT}/usr")
-		$(use_enable sockets)
-	)
-
-	php-ext-source-r3_src_configure
-}
-
-src_test() {
-	local slot
-	for slot in $(php_get_slots); do
-		php_init_slot_env "${slot}"
-		[[ -f tests/template.phpt ]] && rm tests/template.phpt
-		SKIP_ONLINE_TESTS="yes" NO_INTERACTION="yes" emake test
-	done
-}
diff --git a/dev-php/swoole/swoole-4.4.12.ebuild b/dev-php/swoole/swoole-4.4.12.ebuild
deleted file mode 100644
index 4d978ebbd611..000000000000
--- a/dev-php/swoole/swoole-4.4.12.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PHP_EXT_NAME="swoole"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-PHP_EXT_SAPIS="cli"
-DOCS=( README.md )
-
-USE_PHP="php7-1 php7-2 php7-3 php7-4"
-
-inherit php-ext-pecl-r3
-
-HOMEPAGE="https://www.swoole.co.uk"
-KEYWORDS="~amd64 ~x86"
-
-DESCRIPTION="Event-driven asynchronous & concurrent & coroutine networking engine"
-LICENSE="Apache-2.0"
-SLOT="0"
-# Tests can hang.  Disable until this no longer happens
-RESTRICT="test"
-
-DEPEND="
-	app-arch/brotli:0=
-	dev-libs/libaio
-	dev-libs/boost:0=
-	dev-libs/libpcre
-	sys-libs/zlib:0=
-	http2? ( net-libs/nghttp2:0= )
-	ssl? (
-		dev-libs/openssl:0=
-	)
-	php_targets_php7-1? ( dev-lang/php:7.1[cli,sockets?] )
-	php_targets_php7-2? ( dev-lang/php:7.2[cli,sockets?] )
-	php_targets_php7-3? ( dev-lang/php:7.3[cli,sockets?] )
-	php_targets_php7-4? ( dev-lang/php:7.4[cli,sockets?] )
-	mysql? (
-		php_targets_php7-1? ( dev-lang/php:7.1[mysql,mysqli(+)] )
-		php_targets_php7-2? ( dev-lang/php:7.2[mysql,mysqli(+)] )
-		php_targets_php7-3? ( dev-lang/php:7.3[mysql,mysqli(+)] )
-		php_targets_php7-4? ( dev-lang/php:7.4[mysql,mysqli(+)] )
-	)
-"
-
-RDEPEND="${DEPEND}"
-
-IUSE="debug http2 mysql sockets ssl"
-
-src_configure() {
-	# JEMalloc not included as it refuses to find a ${ESYSROOT}/usr/includes/jemalloc subdirectory
-	local PHP_EXT_ECONF_ARGS=(
-		--enable-swoole
-		$(use_enable debug)
-		$(use_enable http2)
-		$(use_enable mysql mysqlnd)
-		$(use_enable ssl openssl)
-		$(use_with ssl openssl-dir "${ESYSROOT}/usr")
-		$(use_enable sockets)
-	)
-
-	php-ext-source-r3_src_configure
-}
-
-src_test() {
-	local slot
-	for slot in $(php_get_slots); do
-		php_init_slot_env "${slot}"
-		[[ -f tests/template.phpt ]] && rm tests/template.phpt
-		SKIP_ONLINE_TESTS="yes" NO_INTERACTION="yes" emake test
-	done
-}
diff --git a/dev-php/swoole/swoole-4.4.14.ebuild b/dev-php/swoole/swoole-4.4.14.ebuild
deleted file mode 100644
index 4d978ebbd611..000000000000
--- a/dev-php/swoole/swoole-4.4.14.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PHP_EXT_NAME="swoole"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-PHP_EXT_SAPIS="cli"
-DOCS=( README.md )
-
-USE_PHP="php7-1 php7-2 php7-3 php7-4"
-
-inherit php-ext-pecl-r3
-
-HOMEPAGE="https://www.swoole.co.uk"
-KEYWORDS="~amd64 ~x86"
-
-DESCRIPTION="Event-driven asynchronous & concurrent & coroutine networking engine"
-LICENSE="Apache-2.0"
-SLOT="0"
-# Tests can hang.  Disable until this no longer happens
-RESTRICT="test"
-
-DEPEND="
-	app-arch/brotli:0=
-	dev-libs/libaio
-	dev-libs/boost:0=
-	dev-libs/libpcre
-	sys-libs/zlib:0=
-	http2? ( net-libs/nghttp2:0= )
-	ssl? (
-		dev-libs/openssl:0=
-	)
-	php_targets_php7-1? ( dev-lang/php:7.1[cli,sockets?] )
-	php_targets_php7-2? ( dev-lang/php:7.2[cli,sockets?] )
-	php_targets_php7-3? ( dev-lang/php:7.3[cli,sockets?] )
-	php_targets_php7-4? ( dev-lang/php:7.4[cli,sockets?] )
-	mysql? (
-		php_targets_php7-1? ( dev-lang/php:7.1[mysql,mysqli(+)] )
-		php_targets_php7-2? ( dev-lang/php:7.2[mysql,mysqli(+)] )
-		php_targets_php7-3? ( dev-lang/php:7.3[mysql,mysqli(+)] )
-		php_targets_php7-4? ( dev-lang/php:7.4[mysql,mysqli(+)] )
-	)
-"
-
-RDEPEND="${DEPEND}"
-
-IUSE="debug http2 mysql sockets ssl"
-
-src_configure() {
-	# JEMalloc not included as it refuses to find a ${ESYSROOT}/usr/includes/jemalloc subdirectory
-	local PHP_EXT_ECONF_ARGS=(
-		--enable-swoole
-		$(use_enable debug)
-		$(use_enable http2)
-		$(use_enable mysql mysqlnd)
-		$(use_enable ssl openssl)
-		$(use_with ssl openssl-dir "${ESYSROOT}/usr")
-		$(use_enable sockets)
-	)
-
-	php-ext-source-r3_src_configure
-}
-
-src_test() {
-	local slot
-	for slot in $(php_get_slots); do
-		php_init_slot_env "${slot}"
-		[[ -f tests/template.phpt ]] && rm tests/template.phpt
-		SKIP_ONLINE_TESTS="yes" NO_INTERACTION="yes" emake test
-	done
-}
diff --git a/dev-php/swoole/swoole-4.4.15.ebuild b/dev-php/swoole/swoole-4.4.15.ebuild
deleted file mode 100644
index 4d978ebbd611..000000000000
--- a/dev-php/swoole/swoole-4.4.15.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PHP_EXT_NAME="swoole"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-PHP_EXT_SAPIS="cli"
-DOCS=( README.md )
-
-USE_PHP="php7-1 php7-2 php7-3 php7-4"
-
-inherit php-ext-pecl-r3
-
-HOMEPAGE="https://www.swoole.co.uk"
-KEYWORDS="~amd64 ~x86"
-
-DESCRIPTION="Event-driven asynchronous & concurrent & coroutine networking engine"
-LICENSE="Apache-2.0"
-SLOT="0"
-# Tests can hang.  Disable until this no longer happens
-RESTRICT="test"
-
-DEPEND="
-	app-arch/brotli:0=
-	dev-libs/libaio
-	dev-libs/boost:0=
-	dev-libs/libpcre
-	sys-libs/zlib:0=
-	http2? ( net-libs/nghttp2:0= )
-	ssl? (
-		dev-libs/openssl:0=
-	)
-	php_targets_php7-1? ( dev-lang/php:7.1[cli,sockets?] )
-	php_targets_php7-2? ( dev-lang/php:7.2[cli,sockets?] )
-	php_targets_php7-3? ( dev-lang/php:7.3[cli,sockets?] )
-	php_targets_php7-4? ( dev-lang/php:7.4[cli,sockets?] )
-	mysql? (
-		php_targets_php7-1? ( dev-lang/php:7.1[mysql,mysqli(+)] )
-		php_targets_php7-2? ( dev-lang/php:7.2[mysql,mysqli(+)] )
-		php_targets_php7-3? ( dev-lang/php:7.3[mysql,mysqli(+)] )
-		php_targets_php7-4? ( dev-lang/php:7.4[mysql,mysqli(+)] )
-	)
-"
-
-RDEPEND="${DEPEND}"
-
-IUSE="debug http2 mysql sockets ssl"
-
-src_configure() {
-	# JEMalloc not included as it refuses to find a ${ESYSROOT}/usr/includes/jemalloc subdirectory
-	local PHP_EXT_ECONF_ARGS=(
-		--enable-swoole
-		$(use_enable debug)
-		$(use_enable http2)
-		$(use_enable mysql mysqlnd)
-		$(use_enable ssl openssl)
-		$(use_with ssl openssl-dir "${ESYSROOT}/usr")
-		$(use_enable sockets)
-	)
-
-	php-ext-source-r3_src_configure
-}
-
-src_test() {
-	local slot
-	for slot in $(php_get_slots); do
-		php_init_slot_env "${slot}"
-		[[ -f tests/template.phpt ]] && rm tests/template.phpt
-		SKIP_ONLINE_TESTS="yes" NO_INTERACTION="yes" emake test
-	done
-}
diff --git a/dev-php/swoole/swoole-4.4.16.ebuild b/dev-php/swoole/swoole-4.4.16.ebuild
index 4d978ebbd611..ae1a5e1862af 100644
--- a/dev-php/swoole/swoole-4.4.16.ebuild
+++ b/dev-php/swoole/swoole-4.4.16.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -9,7 +9,7 @@ PHP_EXT_ZENDEXT="no"
 PHP_EXT_SAPIS="cli"
 DOCS=( README.md )
 
-USE_PHP="php7-1 php7-2 php7-3 php7-4"
+USE_PHP="php7-4"
 
 inherit php-ext-pecl-r3
 
@@ -32,14 +32,8 @@ DEPEND="
 	ssl? (
 		dev-libs/openssl:0=
 	)
-	php_targets_php7-1? ( dev-lang/php:7.1[cli,sockets?] )
-	php_targets_php7-2? ( dev-lang/php:7.2[cli,sockets?] )
-	php_targets_php7-3? ( dev-lang/php:7.3[cli,sockets?] )
 	php_targets_php7-4? ( dev-lang/php:7.4[cli,sockets?] )
 	mysql? (
-		php_targets_php7-1? ( dev-lang/php:7.1[mysql,mysqli(+)] )
-		php_targets_php7-2? ( dev-lang/php:7.2[mysql,mysqli(+)] )
-		php_targets_php7-3? ( dev-lang/php:7.3[mysql,mysqli(+)] )
 		php_targets_php7-4? ( dev-lang/php:7.4[mysql,mysqli(+)] )
 	)
 "
diff --git a/dev-php/swoole/swoole-4.5.9.ebuild b/dev-php/swoole/swoole-4.5.9.ebuild
index 5d5171051808..5c0345cb8a3e 100644
--- a/dev-php/swoole/swoole-4.5.9.ebuild
+++ b/dev-php/swoole/swoole-4.5.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -15,7 +15,7 @@ USE_PHP="php7-2 php7-3 php7-4 php8-0"
 inherit php-ext-pecl-r3
 
 HOMEPAGE="https://www.swoole.co.uk"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 DESCRIPTION="Event-driven asynchronous & concurrent & coroutine networking engine"
 LICENSE="Apache-2.0"
diff --git a/dev-php/swoole/swoole-4.4.19.ebuild b/dev-php/swoole/swoole-4.8.7.ebuild
index 4d978ebbd611..74dd612ea9a3 100644
--- a/dev-php/swoole/swoole-4.4.19.ebuild
+++ b/dev-php/swoole/swoole-4.8.7.ebuild
@@ -1,15 +1,16 @@
-# 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="swoole"
 PHP_EXT_INI="yes"
 PHP_EXT_ZENDEXT="no"
 PHP_EXT_SAPIS="cli"
+PHP_EXT_NEEDED_USE="cli,sockets?"
 DOCS=( README.md )
 
-USE_PHP="php7-1 php7-2 php7-3 php7-4"
+USE_PHP="php7-4 php8-0 php8-1"
 
 inherit php-ext-pecl-r3
 
@@ -19,28 +20,20 @@ KEYWORDS="~amd64 ~x86"
 DESCRIPTION="Event-driven asynchronous & concurrent & coroutine networking engine"
 LICENSE="Apache-2.0"
 SLOT="0"
-# Tests can hang.  Disable until this no longer happens
+# Tests require network access for composer libraries under tests/include/lib/vendor
 RESTRICT="test"
 
 DEPEND="
 	app-arch/brotli:0=
-	dev-libs/libaio
-	dev-libs/boost:0=
 	dev-libs/libpcre
 	sys-libs/zlib:0=
-	http2? ( net-libs/nghttp2:0= )
 	ssl? (
 		dev-libs/openssl:0=
 	)
-	php_targets_php7-1? ( dev-lang/php:7.1[cli,sockets?] )
-	php_targets_php7-2? ( dev-lang/php:7.2[cli,sockets?] )
-	php_targets_php7-3? ( dev-lang/php:7.3[cli,sockets?] )
-	php_targets_php7-4? ( dev-lang/php:7.4[cli,sockets?] )
 	mysql? (
-		php_targets_php7-1? ( dev-lang/php:7.1[mysql,mysqli(+)] )
-		php_targets_php7-2? ( dev-lang/php:7.2[mysql,mysqli(+)] )
-		php_targets_php7-3? ( dev-lang/php:7.3[mysql,mysqli(+)] )
 		php_targets_php7-4? ( dev-lang/php:7.4[mysql,mysqli(+)] )
+		php_targets_php8-0? ( dev-lang/php:8.0[mysql,mysqli(+)] )
+		php_targets_php8-1? ( dev-lang/php:8.1[mysql,mysqli(+)] )
 	)
 "
 
@@ -64,10 +57,14 @@ src_configure() {
 }
 
 src_test() {
+	ulimit -n 16384 > /dev/null 2>&1
 	local slot
 	for slot in $(php_get_slots); do
 		php_init_slot_env "${slot}"
-		[[ -f tests/template.phpt ]] && rm tests/template.phpt
-		SKIP_ONLINE_TESTS="yes" NO_INTERACTION="yes" emake test
+		cd tests || die
+		if has_version ">=dev-php/xdebug-3" ; then
+			sed -i 's/xdebug.default_enable=0/xdebug.mode=off/' run-tests || die
+		fi
+		PHPT=1 "${PHPCLI}" -d "memory_limit=1024m" ./run-tests swoole_* || die
 	done
 }