gentoo resync : 22.12.2021

5 files changed, 2 insertions, 34 deletions

diff --git a/dev-php/Manifest.gz b/dev-php/Manifest.gz
index 89e6ca96ff11..ed9dd858fc68 100644
--- a/dev-php/Manifest.gz
+++ b/dev-php/Manifest.gz
diff --git a/dev-php/pecl-event/Manifest b/dev-php/pecl-event/Manifest
index f827c58191f7..edcbf169415b 100644
--- a/dev-php/pecl-event/Manifest
+++ b/dev-php/pecl-event/Manifest
@@ -1,5 +1,5 @@
 DIST event-2.5.7.tgz 141451 BLAKE2B 6d5e87b0b4892b59e2dc37dde0ae8ecafd104fbaa90fcc4d2b7183d4e3ba2f8fa182ddee90d5ebaebeb826f3e02d760ae25ce5ca01582fec9dfa5cb05dc6f5c6 SHA512 8160c3df1f6faa4b3ee37b9212a7953e5c0cdc747228517d238ea638b2b441e4b64e9d8c91d3af6bd33f33486137e9da1c7cb45b8d8400b8ab46d1ae4c03590a
 DIST event-3.0.2r1.tgz 198176 BLAKE2B ca93fa75fc1210476bddfafb89f9fd7a9a9ed9b23023ce37c5b5fe94c782d3a95a3a9bee8263cca3329b96b848cb213de7fac73c6594a8fee0c7c299b5f44215 SHA512 b117119814763bffe1c2c44766a822f638cd0873eeede29aab139fceb09a09df264f0d7b7e882b21dd9a7e96f45d692b45193509c3f53e0f3b10feb59c1a4ae4
 EBUILD pecl-event-2.5.7.ebuild 1105 BLAKE2B defec4ca79b47d5537497093f04cdbd01c69d6b5f4a873cedadcb5e9dd888bccfcaec649192ae3745e77f263d585194431cee210ed6b726d9a4f636d9e4daa78 SHA512 e4ece44cc0fa80ad7a7601f90c3684cb03c8e1ce2112bc4699d6884458102790b2b60ef287fb443a7b4c1d58f05aa6f2840871fe0b089b32d108fc6b8d71f889
-EBUILD pecl-event-3.0.2_p1.ebuild 1271 BLAKE2B 413bd511d479436bdf81d6d1717dfc8457278ae3fe5d44229f5b8be5695d39aa15df9e06b13ca9038408910aaec90c6a142cc53c0894a6b0424906a149ae4fe2 SHA512 4eef23c64dcf205812c2ea0e2c8a764ecddc4d8296742644df8de2ba3f5814385b90a9c283356604e40a4409591b5b9336b4251e8e8cb36ea7d296f1ccf7d5b6
+EBUILD pecl-event-3.0.2_p1.ebuild 1269 BLAKE2B 6cc6a5c70379094e4aa9f3df93d39de2d7030647ab2af89d22a9ebd1892771a8c021c86cc834e601136a58a9efd5501ae117eeaa0d120aead660ce3ef657493c SHA512 129d9062f5bac4c4ef9bce744ad82eb01d3ca892726ac1f02282a5dff3799f9d7174afcccac30c13dc687edd7ad5c17176216333e943edb80bdd0d67da1ed276
 MISC metadata.xml 462 BLAKE2B 397d205a4e7427357ba567ce23219eb0dabfe1e80cd543603499d1172ab6e44070cadcda8adcdb506967595a02ac14212f900570f71507af6e5f1640bebadfe2 SHA512 a7dea9ba80d58b6ff4761c7446d349bc2fcd1562901568e05cffeb31bbff287d3fdbe7d0ee82af0d3cd91e76cc76cd992b6615cbca9ca8488a587918a2f057af
diff --git a/dev-php/pecl-event/pecl-event-3.0.2_p1.ebuild b/dev-php/pecl-event/pecl-event-3.0.2_p1.ebuild
index bb93011413f9..200d55cffedd 100644
--- a/dev-php/pecl-event/pecl-event-3.0.2_p1.ebuild
+++ b/dev-php/pecl-event/pecl-event-3.0.2_p1.ebuild
@@ -15,7 +15,7 @@ PHP_EXT_PECL_FILENAME="${MY_P}.tgz"
 
 inherit php-ext-pecl-r3
 
