gentoo resync : 03.03.2021

21 files changed, 203 insertions, 486 deletions

diff --git a/dev-php/Manifest.gz b/dev-php/Manifest.gz
index e0d63ac1b0bd..48be8aa1dc45 100644
--- a/dev-php/Manifest.gz
+++ b/dev-php/Manifest.gz
diff --git a/dev-php/PHP_CodeCoverage/Manifest b/dev-php/PHP_CodeCoverage/Manifest
index 8e3929993712..05df9ff5578e 100644
--- a/dev-php/PHP_CodeCoverage/Manifest
+++ b/dev-php/PHP_CodeCoverage/Manifest
@@ -1,9 +1,6 @@
 AUX autoload-7.0.10.php 646 BLAKE2B 71515ed7d8eb3339e2756e8f1af7bba2e0f1cf1b0fc3e225518186dc676caa67cf03ab56188d21382765becae01f9ada57bde0b487f63bce9dcc6f6a4a7efd04 SHA512 c080167102a448c527fb5e185f87506ed225da1b36501cbfc0383af6233f63d7a031234eb21e28376def9004a339d392498ff2903c171dd80e4079d8dcb79c0b
-AUX autoload.php 3859 BLAKE2B 65cc25809352182d5c852743a25e2e297fe0819d2feac0fb47cd9f80e9ea36a16f7f2dbc2657bd73d1e484c1b851b5603eaec8c6d0f7fa5e6582876661587fbe SHA512 c33ce039a84f0f6d260bf46e8308df806968328c80dd89b778c76a0620d514c5e101ac3c741a3b68aba07cb59ccfae4a0dfb6157fb056e03ce65c1478300655a
-DIST PHP_CodeCoverage-4.0.7.tar.gz 349906 BLAKE2B 2ba665efa2d20a5eb66c66375a095425057e883697dd1d3ba7214e56de29c96451516adb2843589e64732c994aac7289afa0e34a74d56ef9bc36f36e635eb944 SHA512 8418efa2585d05b3004ab50e7ba77513429d649f71fdb2479412424a0f40a698a962e1d87852db08fec8f92e569a9a5767dad66d5d64e072637dde33182e71e9
 DIST PHP_CodeCoverage-7.0.10.tar.gz 237217 BLAKE2B bd2dc397c15a85ca020abf3d9a1dfb5f438020b577cded7942110dd8affa2d703ed40bf01ae68f38c6ae9383ba59bc9f7706af99596bce0b40cef6d2a7e92fb2 SHA512 37cda2d3687f62b5546372507954eeedd4da1c03fa9cab147b578d035046763799ca1535310ba458403094714060fe8f1327bed6951440392fee3df551be73b1
 DIST PHP_CodeCoverage-7.0.12.tar.gz 237382 BLAKE2B 3051e7e473506a66d7b4720083274f3b3a64b9f480bb1a95682608220d19be60810a899d974ea3189270c0751f8af058f2503ed83c61d92180cbb41708b07536 SHA512 b105672dc50952c3c606010389fd6fb8ebfcbb78d99d72f9a21a1eef045314b0803fdb689bba1314671d0eeab0e5ed00bf416b09ca45d291688f4c59748c2ed1
-EBUILD PHP_CodeCoverage-4.0.7-r2.ebuild 1231 BLAKE2B 35c5671daef5b92c8f3cd15349db79496254ff3743631f501592d73e2789df444540fde6b50ab966d4215552093763ad18eb5cc5e62e8c1709b0d64f9e194f28 SHA512 14076a4d1184e0b8c754bd943f4d1aabdcd5150f2d04a5aec39722ad3449b91424a7cad81b82fd06562fd5cdf2cc2e8db5dca25cfd6390cfcc2fb56754a62148
 EBUILD PHP_CodeCoverage-7.0.10-r1.ebuild 1951 BLAKE2B 3869286b1e8b8decac2ba671dfec87f6ddaeaef477dd71df4c2b8ac33a6b99681d347f8a6179f732b4a27d83e3ff29e9139b95e8ad91042eee0d2a0f05ac87c6 SHA512 b4aa6e448363d1a9a46a55e0b4e5c17ab542e0395ae8ff7236ef2dfc615912050f0b23a113fc7a02acbf691328ee4d6592f625a6bcc6575da7072c4e68910fbd
 EBUILD PHP_CodeCoverage-7.0.12.ebuild 2779 BLAKE2B 4da5a1db8e259e4bb4d81fafc27c301da2646c4357f37b3e8a83a7c569954b28db06f903e1216525f9ab8370e556addcdd8763e2133e24cbcf6870032a66c30a SHA512 6f5619a0a77154bb12fc0423b7cf5f103adcc248be5abae38206055a76258ba89cf7e67e576f027be027ce19c1776c858591a14ad31c9b83a5b3ddc33a171aaf
 MISC metadata.xml 363 BLAKE2B b7bbbe2ece6838dbb09a821ccc5828da676f85cae4b4e68ac18aea083f22004a00ceffec959d13066f6c64ceb1de6a8852371f1d4d559ee4e2b31a757957e5cc SHA512 14cd926668a3a076c639f765f3e6a8d35b6ca06849dbe2ddbf7d3ee86055b6aa486332d786ec70f5375ba9b50cf43c025210b820a4543b4ec7719f10f60f3c29
