gentoo resync : 29.01.2021

5 files changed, 3 insertions, 135 deletions

diff --git a/dev-php/pecl-event/Manifest b/dev-php/pecl-event/Manifest
index 66ee58d1a6a7..c45d69633546 100644
--- a/dev-php/pecl-event/Manifest
+++ b/dev-php/pecl-event/Manifest
@@ -1,7 +1,3 @@
-AUX pecl-event-2.5.3-no-sockets.patch 638 BLAKE2B 868bff8eb515cf466d9b844baf7322999520c8829f49fb3547229b884b090fd130b72c7b27c74297d3c3d7567f7b5056484a4624dcf6e5010ae8213f01ac8ffa SHA512 482338228ec8e6ea2d91c77e6fe4b2a5619ee39880824bdac134d9f2cd23a2363df2f68eac4a849579c02d9fc140112887d30b601e36d96e4e93837a3c6a653d
-DIST event-2.5.3.tgz 140913 BLAKE2B e9b1886b65d1c307bf4a40ebe20e19f33d9e422ce98fb704c7174e953c2488b87f941fc5615bfee07e7d51e1775a0256349e023e6d8921fdd237e527ab108151 SHA512 359eee2f501444f444904ee1960d85af0b77259e59a06d9c6ae1ec008f7bda9bda5bf999d437d84416150a965466519c04e4c2f36dbca44367075fcbb46cd917
 DIST event-2.5.7.tgz 141451 BLAKE2B 6d5e87b0b4892b59e2dc37dde0ae8ecafd104fbaa90fcc4d2b7183d4e3ba2f8fa182ddee90d5ebaebeb826f3e02d760ae25ce5ca01582fec9dfa5cb05dc6f5c6 SHA512 8160c3df1f6faa4b3ee37b9212a7953e5c0cdc747228517d238ea638b2b441e4b64e9d8c91d3af6bd33f33486137e9da1c7cb45b8d8400b8ab46d1ae4c03590a
-EBUILD pecl-event-2.5.3-r1.ebuild 1287 BLAKE2B 0997b61878600d61f4c7bed21dae3779cd94969822e251b6f8058e278af2618f95750303153f5a6994936b292bb9abb9027adea1119460ba1dff8845f6c45c88 SHA512 0e812328044810c6637a59664f130d67d3d169f99e86f53ac928b97efd797d37318dcaa098ce96ccdc03044f3b4e367446ea993817bb3ca3a13cb723b5aa703a
-EBUILD pecl-event-2.5.3.ebuild 1228 BLAKE2B 404fb20be843887e48696ff4bf0bc0f795b2fc8257d3e41771d23762a2b1b94851262bcc9c3dbbf87cbf98d909f814db5d6c60ac70ec064c3db6508929c96910 SHA512 112041bcedb204a3e978f691ca608569f821e305409f5a0d29148315555a1795737ef6040ffa472e0d095e03a896083f63e09af410b07dd0ea08de4eb445ea3d
-EBUILD pecl-event-2.5.7.ebuild 1171 BLAKE2B 32ca8c89683b02f8a55450ec23eac07212f48c465eda8429d7814f72857622b77fc92a2e1269d9a6d863bf477b4d3b4ae6aae055577409c36d24d0b2f23c2329 SHA512 1981c5cb35eda5db3b35fa90563735e71a931b9f263e89aca7a477d5d38bf5581f163162a1737312d3f23a77bad208740c8e8ec28b63dba5a6215b31ed4e6633
+EBUILD pecl-event-2.5.7.ebuild 1169 BLAKE2B b313db6c4bf2c79faa925404c180bcc40d44b835774a17201c3c7c8f73afd32963448479c55690fc73e360169ac415f0f111bcd5ca9afec5d6c26132109c3837 SHA512 aab9e0cf772a537d934e3d401b9ab333eb5901a39831400fd6966eaff6acd97e0f20411c24038409641d21ceb2e89ca68c79ab876e6a3a23e13821caf7b1803f
 MISC metadata.xml 431 BLAKE2B 25421824761cdcc90c610236ac4acfd85e18fb63e4f92ff3fa5e51698a7e2004812a7193ced70646baf02bacd0bc896a5959ee88bd88dd5de68db729661ad02f SHA512 6349913306ea30f9ee6cd5ad862e0323d143815f4db47da14e5d54d0dcfb604118e3845f664f2a9b8527797b262c9567bbf5f189426f9becbd169be0ec111056
