gentoo resync : 22.05.2021

27 files changed, 309 insertions, 251 deletions

diff --git a/dev-php/Manifest.gz b/dev-php/Manifest.gz
index 57db35828a08..0c11bbaa2e02 100644
--- a/dev-php/Manifest.gz
+++ b/dev-php/Manifest.gz
diff --git a/dev-php/PEAR-Log/Manifest b/dev-php/PEAR-Log/Manifest
index 9a78f64cd263..1722e30ce9cd 100644
--- a/dev-php/PEAR-Log/Manifest
+++ b/dev-php/PEAR-Log/Manifest
@@ -1,5 +1,7 @@
 DIST Log-1.13.1.tgz 46764 BLAKE2B dc0f4605ed801818ddf070ec3beb6818af1630d99bec721cd3f487e709f87bd4a1628a05854c48fe9775aab546bdce4618061ef37674aa9921f536deccc6a080 SHA512 246510b7dbff4dc9f9cdd951d76baf2dd377e30ffde6d38cadac10091dcb92f8095406edb6d8a87ebe2330d514ce99f355f84ebfe57cd8a3f3babc316995148a
 DIST Log-1.13.2.tgz 46801 BLAKE2B 529677ed8a840742840a8ebeb5f5c7d4e8a8af257f9c3b1cb9ff990e42e760e0040f7df8d94794f40ec5654cf33e1909b7b48ca3f656d2a2bc0310c6705d6c24 SHA512 a4adaf7ee2af600a6c14ed398159c61a7df73b2c6be928f0ea6bbaf90d4b0e866e5a169953fa7819e293cd5cb29c6aca762ced79f3619dfbb38af1ea8731b1c4
+DIST Log-1.13.3.tgz 46815 BLAKE2B 139cc96e475bce1e1e34672c97060d8c2f77767d290641936ec9b28502fbf74ae2fcbb06c51bb991b413dfb8b59ae365f608f5db0687342fd2f4033a77d097f1 SHA512 76baf5f6c800252d30403f64f3390291193c208789e1a3b88b945bf4a28defcd465fe2313ec83487f0be95ba2a99ca75d41f4bfb01f83b84b50fdcdb68e901d4
 EBUILD PEAR-Log-1.13.1.ebuild 1349 BLAKE2B dfde1d63591fbe17aa07f2b21f1f9283befecf9c97de833dccdf97e9f31822274fdf28d79ddc28e074212db1d3018d82ec8264c589da5cd76c54f97ddb0850ab SHA512 034c474601f96cf2f1d08e1b9517809417e332d78b69b473f4c26c2c17b2a7b24b591d9f502ec42beb9399ed79a96f3a97f3684b9c0de29cdb85f830d604119b
 EBUILD PEAR-Log-1.13.2.ebuild 1355 BLAKE2B 9b3c58f6b927d4231a010ca39eac6d374c855a175a4dae4f19f4a1e6cbf62eba674e589d97f5bcd41f21e96c39dc1e23b9050126247019d36bf6c1729a3d2844 SHA512 a1c01f4d37ef9217f8dcc7ffdb8dddc3d0530630a9cea89d6aace531461b45737d7a48819f90862b1293a1b385c24e0ca07114b24eb0a92f5e143daf78b59ca2
+EBUILD PEAR-Log-1.13.3.ebuild 1379 BLAKE2B 609cdbbe3d9d539fa89a535d59d7e2326f1895fc8cf09d3f28a3cf7319f9c6d021f6c35304105511c0f2bbc0b03c2fe86f6ac2cee3a058c0b7e56068b915bbc4 SHA512 fa8adaa1a0a7f9e1ac014ae438d3cfa9ac8169467cff0303ae8a02b6a85793b22a410675d61d61225bf3922bdb508247f8b184de61a2c7b07b0dc38414a40b55
 MISC metadata.xml 305 BLAKE2B 78433e4d5c5d5c6ee0346bb8982aba7b44cd3dd8ab7bac01e1b2895734c64aacdc4f805a2eaca7c8d5e6ae95df313cee5934b4782651f64df4f8b248aa702ff6 SHA512 a89d3cecf9e9d8c545a9d70d3cda6b5adb13e77c8d86588823d9b6b4ff146d3323aeae0bd675e30cb5652b254203669097ed5755d3f0dda103031f9a329aa23f
diff --git a/dev-php/PEAR-Log/PEAR-Log-1.13.3.ebuild b/dev-php/PEAR-Log/PEAR-Log-1.13.3.ebuild
new file mode 100644
index 000000000000..2c518ff5dabf
--- /dev/null
+++ b/dev-php/PEAR-Log/PEAR-Log-1.13.3.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="${PN/PEAR-/}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="The Log framework provides an abstracted logging system"
+HOMEPAGE="https://pear.php.net/package/Log"
+SRC_URI="http://download.pear.php.net/package/${MY_P}.tgz"
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="examples test"
+RESTRICT="!test? ( test )"
+
+# The DB, Mail, and MDB2 dependencies are technically optional, but
+# automagic. To avoid surprises, we require them unconditionally.
+CDEPEND="dev-lang/php:*
+	dev-php/PEAR-PEAR
+	dev-php/PEAR-DB
+	dev-php/PEAR-Mail
+	dev-php/PEAR-MDB2"
+
+BDEPEND="test? ( ${CDEPEND} )"
+
+RDEPEND="${CDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_test() {
+	# Requires the "pear" executable from dev-php/PEAR-PEAR.
+	pear run-tests tests || die
+
+	# The command succeeds regardless of whether or not the test suite
+	# passed, but this file is only written when there was a failure.
+	[[ -f run-tests.log ]] && die "test suite failed"
+}
+
+src_install() {
+	dodoc docs/guide.txt misc/log.sql
+	use examples && dodoc -r examples
+
+	# I don't like installing "Log.php" right at the top-level, but any
+	# packages depending on us will expect to find it there and not as
+	# e.g. Log/Log.php.
+	insinto "/usr/share/php/"
+	doins Log.php
+	doins -r Log
+}
diff --git a/dev-php/PHPMailer/Manifest b/dev-php/PHPMailer/Manifest
index 3484409b4d99..ed780f1e8033 100644
--- a/dev-php/PHPMailer/Manifest
+++ b/dev-php/PHPMailer/Manifest
@@ -1,9 +1,3 @@
-DIST PHPMailer-6.1.6.tar.gz 94769 BLAKE2B 6689f4429c0847de41016325553d58d544f78d5f8a94d9014841435a3cf161e4e10b14fe2cbb61c737bf75d87f2dc4cde66885c06a0b6992a472f0f46fe5dd6b SHA512 25530e6c5513e89729a5b253565143a5a9a35ee5f7813637eee18ca1d604cb83625f7beb106e56536f681d7ec4332fcd3cddcac5da7c73f730db1b056ba5b2e4
-DIST PHPMailer-6.1.7.tar.gz 95102 BLAKE2B 8a1a09aa8f1c82900d881cf82e4a44705afbabc2f38b7bcf8b069a23c426f690dfbebd30c27a30dfbd8a3ad10e75e88fab4fa064bd44308b837455b84a41cad9 SHA512 4b37e11bb99966b8151b64a469125f249091c9b57ef729549735f37869fbaf1a1fb1a3f9d19822c824e909e8b53b696d3cb0d5180683e94968145a968622c2e8
-DIST PHPMailer-6.2.0.tar.gz 95671 BLAKE2B e277f9a033e0b01381ac0a8d20b26d265b2ed187f0c9402a373bc2f9f526421830bd65d2ee11b061927963bcfea79ad8dd176c94ff58c41ccec8f80035a63afc SHA512 31a30e3ca3dd75bf36601870c272a12d6abdee09a9dc523f8ccc610f72a56789650e7a58990577929920b540552cbf75b83679d2cc5d9ce5efd3c214ce5baa42
-DIST PHPMailer-6.4.0.tar.gz 97758 BLAKE2B 5a06a72d457dbb3c8a4dab0debd549d13b023ce8ebbd8d089f3ff54fd671d8a3159da024d75cba9c25950f8aa19f2cdc1dd3b00ab03ca52a9c61e33ac214319c SHA512 488d7fc12683da9f1541ef2f237e255743eecca4162000c904e455255ba6a10dcf3aba004fb3efb0b3b37ac7dc35688f52731cd737fb3a9d1cdf53f9e48f90f1
-EBUILD PHPMailer-6.1.6.ebuild 2219 BLAKE2B 08a599591d6bee673c5df6b47d9c9aea0db8e7ba8d46d7568afbb3d72ee65d0e23215d5f77ac3ac04e70ca26a98847323b9a54dd4adef8f453efc90e89d52a3f SHA512 c69da2436be943fb96828db9268f73d34ac129b21521800f510ef79db257b090627f8bc5c384708f38bc9aec024116461b1a9bfce2dc9b0b7e20c23fc41dad27
-EBUILD PHPMailer-6.1.7.ebuild 2219 BLAKE2B 08a599591d6bee673c5df6b47d9c9aea0db8e7ba8d46d7568afbb3d72ee65d0e23215d5f77ac3ac04e70ca26a98847323b9a54dd4adef8f453efc90e89d52a3f SHA512 c69da2436be943fb96828db9268f73d34ac129b21521800f510ef79db257b090627f8bc5c384708f38bc9aec024116461b1a9bfce2dc9b0b7e20c23fc41dad27
-EBUILD PHPMailer-6.2.0.ebuild 2195 BLAKE2B 54fd8e6fb8cf1e7907a2055e2e8b035638c46c8c0136be68b5889b1dbcfe82206575b02f1302a5a22dca3171d9b79a03cb71ebbfe9565aaf7c298eca4ec47b20 SHA512 71791e9219d29b6006e0092fa82f646770b8703891be17bc6559f8c0ce4441c3efa37ec2619d807ee51185a54da259919261e94b2d38372a766c57624cca6600
-EBUILD PHPMailer-6.4.0.ebuild 2195 BLAKE2B 54fd8e6fb8cf1e7907a2055e2e8b035638c46c8c0136be68b5889b1dbcfe82206575b02f1302a5a22dca3171d9b79a03cb71ebbfe9565aaf7c298eca4ec47b20 SHA512 71791e9219d29b6006e0092fa82f646770b8703891be17bc6559f8c0ce4441c3efa37ec2619d807ee51185a54da259919261e94b2d38372a766c57624cca6600
+DIST PHPMailer-6.4.1.tar.gz 98058 BLAKE2B 88b11e096be6a81591b2c68efb1fdc9a5ff0c384508939545c333f940a60949acb34db000ccd3ae9dbc4c5609f6d20006b7d08ad61bb96edf1d7f11b8091c236 SHA512 c702e53afec4a4c9cdb8757928883fcfd6ed5f2babc03466ca2a698e4e4535014407be5618e6dbcd69135f36f6f723fdee266f70fa6546563949d785f5db4f51
+EBUILD PHPMailer-6.4.1.ebuild 2195 BLAKE2B 54fd8e6fb8cf1e7907a2055e2e8b035638c46c8c0136be68b5889b1dbcfe82206575b02f1302a5a22dca3171d9b79a03cb71ebbfe9565aaf7c298eca4ec47b20 SHA512 71791e9219d29b6006e0092fa82f646770b8703891be17bc6559f8c0ce4441c3efa37ec2619d807ee51185a54da259919261e94b2d38372a766c57624cca6600
 MISC metadata.xml 446 BLAKE2B 178ea98081e664641c7a8632a1c7dac9b5cac8992b0b945208f5ef654633340daced2473bbdc342b70d8b168ac2206ba132f7ab9601f61b5436f3eb3e0441ca1 SHA512 3dfce858cb0e00b526f04a5764a6173d4711db4f21f52b6d827b82f1cddea4e33f533e645dae95d0bb6a69699b00520a414f2e322c76b56aee1e4ea047bb4bb5