diff --git a/dev-php/PHP_CodeCoverage/PHP_CodeCoverage-4.0.7-r2.ebuild b/dev-php/PHP_CodeCoverage/PHP_CodeCoverage-4.0.7-r2.ebuild
deleted file mode 100644
index 946931da37b8..000000000000
--- a/dev-php/PHP_CodeCoverage/PHP_CodeCoverage-4.0.7-r2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN="php-code-coverage"
-
-DESCRIPTION="Collection, processing, and rendering for PHP code coverage"
-HOMEPAGE="https://phpunit.de"
-SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
-IUSE=""
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-RDEPEND="dev-php/fedora-autoloader
-	>=dev-php/File_Iterator-1.3
-	<dev-php/File_Iterator-2.0
-	>=dev-php/Text_Template-1.2
-	<dev-php/Text_Template-2.0
-	>=dev-php/PHP_TokenStream-1.4
-	<dev-php/PHP_TokenStream-3.0
-	>=dev-php/sebastian-environment-1.3.2
-	<dev-php/sebastian-environment-3.0
-	>=dev-php/sebastian-version-1.0
-	<dev-php/sebastian-version-3.0
-	dev-php/sebastian-code-unit-reverse-lookup
-	<dev-php/sebastian-code-unit-reverse-lookup-2.0
-	|| (
-		dev-lang/php:7.2[xml(-),xmlwriter(-)]
-	)"
-
-src_install() {
-	insinto /usr/share/php/PHP/CodeCoverage
-	doins -r src/*
-	doins "${FILESDIR}/autoload.php"
-}
-
-pkg_postinst() {
-	ewarn "This library now loads via /usr/share/php/PHP/CodeCoverage/autoload.php"
-	ewarn "Please update any scripts to require the autoloader"
-}
diff --git a/dev-php/PHP_CodeCoverage/files/autoload.php b/dev-php/PHP_CodeCoverage/files/autoload.php
deleted file mode 100644
index b35d6fa4bac0..000000000000
--- a/dev-php/PHP_CodeCoverage/files/autoload.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-/* Autoloader for dev-php/PHP_CodeCoverage */
-
-if (!class_exists('Fedora\\Autoloader\\Autoload', false)) {
-    require_once '/usr/share/php/Fedora/Autoloader/autoload.php';
-}
-
-\Fedora\Autoloader\Autoload::addClassMap(
-    array(
-		'sebastianbergmann\codecoverage\codecoverage' => '/CodeCoverage.php',
-		'sebastianbergmann\codecoverage\filter' => '/Filter.php',
-		'sebastianbergmann\codecoverage\util' => '/Util.php',
-		'sebastianbergmann\codecoverage\driver\driver' => '/Driver/Driver.php',
-		'sebastianbergmann\codecoverage\driver\hhvm' => '/Driver/HHVM.php',
-		'sebastianbergmann\codecoverage\driver\phpdbg' => '/Driver/PHPDBG.php',
-		'sebastianbergmann\codecoverage\driver\xdebug' => '/Driver/Xdebug.php',
-		'sebastianbergmann\codecoverage\exception\coveredcodenotexecutedexception' => '/Exception/CoveredCodeNotExecutedException.php',
-		'sebastianbergmann\codecoverage\exception\exception' => '/Exception/Exception.php',
-		'sebastianbergmann\codecoverage\exception\invalidargumentexception' => '/Exception/InvalidArgumentException.php',
-		'sebastianbergmann\codecoverage\exception\missingcoversannotationexception' => '/Exception/MissingCoversAnnotationException.php',
-		'sebastianbergmann\codecoverage\exception\runtimeexception' => '/Exception/RuntimeException.php',
-		'sebastianbergmann\codecoverage\exception\unintentiallycoveredcodeexception' => '/Exception/UnintentionallyCoveredCodeException.php',
-		'sebastianbergmann\codecoverage\node\abstractnode' => '/Node/AbstractNode.php',
-		'sebastianbergmann\codecoverage\node\builder' => '/Node/Builder.php',
-		'sebastianbergmann\codecoverage\node\directory' => '/Node/Directory.php',
-		'sebastianbergmann\codecoverage\node\file' => '/Node/File.php',
-		'sebastianbergmann\codecoverage\node\iterator' => '/Node/iterator.php',
-		'sebastianbergmann\codecoverage\report\clover' => '/Report/Clover.php',
-		'sebastianbergmann\codecoverage\report\crap4j' => '/Report/Crap4j.php',
-		'sebastianbergmann\codecoverage\report\php' => '/Report/PHP.php',
-		'sebastianbergmann\codecoverage\report\text' => '/Report/Text.php',
-		'sebastianbergmann\codecoverage\report\html\facade' => '/Report/HTML/Facade.php',
-		'sebastianbergmann\codecoverage\report\html\renderer' => '/Report/HTML/Renderer.php',
-		'sebastianbergmann\codecoverage\report\html\renderer\dashboard' => '/Report/HTML/Renderer/Dashboard.php',
-		'sebastianbergmann\codecoverage\report\html\renderer\directory' => '/Report/HTML/Renderer/Directory.php',
-		'sebastianbergmann\codecoverage\report\html\renderer\file' => '/Report/HTML/Renderer/File.php',
-		'sebastianbergmann\codecoverage\report\xml\coverage' => '/Report/XML/Coverage.php',
-		'sebastianbergmann\codecoverage\report\xml\directory' => '/Report/XML/Directory.php',
-		'sebastianbergmann\codecoverage\report\xml\facade' => '/Report/XML/Facade.php',
-		'sebastianbergmann\codecoverage\report\xml\file' => '/Report/XML/File.php',
-		'sebastianbergmann\codecoverage\report\xml\method' => '/Report/XML/Method.php',
-		'sebastianbergmann\codecoverage\report\xml\node' => '/Report/XML/Node.php',
-		'sebastianbergmann\codecoverage\report\xml\project' => '/Report/XML/Project.php',
-		'sebastianbergmann\codecoverage\report\xml\report' => '/Report/XML/Report.php',
-		'sebastianbergmann\codecoverage\report\xml\tests' => '/Report/XML/Tests.php',
-		'sebastianbergmann\codecoverage\report\xml\totals' => '/Report/XML/Totals.php',
-		'sebastianbergmann\codecoverage\report\xml\unit' => '/Report/XML/Unit.php',
-    ),
-    __DIR__
-);
-
-\Fedora\Autoloader\Dependencies::required(array(
-	'/usr/share/php/File/Iterator/autoload.php',
-	'/usr/share/php/PHP/Token/autoload.php',
-	'/usr/share/php/SebastianBergmann/Version/autoload.php',
-	'/usr/share/php/SebastianBergmann/Environment/autoload.php',
-	'/usr/share/php/SebastianBergmann/CodeUnitReverseLookup/autoload.php',
-	'/usr/share/php/Text/Template/autoload.php',
-));
diff --git a/dev-php/PHP_TokenStream/Manifest b/dev-php/PHP_TokenStream/Manifest
index 58c1fe981c15..8d8bd04726ad 100644
--- a/dev-php/PHP_TokenStream/Manifest
+++ b/dev-php/PHP_TokenStream/Manifest
@@ -1,7 +1,4 @@
 AUX autoload-3.1.1.php 2833 BLAKE2B 594aafd23673466891934600e0620437390703a3a3e420c85b5b54de78c0b9a9a4ac39e72103c18e89b5cedb8d8c9c6c2441d6921f0f1034127ee9782967eaac SHA512 26ca45e5761c3a1fc9d89276271763fe5ef5b0c9107978e9e6415d4708da831b1b2f536d642b8e16f8a32cd4247630602d21ef5b5017de6684e8707613625d87
-AUX autoload.php 407 BLAKE2B 8f8afa7524cd277d498acbbc468ad6a7a2b57223111fa459c63a545251430f18be06e7f8079a3ae4f959338530e211d6d7a770bc0739668b9b612b4fbabc1719 SHA512 f80a008f1f443c90814c034822211e94e76d8af31b7da6fb39bbb5aace6473bab8befcd177fd3c2b5b2891bdb62bac66fb03ae6e0fe9429335950b134fccdeab
-DIST PHP_TokenStream-1.4.11.tar.gz 13388 BLAKE2B 20ef9907ce660e2958ffd50f588ead563efa04c9fc4adda4a823830000f73ee7a4c988adc79d14e549c4f02836b7128aa42b01b26996a090595d34a191282b67 SHA512 4e8d8d1eb16169d46b64a43d91f3066d49fe8e3f184d90c5c7cf4234ebfe4eac271a811744b201f05dc86976b3c5b8ad4ae9f2532165a3849980663f1ac5852e
 DIST PHP_TokenStream-3.1.1.tar.gz 14275 BLAKE2B 5300768f79cba17a08f55a58a05744eef55df00fc0f0144612bddd3ba5d0494fe19bd5b74d56b57d345f5d98b63033aa05e6d157c0979be163e51dc7cc5ad19f SHA512 3a1e36d13b8d77d6fe7d1617fc43a8d59b68af6ee6182afdecf5c970c844f7cb63f3056ce7f6aaae17237b948c5ff9862438d823c2eda179e24c1bb4fc4f4e02
-EBUILD PHP_TokenStream-1.4.11-r1.ebuild 782 BLAKE2B 63fb9355c39f382750a33330f44e5ee7097b3bdfe5e6011748bbfe5604d6f22e1365c1f8ead8b1e611d14933a32acad895b2732c81cb88538552c766db5933ba SHA512 280592d32268c8b522c9c3c21bf6e0f63951b48b097b2469a4ec708d6b0a5055a6d5f8ce8792e9a6230682eeaaad5244af8b8871b6cfad0abb3e22852f7d3b6b
 EBUILD PHP_TokenStream-3.1.1.ebuild 1369 BLAKE2B a2989e5824a79e8bd83d8c182f6ea1c37b9b27f259357cab03df45124230e7fc333cbabd231a28c9220120d339cde19b849aa8e8d0a3c274a92056eddf249b95 SHA512 541f2356b3c3843397b8c2a1faed04f415f368b3fbbc9c0f1d33b1b33bedb0b6910c81ceb86e3ec2bb5b65cda3bb0055b04c0af49a9746681a027b33097e7816
 MISC metadata.xml 338 BLAKE2B d6fc1656deef3d826ef47d31a4c02b873a71c287f2d349f96dffa1fcc0b3006a3549a80872efd23b09288d144d18776aefe6e7e6c52045eedc53beeb1331c794 SHA512 1f758ba782eba886cefecaacc81c4c1e77c6e00f6a1e265f5fdf789f757b3c2e3ca742f9c3c1f6427920b6ab42388b34cf2c7d50b11247c4a94a3fee69993e47
diff --git a/dev-php/PHP_TokenStream/PHP_TokenStream-1.4.11-r1.ebuild b/dev-php/PHP_TokenStream/PHP_TokenStream-1.4.11-r1.ebuild
deleted file mode 100644
index 931b95aed14d..000000000000
--- a/dev-php/PHP_TokenStream/PHP_TokenStream-1.4.11-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN="php-token-stream"
-
-DESCRIPTION="Wrapper around PHP's tokenizer extension"
-HOMEPAGE="https://phpunit.de"
-SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
-IUSE=""
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-RDEPEND="dev-php/fedora-autoloader
-	|| (
-		dev-lang/php:7.2[tokenizer(-)]
-	)"
-
-src_install() {
-	insinto /usr/share/php/PHP/Token
-	doins -r src/*
-	doins "${FILESDIR}/autoload.php"
-}
-
-pkg_postinst() {
-	ewarn "This library now loads via /usr/share/php/PHP/Token/autoload.php"
-	ewarn "Please update any scripts to require the autoloader"
-}
diff --git a/dev-php/PHP_TokenStream/files/autoload.php b/dev-php/PHP_TokenStream/files/autoload.php
deleted file mode 100644
index 5b3aac57ec17..000000000000
--- a/dev-php/PHP_TokenStream/files/autoload.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-/* Autoloader for dev-php/PHP_TokenStream */
-
-if (!class_exists('Fedora\\Autoloader\\Autoload', false)) {
-    require_once '/usr/share/php/Fedora/Autoloader/autoload.php';
-}
-
-\Fedora\Autoloader\Autoload::addClassMap(
-    array(
-		'php_token' => '/Token.php',
-		'php_token_stream' => '/Token/Stream.php',
-		'php_token_stream_cachingfactory' => '/Token/Stream/CachingFactory.php',
-    ),
-    __DIR__
-);
diff --git a/dev-php/composer/Manifest b/dev-php/composer/Manifest
index 6aede94970ec..dcf04734a237 100644
--- a/dev-php/composer/Manifest
+++ b/dev-php/composer/Manifest
@@ -1,9 +1,9 @@
 AUX autoload-r1.php 973 BLAKE2B d01d694be6f50af0e995dc24da1545b666609ce0098b4206a1843b249fedcbf983f1826a3158e98ad7cfe675057b12fe52ff82b6b66e2d582ccf983b929c2f90 SHA512 06f9e2862521c54b765f55fe1c1e02728befd296916d0f41357d4e6004f2d00ddaa533ed5210e92e4642eb548a2d5fabf80604fc09ef7e871742716f4c02d112
 AUX autoload.php.tpl 253 BLAKE2B 421f8bd3aa659c6add54e46094ee1d8806ab4fd33ee915515fbe94d241b6a1d5f222b85a720733c5e48369f3a737d5696cf4f8343df7fe809b3a7e4ec38854a1 SHA512 0cfa3e377406d7eada27c56c50b57943b096ea35ec23b2bfe1c926bc4eb276151578d3cfbfa28c76b3358875db35b9e2460204d50571da2d3df6d9a665514da9
-DIST composer-1.10.15.tar.gz 427919 BLAKE2B 38d2e1c795385dd13bedbf5283cf76b04efb54db8dc72eff05370b9505382e2e43f10e1528f148186edb759a098b948d1fee36ac99ab6a5591858723100a27aa SHA512 f8544632e00a08ec75b327e6eac2c96bff60ba78c238863c8ab6b4d82239997f11140a049df0d6c0338bb7523b52fc3ea6f767b9418f75b51535ccfde44fa68c
 DIST composer-1.10.20.tar.gz 429016 BLAKE2B 29dcf1e32974230075e56c9b11e53316a1bada9a6ccf43f3357fc39577abadde566df962bb9bf92cc9806a012fbd70c18aba5daee87090fd10de273643d92ce7 SHA512 5b85ebc6a0612c01bd2dd6f6a57526581a821c1a45163ef85511bd0e629b10dc464776b56fe33be192b2a3f07ce818dc40cf2305d9f65ee10287b2265e198cca
+DIST composer-2.0.11.tar.gz 494980 BLAKE2B 7095b27ff770c890261a622d2b96febeca226fa307fe14d74df0e723fdf2ade8b04ceb85a25317f4f6b2f5cfc9dce27223738e61a734d6b4c3b4069c03ad551a SHA512 7f2429b4cf0dd237b17d393837e18e12886a9b0641130c8d6e490b37f85b8beee54a2b58003e63b7b157104edf70dff211ca44255ee60bf904b3fb7d57f186d2
 DIST composer-2.0.9.tar.gz 493134 BLAKE2B f08818ec05aeebd79501e221b9cef10425c7dd60b9aca17ca8dad2f6967258d6b1a8d0d1b383b0c7dd1214ce6416f666bc30785bcb5978c66051ef2e03d17304 SHA512 4953bcc0d2e9ae61ebbb3615c262ac05762fa0165db2114118eb5c2bb014bc4341b07c3b8739575feacaad92d2460b89486b49f4eb49b80ce4a9de36a1152b48
-EBUILD composer-1.10.15.ebuild 1232 BLAKE2B 584b0a2251e7f63a1bdc9d5c32524690d4dabe7668220fdf8678c0fc8749044334db0b5d39385e8fc181b3c25ec3d955e7dc73f9e0d2bde5d27724b4566fedee SHA512 597a47db43a02071beec253a84b1c548ccba8c6e9604a538055a6de268bba0e0c87b04dae897c15d95a807730c789ad6a15a4eb6b6eb0a850ea94571f7de73ac
 EBUILD composer-1.10.20.ebuild 1233 BLAKE2B 8ca659735c9256070bdf634a96eb790a23ef4a5f6e9bc1c4d488d2082d97d87a043b8becc944f9e33479516b40c29b2ddd93c7fe4219c1a3b143c333464b160d SHA512 5cf952c3bda93befd1a77ed5330905f3be8bddb254cdb3d52c6ea6c24eba0bfd32cb936fbbbe18e18dcdf1362b5e423b45f47346f1fd5e5192753c66f51e00e6
+EBUILD composer-2.0.11.ebuild 2103 BLAKE2B d46051503b70b8c5f27b4d6b7310cccf74afcc2736194ea1dbb5a42d6aae193406c466e6b6f79f0a0e0573e73131b8c780d28680daa9b9ab8a462cf7deaa97ea SHA512 dbb17d0d0b34d31ec6c315e3c6e21c3e355237eabafe94568188620da5e0d706a5fba97c74a29408b4fdf9d87912574e96aecd52a020fafdd917f966b46e7e62
 EBUILD composer-2.0.9.ebuild 2103 BLAKE2B d46051503b70b8c5f27b4d6b7310cccf74afcc2736194ea1dbb5a42d6aae193406c466e6b6f79f0a0e0573e73131b8c780d28680daa9b9ab8a462cf7deaa97ea SHA512 dbb17d0d0b34d31ec6c315e3c6e21c3e355237eabafe94568188620da5e0d706a5fba97c74a29408b4fdf9d87912574e96aecd52a020fafdd917f966b46e7e62
 MISC metadata.xml 774 BLAKE2B 8a1f75c0c7da6f0d193a981c6db3888d62e2223b6368c4a7dece62ae33cc9a2a8c0b34714170462f262569954e70cc9b976012ff864ccfa36a46da3c719169ae SHA512 1a17bfae65923a3bea593c57d7ecf4fb2aeef43d0537636105e52294de295cbfeaed4b3c36ffb8675a563f657f4f969e62096cee20b9ab178c962acf2f68ac3a
diff --git a/dev-php/composer/composer-1.10.15.ebuild b/dev-php/composer/composer-1.10.15.ebuild
deleted file mode 100644
index 29915836e3cf..000000000000
--- a/dev-php/composer/composer-1.10.15.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Dependency Manager for PHP"
-HOMEPAGE="https://github.com/composer/composer"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-lang/php:*[curl]
-	>=dev-php/ca-bundle-1.1.3
-	>=dev-php/psr-log-1.1.0
-	dev-php/fedora-autoloader
-	>=dev-php/json-schema-5.2.7
-	>=dev-php/jsonlint-1.7.1
-	>=dev-php/phar-utils-1.0.1
-	>=dev-php/semver-1.4.2
-	>=dev-php/spdx-licenses-1.5.0
-	>=dev-php/symfony-console-2.8.48
-	>=dev-php/symfony-filesystem-2.8.48
-	>=dev-php/symfony-finder-2.8.49
-	>=dev-php/symfony-process-2.8.48
-	>=dev-php/xdebug-handler-1.3.1"
-
-src_install() {
-	insinto "/usr/share/${PN}"
-
-	# Composer expects the LICENSE file to be there, and the
-	# easiest thing to do is to give it what it wants.
-	doins -r src res LICENSE
-
-	insinto "/usr/share/${PN}/vendor"
-	newins "${FILESDIR}"/autoload-r1.php autoload.php
-
-	exeinto "/usr/share/${PN}/bin"
-	doexe "bin/${PN}"
-	dosym "../share/${PN}/bin/${PN}" "/usr/bin/${PN}"
-
-	dodoc CHANGELOG.md README.md doc/*.md
-	dodoc -r doc/articles doc/faqs
-}
diff --git a/dev-php/composer/composer-2.0.11.ebuild b/dev-php/composer/composer-2.0.11.ebuild
new file mode 100644
index 000000000000..dfdecde74bed
--- /dev/null
+++ b/dev-php/composer/composer-2.0.11.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+DESCRIPTION="Dependency Manager for PHP"
+HOMEPAGE="https://github.com/composer/composer"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-lang/php:*[curl]
+	>=dev-php/ca-bundle-1.0
+	dev-php/fedora-autoloader
+	>=dev-php/jsonlint-1.4
+	>=dev-php/json-schema-5.2.10
+	>=dev-php/phar-utils-1.0
+	>=dev-php/psr-log-1.0
+	>=dev-php/reactphp-promise-2.7
+	>=dev-php/semver-3.0
+	>=dev-php/spdx-licenses-1.2
+	>=dev-php/symfony-console-2.8.52
+	>=dev-php/symfony-filesystem-2.8.52
+	>=dev-php/symfony-finder-2.8.52
+	>=dev-php/symfony-process-2.8.52
+	>=dev-php/xdebug-handler-1.1"
+
+src_prepare() {
+	default
+
+	mkdir vendor || die
+
+	phpab \
+		--output vendor/autoload.php \
+		--template "${FILESDIR}"/autoload.php.tpl \
+		--basedir src \
+		src \
+		|| die
+
+	cat >> vendor/autoload.php <<EOF || die "failed to extend autoload.php"
+
+// Dependencies
+\Fedora\Autoloader\Dependencies::required([
+	'/usr/share/php/Composer/CaBundle/autoload.php',
+	'/usr/share/php/Composer/Semver/autoload.php',
+	'/usr/share/php/Composer/Spdx/autoload.php',
+	'/usr/share/php/Composer/XdebugHandler/autoload.php',
+	'/usr/share/php/JsonSchema/autoload.php',
+	'/usr/share/php/Psr/Log/autoload.php',
+	'/usr/share/php/Seld/JsonLint/autoload.php',
+	'/usr/share/php/Seld/PharUtils/autoload.php',
+	'/usr/share/php/Symfony/Component/Console/autoload.php',
+	'/usr/share/php/Symfony/Component/Filesystem/autoload.php',
+	'/usr/share/php/Symfony/Component/Finder/autoload.php',
+	'/usr/share/php/Symfony/Component/Process/autoload.php',
+	'/usr/share/php/React/Promise/autoload.php'
+]);
+EOF
+}
+
+src_install() {
+	insinto "/usr/share/${PN}"
+
+	# Composer expects the LICENSE file to be there, and the
+	# easiest thing to do is to give it what it wants.
+	doins -r LICENSE res src vendor
+
+	exeinto "/usr/share/${PN}/bin"
+	doexe "bin/${PN}"
+	dosym "../share/${PN}/bin/${PN}" "/usr/bin/${PN}"
+
+	dodoc CHANGELOG.md README.md doc/*.md
+	dodoc -r doc/articles doc/faqs
+}
diff --git a/dev-php/pecl-event/Manifest b/dev-php/pecl-event/Manifest
index c45d69633546..905dac57245c 100644
--- a/dev-php/pecl-event/Manifest
+++ b/dev-php/pecl-event/Manifest
@@ -1,3 +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 1169 BLAKE2B b313db6c4bf2c79faa925404c180bcc40d44b835774a17201c3c7c8f73afd32963448479c55690fc73e360169ac415f0f111bcd5ca9afec5d6c26132109c3837 SHA512 aab9e0cf772a537d934e3d401b9ab333eb5901a39831400fd6966eaff6acd97e0f20411c24038409641d21ceb2e89ca68c79ab876e6a3a23e13821caf7b1803f
+EBUILD pecl-event-3.0.2_p1.ebuild 1280 BLAKE2B cd71bc9764f4e91f80ae62784d2a6ddfff2f1cf0d962f0add9f62005bf7fc93fef3534920af77a6943a5d75cb95fffa48766abaff5b02525e65f0878df350466 SHA512 6d2e8157c2eed7c6ff71ab6733dbcaf38c318f2d19f1e501613a9fe3651d2c9306aba5befbb010a92c58e1c16bbaf846197cf9aa608d63ab70ced18814bb3ee5
 MISC metadata.xml 431 BLAKE2B 25421824761cdcc90c610236ac4acfd85e18fb63e4f92ff3fa5e51698a7e2004812a7193ced70646baf02bacd0bc896a5959ee88bd88dd5de68db729661ad02f SHA512 6349913306ea30f9ee6cd5ad862e0323d143815f4db47da14e5d54d0dcfb604118e3845f664f2a9b8527797b262c9567bbf5f189426f9becbd169be0ec111056
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
new file mode 100644
index 000000000000..bbf8fa4a7267
--- /dev/null
+++ b/dev-php/pecl-event/pecl-event-3.0.2_p1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2021 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-3 php7-4 php8-0"
+#Unique to this release
+MY_P="${PN/pecl-/}-${PV/_p/r}"
+PHP_EXT_PECL_FILENAME="${MY_P}.tgz"
+
+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? ( dev-libs/openssl:0= )
+	php_targets_php7-3? ( dev-lang/php:7.3[sockets(-)?] )
+	php_targets_php7-4? ( dev-lang/php:7.4[sockets(-)?] )
+	php_targets_php8-0? ( dev-lang/php:8.0[sockets(-)?] )"
+
+RDEPEND="
+	${DEPEND}
+	!dev-php/pecl-libevent"
+
+IUSE="debug examples +extra libressl +sockets +ssl threads"
+#Unique to this release
+S="${WORKDIR}/${MY_P}"
+PHP_EXT_S="${S}"
+
+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/phpunit/Manifest b/dev-php/phpunit/Manifest
index 4bde773a07ff..c518b04f58a5 100644
--- a/dev-php/phpunit/Manifest
+++ b/dev-php/phpunit/Manifest
@@ -1,8 +1,5 @@
-AUX autoload.php 11422 BLAKE2B 90c68a16ab1c2a81c31430984b426e0717881e29231ea008c6e75113d4180733af64a5edf7b1aabd8fd6e84b312ed79b80ee001d805d40f060b9b641c0c27948 SHA512 1d4fd0854a85bc404f5567b78effbc0eb41859601b8e56faaa4362e85ec4d07969864b21df3188fc5e82d5993c67655fa278a9c310b2ec7366aa2195c91e90da
-DIST phpunit-5.7.15.tar.gz 205474 BLAKE2B 0220edd59fc3f191b7621f275d3e4ee8f8bf514f74533d99bfb925e11cc54a235fb292ffd1bb54f6bec1e038c06e35a0dc43c1227618590f99e7e85638a7de28 SHA512 6a836e1ad1656fd1d1c5a58ced3c1826b4decc01798b6a804b487c9b4e094ec32f6eb8a84058e268eade62a2fe19d7bd1e760b8b9433299d9fe9c09afdf2bdd3
 DIST phpunit-8.5.11.tar.gz 159302 BLAKE2B fdf156842b3607f4cbd26194efd7eb7cb204fb1d1d078c0c6bd3bb68e520e5d748767f8aab64b7c9bf313161e3d84e08d415fbf0408c26541ec1f70cfe7af8bd SHA512 3e9db4a1d6c5bea3546b24bd837479a0114a9200f96034aabc96933dfb42c1237b03f7118f19eeb1216e32f2034c1ec8c632d20ecacbe70d3660fbbfd167ac79
 DIST phpunit-8.5.14.tar.gz 163158 BLAKE2B 8be0765b89cd7c7f91c7c8753eda9be46a38368c1b538b9e1a06b6f7e5b2cf2c37ef806338b7f4dd213962bfb8f7d749e1a97dd65d0e877fb2ffdeb747dcd344 SHA512 589cd74bf44c16ee0bb0b0e85f3468b0fdbd7e6ce968894954918094d49a0fed46570cac2fa2367f417715bf64f942f5742a292b09edd91317bbea06624ac313
-EBUILD phpunit-5.7.15-r3.ebuild 1535 BLAKE2B 27d95e1f95f3d7e19e03a1da5f6ed6f4e1ddf3227898959fef66f47564e371cf6975ef327bdabe6a33a2594223c2ad83699f0ac2f00769b8d8aad7469f5f7fc0 SHA512 7386395373e5a2434b02710601a93cb34c6f714a1a6a1037ffadb51c44c61f88586a916fbafc23cddb101b422d23c6bcb8268371804bdcd274bb5be37520fd45
 EBUILD phpunit-8.5.11.ebuild 3124 BLAKE2B dae0205a8a36f5895cf73b607b0dc206885b70126b4c78a4db83da64013f21fc0dc162ca120505129ada7cd2527bd7bc0eccd34188fe35f3937ecc2badececf2 SHA512 e8806ef9c92bcb3b9c2bfb2551864d6d2aeb92ca0b00389feb94375247fbd32d2154ba17c6d2f960421c1042dc236ae22b056f26991083c8902e1a97402c9d8f
 EBUILD phpunit-8.5.14.ebuild 3188 BLAKE2B a14aac210c05b2b726f763d58737e21a58a804c3bc7c3f6083446e8f78693a9bbdfb07644c32c6569d291e386d4d0f8461f36ddd7b4afb1d3a207f3765068863 SHA512 b126f5d94f53775f03f04186f04d30310323235bdb4b5e7636014e2b6bb46a43f37bdb8470bf7cc8995fc2121eaa34ad39fe0dfb994456b6d7fcb2579faea02e
 MISC metadata.xml 353 BLAKE2B a652d809f292e3ff3c73fa46bc060ec1bd1a2d21e72b0c5e195ce4ec343d6667a930b1f4e5a2aeafb79bf90ac3cf956dc70022e970e31d6d88731ce949380795 SHA512 551af54d66217054d5bf7bab7737dd4d58eb4abb89e73e1e0f05928ef79d02d404883fca1609e116e359ed63788c21992b6f2205b6bc4544b5f2a16dd0dfa136
diff --git a/dev-php/phpunit/files/autoload.php b/dev-php/phpunit/files/autoload.php
deleted file mode 100644
index f33b4c8881a1..000000000000
--- a/dev-php/phpunit/files/autoload.php
+++ /dev/null
@@ -1,170 +0,0 @@
-<?php
-/* Autoloader for dev-php/phpunit and its dependencies */
-
-$include_dir = '/usr/share/php';
-
-if (!class_exists('Fedora\\Autoloader\\Autoload', false)) {
-    require_once "${include_dir}/Fedora/Autoloader/autoload.php";
-}
-
-\Fedora\Autoloader\Autoload::addClassMap(
-    array(
-	'phpunit\\framework\\assert' => '/ForwardCompatibility/Assert.php',
-	'phpunit\\framework\\basetestlistener' => '/ForwardCompatibility/BaseTestListener.php',
-	'phpunit\\framework\\testcase' => '/ForwardCompatibility/TestCase.php',
-	'phpunit\\framework\\testlistener' => '/ForwardCompatibility/TestListener.php',
-	'phpunit_exception' => '/Exception.php',
-	'phpunit_extensions_grouptestsuite' => '/Extensions/GroupTestSuite.php',
-	'phpunit_extensions_phpttestcase' => '/Extensions/PhptTestCase.php',
-	'phpunit_extensions_phpttestsuite' => '/Extensions/PhptTestSuite.php',
-	'phpunit_extensions_repeatedtest' => '/Extensions/RepeatedTest.php',
-	'phpunit_extensions_testdecorator' => '/Extensions/TestDecorator.php',
-	'phpunit_extensions_ticketlistener' => '/Extensions/TicketListener.php',
-	'phpunit_framework_assert' => '/Framework/Assert.php',
-	'phpunit_framework_assertionfailederror' => '/Framework/AssertionFailedError.php',
-	'phpunit_framework_basetestlistener' => '/Framework/BaseTestListener.php',
-	'phpunit_framework_codecoverageexception' => '/Framework/CodeCoverageException.php',
-	'phpunit_framework_constraint' => '/Framework/Constraint.php',
-	'phpunit_framework_constraint_and' => '/Framework/Constraint/And.php',
-	'phpunit_framework_constraint_arrayhaskey' => '/Framework/Constraint/ArrayHasKey.php',
-	'phpunit_framework_constraint_arraysubset' => '/Framework/Constraint/ArraySubset.php',
-	'phpunit_framework_constraint_attribute' => '/Framework/Constraint/Attribute.php',
-	'phpunit_framework_constraint_callback' => '/Framework/Constraint/Callback.php',
-	'phpunit_framework_constraint_classhasattribute' => '/Framework/Constraint/ClassHasAttribute.php',
-	'phpunit_framework_constraint_classhasstaticattribute' => '/Framework/Constraint/ClassHasStaticAttribute.php',
-	'phpunit_framework_constraint_composite' => '/Framework/Constraint/Composite.php',
-	'phpunit_framework_constraint_count' => '/Framework/Constraint/Count.php',
-	'phpunit_framework_constraint_directoryexists' => '/Framework/Constraint/DirectoryExists.php',
-	'phpunit_framework_constraint_exception' => '/Framework/Constraint/Exception.php',
-	'phpunit_framework_constraint_exceptioncode' => '/Framework/Constraint/ExceptionCode.php',
-	'phpunit_framework_constraint_exceptionmessage' => '/Framework/Constraint/ExceptionMessage.php',
-	'phpunit_framework_constraint_exceptionmessageregexp' => '/Framework/Constraint/ExceptionMessageRegExp.php',
-	'phpunit_framework_constraint_fileexists' => '/Framework/Constraint/FileExists.php',
-	'phpunit_framework_constraint_greaterthan' => '/Framework/Constraint/GreaterThan.php',
-	'phpunit_framework_constraint_isanything' => '/Framework/Constraint/IsAnything.php',
-	'phpunit_framework_constraint_isempty' => '/Framework/Constraint/IsEmpty.php',
-	'phpunit_framework_constraint_isequal' => '/Framework/Constraint/IsEqual.php',
-	'phpunit_framework_constraint_isfalse' => '/Framework/Constraint/IsFalse.php',
-	'phpunit_framework_constraint_isfinite' => '/Framework/Constraint/IsFinite.php',
-	'phpunit_framework_constraint_isidentical' => '/Framework/Constraint/IsIdentical.php',
-	'phpunit_framework_constraint_isinfinite' => '/Framework/Constraint/IsInfinite.php',
-	'phpunit_framework_constraint_isinstanceof' => '/Framework/Constraint/IsInstanceOf.php',
-	'phpunit_framework_constraint_isjson' => '/Framework/Constraint/IsJson.php',
-	'phpunit_framework_constraint_isnan' => '/Framework/Constraint/IsNan.php',
-	'phpunit_framework_constraint_isnull' => '/Framework/Constraint/IsNull.php',
-	'phpunit_framework_constraint_isreadable' => '/Framework/Constraint/IsReadable.php',
-	'phpunit_framework_constraint_istrue' => '/Framework/Constraint/IsTrue.php',
-	'phpunit_framework_constraint_istype' => '/Framework/Constraint/IsType.php',
-	'phpunit_framework_constraint_iswritable' => '/Framework/Constraint/IsWritable.php',
-	'phpunit_framework_constraint_jsonmatches' => '/Framework/Constraint/JsonMatches.php',
-	'phpunit_framework_constraint_jsonmatches_errormessageprovider' => '/Framework/Constraint/JsonMatches/ErrorMessageProvider.php',
-	'phpunit_framework_constraint_lessthan' => '/Framework/Constraint/LessThan.php',
-	'phpunit_framework_constraint_not' => '/Framework/Constraint/Not.php',
-	'phpunit_framework_constraint_objecthasattribute' => '/Framework/Constraint/ObjectHasAttribute.php',
-	'phpunit_framework_constraint_or' => '/Framework/Constraint/Or.php',
-	'phpunit_framework_constraint_pcrematch' => '/Framework/Constraint/PCREMatch.php',
-	'phpunit_framework_constraint_samesize' => '/Framework/Constraint/SameSize.php',
-	'phpunit_framework_constraint_stringcontains' => '/Framework/Constraint/StringContains.php',
-	'phpunit_framework_constraint_stringendswith' => '/Framework/Constraint/StringEndsWith.php',
-	'phpunit_framework_constraint_stringmatches' => '/Framework/Constraint/StringMatches.php',
-	'phpunit_framework_constraint_stringstartswith' => '/Framework/Constraint/StringStartsWith.php',
-	'phpunit_framework_constraint_traversablecontains' => '/Framework/Constraint/TraversableContains.php',
-	'phpunit_framework_constraint_traversablecontainsonly' => '/Framework/Constraint/TraversableContainsOnly.php',
-	'phpunit_framework_constraint_xor' => '/Framework/Constraint/Xor.php',
-	'phpunit_framework_coveredcodenotexecutedexception' => '/Framework/CoveredCodeNotExecutedException.php',
-	'phpunit_framework_error' => '/Framework/Error.php',
-	'phpunit_framework_error_deprecated' => '/Framework/Error/Deprecated.php',
-	'phpunit_framework_error_notice' => '/Framework/Error/Notice.php',
-	'phpunit_framework_error_warning' => '/Framework/Error/Warning.php',
-	'phpunit_framework_exception' => '/Framework/Exception.php',
-	'phpunit_framework_exceptionwrapper' => '/Framework/ExceptionWrapper.php',
-	'phpunit_framework_expectationfailedexception' => '/Framework/ExpectationFailedException.php',
-	'phpunit_framework_incompletetest' => '/Framework/IncompleteTest.php',
-	'phpunit_framework_incompletetestcase' => '/Framework/IncompleteTestCase.php',
-	'phpunit_framework_incompletetesterror' => '/Framework/IncompleteTestError.php',
-	'phpunit_framework_invalidcoverstargetexception' => '/Framework/InvalidCoversTargetException.php',
-	'phpunit_framework_missingcoversannotationexception' => '/Framework/MissingCoversAnnotationException.php',
-	'phpunit_framework_outputerror' => '/Framework/OutputError.php',
-	'phpunit_framework_riskytest' => '/Framework/RiskyTest.php',
-	'phpunit_framework_riskytesterror' => '/Framework/RiskyTestError.php',
-	'phpunit_framework_selfdescribing' => '/Framework/SelfDescribing.php',
-	'phpunit_framework_skippedtest' => '/Framework/SkippedTest.php',
-	'phpunit_framework_skippedtestcase' => '/Framework/SkippedTestCase.php',
-	'phpunit_framework_skippedtesterror' => '/Framework/SkippedTestError.php',
-	'phpunit_framework_skippedtestsuiteerror' => '/Framework/SkippedTestSuiteError.php',
-	'phpunit_framework_syntheticerror' => '/Framework/SyntheticError.php',
-	'phpunit_framework_test' => '/Framework/Test.php',
-	'phpunit_framework_testcase' => '/Framework/TestCase.php',
-	'phpunit_framework_testfailure' => '/Framework/TestFailure.php',
-	'phpunit_framework_testlistener' => '/Framework/TestListener.php',
-	'phpunit_framework_testresult' => '/Framework/TestResult.php',
-	'phpunit_framework_testsuite' => '/Framework/TestSuite.php',
-	'phpunit_framework_testsuite_dataprovider' => '/Framework/TestSuite/DataProvider.php',
-	'phpunit_framework_unintentionallycoveredcodeerror' => '/Framework/UnintentionallyCoveredCodeError.php',
-	'phpunit_framework_warning' => '/Framework/Warning.php',
-	'phpunit_framework_warningtestcase' => '/Framework/WarningTestCase.php',
-	'phpunit_runner_basetestrunner' => '/Runner/BaseTestRunner.php',
-	'phpunit_runner_exception' => '/Runner/Exception.php',
-	'phpunit_runner_filter_factory' => '/Runner/Filter/Factory.php',
-	'phpunit_runner_filter_group_exclude' => '/Runner/Filter/Group/Exclude.php',
-	'phpunit_runner_filter_group_include' => '/Runner/Filter/Group/Include.php',
-	'phpunit_runner_filter_groupfilteriterator' => '/Runner/Filter/Group.php',
-	'phpunit_runner_filter_test' => '/Runner/Filter/Test.php',
-	'phpunit_runner_standardtestsuiteloader' => '/Runner/StandardTestSuiteLoader.php',
-	'phpunit_runner_testsuiteloader' => '/Runner/TestSuiteLoader.php',
-	'phpunit_runner_version' => '/Runner/Version.php',
-	'phpunit_textui_command' => '/TextUI/Command.php',
-	'phpunit_textui_resultprinter' => '/TextUI/ResultPrinter.php',
-	'phpunit_textui_testrunner' => '/TextUI/TestRunner.php',
-	'phpunit_util_blacklist' => '/Util/Blacklist.php',
-	'phpunit_util_configuration' => '/Util/Configuration.php',
-	'phpunit_util_configurationgenerator' => '/Util/ConfigurationGenerator.php',
-	'phpunit_util_errorhandler' => '/Util/ErrorHandler.php',
-	'phpunit_util_fileloader' => '/Util/Fileloader.php',
-	'phpunit_util_filesystem' => '/Util/Filesystem.php',
-	'phpunit_util_filter' => '/Util/Filter.php',
-	'phpunit_util_getopt' => '/Util/Getopt.php',
-	'phpunit_util_globalstate' => '/Util/GlobalState.php',
-	'phpunit_util_invalidargumenthelper' => '/Util/InvalidArgumentHelper.php',
-	'phpunit_util_log_json' => '/Util/Log/JSON.php',
-	'phpunit_util_log_junit' => '/Util/Log/JUnit.php',
-	'phpunit_util_log_tap' => '/Util/Log/TAP.php',
-	'phpunit_util_log_teamcity' => '/Util/Log/TeamCity.php',
-	'phpunit_util_php' => '/Util/PHP.php',
-	'phpunit_util_php_default' => '/Util/PHP/Default.php',
-	'phpunit_util_php_windows' => '/Util/PHP/Windows.php',
-	'phpunit_util_printer' => '/Util/Printer.php',
-	'phpunit_util_regex' => '/Util/Regex.php',
-	'phpunit_util_string' => '/Util/String.php',
-	'phpunit_util_test' => '/Util/Test.php',
-	'phpunit_util_testdox_nameprettifier' => '/Util/TestDox/NamePrettifier.php',
-	'phpunit_util_testdox_resultprinter' => '/Util/TestDox/ResultPrinter.php',
-	'phpunit_util_testdox_resultprinter_html' => '/Util/TestDox/ResultPrinter/HTML.php',
-	'phpunit_util_testdox_resultprinter_text' => '/Util/TestDox/ResultPrinter/Text.php',
-	'phpunit_util_testdox_resultprinter_xml' => '/Util/TestDox/ResultPrinter/XML.php',
-	'phpunit_util_testsuiteiterator' => '/Util/TestSuiteIterator.php',
-	'phpunit_util_type' => '/Util/Type.php',
-	'phpunit_util_xml' => '/Util/XML.php',
-),
-  "${include_dir}/PHPUnit"
-);
-
-// Dependencies
-\Fedora\Autoloader\Dependencies::required(array(
-  "${include_dir}/File/Iterator/autoload.php",
-  "${include_dir}/PHP/CodeCoverage/autoload.php",
-  "${include_dir}/PHP/Timer/autoload.php",
-  "${include_dir}/SebastianBergmann/Version/autoload.php",
-  "${include_dir}/SebastianBergmann/Diff/autoload.php",
-  "${include_dir}/SebastianBergmann/Environment/autoload.php",
-  "${include_dir}/SebastianBergmann/Exporter/autoload.php",
-  "${include_dir}/SebastianBergmann/GlobalState/autoload.php",
-  "${include_dir}/SebastianBergmann/Comparator/autoload.php",
-  "${include_dir}/SebastianBergmann/ObjectEnumerator/autoload.php",
-  "${include_dir}/SebastianBergmann/ResourceOperations/autoload.php",
-  "${include_dir}/Symfony/Component/Yaml/autoload.php",
-  "${include_dir}/Text/Template/autoload.php",
-  "${include_dir}/myclabs/DeepCopy/autoload.php",
-  "${include_dir}/PHPUnit/Framework/MockObject/autoload.php",
-  "${include_dir}/phpspec/Prophecy/autoload.php",
-));
diff --git a/dev-php/phpunit/phpunit-5.7.15-r3.ebuild b/dev-php/phpunit/phpunit-5.7.15-r3.ebuild
deleted file mode 100644
index 601e1c9086e4..000000000000
--- a/dev-php/phpunit/phpunit-5.7.15-r3.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A PHP Unit Testing framework"
-HOMEPAGE="https://phpunit.de"
-SRC_URI="https://github.com/sebastianbergmann/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
-IUSE=""
-
-RDEPEND="dev-php/fedora-autoloader
-	>=dev-php/File_Iterator-1.4.0
-	<dev-php/File_Iterator-2.0
-	>=dev-php/Text_Template-1.2.0
-	<dev-php/Text_Template-2.0
-	>=dev-php/PHP_CodeCoverage-4.0.4
-	<dev-php/PHP_CodeCoverage-5.0
-	>=dev-php/PHP_Timer-1.0.6
-	<dev-php/PHP_Timer-2.0
-	<dev-php/myclabs-deepcopy-2.0
-	<dev-php/phpspec-prophecy-2.0
-	<dev-php/phpunit-mock-objects-4.0
-	<dev-php/sebastian-comparator-2.0
-	<dev-php/sebastian-diff-2.0
-	<dev-php/sebastian-environment-3.0
-	<dev-php/sebastian-exporter-3.0
-	<dev-php/sebastian-global-state-2.0
-	<dev-php/sebastian-object-enumerator-3.0
-	<dev-php/sebastian-resource-operations-2.0
-	<dev-php/sebastian-version-3.0
-	<dev-php/symfony-yaml-4.0
-	|| (
-		dev-lang/php:7.2[cli(-),json(-),unicode(-),xml(-)]
-	)"
-
-src_install() {
-	insinto /usr/share/php/PHPUnit
-	doins -r src/*
-	insinto /usr/share/php/PHPUnit/vendor
-	doins "${FILESDIR}/autoload.php"
-	exeinto /usr/share/php/PHPUnit
-	doexe phpunit
-	dosym ../share/php/PHPUnit/phpunit /usr/bin/phpunit
-}
-
-pkg_postinst() {
-	elog "${PN} can optionally use json, pdo-sqlite and pdo-mysql features."
-	elog "If you want those, emerge dev-lang/php with USE=\"json pdo sqlite mysql\"."
-}
diff --git a/dev-php/smarty/Manifest b/dev-php/smarty/Manifest
index 9356dcd40c92..0a909f16f122 100644
--- a/dev-php/smarty/Manifest
+++ b/dev-php/smarty/Manifest
@@ -1,6 +1,4 @@
 DIST manual-en.3.1.14.zip 408414 BLAKE2B 03d4e7a386eb3bd5b19e5c555ec34b86812838a5b5fac8ec0ab9701fba89a5867714da57d950f68224a89bbe2267c18d638ee850681860de309c74bbfb3d0a0b SHA512 d384e3856b45ed3f992f3732a5465120abe9fb947cdf13ff67a9c4264f72987d24885ee61cd7309b728e64cdfe4f34c3e7f757096d35de56d962f3b78def9e58
-DIST smarty-3.1.33.tar.gz 249999 BLAKE2B 1e174b190238c8b20d5dae9c0c9fdf264c4716ba850599a2a028fe6c307eb3d9d2611e3b928efb9471e051496e4e31502458cd7a71a9318e012d5af7eca2c50e SHA512 443473cf12c7e053744daef7a70d4172979d760278aa1593216d0b70f0c12ca2b48eb79486a1c10a1cf2264da671804b94ee9d538b9013ff0bdc42e28639ca5d
-DIST smarty-3.1.36.tar.gz 264169 BLAKE2B 56c1f361b5aa1fedca13546c717b85f6b54555761f45ba60959358433638714ec5136ad7b506696be3fa96fef14a29fb584e490e7a627ba9a1fd7d65e05cac42 SHA512 242014d4b39d162683bece8e8e29f1913f902c334a6ee0a4c84c1cfb7e06d1e0d7990b63833c8ffa7c4604306b5159caf00bcf2a4c0b6b379bf26768da75148d
-EBUILD smarty-3.1.33.ebuild 1332 BLAKE2B 4218ffe53de5c781ec6dbdb050de8f96f9104f8c5634af309c6118c8d9aabb610a22c730c305ee5f769095211d21bc156df34a6cc75f1bf973f878d1891c6290 SHA512 86876128abc591cb852e75e7b7604f33913db3affe85dd0deafbe3d17571fd2c8608ca2e0021cb53310212befce855d3b74882ad77dec1c83691f92f34e32920
-EBUILD smarty-3.1.36.ebuild 1337 BLAKE2B c20ee31b207ea2842bd692f58b371a250ffd4fc8d65b4f84f52391d6c5f318457bcaff66989e713ebf859f44809aa078b22bec6761a3158e2383fbc09fd1aa96 SHA512 a68d084c774cf721d03ad7178684ff89dce46605c6bb88e8b606f4f254908546942627f7580c6c213e07e282a1b63dabae1f95c7c4f759d64974907e36b239e9
-MISC metadata.xml 716 BLAKE2B 8abe288ed9a4ebaf525d4fe9bf2db14a9b345570298a4f024a034802326e5f87b99530380638eb06697a18e2aea2b605bac197bf2325d15c5f278b2a764b0e11 SHA512 eb97ed210a66eb9e46f228736008d207183f73b48ce5fa4947596935b9200f4444bd54726fa5ec01cd75c8d988e8d357d5d8c56055d3ce3d9f97e797365e8779
+DIST smarty-3.1.39.tar.gz 264604 BLAKE2B ab5e8e052fd83e38a99725f03dcc4a206848c153b0584c12de1c605d9a9a5b47d23c29bd8a5179e53cf73921c89632ee2c4e9921002f41a4de97c6dc2e7d91a1 SHA512 84566bdefd83784c5b22ea4c21405261010a03e07839b15f6e1837aeb93ae12ae724a31648627b5f8794659e2fcd6cbbcd633be8d290dd1744e45e87fbe60fd2
+EBUILD smarty-3.1.39.ebuild 1332 BLAKE2B 6223fcc88515195b121844c10598bfa3759d28943cc06c4295a2fdbd50f422d19e1bfd7dc720a93a0859eccf935acdc6331954a6f08163ef10bde05a59edf5de SHA512 ffa1e8578375016ed486ca4a81585acdacb96e82bf42fa52dd7950759cc31582ad67de1a4143c31d55a975f6baae877bba164a414e5fb7ed315601b4cb823f72
+MISC metadata.xml 741 BLAKE2B 9b372ed89268b7c513490a81680c551274df59b971070435cc89cb83afcd153de45aa76dbef50c31d9b70c3c1e717e26a748906f1a8695e18808f2bba4920fb8 SHA512 6b8973ece5a14b4fc4d9ec45b7a95c4a7a9469fe5e897a8a0ddb4693c7ebcd86588db3973237b26f4008344c65f20313b0228ea4c9b91dea53e370f5ca09e5b9
diff --git a/dev-php/smarty/metadata.xml b/dev-php/smarty/metadata.xml
index 9f16ebd25179..0a961b37b77e 100644
--- a/dev-php/smarty/metadata.xml
+++ b/dev-php/smarty/metadata.xml
@@ -18,4 +18,5 @@
   <upstream>
     <remote-id type="github">smarty-php/smarty</remote-id>
   </upstream>
+  <stabilize-allarches/>
 </pkgmetadata>
diff --git a/dev-php/smarty/smarty-3.1.36.ebuild b/dev-php/smarty/smarty-3.1.36.ebuild
deleted file mode 100644
index 358ecbf11f61..000000000000
--- a/dev-php/smarty/smarty-3.1.36.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DOC_PV="3.1.14"
-
-DESCRIPTION="A template engine for PHP"
-HOMEPAGE="https://www.smarty.net/"
-SRC_URI="https://github.com/smarty-php/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	doc? ( https://www.smarty.net/files/docs/manual-en.${DOC_PV}.zip )"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc"
-
-BDEPEND="doc? ( app-arch/unzip )"
-
-# PHP unicode support is detected at runtime, and the cached templates
-# that smarty generates depend on it. If, later on, PHP is reinstalled
-# without unicode support, all of the previously-generated cached
-# templates will begin to throw 500 errrors for missing mb_foo
-# functions. See bug #532618.
-RDEPEND="dev-lang/php:*[unicode]"
-
-src_install() {
-	insinto "/usr/share/php/${PN}"
-	doins -r libs/*
-
-	local DOCS=( *.txt README README.md )
-	local HTML_DOCS
-	use doc && HTML_DOCS="${WORKDIR}/manual-en/"*
-	einstalldocs
-}
-
-pkg_postinst() {
-	elog "${PN} has been installed in /usr/share/php/${PN}/."
-	elog
-	elog 'To use it in your scripts, include the Smarty.class.php file'
-	elog "from the \"${PN}\" directory; for example,"
-	elog
-	elog "  require('${PN}/Smarty.class.php');"
-	elog
-	elog 'After that, the Smarty class will be available to you.'
-}
diff --git a/dev-php/smarty/smarty-3.1.33.ebuild b/dev-php/smarty/smarty-3.1.39.ebuild
index 838dc8fab1c7..e78d49468259 100644
--- a/dev-php/smarty/smarty-3.1.33.ebuild
+++ b/dev-php/smarty/smarty-3.1.39.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/dev-php/xdebug/Manifest b/dev-php/xdebug/Manifest
index ab0f8088e81e..285534a82678 100644
--- a/dev-php/xdebug/Manifest
+++ b/dev-php/xdebug/Manifest
@@ -3,7 +3,9 @@ AUX 3.0-xdebug.ini 1207 BLAKE2B 5ebcd3d89e1f49ea67c517d9fe6f552b82341e47cc1d46f0
 DIST xdebug-2.9.6.tar.gz 436208 BLAKE2B 00cfb42c41bfb44f285b97779d6ba625641fc34494465e9e791ab5458c6a608e432df0ad45c561df2f8c9aba04ab34b3a98bb5e6bfb92ace39a3ad4145f3514a SHA512 13ed07a1489ba7bc0b4e85bf56306c733e7894cea8cb442649635196606b12d92e5618ab2485e7cde4aaee2ac6752993aecd933c24fd64b5113ef619339403d2
 DIST xdebug-2.9.8.tar.gz 438295 BLAKE2B 8645052faceb354817ddb448f46af5b849507d31255b43ac59bcef4ece7837ef835ae2ad624ed8a95f8f98d552ef0e7195a4ade7df9176bc300d855a0156f405 SHA512 c431d51a0d9c5ac1c7fc529c2819db480cbfff6f65c35c3c0dbef4e78427aa28ede164f397f92c409e58e386a6be34ecd2ded0ee35e01df1cbf92a49fd2f2aab
 DIST xdebug-3.0.2.tar.gz 435761 BLAKE2B 0476d29b3a960d83fd0818098a3d076f48f4d67057a2b6ec79571b011a9f364b18d3319771ad18e7145aa0f0f45fab7ed13d814b863731abe1721aafa8b59408 SHA512 723e00885a49a5626870cc4cb0f7fd49a3173c8d4e9b4022009430fdeaa1b152828de18e6e7fa709be8bb11989c89dc2d9940de9cc3d592174b5dafbc3d2c52d
+DIST xdebug-3.0.3.tar.gz 437261 BLAKE2B 7ccfa8acbbe8b40eb086c9d4f47d363ec52850f5b0b91480bebfa416d7b88edf20deb6ee5fb5514dd1885f7a5b77c4b18caecf958d7dcf463c44c259d0fe2b89 SHA512 2ea5c6e2d6481aeeb5b2d8e39f5c5686d9b7480aea0c159f3da6e830700594b24129c1c4242ff8413b52aa2ed0ea872bf72a17fe23facb69c1cae75a917bde5d
 EBUILD xdebug-2.9.6.ebuild 1194 BLAKE2B 3bc713d7a87b093287f00a41372c72c0245d7a8db887c90110eb047df2a1511d0aa313623c289839668fbc8d79e9a53be4d90ef3de02e8a0b087dcecfd1d066b SHA512 ca1870abca6bf2f68ee42cbd81db5eb65cf91d2fde533f1dd7eb14b5067f830b134716115629270d415e8ec5d0a0653a175a40f36c6f37a3a9ea9e6ad1c8215d
 EBUILD xdebug-2.9.8.ebuild 1198 BLAKE2B c248c825f3437ff09276529712c5baac9d2e8067842cdab6c62779939c9accc53d18e5bd6b650a6a7df98b3fff633686d89a276e001fce3fee45e35d77353d33 SHA512 ea107d25c3d47c2f1b8f62a689d7d796ef7c76b7301f991f3162770a5a4cd9232e392234e9c21342a1aac3a4d2bf3aaa912d58df132ca09ed60d9a1da59fd7f3
 EBUILD xdebug-3.0.2-r1.ebuild 1539 BLAKE2B af6fa2bcce4eb467ce2d27f32d30ab0c6b064869d4dc2ba1409fd6d40fc0cbcf0cffe4679b174f93eb8a0ac657d518ae14f0acd66830d3d9c9996c6d8976ebf3 SHA512 7ba76f4089b5955252daa240ba838340d2d7eefa6223380d7b8df5d4af0e3a38732908517e520da516b63fc68b46d0f845b71d788c617435d575099b9201e2ea
+EBUILD xdebug-3.0.3.ebuild 1539 BLAKE2B af6fa2bcce4eb467ce2d27f32d30ab0c6b064869d4dc2ba1409fd6d40fc0cbcf0cffe4679b174f93eb8a0ac657d518ae14f0acd66830d3d9c9996c6d8976ebf3 SHA512 7ba76f4089b5955252daa240ba838340d2d7eefa6223380d7b8df5d4af0e3a38732908517e520da516b63fc68b46d0f845b71d788c617435d575099b9201e2ea
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/xdebug/xdebug-3.0.3.ebuild b/dev-php/xdebug/xdebug-3.0.3.ebuild
new file mode 100644
index 000000000000..c4a24b3dd8dc
--- /dev/null
+++ b/dev-php/xdebug/xdebug-3.0.3.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PHP_EXT_NAME="xdebug"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="yes"
+PHP_EXT_INIFILE="3.0-xdebug.ini"
+
+USE_PHP="php7-3 php7-4 php8-0"
+PHP_EXT_NEEDED_USE="-threads(-)"
+
+MY_PV="${PV/_/}"
+MY_PV="${MY_PV/rc/RC}"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+inherit php-ext-source-r3
+
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+
+DESCRIPTION="A PHP debugging and profiling extension"
+HOMEPAGE="https://xdebug.org/"
+# Using tarball from GitHub for tests
+#SRC_URI="https://pecl.php.net/get/${PN}-${MY_PV}.tgz"
+SRC_URI="https://github.com/xdebug/xdebug/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="Xdebug"
+SLOT="0"
+IUSE=""
+
+# Tests are known to fail
+RESTRICT="test"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+DOCS=( README.rst CREDITS )
+PHP_EXT_ECONF_ARGS=()
+
+src_test() {
+	local slot
+	for slot in $(php_get_slots); do
+		php_init_slot_env "${slot}"
+		TEST_PHP_EXECUTABLE="${PHPCLI}" \
+		TEST_PHP_CGI_EXECUTABLE="${PHPCGI}" \
+		TEST_PHPDBG_EXECUTABLE="${PHPCLI}dbg" \
+		 "${PHPCLI}" run-xdebug-tests.php
+	done
+}
+
+pkg_postinst() {
+	ewarn "We have set xdebug.mode to off, as xdebug can be"
+	ewarn "installed as a dependency, and not all users will want xdebug to be"
+	ewarn "enabled by default. If you want to enable it, you should edit the"
+	ewarn "ini file and set xdebug.mode to one or more modes e.g. develop,debug,trace"
+	elog ""
+	elog "The 3.0 major release changes many options."
+	elog "Review https://xdebug.org/docs/upgrade_guide for differences from 2.x"
+}