gentoo resync : 25.10.2021

4 files changed, 4 insertions, 81 deletions

diff --git a/dev-php/pecl-http/Manifest b/dev-php/pecl-http/Manifest
index be99011fd3da..b6c7bd12cccf 100644
--- a/dev-php/pecl-http/Manifest
+++ b/dev-php/pecl-http/Manifest
@@ -1,8 +1,6 @@
 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
-EBUILD pecl-http-3.2.1.ebuild 2263 BLAKE2B 10fbe37789566e35b728134e8a8a5f3f8b5bb14175d471c112c68f5d8163bce79f4d57b419d9e707456227155827b5061da21f799500fd38b93a4e0526a1be75 SHA512 93c5002b610f37af407f632c16337bacefd0429492a158413757559063888d30b2eedc1f3ec4c823fcbdeb9e3143143344a9a1485e15d5854c332a1c926050ba
-EBUILD pecl-http-3.2.4-r1.ebuild 2229 BLAKE2B 445ce6fc6ea5179cce22a9fb5a0d014d43a0da20d812ea45b190b3cf1fe4aecfac1d87ca15b478f5c671aa74a2e5bbefb37ed0d2ea60524442cb2649af2892be SHA512 8f72982eabfc0bc712d54890baf4dabb07c4ca2bec89df91904484bbbef321f7496e5037dc6b6e30064c661f8f3f9d99161d077fe9b92105ad1c16ba488877dc
-EBUILD pecl-http-4.2.1.ebuild 1830 BLAKE2B d4150e54da5c4c74685971133e9abe32af0c37b3e34e085dc23cdd64133884478df6fda8561a447fd3ef54939f5551eb416920f017c98e4ee29d097337febab0 SHA512 29bb1775656308df9c88e5cc2801b6f185b3ed4077b793f0c51da6b62b0cc520cf6fca5c0c04796817d059cec032f2321c2944e26773db095fea40f1afb0c178
+EBUILD pecl-http-3.2.4-r1.ebuild 2227 BLAKE2B 0c0fbb0433464e8a81139c8d40757a70026fff21e236131db38ac6df70a7209107cf04573fc5aa3f7cbc1108899d05fa8783a592c47d37b24b24cf20a043413e SHA512 85abeab748a1cdeabbc85aac2b47bdc3ad4322c7a7c9637670836383a5c69f3f7335a3ccc757bf3597fa3da9ccfdf682868806a02ffbe56e951fbdd6c8ab7494
+EBUILD pecl-http-4.2.1.ebuild 1828 BLAKE2B c9a009b2883f856958cc5343625a0e0989590c82696a3cd8be215631b522ecb1debd82491f636fede2f6694da5835d3251b8ffbf22364d8ba1c79578746f5795 SHA512 bde6bfd0a6a6e15a3f902298017f7a771ac6e36dbdff4a5bb24d7c37034727fafa2c6f443590397be4446288ec845ffb4b7bec559e54cd97293c6432e9599ea1
 MISC metadata.xml 240 BLAKE2B f60f325331d493a555e53c29c7cf2742a415356da28a467505f1441f3fd790fd0d59050df84854bdc379d19d94a46121216479807975a2922d5a2fefde83416b SHA512 fada9d69055f2be962b95aac82f260ec5db7a3f4392d10f0458a1d125938fa17539f7ec486000f3a95cff85a3fbb6bbf1f6f4fe6c2de7aa420a7543a3e89d03e
diff --git a/dev-php/pecl-http/pecl-http-3.2.1.ebuild b/dev-php/pecl-http/pecl-http-3.2.1.ebuild
deleted file mode 100644
index 6ccd05d09da9..000000000000
--- a/dev-php/pecl-http/pecl-http-3.2.1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-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_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_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
-		SKIP_ONLINE_TESTS="yes" 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.4-r1.ebuild b/dev-php/pecl-http/pecl-http-3.2.4-r1.ebuild
index 94c0833cc07d..2a31f4ccc895 100644
--- a/dev-php/pecl-http/pecl-http-3.2.4-r1.ebuild
+++ b/dev-php/pecl-http/pecl-http-3.2.4-r1.ebuild
@@ -15,7 +15,7 @@ inherit php-ext-pecl-r3
 
 USE_PHP="php7-3 php7-4"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DESCRIPTION="Extended HTTP Support for PHP"
 LICENSE="BSD-2 MIT"
diff --git a/dev-php/pecl-http/pecl-http-4.2.1.ebuild b/dev-php/pecl-http/pecl-http-4.2.1.ebuild
index 00f8de1189da..203c407dc9c6 100644
--- a/dev-php/pecl-http/pecl-http-4.2.1.ebuild
+++ b/dev-php/pecl-http/pecl-http-4.2.1.ebuild
@@ -15,7 +15,7 @@ inherit php-ext-pecl-r3
 
 USE_PHP="php8-0"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DESCRIPTION="Extended HTTP Support for PHP"
 LICENSE="BSD-2 MIT"