-KEYWORDS="~amd64 ~ia64 ~x86"
+KEYWORDS="amd64 ~ia64 x86"
 LICENSE="PHP-3.01"
 
 DESCRIPTION="PHP wrapper for libevent2"
diff --git a/dev-php/pecl-mcrypt/Manifest b/dev-php/pecl-mcrypt/Manifest
index 33f4574a07bd..0506a8ebee0b 100644
--- a/dev-php/pecl-mcrypt/Manifest
+++ b/dev-php/pecl-mcrypt/Manifest
@@ -1,5 +1,3 @@
-DIST mcrypt-1.0.3.tgz 33590 BLAKE2B 5de1108f53604fffea9e3cb64d9efdae2008da164acd47b27fd0df8f12a0f508345d63bee4d588c1eecd9a935f8be3b2db5c3d119c5b3013955c54085ebe9e9f SHA512 ef215b576b471d6e1ecac4bb097f518fa57fd551b678b7fdddd9d5058f6667b0ee757e887f00b61672b89cd86f1962cbfe0e355681fa47daba9873c3bf4db679
 DIST mcrypt-1.0.4.tgz 27056 BLAKE2B 3faa77299ef1b5ab3f5a427b57d64f5f5ec54bc41f83924bfd285289c168341c0f044970fb0c37ca8561e68be165a40b2d6fd423ed6d5aa74225d5a3fb349546 SHA512 6a8244761035640366041a5f26057ab14bb85eaaa973ddf604e152b786ef750ec775ae91d7582044700d6fdef902425f3a9d6839113a52e0a9f957bf9d0c189a
-EBUILD pecl-mcrypt-1.0.3.ebuild 726 BLAKE2B 869726eb6c6e36082f3ca9e1c23f993d46b9733de66a087a4e0139f8703f2bfb4759ca15d259bd4c9f2a13e5d752ef63e33e533a3dff150f5c8e9d3a3490e397 SHA512 a1dfe478a62d2f93bfe5cdf93da2ad15a0d731f2f4869c1a37be2fef187b61884d87e86e661d19b122b53123035eb0fed8fb7738133198f8e71762a3d9309727
 EBUILD pecl-mcrypt-1.0.4.ebuild 528 BLAKE2B fc56eb2a581e1ba1edf7adb4b952b8305245ecc67eb2e3449fd83d57029dd224be26d77e34bfa8d135ae53b6daeff6301d45356042735108d091519a9bb782f3 SHA512 da4dd33965d8e855dd2543d82dba4de557e48a53db648c236d42d3ce59dfe5365bf54f6b02ba564dee62aca83291f37cfc10234b575771b5d032b8dfbba86776
 MISC metadata.xml 410 BLAKE2B f833751f407d57c96e4e2f2dd05520c55037ba7874e753750df8a22d4c18a5edaf0925982b2b04c4e7e541bd691c6d7798bef0079fe980b35a9f71f5e2405793 SHA512 cf4f51a91d42ff06b0d628c44ee66463a1903de18e749d690a722e2fe77d95d83ba709595adc20e27976de502c5a5e232065d394eb41c03f9d39a8291a874841
diff --git a/dev-php/pecl-mcrypt/pecl-mcrypt-1.0.3.ebuild b/dev-php/pecl-mcrypt/pecl-mcrypt-1.0.3.ebuild
deleted file mode 100644
index f2c29f734582..000000000000
--- a/dev-php/pecl-mcrypt/pecl-mcrypt-1.0.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PHP_EXT_NAME="mcrypt"
-USE_PHP="php7-2 php7-3 php7-4"
-MY_P="${PN/pecl-/}-${PV/_rc/RC}"
-PHP_EXT_ECONF_ARGS=()
-PHP_EXT_PECL_FILENAME="${MY_P}.tgz"
-PHP_EXT_S="${WORKDIR}/${MY_P}"
-
-inherit php-ext-pecl-r3
-
-DESCRIPTION="Bindings for the libmcrypt library"
-LICENSE="PHP-3.01"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
-
-DEPEND="dev-libs/libmcrypt"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	# PHP Warning: Use of undefined constant MCRYPT_CBC - assumed 'MCRYPT_CBC'
-	sed -i '/MODE3/s/MCRYPT_CBC/"MCRYPT_CBC"/g' tests/bug8040.phpt || die
-
-	php-ext-source-r3_src_prepare
-}