gentoo resync : 09.07.2022

3 files changed, 80 insertions, 1 deletions

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
+}