gentoo auto-resync : 15:09:2023 - 10:49:51

3 files changed, 4 insertions, 93 deletions

diff --git a/dev-php/pecl-http/Manifest b/dev-php/pecl-http/Manifest
index aff17d81fff1..0a25cbc8ece5 100644
--- a/dev-php/pecl-http/Manifest
+++ b/dev-php/pecl-http/Manifest
@@ -1,5 +1,3 @@
-DIST pecl_http-3.3.0.tgz 225653 BLAKE2B b8d3875b2716edda98a2f813e2f5947e65684da12be087b2ec51c405223574b2e44dee3ae0a653a538e9c3acafafcec1ff40778d45d8389b239a1ea4578c2831 SHA512 e774ba0514994f219cbd2d8bef872308be8617ea22894db72473042154842c62d918d4c0b87f8c592182fa81fd1487b672252d587857e1b306dce6d38e2f53fb
 DIST pecl_http-4.2.2.tgz 224436 BLAKE2B 26ef3bb38778f0374938ba3f3bddba37c3a2044c7b9ffe2aacbca2566251d26d37882bf66773b8ed62d46855e8f14ad9b577cdb1ef3db9eba9850c0b30e57284 SHA512 1203367d590c7d80ffe7a21e7ac352ba053e3daeb778bf99e08fc13582e665e1429f850e51e36304bdec15e6646b648f2c444b46fa263e5441d008ac41a00f4b
-EBUILD pecl-http-3.3.0.ebuild 2136 BLAKE2B b4f6f3da060c35f9b4411da9353ff39303a07c57bd4f08977442510a7945414693f8adf75f9bbc203caac9e511f54a2566f1931548f772d8d706072a51226808 SHA512 30d5014abc38a14bc7b358200aca11166fa7fa744b4701313855218cfaf048d163a1267bc0454081bf8e03a021cca49ac2b046f5c8483459ddc38ad71d92ab5c
-EBUILD pecl-http-4.2.2.ebuild 2010 BLAKE2B e424cc8475448e2c0bd306b00f3d9f8ef12e103b14fcbf93c7b097c5cdae407bc74b41d5b2338095de30144cc6da8ff57d3df5c02f61f19d9c80af886966cba8 SHA512 4ca71e896dd02403cd7ae6f0438cd50ed65807531c80bcc8f11ebdbeec73a158a15ee193927ccdd6508380f47a150909ef7ae2a059f174cc2a78dc54ca39dfc5
+EBUILD pecl-http-4.2.2.ebuild 1704 BLAKE2B bdc079b712e6cacc4d4757eb5bf49ef8cb05bae5f11428da52d1c9015044b6f783fcc4ebcd648220dce479c1449fc9f27d7a84446b95835bfa7e40e1f6af0c82 SHA512 24279a5aca40cb112bfe3ed3b3c03c09f487672990df8d183bb5aac7b6dac3abfebf62525056fd2f5502adc2de48bef80477420bbeaeb490da3d939d6b7644bc
 MISC metadata.xml 318 BLAKE2B 42b746a7e1bece2295d3350d90feb75bde0fe414baaacc84b996483724f381a281299345debc2bf320488e3eaff141c1f12bbcc929de95a2fbc3caac2957cc06 SHA512 a47c085f27b112dce6f2fdabb1d14c5f9b65ce6453dc8500bc63be4862211ab83ace06ce7303afc4c65e2971cc6ddb468c1aea633f543399db57e1f9d4fb4017
diff --git a/dev-php/pecl-http/pecl-http-3.3.0.ebuild b/dev-php/pecl-http/pecl-http-3.3.0.ebuild
deleted file mode 100644
index 7005edf002ee..000000000000
--- a/dev-php/pecl-http/pecl-http-3.3.0.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2023 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
-}
diff --git a/dev-php/pecl-http/pecl-http-4.2.2.ebuild b/dev-php/pecl-http/pecl-http-4.2.2.ebuild
index 6f8fca855057..4b7e320a307b 100644
--- a/dev-php/pecl-http/pecl-http-4.2.2.ebuild
+++ b/dev-php/pecl-http/pecl-http-4.2.2.ebuild
@@ -9,12 +9,10 @@ PHP_EXT_INI="yes"
 PHP_EXT_ZENDEXT="no"
 PHP_INI_NAME="50-http"
 
-USE_PHP="php7-4 php8-0 php8-1"
+USE_PHP="php8-0 php8-1"
 
 inherit php-ext-pecl-r3
 
-USE_PHP="php8-0 php8-1"
-
 KEYWORDS="amd64 x86"
 
 DESCRIPTION="Extended HTTP Support for PHP"
@@ -33,19 +31,14 @@ COMMON_DEPEND="app-arch/brotli:=
 DEPEND="
 	php_targets_php8-0? ( ${COMMON_DEPEND} dev-lang/php:8.0[session(-),iconv(-)] )
 	php_targets_php8-1? ( ${COMMON_DEPEND} dev-lang/php:8.1[session(-),iconv(-)] )"
-RDEPEND="${DEPEND}
-	php_targets_php7-4? ( dev-php/pecl-http:7[php_targets_php7-4(-)] )"
+RDEPEND="${DEPEND}"
 
 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_php8-0 || use php_targets_php8-1 ; then
-		php-ext-source-r3_src_prepare
-	else
-		default_src_prepare
-	fi
+	php-ext-source-r3_src_prepare
 
 	# Respect LDFLAGS, bug 727134
 	export EXTRA_LDFLAGS="${LDFLAGS}"
@@ -71,9 +64,3 @@ src_test() {
 		rm modules/raphf.so || die
 	done
 }
-
-src_install() {
-	if use php_targets_php8-0 || use php_targets_php8-1 ; then
-		php-ext-pecl-r3_src_install
-	fi
-}