diff --git a/dev-php/PHPMailer/PHPMailer-6.1.6.ebuild b/dev-php/PHPMailer/PHPMailer-6.1.6.ebuild
deleted file mode 100644
index e27c5fd93328..000000000000
--- a/dev-php/PHPMailer/PHPMailer-6.1.6.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Full-featured email creation and transfer class for PHP"
-HOMEPAGE="https://github.com/PHPMailer/PHPMailer"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-# To help out the Composer children, the tests and examples are missing
-# from the release tarballs.
-IUSE="doc idn ssl"
-
-# The ctype and filter extensions get used unconditionally, with no
-# fallback and no "extension missing" exception. All of the other
-# extensions are technically optional, depending on how you use
-# PHPMailer and whether or not you're willing to settle for fallback
-# implementations.
-#
-# The insane dependency string is to prevent the ctype and filter
-# extensions from being provided by one version (i.e. slot) of PHP,
-# while intl and unicode are provided by another.
-RDEPEND="
-	ssl? (
-		idn?  ( dev-lang/php:*[ctype,filter,intl,ssl,unicode] )
-		!idn? ( dev-lang/php:*[ctype,filter,ssl] )
-	)
-	!ssl? (
-		idn?  ( dev-lang/php:*[ctype,filter,intl,unicode] )
-		!idn? ( dev-lang/php:*[ctype,filter] )
-	)"
-BDEPEND="doc? ( dev-php/phpDocumentor )"
-
-src_prepare() {
-	# OAuth.php relies on a (now non-nonexistent) autoloader. We remove
-	# it early so that we don't generate documentation for it later on.
-	rm src/OAuth.php || die 'failed to remove src/OAuth.php'
-	eapply_user
-}
-
-src_compile() {
-	if use doc; then
-		phpdoc --filename="src/*.php" \
-			   --target="./html" \
-			   --cache-folder="${T}" \
-			   --title="${PN}" \
-			   --sourcecode \
-			   --force \
-			   --progressbar \
-			   || die "failed to generate API documentation"
-	fi
-}
-
-src_install() {
-	# The PHPMailer class loads its language files
-	# using a relative path, so we need to keep the "src" here.
-	insinto "/usr/share/php/${PN}"
-	doins -r language src
-
-	dodoc README.md SECURITY.md
-	use doc && dodoc -r html/*
-}
-
-pkg_postinst() {
-	elog "${PN} has been installed in /usr/share/php/${PN}/."
-	elog "Upstream no longer provides an autoloader, so you will need"
-	elog "to include each source file (for example: PHPMailer.php,"
-	elog "Exception.php,...) that you need."
-}
diff --git a/dev-php/PHPMailer/PHPMailer-6.1.7.ebuild b/dev-php/PHPMailer/PHPMailer-6.1.7.ebuild
deleted file mode 100644
index e27c5fd93328..000000000000
--- a/dev-php/PHPMailer/PHPMailer-6.1.7.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Full-featured email creation and transfer class for PHP"
-HOMEPAGE="https://github.com/PHPMailer/PHPMailer"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-# To help out the Composer children, the tests and examples are missing
-# from the release tarballs.
-IUSE="doc idn ssl"
-
-# The ctype and filter extensions get used unconditionally, with no
-# fallback and no "extension missing" exception. All of the other
-# extensions are technically optional, depending on how you use
-# PHPMailer and whether or not you're willing to settle for fallback
-# implementations.
-#
-# The insane dependency string is to prevent the ctype and filter
-# extensions from being provided by one version (i.e. slot) of PHP,
-# while intl and unicode are provided by another.
-RDEPEND="
-	ssl? (
-		idn?  ( dev-lang/php:*[ctype,filter,intl,ssl,unicode] )
-		!idn? ( dev-lang/php:*[ctype,filter,ssl] )
-	)
-	!ssl? (
-		idn?  ( dev-lang/php:*[ctype,filter,intl,unicode] )
-		!idn? ( dev-lang/php:*[ctype,filter] )
-	)"
-BDEPEND="doc? ( dev-php/phpDocumentor )"
-
-src_prepare() {
-	# OAuth.php relies on a (now non-nonexistent) autoloader. We remove
-	# it early so that we don't generate documentation for it later on.
-	rm src/OAuth.php || die 'failed to remove src/OAuth.php'
-	eapply_user
-}
-
-src_compile() {
-	if use doc; then
-		phpdoc --filename="src/*.php" \
-			   --target="./html" \
-			   --cache-folder="${T}" \
-			   --title="${PN}" \
-			   --sourcecode \
-			   --force \
-			   --progressbar \
-			   || die "failed to generate API documentation"
-	fi
-}
-
-src_install() {
-	# The PHPMailer class loads its language files
-	# using a relative path, so we need to keep the "src" here.
-	insinto "/usr/share/php/${PN}"
-	doins -r language src
-
-	dodoc README.md SECURITY.md
-	use doc && dodoc -r html/*
-}
-
-pkg_postinst() {
-	elog "${PN} has been installed in /usr/share/php/${PN}/."
-	elog "Upstream no longer provides an autoloader, so you will need"
-	elog "to include each source file (for example: PHPMailer.php,"
-	elog "Exception.php,...) that you need."
-}
diff --git a/dev-php/PHPMailer/PHPMailer-6.4.0.ebuild b/dev-php/PHPMailer/PHPMailer-6.4.0.ebuild
deleted file mode 100644
index 48dc349297f3..000000000000
--- a/dev-php/PHPMailer/PHPMailer-6.4.0.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Full-featured email creation and transfer class for PHP"
-HOMEPAGE="https://github.com/PHPMailer/PHPMailer"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-# To help out the Composer children, the tests and examples are missing
-# from the release tarballs.
-IUSE="doc idn ssl"
-
-# The ctype and filter extensions get used unconditionally, with no
-# fallback and no "extension missing" exception. All of the other
-# extensions are technically optional, depending on how you use
-# PHPMailer and whether or not you're willing to settle for fallback
-# implementations.
-#
-# The insane dependency string is to prevent the ctype and filter
-# extensions from being provided by one version (i.e. slot) of PHP,
-# while intl and unicode are provided by another.
-RDEPEND="
-	ssl? (
-		idn?  ( dev-lang/php:*[ctype,filter,intl,ssl,unicode] )
-		!idn? ( dev-lang/php:*[ctype,filter,ssl] )
-	)
-	!ssl? (
-		idn?  ( dev-lang/php:*[ctype,filter,intl,unicode] )
-		!idn? ( dev-lang/php:*[ctype,filter] )
-	)"
-BDEPEND="doc? ( dev-php/phpDocumentor )"
-
-src_prepare() {
-	default
-
-	# OAuth.php relies on a (now non-nonexistent) autoloader. We remove
-	# it early so that we don't generate documentation for it later on.
-	rm src/OAuth.php || die 'failed to remove src/OAuth.php'
-}
-
-src_compile() {
-	if use doc; then
-		phpdoc --filename="src/*.php" \
-			--target="./html" \
-			--cache-folder="${T}" \
-			--title="${PN}" \
-			--sourcecode \
-			--force \
-			--progressbar \
-			|| die "failed to generate API documentation"
-	fi
-}
-
-src_install() {
-	# The PHPMailer class loads its language files
-	# using a relative path, so we need to keep the "src" here.
-	insinto "/usr/share/php/${PN}"
-	doins -r language src
-
-	dodoc README.md SECURITY.md
-	use doc && dodoc -r html/*
-}
-
-pkg_postinst() {
-	elog "${PN} has been installed in /usr/share/php/${PN}/."
-	elog "Upstream no longer provides an autoloader, so you will need"
-	elog "to include each source file (for example: PHPMailer.php,"
-	elog "Exception.php,...) that you need."
-}
diff --git a/dev-php/PHPMailer/PHPMailer-6.2.0.ebuild b/dev-php/PHPMailer/PHPMailer-6.4.1.ebuild
index 48dc349297f3..48dc349297f3 100644
--- a/dev-php/PHPMailer/PHPMailer-6.2.0.ebuild
+++ b/dev-php/PHPMailer/PHPMailer-6.4.1.ebuild
diff --git a/dev-php/PHP_CodeSniffer/Manifest b/dev-php/PHP_CodeSniffer/Manifest
index c76fada3c8bd..797e89b68523 100644
--- a/dev-php/PHP_CodeSniffer/Manifest
+++ b/dev-php/PHP_CodeSniffer/Manifest
@@ -1,7 +1,9 @@
 DIST PHP_CodeSniffer-3.5.4.tgz 697668 BLAKE2B f5915bcb73c0db0d8dcab3eda5ab647268888e490d244568f0d0e7fff38c4764cfe62fcc79dabe8095adcef56b1e6d0367d46c36b18d0c4e0fb04a048c697737 SHA512 3e8024aac18111741637f014629eeaf5863b2f080a673e5b379a676fafb69859d1889ae13289b0149a9810641b0a140123a970ae1178fcd2cf6da1c414233bfd
 DIST PHP_CodeSniffer-3.5.6.tgz 706080 BLAKE2B 1d9d097e7c60f520973a0dff16e6b31c9e259599ded3f58ac6dda2f10419969b03c18d1ce7c38f19a0f3474b0d5cf4afc5abb889f820da0d5d9e8f0574a0a354 SHA512 392c162cc8cb8d8fe455990d7f358cc59f486d8083387dc3bf60af6ca7aa0e75b72ed337f624b08948d8060cc96bd2d03373b7508fb9179da6a4e6b83adf06a7
 DIST PHP_CodeSniffer-3.5.8.tgz 716472 BLAKE2B e56efedc07a9db63eb2f135d9fef69bf055cef09c23dd9cd1e0efeed865d559b428e9aec06393b1ec1f58d32add92b2773c3d9ce33377f2441de0145560045a8 SHA512 69ef3d86520f541f492c955bd8158664c78aac6ecd4550f2b996f59d882d91f1bec81da9bbd106edc35c4f1a4c260ef2d9a56ec257fc0b4044047b902403065e
+DIST PHP_CodeSniffer-3.6.0.tgz 762998 BLAKE2B f83626a2a64dbb5c7ae2545368f1efdf74d87630720efe7466d9adfd6591cbcc95f2b74a17f54a935377519c6d909ba17f4056fff6d8f3870cefe782f32675dd SHA512 09c98ac460c6dc70637d2f4d81a1e46bdf742ee14d0b56032e8dbcaf7a0ff03f3fdb1abdf8144f664a33298cf397c732ba62027bcee41f1f4f740d12fa29f6a8
 EBUILD PHP_CodeSniffer-3.5.4.ebuild 1502 BLAKE2B 02a3242341c9006a02cbaacff2a5f4b4eb6cb0d9b680c8ba3102316503c7bfb0bcc7be7799fcf4134991010f94ced0cd15c7b8e468c84f707b2904fa64a8b57f SHA512 c3cc91615ce68a44868765c66a8b6f45bcf93e8ed79f74ba9909249797b79c18565baac9ee98a0b1941fdd0a081f568c6a64a47d1cc328346585e0896f909b19
 EBUILD PHP_CodeSniffer-3.5.6.ebuild 1445 BLAKE2B a7d29b2211a6db7ba565908923e1bfedf6cf4f97d0f64374a34237ff854f3c7a1f29182c41a1b1199ea6de8337092af01eefba5f760c211e8e8df21ec10f8f6f SHA512 2ba7d933623e6d552c1676ff2a8e3b8cd407be3e365921b24a0cbe56875883d951cda7d9afee7dee044403ca94de6ab2f592c18337e0af4ca16fa950b6b381f3
 EBUILD PHP_CodeSniffer-3.5.8.ebuild 1450 BLAKE2B cf406c2ceb6ee7cc5556cce50962e30cc185f62319d9407264077bffaa357bf9aeb4b5440a8edc85c2bc1496f654f1c8e734e81367b17fb4356e0571dcac90d6 SHA512 5a94e1232ddbc0ecdcce41f016a7167405b8b71c309a18833e429a66939f8dc6fb076842c40a0e407ec2927aa2a106d10ab0bd57bad8d3abeb3619666096d271
+EBUILD PHP_CodeSniffer-3.6.0.ebuild 1450 BLAKE2B cf406c2ceb6ee7cc5556cce50962e30cc185f62319d9407264077bffaa357bf9aeb4b5440a8edc85c2bc1496f654f1c8e734e81367b17fb4356e0571dcac90d6 SHA512 5a94e1232ddbc0ecdcce41f016a7167405b8b71c309a18833e429a66939f8dc6fb076842c40a0e407ec2927aa2a106d10ab0bd57bad8d3abeb3619666096d271
 MISC metadata.xml 329 BLAKE2B eaaacdc51abc6864a1cbe1b7a1cfe2aa12e184c39e90246117cfb6481be092b30f3797096ce3769f3932332a1d6ff2761bb527f23a2bdfe0bc191284ef6c5163 SHA512 6fde0d31cc1a5ddb750421437f1bbf819fc418792d0a20ca913f7baa644a9f5f471eaf74f4bbe6713860e6d3d3b555a08faf5786d1d419250f6b965c42384a3c
diff --git a/dev-php/PHP_CodeSniffer/PHP_CodeSniffer-3.6.0.ebuild b/dev-php/PHP_CodeSniffer/PHP_CodeSniffer-3.6.0.ebuild
new file mode 100644
index 000000000000..ee16c9322ac2
--- /dev/null
+++ b/dev-php/PHP_CodeSniffer/PHP_CodeSniffer-3.6.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Detect violations of PHP code standards"
+HOMEPAGE="https://github.com/squizlabs/PHP_CodeSniffer"
+
+# The test suite isn't part of the Github tarball at the moment. Keep an
+# eye on https://github.com/squizlabs/PHP_CodeSniffer/issues/548
+SRC_URI="http://download.pear.php.net/package/${P}.tgz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-lang/php:*[cli(-),tokenizer(-),xmlwriter(-)]"
+DEPEND="test? (
+		${RDEPEND}
+		<dev-php/phpunit-6
+	)"
+
+DOCS=( CONTRIBUTING.md README.md )
+
+src_prepare() {
+	sed -i "s~@data_dir@~${EPREFIX}/usr/share/php/data~" src/Config.php || die
+	default
+}
+
+src_test() {
+	# The test suite will fail if date.timezone isn't set in php.ini.
+	phpunit -d date.timezone=UTC tests/AllTests.php \
+		|| die "test suite failed"
+}
+
+src_install() {
+	local MY_PN="PHP/CodeSniffer" script
+	# The PEAR eclass would install everything into the wrong location.
+	insinto "/usr/share/php/${MY_PN}"
+	doins -r src autoload.php
+
+	insinto "/usr/share/php/data/${MY_PN}"
+	doins CodeSniffer.conf.dist
+	# These load code via relative paths, so they have to be symlinked
+	# and not dobin'd.
+	exeinto "/usr/share/php/${MY_PN}/bin"
+	for script in phpcbf phpcs; do
+		doexe "bin/${script}"
+		dosym "../share/php/${MY_PN}/bin/${script}" "/usr/bin/${script}"
+	done
+
+	einstalldocs
+}
diff --git a/dev-php/pecl-http/Manifest b/dev-php/pecl-http/Manifest
index e0dfe4e3193f..556143d75924 100644
--- a/dev-php/pecl-http/Manifest
+++ b/dev-php/pecl-http/Manifest
@@ -1,7 +1,10 @@
+AUX pecl-http-4.1.0-use-getenv.patch 903 BLAKE2B 1cbf60b5c28918a203f46690cf9c0c7e1d61493582dca79f4933c0354c44f25df8c346ce6cd964e9e9eef5e15ba0f39b7d9229a8bcd566447a816ad3bd4f20e0 SHA512 6242db71bc36de20064e787b435e91e27d4ae98685c2fb050c2247d241c4bd81383d71f7e204e57a86403b1392da4bba4a6be92d1b3628322a2227b895ad8a91
 DIST pecl_http-3.2.1.tgz 221244 BLAKE2B b6581829fb8a800e24ccedd4d0f3efbaf558850bdc356d27a6e1d1097a8e2cfc61963a1daccd1d0f269a7cef5b243d45cdfaff5138321fe20df615dde44d19e3 SHA512 e67d4b32ba6f524e3fcf65f5497b94275e1a4a14fce97c57afe366369f368b3acdbedf364ed73cf983fb2c5f57f498adaa1100e7c936f11cbc5de1caedad7b51
 DIST pecl_http-3.2.4.tgz 220631 BLAKE2B 996236cf9dd2f7d9bfaf046306e99c3ccf778261df19df8fd828b5811798f784841d89a6890e7347bd20cc6da71c966ea3ac9b17bf058e0bb766db7e1a8a6c49 SHA512 59c41d57c94a6e50e2f0b261130a24791b2845246f783b55e7f644f9a897d3650da364c5b38a860761b4a23f9266ed05000d6348bae2a7941e59d6bf5fb61a9e
 DIST pecl_http-4.0.0.tgz 218259 BLAKE2B c9f5973686fd4db95a24dd4c50f217b93becc6a439066a395b0b7fec6e977154e5ae8f2261414458aed8e4a9d1281f44da2ecc67a05127610579f5be91196a88 SHA512 268b569c23f10ed72fe3c84fc5e5bf526c3e5ac345ca0556a24fbd01ce95da468d4e9aac6300d058001534ab826836793bf901e9560b744f1e20d7059be2ec79
+DIST pecl_http-4.1.0.tgz 220349 BLAKE2B 71152ee20930843636d90547339270fecf5569cb9a252a516c8150a134bf75fcb88b4fcfd129af1ca1366f4df775653b4dcdddbf0eb02426625550c1b1a0b483 SHA512 653c1dd8ec6dc738ce2dbf235a3c92522858e17ab9c0d00dd75a51bcfeb836f3fb02a6040b8b67d8d6839055286599958db844891686ca70c36031500be0bc1c
 EBUILD pecl-http-3.2.1.ebuild 2263 BLAKE2B 10fbe37789566e35b728134e8a8a5f3f8b5bb14175d471c112c68f5d8163bce79f4d57b419d9e707456227155827b5061da21f799500fd38b93a4e0526a1be75 SHA512 93c5002b610f37af407f632c16337bacefd0429492a158413757559063888d30b2eedc1f3ec4c823fcbdeb9e3143143344a9a1485e15d5854c332a1c926050ba
 EBUILD pecl-http-3.2.4.ebuild 2021 BLAKE2B f5cb3e15af3e2d4e263df6fe5b6a17f2beb2708950ba9259a2e571f18ff6da387390b42931adcc9251c4973fca9c5b9833659bf21918310f4400d4619aac4dc1 SHA512 86e25ed3765edf637cf9fbcb3d670366d82bba7a3f83542217693f6df530379baeb80ebe5a2c5a5f731497fc557e24aec866dd5980af4a79aff56f6e5b4f2676
 EBUILD pecl-http-4.0.0.ebuild 1747 BLAKE2B e73bd951bab8c3b1fc2da5e28557f77bf5b9dbad70440960ed43068ad4c1af26fa7d4745d05f4c5490bbf7cfcb8d47740e7e39d70323adcae83a89ca08500aa3 SHA512 c5e8b1b34da25acc2698dd6d1eab1d84dacb67730e28cf594f9084575cd2264a33e2b250d37fcb690bbfdecb52eb2c032e629e180bffa5781d5e7ce3d785e34e
+EBUILD pecl-http-4.1.0.ebuild 1879 BLAKE2B 7e22bd02d6ef7dff6089da17643d124a10a1f4a0e23aab29152ae11d950d044f6b5b7437af817a9a6aefc7a1f7503cefc4839e02583cea7aae46faac57ecc08c SHA512 f477e7613249544d842ae5277dc33a90df0097b05bb9d56e5200662bf8e380a5581b2b31ea60ba9278a1fe71331bb97677e54c91746f3b4052296cd8350427e3
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/pecl-http/files/pecl-http-4.1.0-use-getenv.patch b/dev-php/pecl-http/files/pecl-http-4.1.0-use-getenv.patch
new file mode 100644
index 000000000000..c3ad7d968360
--- /dev/null
+++ b/dev-php/pecl-http/files/pecl-http-4.1.0-use-getenv.patch
@@ -0,0 +1,25 @@
+commit a4f66fb42bb5203e9d1897a6cf554aa702ce0380
+Author:     Thomas Deutschmann <whissi@gentoo.org>
+AuthorDate: Tue May 18 19:55:47 2021 +0200
+Commit:     Thomas Deutschmann <whissi@gentoo.org>
+CommitDate: Tue May 18 19:55:47 2021 +0200
+
+    tests: use getenv() to access environment variable
+    
+    Fixes
+    
+      Warning: Undefined array key "PATH" in pecl-http-4.1.0/work/php8.0/tests/skipif.inc on line 56
+
+diff --git a/tests/skipif.inc b/tests/skipif.inc
+index 51272fb..76c3bd7 100644
+--- a/tests/skipif.inc
++++ b/tests/skipif.inc
+@@ -53,7 +53,7 @@ function skip_http2_test($message = "skip need http2 support") {
+ 	if (!(http\Client\Curl\FEATURES & http\Client\Curl\Features\HTTP2)) {
+ 		die("$message (FEATURES & HTTP2)\n");
+ 	}
+-	foreach (explode(":", $_ENV["PATH"]) as $path) {
++	foreach (explode(":", getenv("PATH")) as $path) {
+ 		if (is_executable($path . "/nghttpd")) {
+ 			return;
+ 		}
diff --git a/dev-php/pecl-http/pecl-http-4.1.0.ebuild b/dev-php/pecl-http/pecl-http-4.1.0.ebuild
new file mode 100644
index 000000000000..9ffc9765e462
--- /dev/null
+++ b/dev-php/pecl-http/pecl-http-4.1.0.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+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-3 php7-4 php8-0"
+
+inherit php-ext-pecl-r3
+
+USE_PHP="php8-0"
+
+KEYWORDS="~amd64 ~x86"
+
+DESCRIPTION="Extended HTTP Support for PHP"
+LICENSE="BSD-2 MIT"
+SLOT="8"
+IUSE="ssl curl_ssl_gnutls curl_ssl_nss +curl_ssl_openssl"
+
+COMMON_DEPEND="app-arch/brotli:=
+	dev-libs/libevent
+	>=dev-php/pecl-raphf-2.0.1:7[php_targets_php8-0(-)?]
+	net-dns/libidn2
+	sys-libs/zlib
+	ssl? ( net-misc/curl[ssl,curl_ssl_gnutls(-)=,curl_ssl_nss(-)=,curl_ssl_openssl(-)=] )
+	!ssl? ( net-misc/curl[-ssl] )
+"
+DEPEND="
+	php_targets_php8-0? ( ${COMMON_DEPEND} dev-lang/php:8.0[session(-),iconv(-)] )"
+RDEPEND="${DEPEND}
+	php_targets_php7-3? ( dev-php/pecl-http:7[php_targets_php7-3(-)] )
+	php_targets_php7-4? ( dev-php/pecl-http:7[php_targets_php7-4(-)] )"
+
+PHP_EXT_ECONF_ARGS=( --with-http --without-http-shared-deps --without-http-libidn-dir )
+
+PATCHES=( "${FILESDIR}"/${P}-use-getenv.patch )
+
+src_prepare() {
+	if use php_targets_php8-0 ; then
+		php-ext-source-r3_src_prepare
+	else
+		default_src_prepare
+	fi
+
+	# Respect LDFLAGS, bug 727134
+	export EXTRA_LDFLAGS="${LDFLAGS}"
+}
+
+src_test() {
+	# Cannot use eclass function due to required modules
+	# All tests SKIP otherwise
+	local slot
+	for slot in $(php_get_slots); do
+		php_init_slot_env "${slot}"
+
+		# Link in required modules for testing
+		ln -s "${EXT_DIR}/raphf.so" "modules/raphf.so" || die
+
+		sed -i \
+			's/PHP_TEST_SHARED_EXTENSIONS)/PHP_TEST_SHARED_EXTENSIONS) -d extension=raphf/' \
+			Makefile || die
+
+		SKIP_ONLINE_TESTS=yes NO_INTERACTION="yes" emake test
+
+		# Clean up testing links
+		rm modules/raphf.so || die
+	done
+}
+
+src_install() {
+	if use php_targets_php8-0 ; then
+		php-ext-pecl-r3_src_install
+	fi
+}
diff --git a/dev-php/pecl-parallel/Manifest b/dev-php/pecl-parallel/Manifest
index ff96a2784114..f8cdee81ed4b 100644
--- a/dev-php/pecl-parallel/Manifest
+++ b/dev-php/pecl-parallel/Manifest
@@ -1,3 +1,3 @@
 DIST pecl-parallel-1.1.4.tgz 58783 BLAKE2B 942c767ff4838c13e70829d6ac6599cee3185afaf71e9dc430064835102d31a3e50b99694e1632be652c6a019934a13ba0f5139041bba39d486a20615478b910 SHA512 6693f01b0d43de5153aa0953f90580717e519cfbe8ca5b0ba6abd9cc681e0efe9d7c6fcc601da98f74b570b5810dffdbf5100bedc8ab86c1f4bc61d48955ae77
-EBUILD pecl-parallel-1.1.4.ebuild 592 BLAKE2B 12362590c6cd524c28cd10dbe3ae9d2f2b7cb83261066966f6f4e40a8153adcf6a0bc9a4c39c812b0ea2931afbd591acda034790eacf2d5720ceeecf05b40433 SHA512 7d5544a616a0227bc65a4ffd08cba3d5b9a79446c9a26f88b31fcc98cd562ba9723f2bd8dd0dbdf5bf3b72c041aefa39c2e09379f684ddf6db97217cacd25f36
+EBUILD pecl-parallel-1.1.4.ebuild 556 BLAKE2B 261c1a02c6e8a5c083e080aabe25505b5732002c8114b106a9b35bbe26a91179cf623d19c087eca412fd80ac7c94cb0b038fb341d43287e781b4164d3ab48077 SHA512 ba5f1726fef372707fd7fdaa72ec88c5162810ba709fdf5ef77f56a301733293b728b29b2a7c8f3701b2c5c2c0529a66e5ff89c0eafca3335ed9bf812750817e
 MISC metadata.xml 387 BLAKE2B 68c4ddb99ffd1a19a850584a5e9affdcebf13cbdc2699dacd7462abebfa50183b1ab34a15e2763a4b64fd677e0339aff4a73d0d928d01269b6d818b54020df89 SHA512 7aff04737fac9b89f82c737ac35fc5edd128f405d3d1fb637b612452b8106e9ba5ef9fa112359c586799685905c07a61e0472a0a899a6fcde07c9e11e2eadfa6
diff --git a/dev-php/pecl-parallel/pecl-parallel-1.1.4.ebuild b/dev-php/pecl-parallel/pecl-parallel-1.1.4.ebuild
index b98c81bf0134..5d0e7fc04b47 100644
--- a/dev-php/pecl-parallel/pecl-parallel-1.1.4.ebuild
+++ b/dev-php/pecl-parallel/pecl-parallel-1.1.4.ebuild
@@ -11,7 +11,7 @@ USE_PHP="php7-3 php7-4"
 
 inherit php-ext-pecl-r3
 
-SRC_URI="https://pecl.php.net/get/pecl-${PHP_EXT_NAME}-${PV/_/}.tgz"
+SRC_URI="${SRC_URI} -> ${P}.tgz"
 
 KEYWORDS="~amd64 ~x86"
 
diff --git a/dev-php/phar-io-version/Manifest b/dev-php/phar-io-version/Manifest
index 9130fef2fe03..c74ef8e28476 100644
--- a/dev-php/phar-io-version/Manifest
+++ b/dev-php/phar-io-version/Manifest
@@ -1,6 +1,8 @@
 AUX autoload.php 168 BLAKE2B 8a0af6dc727f5f2fb7d43beda5e7d83bf5879117b4017ca3467d7f5da2e76dd50e58260ee0c3dd043a2da04693cca0fde4f1124aab317ef52cbc3855bd305683 SHA512 d02b31090ab4b2efe92ed0243c4a877a4a0731fc65fc7dd688087b08b3ced80c33570d9f081829354b35612e80b22f28df14cb35faad7466f925aa1c523f7404
 DIST phar-io-version-2.0.1.tar.gz 10348 BLAKE2B 22a4f8426c14662781534e63ddb62e4e783fe563ae061c0c3ae87960e0c649d68adff9b19e4388e9aafc52184aa273e8ecc5df08f16e0918258a2a4862950181 SHA512 068d872ecafc3491c7cd27068fa2b35cf1d7e3abe21649677c935e897b6582d2efcdcbcef71a00f3b9b416320f6139c671411821ad41e3b7c906fac5288646ec
 DIST phar-io-version-3.0.4.tar.gz 6574 BLAKE2B 95456e6980465cbc613fd3b835e11b4bc2cc8641234a88003418125bd27bc52eccaafef506a954cda521d269abb1b14129a8c8cc1dd082d01c85c0cc05c465c5 SHA512 4bc3dc68545d2ba98606bffb3fa289af7668a0df8c9ab67cd2e3a1fe7790e9ce00d4e3642022d8224ef5f3bd0ab0797b68ee73301530a1893b18c123fecf47d2
+DIST phar-io-version-3.1.0.tar.gz 6954 BLAKE2B cd2ed8f1219a6cbb4b50fbfa835dfb7971b0111363344397c4eed672ec223019f66da5afa20b43aeb3d8a9f301438f5a0b0680208115df73cd7e65eda37b1f1a SHA512 f441f341cd63b2910e384fc1a4bae45ab9ccaeaebea8d79c8b20f1d745255c29dbc349962837da5eaa445cfa64ee3c9a4741058da3e669d66da13e45cae2f65e
 EBUILD phar-io-version-2.0.1.ebuild 620 BLAKE2B 8a7c05200fae7e669a14342501ab4bb363818501305b3de329e86e3a36337a9c486041b253b3e3044cddc7f2c37c2700264a405750ea03ec18b8b0939ab291e9 SHA512 aab971d688553fbb2893c69396ccdca1a86aa13e08836bd376f2b6fe1239df4ea81c528a13d386726e82f7d688d5f73bb0a14a5c56ab0ebb387d403ec2fee8b2
 EBUILD phar-io-version-3.0.4.ebuild 782 BLAKE2B 60a058929a817fa62fddf3fd74a0a2c436d806b744f7aa50964cfb1de1f15a4f0cc9e357f3be6f5593fbdf6737a17be81fdf77a3e61058f4d935444800f2dd85 SHA512 5f62b547bc654a93b38f7c2484b799576cfc7324576e0a1185a95f4480d6ace3ce9c4a73fc50cfaba9e1aad5d22476047df3af53c75e4d39df91284f2951a606
+EBUILD phar-io-version-3.1.0.ebuild 782 BLAKE2B 60a058929a817fa62fddf3fd74a0a2c436d806b744f7aa50964cfb1de1f15a4f0cc9e357f3be6f5593fbdf6737a17be81fdf77a3e61058f4d935444800f2dd85 SHA512 5f62b547bc654a93b38f7c2484b799576cfc7324576e0a1185a95f4480d6ace3ce9c4a73fc50cfaba9e1aad5d22476047df3af53c75e4d39df91284f2951a606
 MISC metadata.xml 343 BLAKE2B 89fbe28552e1d4ad3eab9e1c957616ca42c2f4d911d95f0e378096f146812735700eae991a877cb221637e5f50e689d72adf5f824f30af70e7158bbf580d1e65 SHA512 82a23ec3f1172fdb29bed30eefdf5a47cec1200c55854ba0c50b1c141e462a3af022aa96e38a0e6b79254d543cbea0be392e483bbe0df31bb846d68e473c0fb3
diff --git a/dev-php/phar-io-version/phar-io-version-3.1.0.ebuild b/dev-php/phar-io-version/phar-io-version-3.1.0.ebuild
new file mode 100644
index 000000000000..1c28ee251730
--- /dev/null
+++ b/dev-php/phar-io-version/phar-io-version-3.1.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+DESCRIPTION="Library for handling version information and constraints"
+HOMEPAGE="https://github.com/phar-io/version"
+SRC_URI="https://github.com/phar-io/version/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}/version-${PV}"
+
+CDEPEND="dev-php/fedora-autoloader
+	>=dev-lang/php-7.2:*"
+
+BDEPEND="dev-php/theseer-Autoload"
+
+RDEPEND="${CDEPEND}"
+
+src_prepare() {
+	default
+
+	phpab \
+		--output src/autoload.php \
+		--template fedora2 \
+		--basedir src \
+		src \
+		|| die
+}
+
+src_install() {
+	insinto /usr/share/php/PharIo/Version
+	doins src/*.php
+	dodoc README.md
+}
diff --git a/dev-php/psr-log/Manifest b/dev-php/psr-log/Manifest
index cd4a1a120ef7..14a8d4b35a79 100644
--- a/dev-php/psr-log/Manifest
+++ b/dev-php/psr-log/Manifest
@@ -1,4 +1,6 @@
 AUX autoload.php 258 BLAKE2B 64c22f9d35d5b8a66d0823348273123a8440eb3f93b3627767ea9112f23d488422137e5abf329d68b4f320032e1dd74ad5e17b914ca3158036d440e6acadb696 SHA512 ced0c315c49aa13275c6b06ad0c10d2601654408aa4bd535103ac518c977554c7dfaccb31a7c151ada94dfc9c1198a3c4758ce6a020d6a70041aa9cc3fea634e
 DIST psr-log-1.1.3.tar.gz 5863 BLAKE2B 6eb823853d69900f6b265448312cc351f3bbe90b26cf3f01bc108c9508a40d19f8cf52bd157da3481d6fd4bf96f0e40932fa5501226955a87e23bd84ddb36ce0 SHA512 e78f0d2343f0e5e59d3d343d9f122bea9962f8fc9bc66e52838c6ab5047929bfd5178ee63713f12a93889da28d1bd5c8e55243d42110264e32f7d5f207a597bc
+DIST psr-log-1.1.4.tar.gz 5843 BLAKE2B b8cd6304495d4e10e4fbc137c226880fdfe8f5e9ce44f72f9389d3d560db1d8a91ea832c9f89772d329c0bd65fc8710ae4125845cda3d0316de307dd39d1b14f SHA512 fca99e74f357c8da9f726a1f83825aa0d2fdda4ce31c67099818c4aa724fcc1293cecd446476697d244f192e92bf6bc2eed39c197028611589825c677a15f3ac
 EBUILD psr-log-1.1.3.ebuild 528 BLAKE2B cdac444935705a5bba73ad90da978db48c17529f7311f8043ce321dfe741568d5e411895ae2c784f38341a32726ff31d2aae178aed401bcc779affe9b29c9e69 SHA512 038bfd108409aef11848d534e96acdd29f21b6093606930ef18b0b1f13eb6a035c034eaae8c497cd1eb89134a9a38552fe403f20d5579de01e74f1473a80f025
+EBUILD psr-log-1.1.4.ebuild 530 BLAKE2B 096b7a67ee436673c8c7b25c076de7092f36de197df872487c796be856a8fe12399e55d99bd585f6f282b6abdec59741d11ba4affae404d21f8a62c1a19ea0bc SHA512 83ec39a0bb106c1726f47e31eb6ed53411394467e282e19b75bb5b852152cf3f4ecceb2f05e728b83b1a727b5bee4c79b126bf8c147fc14484f6944e1a870648
 MISC metadata.xml 832 BLAKE2B 1c7f2430fe2e012eb2403555c77904434a90983bb31aaca2148a52bcec595101131018f14dbef72a497c88d35065a15fd915d15cc29b0d106cc04a109b72571c SHA512 2715e1f3e5d6b1cf729db0551f8f00deba0a777ff9181c85852a6824a0188834af95cbcf404d3e7563a4588c1aa71e6f8e9199eed7aa7f40c8686d65a68c72ec
diff --git a/dev-php/psr-log/psr-log-1.1.4.ebuild b/dev-php/psr-log/psr-log-1.1.4.ebuild
new file mode 100644
index 000000000000..db272717331e
--- /dev/null
+++ b/dev-php/psr-log/psr-log-1.1.4.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Common interface for logging libraries"
+HOMEPAGE="https://github.com/php-fig/log"
+SRC_URI="https://github.com/php-fig/log/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-lang/php:*
+	dev-php/fedora-autoloader"
+
+S="${WORKDIR}/log-${PV}"
+
+src_install() {
+	insinto "/usr/share/php/Psr/Log"
+	doins -r Psr/Log/. "${FILESDIR}"/autoload.php
+	dodoc README.md
+}
diff --git a/dev-php/swoole/Manifest b/dev-php/swoole/Manifest
index 7f092d24efef..e880940afdf5 100644
--- a/dev-php/swoole/Manifest
+++ b/dev-php/swoole/Manifest
@@ -5,11 +5,11 @@ DIST swoole-4.4.15.tgz 1454897 BLAKE2B 38f804e5f2f41ba2bc32ac2e6fd7be3e03f7a3614
 DIST swoole-4.4.16.tgz 1457270 BLAKE2B 4b65270aa1014ea68cadae8eb021d37498dc3fe0bf2d681c95bf7113928138bc26ab73f3be91185eb5ecebcb4940906814913c7908c87592aafd33fbc1820bf7 SHA512 7be4705967ed6b7a955f679f8c39585d34dc8c87ba608ac3ae2b0fc3cae9513d9639c8e9aac4278ce85acc215b500044626aab9b2aac725c9ffaef72dfb02dd7
 DIST swoole-4.4.19.tgz 1469420 BLAKE2B 0240b5fbd6a4625d426d0c960859b8215122fff10be9e70823eb32f196d3ec075a952dc133258b04c323439de982079f5acbab9039958c457aa18f1687118ce3 SHA512 be4671da9fdbf65daf6364e5eaca9b25fd3557bec848a04b636ace48c896d4dbf08f6e877d6166571aa966732a70037bf2d4ba2f302696dd2b1371e2de993106
 DIST swoole-4.5.9.tgz 1552445 BLAKE2B 602ce65f7b59a3c199d7718aeb941d1ebde7d59096335992c2278f7e330f7b48554a8418cc4014f6fcf47af92d315368a16c572055b1fd9575608c2559ed3107 SHA512 9154a2874480218aa3c8935979267efb92a3d5a4f1ba7dc071bf4c2b169d69e31a6ad7412785d00543dc5827ce2d6c5999b6cabea2089818f3f57acc26bcb31f
-EBUILD swoole-4.2.13.ebuild 1730 BLAKE2B bb89c7c19612161eea5565341ca9ece4daaab5de6bf27655b2b5387354ba376e6d4f70e402604f3e0db11ce892e8ec74d954dbe3e67f01b1fa539bf56042e49e SHA512 b86b4aee7b407442eb34098b3bea94829162d7d05fa9b989b57338f54572c010068e32933552759656ca1f00184108506eed22e6e07d323e7c82278ca4d39cd0
-EBUILD swoole-4.4.12.ebuild 1811 BLAKE2B 6548b853ccaf052ba922377c3bbe6656be48950579c3e9e181dc5b1c356e384fd5e283cce4af79ec4678e13c2421e84a4fd0a472d9e0e1c3edab9d5c97172da3 SHA512 bd7feafcb063a128a61be8e68ab504093aa80e9752199e0762e5d087aebdf0de43a4cea28a4b9dc152cccc6548d9f145aa24738244e37af3c3b9c9102eb62010
-EBUILD swoole-4.4.14.ebuild 1811 BLAKE2B 6548b853ccaf052ba922377c3bbe6656be48950579c3e9e181dc5b1c356e384fd5e283cce4af79ec4678e13c2421e84a4fd0a472d9e0e1c3edab9d5c97172da3 SHA512 bd7feafcb063a128a61be8e68ab504093aa80e9752199e0762e5d087aebdf0de43a4cea28a4b9dc152cccc6548d9f145aa24738244e37af3c3b9c9102eb62010
-EBUILD swoole-4.4.15.ebuild 1811 BLAKE2B 6548b853ccaf052ba922377c3bbe6656be48950579c3e9e181dc5b1c356e384fd5e283cce4af79ec4678e13c2421e84a4fd0a472d9e0e1c3edab9d5c97172da3 SHA512 bd7feafcb063a128a61be8e68ab504093aa80e9752199e0762e5d087aebdf0de43a4cea28a4b9dc152cccc6548d9f145aa24738244e37af3c3b9c9102eb62010
-EBUILD swoole-4.4.16.ebuild 1811 BLAKE2B 6548b853ccaf052ba922377c3bbe6656be48950579c3e9e181dc5b1c356e384fd5e283cce4af79ec4678e13c2421e84a4fd0a472d9e0e1c3edab9d5c97172da3 SHA512 bd7feafcb063a128a61be8e68ab504093aa80e9752199e0762e5d087aebdf0de43a4cea28a4b9dc152cccc6548d9f145aa24738244e37af3c3b9c9102eb62010
-EBUILD swoole-4.4.19.ebuild 1811 BLAKE2B 6548b853ccaf052ba922377c3bbe6656be48950579c3e9e181dc5b1c356e384fd5e283cce4af79ec4678e13c2421e84a4fd0a472d9e0e1c3edab9d5c97172da3 SHA512 bd7feafcb063a128a61be8e68ab504093aa80e9752199e0762e5d087aebdf0de43a4cea28a4b9dc152cccc6548d9f145aa24738244e37af3c3b9c9102eb62010
-EBUILD swoole-4.5.9.ebuild 1553 BLAKE2B 78f509344f313757f454b3b0e4810ec33fd69a22895ee94ff06826164204a175217d3057733e88e4911ce94294f91ec031fcf0cfd993d25df82c78349cb5ffcc SHA512 8c9d746ae3cb918173f9e60fa8b78ff055db12adf8e5d710ca287d912cf60988c62d1f62642b33a43be9e73968b9830bebaa9ae9238b6ac85588c130c0a113fe
+EBUILD swoole-4.2.13.ebuild 1736 BLAKE2B db2e93920c5401e954aa99fa141dd99638e3332ac3ae7fa101f83d88f60da62f4c798826322cb2358a25770bd78968cc405c242204ee6f824d9dda9b973cd331 SHA512 f5f08fd2d4322971352698c0498e898ba8d4e4bc09f114a575eff79705a4435b4a48edc0045cdb75b811cc890e21dd3498696eccbef6ea17b8751c08896188be
+EBUILD swoole-4.4.12.ebuild 1817 BLAKE2B f422e201d77443e94d1448d6fc4402b7e6ed6449ee0c1efa748894289c740b7bda327cade26abe4306f71c5affeff8dc886c8eef8af2bbb3fe89381ca9093713 SHA512 c22f4597075a8b856ebe31917451586c1b3f6f687bb2a47c35cc3e5d83d0b427d02cfb81cd9ae2cfe89d282b682897896bb69fddf54f5da97ef291d5af057aed
+EBUILD swoole-4.4.14.ebuild 1817 BLAKE2B f422e201d77443e94d1448d6fc4402b7e6ed6449ee0c1efa748894289c740b7bda327cade26abe4306f71c5affeff8dc886c8eef8af2bbb3fe89381ca9093713 SHA512 c22f4597075a8b856ebe31917451586c1b3f6f687bb2a47c35cc3e5d83d0b427d02cfb81cd9ae2cfe89d282b682897896bb69fddf54f5da97ef291d5af057aed
+EBUILD swoole-4.4.15.ebuild 1817 BLAKE2B f422e201d77443e94d1448d6fc4402b7e6ed6449ee0c1efa748894289c740b7bda327cade26abe4306f71c5affeff8dc886c8eef8af2bbb3fe89381ca9093713 SHA512 c22f4597075a8b856ebe31917451586c1b3f6f687bb2a47c35cc3e5d83d0b427d02cfb81cd9ae2cfe89d282b682897896bb69fddf54f5da97ef291d5af057aed
+EBUILD swoole-4.4.16.ebuild 1817 BLAKE2B f422e201d77443e94d1448d6fc4402b7e6ed6449ee0c1efa748894289c740b7bda327cade26abe4306f71c5affeff8dc886c8eef8af2bbb3fe89381ca9093713 SHA512 c22f4597075a8b856ebe31917451586c1b3f6f687bb2a47c35cc3e5d83d0b427d02cfb81cd9ae2cfe89d282b682897896bb69fddf54f5da97ef291d5af057aed
+EBUILD swoole-4.4.19.ebuild 1817 BLAKE2B f422e201d77443e94d1448d6fc4402b7e6ed6449ee0c1efa748894289c740b7bda327cade26abe4306f71c5affeff8dc886c8eef8af2bbb3fe89381ca9093713 SHA512 c22f4597075a8b856ebe31917451586c1b3f6f687bb2a47c35cc3e5d83d0b427d02cfb81cd9ae2cfe89d282b682897896bb69fddf54f5da97ef291d5af057aed
+EBUILD swoole-4.5.9.ebuild 1559 BLAKE2B 8a6b91445f759407469793624f8d5fdbd86544b5fb79960bed2a90739f927c3f608332c6a0b807172811ff4dee311eded719bb26cd32ff612640a65ebd9d0c97 SHA512 99cbcc90b6212ee554ed01cc45ed0f6a5577a7e7cb119a49ca090d089c0e61845e27e60e666d0aba66ab2e8d5cd27e829101d324a1a735c8d241c61acab2fefa
 MISC metadata.xml 344 BLAKE2B b6bba613a547a33d17c214859118a6f8c499b65763a8373dde96b955efc9609ddb2f2de6cf678a5f0f1552ac1b054661d2771b68cc007327950721b9e36417aa SHA512 8fe672a189916bf935ff0bc312b617658d3fd789bceb0305dbe9745600690cc2b9d93d2bf60b1bd517c1824c5cef2ea8ebe4eab69716ecba5763742b15cf61c0
diff --git a/dev-php/swoole/swoole-4.2.13.ebuild b/dev-php/swoole/swoole-4.2.13.ebuild
index facb4470ae85..5f7e9c4b7df3 100644
--- a/dev-php/swoole/swoole-4.2.13.ebuild
+++ b/dev-php/swoole/swoole-4.2.13.ebuild
@@ -44,7 +44,7 @@ IUSE="debug http2 mysql sockets ssl"
 
 src_configure() {
 	# PostgreSQL disabled due to Gentoo's slot system
-	# JEMalloc not included as it refuses to find a ${EROOT}/usr/includes/jemalloc subdirectory
+	# JEMalloc not included as it refuses to find a ${ESYSROOT}/usr/includes/jemalloc subdirectory
 	local PHP_EXT_ECONF_ARGS=(
 		--enable-swoole
 		--disable-coroutine-postgresql
@@ -52,7 +52,7 @@ src_configure() {
 		$(use_enable http2)
 		$(use_enable mysql mysqlnd)
 		$(use_enable ssl openssl)
-		$(use_with ssl openssl-dir "${EROOT}/usr")
+		$(use_with ssl openssl-dir "${ESYSROOT}/usr")
 		$(use_enable sockets)
 	)
 
diff --git a/dev-php/swoole/swoole-4.4.12.ebuild b/dev-php/swoole/swoole-4.4.12.ebuild
index dd3020308708..4d978ebbd611 100644
--- a/dev-php/swoole/swoole-4.4.12.ebuild
+++ b/dev-php/swoole/swoole-4.4.12.ebuild
@@ -49,14 +49,14 @@ RDEPEND="${DEPEND}"
 IUSE="debug http2 mysql sockets ssl"
 
 src_configure() {
-	# JEMalloc not included as it refuses to find a ${EROOT}/usr/includes/jemalloc subdirectory
+	# JEMalloc not included as it refuses to find a ${ESYSROOT}/usr/includes/jemalloc subdirectory
 	local PHP_EXT_ECONF_ARGS=(
 		--enable-swoole
 		$(use_enable debug)
 		$(use_enable http2)
 		$(use_enable mysql mysqlnd)
 		$(use_enable ssl openssl)
-		$(use_with ssl openssl-dir "${EROOT}/usr")
+		$(use_with ssl openssl-dir "${ESYSROOT}/usr")
 		$(use_enable sockets)
 	)
 
diff --git a/dev-php/swoole/swoole-4.4.14.ebuild b/dev-php/swoole/swoole-4.4.14.ebuild
index dd3020308708..4d978ebbd611 100644
--- a/dev-php/swoole/swoole-4.4.14.ebuild
+++ b/dev-php/swoole/swoole-4.4.14.ebuild
@@ -49,14 +49,14 @@ RDEPEND="${DEPEND}"
 IUSE="debug http2 mysql sockets ssl"
 
 src_configure() {
-	# JEMalloc not included as it refuses to find a ${EROOT}/usr/includes/jemalloc subdirectory
+	# JEMalloc not included as it refuses to find a ${ESYSROOT}/usr/includes/jemalloc subdirectory
 	local PHP_EXT_ECONF_ARGS=(
 		--enable-swoole
 		$(use_enable debug)
 		$(use_enable http2)
 		$(use_enable mysql mysqlnd)
 		$(use_enable ssl openssl)
-		$(use_with ssl openssl-dir "${EROOT}/usr")
+		$(use_with ssl openssl-dir "${ESYSROOT}/usr")
 		$(use_enable sockets)
 	)
 
diff --git a/dev-php/swoole/swoole-4.4.15.ebuild b/dev-php/swoole/swoole-4.4.15.ebuild
index dd3020308708..4d978ebbd611 100644
--- a/dev-php/swoole/swoole-4.4.15.ebuild
+++ b/dev-php/swoole/swoole-4.4.15.ebuild
@@ -49,14 +49,14 @@ RDEPEND="${DEPEND}"
 IUSE="debug http2 mysql sockets ssl"
 
 src_configure() {
-	# JEMalloc not included as it refuses to find a ${EROOT}/usr/includes/jemalloc subdirectory
+	# JEMalloc not included as it refuses to find a ${ESYSROOT}/usr/includes/jemalloc subdirectory
 	local PHP_EXT_ECONF_ARGS=(
 		--enable-swoole
 		$(use_enable debug)
 		$(use_enable http2)
 		$(use_enable mysql mysqlnd)
 		$(use_enable ssl openssl)
-		$(use_with ssl openssl-dir "${EROOT}/usr")
+		$(use_with ssl openssl-dir "${ESYSROOT}/usr")
 		$(use_enable sockets)
 	)
 
diff --git a/dev-php/swoole/swoole-4.4.16.ebuild b/dev-php/swoole/swoole-4.4.16.ebuild
index dd3020308708..4d978ebbd611 100644
--- a/dev-php/swoole/swoole-4.4.16.ebuild
+++ b/dev-php/swoole/swoole-4.4.16.ebuild
@@ -49,14 +49,14 @@ RDEPEND="${DEPEND}"
 IUSE="debug http2 mysql sockets ssl"
 
 src_configure() {
-	# JEMalloc not included as it refuses to find a ${EROOT}/usr/includes/jemalloc subdirectory
+	# JEMalloc not included as it refuses to find a ${ESYSROOT}/usr/includes/jemalloc subdirectory
 	local PHP_EXT_ECONF_ARGS=(
 		--enable-swoole
 		$(use_enable debug)
 		$(use_enable http2)
 		$(use_enable mysql mysqlnd)
 		$(use_enable ssl openssl)
-		$(use_with ssl openssl-dir "${EROOT}/usr")
+		$(use_with ssl openssl-dir "${ESYSROOT}/usr")
 		$(use_enable sockets)
 	)
 
diff --git a/dev-php/swoole/swoole-4.4.19.ebuild b/dev-php/swoole/swoole-4.4.19.ebuild
index dd3020308708..4d978ebbd611 100644
--- a/dev-php/swoole/swoole-4.4.19.ebuild
+++ b/dev-php/swoole/swoole-4.4.19.ebuild
@@ -49,14 +49,14 @@ RDEPEND="${DEPEND}"
 IUSE="debug http2 mysql sockets ssl"
 
 src_configure() {
-	# JEMalloc not included as it refuses to find a ${EROOT}/usr/includes/jemalloc subdirectory
+	# JEMalloc not included as it refuses to find a ${ESYSROOT}/usr/includes/jemalloc subdirectory
 	local PHP_EXT_ECONF_ARGS=(
 		--enable-swoole
 		$(use_enable debug)
 		$(use_enable http2)
 		$(use_enable mysql mysqlnd)
 		$(use_enable ssl openssl)
-		$(use_with ssl openssl-dir "${EROOT}/usr")
+		$(use_with ssl openssl-dir "${ESYSROOT}/usr")
 		$(use_enable sockets)
 	)
 
diff --git a/dev-php/swoole/swoole-4.5.9.ebuild b/dev-php/swoole/swoole-4.5.9.ebuild
index 48523b05538a..5d5171051808 100644
--- a/dev-php/swoole/swoole-4.5.9.ebuild
+++ b/dev-php/swoole/swoole-4.5.9.ebuild
@@ -43,14 +43,14 @@ RDEPEND="${DEPEND}"
 IUSE="debug http2 mysql sockets ssl"
 
 src_configure() {
-	# JEMalloc not included as it refuses to find a ${EROOT}/usr/includes/jemalloc subdirectory
+	# JEMalloc not included as it refuses to find a ${ESYSROOT}/usr/includes/jemalloc subdirectory
 	local PHP_EXT_ECONF_ARGS=(
 		--enable-swoole
 		$(use_enable debug)
 		$(use_enable http2)
 		$(use_enable mysql mysqlnd)
 		$(use_enable ssl openssl)
-		$(use_with ssl openssl-dir "${EROOT}/usr")
+		$(use_with ssl openssl-dir "${ESYSROOT}/usr")
 		$(use_enable sockets)
 	)