diff --git a/dev-php/pecl-event/files/pecl-event-2.5.3-no-sockets.patch b/dev-php/pecl-event/files/pecl-event-2.5.3-no-sockets.patch
deleted file mode 100644
index 9b95708a6e7b..000000000000
--- a/dev-php/pecl-event/files/pecl-event-2.5.3-no-sockets.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/php7/src/fe-orig.c	2020-02-23 15:50:42.159505602 +0300
-+++ b/php7/src/fe.c	2020-02-23 15:51:09.985462245 +0300
-@@ -640,7 +640,9 @@
- 	PHP_ME(EventUtil, getSocketName,   arginfo_event_util_get_socket_name,   ZEND_ACC_PUBLIC | ZEND_ACC_STATIC)
- 	PHP_ME(EventUtil, getSocketFd,     arginfo_event_util_get_socket_fd,     ZEND_ACC_PUBLIC | ZEND_ACC_STATIC)
- 	PHP_ME(EventUtil, setSocketOption, arginfo_event_util_set_socket_option, ZEND_ACC_PUBLIC | ZEND_ACC_STATIC)
-+#ifdef PHP_EVENT_SOCKETS_SUPPORT
- 	PHP_ME(EventUtil, createSocket,    arginfo_event_util_create_socket,     ZEND_ACC_PUBLIC | ZEND_ACC_STATIC)
-+#endif
- 
- 	PHP_FE_END
- };
diff --git a/dev-php/pecl-event/pecl-event-2.5.3-r1.ebuild b/dev-php/pecl-event/pecl-event-2.5.3-r1.ebuild
deleted file mode 100644
index b30711ec149f..000000000000
--- a/dev-php/pecl-event/pecl-event-2.5.3-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PHP_EXT_NAME="event"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-DOCS=( README.md )
-
-USE_PHP="php7-1 php7-2 php7-3 php7-4"
-
-inherit php-ext-pecl-r3
-
-KEYWORDS="~amd64 ~ia64 ~x86"
-LICENSE="PHP-3.01"
-
-DESCRIPTION="PHP wrapper for libevent2"
-SLOT="0"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.5.3-no-sockets.patch"
-)
-
-DEPEND="
-	>=dev-libs/libevent-2.0.2
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-	php_targets_php7-1? ( dev-lang/php:7.1[sockets?] )
-	php_targets_php7-2? ( dev-lang/php:7.2[sockets?] )
-	php_targets_php7-3? ( dev-lang/php:7.3[sockets?] )
-	php_targets_php7-4? ( dev-lang/php:7.4[sockets?] )"
-
-RDEPEND="
-	${DEPEND}
-	!dev-php/pecl-libevent"
-
-IUSE="debug examples +extra libressl +sockets +ssl threads"
-
-src_configure() {
-	local PHP_EXT_ECONF_ARGS=(
-		--with-event-core
-		$(use_enable debug event-debug)
-		$(use_with extra event-extra)
-		$(use_with ssl event-openssl)
-		$(use_with threads event-pthreads)
-		$(use_enable sockets event-sockets)
-	)
-	php-ext-source-r3_src_configure
-}
-
-src_test() {
-	local slot
-	for slot in $(php_get_slots); do
-		php_init_slot_env "${slot}"
-		SKIP_ONLINE_TESTS="yes" NO_INTERACTION="yes" emake test
-	done
-}
diff --git a/dev-php/pecl-event/pecl-event-2.5.3.ebuild b/dev-php/pecl-event/pecl-event-2.5.3.ebuild
deleted file mode 100644
index 1cb12cf06a50..000000000000
--- a/dev-php/pecl-event/pecl-event-2.5.3.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PHP_EXT_NAME="event"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-DOCS=( README.md )
-
-USE_PHP="php7-1 php7-2 php7-3 php7-4"
-
-inherit php-ext-pecl-r3
-
-KEYWORDS="amd64 ~ia64 x86"
-LICENSE="PHP-3.01"
-
-DESCRIPTION="PHP wrapper for libevent2"
-SLOT="0"
-
-DEPEND="
-	>=dev-libs/libevent-2.0.2
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-	php_targets_php7-1? ( dev-lang/php:7.1[sockets?] )
-	php_targets_php7-2? ( dev-lang/php:7.2[sockets?] )
-	php_targets_php7-3? ( dev-lang/php:7.3[sockets?] )
-	php_targets_php7-4? ( dev-lang/php:7.4[sockets?] )"
-
-RDEPEND="
-	${DEPEND}
-	!dev-php/pecl-libevent"
-
-IUSE="debug examples +extra libressl +sockets +ssl threads"
-
-src_configure() {
-	local PHP_EXT_ECONF_ARGS=(
-		--with-event-core
-		$(use_enable debug event-debug)
-		$(use_with extra event-extra)
-		$(use_with ssl event-openssl)
-		$(use_with threads event-pthreads)
-		$(use_enable sockets event-sockets)
-	)
-	php-ext-source-r3_src_configure
-}
-
-src_test() {
-	local slot
-	for slot in $(php_get_slots); do
-		php_init_slot_env "${slot}"
-		SKIP_ONLINE_TESTS="yes" NO_INTERACTION="yes" emake test
-	done
-}
diff --git a/dev-php/pecl-event/pecl-event-2.5.7.ebuild b/dev-php/pecl-event/pecl-event-2.5.7.ebuild
index 51a0782ec320..9a0e909a2930 100644
--- a/dev-php/pecl-event/pecl-event-2.5.7.ebuild
+++ b/dev-php/pecl-event/pecl-event-2.5.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -12,7 +12,7 @@ USE_PHP="php7-2 php7-3 php7-4"
 
 inherit php-ext-pecl-r3
 
-KEYWORDS="~amd64 ~ia64 ~x86"
+KEYWORDS="amd64 ~ia64 x86"
 LICENSE="PHP-3.01"
 
 DESCRIPTION="PHP wrapper for libevent2"