gentoo (leap year) resync : 29.02.2020

39 files changed, 245 insertions, 135 deletions

diff --git a/dev-php/Manifest.gz b/dev-php/Manifest.gz
index aa934583b8d5..fd86d6ea179a 100644
--- a/dev-php/Manifest.gz
+++ b/dev-php/Manifest.gz
diff --git a/dev-php/PEAR-Crypt_HMAC/Manifest b/dev-php/PEAR-Crypt_HMAC/Manifest
index 3d3db9fd6e36..b04c1d9f1c89 100644
--- a/dev-php/PEAR-Crypt_HMAC/Manifest
+++ b/dev-php/PEAR-Crypt_HMAC/Manifest
@@ -1,4 +1,4 @@
 AUX HMAC-1.0.1.patch 1501 BLAKE2B 2ee57e59c9d4ec6807c3daecc488a39102280c71da62baf9c3cf90a0af8e08c29e6d6be2593f148f4c4808b5d68fd0b681b511eeefd53bd91123959114651474 SHA512 19c968acbe449436f0bde2bbf9b379d9f04e76adf3283504b2fd396c94f19f5767a89a8fa23e23622b6fc3178be9c995b826d5540d994ca31e30f22a835f8c83
 DIST Crypt_HMAC-1.0.1.tgz 2149 BLAKE2B a95f145101cbd9f089948ac62d47b9a449a8cac328636987b49903c07c714c007309b294dd3a16fb5f5cf5bacf00c6e502fd8e29584803c99bff2bf61c5dec0a SHA512 5fb873d9d2e14f18f729e102b0295aaafef53bb150322f4a75d87f6d5ffd3e8829d424ee7285950d92c3408756b40b9ac7fe5123a73cefb341e4224f049bcb18
-EBUILD PEAR-Crypt_HMAC-1.0.1-r2.ebuild 555 BLAKE2B 84e630b126cc502ea43ddc463711076e79af07f006c110e530ff4aa6c152fa9e84d5f742b5a3b19696c644fb569e9d2989acdb8303851eafb684d8b746a02b2b SHA512 899c3c2df4669b4d1a1f32aa6ba93224d47bd9c7ba74ab49b0d7f9c212eb7e03dd73da335273340b3ce1251215e4a1516e289c38d49a3e71d3a6d587df363078
+EBUILD PEAR-Crypt_HMAC-1.0.1-r2.ebuild 557 BLAKE2B 85ccc32f5773ac1e470303265bb9059fc296c279666abbb45aaddcb82c52dae5ad5ed078d83176e8d863b76add120a36ed717eccca010da39fa2abb0c0b6bf45 SHA512 132129ce245d11ef8730271b384fb483f2cf3c8578a9ec336c7bc06ffa6465d5477e82afec3b2bccb76215192ef4bf4040d43c4088b138d1729a1a6cb840d190
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/PEAR-Crypt_HMAC/PEAR-Crypt_HMAC-1.0.1-r2.ebuild b/dev-php/PEAR-Crypt_HMAC/PEAR-Crypt_HMAC-1.0.1-r2.ebuild
index 775b68da5bc9..4b3cd7392992 100644
--- a/dev-php/PEAR-Crypt_HMAC/PEAR-Crypt_HMAC-1.0.1-r2.ebuild
+++ b/dev-php/PEAR-Crypt_HMAC/PEAR-Crypt_HMAC-1.0.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,12 +14,12 @@ RESTRICT="!test? ( test )"
 DEPEND="test? ( dev-php/PEAR-PEAR )"
 PATCHES=( "${FILESDIR}/HMAC-1.0.1.patch" )
 
