gentoo resync : 15.12.2019

8 files changed, 13 insertions, 319 deletions

diff --git a/dev-php/pecl-http/Manifest b/dev-php/pecl-http/Manifest
index bdd31513121c..e772b3ff0b64 100644
--- a/dev-php/pecl-http/Manifest
+++ b/dev-php/pecl-http/Manifest
@@ -1,16 +1,9 @@
-AUX pecl-http-gnutls.patch 1061 BLAKE2B f57588e2c8a7a285a68aab931e0df55cb69cb06c8753afb784542fac1ce757f7ae4e244d49b06ec33e233d01b36b3c89c82e7af3e3d73221ba65ef58ea11dde3 SHA512 a05b39188a66ed9a328f9b864008390e4703db15d15416168e31eed78e2da5239db25d98fe3f4d62c26db6a5dfae83f84db2a6f3fffce39b768a03261c308a90
 DIST pecl_http-2.6.0.tgz 217673 BLAKE2B a7147924cfc018c3e273d85666d9792ea614955d0aa20ac43171266d91d139dccdbf2472dec4d145b798ce99a541dba48f7bed6009fbdf2a7ad81ab322963788 SHA512 12d18049411a4133008449a1e7458a3055322dc337f421e0e2be126ec965f15b0189af6fccd9ca4537c48819c763b9e020906ac6d09d87ead92f4436fac595ad
-DIST pecl_http-3.1.0.tgz 214166 BLAKE2B 2f84fc9f5f7d465142e3482a9ee46b9dd80dd2b5ec58ad1d8d4fb18a665ebe70e4f872b8915c3a84484a3b1cd0709b39bf6170c6f1c6175aef7d43bac44aa3df SHA512 1c272aa476106bb61848f175f0ba6715b3d8928f70cdac1a673cc87c2dc780dff5434a3bc595d5e8a1ef7b847a1d2e214f9e9ae80b8b5d1f80a299febc85b0ea
-DIST pecl_http-3.2.0.tgz 218829 BLAKE2B bbd6f9fe8afb4324d928496e1fbcdd455e8bff5e45312ba65e5e9263719b098763203de055ea8a8ff6202ae4a434d37db25bb0975faacc956af4a0c6e8bfe8a1 SHA512 59738ee52370c68f7e74349d52738da845cfb83ae27b51a2caf3b048ba0b37c897702d7f5f8e0517df5612fd2e904d02e8e24c9e649a9e7cfdcdc04e9d19b113
 DIST pecl_http-3.2.1.tgz 221244 BLAKE2B b6581829fb8a800e24ccedd4d0f3efbaf558850bdc356d27a6e1d1097a8e2cfc61963a1daccd1d0f269a7cef5b243d45cdfaff5138321fe20df615dde44d19e3 SHA512 e67d4b32ba6f524e3fcf65f5497b94275e1a4a14fce97c57afe366369f368b3acdbedf364ed73cf983fb2c5f57f498adaa1100e7c936f11cbc5de1caedad7b51
 DIST pecl_http-3.2.3.tgz 220204 BLAKE2B 2a712dc8f69a8a80f6f8c306883df580fdff4a0d4cb0ac06cc004f8622b30b8e2f5d373276381fd3ad67657a80cc929be81745f200a98b6ed5e475de5639dfc5 SHA512 e955e3246db9a9172081dd9a077154139c585bfce546e91839052bbab4d0db9d0695122574a66891ceba5c0b7e8a8f0768274e1516521ccb95cd19504dc13666
 EBUILD pecl-http-2.6.0-r1.ebuild 1920 BLAKE2B 82a6059834c91e0128a8f37d22e69619bf8f40fe61251f4b7d577e68cd698eca0854f1e43e463420be008d63e35d0aa4dc2c30d391ddd47cfab60a758686af6c SHA512 027af36906cc4f2763a5b8328b5ce2b2705a2c62a86b30cf8f160965ef8a5635971cf7135adde5afe8a72a48abfc29f338b3cd442797a347e15cc9bb9faa64a1
 EBUILD pecl-http-2.6.0-r2.ebuild 1903 BLAKE2B 6063b2a23da518f5806250798949951e3a8668cfd4bd0c517987e8d9f20ff6606f8f4e72c05d982233a095c1c43bd422057c028e35b75860ab4d5a74253f35b5 SHA512 913fe6b153f964e52389424158cbcb945227eae652597cb5e178256ea48410aaaf72fd15509a39fb074d7313a24ca324dde1808e831a3f677a4c3e471ec5b934
 EBUILD pecl-http-2.6.0.ebuild 1384 BLAKE2B 8731362ad89d7289d2c623cc49112727fc65737fed80c92e172b5618eecca4ff38ff49a798210b4b89925d333184135aabfdbb5a71fed76c2702d3267cda418f SHA512 56afa6c46fa8a95d5fa74dcc56527f82b51aaa01d187bb2cd21f8d8a135eb139635eb8a3f298beabd95e89e9c112dffe19a9f2e8ef34acf3dd4908c6d10ee6f1
