gentoo auto-resync : 28:12:2023 - 07:37:55

3 files changed, 3 insertions, 65 deletions

diff --git a/dev-php/pecl-memcache/Manifest b/dev-php/pecl-memcache/Manifest
index 0f9217eb3c2e..83695b82d703 100644
--- a/dev-php/pecl-memcache/Manifest
+++ b/dev-php/pecl-memcache/Manifest
@@ -1,5 +1,4 @@
 AUX 8.0-patches-20211123.patch 5706 BLAKE2B 66b9671357963c0f7c0f32f3b578f4b38acda7024e8c33bb03e328b4177c20841b8318482122b343d407d6dc5e4182d8fc74ae3dfc186ad8d606372d024a4807 SHA512 6e66664ca4aa7d3578facbdad012506b3b12fdae7460c9cad5f515228f697e511bbb02fe7f9a2efcfc3066877688bd7092e81a26199d5e26097f365806079eab
 DIST memcache-8.0.tgz 78448 BLAKE2B fb2d68d5ff4c6343dd2e66ae5c3f84fed22455b8614dce04dde2e10c164bf1f8d276776b74beaa387dd794cf82f6b897a88c8bed058376b9032e0452c2e94b06 SHA512 d5eea13b85d8d35ef6aab8c5699bdcc4707cf8debf4052cbbeac26e7e2360a4d3d4e55e8bd0b40cf19fe014ba1fc42d5417deabbe22a199f0c6aa98b67d132d4
-EBUILD pecl-memcache-8.0-r1.ebuild 1756 BLAKE2B 3a74d6df4bd2b8014ecbaa3ec60c5a792198bebe76c20292e7cb9d19c66460da0785fbe668489968403a3e7e2e5707b76f095c13860a864b14e141ab821f8ec8 SHA512 fd43111a8d3849c235acc802b444bb7cec1ebb99d287ff805fd92e4dded56f86a352345c40208ae211176e1cdf7882085d3707a3f3ad7b09de0b17e04724497f
-EBUILD pecl-memcache-8.0.ebuild 1576 BLAKE2B 3f0becc77c24a002deb94a7de2500ed39521d9611e91e22ffad85d88ea674db9b8ea5b68d6dfa3611a416ea3c5832fa3eda6554ff00e8a4030be2f34b1293347 SHA512 ca03bca8f011501972596d4bbcddb4b82c19779209fdf39e8b91b1832dbc11ed56f8f0e5740022076d9d95419e2d716c14b336de56ed49f6018666a9dfc4c8cb
+EBUILD pecl-memcache-8.0-r1.ebuild 1707 BLAKE2B 3da2ae49246d41e7938a79d67671eb1a037486bfd643527e99ee988415440ff5d0e9d8d363e3a49fd6b1f4793407e4ccc00a8394971eed11ae8f47c539b35388 SHA512 ca9a13dd7fb7122a7a2684921fcbc5355ba552ff89bea77901ff342421cb73700500473c499d812006bf92d47a0e72197368e0d30baacea0b147909e7a6217ce
 MISC metadata.xml 240 BLAKE2B f60f325331d493a555e53c29c7cf2742a415356da28a467505f1441f3fd790fd0d59050df84854bdc379d19d94a46121216479807975a2922d5a2fefde83416b SHA512 fada9d69055f2be962b95aac82f260ec5db7a3f4392d10f0458a1d125938fa17539f7ec486000f3a95cff85a3fbb6bbf1f6f4fe6c2de7aa420a7543a3e89d03e
diff --git a/dev-php/pecl-memcache/pecl-memcache-8.0-r1.ebuild b/dev-php/pecl-memcache/pecl-memcache-8.0-r1.ebuild
index dd2db9d8a731..fad568565135 100644
--- a/dev-php/pecl-memcache/pecl-memcache-8.0-r1.ebuild
+++ b/dev-php/pecl-memcache/pecl-memcache-8.0-r1.ebuild
@@ -9,7 +9,7 @@ PHP_EXT_NEEDED_USE="session(-)?"
 DOCS=( README example.php )
 HTML_DOCS=( memcache.php )
 
-USE_PHP="php8-0 php8-1"
+USE_PHP="php8-1"
 
 inherit php-ext-pecl-r3
 
@@ -20,10 +20,7 @@ LICENSE="PHP-3"
 SLOT="8"
 IUSE="+session"
 
-DEPEND="
-	php_targets_php8-0? ( sys-libs/zlib )
-	php_targets_php8-1? ( sys-libs/zlib )
-"
+DEPEND="php_targets_php8-1? ( sys-libs/zlib )"
 RDEPEND="${DEPEND}"
 
 # The test suite requires memcached to be running.
diff --git a/dev-php/pecl-memcache/pecl-memcache-8.0.ebuild b/dev-php/pecl-memcache/pecl-memcache-8.0.ebuild
deleted file mode 100644
index 5d57ff2bad0e..000000000000
--- a/dev-php/pecl-memcache/pecl-memcache-8.0.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PHP_EXT_NAME="memcache"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-PHP_EXT_NEEDED_USE="session(-)?"
-DOCS=( README example.php )
-HTML_DOCS=( memcache.php )
-
-USE_PHP="php8-0"
-
-inherit php-ext-pecl-r3
-
-KEYWORDS="~amd64 ~hppa ~ppc64 ~x86"
-
-DESCRIPTION="PHP extension for using memcached"
-LICENSE="PHP-3"
-SLOT="8"
-IUSE="+session"
-
-DEPEND="php_targets_php8-0? ( sys-libs/zlib )"
-RDEPEND="${DEPEND}"
-
-# The test suite requires memcached to be running.
-RESTRICT='test'
-
-src_prepare() {
-	if use php_targets_php8-0 ; then
-		php-ext-source-r3_src_prepare
-	else
-		default
-	fi
-}
-
-src_configure() {
-	if use php_targets_php8-0 ; then
-		local PHP_EXT_ECONF_ARGS=( --enable-memcache --with-zlib-dir="${EPREFIX}/usr" $(use_enable session memcache-session) )
-		php-ext-source-r3_src_configure
-	fi
-}
-
-src_install() {
-	if use php_targets_php8-0 ; then
-		php-ext-pecl-r3_src_install
-
-		php-ext-source-r3_addtoinifiles "memcache.allow_failover" "true"
-		php-ext-source-r3_addtoinifiles "memcache.max_failover_attempts" "20"
-		php-ext-source-r3_addtoinifiles "memcache.chunk_size" "32768"
-		php-ext-source-r3_addtoinifiles "memcache.default_port" "11211"
-		php-ext-source-r3_addtoinifiles "memcache.hash_strategy" "consistent"
-		php-ext-source-r3_addtoinifiles "memcache.hash_function" "crc32"
-		php-ext-source-r3_addtoinifiles "memcache.redundancy" "1"
-		php-ext-source-r3_addtoinifiles "memcache.session_redundancy" "2"
-		php-ext-source-r3_addtoinifiles "memcache.protocol" "ascii"
-	fi
-}