-src_test(){
+src_test() {
 	ln -s . Crypt || die
 	peardev run-tests tests || die
 }
 
-src_install(){
+src_install() {
 	insinto /usr/share/php/Crypt
 	doins HMAC.php
 	php-pear-r2_install_packagexml
diff --git a/dev-php/PEAR-File_Fortune/Manifest b/dev-php/PEAR-File_Fortune/Manifest
index 2db0d101face..7a693ad00fe3 100644
--- a/dev-php/PEAR-File_Fortune/Manifest
+++ b/dev-php/PEAR-File_Fortune/Manifest
@@ -1,3 +1,3 @@
 DIST File_Fortune-1.0.0.tgz 14508 BLAKE2B df783a063df6d48692518955f8f1a6306b0e67021c0d3cf6a336ce643a907a5f89578c759f44c9ea36debac28d3819065c2763d5ff8f6c6f63ecd0ea13a68e29 SHA512 4f996e7c6efb339944cdd1cea75400a7539708661b2783fc1126697a12692b3db7a104550da8007fae4e0ac374c2c047a4c90dfa0d2c3424b84f4e1b61ae43ac
-EBUILD PEAR-File_Fortune-1.0.0-r1.ebuild 445 BLAKE2B 8eb691e622c988c1a27ce1158e8045ef40f6288f1ba5ac05a59f48626c5c51ebd7b289b54cfc69a9a8e717de6a06abb2b8a19923d397e3d163c59d4ab7497a62 SHA512 43942d9eb252a418bd496b5d10d557d338364a00efcbe7eb506efc7a3ee41b3b79246a6c4bc23dcc41526df28ba91aa952485783353eb698b004f3809847a578
+EBUILD PEAR-File_Fortune-1.0.0-r1.ebuild 446 BLAKE2B 9317c0f87a5cbf01f34337e8105d5b133b026581312845f50befe4f65f91b833aeb2e3b723c4d11cf47e20b2d3fa4821936f0e58a37c70652d6fa2f7bef0265c SHA512 aaa6fba20c947dff0cefb3bc79b32236e46858009d26261eba57be3672d2e4f54eac1568b0480435fb31ee8b96479adc1f5eabe857026e1850b652225ae614ef
 MISC metadata.xml 235 BLAKE2B 5b10304feea18aae1822be7d29bcce06c8715193b14a3dd2c4d79eb75e2767670352e2ca11e06b9a10ec04b63020a18254cd167e6d6be9072f4a200ca5d11ec4 SHA512 0b3e95bbf68eddf74289dad50f8828cffce2d904ff6f9bd5468177de979677cac11da84d1e0302c52b72085915b9d1b3496107172e5726520d51dad1981daf64
diff --git a/dev-php/PEAR-File_Fortune/PEAR-File_Fortune-1.0.0-r1.ebuild b/dev-php/PEAR-File_Fortune/PEAR-File_Fortune-1.0.0-r1.ebuild
index a406d87b0d28..21dbe5d6c163 100644
--- a/dev-php/PEAR-File_Fortune/PEAR-File_Fortune-1.0.0-r1.ebuild
+++ b/dev-php/PEAR-File_Fortune/PEAR-File_Fortune-1.0.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,6 +16,6 @@ RESTRICT="!test? ( test )"
 RDEPEND=">=dev-lang/php-5.1.4:*"
 DEPEND="test? ( ${RDEPEND} dev-php/phpunit )"
 
-src_test(){
+src_test() {
 	phpunit tests || die
 }
diff --git a/dev-php/PEAR-HTML_Table/Manifest b/dev-php/PEAR-HTML_Table/Manifest
index dd282f1c2ada..ac7409933418 100644
--- a/dev-php/PEAR-HTML_Table/Manifest
+++ b/dev-php/PEAR-HTML_Table/Manifest
@@ -1,3 +1,3 @@
 DIST HTML_Table-1.8.4.tgz 16440 BLAKE2B 0dd3a9e7a184fbbab157e1372f753ed7b3b54e90753f7eb4564f0aaa61bc42183b82b2807d84c1214463e74dcf0c9c14a5f905f0c3eef1f772d70cb179416b9f SHA512 98091827a1cb29c5c13ad05081c2deb39d1c3caa84182837e36dd96371f518f1897b271e3c4682e085b2905df78ae202bbb4d7e9528d440ae6c37e801c326068
-EBUILD PEAR-HTML_Table-1.8.4-r1.ebuild 565 BLAKE2B ce15981934bdeb7dd972c484e8f49141db1213e677d5b7266cb29e5b9b3757673615f979384234f0096107f620f50917a6223abd930919c31226aa50491c9cce SHA512 af170bab1b440bf86e11b22ba35b8d235541f8162542e02818973831cc7818c18d92434505e8f2768a72beb67ca0c11a3beec73ec68526fe2a2471ccba6c928a
+EBUILD PEAR-HTML_Table-1.8.4-r1.ebuild 566 BLAKE2B 7f565d56a80adea7bdad45d55fdd84b329d049979eb7ec842773058190185172b5a33804d28febcdb40dad33c8deb9f501c3a7d08c303cd069b6f6a4ed917ce1 SHA512 292f7139cf4680ebbcc8a00d4984669dbc6e783c8c10e74225cb5d10694f4988467709bbbaf6f251ce133024897d769dacb9d4b34e25d56502a7a509aca2a87f
 MISC metadata.xml 235 BLAKE2B 5b10304feea18aae1822be7d29bcce06c8715193b14a3dd2c4d79eb75e2767670352e2ca11e06b9a10ec04b63020a18254cd167e6d6be9072f4a200ca5d11ec4 SHA512 0b3e95bbf68eddf74289dad50f8828cffce2d904ff6f9bd5468177de979677cac11da84d1e0302c52b72085915b9d1b3496107172e5726520d51dad1981daf64
diff --git a/dev-php/PEAR-HTML_Table/PEAR-HTML_Table-1.8.4-r1.ebuild b/dev-php/PEAR-HTML_Table/PEAR-HTML_Table-1.8.4-r1.ebuild
index 36d801fded87..8ce643ffa6c9 100644
--- a/dev-php/PEAR-HTML_Table/PEAR-HTML_Table-1.8.4-r1.ebuild
+++ b/dev-php/PEAR-HTML_Table/PEAR-HTML_Table-1.8.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,6 +18,6 @@ DEPEND="test? ( >=dev-php/PEAR-PEAR-1.5.0
 RDEPEND=">=dev-php/PEAR-HTML_Common-1.2.3"
 HTML_DOCS=( docs/Table_example1.php docs/Table_example2.php )
 
-src_test(){
+src_test() {
 	peardev run-tests -r || die
 }
diff --git a/dev-php/PEAR-MIME_Type/Manifest b/dev-php/PEAR-MIME_Type/Manifest
index 4535e0e869d6..bb0abaf32596 100644
--- a/dev-php/PEAR-MIME_Type/Manifest
+++ b/dev-php/PEAR-MIME_Type/Manifest
@@ -1,3 +1,3 @@
 DIST MIME_Type-1.4.1.tgz 21807 BLAKE2B 9f90e1dd4505ded94ee47b913814b21a7c9ab9bffabb330005ef5f04bcd9a7c89ecc5bbedbc65c60c63e4769fd0a50bbe0528b1622a25a86a4b7e1873f840f9d SHA512 f70507a44c0f81381baa0532a0f1337932cd69d054b96367b6ee98873fd85a51721f876b9aab679a18aff10b151ad1b447ff1c3f92288827e74e32b2627cdd01
-EBUILD PEAR-MIME_Type-1.4.1.ebuild 526 BLAKE2B 1fc9014adf77822d899f1332e5c80dcc4923d696af8234ea0d7016bb6c87a835454588f56a183088a9d83ebcd65916f13f96982b19e0f8ff7bdd5d16eef7ae53 SHA512 14b34d39ff146862aeb6dcf5cfe41b4b1650b0a8abe2b5abc4da4cc80879378f12529dd90f911fc1e2221a15c0640a3aed27d8d43cd9917d069950d23aa3ef50
+EBUILD PEAR-MIME_Type-1.4.1.ebuild 524 BLAKE2B 6b30fc67b83b07ad120d23aed9e69498305b504a262f3fd56d8d8cd47da27d78da9735e025686f81ee6908df385f0d98951542409c5d2051b75d0669dc388336 SHA512 c899ac3e784322e89f944e5d5603d7727f0caaa7cbcf9c300f5d220d0e53492227cba734e5b4c5b9e9a7a58615a38b6c3e4f51a5912475df39a686f4d405e901
 MISC metadata.xml 311 BLAKE2B ca0816a4957f3b5ddcb64ad8f5c9c00078a8a36c0f51b7ba40dfd2086c3de48a0fed47b7d35a0b12458a9c80d4c20db80e1c7d91c8b6a3a4e68d6d12ab8cd50e SHA512 a2528b21a2d20151b73bedba498db404cf49fad1dffd51bb74478e8ca97b3d5c07bb6a2e988c75a662bcd28af6c5a5e6b5184cf3e835787262b430b61d20049f
diff --git a/dev-php/PEAR-MIME_Type/PEAR-MIME_Type-1.4.1.ebuild b/dev-php/PEAR-MIME_Type/PEAR-MIME_Type-1.4.1.ebuild
index 2a73abfa1534..98f24243bb9a 100644
--- a/dev-php/PEAR-MIME_Type/PEAR-MIME_Type-1.4.1.ebuild
+++ b/dev-php/PEAR-MIME_Type/PEAR-MIME_Type-1.4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ RDEPEND=">=dev-lang/php-5.4:*
 	dev-php/PEAR-System_Command"
 S="${WORKDIR}/${P#PEAR-}"
 
-src_install(){
+src_install() {
 	insinto /usr/share/php
 	doins -r MIME
 }
diff --git a/dev-php/PHPMailer/Manifest b/dev-php/PHPMailer/Manifest
index 8f66e7109468..33784b97d0fb 100644
--- a/dev-php/PHPMailer/Manifest
+++ b/dev-php/PHPMailer/Manifest
@@ -3,9 +3,9 @@ DIST PHPMailer-6.0.7.tar.gz 91706 BLAKE2B 1d3d22dea463040840c1259cfbdbcf2da59cd3
 DIST PHPMailer-6.1.2.tar.gz 93635 BLAKE2B f8a12415a0e24697c84de06782f78a1cc37785ad0a1764dfd53470ca1ac5a8d4dffc418794b7627d2702b16f68ea83a93b362b7659a95e0c0a84e1a9b66b7b9b SHA512 3192f77f7d0158f30c7ea4484c86c279e0563e629702901f66901003c384101c57f7482feb14fc61927afaae8adea5d8fc34bd07c7058f68f6144303ce235fd5
 DIST PHPMailer-6.1.3.tar.gz 93690 BLAKE2B 08f653520a2b7819470cbb5cf1f43480cdcab51fe452f4831df47269f4223cfeb7016e41e8de75c11b15a04fa278fe08439f3c022af9088a5c8f5e4259ae7ebb SHA512 195155e49b29740422e75d7dbcf082cf8b26c87dad7b5473b9d55267e31af3847cb65a1c79f73225fa79080428d8c7516f5cd4d083824fa42f3b22a3bec8c34e
 DIST PHPMailer-6.1.4.tar.gz 93915 BLAKE2B 9f4ec584c57d70c4cbbc33c4ba85469579a00ebbf4aa4680b6f965ad37339b923386e371c01b673bca8c0de6f6ed123b6a1456541b1c472c6f0c93592c7c9e96 SHA512 f13cb959d89c64392ecff4cceaa650c80310f854aaff1c09144727aeb7f50c7ebeaaf7a2be488fa796b5acd1c42c4d13204b0410bc579d2e6aec98feee3b21ef
-EBUILD PHPMailer-5.2.27.ebuild 1959 BLAKE2B fdb6c9c625a9c71b8dd824c7861ffcc6f083c57498a2dc3077253ed420a8c58dd248fdb02f4b0becdc8183984ac247575505f3c44b03b067fcc4579c030e323e SHA512 ebe6ed844a2d20eaf3096e389cd3981aaf034dc13b360578745c6b798be11bcdff3f0ab540c2ea5fbadb1c0c6fab67ee46da63c4e1a51ff0bb60ce8773ce4c46
-EBUILD PHPMailer-6.0.7.ebuild 2216 BLAKE2B e666a411cae84eace13eba49ea2c9d02b2db1514efea96047c8ff455cf03b4a5e6fe2617527a71183d738677dbdb7d5739d9d3a2ca0a5106fe8c4aa295474413 SHA512 fb035831fd806686834ba2b707a6aa62bc846c218d8c6792e0826bc6a3d05a2be4a86fc140928df4a06afbb036a12c0b69f58baff6291e7c4d2fedd408403bca
-EBUILD PHPMailer-6.1.2.ebuild 2216 BLAKE2B e666a411cae84eace13eba49ea2c9d02b2db1514efea96047c8ff455cf03b4a5e6fe2617527a71183d738677dbdb7d5739d9d3a2ca0a5106fe8c4aa295474413 SHA512 fb035831fd806686834ba2b707a6aa62bc846c218d8c6792e0826bc6a3d05a2be4a86fc140928df4a06afbb036a12c0b69f58baff6291e7c4d2fedd408403bca
-EBUILD PHPMailer-6.1.3.ebuild 2216 BLAKE2B e666a411cae84eace13eba49ea2c9d02b2db1514efea96047c8ff455cf03b4a5e6fe2617527a71183d738677dbdb7d5739d9d3a2ca0a5106fe8c4aa295474413 SHA512 fb035831fd806686834ba2b707a6aa62bc846c218d8c6792e0826bc6a3d05a2be4a86fc140928df4a06afbb036a12c0b69f58baff6291e7c4d2fedd408403bca
-EBUILD PHPMailer-6.1.4.ebuild 2216 BLAKE2B e666a411cae84eace13eba49ea2c9d02b2db1514efea96047c8ff455cf03b4a5e6fe2617527a71183d738677dbdb7d5739d9d3a2ca0a5106fe8c4aa295474413 SHA512 fb035831fd806686834ba2b707a6aa62bc846c218d8c6792e0826bc6a3d05a2be4a86fc140928df4a06afbb036a12c0b69f58baff6291e7c4d2fedd408403bca
+EBUILD PHPMailer-5.2.27.ebuild 1962 BLAKE2B e5386bf9d75ae81df44fa8703e2183ff79b39054c14bf49a1b57774d148aa5d460c7f5310a98d447a114187844c0453e4017eb5cfb1f679e4910ad60b83cd6d7 SHA512 b6eab2bf9413f7af3083f92a0d8f3252a3773526711c724786df3b3c056472f6a0d7a0725ae58adc3860cff8c5ee9707a7198e0193a7fedf31c878408d385b85
+EBUILD PHPMailer-6.0.7.ebuild 2219 BLAKE2B 08a599591d6bee673c5df6b47d9c9aea0db8e7ba8d46d7568afbb3d72ee65d0e23215d5f77ac3ac04e70ca26a98847323b9a54dd4adef8f453efc90e89d52a3f SHA512 c69da2436be943fb96828db9268f73d34ac129b21521800f510ef79db257b090627f8bc5c384708f38bc9aec024116461b1a9bfce2dc9b0b7e20c23fc41dad27
+EBUILD PHPMailer-6.1.2.ebuild 2219 BLAKE2B 08a599591d6bee673c5df6b47d9c9aea0db8e7ba8d46d7568afbb3d72ee65d0e23215d5f77ac3ac04e70ca26a98847323b9a54dd4adef8f453efc90e89d52a3f SHA512 c69da2436be943fb96828db9268f73d34ac129b21521800f510ef79db257b090627f8bc5c384708f38bc9aec024116461b1a9bfce2dc9b0b7e20c23fc41dad27
+EBUILD PHPMailer-6.1.3.ebuild 2219 BLAKE2B 08a599591d6bee673c5df6b47d9c9aea0db8e7ba8d46d7568afbb3d72ee65d0e23215d5f77ac3ac04e70ca26a98847323b9a54dd4adef8f453efc90e89d52a3f SHA512 c69da2436be943fb96828db9268f73d34ac129b21521800f510ef79db257b090627f8bc5c384708f38bc9aec024116461b1a9bfce2dc9b0b7e20c23fc41dad27
+EBUILD PHPMailer-6.1.4.ebuild 2219 BLAKE2B 08a599591d6bee673c5df6b47d9c9aea0db8e7ba8d46d7568afbb3d72ee65d0e23215d5f77ac3ac04e70ca26a98847323b9a54dd4adef8f453efc90e89d52a3f SHA512 c69da2436be943fb96828db9268f73d34ac129b21521800f510ef79db257b090627f8bc5c384708f38bc9aec024116461b1a9bfce2dc9b0b7e20c23fc41dad27
 MISC metadata.xml 446 BLAKE2B 178ea98081e664641c7a8632a1c7dac9b5cac8992b0b945208f5ef654633340daced2473bbdc342b70d8b168ac2206ba132f7ab9601f61b5436f3eb3e0441ca1 SHA512 3dfce858cb0e00b526f04a5764a6173d4711db4f21f52b6d827b82f1cddea4e33f533e645dae95d0bb6a69699b00520a414f2e322c76b56aee1e4ea047bb4bb5
diff --git a/dev-php/PHPMailer/PHPMailer-5.2.27.ebuild b/dev-php/PHPMailer/PHPMailer-5.2.27.ebuild
index 00117b7fc6e4..160382537ad9 100644
--- a/dev-php/PHPMailer/PHPMailer-5.2.27.ebuild
+++ b/dev-php/PHPMailer/PHPMailer-5.2.27.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -33,7 +33,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	doc? ( dev-php/phpDocumentor )"
 
-src_compile(){
+src_compile() {
 	if use doc; then
 		phpdoc --filename="class.*.php" \
 			   --target="./html" \
@@ -46,7 +46,7 @@ src_compile(){
 	fi
 }
 
-src_install(){
+src_install() {
 	# To help out the Composer kids, most of the documentation and
 	# tests are missing from the release tarballs.
 	insinto "/usr/share/php/${PN}"
@@ -56,7 +56,7 @@ src_install(){
 	use doc && dodoc -r html/*
 }
 
-pkg_postinst(){
+pkg_postinst() {
 	elog "${PN} has been installed in /usr/share/php/${PN}/."
 	elog "To use it in a script, require('${PN}/${PN}Autoload.php'),"
 	elog "and then use the ${PN} class normally. Most of the examples in"
diff --git a/dev-php/PHPMailer/PHPMailer-6.0.7.ebuild b/dev-php/PHPMailer/PHPMailer-6.0.7.ebuild
index d753eb1c174f..e27c5fd93328 100644
--- a/dev-php/PHPMailer/PHPMailer-6.0.7.ebuild
+++ b/dev-php/PHPMailer/PHPMailer-6.0.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -42,7 +42,7 @@ src_prepare() {
 	eapply_user
 }
 
-src_compile(){
+src_compile() {
 	if use doc; then
 		phpdoc --filename="src/*.php" \
 			   --target="./html" \
@@ -55,7 +55,7 @@ src_compile(){
 	fi
 }
 
-src_install(){
+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}"
@@ -65,7 +65,7 @@ src_install(){
 	use doc && dodoc -r html/*
 }
 
-pkg_postinst(){
+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,"
diff --git a/dev-php/PHPMailer/PHPMailer-6.1.2.ebuild b/dev-php/PHPMailer/PHPMailer-6.1.2.ebuild
index d753eb1c174f..e27c5fd93328 100644
--- a/dev-php/PHPMailer/PHPMailer-6.1.2.ebuild
+++ b/dev-php/PHPMailer/PHPMailer-6.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -42,7 +42,7 @@ src_prepare() {
 	eapply_user
 }
 
-src_compile(){
+src_compile() {
 	if use doc; then
 		phpdoc --filename="src/*.php" \
 			   --target="./html" \
@@ -55,7 +55,7 @@ src_compile(){
 	fi
 }
 
-src_install(){
+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}"
@@ -65,7 +65,7 @@ src_install(){
 	use doc && dodoc -r html/*
 }
 
-pkg_postinst(){
+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,"
diff --git a/dev-php/PHPMailer/PHPMailer-6.1.3.ebuild b/dev-php/PHPMailer/PHPMailer-6.1.3.ebuild
index d753eb1c174f..e27c5fd93328 100644
--- a/dev-php/PHPMailer/PHPMailer-6.1.3.ebuild
+++ b/dev-php/PHPMailer/PHPMailer-6.1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -42,7 +42,7 @@ src_prepare() {
 	eapply_user
 }
 
-src_compile(){
+src_compile() {
 	if use doc; then
 		phpdoc --filename="src/*.php" \
 			   --target="./html" \
@@ -55,7 +55,7 @@ src_compile(){
 	fi
 }
 
-src_install(){
+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}"
@@ -65,7 +65,7 @@ src_install(){
 	use doc && dodoc -r html/*
 }
 
-pkg_postinst(){
+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,"
diff --git a/dev-php/PHPMailer/PHPMailer-6.1.4.ebuild b/dev-php/PHPMailer/PHPMailer-6.1.4.ebuild
index d753eb1c174f..e27c5fd93328 100644
--- a/dev-php/PHPMailer/PHPMailer-6.1.4.ebuild
+++ b/dev-php/PHPMailer/PHPMailer-6.1.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -42,7 +42,7 @@ src_prepare() {
 	eapply_user
 }
 
-src_compile(){
+src_compile() {
 	if use doc; then
 		phpdoc --filename="src/*.php" \
 			   --target="./html" \
@@ -55,7 +55,7 @@ src_compile(){
 	fi
 }
 
-src_install(){
+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}"
@@ -65,7 +65,7 @@ src_install(){
 	use doc && dodoc -r html/*
 }
 
-pkg_postinst(){
+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,"
diff --git a/dev-php/fedora-autoloader/Manifest b/dev-php/fedora-autoloader/Manifest
index afa248bb66b3..9d9cc004e027 100644
--- a/dev-php/fedora-autoloader/Manifest
+++ b/dev-php/fedora-autoloader/Manifest
@@ -1,5 +1,7 @@
 DIST fedora-autoloader-0.2.1.tar.gz 7634 BLAKE2B e2827ac332a7b50f94383a11b33f25625d67984491fc46dce6ad01d6e4b986c489062464d09ff5ed32f29c2d623ff9d59579fc007eceb1279f660695feea72a0 SHA512 81501dbc0668c1cc6d6fb030e0d9ee91d31db8fa32b3348a0215dbf20a3ef1d41bc398124e1d7f0c1d5ffa8fce8c33e60a3182eaba6ba740d78b4a7f6db2aea8
 DIST fedora-autoloader-1.0.0.tar.gz 8504 BLAKE2B ada69f3f3126b2c233b0ab933e52468d8303dbaacfc27364f490ce7b093043f92913ecc55180b460828573f0f204f5e7f4d10b3149ef6f5b3cee1d645fa6ac58 SHA512 a8e3330d961a9415a817d41ad9feb91018aa398607a2adce1f8386d491581773226f6819ac3d90827344898fbbdb32c0881af3f122efdad021f7ce70a07cc66e
+DIST fedora-autoloader-1.0.1.tar.gz 8743 BLAKE2B 4ba6ed275812036f171138e05f5aa56611c6430bc5e440dac5ee45ad975f2300c70c0b964c8c5e0681028829738ad1e4abd69b14e83e10e5215ea9ec7f2d705f SHA512 dd27348e23b69f03e64c2608ae9fd8caf54baa60327c944f46ab5f4cc762677baacc21ba0ea97cad5d97e9f168b1b3731e0ab2bb48df394c07aaa61fd9d66de6
 EBUILD fedora-autoloader-0.2.1.ebuild 723 BLAKE2B d487b5974089f9241b28d5cdd21b641595c574484657ecb8cd396cf4f44d0788d25533450ddafb24059b163881db45450bd3ae517bea7a6eb1d3b2be03dac2e4 SHA512 878bc7c8a11980bcdf6ee5fcc91d4971a2836f2eccd040992a5bd0cd5118bc02d0567cf1a801268785663c9736c36b102ffaf75a3dcf725ffb117824644324b1
 EBUILD fedora-autoloader-1.0.0.ebuild 725 BLAKE2B 1d62af67d44179653f28bcd252646afe844da36d4674c52de3d00bc73a3ede9b03c16e2c820bef3eb2d5b9212689ae31474490603c4b7945b4b828b973be0943 SHA512 badd2cd94a6c51e7723932736ac8d66f251b5bd68d3c2f88c1aa803583bccc9d0bb1aa852d6529c353f89834f2bfb41623de2ea35ef0a1d96108452152c44c4d
+EBUILD fedora-autoloader-1.0.1.ebuild 722 BLAKE2B 07dbd3c143b6a4359a134c8aab077bbddfe19b1891c157d76166263ede9bb427e4f3624202c1b840a79527d5f32f3c4229a7237383387c103048d534808cf183 SHA512 a060a49210d28886218da94f326d81c7b6b501dcda80b6b1faf768a907d89acb52d99ba341ae544d4a72d25765b5acd214835d802b9f01fae522a23d2626fe99
 MISC metadata.xml 710 BLAKE2B 8ce6437cfec2d52048b7107c177bc025ea7770ac3aea2c86782f9b61ad6ba05b9c3df2f377ef97291356f97822721bda247047577383374252170f5835ee7f10 SHA512 f12b4505ad34c9171cb4547793c17406e4bee91f6b97efc39825d981d426fd729304ee72ac51471e8b4fea8cf6d194bc32990bec2206d661e510847729fc3819
diff --git a/dev-php/fedora-autoloader/fedora-autoloader-1.0.1.ebuild b/dev-php/fedora-autoloader/fedora-autoloader-1.0.1.ebuild
new file mode 100644
index 000000000000..81eea1238509
--- /dev/null
+++ b/dev-php/fedora-autoloader/fedora-autoloader-1.0.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Fedora's Static PSR-4, PSR-0, and classmap autoloader"
+HOMEPAGE="https://github.com/php-fedora/autoloader"
+SRC_URI="https://github.com/php-fedora/autoloader/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+
+IUSE="test"
+
+RESTRICT="test"
+
+RDEPEND="dev-lang/php:*"
+DEPEND="
+	test? (
+		${RDEPEND}
+		dev-php/phpunit )"
+
+S="${WORKDIR}/autoloader-${PV}"
+
+src_install() {
+	insinto "/usr/share/php/Fedora/Autoloader"
+	doins -r src/.
+	dodoc CHANGELOG.md README.md
+}
+
+src_test() {
+	phpunit || die "test suite failed"
+}
diff --git a/dev-php/maxmind-db-reader/Manifest b/dev-php/maxmind-db-reader/Manifest
index 515b522793ae..a64477068a59 100644
--- a/dev-php/maxmind-db-reader/Manifest
+++ b/dev-php/maxmind-db-reader/Manifest
@@ -1,3 +1,5 @@
 DIST MaxMind-DB-Reader-php-1.4.1.tar.gz 19667 BLAKE2B b397eb1bb7fa00c3382c7ee7c019c401d390c88d9bccd7742873445e95cb87d780ac17affe5cd1ec98e6f60d16660784dc5fdb188f8e4d2956df816397a9c251 SHA512 2407f3d1af10830078c9f5ba93ee74761084b06e630242eff0f707b98bdb78e6e87dabc999c36b29780ba9c8c38aec0225700005b66d95b3707bdc06875c6dd5
-EBUILD maxmind-db-reader-1.4.1.ebuild 2223 BLAKE2B 28e63ed1f512b6b6d4c7cd94d7721dae79c08456b1cc7f76439eec11fc8869cec49b3f73638ee8a2ba38550bd376ca2a4debc58e62c0225da3710aa87fff4fa8 SHA512 d09325c99d561ad81f6b041dfad5584f8dbb45945c7d331b52f4507af784594098799669a01227a4961578b4c41a6d67cd5806214a60612d80b845c4ee37f6d7
+DIST MaxMind-DB-Reader-php-1.6.0.tar.gz 20898 BLAKE2B cf6922bbd5b2c76fcb9b7a97299f0a73232686bf8facce39355f8a4cc55e98a4d8e64a51eae8427b5f14d6905d4cd85956effa5299cc493bd63708cf52ab30d0 SHA512 e8c0ccf2cfcedf7527b4e3f858d2ed0e70add60692fff4a65f08e5cb885516b7c2a3ceaa3c21713369cd8ffca2b671d764063236de1d729cfc5173f7d5dd4607
+EBUILD maxmind-db-reader-1.4.1.ebuild 2225 BLAKE2B 3281f8568667326e0c8a1c87e63a0f637fd275c4eeea540982d9c1a5f9a0095ce1eb55889deb6ae643d4b2e3bc5a997b59ba7108e1d2b86065ac8c9b5cb5fc51 SHA512 340b443f5205ec325f72fe24d8e8eb77869c2f890967ae6f1f7036a402dd10b6b2620ab1f11a46fff7dba9cc919d8b27298fc27d81bbce59bfd9aacce80cfb18
+EBUILD maxmind-db-reader-1.6.0.ebuild 2218 BLAKE2B dca404bcaa496d72cce3bd8055728bdf5f69a6028dd9afeb3c358affa5636a745e36afa42a2eb505c96781bbc0d00535c4df197b4deffb899161a03b76fcd131 SHA512 8243d5a307ac4d3be45dc60c064a9285fbeafb74b847f75152863d9c97393f41b3268c7eec89725beae525435abfaa94a540a3ec04272b92136698050e4b7b54
 MISC metadata.xml 585 BLAKE2B 0b6a50c15e2fe822a2a3cb52b7fec01677d4fd8601f9b3d0fbdaffedb951edda038d721bf4fb10ed49c3e87823115069be53495630ed2472c982084256c9d1eb SHA512 ec754283b76dde98c10ae1bbd0c11e24e53162d4829e3d32ca9c32b9dbfdef4df0494ba2fccdc0ba1c05c9aa58086c5064124daff69db00372915c530089b2e9
diff --git a/dev-php/maxmind-db-reader/maxmind-db-reader-1.4.1.ebuild b/dev-php/maxmind-db-reader/maxmind-db-reader-1.4.1.ebuild
index 7ecc93acbd4e..ebefd8c16abb 100644
--- a/dev-php/maxmind-db-reader/maxmind-db-reader-1.4.1.ebuild
+++ b/dev-php/maxmind-db-reader/maxmind-db-reader-1.4.1.ebuild
@@ -27,7 +27,7 @@ RESTRICT="!test? ( test )"
 DEPEND="extension? ( dev-libs/libmaxminddb )"
 RDEPEND="${DEPEND}"
 
-src_prepare(){
+src_prepare() {
 	# We need to call eapply_user ourselves, because it may be skipped
 	# if either the "extension" USE flag is not set, or if the user's
 	# PHP_TARGETS is essentially empty. In the latter case, the eclass
@@ -70,7 +70,7 @@ src_test() {
 	use extension && php-ext-source-r3_src_test
 }
 
-pkg_postinst(){
+pkg_postinst() {
 	elog "${PN} has been installed in /usr/share/php/MaxMind/Db/."
 	elog "To use it in a script, require('MaxMind/Db/autoload.php'),"
 	elog "and then most of the examples in the documentation should"
diff --git a/dev-php/maxmind-db-reader/maxmind-db-reader-1.6.0.ebuild b/dev-php/maxmind-db-reader/maxmind-db-reader-1.6.0.ebuild
new file mode 100644
index 000000000000..aaa418f47bf0
--- /dev/null
+++ b/dev-php/maxmind-db-reader/maxmind-db-reader-1.6.0.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+MY_PN="MaxMind-DB-Reader-php"
+MY_P="${MY_PN}-${PV}"
+S="${WORKDIR}/${MY_P}"
+PHP_EXT_S="${S}/ext"
+PHP_EXT_NAME="maxminddb"
+PHP_EXT_OPTIONAL_USE="extension"
+
+USE_PHP="php7-2 php7-3 php7-4"
+
+inherit php-ext-source-r3
+
+DESCRIPTION="PHP reader for the MaxMind database format"
+HOMEPAGE="https://github.com/maxmind/MaxMind-DB-Reader-php"
+SRC_URI="https://github.com/maxmind/${MY_PN}/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="extension test"
+RESTRICT="!test? ( test )"
+
+DEPEND="extension? ( dev-libs/libmaxminddb )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	# We need to call eapply_user ourselves, because it may be skipped
+	# if either the "extension" USE flag is not set, or if the user's
+	# PHP_TARGETS is essentially empty. In the latter case, the eclass
+	# src_prepare does nothing. We only call the eclass phase conditionally
+	# because the correct version of e.g. "phpize" may not be there
+	# unless USE=extension is set.
+	if use extension ; then
+		php-ext-source-r3_src_prepare
+	else
+		default
+	fi
+}
+
+src_configure() {
+	# The eclass phase will try to run the ./configure script even if it
+	# doesn't exist (in contrast to the default src_configure), so we
+	# need to skip it if the eclass src_prepare (that creates said
+	# script) is not run.
+	use extension && php-ext-source-r3_src_configure
+}
+
+src_compile() {
+	# Avoids the same problem as in src_configure.
+	use extension && php-ext-source-r3_src_compile
+}
+
+src_install() {
+	dodoc CHANGELOG.md README.md
+	insinto /usr/share/php
+	doins -r src/MaxMind
+	insinto /usr/share/php/MaxMind/Db
+	doins autoload.php
+
+	use extension && php-ext-source-r3_src_install
+}
+
+src_test() {
+	# The PHP API has its own set of tests that isn't shipped with the
+	# release tarballs at the moment (github issues 55).
+	use extension && php-ext-source-r3_src_test
+}
+
+pkg_postinst() {
+	elog "${PN} has been installed in /usr/share/php/MaxMind/Db/."
+	elog "To use it in a script, require('MaxMind/Db/autoload.php'),"
+	elog "and then most of the examples in the documentation should"
+	elog "work without further modification."
+}
diff --git a/dev-php/pecl-memcached/Manifest b/dev-php/pecl-memcached/Manifest
index 4f750ef011d4..67057c7c0233 100644
--- a/dev-php/pecl-memcached/Manifest
+++ b/dev-php/pecl-memcached/Manifest
@@ -1,5 +1,5 @@
 DIST memcached-3.1.3.tgz 82673 BLAKE2B ccb9267cbd974337b7cd8836ab6e35c4fd9398d731dcd333bcb664b91037d1775651e6bb5d00b602767834681289064ede678ea2e6e3641631bba4990a380dee SHA512 9c09648c26011c5e749bee1a556c976e6e5e648dc65580e7caa296dab79e3764edf1408f96edcaca5efb0229320c86fcfa0422e55d486beb6466892f7e08c4a3
 DIST memcached-3.1.5.tgz 83015 BLAKE2B 80f5cbed8e34f867962792d95d242015690f64ab3b462e09813a11b8b86234b0b05b0f6a78f7c6184482b66ba8015064b37f77bbb816a3aee2edd0ce97ab0cbc SHA512 87d5fd079fcaad81139785d6766da71b23a1a0fe907d4b22f3a787af148a20412c11df11c4d98c165241658baf0d87c8a6b29de15db07a0f9d1fabc8aec8f0e9
-EBUILD pecl-memcached-3.1.3-r1.ebuild 2177 BLAKE2B c97f416693f9b03e70a291c3d0be4b56d64243ee81ae4c6ccf5c639561cb3757d758b09e0314aaa89dd739137b3eeff687744b1e4eab78b788a243162c7fb681 SHA512 04f8cf54a3891c1c64373e928fe89f1be719079ce25791a294ab165202a169e89763b23652cb9d9f1d545c8c39b87e9564c797b9b38219657f83e1848ca6a6c7
+EBUILD pecl-memcached-3.1.3-r1.ebuild 2179 BLAKE2B ec037ba55dd9cf0a41779d04c7d1b9e3f4c48c8fc9ff9c62db32c8128c1231891da49fcb9c5b190105e04b76b51e26e4979ee97be4a99de63494d404058b5e95 SHA512 fdabf00ea90160f615698325a74d9abfd5cd6f476f910d20c06ff4fe0b3ef8fe0e01b915615ec764e05fc565cf4cfbe3b940c496511d5d800740f34ab2002cbf
 EBUILD pecl-memcached-3.1.5-r1.ebuild 1586 BLAKE2B f676fe674e5e61de6c34cbb8ce78d1be5b3015886653a9145a41de71934aeff6d1d65c39047ebdf213095230c26d549b5a953f02ed856d944ecacb46d2c36a61 SHA512 f81ac04354d6d5330ecb78cdbbca475b22c81652b509c42042ae63d2681e2d7a2f631517f589475c3f652e359b540ffa06476d7fbd314cef26152aa1482b837b
 MISC metadata.xml 568 BLAKE2B f99b2eb530ffd87100256bb477bfbd50e48b28283bc01147b0cb1e3dd7dbfb940cd8e16e24c68723fe764df0cbdb1ecb0b995e151c67a37673a19a2cfeb1bcfa SHA512 9fb2c3ea2dba6b4b1cdda8acc02afa006a95651b4fdb5011b15e4046bc44742cc5306d20db070f4f1977352873576040a34ed24a660ec2c640e118115359f2c6
diff --git a/dev-php/pecl-memcached/pecl-memcached-3.1.3-r1.ebuild b/dev-php/pecl-memcached/pecl-memcached-3.1.3-r1.ebuild
index 413bcd4c7154..755ce7ed1adf 100644
--- a/dev-php/pecl-memcached/pecl-memcached-3.1.3-r1.ebuild
+++ b/dev-php/pecl-memcached/pecl-memcached-3.1.3-r1.ebuild
@@ -36,7 +36,7 @@ RDEPEND="
 DEPEND="${RDEPEND} test? ( net-misc/memcached )"
 RDEPEND="${RDEPEND} php_targets_php5-6? ( dev-php/pecl-memcached:0[php_targets_php5-6(-)] )"
 
-src_prepare(){
+src_prepare() {
 	if use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3 ; then
 		php-ext-source-r3_src_prepare
 	else
@@ -69,7 +69,7 @@ src_test() {
 	fi
 }
 
-src_install(){
+src_install() {
 	if use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3 ; then
 		php-ext-source-r3_src_install
 	fi
diff --git a/dev-php/pecl-redis/Manifest b/dev-php/pecl-redis/Manifest
index 467896a0bf18..2dbfc5c4e1ba 100644
--- a/dev-php/pecl-redis/Manifest
+++ b/dev-php/pecl-redis/Manifest
@@ -3,9 +3,9 @@ DIST redis-4.2.0.tgz 235569 BLAKE2B 14089171b9654affeb8c2b3861a698a3ba8d6ac23523
 DIST redis-4.3.0.tgz 241883 BLAKE2B 3f3ef7f67ba1167cb031e6816ee9f90d24eecc002064720e68a65bf8db16b0f826c90a5f3b7bed771f535aca8cbc9b62654fa2c234a42af8168baf0315a25c17 SHA512 30ce5863540485463704e6f90cff3a8d1f5bda34360c987e848ab290c8240f323b6eb2df1e90cc4c0922b3413652132d937488943f5db4e242c460c592da54ca
 DIST redis-5.0.2.tgz 243270 BLAKE2B 5c01dc23d5c86f407bddd6a54455f37427a5cae3786e393afc34fae23771062cae9cbe1b55a3c0578b5ecc1ada97328f63fe10e8e91af8fcd0f4b275850f0b50 SHA512 ea5601a520a95443abf5b2f17516ffe047ce50df721519a82b68124b9a406d52628697b486e37cd1ea2798a5ddce82549a516835a9d348925adedbdf5ef2d2b0
 DIST redis-5.1.1.tgz 245205 BLAKE2B b7177be5282b081562a446b1b37c7b46ba0ef382e55f27989d5586346a10f842d050ee46e881e480ea6b768e1259458df565d02193eda13a95704cd5455c1ca2 SHA512 eb6aa538d2ae4115634fd5841e3ccccf788cad13b99e0485fb2af43def85e93328012e5cef66d1be4bdd494be6f68de329a066e41b710e434f94f3ed3401bfee
-EBUILD pecl-redis-3.1.6-r1.ebuild 1504 BLAKE2B 39cd4e0402cde5507b4de802e6ec1a9855f293ea1710f1987690c9c4dca507c72045b87b423c89950e76facff3699ec782df904904c4f361f304f9a3f0095f2f SHA512 6588808380496dbf7f46e85483393a1c2fbe10720959a113cdf19e527a43e72e11fa948a168d965d3dbd1c1d3809051246d2a1ed504fb0958a728b20191b2ec1
-EBUILD pecl-redis-4.2.0.ebuild 1747 BLAKE2B d785de1e3b9e85782a7af70a6ee3382ce8531a54d27577abd8f06c8d6e5ede63469445ab63b6a2024abbc83dde9b0f3575e7dcf4fe0fcb3f31d542f706d3e4f7 SHA512 569786473550db55ea8f4361f15441f009d6b120a97a76a17006b644f49dfe0889c0e6e586d831bd62de6935fa18ebec78c3232da03a19254a23c68b7a7dc024
-EBUILD pecl-redis-4.3.0.ebuild 1638 BLAKE2B 91c61e08270fbd775be92db55362cc4e3938ab1119ff65f5b38c4d73a7c39deba7a19673ec611baf1a0b425205fce4a04d04e4478d96c063959b36789487cecd SHA512 e00b2cef43e844256e4fb7de433b3f545d8c184a8e2eeb3cefc1bda672d56b2df17c6762ad3960ee0ee8bd44f735b498a10e83af2118dbe544f30474dc1cf409
-EBUILD pecl-redis-5.0.2.ebuild 1288 BLAKE2B afc0a2af14d7e07646feaadca86f8ce030509bae35932d39c7dd396ad59e08198adfd86c3dddea6dcbe9045987238479f6f20f941c828cc1a0893c0803f67a8b SHA512 672cac0af28c9daf4c1acc2602690a1f65862825bd15cb9731e6691cf05763b5cd16a520e35165d1b7215fc5c7276605d5f9cdcec030846b00e493308450fb5b
-EBUILD pecl-redis-5.1.1.ebuild 1288 BLAKE2B afc0a2af14d7e07646feaadca86f8ce030509bae35932d39c7dd396ad59e08198adfd86c3dddea6dcbe9045987238479f6f20f941c828cc1a0893c0803f67a8b SHA512 672cac0af28c9daf4c1acc2602690a1f65862825bd15cb9731e6691cf05763b5cd16a520e35165d1b7215fc5c7276605d5f9cdcec030846b00e493308450fb5b
+EBUILD pecl-redis-3.1.6-r1.ebuild 1502 BLAKE2B d9560e8026436626eb730d8bdf8e74847d47aeba0fc4b22e81b1d5647ba1b80bab258d2e3d963bb6903a02de2f49e1d37ea9b3619cade7802d1e914bc9cd515c SHA512 663cf82f078677db0e59843f6c71b706145f67123e65454f16e8ccace80e762445ed877d2c33163daf834fecc9c5cca912863aba52637ded68d0b3a7414a25f8
+EBUILD pecl-redis-4.2.0.ebuild 1748 BLAKE2B 096523340747ea170d8e91350093de309b4b578fbca901f309258f5ba04e921d3b8c2d7ab2384504e5c6c47aa3e271a9cb5237498e1f6b3760aa3bfacff7212c SHA512 ff386f1d8483ccd28aa06e553271c3adfaf09f96e961171441c6a9756c01908451d8ce1bd317b43af89bc0450746fbaf10eb67cc8183a2e1575e1ff845f7c593
+EBUILD pecl-redis-4.3.0.ebuild 1639 BLAKE2B 6d826f43adc0f6d8eb33b138586f522f02be28ba3f454009e0a85ba401b0dedfc1d92b882a573b6edfd9f0004c2e17faa5ac4406865660eccfde5adc0e3263c9 SHA512 7f18e631bb8b9db06806bb22825ae7e9120c84b73fe68980cbe5f1c479de0f6c0149316447f3234e0953789aabeec5ef00cc1bd7f710be5d0631f0070f28a13e
+EBUILD pecl-redis-5.0.2.ebuild 1289 BLAKE2B e2d46465d021c42039ccf1a630ce734b8e56fa777ab2139db35b3a91ecb6b45a1a06294bb24ab2bc874aaf959aa5387704baf0c22f7f8100a8f4ee05abd23d00 SHA512 f88f09308838ce1b9ad0cd582935833c1a968ab87517db8a0027e607f2ec658ba75558bdd9f2a0b7b7a7ff2fbb9eb3e3252c64ebeb8f6d1483655a3b221c4d51
+EBUILD pecl-redis-5.1.1.ebuild 1289 BLAKE2B e2d46465d021c42039ccf1a630ce734b8e56fa777ab2139db35b3a91ecb6b45a1a06294bb24ab2bc874aaf959aa5387704baf0c22f7f8100a8f4ee05abd23d00 SHA512 f88f09308838ce1b9ad0cd582935833c1a968ab87517db8a0027e607f2ec658ba75558bdd9f2a0b7b7a7ff2fbb9eb3e3252c64ebeb8f6d1483655a3b221c4d51
 MISC metadata.xml 383 BLAKE2B b7a47896565db2f132479963a5479262864421a8388bd262ba9aa8eb6445e0d351478530475b5dba12cc9cbbc33089a904f9945816d3009c75f09dcea9c4cfdc SHA512 da5c3918a6652f1f3ae58a5bcd2c5eb3308d764df1a14bae1658f5f2022ee364b6cd288c4a3c700cf27b70b2f967f66668c17ea9850fc48910005310d16125b0
diff --git a/dev-php/pecl-redis/pecl-redis-3.1.6-r1.ebuild b/dev-php/pecl-redis/pecl-redis-3.1.6-r1.ebuild
index 6c219bc92938..bbcdfa102de4 100644
--- a/dev-php/pecl-redis/pecl-redis-3.1.6-r1.ebuild
+++ b/dev-php/pecl-redis/pecl-redis-3.1.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -40,7 +40,7 @@ src_configure() {
 	php-ext-source-r3_src_configure
 }
 
-src_test(){
+src_test() {
 	local slot
 	for slot in $(php_get_slots); do
 		php_init_slot_env "${slot}"
diff --git a/dev-php/pecl-redis/pecl-redis-4.2.0.ebuild b/dev-php/pecl-redis/pecl-redis-4.2.0.ebuild
index f92d9dd8a0a7..8dbca16cb71f 100644
--- a/dev-php/pecl-redis/pecl-redis-4.2.0.ebuild
+++ b/dev-php/pecl-redis/pecl-redis-4.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -41,7 +41,7 @@ src_configure() {
 	php-ext-source-r3_src_configure
 }
 
-src_test(){
+src_test() {
 	local slot
 	for slot in $(php_get_slots); do
 		php_init_slot_env "${slot}"
diff --git a/dev-php/pecl-redis/pecl-redis-4.3.0.ebuild b/dev-php/pecl-redis/pecl-redis-4.3.0.ebuild
index d3b1f62b953a..1dfd74d7f0b4 100644
--- a/dev-php/pecl-redis/pecl-redis-4.3.0.ebuild
+++ b/dev-php/pecl-redis/pecl-redis-4.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -40,7 +40,7 @@ src_configure() {
 	php-ext-source-r3_src_configure
 }
 
-src_test(){
+src_test() {
 	local slot
 	for slot in $(php_get_slots); do
 		php_init_slot_env "${slot}"
diff --git a/dev-php/pecl-redis/pecl-redis-5.0.2.ebuild b/dev-php/pecl-redis/pecl-redis-5.0.2.ebuild
index 77a59f7f0899..55f32f3d4289 100644
--- a/dev-php/pecl-redis/pecl-redis-5.0.2.ebuild
+++ b/dev-php/pecl-redis/pecl-redis-5.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -39,7 +39,7 @@ src_configure() {
 	php-ext-source-r3_src_configure
 }
 
-src_test(){
+src_test() {
 	local slot
 	for slot in $(php_get_slots); do
 		php_init_slot_env "${slot}"
diff --git a/dev-php/pecl-redis/pecl-redis-5.1.1.ebuild b/dev-php/pecl-redis/pecl-redis-5.1.1.ebuild
index 77a59f7f0899..55f32f3d4289 100644
--- a/dev-php/pecl-redis/pecl-redis-5.1.1.ebuild
+++ b/dev-php/pecl-redis/pecl-redis-5.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -39,7 +39,7 @@ src_configure() {
 	php-ext-source-r3_src_configure
 }
 
-src_test(){
+src_test() {
 	local slot
 	for slot in $(php_get_slots); do
 		php_init_slot_env "${slot}"
diff --git a/dev-php/pecl-stomp/Manifest b/dev-php/pecl-stomp/Manifest
index 1afd91e7d058..c75e17bbe711 100644
--- a/dev-php/pecl-stomp/Manifest
+++ b/dev-php/pecl-stomp/Manifest
@@ -1,3 +1,3 @@
 DIST stomp-2.0.2.tgz 23609 BLAKE2B b6ed89b5b8fd0bb501b2337e87107797eedc6ac53c81ba86d2e755cfa2dd716bf4e409cee623430791e0b4854833ef44ed7f6f9e1d89fcd2250d598af0dcaea6 SHA512 577a781b45ef394cd833fb69c808da9b8a8ff69b31b1093c5eef3f7b5d1b37cd0b45c32a03883f56f86213e32bb18aaf0a80010c6bec7efa7239ea48bc57b4b4
-EBUILD pecl-stomp-2.0.2.ebuild 1258 BLAKE2B f6fbfb7f5ef066b69880e44714c575bbf05740b7e9442f37b8e95729cb7d1a50fd47df7197ed89c5c9f348a89a4737ce9d7be9f7c5b5af1fbf8898d6f3c0c846 SHA512 867ff41dff254251b76f892f3d3826fe5301a2fe3e06fe1f9da38eb915379891168d6a6692fef26dad47aeafd18283f36e0160f6d2905a5e4d7c483b59e9c4af
+EBUILD pecl-stomp-2.0.2-r1.ebuild 616 BLAKE2B 97c500a0868257e0c688871f8c5a08973cb2390ebd49b3de2a9e2d91bae5e9417cf6914a62a07d863ffe69d9cabb600fd8f4dadc4dc37fee2be16e3a817486c0 SHA512 9a985bcad1c6c7fbacf128810330d52afeb3d7e235234606a579596d7a14fbc738c2127578c729d2ba1e4f245f881efed1b346e961e2c4a2258bc54624ca647b
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/pecl-stomp/pecl-stomp-2.0.2-r1.ebuild b/dev-php/pecl-stomp/pecl-stomp-2.0.2-r1.ebuild
new file mode 100644
index 000000000000..bc5c1a2e4ad0
--- /dev/null
+++ b/dev-php/pecl-stomp/pecl-stomp-2.0.2-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_PHP="php7-2 php7-3 php7-4"
+PHP_EXT_NAME="stomp"
+PHP_EXT_NEEDED_USE="ssl(-)?"
+DOCS=( CREDITS doc/classes.php doc/functions.php )
+
+inherit php-ext-pecl-r3
+
+KEYWORDS="~amd64 ~x86"
+
+DESCRIPTION="PHP extension to communicate with Stomp message brokers"
+LICENSE="PHP-3.01"
+SLOT="7"
+IUSE="examples ssl test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="virtual/pkgconfig"
+
+src_configure() {
+	local PHP_EXT_ECONF_ARGS=(
+		--enable-stomp
+		--with-openssl-dir=$(usex ssl yes no)
+	)
+	php-ext-source-r3_src_configure
+}
diff --git a/dev-php/pecl-stomp/pecl-stomp-2.0.2.ebuild b/dev-php/pecl-stomp/pecl-stomp-2.0.2.ebuild
deleted file mode 100644
index b4813f56c437..000000000000
--- a/dev-php/pecl-stomp/pecl-stomp-2.0.2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_PHP="php5-6 php7-1 php7-2 php7-3"
-PHP_EXT_NAME="stomp"
-DOCS=( CREDITS doc/classes.php doc/functions.php )
-
-inherit php-ext-pecl-r3
-
-USE_PHP="php7-1 php7-2 php7-3"
-
-KEYWORDS="~amd64 ~x86"
-
-DESCRIPTION="PHP extension to communicate with Stomp message brokers"
-LICENSE="PHP-3.01"
-SLOT="7"
-IUSE="examples ssl test"
-RESTRICT="!test? ( test )"
-
-DEPEND="${DEPEND}
-	php_targets_php7-1? ( dev-lang/php:7.1[ssl?] )
-	php_targets_php7-2? ( dev-lang/php:7.2[ssl?] )
-	php_targets_php7-3? ( dev-lang/php:7.3[ssl?] )
-"
-
-RDEPEND="${DEPEND}
-	php_targets_php5-6? ( dev-php/pecl-stomp:0 )"
-
-DEPEND="virtual/pkgconfig ${DEPEND}"
-
-src_prepare() {
-	if use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3 ; then
-		php-ext-source-r3_src_prepare
-	else
-		default
-	fi
-}
-
-src_configure() {
-	if use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3 ; then
-		local PHP_EXT_ECONF_ARGS=(
-			--enable-stomp
-			--with-openssl-dir=$(usex ssl yes no)
-		)
-		php-ext-source-r3_src_configure
-	fi
-}
-
-src_install() {
-	if use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3 ; then
-		php-ext-pecl-r3_src_install
-	fi
-}
diff --git a/dev-php/recaptcha/Manifest b/dev-php/recaptcha/Manifest
index 78aa10a123a7..3895dd24a8c5 100644
--- a/dev-php/recaptcha/Manifest
+++ b/dev-php/recaptcha/Manifest
@@ -1,3 +1,3 @@
 DIST recaptcha-1.2.1.tar.gz 19935 BLAKE2B 43077b25d484940951bf070fa440b5d13c6992c2a157e06b81961b9692683a277d9507e44102dd0ba0cde66c892fd4736ed34cae4b001bdce0d4ab619828b432 SHA512 62df22a6f4b05006a6051db689994e455ada43f76406dd62c5c13f1d90ae64401e9d75c6a92f2c620a14c070d2b49199c20e70eb6284e42e676d37412a98abe4
-EBUILD recaptcha-1.2.1.ebuild 955 BLAKE2B b2e694b6da4a55ec8155a4c3c176ef5e0807c167b545d346e5ca70e324cd5d18587155a741aab27f2b87f42060fef0f8f0d58b3ad54bb891c6ab4b8533679b3b SHA512 d44bb3f7443a100a6c27d1f41ee089d14110adcd3e31d85612d3bfec44a7115f82ae9ff8016ce1386277eae11fde54acce667a5ab9d8baf6078b0dc7644943b0
+EBUILD recaptcha-1.2.1.ebuild 958 BLAKE2B b2e88432bd9ddc208ef45f8f89e8e95794d586dd097aa8c7b9f8fa3325fcd30c9ae328b77d5f91755dfe9268595ee8311845f05d14f55c61e9dcb8193372d018 SHA512 50ea1405e91cd41da9284934b5b8e14e833e766b7714325afaa1cb35e52ea61546e76c41408fe691e66eb816b02dd37cf57989e4261f8e978f0d81aa346fafa3
 MISC metadata.xml 337 BLAKE2B f5bf73fb4a4f700d08f240f2f5fbf629322ab2f8db346085d09331b69958545dbbf53973a6f04d105edc070901b2cc82ee7800f6be134f159bd7b6587631119b SHA512 abbe5982149863ee6b21edcc5299238a1449ec2ff4088b86453ef4196a2903c1d6fe38cec785562904369944fc6231b463cc1c4914e3eba8e6744bbe2a8ed520
diff --git a/dev-php/recaptcha/recaptcha-1.2.1.ebuild b/dev-php/recaptcha/recaptcha-1.2.1.ebuild
index 8e2eb09e7b8b..b5d70a8d7ba6 100644
--- a/dev-php/recaptcha/recaptcha-1.2.1.ebuild
+++ b/dev-php/recaptcha/recaptcha-1.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,18 +16,18 @@ RESTRICT="!test? ( test )"
 RDEPEND="dev-lang/php"
 BDEPEND="test? ( ${RDEPEND} dev-php/phpunit )"
 
-src_install(){
+src_install() {
 	insinto "/usr/share/php/${PN}"
 	doins -r src/autoload.php src/ReCaptcha
 	dodoc CONTRIBUTING.md README.md
 	use examples && dodoc -r examples
 }
 
-src_test(){
+src_test() {
 	phpunit || die "test suite failed"
 }
 
-pkg_postinst(){
+pkg_postinst() {
 	elog "${PN} has been installed in /usr/share/php/${PN}/."
 	elog "To use it in a script, require('${PN}/autoload.php'),"
 	elog "and then use the ${PN} class normally. Most of the examples in"
diff --git a/dev-php/twig/Manifest b/dev-php/twig/Manifest
index 16a16ca3ffe7..508b75778009 100644
--- a/dev-php/twig/Manifest
+++ b/dev-php/twig/Manifest
@@ -1,7 +1,7 @@
 AUX Autoloader.php 503 BLAKE2B 57679179226098eea818df53154b98afd3249f12a219fc894a7529bdcb8ceb39c7c5c20f14263ce03875983ab0acaeaa6e09ca8446ee5b9a591b6e284e7f9238 SHA512 054a9420a23b67c57ca0780fdbc3c817436dea71780714654469efa23c0d17173e1c87b2f3c6ce48e26e4dd49a92f1f17e2e23472a666513e9fb8903a4f11699
 DIST twig-1.40.1.tar.gz 274081 BLAKE2B 0e73bd9fff58677446ba03ed560bff17c1879192b79cca9f718ccd330e1eac64ee1195d7034fa52ec009e323868d1cc1bedc182e90f0a77c8b54d6aa16022554 SHA512 de174e5dd14562a155515a3238aa07ef5a22c3bf0eff8ecc320f1a972e56f1ec759a53ee24579c6434e286b3775044e88c753fd08930037314b45c9577b310b1
 DIST twig-1.42.3.tar.gz 278164 BLAKE2B 4bff9f7f85ce8ca00871e9342ec11a68d4b930f7761bc7404f504322483d328570e9e540e2518b5e1ad513002ce95686b7a1a47ff7aa4b28c16b2871ba759b01 SHA512 9dc892d80445f9fa9a3bde5cfdc49f2975a43f36123c1f4bbbb40740269e9aa4355d0d8668552e535f74a8ff27cc8ee1dc6983b50567993c1deab09569a7c5e3
-EBUILD twig-1.40.1-r1.ebuild 1369 BLAKE2B d0cb11c5eacd37538ad94097a5c2db78c351893140df5f025b82a8f3b8ec57ebadfee4ecafc2be5c527955656315e20ea9b404ecdaf374a92864c6f66edcb421 SHA512 e4243f710ed4287c8bd8ebb74bba91e534c1b6ec3b898706dbbd2cc7920682bc0c78e92472ad33257696df1031acbcfdf5a67036f7ff0a050cb3ccb49e30106b
-EBUILD twig-1.42.3-r1.ebuild 1378 BLAKE2B dc1556d8ff902b66933291ddfc87412c72bd32ecdbb71feda177b82467e08466dcc154064a009a86035d64093326bd8f1fc4b59487e4a01bdaa8caf4465ba9fe SHA512 ba447650c544b22dc7d88b91b61213018ed9ef8353e1edbea056b30f28b3bd4a50982b08812d65313ae5d786ba64c1ee72412b03168d3eb38f449bbffb43e27b
-EBUILD twig-1.42.3.ebuild 1369 BLAKE2B d0cb11c5eacd37538ad94097a5c2db78c351893140df5f025b82a8f3b8ec57ebadfee4ecafc2be5c527955656315e20ea9b404ecdaf374a92864c6f66edcb421 SHA512 e4243f710ed4287c8bd8ebb74bba91e534c1b6ec3b898706dbbd2cc7920682bc0c78e92472ad33257696df1031acbcfdf5a67036f7ff0a050cb3ccb49e30106b
+EBUILD twig-1.40.1-r1.ebuild 1372 BLAKE2B 75e3c4f3f38c36f0423ac633ed6ce78b0e8c53dd31823fcb30d8977c47161ab89917c04f5cabd48679f6bb70d552c8f5eee507cc1dea033192e2759618b90565 SHA512 2eb497b3edc86f26f4c39e7cbe477904dfaf8399e92a7452fd30eea4fdfb8d64f808a3889d996d2b144252c48b05723f812bc0dc105afe3fc6a374d171e48273
+EBUILD twig-1.42.3-r1.ebuild 1381 BLAKE2B 7eed6dba35c53dd75bc0537106c71f21e884098dbc624e6a0bb74c20df3e8b9a9470a4b0406db30552b9e1fd426b35395b948b41922705d81f0263d76b947173 SHA512 2913e54cb00cfc43599ebecfbd1af319bae8e01250aa666524edd6f5f483adac859f98fcb53672f9fb87a43e6829bb8246438d1ea60202323da3086eaee16813
+EBUILD twig-1.42.3.ebuild 1372 BLAKE2B 75e3c4f3f38c36f0423ac633ed6ce78b0e8c53dd31823fcb30d8977c47161ab89917c04f5cabd48679f6bb70d552c8f5eee507cc1dea033192e2759618b90565 SHA512 2eb497b3edc86f26f4c39e7cbe477904dfaf8399e92a7452fd30eea4fdfb8d64f808a3889d996d2b144252c48b05723f812bc0dc105afe3fc6a374d171e48273
 MISC metadata.xml 438 BLAKE2B 412d85f4f682c6c8e279082834468d3a59cbe2d9fbaaef1f7674903a59e68982d3ec6059f61517383a05488d7bff960ca36dbc869f588388c98511fca5662e5b SHA512 849a7ea4878de239a4454b63f63ecf3ac959ba7fb49d83b0cb60891974bb1cf2c330d27188f6b2ca7cee2f2ad5aefebeb4b914f3eb50eff4e09c973d8ca80339
diff --git a/dev-php/twig/twig-1.40.1-r1.ebuild b/dev-php/twig/twig-1.40.1-r1.ebuild
index c06e5c627361..5935eab4bd1d 100644
--- a/dev-php/twig/twig-1.40.1-r1.ebuild
+++ b/dev-php/twig/twig-1.40.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -20,7 +20,7 @@ DEPEND="test? ( dev-php/phpunit ${RDEPEND} )"
 # Test fail due to missing Symphony dependencies
 RESTRICT="test"
 
-src_install(){
+src_install() {
 	# The autoloader requires the 'T' in "Twig" capitalized.
 	insinto "/usr/share/php/${MY_PN}/lib"
 	doins -r lib/"${MY_PN}"/*
@@ -37,13 +37,13 @@ src_install(){
 	use doc && dodoc -r doc
 }
 
-src_test(){
+src_test() {
 	cp "${FILESDIR}/Autoloader.php" "${S}" || die
 	phpunit --bootstrap Autoloader.php || die "test suite failed"
 	rm "${S}/Autoloader.php" || die
 }
 
-pkg_postinst(){
+pkg_postinst() {
 	elog "${PN} has been installed in /usr/share/php/${MY_PN}/."
 	elog "To use it in a script, require('${MY_PN}/Autoloader.php')"
 }
diff --git a/dev-php/twig/twig-1.42.3-r1.ebuild b/dev-php/twig/twig-1.42.3-r1.ebuild
index 6e54e7688809..1b651a90eb5c 100644
--- a/dev-php/twig/twig-1.42.3-r1.ebuild
+++ b/dev-php/twig/twig-1.42.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -20,7 +20,7 @@ DEPEND="test? ( dev-php/phpunit ${RDEPEND} )"
 # Test fail due to missing Symphony dependencies
 RESTRICT="test"
 
-src_install(){
+src_install() {
 	# The autoloader requires the 'T' in "Twig" capitalized.
 	insinto "/usr/share/php/${MY_PN}/lib/${MY_PN}"
 	doins -r lib/"${MY_PN}"/*
@@ -37,13 +37,13 @@ src_install(){
 	use doc && dodoc -r doc
 }
 
-src_test(){
+src_test() {
 	cp "${FILESDIR}/Autoloader.php" "${S}" || die
 	phpunit --bootstrap Autoloader.php || die "test suite failed"
 	rm "${S}/Autoloader.php" || die
 }
 
-pkg_postinst(){
+pkg_postinst() {
 	elog "${PN} has been installed in /usr/share/php/${MY_PN}/."
 	elog "To use it in a script, require('${MY_PN}/Autoloader.php')"
 }
diff --git a/dev-php/twig/twig-1.42.3.ebuild b/dev-php/twig/twig-1.42.3.ebuild
index c06e5c627361..5935eab4bd1d 100644
--- a/dev-php/twig/twig-1.42.3.ebuild
+++ b/dev-php/twig/twig-1.42.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -20,7 +20,7 @@ DEPEND="test? ( dev-php/phpunit ${RDEPEND} )"
 # Test fail due to missing Symphony dependencies
 RESTRICT="test"
 
-src_install(){
+src_install() {
 	# The autoloader requires the 'T' in "Twig" capitalized.
 	insinto "/usr/share/php/${MY_PN}/lib"
 	doins -r lib/"${MY_PN}"/*
@@ -37,13 +37,13 @@ src_install(){
 	use doc && dodoc -r doc
 }
 
-src_test(){
+src_test() {
 	cp "${FILESDIR}/Autoloader.php" "${S}" || die
 	phpunit --bootstrap Autoloader.php || die "test suite failed"
 	rm "${S}/Autoloader.php" || die
 }
 
-pkg_postinst(){
+pkg_postinst() {
 	elog "${PN} has been installed in /usr/share/php/${MY_PN}/."
 	elog "To use it in a script, require('${MY_PN}/Autoloader.php')"
 }
diff --git a/dev-php/xhprof/Manifest b/dev-php/xhprof/Manifest
index eed4c6711d73..ca64c282aba0 100644
--- a/dev-php/xhprof/Manifest
+++ b/dev-php/xhprof/Manifest
@@ -1,3 +1,5 @@
 DIST xhprof-0.9.10.tar.gz 850440 BLAKE2B f277c4e798c63337d7319ece9e5405fe2aa87677b146bd0a3c73079cda70b005b8a97647a4bfee66e8263eb413b60d685f617d1f8faefe3aff01c5eb5cbcd364 SHA512 f078c7d025d4712858f55a6a212f888cdb67f862c912639db4bd50b9d601e824c7a0bf9e0f9d1b04673230c7a04d9e00fff42f729055677db021ee47e7128088
+DIST xhprof-2.1.4.tgz 841444 BLAKE2B 33be85d55f2636af5664aeb017ccaab6ad03962d44b3143c0eb9d9f9cc0fa74048fbca6beae89d02ed47db8ffe1ea77df1f6a41aa62fbc90fea2c52c467a422d SHA512 8777d29c16bce9e7698cf37c7dd631e951a018fa63ab5a4ab0df8e7621643e7fb905cd9bc189b238d76e32408a43f522bbab455caab6b89f7b6c26590b2733a3
 EBUILD xhprof-0.9.10.ebuild 541 BLAKE2B 84f6cb6126b441543d321d49193436cb8f91fefde036feec8132d8ce388b3be81ff5e75440a96683f48d437cc7cdc50c56a1a7986c8d18fed990c0d5dbe48035 SHA512 0a3be7f712101f71036f190acbd002a164955dc7457053f17a68fc2487ea745c8ae2e8c2e1ed49564e9a1db5eca3a11a09396034867cbd4866563347d0422b7d
+EBUILD xhprof-2.1.4.ebuild 376 BLAKE2B f682e1a892a38da3f476f6175a2c2224d7b0e03a1350de4e782a6159b828fe791fd66e6c30a9f1fa957062c6d6fcca06d16017823786ae7ff221f60ad3a3ac07 SHA512 8798ba51484b6aa0cbbd977305155f67697788334e2b13939141e83c79f59c1149a80ac510be3177f5fa15f4de20141e856b8cf4cc8e7667a9ef2aa1900200f6
 MISC metadata.xml 426 BLAKE2B 9725546deb1835263eb2f7903b589076f2f6dec97cbe740a2f29e7ef0e9299a298851009a2e068659a6779ddf8d469fa4e01e262a97263bb03a03073e4081c82 SHA512 4900959bb60845c19e4cf92b87acf8cb6c132831d495964dfe2ef102898485ae432ea2c1a20c778227e48786e21db8fb4de5d8b07aa33fb193c8d58643a35316
diff --git a/dev-php/xhprof/xhprof-2.1.4.ebuild b/dev-php/xhprof/xhprof-2.1.4.ebuild
new file mode 100644
index 000000000000..6d7187add699
--- /dev/null
+++ b/dev-php/xhprof/xhprof-2.1.4.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PHP_EXT_S="${S}/extension"
+PHP_EXT_ECONF_ARGS=""
+USE_PHP="php7-2 php7-3 php7-4"
+
+inherit php-ext-pecl-r3
+
+KEYWORDS="~amd64 ~x86"
+
+HOMEPAGE="https://pecl.php.net/package/xhprof"
+DESCRIPTION="A Hierarchical Profiler for PHP"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""