-EBUILD pecl-http-3.1.0-r1.ebuild 2123 BLAKE2B a7b5367adac7f83908f8f4bd3efc828b64e570e87cf187e32a852d566c0bb34250cb08a7e91c729ba4f4210feb2d1a1da573faff04d56a8238f18d13ea3767be SHA512 e9d1bc26b6cb8eb453f8faf1520ee7fef6ec66780d3d9d81a5f787e244b04abdd9734a73f0c47ccd717ffea20a3511cc57651c4960299ced1636129ddd17d92e
-EBUILD pecl-http-3.1.0-r2.ebuild 2141 BLAKE2B 1d7995c97a5d3b7060d7f2dc118af8224e41d9e7c50c46e9242b700e5145b7ddbbae4b5bbec9e14011fd4cfb944a44103fce4a4b03b29b7026ff30372ce0dc47 SHA512 bd399cc7134919e5b1c0a5f495901408a1957cf88185c7918300556b3bfd1c52651ca5a1a749b874b48e0797746fdb9c2fa533f1edc76e0fcdf751a806fb165f
-EBUILD pecl-http-3.1.0.ebuild 1587 BLAKE2B 1347611d4ad7f0ce44ef23370797cb37faad0d6261527fe8c28d935d9920c94ee06905396be0122f68a2ae4541169d10e8600bea3691a7d82090b8131f2275ac SHA512 f5d7f29153359c1a4a6991165e42a674c086e544c37fbdc23e580e2a6714734acbccb15081eedf92be3df79a21298ad5ee81032b75278c5ffc2bbfc59b0c6215
-EBUILD pecl-http-3.2.0.ebuild 2278 BLAKE2B 116dabcfe280aa6493c26b27839f3aca896f53eb1a31d888b37ac9fed4465fc5bcc90fd53997172946be531ad8ffcd40546150ca12364e8b2c6822d802b93024 SHA512 254a844d59183d63de091c19b2df2d318b965cd49d8a236d8ea68c0c7dd57d6b16a03377ad5eeed9544b886a679c089fb8ce710cdd4960e0a2f663478b3b5817
-EBUILD pecl-http-3.2.1.ebuild 2278 BLAKE2B 60c7b681cee099c96937487432dc929da276f2da70a05a0d6650204323cbacb26c677f5cc1f7cfeaeb5a8f5f4ed98b2ffad21433079792bb7d7f58eabf8ef7cc SHA512 4c64162b73cca6d2f89eb40da5c42d19b2da6bb4ec55d636729e311a42acf31c9f6c91f536d86cf6ff08d2c5a0d716f3df080dafb12399ea4e69d9f7801d65d3
-EBUILD pecl-http-3.2.3.ebuild 2278 BLAKE2B 60c7b681cee099c96937487432dc929da276f2da70a05a0d6650204323cbacb26c677f5cc1f7cfeaeb5a8f5f4ed98b2ffad21433079792bb7d7f58eabf8ef7cc SHA512 4c64162b73cca6d2f89eb40da5c42d19b2da6bb4ec55d636729e311a42acf31c9f6c91f536d86cf6ff08d2c5a0d716f3df080dafb12399ea4e69d9f7801d65d3
+EBUILD pecl-http-3.2.1.ebuild 2300 BLAKE2B 60e5a929270af09032e8494a55d90ef56b7a82821c4fb20a3ed8b03e08aa8ef77cc2d101ddbc31b095ec8b051acf9ebf2d0506a195e6f1aed4124eb54c6564b7 SHA512 0e2d36bfea79ec4662aff2425dae4193eff07864c2ef8c25bd087b56cba02c4c0eaa2af9c8449e64322ce0e42d75fbcfa8381e737172bd59c3e8a7d4dd90e0e0
+EBUILD pecl-http-3.2.3.ebuild 2471 BLAKE2B 1ffdd3704cf738741f61dd0370995530b32404d49d3bfbfd517612c11e27dbe8456786dc018d5cc03bd59cb03437bc2629ff775e52eb58cf4f1b14ac9e77bbdd SHA512 aaeb45f27eb7815b8fd4708ad7741a96fbe6050c01fc5465db364679f3224321e647d56a7b5e66bb87bbc960b674b453467baa7db7324e9b41974af155cbd97f
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/pecl-http/files/pecl-http-gnutls.patch b/dev-php/pecl-http/files/pecl-http-gnutls.patch
deleted file mode 100644
index 4b58805946dc..000000000000
--- a/dev-php/pecl-http/files/pecl-http-gnutls.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -aurN a/autoconf/pecl/libcurl.m4 b/autoconf/pecl/libcurl.m4
---- a/autoconf/pecl/libcurl.m4	2016-12-12 04:04:21.000000000 -0500
-+++ b/autoconf/pecl/libcurl.m4	2017-01-06 09:07:17.575660038 -0500
-@@ -87,7 +87,7 @@
- 	AC_REQUIRE([PECL_HAVE_LIBCURL_CA])dnl
- 	PECL_HAVE_LIBCURL_FEATURE([SSL], [
- 		PECL_HAVE_LIBCURL_SSLLIB([OpenSSL], [openssl/ssl.h openssl/crypto.h], [ssl crypto])
--		PECL_HAVE_LIBCURL_SSLLIB([GnuTLS], [gnutls.h gcrypt.h], [gnutls gcrypt])
-+		PECL_HAVE_LIBCURL_SSLLIB([GnuTLS], [gnutls/gnutls.h gcrypt.h], [gnutls gcrypt])
- 		PECL_HAVE_LIBCURL_SSLLIB([NSS])
- 		PECL_HAVE_LIBCURL_SSLLIB([SecureTransport])
- 		PECL_HAVE_LIBCURL_SSLLIB([GSKit])
-diff -aurN a/src/php_http_client_curl.c b/src/php_http_client_curl.c
---- a/src/php_http_client_curl.c	2016-12-12 04:04:21.000000000 -0500
-+++ b/src/php_http_client_curl.c	2017-01-06 09:09:01.631772852 -0500
-@@ -21,7 +21,7 @@
- #	include <openssl/ssl.h>
- #endif
- #if PHP_HTTP_HAVE_LIBCURL_GNUTLS
--#	include <gnutls.h>
-+#	include <gnutls/gnutls.h>
- #endif
- 
- typedef struct php_http_client_curl_handler {
diff --git a/dev-php/pecl-http/pecl-http-3.1.0-r1.ebuild b/dev-php/pecl-http/pecl-http-3.1.0-r1.ebuild
deleted file mode 100644
index df1e34b5a7e3..000000000000
--- a/dev-php/pecl-http/pecl-http-3.1.0-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PHP_EXT_NAME="http"
-PHP_EXT_PECL_PKG="pecl_http"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-
-USE_PHP="php5-6 php7-0 php7-1"
-
-inherit php-ext-pecl-r3
-
-USE_PHP="php7-0 php7-1"
-
-KEYWORDS="~amd64 ~x86"
-
-DESCRIPTION="Extended HTTP Support for PHP"
-LICENSE="BSD-2 MIT"
-SLOT="7"
-IUSE="ssl curl_ssl_gnutls curl_ssl_libressl curl_ssl_nss +curl_ssl_openssl"
-
-DEPEND="dev-libs/libevent
-	dev-php/pecl-propro:7[php_targets_php5-6?,php_targets_php7-0?,php_targets_php7-1?]
-	dev-php/pecl-raphf:7[php_targets_php5-6?,php_targets_php7-0?,php_targets_php7-1?]
-	net-dns/libidn
-	sys-libs/zlib
-	ssl? ( net-misc/curl[ssl,curl_ssl_gnutls=,curl_ssl_libressl=,curl_ssl_nss=,curl_ssl_openssl=] )
-	!ssl? ( net-misc/curl[-ssl] )
-	php_targets_php7-0? ( dev-lang/php:7.0[hash,session,iconv] )
-	php_targets_php7-1? ( dev-lang/php:7.1[hash,session,iconv] )"
-RDEPEND="${DEPEND}
-	php_targets_php5-6? ( dev-php/pecl-http:2[php_targets_php5-6] )"
-
-PHP_EXT_ECONF_ARGS=( --with-http --without-http-shared-deps --without-http-libidn2-dir )
-
-PATCHES=( "${FILESDIR}/pecl-http-gnutls.patch" )
-
-src_prepare() {
-	if use php_targets_php7-0 || use php_targets_php7-1 ; then
-		php-ext-source-r3_src_prepare
-	else
-		default_src_prepare
-	fi
-}
-
-src_install() {
-	if use php_targets_php7-0 || use php_targets_php7-1 ; then
-		php-ext-pecl-r3_src_install
-
-		# Ensure that the http extension is loaded after its
-		# dependencies raphf and propro (bug 612054). Some day
-		# this should be possible through the eclass (bug 586446).
-		local slot, file, oldname, newname
-		for slot in $(php_get_slots); do
-			php_init_slot_env "${slot}"
-			for file in $(php_slot_ini_files "${slot}") ; do
-				# Prepend "zz" to the ini symlink name. This is sadly
-				# coupled to the naming convention in the eclass.
-				oldname="${ED}/${file/ext/ext-active}"
-				newname="${oldname/${PHP_EXT_NAME}.ini/zz${PHP_EXT_NAME}.ini}"
-				mv "${oldname}" "${newname}" \
-					|| die "failed to rename ${oldname} to ${newname}"
-				einfo "renamed ${oldname} to ${newname}"
-			done
-		done
-	fi
-}
diff --git a/dev-php/pecl-http/pecl-http-3.1.0-r2.ebuild b/dev-php/pecl-http/pecl-http-3.1.0-r2.ebuild
deleted file mode 100644
index 3cdfdc24b15d..000000000000
--- a/dev-php/pecl-http/pecl-http-3.1.0-r2.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-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="php5-6 php7-1 php7-2"
-
-inherit php-ext-pecl-r3
-
-USE_PHP="php7-1 php7-2"
-
-KEYWORDS="~amd64 ~x86"
-
-DESCRIPTION="Extended HTTP Support for PHP"
-LICENSE="BSD-2 MIT"
-SLOT="7"
-IUSE="ssl curl_ssl_gnutls curl_ssl_libressl curl_ssl_nss +curl_ssl_openssl"
-
-DEPEND="dev-libs/libevent
-	dev-php/pecl-propro:7[php_targets_php7-1?,php_targets_php7-2?]
-	dev-php/pecl-raphf:7[php_targets_php7-1?,php_targets_php7-2?]
-	net-dns/libidn2
-	sys-libs/zlib
-	ssl? ( net-misc/curl[ssl,curl_ssl_gnutls=,curl_ssl_libressl=,curl_ssl_nss=,curl_ssl_openssl=] )
-	!ssl? ( net-misc/curl[-ssl] )
-	php_targets_php7-1? ( dev-lang/php:7.1[hash,session,iconv] )
-	php_targets_php7-2? ( dev-lang/php:7.2[hash,session,iconv] )"
-RDEPEND="${DEPEND}
-	php_targets_php5-6? ( dev-php/pecl-http:2[php_targets_php5-6] )"
-
-PHP_EXT_ECONF_ARGS=( --with-http --without-http-shared-deps --without-http-libidn-dir )
-
-PATCHES=( "${FILESDIR}/pecl-http-gnutls.patch" )
-
-src_prepare() {
-	if use php_targets_php7-1 || use php_targets_php7-2 ; 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 ; 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
-		NO_INTERACTION="yes" emake test
-		# Clean up testing links
-		rm modules/propro.so modules/raphf.so || die
-	done
-}
-
-pkg_postinst() {
-	ewarn "This API has drastically changed and is not compatible with the 1.x syntax."
-	ewarn "Please review the documentation and update your code."
-}
diff --git a/dev-php/pecl-http/pecl-http-3.1.0.ebuild b/dev-php/pecl-http/pecl-http-3.1.0.ebuild
deleted file mode 100644
index c262cbac8549..000000000000
--- a/dev-php/pecl-http/pecl-http-3.1.0.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PHP_EXT_NAME="http"
-PHP_EXT_PECL_PKG="pecl_http"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-
-USE_PHP="php5-6 php7-0 php7-1"
-
-inherit php-ext-pecl-r3
-
-USE_PHP="php7-0 php7-1"
-
-KEYWORDS="amd64 x86"
-
-DESCRIPTION="Extended HTTP Support for PHP"
-LICENSE="BSD-2 MIT"
-SLOT="7"
-IUSE="ssl curl_ssl_gnutls curl_ssl_libressl curl_ssl_nss +curl_ssl_openssl"
-
-DEPEND="dev-libs/libevent
-	dev-php/pecl-propro:7[php_targets_php5-6?,php_targets_php7-0?,php_targets_php7-1?]
-	dev-php/pecl-raphf:7[php_targets_php5-6?,php_targets_php7-0?,php_targets_php7-1?]
-	net-dns/libidn
-	sys-libs/zlib
-	ssl? ( net-misc/curl[ssl,curl_ssl_gnutls=,curl_ssl_libressl=,curl_ssl_nss=,curl_ssl_openssl=] )
-	!ssl? ( net-misc/curl[-ssl] )
-	php_targets_php7-0? ( dev-lang/php:7.0[hash,session,iconv] )
-	php_targets_php7-1? ( dev-lang/php:7.1[hash,session,iconv] )"
-RDEPEND="${DEPEND}
-	php_targets_php5-6? ( dev-php/pecl-http:2[php_targets_php5-6] )"
-
-PHP_EXT_ECONF_ARGS=( --with-http --without-http-shared-deps --without-http-libidn2-dir )
-
-PATCHES=( "${FILESDIR}/pecl-http-gnutls.patch" )
-
-src_prepare() {
-	if use php_targets_php7-0 || use php_targets_php7-1 ; then
-		php-ext-source-r3_src_prepare
-	else
-		default_src_prepare
-	fi
-}
-
-src_install() {
-	if use php_targets_php7-0 || use php_targets_php7-1 ; then
-		php-ext-pecl-r3_src_install
-	fi
-}
-
-pkg_postinst() {
-	ewarn "This API has drastically changed and is not compatible with the 1.x syntax."
-	ewarn "Please review the documentation and update your code."
-}
diff --git a/dev-php/pecl-http/pecl-http-3.2.0.ebuild b/dev-php/pecl-http/pecl-http-3.2.0.ebuild
deleted file mode 100644
index b17e8e396289..000000000000
--- a/dev-php/pecl-http/pecl-http-3.2.0.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-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="php5-6 php7-1 php7-2 php7-3"
-
-inherit php-ext-pecl-r3
-
-USE_PHP="php7-1 php7-2 php7-3"
-
-KEYWORDS="~amd64 ~x86"
-
-DESCRIPTION="Extended HTTP Support for PHP"
-LICENSE="BSD-2 MIT"
-SLOT="7"
-IUSE="ssl curl_ssl_gnutls curl_ssl_libressl curl_ssl_nss +curl_ssl_openssl"
-
-DEPEND="app-arch/brotli:=
-	dev-libs/libevent
-	dev-php/pecl-propro:7[php_targets_php7-1?,php_targets_php7-2?,php_targets_php7-3?]
-	dev-php/pecl-raphf:7[php_targets_php7-1?,php_targets_php7-2?,php_targets_php7-3?]
-	net-dns/libidn2
-	sys-libs/zlib
-	ssl? ( net-misc/curl[ssl,curl_ssl_gnutls=,curl_ssl_libressl=,curl_ssl_nss=,curl_ssl_openssl=] )
-	!ssl? ( net-misc/curl[-ssl] )
-	php_targets_php7-1? ( dev-lang/php:7.1[hash,session,iconv] )
-	php_targets_php7-2? ( dev-lang/php:7.2[hash,session,iconv] )
-	php_targets_php7-3? ( dev-lang/php:7.3[hash,session,iconv] )"
-RDEPEND="${DEPEND}
-	php_targets_php5-6? ( dev-php/pecl-http:2[php_targets_php5-6] )"
-
-PHP_EXT_ECONF_ARGS=( --with-http --without-http-shared-deps --without-http-libidn-dir )
-
-src_prepare() {
-	if use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3 ; then
-		php-ext-source-r3_src_prepare
-	else
-		default_src_prepare
-	fi
-}
-
-src_install() {
-	if use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3 ; 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
-		NO_INTERACTION="yes" emake test
-		# Clean up testing links
-		rm modules/propro.so modules/raphf.so || die
-	done
-}
-
-pkg_postinst() {
-	ewarn "This API has drastically changed and is not compatible with the 1.x syntax."
-	ewarn "Please review the documentation and update your code."
-}
diff --git a/dev-php/pecl-http/pecl-http-3.2.1.ebuild b/dev-php/pecl-http/pecl-http-3.2.1.ebuild
index 564462685ed2..bb652b2134f2 100644
--- a/dev-php/pecl-http/pecl-http-3.2.1.ebuild
+++ b/dev-php/pecl-http/pecl-http-3.2.1.ebuild
@@ -15,7 +15,7 @@ inherit php-ext-pecl-r3
 
 USE_PHP="php7-1 php7-2 php7-3"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DESCRIPTION="Extended HTTP Support for PHP"
 LICENSE="BSD-2 MIT"
@@ -63,7 +63,7 @@ src_test() {
 		sed -i \
 			's/PHP_TEST_SHARED_EXTENSIONS)/PHP_TEST_SHARED_EXTENSIONS) -d extension=propro.so -d extension=raphf.so/' \
 			Makefile || die
-		NO_INTERACTION="yes" emake test
+		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-http/pecl-http-3.2.3.ebuild b/dev-php/pecl-http/pecl-http-3.2.3.ebuild
index 564462685ed2..df14e937eb77 100644
--- a/dev-php/pecl-http/pecl-http-3.2.3.ebuild
+++ b/dev-php/pecl-http/pecl-http-3.2.3.ebuild
@@ -9,11 +9,11 @@ PHP_EXT_INI="yes"
 PHP_EXT_ZENDEXT="no"
 PHP_INI_NAME="50-http"
 
-USE_PHP="php5-6 php7-1 php7-2 php7-3"
+USE_PHP="php5-6 php7-1 php7-2 php7-3 php7-4"
 
 inherit php-ext-pecl-r3
 
-USE_PHP="php7-1 php7-2 php7-3"
+USE_PHP="php7-1 php7-2 php7-3 php7-4"
 
 KEYWORDS="~amd64 ~x86"
 
@@ -24,22 +24,23 @@ IUSE="ssl curl_ssl_gnutls curl_ssl_libressl curl_ssl_nss +curl_ssl_openssl"
 
 DEPEND="app-arch/brotli:=
 	dev-libs/libevent
-	dev-php/pecl-propro:7[php_targets_php7-1?,php_targets_php7-2?,php_targets_php7-3?]
-	dev-php/pecl-raphf:7[php_targets_php7-1?,php_targets_php7-2?,php_targets_php7-3?]
+	dev-php/pecl-propro:7[php_targets_php7-1?,php_targets_php7-2?,php_targets_php7-3?,php_targets_php7-4?]
+	>=dev-php/pecl-raphf-2.0.1:7[php_targets_php7-1?,php_targets_php7-2?,php_targets_php7-3?,php_targets_php7-4?]
 	net-dns/libidn2
 	sys-libs/zlib
 	ssl? ( net-misc/curl[ssl,curl_ssl_gnutls=,curl_ssl_libressl=,curl_ssl_nss=,curl_ssl_openssl=] )
 	!ssl? ( net-misc/curl[-ssl] )
 	php_targets_php7-1? ( dev-lang/php:7.1[hash,session,iconv] )
 	php_targets_php7-2? ( dev-lang/php:7.2[hash,session,iconv] )
-	php_targets_php7-3? ( dev-lang/php:7.3[hash,session,iconv] )"
+	php_targets_php7-3? ( dev-lang/php:7.3[hash,session,iconv] )
+	php_targets_php7-4? ( dev-lang/php:7.4[session,iconv] )"
 RDEPEND="${DEPEND}
 	php_targets_php5-6? ( dev-php/pecl-http:2[php_targets_php5-6] )"
 
 PHP_EXT_ECONF_ARGS=( --with-http --without-http-shared-deps --without-http-libidn-dir )
 
 src_prepare() {
-	if use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3 ; then
+	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
@@ -47,7 +48,7 @@ src_prepare() {
 }
 
 src_install() {
-	if use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3 ; then
+	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
 }
@@ -63,7 +64,7 @@ src_test() {
 		sed -i \
 			's/PHP_TEST_SHARED_EXTENSIONS)/PHP_TEST_SHARED_EXTENSIONS) -d extension=propro.so -d extension=raphf.so/' \
 			Makefile || die
-		NO_INTERACTION="yes" emake test
+		SKIP_ONLINE_TESTS=yes NO_INTERACTION="yes" emake test
 		# Clean up testing links
 		rm modules/propro.so modules/raphf.so || die
 	done