gentoo Easter resync : 12.04.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-04-12 03:41:30 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2020-04-12 03:41:30 +0100
commit: 623ee73d661e5ed8475cb264511f683407d87365 (patch)
tree: 993eb27c93ec7a2d2d19550300d888fc1fed9e69 /dev-php
parent: ceeeb463cc1eef97fd62eaee8bf2196ba04bc384 (diff)
284 files changed, 1230 insertions, 695 deletions
diff --git a/dev-php/File_Iterator/File_Iterator-1.4.2.ebuild b/dev-php/File_Iterator/File_Iterator-1.4.2.ebuild
index 10ce7d75104f..5a99e1487807 100644
--- a/dev-php/File_Iterator/File_Iterator-1.4.2.ebuild
+++ b/dev-php/File_Iterator/File_Iterator-1.4.2.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
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> $
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-php/File_Iterator/File_Iterator-1.4.3.ebuild b/dev-php/File_Iterator/File_Iterator-1.4.3.ebuild
index ccd2b390476d..9068f6072639 100644
--- a/dev-php/File_Iterator/File_Iterator-1.4.3.ebuild
+++ b/dev-php/File_Iterator/File_Iterator-1.4.3.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
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> $
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE=""
 
 S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-php/File_Iterator/File_Iterator-2.0.2-r1.ebuild b/dev-php/File_Iterator/File_Iterator-2.0.2-r1.ebuild
index ed6e2925e36f..b2508d50cec0 100644
--- a/dev-php/File_Iterator/File_Iterator-2.0.2-r1.ebuild
+++ b/dev-php/File_Iterator/File_Iterator-2.0.2-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
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> $
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE=""
 
 S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-php/File_Iterator/File_Iterator-2.0.2.ebuild b/dev-php/File_Iterator/File_Iterator-2.0.2.ebuild
index 7763457d86b5..95a6e0b5b8e7 100644
--- a/dev-php/File_Iterator/File_Iterator-2.0.2.ebuild
+++ b/dev-php/File_Iterator/File_Iterator-2.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> $
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE=""
 
 S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-php/File_Iterator/Manifest b/dev-php/File_Iterator/Manifest
index d5656c67923d..f5afb4e42f87 100644
--- a/dev-php/File_Iterator/Manifest
+++ b/dev-php/File_Iterator/Manifest
@@ -6,8 +6,8 @@ DIST File_Iterator-1.4.2.tar.gz 4141 BLAKE2B 4c8d9847fa198d444571acdf777020b76e8
 DIST File_Iterator-1.4.3.tar.gz 4140 BLAKE2B 89274c6f9b561dbc732d0b81f06b7c34d267ea31d1deb5977eaa16852d87442183221ed6789fd5e09b80ef96811df2ff8ef5da5c764703f5e7a2d5289f582527 SHA512 cea906d6028d9c2dbbb5486198adbecbca87f8b4dcbe12f72b9732ac29cf8eb868a23af7a5bcf2de55e0040a077ab55b016e773d5145f987f7e3f9671ad3ea28
 DIST File_Iterator-2.0.2.tar.gz 7239 BLAKE2B af2cc29d087bd597b10fd1d22a35c906deca70eb79bbcbb52ca3d8c408cbe8887233b69ba7f9c37fe639ff7d544d1109609a0b2e59c5f49bb286aee3e3f3f2d1 SHA512 2f1acee0358e03bd831d0228dfd2fc65848f7105e0dabb6cf81890d8549e3f39037a01bed2357316a27bb863955c1f51d56770c0ea733f5389d8e47f30050687
 EBUILD File_Iterator-1.3.4.ebuild 577 BLAKE2B 0c98424026c342511d6f73c2fe4d2ccad1e14dd97f97cf1d36bec6e469093bbef5fcdf0ca89c79d3410c1957083150d121587a509ac45689273aa1b34132d848 SHA512 5b389c4cb5c4a939a330347db4281fdc2c0c3ef993cb3f5606fa1a54f7968616c2ae275fb49c810256b84774cca5aa4776bd3a139078e9e4651cb3a47d5b5b57
-EBUILD File_Iterator-1.4.2.ebuild 858 BLAKE2B d5f2605720b1f4c287dad59f70d8d0244bb2d471b616677a125760c7dde73b99b20de5a4ab848d317bcdeaa66b763581db1ba4ec00f057ff3a5744d47fbb051a SHA512 2e51a9bd9318ed36a8954ea0020a926fe72bdd9f789dac72348177b4f6d3113ebc18e051089e0c8473ffdba1cc73737f0a137cc9f81c313030a9934042d327c8
-EBUILD File_Iterator-1.4.3.ebuild 866 BLAKE2B e5e1e0dc5ebe224bbddeab59ee7f2e0be3b06a400af818f7d0045869fdfdddbf60efc405a9aa1e30bad8a9c3310e4a71db866821fea6b4e5486d35001f92a306 SHA512 f45b221200b40f5c10c1d7240b3eb1e459c8784741cd5a0ec594ce7ba382e5383a9f8086aa9e58fbd1d739795b52a11e02ed35a9f18f6a9c4e970f7268cfb6bc
-EBUILD File_Iterator-2.0.2-r1.ebuild 883 BLAKE2B 59775fff96f67170df636cc3d3be545c64434c9c54017ef0ef10f3b2b3240af05a97b105963d41d15daa43e514f60db19fa16411a40d9b2f3240f30bf16ffcdd SHA512 e0f54104952e1c31f36e2e1689d569bb92099a8c3ddfe7814f82ef310f08c4e742dd31178bac219f8f2d7dc3d98184c9697064ad9a99aa6683e10b0fac8c91b2
-EBUILD File_Iterator-2.0.2.ebuild 863 BLAKE2B 32456063a934491a2e434f613ca846f920334da7215b41f5acc3201349be9aea4d2b3f379fb5e9b87548906bb498f0bcfc6d226efbe3f24743a2c2f94da8343e SHA512 f22f9ba8c3f5128f28d246f5d34269c7792c4427023daf83e0b43cf8a9b42b4dd1e84dca8ed048ca6b0571b90a078bc1debabbff6611732a9c14c06f92a737fe
+EBUILD File_Iterator-1.4.2.ebuild 852 BLAKE2B e3e3075a8c818303c6a8d3a5f10176bb0deadb5d4ef956e4c7a838db65861b20188afbd2d8e9b76384790e454a9a34dd991dfcaf9fece6fea561aba0da93a66c SHA512 ada53b6a14314057ef32bbe889c2076dc735db6e752f0396e389fc5c6d358ed5b2b672fe1220c9cbc3098222c2db88131936a2d28c719dcd5b8094a3a754778f
+EBUILD File_Iterator-1.4.3.ebuild 859 BLAKE2B e193a99facde34aea54021bea273ecc017de599f1bae6d9e7d9ebcd20b5f62d48c39057512b589d93f201d33c7dd799ffa8fcf6e794d9a3fb7549f710c51c747 SHA512 418129ad6526f6f8d8e6fa141318bda75331cc4ea0dd9d7a0e4fbf2bbf19b6a59eaee4ed528df973ad306c8a6124a0dcc1fac43270c38561bfdb1278e2413d2e
+EBUILD File_Iterator-2.0.2-r1.ebuild 879 BLAKE2B 5be45ce87294c41e8bcd262fae3e850ecec5f64e1abcc80b8644508bc77362c753e084447b8015c626540ec4f3ecc5f26f2960ea949d4017bcade38f1fcd5d3a SHA512 2871efeffde7d2681241f39868687e2f4d742deed372dc49011bfb57368dcf8bf4f0e78b1a16024e2f86febfea0b7c0f9c527824ed2133ce5b865eaea6dffcd3
+EBUILD File_Iterator-2.0.2.ebuild 859 BLAKE2B d8af9f3839dd9c376ad5104fc5f6921d4091955e8e6c25048dd77d891a87b630f37bf55935c518f9a219bdce3f94a1bc982a89de86b4ed930f580f1d7fe8fdcc SHA512 e4756380daf95c479eebc2a8ec43d4e3e60f1df8e32fb20573cc7a9442e101d198cadaaaf4c1d841c7e55dc7d51c14f5e589bb606423c9ffc5085763ef267907
 MISC metadata.xml 349 BLAKE2B ab948322ce2cfa4e40d9b0ac17d435db9e4613000fa05c810860e281615d5b1297f826ec51ed460ba87080508578e2353729843cdd2bf1f4226890413137a911 SHA512 85e7e819b346185575934f4f356d1346534fce0fe1ddcf5e88e855ce40f64c48bf73c1f14085cf0526ee681014943f7524ea79b7d951b66c12e67e6f04c099e8
diff --git a/dev-php/Manifest.gz b/dev-php/Manifest.gz
index fd86d6ea179a..f6b35af26c6d 100644
--- a/dev-php/Manifest.gz
+++ b/dev-php/Manifest.gz
diff --git a/dev-php/PEAR-Archive_Tar/Manifest b/dev-php/PEAR-Archive_Tar/Manifest
index e2a492378db9..8fd8f1401576 100644
--- a/dev-php/PEAR-Archive_Tar/Manifest
+++ b/dev-php/PEAR-Archive_Tar/Manifest
@@ -2,8 +2,8 @@ DIST Archive_Tar-1.4.5.tgz 20919 BLAKE2B 506b2fae8f99634cf40ecff9c5ec695c101f4e1
 DIST Archive_Tar-1.4.7.tgz 21134 BLAKE2B 15bc4e7f74a61062d10fa69bb826bbf92dbee6fc3f45da32a2b25964f3e042c0559e0614be13592b68cdea0a819315f43c4331d9dc90e94dd3c773f38c379e99 SHA512 e496fdcb1e7a2bbbc4aae88bae5793b0da6e7e7ee0ebbab78de14279cc3a5b7a2ec30d1424c3977ba6e4edd4780c0cb8dcf4288a7495252e28c560b8781d5b75
 DIST Archive_Tar-1.4.8.tgz 21236 BLAKE2B fded2febc840bdcfd072e4ff44b3002078899c01a3aa3110cd5b54fbb1695e856f5faad447330d174e4b3b73e515d15de7a700c6a0e588f7e038b79e09f02362 SHA512 b4fe4944a6f261de0c9e28aeee7f50fc7220400c6abad3093c81b1b3b98cbb179abb17b53e90071af6f2fb0f13dfabb24a51d826f4bc632631f1e60e038728e1
 DIST Archive_Tar-1.4.9.tgz 21343 BLAKE2B c951a909c151c4582841692dfd85068031ac80f7925b562c408ab8d454fbf693b8dfc046137150ee5ea5e452a669c2f25a8017c5e623ef095fa81e799451f50a SHA512 c0cce8213926aa9fde07bf46d77015b2dfbfe878cf386df43fcd4cf346b4ffdb2587676cfb69fc917cc31b63507c33702938a22aeb26e16b5ea27039c525c4e1
-EBUILD PEAR-Archive_Tar-1.4.5.ebuild 751 BLAKE2B e96088dd60d167367934f0f7cdc21cec689ed686a21f5ba40428566ba87dcc95e1cbf7716132d6de5709297612df13764d651c1796632e99ab9e0feadc337bae SHA512 dd5474a5ec6d2a73d522452fcf02f0eba3ce46ea9a57ef01da8d9212848d865bec41b3a91a5c32743753ca293dbe86c7c7d66e3b2bdc2e549ef303e1d8ced0df
-EBUILD PEAR-Archive_Tar-1.4.7.ebuild 758 BLAKE2B 5cb2c1d541d975b854a474b4c0ec3f6b0a2b70a40f41a18070e8cedcc0db137b1e48d872652763e18570a044c662779fe379ec78eb8c71977b184fd944190d8d SHA512 fe66b6584b258188e413f241abe38cf6f00ae8202f7baaf090e7cb96fd0f673779c27c6237d95a2d7c7f520766e180b3dcc21606a9ea53f6aa842435ef6567fb
-EBUILD PEAR-Archive_Tar-1.4.8.ebuild 758 BLAKE2B 5cb2c1d541d975b854a474b4c0ec3f6b0a2b70a40f41a18070e8cedcc0db137b1e48d872652763e18570a044c662779fe379ec78eb8c71977b184fd944190d8d SHA512 fe66b6584b258188e413f241abe38cf6f00ae8202f7baaf090e7cb96fd0f673779c27c6237d95a2d7c7f520766e180b3dcc21606a9ea53f6aa842435ef6567fb
-EBUILD PEAR-Archive_Tar-1.4.9.ebuild 758 BLAKE2B 5cb2c1d541d975b854a474b4c0ec3f6b0a2b70a40f41a18070e8cedcc0db137b1e48d872652763e18570a044c662779fe379ec78eb8c71977b184fd944190d8d SHA512 fe66b6584b258188e413f241abe38cf6f00ae8202f7baaf090e7cb96fd0f673779c27c6237d95a2d7c7f520766e180b3dcc21606a9ea53f6aa842435ef6567fb
+EBUILD PEAR-Archive_Tar-1.4.5.ebuild 747 BLAKE2B 99bbb190966cc20f9f249b140ae738fc588f7caa579f0089e24f090ce149d2d788a5c9dc5b8cff9835d8e6dbc278919cee1f7748319e8755e1aaa1761be1a7c9 SHA512 9ef3018d22c99f8116e5192dec05314c5aa251f42b91c6b828398663e5eb7926cbd343b90de9e01b236245df93a6508ef30e7338c9b3ffc5fd535772dbc84680
+EBUILD PEAR-Archive_Tar-1.4.7.ebuild 754 BLAKE2B e862af920b6f550e73fafef286cd5de5d1148e7233a58056913c1e77acd8721fd1c7f88f8ea9c6c91f059d0d5f99967c55640e5f8fef5d0b8351cddf02e584ab SHA512 be1307b048050ee7ff0c87ee833e1afbd24da2af7e4c71c5e3f4501688375df75efe206308fd3820d961e132097f9692f19e42d2be810a05e1f3a5f422d1dfd4
+EBUILD PEAR-Archive_Tar-1.4.8.ebuild 754 BLAKE2B e862af920b6f550e73fafef286cd5de5d1148e7233a58056913c1e77acd8721fd1c7f88f8ea9c6c91f059d0d5f99967c55640e5f8fef5d0b8351cddf02e584ab SHA512 be1307b048050ee7ff0c87ee833e1afbd24da2af7e4c71c5e3f4501688375df75efe206308fd3820d961e132097f9692f19e42d2be810a05e1f3a5f422d1dfd4
+EBUILD PEAR-Archive_Tar-1.4.9.ebuild 754 BLAKE2B e862af920b6f550e73fafef286cd5de5d1148e7233a58056913c1e77acd8721fd1c7f88f8ea9c6c91f059d0d5f99967c55640e5f8fef5d0b8351cddf02e584ab SHA512 be1307b048050ee7ff0c87ee833e1afbd24da2af7e4c71c5e3f4501688375df75efe206308fd3820d961e132097f9692f19e42d2be810a05e1f3a5f422d1dfd4
 MISC metadata.xml 313 BLAKE2B 96717f88c6747b4b6dc814ffee022a1bfe7965ca71f0d1dff4acae773d37ba43d21b92343993b19c753360651ae63c7e0cea16d51c12d4fee03d6852a50be7ff SHA512 189683deca6b9b76a4ca070938afa484580b57a8c799f49f26e9b123165d545ab6aec31bc2b96400cfc5390f3837477a8d58b461e317ab14bf1152292880ece1
diff --git a/dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.4.5.ebuild b/dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.4.5.ebuild
index c0a300889d88..b4314c0f2407 100644
--- a/dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.4.5.ebuild
+++ b/dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.4.5.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
@@ -11,7 +11,7 @@ HOMEPAGE="https://pear.php.net/package/Archive_Tar"
 SRC_URI="https://pear.php.net/get/${MY_P}.tgz"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 # bzip2 and zlib are needed for compressed tarballs, and there's one
diff --git a/dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.4.7.ebuild b/dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.4.7.ebuild
index 14ff10890513..ec77b9463d55 100644
--- a/dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.4.7.ebuild
+++ b/dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.4.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
@@ -11,7 +11,7 @@ HOMEPAGE="https://pear.php.net/package/Archive_Tar"
 SRC_URI="https://pear.php.net/get/${MY_P}.tgz"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE=""
 
 # bzip2 and zlib are needed for compressed tarballs, and there's one
diff --git a/dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.4.8.ebuild b/dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.4.8.ebuild
index 14ff10890513..ec77b9463d55 100644
--- a/dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.4.8.ebuild
+++ b/dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.4.8.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
@@ -11,7 +11,7 @@ HOMEPAGE="https://pear.php.net/package/Archive_Tar"
 SRC_URI="https://pear.php.net/get/${MY_P}.tgz"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE=""
 
 # bzip2 and zlib are needed for compressed tarballs, and there's one
diff --git a/dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.4.9.ebuild b/dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.4.9.ebuild
index 14ff10890513..ec77b9463d55 100644
--- a/dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.4.9.ebuild
+++ b/dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.4.9.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
@@ -11,7 +11,7 @@ HOMEPAGE="https://pear.php.net/package/Archive_Tar"
 SRC_URI="https://pear.php.net/get/${MY_P}.tgz"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE=""
 
 # bzip2 and zlib are needed for compressed tarballs, and there's one
diff --git a/dev-php/PEAR-Auth_SASL/Manifest b/dev-php/PEAR-Auth_SASL/Manifest
index 2a73deebd342..fc75de32754f 100644
--- a/dev-php/PEAR-Auth_SASL/Manifest
+++ b/dev-php/PEAR-Auth_SASL/Manifest
@@ -1,3 +1,3 @@
 DIST Auth_SASL-1.1.0.tgz 9380 BLAKE2B ab04812883b5b1a88fe1440f23e206e39676807c69bc029e81e539eb5588a4fa15bcb6f867f109a5eb86d0758bf9fb4f30664a8fdac7aee59a0426f5da6e6dbf SHA512 446ffa37fe7669d3993613167b07fb173c2e17664dcfb56d96a889b4a0cb2c83cc73d307aee15fc8fa7e666502835c15d09c32d8a491060bdd23c9093346bc40
-EBUILD PEAR-Auth_SASL-1.1.0.ebuild 336 BLAKE2B 9403037ac6c181ba4f80131c9582451f8c6b92882e307f17a14a13130c931785c047b5a08798083e67bd1146181a1dae8ee1dd89f1d4d11f53bf32c0f727475e SHA512 2194022231fbb955c503463e210069b7594be81a607a09bc46a5db5b71417c7dec4c58eece30a191d608eb5d0720626ea77a3e6f3411b651bd6c0a426e0ac5e2
+EBUILD PEAR-Auth_SASL-1.1.0.ebuild 330 BLAKE2B 7372162f99cfeb0cf0ace441dda24ef548d234749ebae0adeb2c99cf77884f04666d868842f5521f8622420f260f50a006808a3c17912cacfee8f8f569e1c78a SHA512 56b07a4b28b72fba0c349f0350b848d10a3e21ba017bc5e430921a79f213cd419807e5fdc4d0ab6a2af7e0d782bd208a80186e1c1e34e7161881e00dad86325d
 MISC metadata.xml 311 BLAKE2B 32a29fd08f7c52c73d282412b70345efdb2c759e81dce883b039c6a4180e5c0177fc6e8f997d7d51741bbe1e5969a578f900901c15a1b893d9458bd0341ed4ec SHA512 a7f236f4833cece9f46d1073f6ed444150b0a7fb7983bc94b0f465f77a4b7c8ef6c7b6b3f212d43b30579293247b04a1790b6218e89c3578370a842e50c6467a
diff --git a/dev-php/PEAR-Auth_SASL/PEAR-Auth_SASL-1.1.0.ebuild b/dev-php/PEAR-Auth_SASL/PEAR-Auth_SASL-1.1.0.ebuild
index 7a07203c6f73..57a5366aab6d 100644
--- a/dev-php/PEAR-Auth_SASL/PEAR-Auth_SASL-1.1.0.ebuild
+++ b/dev-php/PEAR-Auth_SASL/PEAR-Auth_SASL-1.1.0.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
@@ -9,6 +9,6 @@ DESCRIPTION="Abstraction of various SASL mechanism responses"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE=""
 RDEPEND=">=dev-php/PEAR-PEAR-1.10.1"
diff --git a/dev-php/PEAR-Cache/Manifest b/dev-php/PEAR-Cache/Manifest
index e39790ade2f8..53ac89d14b7f 100644
--- a/dev-php/PEAR-Cache/Manifest
+++ b/dev-php/PEAR-Cache/Manifest
@@ -1,3 +1,3 @@
 DIST Cache-1.5.6.tgz 31384 BLAKE2B 08a9a1bdb913d434bc979d9a21c45c36cad03763554226291924cffba462c2b52cf4266972e616ac7f3cf09c605ee1a56337070058f494187d6bbf14812fc235 SHA512 6c42901d9a462c803ff349650519fdb705bc56bebf1d106bd0796e35bf3ee6b4e1f783a3af022f024d9473a7e75eb14ff1954decc0a4c133817a8ed65e42f29a
-EBUILD PEAR-Cache-1.5.6-r2.ebuild 617 BLAKE2B b6b52f99d54c965f923d42113104b17fcef9a41ef9465f7de86e5c183d3ddb2c928eeebf42a5ba16c3af8456f08e23b324c3ea23c98557aea6aed536091473c5 SHA512 a68a83d6f687599ff4d274552b5e454bb299a61d255885727d71623791ec44fcd9f13505adb65dee07ebe750678cbfe86fcd0b4d44bb2dca5a28f22999efc60f
+EBUILD PEAR-Cache-1.5.6-r2.ebuild 611 BLAKE2B b08640a27617af3a75040b8815913d8b2769768f12eba74ac9a85bf47314899cf1528c5e24747ec15cb2bedcb63819355421881ab4d9c89f784cb07103e76b0f SHA512 f5767a5f32be748dcc377cdea96be1ca0ddc8880db3b8440b9faa758f77ef4ae9509f17d8d8605e34808a70d23effcd0bd1d0997b8b2348a2c44d6a3db98652c
 MISC metadata.xml 235 BLAKE2B 5b10304feea18aae1822be7d29bcce06c8715193b14a3dd2c4d79eb75e2767670352e2ca11e06b9a10ec04b63020a18254cd167e6d6be9072f4a200ca5d11ec4 SHA512 0b3e95bbf68eddf74289dad50f8828cffce2d904ff6f9bd5468177de979677cac11da84d1e0302c52b72085915b9d1b3496107172e5726520d51dad1981daf64
diff --git a/dev-php/PEAR-Cache/PEAR-Cache-1.5.6-r2.ebuild b/dev-php/PEAR-Cache/PEAR-Cache-1.5.6-r2.ebuild
index c9fb6660f276..b8d1392509c8 100644
--- a/dev-php/PEAR-Cache/PEAR-Cache-1.5.6-r2.ebuild
+++ b/dev-php/PEAR-Cache/PEAR-Cache-1.5.6-r2.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
@@ -9,7 +9,7 @@ DESCRIPTION="Framework for caching of arbitrary data"
 
 LICENSE="PHP-2.02"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 src_install() {
diff --git a/dev-php/PEAR-Cache_Lite/Manifest b/dev-php/PEAR-Cache_Lite/Manifest
index 4706b1368aab..ea26c18c01ae 100644
--- a/dev-php/PEAR-Cache_Lite/Manifest
+++ b/dev-php/PEAR-Cache_Lite/Manifest
@@ -1,5 +1,5 @@
 DIST Cache_Lite-1.8.2.tgz 33873 BLAKE2B 0b5a21550fe6eb33242e97b135a7e2532fb0a3a047dfb3e858bf6a6bdc21e991007e4787764561baa9a165fdebd159caa33c14c822a29374be4081d07a63c858 SHA512 dfb3c2dadd0ca60cc62ad71fd6fc51c0665901b4370207dfeb1f0f56e9db4fb24724d22f2939f67d8aa044e1b465483c40ec34fb3bcc5e12031d4dd1e05953b4
 DIST Cache_Lite-1.8.3.tgz 34036 BLAKE2B ca0b404371d370c7aeda2c83805d9f0c7c864063ffe597a277f123fd1de991e0e1c15e134ffa674bd387cc1d3cbb09eed047c7f10b8fbc755c0c8749483b2d01 SHA512 700376dd33afd0b1ed812d0d3dbdc14ad5523b3b181ac64ef0d56b62040c3d7bc9f234b3dae8013876a902f21da8dc92b1de41cea11aa428036bcc6e96166e65
-EBUILD PEAR-Cache_Lite-1.8.2.ebuild 471 BLAKE2B fc12491c7adb9a335fa5005c7cc17657126be607eb533d94f5ed7bb64701fbd5a0266fd58793aafa84ece83b627f56039efd70cb0cb0ffbb7704dfb48b02ce0d SHA512 5b2a782b5df15daeaeba403d4f99496fe51dfd04ee5f4418c47901c1b8c8f82d3a50ce21c3d15d7ec0971eb339121bf3bcf87190630447e1adb5e79339ecd0e8
+EBUILD PEAR-Cache_Lite-1.8.2.ebuild 472 BLAKE2B 7a150359f09c0ebf1330c2bb31655bc84a39b17c0bb1775f09917f889f34c52a3de50d6d32a25e984ade7b0597266642c6493d73c56a1f80358c1aa771a0ac29 SHA512 d743870e17952e0b82b8a46a1247197015281b3ee86af5d68a371eb44a5b948e6b952f4375b9298a8815020be7630486ed05fac0ee7050da2b301749a3798df7
 EBUILD PEAR-Cache_Lite-1.8.3.ebuild 478 BLAKE2B 9591c22b03771bd9476223f7e01935922fda012125ea2e4f1e70724601c710ee167e3321d65ebb6f77fb2af49bb4e4009b8c26aaaec0150526396ff9567037ad SHA512 f46a4819086a928a70e7a323d2ca60c55a190282e09c23d4cac9cb070b4fc3c93e020c5a39b11634501ee55cc389dcbd13f46a575fbf1891fb2e516efb0388f4
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/PEAR-Cache_Lite/PEAR-Cache_Lite-1.8.2.ebuild b/dev-php/PEAR-Cache_Lite/PEAR-Cache_Lite-1.8.2.ebuild
index 2be02b852bd8..468533acd109 100644
--- a/dev-php/PEAR-Cache_Lite/PEAR-Cache_Lite-1.8.2.ebuild
+++ b/dev-php/PEAR-Cache_Lite/PEAR-Cache_Lite-1.8.2.ebuild
@@ -5,7 +5,7 @@ EAPI="6"
 
 inherit php-pear-r2
 
-KEYWORDS="~alpha amd64 hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86"
 DESCRIPTION="Fast and safe little cache system"
 LICENSE="LGPL-2.1"
 SLOT="0"
diff --git a/dev-php/PEAR-Console_CommandLine/Manifest b/dev-php/PEAR-Console_CommandLine/Manifest
index 3d9932362e3e..c140db0c345d 100644
--- a/dev-php/PEAR-Console_CommandLine/Manifest
+++ b/dev-php/PEAR-Console_CommandLine/Manifest
@@ -1,3 +1,3 @@
 DIST Console_CommandLine-1.2.2.tgz 40705 BLAKE2B 1cf2fd7ffdafe1b6e683d40e24c07bc12c9e41469e42595f40778f0bfef30457b32f80b966835a690724e29216348be0fb3f98a83947459d48f728896a5a056a SHA512 05dbde123d0d4fdbba2a959f4bea3b115e3629060a268d25a3007c2ee5a3530b8ebbd8c7d124a6c9d012cafa19f41690a888943a6c1e2e5ec1b9d83fa821d603
-EBUILD PEAR-Console_CommandLine-1.2.2.ebuild 1413 BLAKE2B ad50b54d50a05cbac22faeb2cf2ce0eedaa9a24c28b47e5b42e6856c7e9be52060f4d944b9292cea59703a2964cfcacc292a31d3e0958ebb514848a99a0850d6 SHA512 6f7bc398e6dc588de87f7720231ab1650ec3a001b8069200f445596690f7dbc96755c795afebfc29dac7f8a48e80698857df054d0f82378db4ede3760d4ce841
+EBUILD PEAR-Console_CommandLine-1.2.2.ebuild 1414 BLAKE2B 1de2af4e38b5b3868d2c1717375dff2f19e505c2772b9e154589dfd0619b4db497d3c01ed48712fbb9c50de8d5a4e2ec8871b292b10585f5d261183f2d46084e SHA512 6b09933ceadd88891f1235632b77d99cb116228e7e65b629e8967004f9e771f44acfd853adcd34abc9144b586615b358a2a854a3c5c229c262df653a2d25275f
 MISC metadata.xml 397 BLAKE2B ed50944409b7944c1da567241dab1e2e287b15e7a03c662c0642540b4fa1c50b6d048f6c7033b7fd1c598e5e2edc07bed8a758ec8f71e56e0c4a459f7efd9175 SHA512 ffb1a260b10acfd50fd5b3ee01d80b082f56e31c18c99232a28947a7b29d1ef1e529052b109573aebac05138982322f3a46cf6652f0e519222fb87ef730f5e84
diff --git a/dev-php/PEAR-Console_CommandLine/PEAR-Console_CommandLine-1.2.2.ebuild b/dev-php/PEAR-Console_CommandLine/PEAR-Console_CommandLine-1.2.2.ebuild
index 695550207d20..d3788c8cdeb3 100644
--- a/dev-php/PEAR-Console_CommandLine/PEAR-Console_CommandLine-1.2.2.ebuild
+++ b/dev-php/PEAR-Console_CommandLine/PEAR-Console_CommandLine-1.2.2.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://pear.php.net/package/Console_CommandLine"
 SRC_URI="http://download.pear.php.net/package/${MY_P}.tgz"
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="amd64 arm hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-php/PEAR-Console_Getopt/Manifest b/dev-php/PEAR-Console_Getopt/Manifest
index 917b30cfe8e4..33d4b83c2e8c 100644
--- a/dev-php/PEAR-Console_Getopt/Manifest
+++ b/dev-php/PEAR-Console_Getopt/Manifest
@@ -1,5 +1,5 @@
 DIST Console_Getopt-1.4.1.tgz 5580 BLAKE2B 514d44cfd2bb7c8bcda49df2b6ba4dafc77184557f58f52c02c6a136e335639e65b7c10f5659dad9d7a87e946d60947121cb5f35a72b6d29fbb3efa3e535283b SHA512 cbf12a72b33424935f019b17ae8fa55289eae77d3845dcfcbbc1c47b71111992d2c0eb837b0f262ce644809c3cc06ad0c2bb04aa1b6ec89a1e3122f327114dbd
 DIST Console_Getopt-1.4.3.tgz 5789 BLAKE2B 641432105696e93160fd6a3ade4ee8c1bd7780cc502668266485d8c747fc8ceb97ce70ebdab8f61a739a4bf8267bfc936f0c9fd51b408add680a2288d49e0412 SHA512 7803e063576e9dac6833064b5a1479d22ca31c2a8ef8036ae530271e4e824fedb94e54d63266be8929f90f8df745b3ada7185dc98319b331f8dc5e9cac5445a0
-EBUILD PEAR-Console_Getopt-1.4.1-r1.ebuild 550 BLAKE2B 24a8d81621128ae1e4a3cf110e454fc9ffa13bae307ba134bb67f91c294957b1b9955414dde14583f886f179b2678a22c6e742bdede06d40f754657b149e4c9e SHA512 1463912468f372bcf7c940dec676525934e1749bbe5b3685fb4c21a03213a840742292de8d037d56593d684a7cf5117b471121c24a80158b01829a659307e903
-EBUILD PEAR-Console_Getopt-1.4.3.ebuild 558 BLAKE2B 931a37c24860e88a9daad7b1040e6b7d484dab31822f82ca796de866567674242ea124a108f75b22859cb5f05b25e5b3227b7e1c7b609fccab49aa9bfb66dd0a SHA512 bd53d83da8f663a1842bca9fb762163437077052a36d0b89973f674d0c82aaf4154c170b951910650e81f9ae8f8e4aebd231942a11bae91ac49fad23dbba9541
+EBUILD PEAR-Console_Getopt-1.4.1-r1.ebuild 547 BLAKE2B 88d2d7346ac9fc35e222a53ebaa1fdb7747127055f95c25ae356b91457cb9e31086016cf44d54ae653a87312190ab3845073f9cc562cfc6419c2cf5a6128de4c SHA512 c315f06d00639b2f2ddab0cf8feec3638718a00671d94891c1667377495421fb0d2fd46e375c1bfcf91052e259fe99036c2a021aa9fdba4f672f512c4e75fa11
+EBUILD PEAR-Console_Getopt-1.4.3.ebuild 554 BLAKE2B 81a1384897e6df1e2a40b39e7c9f4819e81df1160e2a56e6133560953d505d710ae0f4e4240d0db0d628f7cd49e379404e31fd1a28cc3148bccd509e187af9f2 SHA512 3dbeec4c4b1422be54d4a96ee16e868ed1674ad074f5bc0ce84b3a60786dd6c09f3cb5e399c757f21eab21099d5585f56ecb37e945fcaeb9f60496064744b974
 MISC metadata.xml 316 BLAKE2B 680f79e848a7196c2ab95b0be749c99b71dffeb3cfe501c57d8e6d84f0108e09e8e4e3d307e2db82ab7f65aeb4b3824bc801c29d7d0d8be14bb899c3557ccd65 SHA512 8103a2aac5f04ccca0accc1b5dcfc11ee2c59992ea7364e87cf1208fda18f58ac48c833413db682993464912087df6bae19419b153fdf335ea56a1ae406c5994
diff --git a/dev-php/PEAR-Console_Getopt/PEAR-Console_Getopt-1.4.1-r1.ebuild b/dev-php/PEAR-Console_Getopt/PEAR-Console_Getopt-1.4.1-r1.ebuild
index b560ae6a7ce2..3a0c69449f47 100644
--- a/dev-php/PEAR-Console_Getopt/PEAR-Console_Getopt-1.4.1-r1.ebuild
+++ b/dev-php/PEAR-Console_Getopt/PEAR-Console_Getopt-1.4.1-r1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://pear.php.net/package/Console_Getopt"
 SRC_URI="https://pear.php.net/get/${MY_P}.tgz"
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 DEPEND=""
diff --git a/dev-php/PEAR-Console_Getopt/PEAR-Console_Getopt-1.4.3.ebuild b/dev-php/PEAR-Console_Getopt/PEAR-Console_Getopt-1.4.3.ebuild
index 130680148c73..1f5d8be072f4 100644
--- a/dev-php/PEAR-Console_Getopt/PEAR-Console_Getopt-1.4.3.ebuild
+++ b/dev-php/PEAR-Console_Getopt/PEAR-Console_Getopt-1.4.3.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://pear.php.net/package/Console_Getopt"
 SRC_URI="https://pear.php.net/get/${MY_P}.tgz"
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE=""
 
 DEPEND=""
diff --git a/dev-php/PEAR-Console_Table/Manifest b/dev-php/PEAR-Console_Table/Manifest
index 0acf63787762..6eb7ed343e21 100644
--- a/dev-php/PEAR-Console_Table/Manifest
+++ b/dev-php/PEAR-Console_Table/Manifest
@@ -1,5 +1,5 @@
 DIST Console_Table-1.3.0.tgz 11391 BLAKE2B 25cbb72f2fa23026320840eb3e3b85f08dfc6a90ae9a613ec3e7251b407fc971c0a8aad3ac6bccbb9cd99066aca30249373539b8758fed58b0d1fc53898fc71b SHA512 83227ce8e55ae38cdf91b7097879a3406898064d1c047c5a94c6cadc46cbeeea51c43d135e6aadfbdb38fa080a1b27a1d4cea1c36ff9eb3e14dc4b04de334c11
 DIST Console_Table-1.3.1.tgz 11492 BLAKE2B bff94b2ae1b6d23eaf9a60deee4e78ee3467eff9d53c1d6ac8330347647b54700d4b3cf30be84c071afc34a4517b3135f6b18011418ea5dfc0e2841da1a30874 SHA512 abac68c20bb670b29f405625edff0330ce5af51763a50ee7482c3ab9d39c7335134d77c0f1a94ce4914c2f454d493a685841e07628eb2aa58cc66617521b6a65
-EBUILD PEAR-Console_Table-1.3.0-r1.ebuild 391 BLAKE2B bc5ad212a184624db683a114b4a66218bc588245cec020981e9a87112118306e80cd20891fdee59ef7cf1c68a54aa25b1dedd393627d8d107dc0384930ef449d SHA512 be8bdd84909cdd346c111a9361c98ee18f6729156d576b2b59a489bda53191f9dff547654eaafe121d71c4915474d3e6b50fac0ee625ee86c3ed4b1a2fbace44
+EBUILD PEAR-Console_Table-1.3.0-r1.ebuild 392 BLAKE2B e8f1722d98c9a5cf824636029ed18468d806da9792e41d38cc3448ed364d0869e1180dd268e392749a912433fe7820f84cb70deb412e29663bf488c9c1b02eaa SHA512 e7f663736d199d0082d87364c6cf294c0b3f0179029dd9980ddcae2b31e7c438ba78ba2b1ce79c333da05fefa189fd800c07270e643a4af6dff237709a2748e3
 EBUILD PEAR-Console_Table-1.3.1.ebuild 519 BLAKE2B db1ba783c2f66dfaba8b3d9ce33f96ca1c80e252877cce22b2ddb9c8a7d240a3184b8f77c54f6df5b97136ceecf3f46f4ba85a4131f0f4a077bb79d5ef05368b SHA512 b587595848b4ce3a8915b29a8a817317001ca11a246a35f6d673b11045881287964c68681cbaef2e6458547d80d4629f6ac32ce060a4764670ebfa371dd57f90
 MISC metadata.xml 315 BLAKE2B 82168e43ddcd8fbbff59b6a83fab3b4abbf540c4c486819da9ccf39b282f4b45c2bab6bedc97bcbcaae1656fd2fd1ebcee0d43b7ae0f5021eaa9767460a75dfc SHA512 8fdf28a135ca48c1d377bd355924214fbad506e853a6e9c85ba1956ea587e84bdcecb21aee700cff77031b37945a0143bbe98ea55e226934d6a7119ba367265b
diff --git a/dev-php/PEAR-Console_Table/PEAR-Console_Table-1.3.0-r1.ebuild b/dev-php/PEAR-Console_Table/PEAR-Console_Table-1.3.0-r1.ebuild
index 4d2f1d8fd3bb..7f52dbd5d651 100644
--- a/dev-php/PEAR-Console_Table/PEAR-Console_Table-1.3.0-r1.ebuild
+++ b/dev-php/PEAR-Console_Table/PEAR-Console_Table-1.3.0-r1.ebuild
@@ -8,7 +8,7 @@ inherit php-pear-r2
 DESCRIPTION="Class that makes it easy to build console style tables"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86"
 IUSE=""
 
 src_install() {
diff --git a/dev-php/PEAR-Crypt_GPG/Manifest b/dev-php/PEAR-Crypt_GPG/Manifest
index 4c1fcc9ea766..50258d62622c 100644
--- a/dev-php/PEAR-Crypt_GPG/Manifest
+++ b/dev-php/PEAR-Crypt_GPG/Manifest
@@ -1,6 +1,6 @@
 AUX fix-unit-tests-with-new-gpg.patch 2090 BLAKE2B 7cc3b79bfd29244eec6e0152130d33d64ff99ddb4da9508affa9a06274d8b888d4e7ea38c2a8e090953b40533b19a5224f803d71199ece8dde70444959fba9eb SHA512 3b6b301d19cde1eebd411caf409dd11add712717a638f2b4d8567114cc065efdc899cb8244412da7b3438850a9bedfafe95e370705fd7439b312f4cb318f4124
 DIST Crypt_GPG-1.6.2.tgz 346709 BLAKE2B abced2fe8c909f06690c38884506ce03df4c5ef3ef460aafce65ea9405c6974f8af320fd5a07a7967b45421a9a67aa27026c28ef7eb1402ffefba527007a33ae SHA512 9d954d96b4e461c75f79ce9bc701d062e3f19671690228e6e0ce5265733ac1de9c06520f9f750348f3c37f01ccb79720574b2d2f371e69c8a25ae6e1bc18aabd
 DIST Crypt_GPG-1.6.3.tgz 346999 BLAKE2B 8402ef382a6393972a3fda7370fbd37dec19d0ebabb6b316d35783538dbc01746476977d7dc3da487876201cd678964d9572dc67a43911319b1b614004a3c909 SHA512 f1ad2560a43a1e8f5a33269bc4ae4067e19e5325fdbd8d2fc55f6cb8aad89258df45fbecedd93a21749f33024c819f07399580b1a4760f5740f26043109dc396
-EBUILD PEAR-Crypt_GPG-1.6.2.ebuild 1169 BLAKE2B 1926217a77d74792bf4cdd6fb4b172879e06727020f809944b56ff35d9f2e675db90cadfc12171e667ab189ce53443580d34f6836e64b5d2d8d4275ef5f2650a SHA512 d4798e649461d3ed26536d6c5234f37bcd4a4504026d26de5ce41753c710247b1fabfed851c3a41a56e1eaf2ed66d2593d5510455fb14ee49c2e047e2facfd87
+EBUILD PEAR-Crypt_GPG-1.6.2.ebuild 1170 BLAKE2B 437691fd331a1c589a256764c9d441f1b9a8812ce4c7b435ba73de7a3aecbc4417c1e9e52a61e1b3ecdfc26b8cd37c14ae3a7bf0683ddcd4eeefb0a516b3f753 SHA512 51cbb2871f7093b20962ec8726ec59aa333557c1b2fc843ca28bdf1896b5b4bfeca2002fd906af2c0607e22ac25108ad373c17cf75e1576d98d5b3049870c554
 EBUILD PEAR-Crypt_GPG-1.6.3.ebuild 1117 BLAKE2B e79952729e05686e9915b4ea3baf6089c52ee55043d79fc5826a29a3028e2cdaf82b42f087c169a50eb06694482a61c284bc9313b12ccf23c8bf14e556d85238 SHA512 2316799e3357d240a23a4020bf0c971abaecdde9792745f38bd9fafa26f78bc94eae9845ee1c1ff1d959d954bab1dc6ab09f92496c2497335b1fa42f6a49c562
 MISC metadata.xml 490 BLAKE2B ae0122e23babc3353357016c47707d7a9ec6cf92d2a981c25eaebcc13713c676cd6c283b2810d6f337071651546085db6a4de56e6decd22275de90da88181f08 SHA512 21423e113024e94c04f245071ecc0a0308672387b92f42c7f57b0d716b0d681d2008fab84cec1bf0b0d37981d5548515e5f3997e76e288d9aafee678b5411ab9
diff --git a/dev-php/PEAR-Crypt_GPG/PEAR-Crypt_GPG-1.6.2.ebuild b/dev-php/PEAR-Crypt_GPG/PEAR-Crypt_GPG-1.6.2.ebuild
index 671615f5a673..dfc934dcbed9 100644
--- a/dev-php/PEAR-Crypt_GPG/PEAR-Crypt_GPG-1.6.2.ebuild
+++ b/dev-php/PEAR-Crypt_GPG/PEAR-Crypt_GPG-1.6.2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://pear.php.net/package/Crypt_GPG"
 SRC_URI="http://download.pear.php.net/package/${MY_P}.tgz"
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 arm hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="amd64 arm hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-php/PEAR-DB/Manifest b/dev-php/PEAR-DB/Manifest
index 98f1e304d66e..a88552f1f4f3 100644
--- a/dev-php/PEAR-DB/Manifest
+++ b/dev-php/PEAR-DB/Manifest
@@ -1,5 +1,5 @@
 DIST DB-1.9.2.tgz 133795 BLAKE2B 8b37b010145efd10a2b551392988a810c35b9a8c794eb0e162056fcded104276b19e97afb91149f1814f9f838a0db579a76578fb80d96d0574e5b7714d77aa91 SHA512 126bbbb847a24c20731f1e5f4a549e9d7e0651a760f10c49cfc7550f80dd8b05f3560bc80110bcaab9e79dcbb714c6113948f14a727f7f4087a23178b3db0afa
 DIST DB-1.9.3.tgz 132290 BLAKE2B 8970697ac66bc9fe7f8c374431c59627133401e5b591fb3fc95ffc3a6ebb8cfe7e93982178e092eefc79d91657992eb539fc7211a237e3fe7407c75c7013831f SHA512 3fe98f97307818f65c0eaf291169fd13533a4d484d34d7fa7aa82580f6ec3d89b984292f173da2cf896f5f15531db9bde2be981e5a7679cc00c48aa2f9cc1142
-EBUILD PEAR-DB-1.9.2-r1.ebuild 759 BLAKE2B 937c4eb2f165bcc577ef2e3f256c37dc1ae303e641b2d20b6336730ca3be5faf9b56d607d644397bd8d3cc427916fb421f39b2033b614a04abfd87166510caa9 SHA512 05b7f0004d289a97118d7ca9a11d138094ce233a599d2388aef9466d3cf45330cacde5ee167eb74250cbe9d0afa5438787e6cbd3ce9fc126589105e13997563c
-EBUILD PEAR-DB-1.9.3.ebuild 767 BLAKE2B 51e9da91a0a5e2491e0046a91241a2ad822a63e1f9e7199c81fdc9d68773390a6427fa536b095aaf4d3d4efc5312f0cd25a002111a8968040f59cfd26733aaf2 SHA512 4b92b9173ac854c19e8789d3250650b4280a01a44b649d98a3a5250c2e912bcfa5b3dd5c938b3666407b33e5506089c41b5619fdd12124b32a3b09607e05c74f
+EBUILD PEAR-DB-1.9.2-r1.ebuild 756 BLAKE2B 61a2c45bf60e45b83cdabe857f995e302c7392bbd899bb6d17f1c219ba01ca817a704fdd1095eae1f216c436b380a4d81da025f5b1d83cee91cdd01b2d67c31e SHA512 9e5211a5002b38a3d9744da28dbcab240d6560cad1a20a03823e7e5f940fb4b83e2e936b753f8557c827125fded29e21ac6e4f988ae7d27d12e783eb2f6c6010
+EBUILD PEAR-DB-1.9.3.ebuild 763 BLAKE2B a1b994ccbc19b5b13732585235cbf814f6b5e37f12fbd09c6b7f8a1c6812eff583cc5eadb3f3dd78609fa77ad74f67381e9d6b3685b120c9b05ee5f5a041c59c SHA512 eb4d31372c536a2377af8522f853744d1228c5a8927c74086c2bf94e34b7df9aa4d8755d6a0f7ed5cff084af59085368d31bc2e615751926e9b557efaacaf517
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/PEAR-DB/PEAR-DB-1.9.2-r1.ebuild b/dev-php/PEAR-DB/PEAR-DB-1.9.2-r1.ebuild
index be76838871fb..39a7348a4e3a 100644
--- a/dev-php/PEAR-DB/PEAR-DB-1.9.2-r1.ebuild
+++ b/dev-php/PEAR-DB/PEAR-DB-1.9.2-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 inherit php-pear-r2
 
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 
 DESCRIPTION="Database abstraction layer for PHP"
 LICENSE="PHP-3"
diff --git a/dev-php/PEAR-DB/PEAR-DB-1.9.3.ebuild b/dev-php/PEAR-DB/PEAR-DB-1.9.3.ebuild
index aef50db8db8c..4ffad08d1fe3 100644
--- a/dev-php/PEAR-DB/PEAR-DB-1.9.3.ebuild
+++ b/dev-php/PEAR-DB/PEAR-DB-1.9.3.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 inherit php-pear-r2
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 
 DESCRIPTION="Database abstraction layer for PHP"
 LICENSE="PHP-3"
diff --git a/dev-php/PEAR-Date/Manifest b/dev-php/PEAR-Date/Manifest
index 907a743a0a58..09d3ce3ddb07 100644
--- a/dev-php/PEAR-Date/Manifest
+++ b/dev-php/PEAR-Date/Manifest
@@ -1,3 +1,3 @@
 DIST Date-1.5.0a4.tgz 222378 BLAKE2B aeca1d84c0cdbb55ed5ac9f6ce7819f7666085a1dbf610990e4afb07be78fed1cabbadd770ffceea97c37eb4ffccf44d18fd84646b6918cd5f5fa12f97d2c951 SHA512 91f80cbb78b8cf24fdc2e4423e7e018da736507136bcf68a61dc8a0f130d44f5937e1ddf39b45189cb08e0d17a4c0295d407920a2b25ba8029517e96a071b65b
-EBUILD PEAR-Date-1.5.0_alpha4-r1.ebuild 367 BLAKE2B c467989741e9a8b83c96c0cbbed2a25a0c0753b3e84d67b01a9e41abb41c83f54a4fed7d1428a49fd565942a1183e14ce0db84c9610352669aa326cb2ba75837 SHA512 b4b88764541e5a23fdc090841fae53b90b9b3a5e36e3e18793bf71f7a9b8656207ff5f24190d0a78ec472ef259686bda7ba6209524ce9d371f5c54a1b5cca09b
+EBUILD PEAR-Date-1.5.0_alpha4-r1.ebuild 361 BLAKE2B 4645222ddaa8ebe4d4fe274f4f28f9389a99edd919f89b55bc93a2ebed4115d34567f4af42cbc380b403a5f94b87dc6bec49c0f0954854e092eef382814d006c SHA512 9af62169228a330639f16132572057fa9bcf9eff94f13e5348e86c78fb1d285c3599219cd73214160109ecaf5844add04b6ed1bd89b96cef0a810871fe5c763a
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/PEAR-Date/PEAR-Date-1.5.0_alpha4-r1.ebuild b/dev-php/PEAR-Date/PEAR-Date-1.5.0_alpha4-r1.ebuild
index 1940f31de7f4..071bed4607e7 100644
--- a/dev-php/PEAR-Date/PEAR-Date-1.5.0_alpha4-r1.ebuild
+++ b/dev-php/PEAR-Date/PEAR-Date-1.5.0_alpha4-r1.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
@@ -6,7 +6,7 @@ EAPI=6
 PEAR_PV=${PV/_alpha/a}
 inherit php-pear-r2
 
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 
 DESCRIPTION="Date and Time Zone classes"
 LICENSE="BSD"
diff --git a/dev-php/PEAR-Exception/Manifest b/dev-php/PEAR-Exception/Manifest
index 36c28a191047..f9466e2ba7b9 100644
--- a/dev-php/PEAR-Exception/Manifest
+++ b/dev-php/PEAR-Exception/Manifest
@@ -1,3 +1,3 @@
 DIST PEAR_Exception-1.0.0.tgz 5270 BLAKE2B f6f6874083fcef2453e1d07e1ee3e900e4f7d18eca8e9a9eda9891492dd3fc1e31eb13944031e82044f976f1070463a3b099a8223d2dabb2da109bb123997f5a SHA512 f2078186fdad6c6ca59ac462a24f7f9689bea08d30f786acb7779d52cd433e490c752ba0a263067d869151b0c051cded327cb3477a039c5de68c854bff002b58
-EBUILD PEAR-Exception-1.0.0.ebuild 686 BLAKE2B f5680e515ee4994a5241f20b4d14d9224f3a7ac8562a18d42bfeb83120618f19dbc87498e7fd0a76bb32fcc026baf83dc04066d70162b1507330bd55ea05c0a2 SHA512 b4dca260af4ece15a21ea8db5bbd599efeac55f83506d3f0c65c4e1145b315ad3654e678cd66a2fbec61645ad6307d89ac3bba6f358fe532155c13cc28a00b61
+EBUILD PEAR-Exception-1.0.0.ebuild 683 BLAKE2B 744b855992c667a3724be177457f8e72aaa0f1d0a07877f9fc153ca5bcda6b49f798eb0bf4e73e3d6206b2770da5ac80840588a9a44b463d010b5b44e2a950b7 SHA512 2c75b63a45b5acf63c607d45ee27354fa710ecd2c1b3981e4d33cbbcd1ab49072019fa1fb89cbb70e603baa061990bff1c24b3cdf5d3fdc431e6008d90d3affc
 MISC metadata.xml 387 BLAKE2B 889a6e870f53bbaf7ea5d86dbddd30c85bbab181886d5eed8b8d05d4b744ed5b1152773a158f7ace3b3bf037d0dc6d5631d5e951a12f4c7a16d05a66156513ba SHA512 c3c5a2c8f8f1696240e9631e2e29d5f0780c856ad92067b24bafdf2325170b24177dd2b0ef6dba4582ec517e64f98019e9c4b823a045c9f65dd5606f0bc29e62
diff --git a/dev-php/PEAR-Exception/PEAR-Exception-1.0.0.ebuild b/dev-php/PEAR-Exception/PEAR-Exception-1.0.0.ebuild
index 1801a859eab6..efec088e7ab4 100644
--- a/dev-php/PEAR-Exception/PEAR-Exception-1.0.0.ebuild
+++ b/dev-php/PEAR-Exception/PEAR-Exception-1.0.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://pear.php.net/package/PEAR_Exception"
 SRC_URI="http://download.pear.php.net/package/${MY_P}.tgz"
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 RDEPEND="dev-lang/php:*
diff --git a/dev-php/PEAR-File/Manifest b/dev-php/PEAR-File/Manifest
index eece4fdb299b..ad14089a55ee 100644
--- a/dev-php/PEAR-File/Manifest
+++ b/dev-php/PEAR-File/Manifest
@@ -1,3 +1,3 @@
 DIST File-1.4.1.tgz 8164 BLAKE2B f57a70b6cdd469c152f7beb2dffe0b278ae0eb71c412729a15b8d2a9dfef1b2bb303d96930bba64bfc1d4f2972a4f64087f972fc0367fef67e6b88c29e56a78a SHA512 78dbe4f80296f3c16df89de2f0d332b442d4787be4f7a3bb78259b0e0a0eb719bbadecba6571609ea6b6a488124ff36b6de08061e88268d5f2805fb8a3be05b0
-EBUILD PEAR-File-1.4.1-r1.ebuild 404 BLAKE2B 42d0d37fcda562a411bbfbded1785c0e769457170107b16f345d05bf2219fa7660960b5f781a0296d1e9e5ce13ebe0ed86acd3d1bab4f39da6fe0a5ca0d0a66a SHA512 e103b3669a9d1bc257c84e31b4959acf0a5fd7fe4b7ff07a256548373f0edc75b4828853b552dceba33efc82e1791411578981256bac2d262252ce1d7b0e0087
+EBUILD PEAR-File-1.4.1-r1.ebuild 401 BLAKE2B c2c0678922eb6bc51a709bb644a2c996c4199b2acac395dd873975e5a79cbd18fa4b7d6513398b578c76fe39a965fcbd6986f11aa9fa9a1f70cb24e23c4aaa0c SHA512 ffd07542ab6d74833ac1b3b24091e75cd7f865217a574560cf3569e1837c272d7e33993fe66da57dc21bb9eb1b2e35c7b06dd64e409522fd71e7989c6141aa15
 MISC metadata.xml 235 BLAKE2B 5b10304feea18aae1822be7d29bcce06c8715193b14a3dd2c4d79eb75e2767670352e2ca11e06b9a10ec04b63020a18254cd167e6d6be9072f4a200ca5d11ec4 SHA512 0b3e95bbf68eddf74289dad50f8828cffce2d904ff6f9bd5468177de979677cac11da84d1e0302c52b72085915b9d1b3496107172e5726520d51dad1981daf64
diff --git a/dev-php/PEAR-File/PEAR-File-1.4.1-r1.ebuild b/dev-php/PEAR-File/PEAR-File-1.4.1-r1.ebuild
index ef6b2de704c6..04c7b1490393 100644
--- a/dev-php/PEAR-File/PEAR-File-1.4.1-r1.ebuild
+++ b/dev-php/PEAR-File/PEAR-File-1.4.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=6
@@ -9,7 +9,7 @@ DESCRIPTION="Common file and directory routines"
 
 LICENSE="PHP-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 DEPEND="test? ( dev-php/PEAR-PEAR )"
diff --git a/dev-php/PEAR-File_Find/Manifest b/dev-php/PEAR-File_Find/Manifest
index ca38a09d967c..f200d6cd9c43 100644
--- a/dev-php/PEAR-File_Find/Manifest
+++ b/dev-php/PEAR-File_Find/Manifest
@@ -1,3 +1,3 @@
 DIST File_Find-1.3.3.tgz 8212 BLAKE2B be45210efcf1aad52df123dd141f1a8ea62321a25cb460da4384456baeff13b51f8850f44e08cb75baa350e7b2a1419b27d89dd5a81f58a7302ab93c95c274a3 SHA512 f912e1f680c5869380791979bd33dabce0e95e40a84ee188052b2be8280de806fd117c11d66b98b7072724ecd9d57203ee5a32fe35705c337e73393fec075bb0
-EBUILD PEAR-File_Find-1.3.3.ebuild 1179 BLAKE2B 654c4cc1e43d58d074ded795bd714a4c3ccd3469e50267c98898b8735144a86b0047505a540ec07779b170a48fe47f02196900cb4eb464fc78bc5bab2596a01c SHA512 f61df8e4e3ae737bbdc1bc36653486037bd6836a18f7cf69baa47be3184c27ee735fb270fc8e88cbba34d149e3877a20562a2e3418b04191e0b9e215238fb94d
+EBUILD PEAR-File_Find-1.3.3.ebuild 1180 BLAKE2B 3687a25aea44adace8039fedfac9e27eca3530efaacb22c795c9411ab1a168be96b29c28ea58339ab15cc280ba2bf71fd0015d324d737af2c1aa51607ef84b91 SHA512 4e22564e74ceab90bc40186defb60c382c840378a757eaa62f97f9c05c3d5c4d6eb265a16690358edbeb342236d35fa4106966b37181c3fce198020b3aaeb699
 MISC metadata.xml 377 BLAKE2B d299154cdb99a5ff1562f245e5a24face117c08cb2bd9f457ee83d40bde667ed659c84e94465c1cbaeb6b2220c48738d261ed690aca9bc43fc83d127adcff872 SHA512 1d640be46e06957c8f3c127a9acac3f4f6b197efdcb96b13a5fff00aa638b3cb7febb5cba261ce45bb68c2356894006e3e57343fdf8bfbdb5d60e6a89f173a73
diff --git a/dev-php/PEAR-File_Find/PEAR-File_Find-1.3.3.ebuild b/dev-php/PEAR-File_Find/PEAR-File_Find-1.3.3.ebuild
index 8b4a22f02dea..d0ca871cb2f0 100644
--- a/dev-php/PEAR-File_Find/PEAR-File_Find-1.3.3.ebuild
+++ b/dev-php/PEAR-File_Find/PEAR-File_Find-1.3.3.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://pear.php.net/package/File_Find"
 SRC_URI="http://download.pear.php.net/package/${MY_P}.tgz"
 LICENSE="PHP-3.01"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-php/PEAR-File_Gettext/Manifest b/dev-php/PEAR-File_Gettext/Manifest
index b9e59693e52c..7d5bcb0c09ec 100644
--- a/dev-php/PEAR-File_Gettext/Manifest
+++ b/dev-php/PEAR-File_Gettext/Manifest
@@ -1,4 +1,4 @@
 AUX File_Gettext-0.4.2-construct.patch 1999 BLAKE2B 5feac1b3c48fef5401158a06db1410878b50d28841807ea5d2f99c7c59cc51472927f9ee85f9b29deadfbe0c964f761d2fbdcfd912ceeda6a722f463370373ff SHA512 a1ca97160f3c521ba340a89c19933daba20b0c11716349b34b330fe10f5a9e924cc28fa7248efb64648ef1ffac832a16c6051723d6f76c63a03454a523a9fe6e
 DIST File_Gettext-0.4.2.tgz 7307 BLAKE2B f1eae4724c62a44515107a0e4cb89aa7abff8f856c5f11a90f6b78dc4e5601cc024e64e8ae0344c3433ffc5355e2dbb9d7e3cc745001ad2098a073bbca0a97da SHA512 cc56430076485d90afca548c78650a2ada4eb8df7e0a58458eded2dca222466aba91d982fb0103e6b63fc4c8140c3ac4c2a4a7c3c77fbc7740922a8b4e33c6a9
-EBUILD PEAR-File_Gettext-0.4.2-r1.ebuild 339 BLAKE2B 36ceaed550b038c40bafba6edbcb2027fdfbc56dccb7fca5691462159b3605ad2b3fb3ab57765b5261c3ef5e4f67add7203e77adf3cd7452db345b319020cd97 SHA512 d39133b0606c65b8f76fbfd867bc038a3580eded50554caefabec2abc26e68289eb3014fd1b1471b9436164876d289b169763c7caa0d9cddec7fad1374b439c5
+EBUILD PEAR-File_Gettext-0.4.2-r1.ebuild 333 BLAKE2B 85f2a47868c44bdddfcea6a5741b5ca866d0aa6598c1ccce4c61a5487c710ea1520682013735870efcc2122cb56452fc0d0eb9502de9fa5f99dc2d52212302b6 SHA512 13cf9026e5dcf6bc7f9789e158768d409d4b261ecb9a6c80b37fb98ca18fd2081f01140173f73f3de3f60de4c00541d42f5064004bb1bd5d69177387f7f2e400
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/PEAR-File_Gettext/PEAR-File_Gettext-0.4.2-r1.ebuild b/dev-php/PEAR-File_Gettext/PEAR-File_Gettext-0.4.2-r1.ebuild
index 93866627df75..f4911dcef80e 100644
--- a/dev-php/PEAR-File_Gettext/PEAR-File_Gettext-0.4.2-r1.ebuild
+++ b/dev-php/PEAR-File_Gettext/PEAR-File_Gettext-0.4.2-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
@@ -9,6 +9,6 @@ DESCRIPTION="GNU Gettext file parser"
 
 LICENSE="PHP-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE=""
 PATCHES=( "${FILESDIR/File_Gettext-0.4.2-construct.patch}" )
diff --git a/dev-php/PEAR-HTML_Common/Manifest b/dev-php/PEAR-HTML_Common/Manifest
index 1b14d07d8ca0..6babe5573df5 100644
--- a/dev-php/PEAR-HTML_Common/Manifest
+++ b/dev-php/PEAR-HTML_Common/Manifest
@@ -1,3 +1,3 @@
 DIST HTML_Common-1.2.5.tgz 4585 BLAKE2B c09e9a98333ca98c2f69a483ebc037b9a8c6c8925d5afd10febd0345462553d4493003565dd1185182c611d2bd77980d4712c0d959c03ba7e98d0715ff6ee2d5 SHA512 f30f60f6a5071c264c9892b78236ecd89330f35196f0d16a75f44b0366b378737fb722a27ff2b4c410b4d8c4aaeca75a7e754dbc99c2bfa63b3a2d67bf70db93
-EBUILD PEAR-HTML_Common-1.2.5-r1.ebuild 387 BLAKE2B 41b659e76f3cfca7d2c96940edd7224737f7ffe9a8c411e8a630c85c6950be81c04446c73f69c22e3bd215acfa293fa46004f904d4d1143034e7359e03e1f8ec SHA512 e8e40112114dac45b192aa1041de8d445ff003fa7444cd1204cd494e62b25e5f70ab5dd37e4f57247483591a62f6e13a225ae7f1844d38a5df5a71743339733d
+EBUILD PEAR-HTML_Common-1.2.5-r1.ebuild 381 BLAKE2B 2c003558c36b99af5652e92cfe156c7612ace7b97c6f9227aabeff2bb8733406e70a1b9d84ead093e2beae50ff3ef7ab13c259972977839ea285abcfb4bb69cb SHA512 948310b805d4e24a65e7606f49a73c7dc8556872935e03e752d9e71a36146f85c76bfaa4ea7c0e2f134e80a91c8d75bdb77a48fcf36604354d6ed98d4a30ec67
 MISC metadata.xml 235 BLAKE2B 5b10304feea18aae1822be7d29bcce06c8715193b14a3dd2c4d79eb75e2767670352e2ca11e06b9a10ec04b63020a18254cd167e6d6be9072f4a200ca5d11ec4 SHA512 0b3e95bbf68eddf74289dad50f8828cffce2d904ff6f9bd5468177de979677cac11da84d1e0302c52b72085915b9d1b3496107172e5726520d51dad1981daf64
diff --git a/dev-php/PEAR-HTML_Common/PEAR-HTML_Common-1.2.5-r1.ebuild b/dev-php/PEAR-HTML_Common/PEAR-HTML_Common-1.2.5-r1.ebuild
index d23915511424..fd84f17b12f0 100644
--- a/dev-php/PEAR-HTML_Common/PEAR-HTML_Common-1.2.5-r1.ebuild
+++ b/dev-php/PEAR-HTML_Common/PEAR-HTML_Common-1.2.5-r1.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
@@ -8,7 +8,7 @@ inherit php-pear-r2
 DESCRIPTION="Base class for other HTML classes"
 LICENSE="PHP-3.01"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 src_install() {
diff --git a/dev-php/PEAR-HTML_Common2/Manifest b/dev-php/PEAR-HTML_Common2/Manifest
index a2f38c0ab3b4..4b0358bef16e 100644
--- a/dev-php/PEAR-HTML_Common2/Manifest
+++ b/dev-php/PEAR-HTML_Common2/Manifest
@@ -1,5 +1,5 @@
 DIST HTML_Common2-2.1.1.tgz 8664 BLAKE2B 2422d0d32f1ff55bf0e40cda5460d3e891cb9bc27001b8d72b7f52d43a2ed6ed2507593a780819550aa11b9aaff75b286995d013cf3e74051abb8700b9f96ac1 SHA512 3fc868c0c5d69a542d205cf853f8993fe6849eec58b35b080db44a7a788b19dfdc9cd669d269ddab70f37edcde763d1beff4c60f2befc2cf2548f63197634124
 DIST HTML_Common2-2.1.2.tgz 8579 BLAKE2B 43d71ca1010e3cb4d73f25417b601872485f9c8990cb3117d112a84f2eca67437687d423146c1f67f8053116d4aef04b4859982805c7009047a682385878dc8e SHA512 f6082e44578dfa063f4f1a896ea477c485122e3d2cc89764c16ee76c3153d60276cbc290b4f3b8c18536aaeffb6797b9c56b8b0f2ffe1ef953fe02a5fb32b864
-EBUILD PEAR-HTML_Common2-2.1.1.ebuild 449 BLAKE2B 69dbca9cead7a3ea68f81156ddeee1c0ae961287aaa59ea2d086efebb39dbd87d719f0fd36ca019cab69ab0735577116095d5bd652c81916289c2301146c1624 SHA512 61b4c0bfcef16686e421beb56baedd132d60d0ee142c97a3718080cbd2295be83054ae8646d386735e5c709e1fa2aa958bf2594441edded2d75942b04cdcf6f0
-EBUILD PEAR-HTML_Common2-2.1.2.ebuild 449 BLAKE2B 90083ff5d6a17f74c94cd400b623f3c973dd81793a65af8a6a975f93023503319afab1a57a44cfcda379f8dfa71074edd7bb49e8758adc445f2afd9049ec5743 SHA512 51bbc685b08a5f13aab9b33a4368c8639bd109ccda15f80403f50c05f8e01bfea248c9c902085090cb4aa13d4f6c7f3ee5dbdb2a53ff62973f57113f3af52f05
+EBUILD PEAR-HTML_Common2-2.1.1.ebuild 445 BLAKE2B ddf032ac42af1342a1634253dd64f218c210656e262792c040438bf21c3eac9d2f21b3c7f554edb3028bba805c71446f02fd96035c1a001fd4229f256feed7a9 SHA512 574182964796ac816a44d3fc708d19cec458dcdaa8e9d463443375dad26ef7122ecae62e66d86b905e00639567840a549975cad89455606a86f44918c7bf7276
+EBUILD PEAR-HTML_Common2-2.1.2.ebuild 445 BLAKE2B c5119c780af4f92115c6385fa1670014ca17505dd578e790b5c1a95ae55fa2042fc963aeba59ca2d2316d60d74463a8b02075ce05c476dc12e551685b63092d3 SHA512 7b01dd97b32e7449f68a11312ffd4b10886f7811d5ec3065b9eae97b664c8f315de6c57405e331b35c485053c715ec98b38dff791dabd7f5afcefe2492f0a785
 MISC metadata.xml 235 BLAKE2B 5b10304feea18aae1822be7d29bcce06c8715193b14a3dd2c4d79eb75e2767670352e2ca11e06b9a10ec04b63020a18254cd167e6d6be9072f4a200ca5d11ec4 SHA512 0b3e95bbf68eddf74289dad50f8828cffce2d904ff6f9bd5468177de979677cac11da84d1e0302c52b72085915b9d1b3496107172e5726520d51dad1981daf64
diff --git a/dev-php/PEAR-HTML_Common2/PEAR-HTML_Common2-2.1.1.ebuild b/dev-php/PEAR-HTML_Common2/PEAR-HTML_Common2-2.1.1.ebuild
index 3f9b1d0f198f..f11b8a2f0e47 100644
--- a/dev-php/PEAR-HTML_Common2/PEAR-HTML_Common2-2.1.1.ebuild
+++ b/dev-php/PEAR-HTML_Common2/PEAR-HTML_Common2-2.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=6
@@ -8,7 +8,7 @@ inherit php-pear-r2
 DESCRIPTION="Abstract base class for HTML classes (PHP5 port of PEAR-HTML_Common package)"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 DEPEND="test? ( dev-php/phpunit )"
diff --git a/dev-php/PEAR-HTML_Common2/PEAR-HTML_Common2-2.1.2.ebuild b/dev-php/PEAR-HTML_Common2/PEAR-HTML_Common2-2.1.2.ebuild
index 114741e6029b..821e6e7c7feb 100644
--- a/dev-php/PEAR-HTML_Common2/PEAR-HTML_Common2-2.1.2.ebuild
+++ b/dev-php/PEAR-HTML_Common2/PEAR-HTML_Common2-2.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
@@ -8,7 +8,7 @@ inherit php-pear-r2
 DESCRIPTION="Abstract base class for HTML classes (PHP5 port of PEAR-HTML_Common package)"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 DEPEND="test? ( dev-php/phpunit )"
diff --git a/dev-php/PEAR-HTML_Javascript/Manifest b/dev-php/PEAR-HTML_Javascript/Manifest
index 0245b835f58d..b22f7a4cfa9c 100644
--- a/dev-php/PEAR-HTML_Javascript/Manifest
+++ b/dev-php/PEAR-HTML_Javascript/Manifest
@@ -1,3 +1,3 @@
 DIST HTML_Javascript-1.1.2.tgz 8620 BLAKE2B ea7eb4296b97ec6f2c0f3d32d3cce367bd8472d13dcf1c6d04dbaec2a649f9bcd85b3f913a4c384ba43c983d33fb7ac10aa8b28983c488f7662efb4708bcf4f8 SHA512 2ac6732f9156af318be8d17d1aa9c0040e5367faf29d6e968740d2fc9ab5806b3a08ee1b33f1c1fd618768a1c50ec67b8ffae6975dda7aa77234ef22e0ff8545
-EBUILD PEAR-HTML_Javascript-1.1.2-r1.ebuild 432 BLAKE2B 1ffc705ef0b81b37203886d3a67c0ae6c7347132e26a357effa4deb92410a26a56fa72b599727255034bf968a4bb2fc2d03c66efabe53372bcb414ed914fe997 SHA512 e913f2f63c40c3400af6bb05dfde14c481cb2278249f11e828c0a8d0d9bc8a9da31818afa1571a9102d392e765efcd6680b28e229af3eef5be0d57cd0bdd3457
+EBUILD PEAR-HTML_Javascript-1.1.2-r1.ebuild 433 BLAKE2B 15d4a453ca6d671e1db1042ae2978cf6a007327f3d371554abf27589fa300c675ffa042bdbbc10c9ab7c707f6aa7f835341adbc75f3db5af172299f08cb6f621 SHA512 657734c8f97d0044fa670cfee2401cb38559deb8277b2ce3809831e0eabfe6c837de6f1c7e9f3abd2f07df3dcf17e2e30d4bf313d93018c1a68e287236208049
 MISC metadata.xml 317 BLAKE2B bf3c184211f7eeca242194a13bab4054fe23ed3bebb0077075de372192b0c70972caae805cbe91f428639624231135a033c5812c1060207f4bb941ada72351f8 SHA512 016d945969562fa523bab4c76645d4a78629e30af6fc300b5462f5147fe31bfa883ad949112d76df0d243985a3bfdcc74364e3b9c42b12de034c978dc898e839
diff --git a/dev-php/PEAR-HTML_Javascript/PEAR-HTML_Javascript-1.1.2-r1.ebuild b/dev-php/PEAR-HTML_Javascript/PEAR-HTML_Javascript-1.1.2-r1.ebuild
index d9aefdd3a64e..1d9005db15d3 100644
--- a/dev-php/PEAR-HTML_Javascript/PEAR-HTML_Javascript-1.1.2-r1.ebuild
+++ b/dev-php/PEAR-HTML_Javascript/PEAR-HTML_Javascript-1.1.2-r1.ebuild
@@ -9,7 +9,7 @@ IUSE=""
 DESCRIPTION="Provides an interface for creating simple JS scripts within PHP"
 LICENSE="PHP-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86"
 
 src_install() {
 	insinto /usr/share/php/HTML
diff --git a/dev-php/PEAR-HTML_Table/Manifest b/dev-php/PEAR-HTML_Table/Manifest
index ac7409933418..24309d5b9db8 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 566 BLAKE2B 7f565d56a80adea7bdad45d55fdd84b329d049979eb7ec842773058190185172b5a33804d28febcdb40dad33c8deb9f501c3a7d08c303cd069b6f6a4ed917ce1 SHA512 292f7139cf4680ebbcc8a00d4984669dbc6e783c8c10e74225cb5d10694f4988467709bbbaf6f251ce133024897d769dacb9d4b34e25d56502a7a509aca2a87f
+EBUILD PEAR-HTML_Table-1.8.4-r1.ebuild 567 BLAKE2B 77ba415aae2e2ef6bb00e7e25101e395da6f7b9e353d694c839dc1ffa22c099370068e61a0520f3ea5b2eb2f74b60de3b74e86ddbb599174128ffde3e1fed89b SHA512 a871235f4b2a3f3dc96a81a738f280c7b262f3e78b8802b7fa5b2eefcf00ec106db41cebfa4eb71701a36d364603f5b818ed503b7ee78b5bbf213f5b93ce53de
 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 8ce643ffa6c9..fbf07f50fd05 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
@@ -9,7 +9,7 @@ DESCRIPTION="Makes the design of HTML tables easy, flexible, reusable and effici
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-php/PEAR-HTML_Table_Matrix/Manifest b/dev-php/PEAR-HTML_Table_Matrix/Manifest
index 67f1a96da218..9413b134aee4 100644
--- a/dev-php/PEAR-HTML_Table_Matrix/Manifest
+++ b/dev-php/PEAR-HTML_Table_Matrix/Manifest
@@ -1,3 +1,3 @@
 DIST HTML_Table_Matrix-1.0.10.tgz 7837 BLAKE2B 6540d2cbf8aa7e50a21181c48f58466d4173488c3c6ff730b37ba4b43f01b59905ae2881f2dc3bbf7b5789e758c6a175b8750e091e8f6b56e1f3be31dfffe8a4 SHA512 61abbdaa1fba65e9c7073932d25e24337d6fda31360cdb58345e01fbb625707295ab39ecddc74e122584c7862bdbcd86114f576a11d015a123964984a4433416
-EBUILD PEAR-HTML_Table_Matrix-1.0.10-r1.ebuild 404 BLAKE2B f9b12e2c1cd1ea93c6f1d8dff60ae42d5f98e96e02e7d0e5764f8592e71545d7aaf294503815b1a33d290bc621e1eb9ab5496947c3f735620fabf0c41cb67892 SHA512 2f8d6abde33b57de8f30562d7c33960bd9f0b79ac33a3c32faf66164b6c00d2f116151c2c0a1779a63743cabd748c896e0d2e7629832ef28ad333c5c0c28b433
+EBUILD PEAR-HTML_Table_Matrix-1.0.10-r1.ebuild 405 BLAKE2B 2618723c9f82e1c0affae70625b6de12458cd0828504dc107ae3741148268137ce88af95d8ac6ad9117fa4ce7d88f34b290e5ea1b4efa427e72d66c097b34b9e SHA512 5130f6d290a26fdcf831062bb57a3a9e5548585b0fcb7f1f131f2d9441cf0b08f76b44d6607bf9a49936fefcf84c9ab0772624439c921c85bc8eaa554d3ddf35
 MISC metadata.xml 235 BLAKE2B 5b10304feea18aae1822be7d29bcce06c8715193b14a3dd2c4d79eb75e2767670352e2ca11e06b9a10ec04b63020a18254cd167e6d6be9072f4a200ca5d11ec4 SHA512 0b3e95bbf68eddf74289dad50f8828cffce2d904ff6f9bd5468177de979677cac11da84d1e0302c52b72085915b9d1b3496107172e5726520d51dad1981daf64
diff --git a/dev-php/PEAR-HTML_Table_Matrix/PEAR-HTML_Table_Matrix-1.0.10-r1.ebuild b/dev-php/PEAR-HTML_Table_Matrix/PEAR-HTML_Table_Matrix-1.0.10-r1.ebuild
index 630d4e93b560..fd46f455f411 100644
--- a/dev-php/PEAR-HTML_Table_Matrix/PEAR-HTML_Table_Matrix-1.0.10-r1.ebuild
+++ b/dev-php/PEAR-HTML_Table_Matrix/PEAR-HTML_Table_Matrix-1.0.10-r1.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Autofill a table with data"
 
 LICENSE="PHP-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 ~sparc x86"
 IUSE=""
 RDEPEND=">=dev-php/PEAR-HTML_Table-1.5-r1
 	>=dev-php/PEAR-Numbers_Words-0.13.1-r1"
diff --git a/dev-php/PEAR-HTML_Template_Flexy/Manifest b/dev-php/PEAR-HTML_Template_Flexy/Manifest
index 9df457486835..fd71bfcfdcb4 100644
--- a/dev-php/PEAR-HTML_Template_Flexy/Manifest
+++ b/dev-php/PEAR-HTML_Template_Flexy/Manifest
@@ -1,4 +1,4 @@
 AUX 1.3.13-postrelease-fixes.patch 1937 BLAKE2B 5ef09498aa13ade77390b7aa5a7d1bb5170cba6fd990e27ad2f95e2af11be7cba542077fb6983e4057d7ee7f834bdaceafb2530caa104cf0dea8ec79453e814c SHA512 8e525617d5ea6958628acb583cd6eb5dbc5ed6eafee36cef82b543d77f32dfc741d65f2acf62cadd9441fc609bee25d7bc5dbb0a66e6a02a0e19c81ec815b676
 DIST HTML_Template_Flexy-1.3.13.tgz 213779 BLAKE2B 3e5cf6657095d86bc8910c4e57c33bc943cf135b2d655b29f65aee997f946b2f1b3eaad445d1f529ae2a80c0c6420c76bf5c560a57e3ff5791964f92ce0fd85b SHA512 c99257c6f5451dbd2176251295f425950e359b2c0e76c1627718b4306ac12417eee697882250b4b5571397d8e47d6b3110770d66ebc91d021cb66064b86b5ad2
-EBUILD PEAR-HTML_Template_Flexy-1.3.13.ebuild 485 BLAKE2B d8d78e905b0b8881abe6d1bc9446c417b1ac837d83f61bc1aba957981fe50b969c69548fdf4a1d9384d6f3dc20d7e27677b657a90e0f99b2ab6f99bdda6577a8 SHA512 d5ed6fdb908e3c28242942fe1f7c664049dd94bf922a3b30f1509ac601599358ab6f447a2d100e89393cd2abed776af24fa444fa7bf5f565c9525571dba877e7
+EBUILD PEAR-HTML_Template_Flexy-1.3.13.ebuild 486 BLAKE2B d388c7c72282e3fa81bcf93a9b571466e637de736300491f7c60e67997fdb0fdcbbdb02709edf883860fc5dcc37204b2b569c455a82f773e9f8419e5b4c657ff SHA512 76796204b2b39ac550195e497fd5b72336e7c22986efcc0b7fa1401a947fadf43fc260fc26cb265b4a32327c3ecdeda093642107b766aab11257578eb7d5894e
 MISC metadata.xml 321 BLAKE2B 1f66fa934126f0a2173994a87f47a13747fb2ac1fafde475a91718aa52aede36c9b07b6ba8b4647088dbdafbfbb4272981ab0053fda527e73ef3add906d7ab52 SHA512 1ddf85f84e478fc10a7aa1431fe3eb933e9b09b49c5dcca1340b95cd7e880ea2af158b12bcf24fa9b0c523258cadbfb49bb14065484b8797c713ee4f0494152a
diff --git a/dev-php/PEAR-HTML_Template_Flexy/PEAR-HTML_Template_Flexy-1.3.13.ebuild b/dev-php/PEAR-HTML_Template_Flexy/PEAR-HTML_Template_Flexy-1.3.13.ebuild
index 424bbe04e49c..9f308a78ce55 100644
--- a/dev-php/PEAR-HTML_Template_Flexy/PEAR-HTML_Template_Flexy-1.3.13.ebuild
+++ b/dev-php/PEAR-HTML_Template_Flexy/PEAR-HTML_Template_Flexy-1.3.13.ebuild
@@ -8,7 +8,7 @@ inherit php-pear-r2
 DESCRIPTION="An extremely powerful Tokenizer driven Template engine"
 LICENSE="PHP-2.02"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="minimal"
 RDEPEND="!minimal? ( >=dev-php/PEAR-HTML_Javascript-1.1.0-r1
 	dev-php/PEAR-File_Gettext )"
diff --git a/dev-php/PEAR-HTML_Template_Sigma/Manifest b/dev-php/PEAR-HTML_Template_Sigma/Manifest
index b82c4a1ed3ad..769560e66217 100644
--- a/dev-php/PEAR-HTML_Template_Sigma/Manifest
+++ b/dev-php/PEAR-HTML_Template_Sigma/Manifest
@@ -1,4 +1,4 @@
 AUX HTML_Template_Sigma-1.3.0-php7.patch 2155 BLAKE2B 1e46e49bf5bf54719635736f8c5f50c6c123c5777fbcf59c1fb5129f068d4947c0e0669b6df76de80b2cd54ec8674a85174f1acfa3a2601abd82eab6bb30d416 SHA512 ea9399d7b7de2361a11b2cc2e89d534b4289ecd656c9b5d99618d4faef9ad7b39e87884d5c720b62a8d55c58ce66b35ee014d010bef5a8ec5cc4b2884b894eda
 DIST HTML_Template_Sigma-1.3.0.tgz 30185 BLAKE2B 62d91d803a088c45c662191cc4fe544d2ef694577a3250a5bc19bc7b41640fc695be95c075c8c3f53e3ebc03fa7d9d38135d607c408ff3d6cb0f1ad11855b740 SHA512 586068325a3320e2778131c1da98d6179d2385d2d73308b0ea1e8df3e0de23f869e03d74454752631998ef3411d8e8b37feab93c6c7b9f51ae4bedb48155e3ed
-EBUILD PEAR-HTML_Template_Sigma-1.3.0-r1.ebuild 542 BLAKE2B 6805809cb7050e9ab3e49e74763ac974a9fb57aa6bf6c184858c303840bbfba07ef0365f9f28101b6e2fcb614af11082a371fca1942bb3c6de0683b1aeedade8 SHA512 fda474a9f45d1c9060250628c2a5a67839b990d537f3aab39ed07587796097dc2c0ab6171cb5bd3a857ae9533c802da3109436e0d979c83cbe34e61650c8948e
+EBUILD PEAR-HTML_Template_Sigma-1.3.0-r1.ebuild 543 BLAKE2B 5f8862a8718f8c6fb60caa60db925a1657dad789c3dd1858644adeb8655677c24a4d3455c10c0b4df7f4e5b25da0eb6eca914ace378cf6b7285a009f9b0b5338 SHA512 87029521f2490b484290e4fb121ab1a23af7b9c66add9eb5ee32ba80571b74ba0adc0255ba9f42bbfe5657a4eff02c7a2bd6a11364b32d3b507c4cf267343cf0
 MISC metadata.xml 235 BLAKE2B 5b10304feea18aae1822be7d29bcce06c8715193b14a3dd2c4d79eb75e2767670352e2ca11e06b9a10ec04b63020a18254cd167e6d6be9072f4a200ca5d11ec4 SHA512 0b3e95bbf68eddf74289dad50f8828cffce2d904ff6f9bd5468177de979677cac11da84d1e0302c52b72085915b9d1b3496107172e5726520d51dad1981daf64
diff --git a/dev-php/PEAR-HTML_Template_Sigma/PEAR-HTML_Template_Sigma-1.3.0-r1.ebuild b/dev-php/PEAR-HTML_Template_Sigma/PEAR-HTML_Template_Sigma-1.3.0-r1.ebuild
index 906eaf8e4485..658dc509fdff 100644
--- a/dev-php/PEAR-HTML_Template_Sigma/PEAR-HTML_Template_Sigma-1.3.0-r1.ebuild
+++ b/dev-php/PEAR-HTML_Template_Sigma/PEAR-HTML_Template_Sigma-1.3.0-r1.ebuild
@@ -8,7 +8,7 @@ inherit php-pear-r2
 DESCRIPTION="An implementation of Integrated Templates API with template 'compilation' added"
 LICENSE="PHP-3.01"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-php/PEAR-HTTP/Manifest b/dev-php/PEAR-HTTP/Manifest
index e1feaa395542..ec8187551f11 100644
--- a/dev-php/PEAR-HTTP/Manifest
+++ b/dev-php/PEAR-HTTP/Manifest
@@ -1,3 +1,3 @@
 DIST HTTP-1.4.1.tgz 8635 BLAKE2B 2d834adcd5f5f2123f0d477bcb1b8189312d7fd8e2ff8e23f23a12ce762dbcda359ac61b192b58f60749c527c0545c3ef321a9610f3fbb0eacd3545e42f86e6b SHA512 60f9ef88eea358e83942213c9643ed7a635822c0963b79221eabb1000e126e5a79e4c6b3901c83c53ad1734ac6b774d355328a8d94087faee544af9bdc20f71c
-EBUILD PEAR-HTTP-1.4.1-r3.ebuild 473 BLAKE2B 34dd864cd903d7c2d297e918f2c01f4e2506ce9ab3ecac7a1eeca4eefba1487b029d4a7d9a2f13e8dfd2cbb7632a8b1aa7a404dbf9a18ed71ba7d412e678ffb5 SHA512 f9a7e641987e6326975a90850c46ae95c7a82f5556d1e044056ce45287b9ef1040ca58467c523e62740193ca0c9fb7aafae1a17d5e15c2482ef433947df64785
+EBUILD PEAR-HTTP-1.4.1-r3.ebuild 474 BLAKE2B 656241501dd777ada3c7453b88b2a42698503fe03f3bdeabee363add9c3e13719318f71316427adf0f9cdf690d3cf8782ad270fff4879978e781d209a0041398 SHA512 0f86580978798a6a28c0e28b2ab5afa543c3e7b2dd342d5cdfd7fb02a36290ce730cf0ad03ce7f4090ebfd7023bb0e4356ce4f628e7a5a9fdd7d4dcc664d41c1
 MISC metadata.xml 235 BLAKE2B 5b10304feea18aae1822be7d29bcce06c8715193b14a3dd2c4d79eb75e2767670352e2ca11e06b9a10ec04b63020a18254cd167e6d6be9072f4a200ca5d11ec4 SHA512 0b3e95bbf68eddf74289dad50f8828cffce2d904ff6f9bd5468177de979677cac11da84d1e0302c52b72085915b9d1b3496107172e5726520d51dad1981daf64
diff --git a/dev-php/PEAR-HTTP/PEAR-HTTP-1.4.1-r3.ebuild b/dev-php/PEAR-HTTP/PEAR-HTTP-1.4.1-r3.ebuild
index 7597f7c664e0..292a9fb26149 100644
--- a/dev-php/PEAR-HTTP/PEAR-HTTP-1.4.1-r3.ebuild
+++ b/dev-php/PEAR-HTTP/PEAR-HTTP-1.4.1-r3.ebuild
@@ -8,7 +8,7 @@ inherit php-pear-r2 eutils
 DESCRIPTION="Miscellaneous HTTP utilities"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 DEPEND="test? ( dev-php/PEAR-PEAR )"
diff --git a/dev-php/PEAR-HTTP_Request2/Manifest b/dev-php/PEAR-HTTP_Request2/Manifest
index ea70b17262c5..fc64bbf90579 100644
--- a/dev-php/PEAR-HTTP_Request2/Manifest
+++ b/dev-php/PEAR-HTTP_Request2/Manifest
@@ -1,3 +1,3 @@
 DIST HTTP_Request2-2.3.0.tgz 119717 BLAKE2B f12972b2423258016f4f4ef8888b5aa1d56bb47146cc6e21f74edfd2e3cd8ae69a1830b4a203990e1346554f2a6e9538e8d5feae27cceadc8465b018dd34ff37 SHA512 52fc2768f3c5afe6fd4505d427255e467b5b7cac8a4116cbabc3f1c0ffe6f1bd061a9c9b31de2ebbd4a7844ae73085ab0d52adf905dce28eb31197117657d77b
-EBUILD PEAR-HTTP_Request2-2.3.0-r1.ebuild 750 BLAKE2B 1a870c917970661da9e0dc387d7692faae3b4cc9990dac69f8fa11e086c26f067c8688feb644f5bcbfaa45db1f6585311e0a9626b9387fa70eec952b57ba401b SHA512 c3750b78522c3b387ff504b913aa8c6749df23ea8b9215e4d971e27c1996da344417c6912b938292ebcf5427a4d9e6d17304676399e3a044b0f31c535fc0e12d
+EBUILD PEAR-HTTP_Request2-2.3.0-r1.ebuild 747 BLAKE2B 1b4e65931c219d62a939d98def1303fd6f94572ef8c37297f81e4a66802d9760ed10780b0c659f25bd20006aec9f76db9e1442b26810dd3bfd0b51ccb7788f20 SHA512 6d715ebef3a7ca2238fa9be01fa37dc37fa617a521833886b9248e683faf98b92999082893a8c6d9f2cfcfb5867eab151b248df20a26dffd8ba3bfd3227f3886
 MISC metadata.xml 719 BLAKE2B 82195b1905bf7b954b7a62502ef524628a05a509e551bdeae9dec1d157579ca6520a8173dd5cfe2eb677f8d26b5fce9195d9312027f6a50d063f0a77acc6152f SHA512 38a38b6d73d885e7222812f54cc4bb67fae6d05c5647b123c00c7676a3feb8fc2cf33a2d308058431e00865a1dc198fd978614c652e614a1058e0319abe72704
diff --git a/dev-php/PEAR-HTTP_Request2/PEAR-HTTP_Request2-2.3.0-r1.ebuild b/dev-php/PEAR-HTTP_Request2/PEAR-HTTP_Request2-2.3.0-r1.ebuild
index 23d21031598b..7efaf9fa5aa5 100644
--- a/dev-php/PEAR-HTTP_Request2/PEAR-HTTP_Request2-2.3.0-r1.ebuild
+++ b/dev-php/PEAR-HTTP_Request2/PEAR-HTTP_Request2-2.3.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
@@ -9,7 +9,7 @@ DESCRIPTION="Provides an easy way to perform HTTP requests"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ia64 ~ppc ~ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~s390 sparc x86"
 IUSE="+curl +fileinfo +ssl test +zlib"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-php/PEAR-Image_IPTC/Manifest b/dev-php/PEAR-Image_IPTC/Manifest
index a105c06e037b..54a6bb712541 100644
--- a/dev-php/PEAR-Image_IPTC/Manifest
+++ b/dev-php/PEAR-Image_IPTC/Manifest
@@ -1,3 +1,3 @@
 DIST Image_IPTC-1.0.2.tgz 3530 BLAKE2B 359425d308dabf82729993113e8e21ae5f48f470b7a49a0adde2728f6b6ffb42c12908f10fa7cd8756e6fb5f5a30cd59371f567a9509ea844bc66e94af5cf53f SHA512 6481d2e9597a6fa5e6e7a782d18a9d7275d766a38f49d52d2ebddcd918c12c3632eceb2b5b1547f631be630779deab2f41894bf241a3e650d5f046e02201af1f
-EBUILD PEAR-Image_IPTC-1.0.2-r2.ebuild 410 BLAKE2B 02c8193c6fc394bcb3ee1eda75e3008ef1e197bcc16be0e4e7a18d372cea3b6ac6a281fd807cfd563149307212482fa7961b6b8e9f2694470f23baa2c95d672f SHA512 b8502651aa5f60fc4f36f4aed8fb49e5be94b2436a1275f150031e7f5c9b192104714f12174deddb4e004a86e6679c52a91cbf9296fd93d7086888634a50bc0f
+EBUILD PEAR-Image_IPTC-1.0.2-r2.ebuild 411 BLAKE2B e326e5f6a4ff987f5e97e979038ee29af76ce27eeda477f8ff84c4ec0708adba7dc518b221ef9f893522def168a2c32afb57c94c803a9abc8474e33512063bd2 SHA512 d854fbe4bbe4b1687b9147620ebcbc3446c3609c90caa3aa7fa2eb59e275168db71cdd91ca601b4391d564f29fe47f2a69d82b89bb2abccd535aa146e7bd8ade
 MISC metadata.xml 235 BLAKE2B 5b10304feea18aae1822be7d29bcce06c8715193b14a3dd2c4d79eb75e2767670352e2ca11e06b9a10ec04b63020a18254cd167e6d6be9072f4a200ca5d11ec4 SHA512 0b3e95bbf68eddf74289dad50f8828cffce2d904ff6f9bd5468177de979677cac11da84d1e0302c52b72085915b9d1b3496107172e5726520d51dad1981daf64
diff --git a/dev-php/PEAR-Image_IPTC/PEAR-Image_IPTC-1.0.2-r2.ebuild b/dev-php/PEAR-Image_IPTC/PEAR-Image_IPTC-1.0.2-r2.ebuild
index d69d57ec6c70..b7a4107be235 100644
--- a/dev-php/PEAR-Image_IPTC/PEAR-Image_IPTC-1.0.2-r2.ebuild
+++ b/dev-php/PEAR-Image_IPTC/PEAR-Image_IPTC-1.0.2-r2.ebuild
@@ -8,7 +8,7 @@ inherit php-pear-r2
 DESCRIPTION="This package provides a mechanism for modifying IPTC header information"
 LICENSE="PHP-2.02"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86"
 IUSE=""
 
 src_install() {
diff --git a/dev-php/PEAR-Log/Manifest b/dev-php/PEAR-Log/Manifest
index 0b1081416c29..e996bc2efbbe 100644
--- a/dev-php/PEAR-Log/Manifest
+++ b/dev-php/PEAR-Log/Manifest
@@ -1,3 +1,3 @@
 DIST Log-1.13.1.tgz 46764 BLAKE2B dc0f4605ed801818ddf070ec3beb6818af1630d99bec721cd3f487e709f87bd4a1628a05854c48fe9775aab546bdce4618061ef37674aa9921f536deccc6a080 SHA512 246510b7dbff4dc9f9cdd951d76baf2dd377e30ffde6d38cadac10091dcb92f8095406edb6d8a87ebe2330d514ce99f355f84ebfe57cd8a3f3babc316995148a
-EBUILD PEAR-Log-1.13.1.ebuild 1351 BLAKE2B 79521ebb491736860b86fe3088c3d9f94a43992e19fb7dc7d32b94c5e57087df969ec592e6285de19ed263c2449b1e3d51543fcab25bf6207e1bd48042bc209b SHA512 3975072db6712bdc20ef7fee7ff4900107d71123e0abde68b7b866e6042e82afeb198caef7021e6c19a3c99022ba34fd0d761860068c2bae3411ae2283b895a6
+EBUILD PEAR-Log-1.13.1.ebuild 1348 BLAKE2B 8ffba37aebb27becc35d76b635b25bdea8a084f9e6dfbdf33295ae4313150f73ad6b9741a0de2c9046d99441fe7df7aebc8b96867c41f2f88cb9d2dce14789fa SHA512 825574468c5848d094b18e6e9961c942556f4498cc0eaa7f6731909f730724eede1501e3dbe4da6dcbee6867ccb76e405c6636149f8acdf71eb7a843cad4989f
 MISC metadata.xml 305 BLAKE2B 9ae588d4fa3e555b0362d0f9ba19dd3bfd459f1788fb047852f22cde3d2688e3807d4ad87247b9dd8759450af1c1ce55192b2e551a8337abd08fbc771f32cd36 SHA512 8540d045359dc2f4ed04bde79616f2ebe923a0d3a6e401788a37e3bfd973a9db33662f5c01326e0fe0198246dad290d8d3ec3d841394071c215f70a8ad4abf71
diff --git a/dev-php/PEAR-Log/PEAR-Log-1.13.1.ebuild b/dev-php/PEAR-Log/PEAR-Log-1.13.1.ebuild
index 00ac5886638d..7f0a72dee5f0 100644
--- a/dev-php/PEAR-Log/PEAR-Log-1.13.1.ebuild
+++ b/dev-php/PEAR-Log/PEAR-Log-1.13.1.ebuild
@@ -11,7 +11,7 @@ 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 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE="examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-php/PEAR-MDB/Manifest b/dev-php/PEAR-MDB/Manifest
index 5c97739f71c6..4170f74baf90 100644
--- a/dev-php/PEAR-MDB/Manifest
+++ b/dev-php/PEAR-MDB/Manifest
@@ -1,3 +1,3 @@
 DIST MDB-1.3.0.tgz 218957 BLAKE2B 17dbcea6487180a19386177cf5ab88abd744d8d52c16bcf156447dfa30c6489329fb6350ef6c33f4923bac6cd5465335010f6d3a7123fd1a21ab4cb845130517 SHA512 48a3319b66cc0ba60a9b96278b6f40015c4cf13d43d4b176b7682b4ad0b071b74830446c71347fcb47c5548ccfc35b98f61f2638a8fb2521534603a39843d37a
-EBUILD PEAR-MDB-1.3.0-r2.ebuild 499 BLAKE2B 3afdf7c4673f82f7cd7f52d23433f4143f6c9881685594a5564ba26b31a17d7a839480f32aa5fe808b387006bc23b362d256af2180f7d6204ddc9067a77f799a SHA512 977bc76eb537392b5ff1d6cc6f647c0588422de9b3e27d4175a7ca06958d63cfb81189a5bda5b7eac1291c7eb21133fdee069222292cf24a24a894d803aed33c
+EBUILD PEAR-MDB-1.3.0-r2.ebuild 500 BLAKE2B 67e5c34afafeee1d7ed664bb55cdc0d7019c396ae0cf4e57264e4c502fdb29b7d1b05a875b5dff7662795f74788dc2b1bdcb8558060ab18c624d1a0245d136c6 SHA512 394ac804dcbabfc03c285f19f8f5e72552cc2c256f2f02208d70153b07a43469590568b9ca434dfa26b547b37f4671c566999d28392d5666896544a915e1a1ba
 MISC metadata.xml 235 BLAKE2B 5b10304feea18aae1822be7d29bcce06c8715193b14a3dd2c4d79eb75e2767670352e2ca11e06b9a10ec04b63020a18254cd167e6d6be9072f4a200ca5d11ec4 SHA512 0b3e95bbf68eddf74289dad50f8828cffce2d904ff6f9bd5468177de979677cac11da84d1e0302c52b72085915b9d1b3496107172e5726520d51dad1981daf64
diff --git a/dev-php/PEAR-MDB/PEAR-MDB-1.3.0-r2.ebuild b/dev-php/PEAR-MDB/PEAR-MDB-1.3.0-r2.ebuild
index 5ffac435ffa6..b8f5865dc858 100644
--- a/dev-php/PEAR-MDB/PEAR-MDB-1.3.0-r2.ebuild
+++ b/dev-php/PEAR-MDB/PEAR-MDB-1.3.0-r2.ebuild
@@ -8,7 +8,7 @@ inherit php-pear-r2
 DESCRIPTION="PEAR MDB combines the PEAR DB and Metabase php database abstraction layers"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86"
 IUSE=""
 RDEPEND="dev-php/PEAR-XML_Parser"
 HTML_DOCS=( doc/xml_schema.xsl doc/skeleton.php doc/xml_schema_documentation.html doc/tutorial.html doc/datatypes.html doc/Modules_Manager_skeleton.php )
diff --git a/dev-php/PEAR-MDB2/Manifest b/dev-php/PEAR-MDB2/Manifest
index a3e56d5b8d25..7bc8830bf5d6 100644
--- a/dev-php/PEAR-MDB2/Manifest
+++ b/dev-php/PEAR-MDB2/Manifest
@@ -1,3 +1,3 @@
 DIST MDB2-2.5.0b5.tgz 136834 BLAKE2B 4736cd205f186b56af4ad7b0c6a83aee5c042d06202464b4226d76e0e37608472f4650f6849de1912f6e47f35ff41ef6fe55f6449835f86ef7eb7ae8bb6e02e2 SHA512 76381594070d250f4428eebeaa4867e72b2be0723ec592ff4f0fba089823e97de057f93e630a5cb226ca2f67028bee57072a0af30677728d614d7a7242c6c6fc
-EBUILD PEAR-MDB2-2.5.0_beta5-r2.ebuild 874 BLAKE2B 1ec3f73a12faa5b54e7818677eb9c4ffc6c8f27060f009c1101e9312dbef9ac0cd5dc7b368078ebf526c6a9500e0350f85eb170d6b51daaa08bcbbcee3b5d64e SHA512 0fd7677133f85c9b0c6d0da901b63e743f2df1f4c8a6a62694fa7c632d84b0f41a28f0500999443cd2e968559fedbf6bf277c396db3d40b7a1a6a61f8409987d
+EBUILD PEAR-MDB2-2.5.0_beta5-r2.ebuild 871 BLAKE2B 710105d046fe964b04cd86c15915a13b383e210fb18322f989a5d7cd978cd0ffabdf69fa000a64491b8ec7f150453d282fe49c3a57ec4dc49276f2c1911c4122 SHA512 18e1d85ca58073b24209321427f7ce8acd087ed4fb36ea330140a3822d016df2387dee38bf58e0349503dff74881f958bd001588525b06e7141360673371cb57
 MISC metadata.xml 306 BLAKE2B c73f196a4a888c22bcde1298962ef829f5993b71d8ac5ded01f41b5fe2e91f599f8c9ed64e134ec26db62d9cc3c610397bf33159f3efde999ccc9cd40ab7bd4e SHA512 2edc3e48edb9d3788f5af8aea2797a72ff699c3fe28ed7664ebc1b1abe5d25616a54d3b9ace88ffef2399113d1678add85153b469d113f6e9e82808390d0373a
diff --git a/dev-php/PEAR-MDB2/PEAR-MDB2-2.5.0_beta5-r2.ebuild b/dev-php/PEAR-MDB2/PEAR-MDB2-2.5.0_beta5-r2.ebuild
index 85ea26e116e8..a0a6739e7dc8 100644
--- a/dev-php/PEAR-MDB2/PEAR-MDB2-2.5.0_beta5-r2.ebuild
+++ b/dev-php/PEAR-MDB2/PEAR-MDB2-2.5.0_beta5-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=7
@@ -10,7 +10,7 @@ inherit php-pear-r2
 DESCRIPTION="Database Abstraction Layer"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE="mssql mysql mysqli oci8 oci8-instant-client postgres sqlite"
 
 RDEPEND=">=dev-php/PEAR-PEAR-1.9.1"
diff --git a/dev-php/PEAR-MDB2_Driver_mssql/Manifest b/dev-php/PEAR-MDB2_Driver_mssql/Manifest
index 5d406d679fac..e3f086353f04 100644
--- a/dev-php/PEAR-MDB2_Driver_mssql/Manifest
+++ b/dev-php/PEAR-MDB2_Driver_mssql/Manifest
@@ -1,3 +1,3 @@
 DIST MDB2_Driver_mssql-1.5.0b4.tgz 37246 BLAKE2B d53ad20004cb96d4c927ff897ae37a28b907c08e8ec9298e18e9c237bb58eff6d5d5e60b466608db6a143a71fec6d519a60d6da502cddf7018a777f65d278560 SHA512 9d8634508eaaed7ed35c4a2e61dcd31a20049f519dafeb6ac07541c4121ebe6efebf1db42d0352aea90971f3fd272085278fef0aabce4a527cf61bb7205321cd
-EBUILD PEAR-MDB2_Driver_mssql-1.5.0_beta4-r1.ebuild 376 BLAKE2B 82f410b4655b3d6738fc37a6a71af0202d8fd33f2cc413ce45837917869e3255c9bc3d04c8ace42c397ab12c4fb8c39a9c346d7aabe62212ab51acd65d5dd2c6 SHA512 9d7aae3bcf2cee6658c3fdfdcb6829fe09b88ff211f41261eb5fbe351554738b38d6eb2e917736589e44bf4b3e42399461d1cf836a7e6858a777cdacdb60e87d
+EBUILD PEAR-MDB2_Driver_mssql-1.5.0_beta4-r1.ebuild 370 BLAKE2B 35a32562cb18f639675ca5e74e580e84772976b1fa59f73f3c3f5cd09d8887ab86dd31523b6261078de050978501f29b302dc2d64952738ddbb2aabe5aa357b2 SHA512 4f4b24ebc951db8a9fdb38feef069653c1315be3ed72e6cd470f7710315d1e1c225335a0929cfce21268554ab14c5474af893269123a6739f0a0b64ea014759c
 MISC metadata.xml 319 BLAKE2B 4038d7d1c024f4120bc52e536a246ceea95c8433cf951b285593b4f2da914ad625497ec3fbbfdfe36cfaafa0b5abe53a3f5d14a21a4828b43124863e046dbbdf SHA512 2c7cff072e4fc3e17e551f9b464ae273ed28fd38b267653befac2762c344b4cd34f3d98798f0c91ce5bead59b41c3fa2f5fbac0b989f9660a585ca9fde4184fe
diff --git a/dev-php/PEAR-MDB2_Driver_mssql/PEAR-MDB2_Driver_mssql-1.5.0_beta4-r1.ebuild b/dev-php/PEAR-MDB2_Driver_mssql/PEAR-MDB2_Driver_mssql-1.5.0_beta4-r1.ebuild
index 04c4281fb10e..6c02e86f6c91 100644
--- a/dev-php/PEAR-MDB2_Driver_mssql/PEAR-MDB2_Driver_mssql-1.5.0_beta4-r1.ebuild
+++ b/dev-php/PEAR-MDB2_Driver_mssql/PEAR-MDB2_Driver_mssql-1.5.0_beta4-r1.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
@@ -10,7 +10,7 @@ inherit php-pear-r2
 DESCRIPTION="Database Abstraction Layer, mssql driver"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 RDEPEND=">=dev-php/PEAR-MDB2-2.5.0_beta3
diff --git a/dev-php/PEAR-MDB2_Driver_mysqli/Manifest b/dev-php/PEAR-MDB2_Driver_mysqli/Manifest
index cc34af1e12ce..e90b29a30105 100644
--- a/dev-php/PEAR-MDB2_Driver_mysqli/Manifest
+++ b/dev-php/PEAR-MDB2_Driver_mysqli/Manifest
@@ -1,3 +1,3 @@
 DIST MDB2_Driver_mysqli-1.5.0b4.tgz 49450 BLAKE2B db8341c8d9fb6f121daf0bf8d5004b57afc59a0dbe5fa662591d2026424acc015cc4b23848284f639c8d614ae01b4f43a5d185ef6b8528df79079356f3f0cbeb SHA512 cb4ba5b34b241f1eb6da72e63f47a99c939ac895530b20d077cf94fa96a9b36826aa128386ffa10e51488f8f3e93da9015805f6f28ddb8729e2812ff240ea894
-EBUILD PEAR-MDB2_Driver_mysqli-1.5.0_beta4-r1.ebuild 385 BLAKE2B df49b6a368b115da3487ba7cbe68c944a0fc3e00370cffa43a91f7be7a97169e0ecfe9d79ebda3c16cd83cb00ec1bb688d13f74d9a82a76095f0ca219a777a64 SHA512 616e61754f7754663ed6f93c9000e7a7615150077de9062986be723e5a17897969b85db9b0ab8222d3bff08304b4ab902667482b1c22f8310d9e403c11bb63fe
+EBUILD PEAR-MDB2_Driver_mysqli-1.5.0_beta4-r1.ebuild 379 BLAKE2B cea1389089f2ffae0ac93b06eb773b7feeec5c9f3a7dc08bf769228bcfc0c17092ebf52f3140fb469a253e4a7542bb6bb5cffeb399c61c8dc2d944d68ab84dcf SHA512 da02a054e70c25619261ff343cdd6e28125a39cc6272bbc124ada2e3a80d337e3a25832c9526c6db9eea492554d1a4bf5b18b301a531acef9feb9a3450a8d7e5
 MISC metadata.xml 320 BLAKE2B 42ba23a1fd9dbaf48892260221e3f4eaa6943c59a275b7c02191d9b35d9eeb2a23e991ce48a500ee3c99b6b6638d8102e254a14b377d13b139a195d17e6899bf SHA512 27fb6b627b6937e4d0f8e294e0a193baba97cc52f463484770ba81ddbd08fdf5652b7d0b3ea39f270efca14fef0fc235c4549743cf47a192271f9c73d9c81498
diff --git a/dev-php/PEAR-MDB2_Driver_mysqli/PEAR-MDB2_Driver_mysqli-1.5.0_beta4-r1.ebuild b/dev-php/PEAR-MDB2_Driver_mysqli/PEAR-MDB2_Driver_mysqli-1.5.0_beta4-r1.ebuild
index b4bb48312ec0..8fe922643f62 100644
--- a/dev-php/PEAR-MDB2_Driver_mysqli/PEAR-MDB2_Driver_mysqli-1.5.0_beta4-r1.ebuild
+++ b/dev-php/PEAR-MDB2_Driver_mysqli/PEAR-MDB2_Driver_mysqli-1.5.0_beta4-r1.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
@@ -10,7 +10,7 @@ inherit php-pear-r2
 DESCRIPTION="Database Abstraction Layer, mysqli driver"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 RDEPEND=">=dev-php/PEAR-MDB2-2.5.0_beta3
diff --git a/dev-php/PEAR-MDB2_Driver_pgsql/Manifest b/dev-php/PEAR-MDB2_Driver_pgsql/Manifest
index 3c1d23e5a872..962310a12f63 100644
--- a/dev-php/PEAR-MDB2_Driver_pgsql/Manifest
+++ b/dev-php/PEAR-MDB2_Driver_pgsql/Manifest
@@ -1,3 +1,3 @@
 DIST MDB2_Driver_pgsql-1.5.0b4.tgz 42404 BLAKE2B 344d952cd745f66e3636c90c2262ce643a5af79a9fe919ddea63a76a7e4c9b97295b06e083f2b8866702b131bf5458380fee66b9cc6aeb5bb2190fdd189a4b03 SHA512 3beda16ee937f3f3af9217f778ae21bb67abe21bf338efa7fc7df0d512bad41cea5b10d4be26bc8055a0107cb14a814ae5da3db2d4346d479082d31cd1cec091
-EBUILD PEAR-MDB2_Driver_pgsql-1.5.0_beta4-r1.ebuild 386 BLAKE2B 89cc8fda1539e942eb84ff3cccd32ea703f64a528cc46b1477e2951c04b7506754a8924feb27799b6598a51f034beac21029d4614e10bdfd9f45a78aca9364b7 SHA512 1887aa99fb0690c6b0332f6fed4880ffbe2f19d2d115bfefeb448c4fa4695b53abe97418c89985d44889f1fdce2394c884162e57f613acc043c0823874ef2ce7
+EBUILD PEAR-MDB2_Driver_pgsql-1.5.0_beta4-r1.ebuild 380 BLAKE2B dbcb307286cb681aef669d2414b0369c30947283193d3a0ecb55eae143a9f9327bd52206b55961923fc57a130501637c99eaf11ae88b9b38f41a1e0dd8d7c1c0 SHA512 ff48e47a9b42cdb45a323b25fb44a7d3cd7026c50bf78f2965a8fb1baad597155d3688e44540f78f7151504c47429c1900044b4205115aff4f61539e5a735f58
 MISC metadata.xml 319 BLAKE2B 4be4d41cfcd4c23a3b5bff9c77d4f1d374974039f86d8263b04cdaed33da08bf15e8215c9626cae2df54c104bd93efe6bb2f4d0cd17191de1fa73c86344c210c SHA512 9081f4495127df0d74683a605330aa2c9cd615eab65d41e8b5636b6614ac38e6e679e49eaf3d7dd9e23e774e9b389963cb3ec2eb8d6f673532fa4d22ba12f357
diff --git a/dev-php/PEAR-MDB2_Driver_pgsql/PEAR-MDB2_Driver_pgsql-1.5.0_beta4-r1.ebuild b/dev-php/PEAR-MDB2_Driver_pgsql/PEAR-MDB2_Driver_pgsql-1.5.0_beta4-r1.ebuild
index ab98dd11eefc..2dea3f0cbbf1 100644
--- a/dev-php/PEAR-MDB2_Driver_pgsql/PEAR-MDB2_Driver_pgsql-1.5.0_beta4-r1.ebuild
+++ b/dev-php/PEAR-MDB2_Driver_pgsql/PEAR-MDB2_Driver_pgsql-1.5.0_beta4-r1.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
@@ -10,7 +10,7 @@ inherit php-pear-r2
 DESCRIPTION="Database Abstraction Layer, pgsql driver"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 RDEPEND=">=dev-php/PEAR-MDB2-2.5.0_beta3
diff --git a/dev-php/PEAR-Mail/Manifest b/dev-php/PEAR-Mail/Manifest
index bd94a89b66f8..1d63ffbf2e6e 100644
--- a/dev-php/PEAR-Mail/Manifest
+++ b/dev-php/PEAR-Mail/Manifest
@@ -1,3 +1,3 @@
 DIST Mail-1.4.1.tgz 21756 BLAKE2B 247df343a7b09760501918681cadc3a649ff9f2bd9974aa714a3661e64af6f1503edeb8ef0030f0ce113c43467cada3e7d62c6a60e751b5c8e6980c14f97fdbb SHA512 851fa64bcf042fba58a70833c12ec5d7af6382e14e6157eeeb5be51b22cdfa5677c5d1eeba8c1f9eef6d55c2d732a4d5d6ea28c726aef232b233c170f7b82307
-EBUILD PEAR-Mail-1.4.1-r1.ebuild 475 BLAKE2B c13ac7487089744fae73855d5e1a01283748912ac5dda14c3a78b9005e6a8e15d379e6aa855b3154959ddbf06a651683e09c63e6a61ba9ff3902e16d89a6925c SHA512 e6ebfd041af7e2e893c7de6b07abe39c0265e221d76efe4e00fa3f9ea9b2c53b42651f53fde43ca2801fde1bf72b652d0afa5b8552e599514d3b45de5360344c
+EBUILD PEAR-Mail-1.4.1-r1.ebuild 472 BLAKE2B 6ac5b3c0202ee6add5da1eb5baf49e040ae438d7002d458f92ecad32948b7c6d1ce6d7696719b76a9d79c0d2e3d51a31e771d32d45920f670df5e6e571e86aa4 SHA512 62029330f0004c2ae3aebcc879631f1f691d975e1e3a7c977022edad2915403f4bc2b49f6c2d42f4048b90aa145315ff386c0f92355bcd9bf2881446a2523b44
 MISC metadata.xml 306 BLAKE2B 82277e19d97f3d3d90c3a7785f58bc83fde319d3713254686f3607c1f5a8750b806080ed4a9db754b5cb5693af5bee73137b14ec368519a4a61b4f15341de91a SHA512 cc21c255e8437d641d2eb2950b641c543bdc8725bd8b7f27382f6355f053c781d36778fdb7fa630270b60ee4580c06cda52dfb3d757c1bf9735915c398df99fa
diff --git a/dev-php/PEAR-Mail/PEAR-Mail-1.4.1-r1.ebuild b/dev-php/PEAR-Mail/PEAR-Mail-1.4.1-r1.ebuild
index 494218fd4b90..03f9c146fc0f 100644
--- a/dev-php/PEAR-Mail/PEAR-Mail-1.4.1-r1.ebuild
+++ b/dev-php/PEAR-Mail/PEAR-Mail-1.4.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=6
@@ -9,7 +9,7 @@ DESCRIPTION="Class that provides multiple interfaces for sending emails"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-php/PEAR-Mail_Mime/Manifest b/dev-php/PEAR-Mail_Mime/Manifest
index 2374302f44d7..1703fc669c0f 100644
--- a/dev-php/PEAR-Mail_Mime/Manifest
+++ b/dev-php/PEAR-Mail_Mime/Manifest
@@ -1,7 +1,7 @@
 DIST Mail_Mime-1.10.2.tgz 36501 BLAKE2B 59e900b99061e84d307eb46d295f843404ae06b01936cec4ed610c298b6f7e8fcee15098fa6d935696122311eae2dbf733611410b2249f2535673a3031011fa3 SHA512 4e3b2a2adc58d8b4f16f56509c9f22638dc37aedf1bec60871706390198198be6ed6dccae8c250eb33de3a441aeb122097ffaddbc49191745f0f09693ec6612b
 DIST Mail_Mime-1.10.4.tgz 36909 BLAKE2B 101d050d96b717ad970a6f8c170ba8ea7d94252274f0b006a266a5ef4ac9d49fb350d3bf120ce645e5a54af1f0ad0ab664c828abfa8a4a96170e7204c73dfd82 SHA512 6e58e1078292cf43605313e2402b60deb97be0b56c8eb5dbbb501cf92ca836ca4bdbc9e1ab878c89f8e59941962a91b73dd917c8e678f0944f271e5537f065e5
 DIST Mail_Mime-1.10.6.tgz 38355 BLAKE2B d12b0496122c67236090db84710aa1fa660570d82952f037ddeb795ac3184a427965e12b21a6dcd6bfaea692299fb6e610822a364470c444455369f96dbbe972 SHA512 223e4a3a3ab52497d7cee551108642aa8c90328cd5d28ec0f215e16e0f2066fbaa3e4d51e62080d322846f8410c2e4641cd7c743e736062b6f8215e637877518
-EBUILD PEAR-Mail_Mime-1.10.2-r1.ebuild 651 BLAKE2B ecff98990c6f209029ea163a93d2521fcd908100cc257ec7f17189747795bcac5b4972bb5c8d76ac5590be998d2194a96ead357f1639b93bc8c3c5141fa8e375 SHA512 a538af615577fd65dcea28709ee32bda7809b3868f06bd73a1b5853e9de43bfaaed3de31a931523791e5d4a51bd0fb04ba0907da26341dc7697c8faa7f6132f4
-EBUILD PEAR-Mail_Mime-1.10.4.ebuild 663 BLAKE2B c7fec7b8724596d7d4745511c64567a3fbe6793ed1d87b4b08426222998e133c6236701231eda523e4671dd2a3cd4595882b0719d240fcf09b4a4dc95039d0d5 SHA512 b30976ca51d1fd1b1ee08aad5ef3cf5c4f5ca3522734fa73864c671412153f90d1fe67309235990cc5f802a17c6877ed28f4c6a24935b72104bcbe6e7a0d2e08
-EBUILD PEAR-Mail_Mime-1.10.6.ebuild 663 BLAKE2B 3b950ebb4abffe78b00208673ca0b01a9a91c0c83acd8ced9bcdcd84021e2b9f8a8cf9ea65878a35030ba27353ec4311199a46ba574ee875cc51c873bdb10bc9 SHA512 faa78e7c72ff8fbb951a6a38d942c21048b0199a352b0c6b8e9f02db9400dbbd3201f8b60960f864f4af78dfa684f85f115c58900ab28ac8c726ab58c2e03001
+EBUILD PEAR-Mail_Mime-1.10.2-r1.ebuild 648 BLAKE2B 735856e37be12bd6e5dd34237a939dc5dd589f5c32d38ffdbcf1c1df5ebb51e70438dd1df058ce63a705856c898b9e035a935f6fd20263b91602b09585021af5 SHA512 a2e35d79feb1beffd8db5cd4e850cdd4107b26c87f4ae2fe5c74c1eed9a64bd6a8773e1c7561f1cea96348b9d47be0af9fd36a09e429ff0079a0f96be2cfbc71
+EBUILD PEAR-Mail_Mime-1.10.4.ebuild 659 BLAKE2B 5d14d7d28e38dee39420268c0d300a8e50204360fa2e494770e65caf0caec3d90e531462222583f4df1af33e7d387f7b282ed8418af4fe19e1f477720f14d265 SHA512 27ad47c4f1ba14bd930279a9ea570952cd3305d47f770a4713ab312c32fd4666de43fcb1e8b1fcdf1aacc51fd3c72ec05650fff8cff50ea1aaee9c15a5839fbd
+EBUILD PEAR-Mail_Mime-1.10.6.ebuild 659 BLAKE2B 5d14d7d28e38dee39420268c0d300a8e50204360fa2e494770e65caf0caec3d90e531462222583f4df1af33e7d387f7b282ed8418af4fe19e1f477720f14d265 SHA512 27ad47c4f1ba14bd930279a9ea570952cd3305d47f770a4713ab312c32fd4666de43fcb1e8b1fcdf1aacc51fd3c72ec05650fff8cff50ea1aaee9c15a5839fbd
 MISC metadata.xml 358 BLAKE2B 0bfd697c80f3c64bff567b59cba40da1879b944b0775ed1d5e7fb4d80b057403dce613ffec5d5f06b46b7446dc16b3c95523f4b230b7f68ba3f6e05e502f9753 SHA512 c0a0fb9ceafd2378e774675500f9c1c60a7510a30c98f293bd5c92f83bfbe6a10b59d0b85ac6de1724b9e5deb1a7c0371e35871a8c7b9c63724df2762f3ca7a2
diff --git a/dev-php/PEAR-Mail_Mime/PEAR-Mail_Mime-1.10.2-r1.ebuild b/dev-php/PEAR-Mail_Mime/PEAR-Mail_Mime-1.10.2-r1.ebuild
index 53daaa9d92fb..d3b8fe4bc6c5 100644
--- a/dev-php/PEAR-Mail_Mime/PEAR-Mail_Mime-1.10.2-r1.ebuild
+++ b/dev-php/PEAR-Mail_Mime/PEAR-Mail_Mime-1.10.2-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
@@ -9,7 +9,7 @@ DESCRIPTION="Create and manipulate mime messages with PHP"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 DEPEND="test? ( dev-php/PEAR-PEAR )"
diff --git a/dev-php/PEAR-Mail_Mime/PEAR-Mail_Mime-1.10.4.ebuild b/dev-php/PEAR-Mail_Mime/PEAR-Mail_Mime-1.10.4.ebuild
index ab2b18f8acb5..a88d469a1fcd 100644
--- a/dev-php/PEAR-Mail_Mime/PEAR-Mail_Mime-1.10.4.ebuild
+++ b/dev-php/PEAR-Mail_Mime/PEAR-Mail_Mime-1.10.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"
@@ -9,7 +9,7 @@ DESCRIPTION="Create and manipulate mime messages with PHP"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="test"
 
 RESTRICT="!test? ( test )"
diff --git a/dev-php/PEAR-Mail_Mime/PEAR-Mail_Mime-1.10.6.ebuild b/dev-php/PEAR-Mail_Mime/PEAR-Mail_Mime-1.10.6.ebuild
index 7c2883db6689..a88d469a1fcd 100644
--- a/dev-php/PEAR-Mail_Mime/PEAR-Mail_Mime-1.10.6.ebuild
+++ b/dev-php/PEAR-Mail_Mime/PEAR-Mail_Mime-1.10.6.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Create and manipulate mime messages with PHP"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="test"
 
 RESTRICT="!test? ( test )"
diff --git a/dev-php/PEAR-Mail_mimeDecode/Manifest b/dev-php/PEAR-Mail_mimeDecode/Manifest
index 504e48d45fce..192c7391723a 100644
--- a/dev-php/PEAR-Mail_mimeDecode/Manifest
+++ b/dev-php/PEAR-Mail_mimeDecode/Manifest
@@ -1,3 +1,3 @@
 DIST Mail_mimeDecode-1.5.6.tgz 13258 BLAKE2B 7e027cf9bf2a450bde639f8c530f216cc8dfd9eab719829dedad029d98fc5c4806279d13ec3ffb5191ba23edf64ae658ca0ec8d83f116da3fafbd23d758a9f00 SHA512 fe46ff2542acd3b180981c7dae41a1979b2edb3bfa5ad716a1ff39a255c2c04d92a7d770ae6531e38f3b869173f576fba44410c8e03269510d71dce5fa345bd1
-EBUILD PEAR-Mail_mimeDecode-1.5.6-r2.ebuild 482 BLAKE2B da18d036a388a19fd61a0ec1e8494ff136b7fe7c7984d05ce4fe23f06481330e85d738b02e30a79428462cc2d1e9f05a6661044b0b8ffde7783b878565c99c10 SHA512 652a98d725e8db2cca2cbf818e54596ff8355296b306b6c8846d38c438b5695c3009a21f07342d4a5a64cb42e04e64224197b58bed69ccf4da8f08a3e86923e3
+EBUILD PEAR-Mail_mimeDecode-1.5.6-r2.ebuild 479 BLAKE2B cbc3820994466893f9907781a88f8d0dd92ba78ae72e721196f46681651a353b5cbffe1fae155801b0cbc93aa00ec1eda54417f9505857e98b892d1c7e7b0131 SHA512 5bb381d003f02f04c6472202db441ba9ed7c5a3b942d279c659b9dd4cfbff8ddf040c1c97fcf42fdda673fabb947cd4c017cf9e8f341168d07b9db16b0511016
 MISC metadata.xml 317 BLAKE2B 00a849c6fe77dbad0b85efe11bf5826ee7d1527a66615400579b33ad6da1bfbb9e86c70bacec14fe304d20e5672cfd394643b4df5caac1af6fe9991deab8ab59 SHA512 00a0f91819696baf2e347036e70f5c32925ed6694144dfbd68e3aca5a62e3c6a157eabc8b4b74d3392008468eb23ee9c4639031e31334733e33be85bc19e2237
diff --git a/dev-php/PEAR-Mail_mimeDecode/PEAR-Mail_mimeDecode-1.5.6-r2.ebuild b/dev-php/PEAR-Mail_mimeDecode/PEAR-Mail_mimeDecode-1.5.6-r2.ebuild
index d4b0e5530aac..cd7919d7c8bc 100644
--- a/dev-php/PEAR-Mail_mimeDecode/PEAR-Mail_mimeDecode-1.5.6-r2.ebuild
+++ b/dev-php/PEAR-Mail_mimeDecode/PEAR-Mail_mimeDecode-1.5.6-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
@@ -8,7 +8,7 @@ inherit php-pear-r2
 DESCRIPTION="Provides a class to decode mime messages (split from PEAR-Mail_Mime)"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-php/PEAR-Math_BigInteger/Manifest b/dev-php/PEAR-Math_BigInteger/Manifest
index 3a9c169eb19f..2280d7311f20 100644
--- a/dev-php/PEAR-Math_BigInteger/Manifest
+++ b/dev-php/PEAR-Math_BigInteger/Manifest
@@ -1,3 +1,3 @@
 DIST Math_BigInteger-1.0.3.tgz 28009 BLAKE2B 21bce67edff73b791322e364d15a1da2c57e9559aa4684b435fe6a8f17a14ce30b81d8ade0fc46d995a1c8f61843ec239ba1c09394adfa9cf77ccf448ecf3d72 SHA512 c8d6d638a6093b39e0f95e55d4d7488ddda1ad512504a97ce62a78ffae969b0d90925d6252b26230e5664f84b0a6b70fb456a678fbb291ca1a068cc7c539f415
-EBUILD PEAR-Math_BigInteger-1.0.3-r1.ebuild 638 BLAKE2B 2846056f225a11cdd166d50b4517267956c0a486acf4048896ef66520b09c234b5dac246ccd5f9e1b305e3d3f3f5ff3fa4fcdec3fd9336a37f7cb1d7c8c9de2b SHA512 8cd4f23404d440688f7445217794ef94d0556cc56d59bcfcb1699691a4ca27ea7a954be8c00eeda02c50929a8ecc7d019a5686543fc839c4128f755612393810
+EBUILD PEAR-Math_BigInteger-1.0.3-r1.ebuild 639 BLAKE2B 08d11ca886f4643f9c078cb6e87ef1d95e1de6b1faee03daa3c65def79efb387480ef96037ef38db738d65372479919c5c4fb13541fb515a1fcd6dbc1c3b51df SHA512 67e9cc03838cc910d2aabcf5484e947ddd40b6cedf55a96dc1c6a7140414cd45a6eb5bebbf5c0110e045bf9499199c30271a376844623c037ad2e18c271bf60c
 MISC metadata.xml 383 BLAKE2B fe5d5ba08fd329fb70f87a71af8c7e496a439c956de7222679c06a910c9bcf853cf454d65f5b560f378b7236e2e9e4365006e03256fcd7af69e39040e9155ee4 SHA512 b6c4d19556a70c765b60a6c9c8ef2389fab9ae7a07f9d6d4ad032e1c87b87396de7428a6e4b4f4980c8423ec12db9febfc487a32b5239a3ac948569e2aca451d
diff --git a/dev-php/PEAR-Math_BigInteger/PEAR-Math_BigInteger-1.0.3-r1.ebuild b/dev-php/PEAR-Math_BigInteger/PEAR-Math_BigInteger-1.0.3-r1.ebuild
index 50b08843d16e..adfa2c539627 100644
--- a/dev-php/PEAR-Math_BigInteger/PEAR-Math_BigInteger-1.0.3-r1.ebuild
+++ b/dev-php/PEAR-Math_BigInteger/PEAR-Math_BigInteger-1.0.3-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="
 SRC_URI="http://download.pear.php.net/package/${MY_P}.tgz"
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86"
 IUSE=""
 DEPEND=""
 RDEPEND="dev-lang/php:*"
diff --git a/dev-php/PEAR-Net_DNS/Manifest b/dev-php/PEAR-Net_DNS/Manifest
index a6b0297b9295..4db597fa748f 100644
--- a/dev-php/PEAR-Net_DNS/Manifest
+++ b/dev-php/PEAR-Net_DNS/Manifest
@@ -1,3 +1,3 @@
 DIST Net_DNS-1.0.7.tgz 32647 BLAKE2B 2e48b289a51ab5a2c551e1d3ac5a546289e9cc0af51cb4b6494e3bd28d1edc5c313b52b9061b86a8978bd879d3d6ddc00deebfdcdba3d41e48d3457e1b8d320a SHA512 4f3b9c416f0b41f5bf2870b4a7bfad1756c87bec6d0b9d24c36f99792bb3fae61e80d7c366d3a632016964a6bd14f07f52cf16976018c3bba8beb64b22987a5c
-EBUILD PEAR-Net_DNS-1.0.7-r1.ebuild 319 BLAKE2B 78612adb0e914a93e5da3441fa0a14f454c63cc783a052ec3f010e18459d266d2680178b9dbc54ffad034b8c7a90ca530bf128bde67f78b14ae8584223e32609 SHA512 822a3e0a16b53d06b4c416ca5a71f7a7d68237f22df67c31a336528be9ba4ceb75f1b860e88978121e2cb57c2a50d7e4fdebfc94ab8c93020fc530f9312dbac3
+EBUILD PEAR-Net_DNS-1.0.7-r1.ebuild 320 BLAKE2B 14649cdcf8fb6b2f4a890797b79d92e6b7da6214f68136cb68a8bf8c57f8c8c66ccf3d198f64eee52e30a505be82cfed14511bb3a993ae582fe6e0cc8d973549 SHA512 aca6774de49b21d35b9211ace3490ad2adbe3e8bd1b95cb36c133f2fa0cdd60844f1c81ce68e61fce496d44d6823a5b771b4fef9e474710cd98802f1a318bcbc
 MISC metadata.xml 235 BLAKE2B 5b10304feea18aae1822be7d29bcce06c8715193b14a3dd2c4d79eb75e2767670352e2ca11e06b9a10ec04b63020a18254cd167e6d6be9072f4a200ca5d11ec4 SHA512 0b3e95bbf68eddf74289dad50f8828cffce2d904ff6f9bd5468177de979677cac11da84d1e0302c52b72085915b9d1b3496107172e5726520d51dad1981daf64
diff --git a/dev-php/PEAR-Net_DNS/PEAR-Net_DNS-1.0.7-r1.ebuild b/dev-php/PEAR-Net_DNS/PEAR-Net_DNS-1.0.7-r1.ebuild
index bd20c47d5220..ac2c7ce25eb7 100644
--- a/dev-php/PEAR-Net_DNS/PEAR-Net_DNS-1.0.7-r1.ebuild
+++ b/dev-php/PEAR-Net_DNS/PEAR-Net_DNS-1.0.7-r1.ebuild
@@ -8,5 +8,5 @@ inherit php-pear-r2
 DESCRIPTION="Resolver library used to communicate with a DNS server"
 LICENSE="PHP-3.01 || ( LGPL-2.1 LGPL-3 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86"
 IUSE=""
diff --git a/dev-php/PEAR-Net_DNSBL/Manifest b/dev-php/PEAR-Net_DNSBL/Manifest
index 225db0f8273d..949dee9aff6a 100644
--- a/dev-php/PEAR-Net_DNSBL/Manifest
+++ b/dev-php/PEAR-Net_DNSBL/Manifest
@@ -1,3 +1,3 @@
 DIST Net_DNSBL-1.3.7.tgz 8125 BLAKE2B 635258a5062ff0a7346b289f9cf429103690d71485417c948d7007e4b344dbadb25097d9f0c8731cb7eb5e72b3d7be561c7d872490d859a2328bb97f9a75350d SHA512 6591b81e5e4b98092daea3e27993099028581052a7907b79b4231d549b4d9aaa6fddbd53fd8bfe9734ae41fc85c46f2fc17e5ce50e8303fa5c166dd4b3062ea0
-EBUILD PEAR-Net_DNSBL-1.3.7-r1.ebuild 703 BLAKE2B 5f36ab4c67057a43946f548cc9dae29cec18cb6cc960e172f66ecbb5158ce815e3f9d6031ef9b8fbfa7859d87a64266e1d311ec3bae22c31ab950751215d7b4a SHA512 12e42e6085c21619b92c6abbeebc2cab9d9fb5aab8521677a3ea1cf1b52c31d37db1447ca1f14628efc678be085afe9323ee680d8d48aafd434ad576cc0ac854
+EBUILD PEAR-Net_DNSBL-1.3.7-r1.ebuild 704 BLAKE2B c78da7431b81e1639059da94839843da98a6c2cfc6b0f895694b1b025a0db84ade68fdac6aa000a493d9360a2ceb5b7971f84bd57bce7d4b1894a9585fe3adbe SHA512 01687319316585ebb356904d93e0ea7883bd803f1fc459b115975a9cd4ffd2660484638b3e03798b51370c186544da30f67beadf4ef85ce6bb91df227b45fc8e
 MISC metadata.xml 377 BLAKE2B 27b6b2942faca1e2e82de44f5ad600bc3adf30660a0426187bcb9f5b626b19d4695cf847004f20f064461e59ac0e8272020c6c7a9a965a0873cb53c3a5976ec2 SHA512 6aa25d965c699af2196695de28f817426190fa58e7f19285e5130b538e1f650f526179c75f9a6b9b478a2099e400d42fcbe04e90ac987e9fa9bf5670dac0dafe
diff --git a/dev-php/PEAR-Net_DNSBL/PEAR-Net_DNSBL-1.3.7-r1.ebuild b/dev-php/PEAR-Net_DNSBL/PEAR-Net_DNSBL-1.3.7-r1.ebuild
index 9ed68220b5b2..777b6415f1ba 100644
--- a/dev-php/PEAR-Net_DNSBL/PEAR-Net_DNSBL-1.3.7-r1.ebuild
+++ b/dev-php/PEAR-Net_DNSBL/PEAR-Net_DNSBL-1.3.7-r1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://pear.php.net/package/Net_DNSBL"
 SRC_URI="http://download.pear.php.net/package/${MY_P}.tgz"
 LICENSE="PHP-3.01"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ia64 sparc x86"
+KEYWORDS="~alpha amd64 hppa ~ia64 sparc x86"
 IUSE="examples"
 RDEPEND="dev-lang/php:*
 	dev-php/PEAR-Cache_Lite
diff --git a/dev-php/PEAR-Net_POP3/Manifest b/dev-php/PEAR-Net_POP3/Manifest
index 8470933bad1b..f7c0f26a6548 100644
--- a/dev-php/PEAR-Net_POP3/Manifest
+++ b/dev-php/PEAR-Net_POP3/Manifest
@@ -1,3 +1,3 @@
 DIST Net_POP3-1.3.8.tgz 9657 BLAKE2B 83697be081976eb9b241bb2cee62edd509492d91a7343897bf427735dd5fb08ce5d22fcfa4aa1337a3dd90da3b72782e0837068727bf0aae3a33dee852b92799 SHA512 2f77b2e9c8df8974b19c66777b7664c9503c81856629e2aedc00536afa62baaa7579370119603559d74c1f3f6d57195851e9956020cf92c202af606933c48b13
-EBUILD PEAR-Net_POP3-1.3.8-r1.ebuild 423 BLAKE2B 9e2428e5cb865b58c3b40129ce577070164e5a5b0ff1de5fc676d8868e6d6f871b7871ec6ff70deba1474c38bd9f9a6c60a0383dea49758c6cac051add8871d6 SHA512 0d67b5b5afd94e81dacd0f457e56464cc0ec82612e31a4e3e7893d440decc7967860c3eee425ed1b862605b808f8aca2dc4a0746c453f69f5fbbc289774f2545
+EBUILD PEAR-Net_POP3-1.3.8-r1.ebuild 424 BLAKE2B 4de87be038e81d4348ffb50ca81474b894516539949d56d7fe6e1b53d9024d16797a04407cfba2156648b3e70536e858b685437d9d470d1ec84ca4179d975666 SHA512 628168d9d7ec89400dd84ab424831bfb0e5bf33dadc41ffa8857508f51102dcb85be48b354aab6c30338b1a933128cef3fbd2f918a97aeb261a880f617484b59
 MISC metadata.xml 235 BLAKE2B 5b10304feea18aae1822be7d29bcce06c8715193b14a3dd2c4d79eb75e2767670352e2ca11e06b9a10ec04b63020a18254cd167e6d6be9072f4a200ca5d11ec4 SHA512 0b3e95bbf68eddf74289dad50f8828cffce2d904ff6f9bd5468177de979677cac11da84d1e0302c52b72085915b9d1b3496107172e5726520d51dad1981daf64
diff --git a/dev-php/PEAR-Net_POP3/PEAR-Net_POP3-1.3.8-r1.ebuild b/dev-php/PEAR-Net_POP3/PEAR-Net_POP3-1.3.8-r1.ebuild
index bd0152073aac..9d057963b5f2 100644
--- a/dev-php/PEAR-Net_POP3/PEAR-Net_POP3-1.3.8-r1.ebuild
+++ b/dev-php/PEAR-Net_POP3/PEAR-Net_POP3-1.3.8-r1.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Provides a POP3 class to access POP3 server"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 ~sparc x86"
 IUSE="+sasl"
 RDEPEND=">=dev-php/PEAR-Net_Socket-1.0.6-r1
 	sasl? ( >=dev-php/PEAR-Auth_SASL-1.0.2 )"
diff --git a/dev-php/PEAR-Net_SMTP/Manifest b/dev-php/PEAR-Net_SMTP/Manifest
index 440648536434..883581fe0a20 100644
--- a/dev-php/PEAR-Net_SMTP/Manifest
+++ b/dev-php/PEAR-Net_SMTP/Manifest
@@ -2,8 +2,8 @@ DIST Net_SMTP-1.7.2.tgz 14795 BLAKE2B e7be5c595e5eb9cd98c0cb82899545b02399ce3aed
 DIST Net_SMTP-1.7.3.tgz 14855 BLAKE2B b6891196a6871adc3936c89507e3aef1f7d9af045acab09aba5f145a9d1e1da5cee2608873f7a42ebc1d00f99ec733823afe94e15c283245ed1bc035858d94a7 SHA512 b1c2be95c50151e91c2dcc7b9d98233504cc2389c01e4e42e752cba606355da616e570ca86042b68498aad63aaad14ea048b0a0e4e2baa802dc58c440eb60f15
 DIST Net_SMTP-1.8.1.tgz 14931 BLAKE2B 9194e46d1987e48f58c3b851bf6921b4308d39d17b7ca028a4a58a6583171dbe31020477cd7f808ac72ffae81f315e3b416cd5f52e898e0d12cc802af5dbcaa7 SHA512 ba3b68e35d95cc41ef33105402348a322e54c6335d819d1a6e1264f25bc30def4485d0da34901ca203ccd591aeddffbe75b5acb11fb7415a1a13668198aa9942
 DIST Net_SMTP-1.9.0.tgz 15135 BLAKE2B 9413daf3741a0dd50e19cff89f501c57f442fda38b69c8dad860ba257ff7333fa4f50e2530d86599d4f38c6e3dbc67d7a401fe8be3bf85266c76701038f63247 SHA512 fb28bbf07e54d71d1a82d59b137e4905c77b5600c10cf7760890ec708fc9e6df9d47715cf6808569f88603fac80c1cfdd7c4f3893efe7ac7aecaac47ba849ec2
-EBUILD PEAR-Net_SMTP-1.7.2-r3.ebuild 690 BLAKE2B a9c21fa4c26cd898abd91384176fc0a76a2d17477466eb448f7b081887b60aecab8ae037786a8702506c3a81d1bec58ba188443eb3d8b3e609d5714fa24f0177 SHA512 b34e8ac8a60bfc7f0dd3ef26175cb50655f3775c84c3552fbd1179cb89d00732f8c88b97a8f0189d0e357588f83df39adc7913d800365752a68140e7c8b94268
-EBUILD PEAR-Net_SMTP-1.7.3.ebuild 698 BLAKE2B 7ba96ed62c9b948c110edc64e4174bceec42268994bf0105b282baff3d280ad90d3a5957504b779d36ac2619b0bd4ed1b98e953aa60595057b4d8c6679104da7 SHA512 52f3e21d5e8fe9a33102b98972ff2f4b14e2ca07998311b9959da50a49ec04ea3710b7acce7051589dcb727ce34877a22531760164459174987f06d339ddd452
-EBUILD PEAR-Net_SMTP-1.8.1.ebuild 651 BLAKE2B 4e8b2711832596a23d04afce309194e5566def419c2a1448f55ab4b5f712269b29fc56ad02137bd9533b11b3beba963d98b5ab6fdf4740a98e36bc40a7e482a0 SHA512 95c25e4a90c9e1caee3582379ef2d50be17369589699739b843e9f0643eeddf3143fdba03bf7bc99be98e21fea1c7d326aaa64a35ba4dcb410c977979f6ef6e6
-EBUILD PEAR-Net_SMTP-1.9.0.ebuild 651 BLAKE2B 4e8b2711832596a23d04afce309194e5566def419c2a1448f55ab4b5f712269b29fc56ad02137bd9533b11b3beba963d98b5ab6fdf4740a98e36bc40a7e482a0 SHA512 95c25e4a90c9e1caee3582379ef2d50be17369589699739b843e9f0643eeddf3143fdba03bf7bc99be98e21fea1c7d326aaa64a35ba4dcb410c977979f6ef6e6
+EBUILD PEAR-Net_SMTP-1.7.2-r3.ebuild 687 BLAKE2B f632d99be12794263a34ee147804cc87abf5161fe448e0771baf8044bbe10d6b7217183db55dc8d0d79a592ed869c8a39bec149c81df216bb1baa71d4341c2d9 SHA512 6d27788351d4d6386a0bc223ae39913678a9a5c5043750e263ac5a643988b1b4d2edbd2c89e13eccd58c46811f0d40f554d3610a86cd62c8ae949cfc65243a53
+EBUILD PEAR-Net_SMTP-1.7.3.ebuild 694 BLAKE2B dde59da780a90922f27196bb86821dbfd50f4735e86192f4052db322c5f0bef921d2e85db403f8882c0a70ee974481043c0e9a069100bb1339a68a028c32a6a2 SHA512 c1d844784d9f311739f0b8dcef424fcffa6a5114ae62b1a34c660cc3e77f13f71fcb5eb78e55514dc6341dea9cd84beec7d8e2f6b673aba59435c66f2be7e3ec
+EBUILD PEAR-Net_SMTP-1.8.1.ebuild 647 BLAKE2B d18830a7373e02e2a6194013d9841d81d19ce099514a779ff4887a0d74a8fdff99113795e7699b7ba8cfaa757eb3bd987f2395c8505a3a6f051004ecbbbeffa6 SHA512 55c5116c262e00ee6b3bbd416e67a78bb88bbb7c5ff7d4ed94138f8340b67d107d767d5a2d40165ba8bb4afd99cc2b192bfab66977e3795f6ff38e0056db2337
+EBUILD PEAR-Net_SMTP-1.9.0.ebuild 647 BLAKE2B d18830a7373e02e2a6194013d9841d81d19ce099514a779ff4887a0d74a8fdff99113795e7699b7ba8cfaa757eb3bd987f2395c8505a3a6f051004ecbbbeffa6 SHA512 55c5116c262e00ee6b3bbd416e67a78bb88bbb7c5ff7d4ed94138f8340b67d107d767d5a2d40165ba8bb4afd99cc2b192bfab66977e3795f6ff38e0056db2337
 MISC metadata.xml 488 BLAKE2B 599d14f0128115db0ec6ff80d664e286e1b28dc8b0dcd5d0a94c1f3229b3290af47beee88825567ec1aea4eddd799a21f178a05849658e2d0f6bf0a45ceec94c SHA512 4833cacc6321078ce7696ac7f456e1ed368300879b71a133eb81a804e985207f5baa10b8305dbfa716f08057b74bb374347f9211924ecd3fb7a1c44562eb8aac
diff --git a/dev-php/PEAR-Net_SMTP/PEAR-Net_SMTP-1.7.2-r3.ebuild b/dev-php/PEAR-Net_SMTP/PEAR-Net_SMTP-1.7.2-r3.ebuild
index 38de8c197e8f..97205682dbd5 100644
--- a/dev-php/PEAR-Net_SMTP/PEAR-Net_SMTP-1.7.2-r3.ebuild
+++ b/dev-php/PEAR-Net_SMTP/PEAR-Net_SMTP-1.7.2-r3.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://pear.php.net/package/Net_SMTP"
 SRC_URI="http://download.pear.php.net/package/${MY_P}.tgz"
 LICENSE="PHP-3.01"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE="examples sasl"
 DEPEND=""
 RDEPEND="dev-lang/php:*
diff --git a/dev-php/PEAR-Net_SMTP/PEAR-Net_SMTP-1.7.3.ebuild b/dev-php/PEAR-Net_SMTP/PEAR-Net_SMTP-1.7.3.ebuild
index 718931d118f4..ba2d4e8a2dea 100644
--- a/dev-php/PEAR-Net_SMTP/PEAR-Net_SMTP-1.7.3.ebuild
+++ b/dev-php/PEAR-Net_SMTP/PEAR-Net_SMTP-1.7.3.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://pear.php.net/package/Net_SMTP"
 SRC_URI="http://download.pear.php.net/package/${MY_P}.tgz"
 LICENSE="PHP-3.01"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="examples sasl"
 DEPEND=""
 RDEPEND="dev-lang/php:*
diff --git a/dev-php/PEAR-Net_SMTP/PEAR-Net_SMTP-1.8.1.ebuild b/dev-php/PEAR-Net_SMTP/PEAR-Net_SMTP-1.8.1.ebuild
index bbce75d23463..56fe101e706d 100644
--- a/dev-php/PEAR-Net_SMTP/PEAR-Net_SMTP-1.8.1.ebuild
+++ b/dev-php/PEAR-Net_SMTP/PEAR-Net_SMTP-1.8.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
@@ -12,7 +12,7 @@ DESCRIPTION="A PHP implementation of the SMTP protocol"
 HOMEPAGE="https://pear.php.net/package/Net_SMTP"
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="examples sasl"
 DEPEND=""
 RDEPEND="dev-lang/php:*
diff --git a/dev-php/PEAR-Net_SMTP/PEAR-Net_SMTP-1.9.0.ebuild b/dev-php/PEAR-Net_SMTP/PEAR-Net_SMTP-1.9.0.ebuild
index bbce75d23463..56fe101e706d 100644
--- a/dev-php/PEAR-Net_SMTP/PEAR-Net_SMTP-1.9.0.ebuild
+++ b/dev-php/PEAR-Net_SMTP/PEAR-Net_SMTP-1.9.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=7
@@ -12,7 +12,7 @@ DESCRIPTION="A PHP implementation of the SMTP protocol"
 HOMEPAGE="https://pear.php.net/package/Net_SMTP"
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="examples sasl"
 DEPEND=""
 RDEPEND="dev-lang/php:*
diff --git a/dev-php/PEAR-Net_Sieve/Manifest b/dev-php/PEAR-Net_Sieve/Manifest
index 6b1a526c8b59..fb52b7e20a9e 100644
--- a/dev-php/PEAR-Net_Sieve/Manifest
+++ b/dev-php/PEAR-Net_Sieve/Manifest
@@ -1,5 +1,5 @@
 DIST PEAR-Net_Sieve-1.5.2.tar.gz 16332 BLAKE2B 24d385225fbf3c4bf5612927826ced468ccb5addeac9cd49c6fb617304fa77f4a44a11e3adf09173f65315d8a0755e44e93d0a7ae1c60f1a954849bee2380053 SHA512 672d2f6f4c3241f748fbdebd804f2186dd2a5f8b7be6a75cb9187ed16e61502e4a338bfaa1815190b74ab534cb7277b534b0542309098797fcb63582dc81bdbe
 DIST PEAR-Net_Sieve-1.5.4.tar.gz 16306 BLAKE2B 6ecd4ef669211b01089f29c48735b7259c392510f09df9aa0f1126fef8e3ebbf83803ab47bdd37c9b798a2add4c3d19e1a04960290a202070e17ee1f8041d02d SHA512 c981ba421946cc1eb1f2101cf25cbfbbcf56b74f92a8a257b19a8b43fb04ad2d8c9d93a2f44903589bb6014c53cc6ae96c44b1c31c389510439f1f2da57b3353
-EBUILD PEAR-Net_Sieve-1.5.2-r1.ebuild 725 BLAKE2B 3e21e96c9a893c8f6af463c8456c943bbe62ef54620853fa9b292c7a06673b1e579abacdfcabd83d1fea0ff0a5a6536ce7d024b323dd35b89af3ae0136ec0e34 SHA512 b3db383946d33658932bcb1a56bc3297903ea248914a7f4854c6149ed050c40c316697f5d629060b459cfae6aa7a5572bbecf57e6c099b4b9051b6700448c89e
-EBUILD PEAR-Net_Sieve-1.5.4.ebuild 733 BLAKE2B 37cd0808517c8f642139550dcd2f1ced85db54228c1fed41860785865e6c5092ebda6cc27b44e40d0433e869801fd3474dc4d7cad74f5d7281b87cd446ca5230 SHA512 2c2c2c49e2d73cb122b558f388ac6179675b0012d7f19770fdea569a79a8287ec17ce876dc4bfb10fb53615b615df44baf1ce52b0d72be4440d5e32ee89edd34
+EBUILD PEAR-Net_Sieve-1.5.2-r1.ebuild 722 BLAKE2B ef44bd70523599d5381b1437224a15e012e771c495b25c159d3bdca786482ce1ff01df9ec78f200fca73886fbc553f5b17890552e6c98cd3f068650ab3232640 SHA512 cbbdf1b792b908bf97977b7f0ab46921d2ae9b3d4bb41520254f0b052f35f4b15c047f90ff43c2ffaaede831d5508d2258ae757ea5380ca791b1b8e6e02c1ab3
+EBUILD PEAR-Net_Sieve-1.5.4.ebuild 729 BLAKE2B 8a2bd4a02b28576b608596f3314212146aadeab8aaece945929bd4eca50390d7167b34e82cb58e9cd44da5e5c2863314864f388a853c5ca0365262811fde4161 SHA512 0e85a475f61594d2e38ecca7da2a699fe72b610f14959a6d3c094f236e90be707ff71857b24ae03519da84e4077f2bd536d0dd8924d8923f14e56a3ff833b544
 MISC metadata.xml 446 BLAKE2B e5028538816946cd2671d0130a50567e96988911a0b840675d09d2a831943a315b366c6d4271f7c6c67f2dda01b256cdf53f76b322fdaae8a79bdb29f3e63b61 SHA512 0b111b55018dbc43da39aa4a87691573f540b3866da616836aa04cc9ae19419b80ad5837cd8756386f153ebc8ee1d0886f12c81a3e56440654d91dc92fbd248d
diff --git a/dev-php/PEAR-Net_Sieve/PEAR-Net_Sieve-1.5.2-r1.ebuild b/dev-php/PEAR-Net_Sieve/PEAR-Net_Sieve-1.5.2-r1.ebuild
index df0ab0099dea..8d21ec78bb5f 100644
--- a/dev-php/PEAR-Net_Sieve/PEAR-Net_Sieve-1.5.2-r1.ebuild
+++ b/dev-php/PEAR-Net_Sieve/PEAR-Net_Sieve-1.5.2-r1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://github.com/roundcube/Net_Sieve"
 SRC_URI="https://github.com/roundcube/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE="sasl"
 
 RDEPEND="dev-lang/php:*
diff --git a/dev-php/PEAR-Net_Sieve/PEAR-Net_Sieve-1.5.4.ebuild b/dev-php/PEAR-Net_Sieve/PEAR-Net_Sieve-1.5.4.ebuild
index 521fbee2dfca..42e647387538 100644
--- a/dev-php/PEAR-Net_Sieve/PEAR-Net_Sieve-1.5.4.ebuild
+++ b/dev-php/PEAR-Net_Sieve/PEAR-Net_Sieve-1.5.4.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://github.com/roundcube/Net_Sieve"
 SRC_URI="https://github.com/roundcube/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="sasl"
 
 RDEPEND="dev-lang/php:*
diff --git a/dev-php/PEAR-Net_SmartIRC/Manifest b/dev-php/PEAR-Net_SmartIRC/Manifest
index 4149592ff6be..11aa4b38f04f 100644
--- a/dev-php/PEAR-Net_SmartIRC/Manifest
+++ b/dev-php/PEAR-Net_SmartIRC/Manifest
@@ -2,7 +2,7 @@ DIST Net_SmartIRC-1.1.10.tar.gz 927009 BLAKE2B b410a0b4a02e60e27860f9c6b0ab8fecf
 DIST Net_SmartIRC-1.1.12.tgz 166039 BLAKE2B 43aec437de08d6e0dd651b810b21b5fed5587e2e7e154fe4f078cc618ee501c3d962b824931558458895541ddc9dc46ec3b1f0356aac5b052dd63b498018bb47 SHA512 2da5f0f9ea9167dfd1490fb6ba1e97416c78389924f390030ba71ea28dc5b667451223daa7e3878cbae607159054d656534ff646636f8f5294eb0bda1b17074c
 DIST Net_SmartIRC-1.1.13.tgz 166028 BLAKE2B 7e2b91dc01febe561c3ce55901f999f84f87fdbe20b5a1560a060125de4ae7d9869141cc0b2bcd9dfd0479a3a0a2d3c9d0f2719f70edc122df70f181d788f73b SHA512 d8f5a4f38b0aa830a84c9433deaf16b936f79e30bd9588cb0225ec20698af3d334fd1fdb320c64d1a72b0d206ae794b9e4135f1053855f586155694f6342cb0b
 DIST Net_SmartIRC-1.1.14.tgz 166115 BLAKE2B bacd23296dea25bc898ce3ba67d89949a3ad34675000bde9fe78371a7d97596272708f114b7980c3754cb862be68b84dcb0e8df10374cb560180d50c3bf61f49 SHA512 35cf0714a695e1b40e0db1f4d20c0ea4d431940e1e5894899db0bd13137e90c790067d266dc43f1ccc2921ad1f48cc70aa448225acac4358c8eb839f755717a0
-EBUILD PEAR-Net_SmartIRC-1.1.10-r1.ebuild 777 BLAKE2B 3fde8e83155b80a9269c270385844042b8472c1809fff9e4a21629238610a2284a888a22f9f3e6da1583766db09a380395a2603cdf6f06e13f4c7a9807bd49ea SHA512 d7a6122f64b34b8f2898a27869c55f0ce500fc083c1c42949fe319bb0eaf938023975bf0fcea49a87ad08736c9d947a8fe8346a0502bc4c1f3b8988a84a06942
+EBUILD PEAR-Net_SmartIRC-1.1.10-r1.ebuild 778 BLAKE2B c8e73ee8eb12e4e53374a5213997f80f9b1cf455c07755f9d5258bdca1fc79f4e222f13fc00066bfb4256491578af6bfc71aa3417071f3156e0845e741974a61 SHA512 aaac3d8ba97ff976e534540cac5590682fc2591441b71844600eecd206bc66ce5311c03ae07885bed895a9c9c29041889aba0ef4dd513c097611272ad75e2a12
 EBUILD PEAR-Net_SmartIRC-1.1.12.ebuild 545 BLAKE2B 80991f66ddd016eacdbf1c1d1b9232bf15a507e04e4ca530f0a78d135187c1a944cb7cf57e88a4266e45a0c20c76b74b720ee733daf6562e5fc303c978e75c64 SHA512 aea02f3d6ac0e4fd6b8fa92730162e6fe07e1e6299d084f8260cead0b2e8b6d982644ed4d37cb8c8ceeb296bf118b88f8913005d81b8e972e060885aeb56d4fe
 EBUILD PEAR-Net_SmartIRC-1.1.13.ebuild 542 BLAKE2B 8ea1b954d63b2b9b79c19b5188933c28a64978bcf64e48427ff5d2d5c54b27d7ef134f30c0d04a87c3d002fa9aef40b8fce72310827c9e96600089d5707abbd5 SHA512 9e8bd3b6c852f93458b9704a28f5b0ee11d7d8eb5f08dc1ed708d1b943026f379cac37679e2446b8db06544f34c48589bc2a0b1a4f3c892b66cead0caab563b8
 EBUILD PEAR-Net_SmartIRC-1.1.14.ebuild 542 BLAKE2B b83893302467febf4d294444c9bdfe1c902aff437b199cb519228fbd74ec15f5c350f0e09c16390a7626129cf22fd384ab875b61129b6980b082556268bc6e0e SHA512 f9f78d8fd37608299b72cd9efa58e27a7095e5e6d57c81c272a641fbe040fc20a1ed40d4b63899ec4d51f10c90d38a9f6258b313e759e1a6d8d4e4ab665246f6
diff --git a/dev-php/PEAR-Net_SmartIRC/PEAR-Net_SmartIRC-1.1.10-r1.ebuild b/dev-php/PEAR-Net_SmartIRC/PEAR-Net_SmartIRC-1.1.10-r1.ebuild
index 2fc6ed912b72..413a9729286b 100644
--- a/dev-php/PEAR-Net_SmartIRC/PEAR-Net_SmartIRC-1.1.10-r1.ebuild
+++ b/dev-php/PEAR-Net_SmartIRC/PEAR-Net_SmartIRC-1.1.10-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/pear/${MY_PN}/archive/v${PV}.tar.gz
 DESCRIPTION="PHP class to communicate with IRC networks"
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="doc examples"
 
 RDEPEND="dev-lang/php:*"
diff --git a/dev-php/PEAR-Net_Socket/Manifest b/dev-php/PEAR-Net_Socket/Manifest
index 430147d19956..a1d18de984fc 100644
--- a/dev-php/PEAR-Net_Socket/Manifest
+++ b/dev-php/PEAR-Net_Socket/Manifest
@@ -1,3 +1,3 @@
 DIST Net_Socket-1.2.2.tgz 6903 BLAKE2B a0ee530ebb2962de8560d5cb2147ee831d62c5deac056a7f4944b451853b3ab65f1f46332700d4e18a1ff6e1cce138bf46f5053586bc7f8073143c6aa101e9c6 SHA512 fd415fbd4a6801b63cda3168ff275fdeae233a3cc4c62f9bfe561f83f24f89795a7e7ad862641a73bb6d6e3c0da8b56cd00e7e7a1db616de040ea7883d84caa5
-EBUILD PEAR-Net_Socket-1.2.2.ebuild 334 BLAKE2B 471b729c239e46bf465780fc16b41a1922af63c9b6df291337d548746a575b6b10c861834b82ea0180bb36e406a2c9b66348835bb5dfbdf4723a5c0f338cce33 SHA512 638e0b0a30e55a0eb2071c44846a33562359091ff8a83a6abe9200d3d49f1378e8c94b86f788bd5136e9494d20c86656664e903207c90097e3d24a8682d64c1e
+EBUILD PEAR-Net_Socket-1.2.2.ebuild 328 BLAKE2B 593531b30862ac06bec077e6f4cb076453ec1bc1c2780bce3d46f8b97d5c57d517d15f3488605bc80f96387c302f986c5d2520a648254327da0928e4e062498e SHA512 83c4256f15bbc07b299dd6518da7ee86e108ba0a0cefd5b91280e625bce42a333a3a201d966480343b6521c048e7c5fea23d820dd687f589e4a61b66cab23715
 MISC metadata.xml 379 BLAKE2B 233538cb7305e5b6f2cad2b743cbae9116c3307b72ae0645e34fdaf76f72b1fcbe9618f4ba35ab5b3942bbc2a5fd7491e4cfcd7d63f1074fd50e27552a0003d6 SHA512 bde8388227ab4467df4613b0ab02b20286f3700c3c48649dd445085c98f9885f7e46603b2977ff539e5b2577c6f703c7d397a5b0a14538f093698aaa0662deb0
diff --git a/dev-php/PEAR-Net_Socket/PEAR-Net_Socket-1.2.2.ebuild b/dev-php/PEAR-Net_Socket/PEAR-Net_Socket-1.2.2.ebuild
index 0126c8b9e888..69bf4f9740fc 100644
--- a/dev-php/PEAR-Net_Socket/PEAR-Net_Socket-1.2.2.ebuild
+++ b/dev-php/PEAR-Net_Socket/PEAR-Net_Socket-1.2.2.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
@@ -8,7 +8,7 @@ inherit php-pear-r2
 DESCRIPTION="PHP class interface to TCP sockets"
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE=""
 DEPEND=""
 RDEPEND=">=dev-php/PEAR-PEAR-1.10.1"
diff --git a/dev-php/PEAR-Net_URL/Manifest b/dev-php/PEAR-Net_URL/Manifest
index 88a589bbab84..09368740a45c 100644
--- a/dev-php/PEAR-Net_URL/Manifest
+++ b/dev-php/PEAR-Net_URL/Manifest
@@ -1,3 +1,3 @@
 DIST Net_URL-1.0.15.tgz 6303 BLAKE2B d4b89e6d5932d1494471a3d373c069bc02f6c70f59908b6db2087c88dc90b999206901c8c42a521221ff868d2e21cad3473bb33262e816c14a0ef90c6b5bc4c9 SHA512 ea61e0dc603a4dc38fd6f4d2fa3d897d3b449a6ed19fa21ed1758b1945765405855058b70a4f9d46bb9abeb238c5e4fe9d2625774e6d5af6ba7ebc1c8f14154c
-EBUILD PEAR-Net_URL-1.0.15-r1.ebuild 418 BLAKE2B 9a5daada15087efcc835f93e4b853c2edeb0fab64b508bf723dac713b38214fb0724340396d962cd24968ca56ff46d62a8ea0179d364fab5c74b4de29cc36456 SHA512 5847b8a37266fdc4441fb30ee789658d0e8c8177e99cc5a7d78fb77b50ede8e4b30300b9ea545c6b21e0e2f3136a4656f1cd0d3e7dad4e60ff1579d6a42e7515
+EBUILD PEAR-Net_URL-1.0.15-r1.ebuild 412 BLAKE2B 2bf9439e45d2e9dfa846b22ad41f2b8b3050760da2f169bc7e36b0e1b8b4af3e22e52f996d3e6acb4c6be04f05f7d92174daf715c49f09ac3602ffe7d8748d19 SHA512 c63e973b6196cc92e649bea32c1b54a503294fc66b60c47213f7bf809d913ec72b7ec128a5d5e1b4123fcbd8e3344be08291d5770cd76c007be19568c27d0e28
 MISC metadata.xml 235 BLAKE2B 5b10304feea18aae1822be7d29bcce06c8715193b14a3dd2c4d79eb75e2767670352e2ca11e06b9a10ec04b63020a18254cd167e6d6be9072f4a200ca5d11ec4 SHA512 0b3e95bbf68eddf74289dad50f8828cffce2d904ff6f9bd5468177de979677cac11da84d1e0302c52b72085915b9d1b3496107172e5726520d51dad1981daf64
diff --git a/dev-php/PEAR-Net_URL/PEAR-Net_URL-1.0.15-r1.ebuild b/dev-php/PEAR-Net_URL/PEAR-Net_URL-1.0.15-r1.ebuild
index b0f419341950..ceadbc030473 100644
--- a/dev-php/PEAR-Net_URL/PEAR-Net_URL-1.0.15-r1.ebuild
+++ b/dev-php/PEAR-Net_URL/PEAR-Net_URL-1.0.15-r1.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
@@ -9,7 +9,7 @@ DESCRIPTION="Easy parsing of URLs"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 src_install() {
diff --git a/dev-php/PEAR-Net_URL2/Manifest b/dev-php/PEAR-Net_URL2/Manifest
index 79211a38d02a..625cbe58069c 100644
--- a/dev-php/PEAR-Net_URL2/Manifest
+++ b/dev-php/PEAR-Net_URL2/Manifest
@@ -1,3 +1,3 @@
 DIST Net_URL2-2.2.1.tgz 20010 BLAKE2B 5c8e5db577ad01dd247b72f82b9014e7cc4ef94955566b65b4210c7371702de8b1b67aa2d8bee27c5d88cabec069e3a334630429547dce2e611ce0da40210b08 SHA512 356eebcb7b077e8a57d19f7a0549c973fe4923fbd83836ac000c1068d7f19c42ebebef5e07a2a5880737d0f8b2398bb32be9fa97ef931a1009d6229dfd71b495
-EBUILD PEAR-Net_URL2-2.2.1-r2.ebuild 351 BLAKE2B bc71d5a2de83f155ced9f7c1f5065cab45e305d38b1bf360ffdb45bcb51ac7289529ac26efb84f91103bb1be8340d1d696afccbb14eba2f064c708da60628e05 SHA512 9f2fe97fbcc79d89f201f11c0e102c7b5e8da6dd84d0a4db5d8b1a4b2560fb23c68c8bf8d1326ce3b3c2ef4db67b45a216cc89842fe4cea3ebca03bfd97badef
+EBUILD PEAR-Net_URL2-2.2.1-r2.ebuild 345 BLAKE2B bdc524bba0235c7ea63ae85752d2dd5958529e6a33caf529e2e2852ef56886d670086ea5094e8365b9f481f42b61426caa22c8d020388a828fb25fe719c44dce SHA512 86b3d4c1fc862e7a0460277433d44010e734b52b8db0cfcef9e28f8a1b165039709f1f1e50b964e2a9d71f2463981e8ec99cc7bfc418e7c5b3ab87699f68dc1f
 MISC metadata.xml 310 BLAKE2B ceeffe3f581bffc5354ffa5ae85c80bf3395578d2300566cab9ae2405485c06bb02d6a55eed89d33eb2af4be3e668073d6fed96614b4a40390ec5339f243f8be SHA512 ee52f22f04cecdd1a9cb93ad11d75a8e9889f988e189995707c28a3923bdac05c330c8f9e658717e3d0713b5f1dcdc772f4ec31fa216ee15006bc67340fcd84a
diff --git a/dev-php/PEAR-Net_URL2/PEAR-Net_URL2-2.2.1-r2.ebuild b/dev-php/PEAR-Net_URL2/PEAR-Net_URL2-2.2.1-r2.ebuild
index c8e4175bbe2e..436e6b7af4c5 100644
--- a/dev-php/PEAR-Net_URL2/PEAR-Net_URL2-2.2.1-r2.ebuild
+++ b/dev-php/PEAR-Net_URL2/PEAR-Net_URL2-2.2.1-r2.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
@@ -8,7 +8,7 @@ inherit php-pear-r2
 DESCRIPTION="Easy parsing of URLs (PHP5 port of PEAR-Net_URL package)"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ia64 ~ppc ~ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~s390 sparc x86"
 IUSE=""
 
 DOCS=( docs/6470.php docs/example.php )
diff --git a/dev-php/PEAR-Net_UserAgent_Detect/Manifest b/dev-php/PEAR-Net_UserAgent_Detect/Manifest
index 92ff65c981b8..9585c2d9de62 100644
--- a/dev-php/PEAR-Net_UserAgent_Detect/Manifest
+++ b/dev-php/PEAR-Net_UserAgent_Detect/Manifest
@@ -1,3 +1,3 @@
 DIST Net_UserAgent_Detect-2.5.2.tgz 11986 BLAKE2B 5a0d6dbcb07765d3f2f646500b2d5dada4b0e030c8173f988bc0a0ccea13d50cf69071c8a385fb6a7b821304dd072751b7ed22649899b371605fa289c7788ff5 SHA512 c97069ff6d99f78d580426751849cff865a50e63f55fc4596894b49604977fccc14d0eb269a66ebf56dfe89c67cb733b0ab8827766d3511a9bc6a05be2baa060
-EBUILD PEAR-Net_UserAgent_Detect-2.5.2-r1.ebuild 489 BLAKE2B 78f32418fe5f4ce9286085628d4428be381622b4a00a8855c6c1f123c3cf1267a3e0442232e473911990d2d5c6e159dce723a1dd4f885f0cf67aa655cb7fc1ae SHA512 0cad21df7026cc7fddcd2700922c3c6c4cf94edd49c57cafa52d9583eed449d006fdcd0ad92494e5625e699fa4412affbe69864f77a29f678fd49aaf7cf4b0c0
+EBUILD PEAR-Net_UserAgent_Detect-2.5.2-r1.ebuild 490 BLAKE2B 3c6b35aa08565a75ea562417dba75341d6677988f8aedb6a17ca6a0b8a582611fd702cc2c5bd6e6a2f36377d3b2383d2e1b6a2b3c422c52e03fc3e4c26884cc0 SHA512 b2aea322bd7bea7ba9945b7ceb9c424de4e61d9f6e2ad0ee87fd830fffef5173f1705aa3e02baf7873f757c1e924c59efe2b5d1ad0fa9719c90cc3ac7e516a42
 MISC metadata.xml 235 BLAKE2B 5b10304feea18aae1822be7d29bcce06c8715193b14a3dd2c4d79eb75e2767670352e2ca11e06b9a10ec04b63020a18254cd167e6d6be9072f4a200ca5d11ec4 SHA512 0b3e95bbf68eddf74289dad50f8828cffce2d904ff6f9bd5468177de979677cac11da84d1e0302c52b72085915b9d1b3496107172e5726520d51dad1981daf64
diff --git a/dev-php/PEAR-Net_UserAgent_Detect/PEAR-Net_UserAgent_Detect-2.5.2-r1.ebuild b/dev-php/PEAR-Net_UserAgent_Detect/PEAR-Net_UserAgent_Detect-2.5.2-r1.ebuild
index cbd8783e128b..4449b9ebd168 100644
--- a/dev-php/PEAR-Net_UserAgent_Detect/PEAR-Net_UserAgent_Detect-2.5.2-r1.ebuild
+++ b/dev-php/PEAR-Net_UserAgent_Detect/PEAR-Net_UserAgent_Detect-2.5.2-r1.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Determines Web browser, version, and platform from an HTTP user age
 
 LICENSE="PHP-2.02"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86"
 IUSE=""
 
 src_install() {
diff --git a/dev-php/PEAR-Numbers_Words/Manifest b/dev-php/PEAR-Numbers_Words/Manifest
index 3ff2be7707e2..2c1c04d2249e 100644
--- a/dev-php/PEAR-Numbers_Words/Manifest
+++ b/dev-php/PEAR-Numbers_Words/Manifest
@@ -1,5 +1,5 @@
 DIST Numbers_Words-0.18.1.tgz 72925 BLAKE2B 2dd624fe4ede72c00f68f259c0271ca405e76bab6b43d85024cfa70b74e50e9ac5fbccd7e770c90ac4bcc5eabbdc33ccc9bc6b691e0da2b9a05ee5a141a0d8ac SHA512 b6063db873d65bc872ea64e6ae4282da9b36aa15ac336a5b443e4bc3cc7ad49538327bb56d0b70a482c82dfa1d732426f9cc45453d4d13a25a840871e1f6fb2c
 DIST Numbers_Words-0.18.2.tgz 73113 BLAKE2B e64fd1fcd8017b1768bc0e8918a79a91b83711433d0a29d36b145fdc07cee8cc3149a31d8e3739bd59ee57a821aafd8532fd8a54684da7e2395463662b733335 SHA512 cc719ea47e7da365959a02106d80aabe2ed079064128af1a61c0c53ed44726e7169de5c9d8dd28cbf917e025841e9aa07b4b8c9313a788b0a92eab32a4edb37c
-EBUILD PEAR-Numbers_Words-0.18.1-r1.ebuild 724 BLAKE2B c19cf193a022bdaa39a8528203ab21e69ac247e9bf9dd17a3513623bb67811186018005a44e323561600bcb4fd7ebca1ecdc8d9abd73d52c74df008726e8f736 SHA512 b7dcf0caa5ed332078bfcb082458c4407b2b1a4a3d5523d962aef1a44125bd9c16d5a8668075526ceb5a7d3e940028ce493312b98216ba96db5c1ab5bbba0d96
+EBUILD PEAR-Numbers_Words-0.18.1-r1.ebuild 725 BLAKE2B 0625d57a298d831e522b82a67bd785ff88e6539b29d3e4713ee9c94fb0f909125f7dd6a423a56a53bd42462f5a8cd360aef38666bb992982e0b8a29849e81b96 SHA512 d31d0c540e863e636abf4823e7294cd3524512dc51b6a916963b1f2ae0cc9bd44fd6ba931f5dd3a029fb50ff6826adbc13c1186f3ca6dec5d1fe2393273b0b30
 EBUILD PEAR-Numbers_Words-0.18.2.ebuild 549 BLAKE2B a0616c4038cb2ad5ddff43e904659e584667fdde486b1e8b278562a24f3bce80bd6eea7c064f210bedba129f9ece3c5850316b9dc73cdbc969ef51dbb1308653 SHA512 5376a071214ae52c4dc5575cf5dd917b37d7b117e802617370ba4b83258a93ce332938ae7abf3f61714d3edb996d3d557a40c1b0e5bdc9b7955b03aebaff434d
 MISC metadata.xml 385 BLAKE2B 96fd8d4dffa8bcda044ca563466bd32986e2ddfc984494a13eabcd71377c0a850ad4458f2c0c96870105e215d38295ddd32d640c0f8cba8a6566e78a2bfcc197 SHA512 05fafb5b7437fcffa392b1898b60bc7811dbc0ac3b8da7f0b7205c16a9292cbaad3e62ca59e999ebf9cba1e3d0fe0076203dceb68dcf1a2dc2af496403cf812e
diff --git a/dev-php/PEAR-Numbers_Words/PEAR-Numbers_Words-0.18.1-r1.ebuild b/dev-php/PEAR-Numbers_Words/PEAR-Numbers_Words-0.18.1-r1.ebuild
index 58ac37420652..17d5a9524b94 100644
--- a/dev-php/PEAR-Numbers_Words/PEAR-Numbers_Words-0.18.1-r1.ebuild
+++ b/dev-php/PEAR-Numbers_Words/PEAR-Numbers_Words-0.18.1-r1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://pear.php.net/package/Numbers_Words"
 SRC_URI="http://download.pear.php.net/package/${MY_P}.tgz"
 LICENSE="PHP-3.01"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-php/PEAR-OLE/Manifest b/dev-php/PEAR-OLE/Manifest
index c3212e58301d..2a067b74ece2 100644
--- a/dev-php/PEAR-OLE/Manifest
+++ b/dev-php/PEAR-OLE/Manifest
@@ -1,3 +1,3 @@
 DIST OLE-1.0.0RC3.tgz 14233 BLAKE2B ca8ae3959b618a0cd9344a3b07c8587f4f1d10063ff6101e8f27d0c4c8b0d08a0a258ae40ac9b7ce30622d57cc6bfbb2a5b4f5b393ef69e25c276813ee70461e SHA512 36a9bbe243d0f172bcd3fc5dd0926a0e42389b4e222cca90678f41bb968c70e4d04c959f3fe3bad1704543ecbcda871a248aa445a1dc6c2f0b73925198f5b07e
-EBUILD PEAR-OLE-1.0.0_rc3.ebuild 368 BLAKE2B 5aa86660067928a1dec5bfa79374c7ec0977537a1bb95132cd9eaa0c6a8803d8cc6068fbc70d7521962b1967f61aa232a42b8991ac761d3e412f7866092c3aac SHA512 155724ddb05d7fc0e5c86c0f097797fcdfd630475aed7e297e0bd546298af33c046967ecf2327d338883210bb79801735d2fb6ee471da6db3fd310102e4a7847
+EBUILD PEAR-OLE-1.0.0_rc3.ebuild 362 BLAKE2B 8e7a362e00cad3bef86b969c54466c9417a35e8c175a1989114246f4fd67fab7a4a62a63ccaf007e3d4248482133aaeea8f249648109765200daff564cd63b2a SHA512 172cd9a1d60b78a1fe1eb8ff062b4890aa13aad8bf7d23baca847179bda0d7c43bfeb439a66c518a7fc4eea43d5ba55d56c1b5a02e32dcb8842c1a797d5c46bd
 MISC metadata.xml 365 BLAKE2B d3239ca6d5ef2cac6033276506a09ac2dc02805de0cc194f700be394828c56d754d364fa1b12895f3a78d2fc7145c57b8a097fbbc02bcebd006da21759a42793 SHA512 3871e3db946f3c1d55f06eb228b38e4b3d596b40781c0062c5aa5dad7b785312db6ddf41e16f372f3541c1eaf30264b78bd84db2a4c2843376af4111a50479ae
diff --git a/dev-php/PEAR-OLE/PEAR-OLE-1.0.0_rc3.ebuild b/dev-php/PEAR-OLE/PEAR-OLE-1.0.0_rc3.ebuild
index 47427c4bc642..4f789d2d6c6a 100644
--- a/dev-php/PEAR-OLE/PEAR-OLE-1.0.0_rc3.ebuild
+++ b/dev-php/PEAR-OLE/PEAR-OLE-1.0.0_rc3.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
@@ -11,5 +11,5 @@ DESCRIPTION="Package for reading and writing OLE containers"
 HOMEPAGE="https://pear.php.net/package/OLE"
 LICENSE="PHP-3.01"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE=""
diff --git a/dev-php/PEAR-PEAR/Manifest b/dev-php/PEAR-PEAR/Manifest
index e654c80efb39..648a41ca8f8e 100644
--- a/dev-php/PEAR-PEAR/Manifest
+++ b/dev-php/PEAR-PEAR/Manifest
@@ -3,7 +3,7 @@ AUX pear.conf-r2 379 BLAKE2B fe57574f4e4ce095f7ddd9bc26606181a86e67f6c8e6dad57a7
 DIST PEAR-1.10.6.tgz 291529 BLAKE2B 7a75c89df2b34b368564e745a727292e5c5ee3a145995c15d338901b235664d0a783ca0efc9cd1d321cc2c496e88395db376ce7bbd6ccbf55d484d7f1021cd2b SHA512 ccd436a2cb9d30b434a78483432c51a8fa5b3e96e79ca3b28131b8dcd37bbae0b782efd762eb92dc40db24d3f61025c64ec5d29aed10fd80a6b28c224c4f1e2a
 DIST PEAR-1.10.7.tgz 291786 BLAKE2B 7e760c2782832fab2a35f86e2f9072058d622918cdc2b61b7066d2f17787488d228186948e96e602bb412b76b806004642e7ba83db00950a822996869dae9cd4 SHA512 ebe93cff5546ad3a80d3d1c0284e34a46ec8dbdb7d015a11350231244baca75a57596e446c1386bc40650525f59c04617e73b1071a0fe77210dc5979edb5151f
 DIST PEAR-1.10.9.tgz 291931 BLAKE2B b9120d9b643be926e80aac33aafd0f22cacca11c10b857d99b6d51a7315467ad18d79246ab2752b962de92957fe14fc65e1d01570eb73b562b0e6e030dfb7162 SHA512 072d2eda510c05649f8d1481665bdd42efa060e6098b4b0d0353c95cf79d342ec601dd36dab3e6583b612582d2f03672a7b5de1518e3a0e8fd190ea698a17e60
-EBUILD PEAR-PEAR-1.10.6.ebuild 5887 BLAKE2B dfc0627896d0669021179e2476b981d145a27cba7396635a9eb3c3970cb5fe8a9cabb497b45ec954b21132daf253c612ad118564ad7929ef638593312e940ff5 SHA512 3b35c800d71db46693c32391dfd716bae6742286f8e3e51be77faacb701a26ff713dfe12a3be2d59df0f6877893b9acb35c0b7c79fe3d933ed4ae3f4c02352c9
-EBUILD PEAR-PEAR-1.10.7.ebuild 5898 BLAKE2B 0cc8d45ab6e8fa7084b91008f9dc6db2d53ff773b1ed4fdd0ead873480390577692e8bd582ce53b3e367d012bd0d35f64ccd3da323791794228735d927e20922 SHA512 9b5c2fd2cab1ef732d49f5643649571e5fee512caf210a6b9baa609cd3edcc3d70028f3777f3590e59cd9512f399dbfb3dd81457fa522aef66b46f6595deea84
-EBUILD PEAR-PEAR-1.10.9.ebuild 5898 BLAKE2B 0cc8d45ab6e8fa7084b91008f9dc6db2d53ff773b1ed4fdd0ead873480390577692e8bd582ce53b3e367d012bd0d35f64ccd3da323791794228735d927e20922 SHA512 9b5c2fd2cab1ef732d49f5643649571e5fee512caf210a6b9baa609cd3edcc3d70028f3777f3590e59cd9512f399dbfb3dd81457fa522aef66b46f6595deea84
+EBUILD PEAR-PEAR-1.10.6.ebuild 5883 BLAKE2B 782f4f038a12b19a056f1a7343103c1f497fef413fb007bbf8a2f41b67d2c7abd8dc92019759874f5e2715b00139a6212cee2f3e135be3cd7e1532f521e09118 SHA512 edbe76956baca5f011e9b5fe47ef9b4138252bf59912ffc742c45abe9196b9c1cad0a83fdfce899e855f25e5102cc8cb1ad3a1504f8f26220de56bf3ec0f1b19
+EBUILD PEAR-PEAR-1.10.7.ebuild 5894 BLAKE2B 4da9142dd31318085b21a46fc4df5d44c63a7abbbf2383b4cbf886bcf5395c0c00d81d1f432597106a3411b972d38dfae70be16046aa09a9c3b2528500b4b87e SHA512 8cf842e92854497a1f565813d713cc03e0a62a3a8f01fb41ccf140e82736cd8d2ab8ed50c915095b4dedb13c88c2bb4c1bcbb22366cd37828c0923ed8dc85998
+EBUILD PEAR-PEAR-1.10.9.ebuild 5894 BLAKE2B 4da9142dd31318085b21a46fc4df5d44c63a7abbbf2383b4cbf886bcf5395c0c00d81d1f432597106a3411b972d38dfae70be16046aa09a9c3b2528500b4b87e SHA512 8cf842e92854497a1f565813d713cc03e0a62a3a8f01fb41ccf140e82736cd8d2ab8ed50c915095b4dedb13c88c2bb4c1bcbb22366cd37828c0923ed8dc85998
 MISC metadata.xml 306 BLAKE2B fdddffeab9925e2296436f14f6224e0cbdbe2d386e863de68a555cf8b1e5434409af998a4b73c9380d2118db0a021401b23034895038e31559e0de0919a8c597 SHA512 2e46d7a6fcadfed2ff7be17a5f0a82b5cbf6184b50384f868a6ad8821746badfe126279ef9c114ef9d9a42374931193dba4b84483d437797636b95e6e97247fa
diff --git a/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.6.ebuild b/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.6.ebuild
index 1fb1d139c3f4..78dcbaeb6495 100644
--- a/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.6.ebuild
+++ b/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.6.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="PEAR Base System"
 HOMEPAGE="https://pear.php.net/package/PEAR"
 SRC_URI="https://pear.php.net/get/${MY_P}.tgz"
 LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm ~hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.7.ebuild b/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.7.ebuild
index fc163229c006..62984cee2a85 100644
--- a/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.7.ebuild
+++ b/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.7.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="PEAR Base System"
 HOMEPAGE="https://pear.php.net/package/PEAR"
 SRC_URI="https://pear.php.net/get/${MY_P}.tgz"
 LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.9.ebuild b/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.9.ebuild
index fc163229c006..62984cee2a85 100644
--- a/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.9.ebuild
+++ b/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.9.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="PEAR Base System"
 HOMEPAGE="https://pear.php.net/package/PEAR"
 SRC_URI="https://pear.php.net/get/${MY_P}.tgz"
 LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-php/PEAR-Pager/Manifest b/dev-php/PEAR-Pager/Manifest
index e656e161e459..668a832f8b4f 100644
--- a/dev-php/PEAR-Pager/Manifest
+++ b/dev-php/PEAR-Pager/Manifest
@@ -1,3 +1,3 @@
 DIST Pager-2.5.1.tgz 36596 BLAKE2B a41317844cd79852dd2df88dc1d3fe42f68c1dcb6308846dee119e29b5c2b1ecb16cb2669029be4b31f13d3e6a1ff315f92847554d0b18f5845425a714ea9593 SHA512 59c93117196876e87ced8549b94e31255d280bc6a47a3d2197677d118c6bba77a4a4f404266f03eb42da5da1682c13e19610fe37c244bc9aa379b14931779f71
-EBUILD PEAR-Pager-2.5.1.ebuild 289 BLAKE2B 1b1cbe6423170c09f14e308c7580ae2c4c728400a1d5b8f56a0532be56d773611a45a738764834bec055848b659dabbbcae30bf262562ec673f3dfc0d9c53706 SHA512 fd9ab683e14bfc4b367b637b94dd22b12209b3e6416115558d578a78729a2c13680896c3d0c8146f69926262be665c102029b42da71f53f826e53704bc0fc482
+EBUILD PEAR-Pager-2.5.1.ebuild 290 BLAKE2B f32788166efd108da4deb70ac5c43d061d5e7ca6156a18e9f9345cf16b12ef29163167729108a46a65473be6a795ae7ec4b6367f06123558aac62c102d113d80 SHA512 3a442e3698f775c3d73060075738a219f461535db2ae7088b3fdcbed8b78150ff57e63065b4bf46b956df91b67661a064d7b02a734670d9e2673231a2eb89c5e
 MISC metadata.xml 369 BLAKE2B 56492dbfe99972e9578a8c20602d5062261b5ce0f0348a76cec46c816d5e41b60fbf4ed9ee77548e6b545ed4024cd6e3e972b29ded9ad71446eb5e9a12b2c7f3 SHA512 5bb1d6cb8e32ac1072ee2f8224112a2758003ceaf9caa327ccc0c3c546ac4e4148e2681fb9d75376ad75c7a38a67d6a3bee4b238e6874f2729e67667cfd6ab65
diff --git a/dev-php/PEAR-Pager/PEAR-Pager-2.5.1.ebuild b/dev-php/PEAR-Pager/PEAR-Pager-2.5.1.ebuild
index bc7fdb114af1..3251c24833c5 100644
--- a/dev-php/PEAR-Pager/PEAR-Pager-2.5.1.ebuild
+++ b/dev-php/PEAR-Pager/PEAR-Pager-2.5.1.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Data paging class"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/php-5.6.0:*"
diff --git a/dev-php/PEAR-Spreadsheet_Excel_Writer/Manifest b/dev-php/PEAR-Spreadsheet_Excel_Writer/Manifest
index 152ee4bf20c5..c3efd87d21d5 100644
--- a/dev-php/PEAR-Spreadsheet_Excel_Writer/Manifest
+++ b/dev-php/PEAR-Spreadsheet_Excel_Writer/Manifest
@@ -1,3 +1,3 @@
 DIST Spreadsheet_Excel_Writer-0.9.4.tgz 58480 BLAKE2B 3469f9ab5965f6c4ef84d05c8f8ad76e57d354c6d7890327ac83b04bfe03dd675a9a9c60fc3f35eef005bfc338f3d91ed3c37d76d781d053bde15f3195d56193 SHA512 e8254e6e15862147830fd4300d6fb88978d84ad350e2e969af1d02df282c54798a429717874f8d12dc031bbc6dbe752e6b740fcd2b7094dc9eda666145f50431
-EBUILD PEAR-Spreadsheet_Excel_Writer-0.9.4.ebuild 362 BLAKE2B ebe38d94b311917b7929bd93ee03d008ed5086d84673c1b98e670c58f31dfd8c5193ddc6c867b056c2d226a2b3b6c1bde2c4b4d43fe1822bfbc2a3fe14db363a SHA512 472c71da2539dd4b4711d162bffd7e9e96509b3e4a98aeaf3c955a94b987b4fc4565726216816976faac784542f07bc5611cc04a894985c9fb79df3905c728a0
+EBUILD PEAR-Spreadsheet_Excel_Writer-0.9.4.ebuild 356 BLAKE2B 0d1990e4d16ab1e63fa00144039ad05eaa39abc5f2cda604e380f46f86308820c1659a1a7cbc15d7c2362f0e1abe0381461bc998e3747c50e202b0544645b2e7 SHA512 e5ea3e8962f0f883af66653381d5c015890d86314da4f2a37d0546cedd69bfb51739b331e5f4114eaf00f37bcda82a8b7fc202a4c5a7de93f0ab4fbe69c8044c
 MISC metadata.xml 235 BLAKE2B 5b10304feea18aae1822be7d29bcce06c8715193b14a3dd2c4d79eb75e2767670352e2ca11e06b9a10ec04b63020a18254cd167e6d6be9072f4a200ca5d11ec4 SHA512 0b3e95bbf68eddf74289dad50f8828cffce2d904ff6f9bd5468177de979677cac11da84d1e0302c52b72085915b9d1b3496107172e5726520d51dad1981daf64
diff --git a/dev-php/PEAR-Spreadsheet_Excel_Writer/PEAR-Spreadsheet_Excel_Writer-0.9.4.ebuild b/dev-php/PEAR-Spreadsheet_Excel_Writer/PEAR-Spreadsheet_Excel_Writer-0.9.4.ebuild
index 172875c4e4e2..9aea64a14364 100644
--- a/dev-php/PEAR-Spreadsheet_Excel_Writer/PEAR-Spreadsheet_Excel_Writer-0.9.4.ebuild
+++ b/dev-php/PEAR-Spreadsheet_Excel_Writer/PEAR-Spreadsheet_Excel_Writer-0.9.4.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
@@ -8,7 +8,7 @@ inherit php-pear-r2
 DESCRIPTION="Package for generating Excel spreadsheets"
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 RDEPEND=">=dev-lang/php-5.4:*[iconv]
 	>=dev-php/PEAR-OLE-0.5-r1"
 IUSE=""
diff --git a/dev-php/PEAR-Structures_Graph/Manifest b/dev-php/PEAR-Structures_Graph/Manifest
index 51f220f2ee73..24c864c4a53f 100644
--- a/dev-php/PEAR-Structures_Graph/Manifest
+++ b/dev-php/PEAR-Structures_Graph/Manifest
@@ -1,3 +1,3 @@
 DIST Structures_Graph-1.1.1.tgz 12402 BLAKE2B 049fc9a15b1ea46a8cb63576174b4b1cc491dd31794b8a1f9526958f6d54902069d16a7158615fc9708ba88bf46e0b021baa01596e443f8c6d9a7f551dac8b23 SHA512 cd4feb265e1aa05de348645dfc0b8e336486cb02c553dd8fcacb0a1eab452bf54108e07864395d55e0c92f4ffd338a5ae846b2dc28804bb23f03c91864ef0284
-EBUILD PEAR-Structures_Graph-1.1.1-r1.ebuild 572 BLAKE2B 997c308a1d363e65053e3729a9a3d1b4e319d10bb93fa124d53fc52a1b9d3fdc251940e115424273c1776c9cd39a684560952529eb3c8fb17dea21af93e969d7 SHA512 9ea98e84685980c01eb5ea3677cc9b5446281a748cc404b2cc42710188448eb5a70413a3520846353bf74efbfc78d5a87c6823539a194ff354d1e11d614c02fc
+EBUILD PEAR-Structures_Graph-1.1.1-r1.ebuild 569 BLAKE2B 682f2e5d140d8aa0de7447f1343c388bbc13a5eb19ef78ef1cb3a67038a193a9858544d74d1d78c0b2a853bd77b55a0c75697920771711346596cce848cb1649 SHA512 a0d15b311baf1a606e945719e27d4ec69de38a2edafd68f85efdce1ab59ac335f67f98dcc20d8909764f76b49ab0d09b892f6c21896632361032d85d6f8a76f7
 MISC metadata.xml 318 BLAKE2B 66ea3ce84886e04f579c77ced4528ce6a57e433031b6bf1254d5e56e950172fee80e90f164b34c9efeb9c3b5245be70241a8da2ecf3a1860be68b8cac963de52 SHA512 4681aaf5d12c2bd322389f2948669706bbc7c9e1221f0a4a5f06bb53565782fc8408856e986f73a2b41067eb1d8f1903c0b74a6ccc863fdc7f638b563071e927
diff --git a/dev-php/PEAR-Structures_Graph/PEAR-Structures_Graph-1.1.1-r1.ebuild b/dev-php/PEAR-Structures_Graph/PEAR-Structures_Graph-1.1.1-r1.ebuild
index 092042ac9b1e..7a8320bb1a84 100644
--- a/dev-php/PEAR-Structures_Graph/PEAR-Structures_Graph-1.1.1-r1.ebuild
+++ b/dev-php/PEAR-Structures_Graph/PEAR-Structures_Graph-1.1.1-r1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://pear.php.net/package/Structures_Graph"
 SRC_URI="https://pear.php.net/get/${MY_P}.tgz"
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 DEPEND=""
diff --git a/dev-php/PEAR-System_Command/Manifest b/dev-php/PEAR-System_Command/Manifest
index 5636daff2b81..071fc7d5ae8e 100644
--- a/dev-php/PEAR-System_Command/Manifest
+++ b/dev-php/PEAR-System_Command/Manifest
@@ -1,3 +1,3 @@
 DIST System_Command-1.0.8.tgz 6528 BLAKE2B b1aaf2a55f65cd020d7d619dae7c758480241f2be77eea0777cab12ad904522b8e4d8021168e1455fa8c89fabfc87c7e89a581af267dbfbab174898b0d6b8e97 SHA512 37aa9624fe566cdd8613ffd021ba32c2a3f0818b8881933dc1c2e12e2e03773b98b4295b46ef54baca26fb07015c0db2b87e44136f46c09f820994905241acee
-EBUILD PEAR-System_Command-1.0.8-r1.ebuild 590 BLAKE2B e630e86c6653e1730ddf41db870525f3e29684ace7ef184873be43242777722d4b0b752d65bc22c96118d9f57b73e6dc112ac5b28f6f06f039ff65ccfb42e2fb SHA512 1de7ec2038d12a51a5617fdbc2ce018e4c90caa631015550d2fcbe5b5138209e2e5b0914c1d8739a1e2f737f45808f4b4416ccbc2c00b04c12e85f202e991b86
+EBUILD PEAR-System_Command-1.0.8-r1.ebuild 591 BLAKE2B 4ad23092ce22c090211738223dbddc2dce0b113d8131219217a5b4435e37926217c0fd0462d6a34468265dc6af101ae966d1edf2251dee5a3639722f3930b49f SHA512 2baf3fe001478df8148f18342056fd963fe5df5fb8ad2bc34a8fb8dbcaeb57715193f42e235738f93e39018c329629d3566d7640165af43dd806529f8b72529c
 MISC metadata.xml 387 BLAKE2B fde6b0c7f1677ebc0e0e40377031d806dae236925943478e278552d9b54c6db74dc9096f975731293f0edb2493faf453d3c830e29c2678257ffa08b72c02e9f6 SHA512 c0b80ef4a3417735c450179e72e2aa67528225c307d64b4ee214e6c1c765529fe0d031c378c4f7570681843a7c5fa6eec9b224d903befc55b2e362cb10128dd0
diff --git a/dev-php/PEAR-System_Command/PEAR-System_Command-1.0.8-r1.ebuild b/dev-php/PEAR-System_Command/PEAR-System_Command-1.0.8-r1.ebuild
index b42ecba48d48..84e432729aea 100644
--- a/dev-php/PEAR-System_Command/PEAR-System_Command-1.0.8-r1.ebuild
+++ b/dev-php/PEAR-System_Command/PEAR-System_Command-1.0.8-r1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://pear.php.net/package/System_Command"
 SRC_URI="http://download.pear.php.net/package/${MY_P}.tgz"
 LICENSE="PHP-3.01"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="examples"
 
 RDEPEND="dev-lang/php:*
diff --git a/dev-php/PEAR-Text_Password/Manifest b/dev-php/PEAR-Text_Password/Manifest
index a19d70ce4937..9f9123bb6d3e 100644
--- a/dev-php/PEAR-Text_Password/Manifest
+++ b/dev-php/PEAR-Text_Password/Manifest
@@ -1,3 +1,3 @@
 DIST Text_Password-1.2.1.tgz 5631 BLAKE2B d765606e7082076f92d76d3a2e7a0721950b9fc81b267a51aa3ef56ed92706105486d3a62a6ec81e06dbdb41a15d0a7e9add8ef99c87b76af6445fb7bcbdbaaa SHA512 9f7a357b92b8013f41cd964245fd764c5f1347b41612aacb5fca66e4963e007d7470ea3a046e6186cfebed4960c5b6e6e23e4f2ab9e08c7aee10cba5ea347fc9
-EBUILD PEAR-Text_Password-1.2.1.ebuild 642 BLAKE2B 849bf1ce264712dcf12244d6961bae09081982df87f7f5319962e13f6140732650d2262a4bd661235579a4868633f716dba122db26972edc208ece86ee94d09d SHA512 f540320c450a9db3a90a25b3ea8e94dab7f7869865b768a57ebf8ac0067dd50f924151c674444748c68bc91866b8fd914b21ced375174a0cea6cacb3b5defce1
+EBUILD PEAR-Text_Password-1.2.1.ebuild 643 BLAKE2B 8c0d3e6ad0b1b52cac579d5235af8af943d36a906d40cdb3ba1eea33a46fb2de840cc4d1bb2f876e73d9a58ca4648fecc237e2d105584ccd4bf3d02702cb5064 SHA512 f6389bcb10e00bdb26d93e17312829b193a1f238e28333327f39d0b2ea62c181e67dc12d2fc965ee2361face0a5dfdcd00c51508c32917dabece629dbc799b85
 MISC metadata.xml 385 BLAKE2B ae61061345cae297a5e8b33dda7940d439f7e59b44cd6b7f298664737a821fdd4abd60cd52655261a999fd850620e4ffe51767931c7edcba6354582c6bdfebf3 SHA512 3898231004b87b780853676c8779ff5162d1111ea9a85ec795ed7dbe1563c6ed70e1dcfc3a8f9fb76b1893db606d9b84e83963537d53f0e3b302893c1b87a4e7
diff --git a/dev-php/PEAR-Text_Password/PEAR-Text_Password-1.2.1.ebuild b/dev-php/PEAR-Text_Password/PEAR-Text_Password-1.2.1.ebuild
index 74b9759798fe..716200a0a39f 100644
--- a/dev-php/PEAR-Text_Password/PEAR-Text_Password-1.2.1.ebuild
+++ b/dev-php/PEAR-Text_Password/PEAR-Text_Password-1.2.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://pear.php.net/package/Text_Password"
 SRC_URI="http://download.pear.php.net/package/${MY_P}.tgz"
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 ~sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-php/PEAR-Text_Wiki/Manifest b/dev-php/PEAR-Text_Wiki/Manifest
index 3f00ed941ca5..c87992555e31 100644
--- a/dev-php/PEAR-Text_Wiki/Manifest
+++ b/dev-php/PEAR-Text_Wiki/Manifest
@@ -1,5 +1,5 @@
 DIST Text_Wiki-1.2.2_p20170904.tar.gz 86810 BLAKE2B 3277fbfae5683c147c1537a7f789b8b9500bfa39014832ed08d91028882813f60727f9ff503d38dde5f017fd5f1ec69d61775a14094b0d267a1b0019f10090c8 SHA512 8e731a6cc9ec0e964d86de5eb96f285155f61d21e229499132f5b06ef8ff520658a42c9c6fb60d73b9bc8828ec9b616bc11e4f04bdd6e74836d52fc53a92dd71
 DIST Text_Wiki-1.2.3.tgz 89906 BLAKE2B 8db39418478085bebbbb32f8d80fbf9f6b9058adf9071f7f7493a4e493fbd088e231759752ddc41aad6c58b1ddab953111df006f901545c896e266b75dc70f26 SHA512 619f5323648b1344c572a1aa03626dc00a4dd9f201814fee5a3b962f69085943a1c7d1ef06e7c0cc4be7628bc76889972f1750aa9f7f67348381df1af4a4bd73
-EBUILD PEAR-Text_Wiki-1.2.2_p20170904.ebuild 788 BLAKE2B cbde6b3691e496ba9948846126d2b2889e48eac75eb2e6cc3dcd4f4402732263d77833bd40e4d58ba10eb2b9f341b84e674dbe48974803915d08c324bcb8472c SHA512 8434ce7a3b5051ef53bc3a60dde6a8efa90f286ef289523a009a23611d8ad2ca3fdf8cbd5d52b9a0171bf0f7d5fc74181cbb4077fb5c345f19e41f4597ce1f0b
+EBUILD PEAR-Text_Wiki-1.2.2_p20170904.ebuild 789 BLAKE2B b763b531a8a49908d0e997af2d445be8af4d316261c50db43d7f82ad928c94b2e8441c1d751aa5b3bf4bcb2838c9ff4848e02e046a64ae52c20c3baa0b665f07 SHA512 d1359cfc068abf04c23c33c0e6c83d364782bafaa1f5229b43b270eaa589af5b33c96b6abb68c8331693bdb7e0418be42b6172ea7c81762d87301ce1be8005d0
 EBUILD PEAR-Text_Wiki-1.2.3.ebuild 485 BLAKE2B 453781199731fc81f62380c2464ebe401672d7b988cf1e836c0eb9c5336263d99793694f40e0a6e7cf25d3558d71ca42466d89c798bdd7391ddf2592f3d2cc7f SHA512 689c2a9a6afc79004e581f5e345448e8256ab9edc58c573e33456b16697e567b21ca53cab200ce2c9d399512edc1913e83dec334505b7eaa05ef1335bbad848a
 MISC metadata.xml 326 BLAKE2B a47b62c42ef2f751077622f4a770ffe42148d1d185948fd956e3b6caa57b37962af47733e129851e8931c449fd958d76f5261a1483d0dce20dbd73ff07d688ec SHA512 0d6ef943c1e68ec438ea1ef9627745be5abd72124e378313cb68895452db19873da7ca975f5865ca191b8b9b6855665064000a7d2071df334f486a5b172c7aeb
diff --git a/dev-php/PEAR-Text_Wiki/PEAR-Text_Wiki-1.2.2_p20170904.ebuild b/dev-php/PEAR-Text_Wiki/PEAR-Text_Wiki-1.2.2_p20170904.ebuild
index af6715552fb2..24295e7cc65e 100644
--- a/dev-php/PEAR-Text_Wiki/PEAR-Text_Wiki-1.2.2_p20170904.ebuild
+++ b/dev-php/PEAR-Text_Wiki/PEAR-Text_Wiki-1.2.2_p20170904.ebuild
@@ -8,7 +8,7 @@ inherit php-pear-r2 vcs-snapshot
 DESCRIPTION="Abstracts parsing and rendering rules for Wiki markup in structured plain text"
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 # Pull from github as pear.php.net is not updated
diff --git a/dev-php/PEAR-Validate/Manifest b/dev-php/PEAR-Validate/Manifest
index 175fdc27f109..3e4759d84e06 100644
--- a/dev-php/PEAR-Validate/Manifest
+++ b/dev-php/PEAR-Validate/Manifest
@@ -1,4 +1,4 @@
 AUX 0.8.5-fix-test-php7.patch 905 BLAKE2B 5d000b990cd38d697af861ff828f2e9efd8fdef0e2a6fec87fbc60208c1a9f40686c5c0be63cdf862221311f235f87bccb975cf78bb4d5f2b03be6916d3899bb SHA512 44aa6cb09f19ad3246bc7e6d825de786139da433564b902bfff020be52b14f554f752f0ca7f790d378a74a3a62e15cf13383a9bff25db2f67e4496d5bcef5e7b
 DIST Validate-0.8.5.tgz 21668 BLAKE2B 5f1897f9a796bab047beb7bdcf79726f58f069874cb1d08a17078c8d974bed626b3e37dd792e8b941fd0115d9060986278d459037580adedf6088ef51d5f2c13 SHA512 4e2e330b0a74a24d18af262ef42d872ab9eb2386e11c5647d898c60e11a29d06c97c0295cdf0999c3a4805f3f1efae2949c54520da50cf6adfcc5a6c4f6e1b63
-EBUILD PEAR-Validate-0.8.5-r1.ebuild 566 BLAKE2B a5f74e8824ea5aae2c8a6662f0bc5a14c15a62a60ca76645b8d7bf4af0943896263a731cd7b9dfe5c651de537c33a3bcb5de8907be1548ea57c11006379a5855 SHA512 8de0c4cc0a897fa007f98793d2100ba79bcf291bd7801e22beb2f805564b96e8b6f89108734569b0968bd3847e48889a5319053cc1f0f8ca40af8f6533037db6
+EBUILD PEAR-Validate-0.8.5-r1.ebuild 563 BLAKE2B dbf1117e9cb946628cbb19c7fd18279a6374f20a5ecb49e25c7fd28aaf48c673d72946af5373447d3662f6c5a204259d829f2fb5a1c63da506a74dc7df306dec SHA512 61ef188c1525f667db32c7e3fdac70c1c9893dd436cef27b6b82bf496937f61a0dbdbb97653c84f3d2b9bb0a581f2cae65b961d9e69b9827f53eaef12a4ae4c5
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/PEAR-Validate/PEAR-Validate-0.8.5-r1.ebuild b/dev-php/PEAR-Validate/PEAR-Validate-0.8.5-r1.ebuild
index e26e198b0c9c..b1581cefac62 100644
--- a/dev-php/PEAR-Validate/PEAR-Validate-0.8.5-r1.ebuild
+++ b/dev-php/PEAR-Validate/PEAR-Validate-0.8.5-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 inherit php-pear-r2
 
-KEYWORDS="~alpha amd64 ~arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 
 DESCRIPTION="Validation class"
 LICENSE="BSD"
diff --git a/dev-php/PEAR-XML_Parser/Manifest b/dev-php/PEAR-XML_Parser/Manifest
index 3109f56aa80e..f50948bcd9a2 100644
--- a/dev-php/PEAR-XML_Parser/Manifest
+++ b/dev-php/PEAR-XML_Parser/Manifest
@@ -1,5 +1,5 @@
 DIST XML_Parser-1.3.7.tgz 13339 BLAKE2B 10cc89dbf4f6c4b28fea73cc45757e71a897b01fd21a3d2711fef5eb0cd33e1fdeda143ce88dd425fdea9802a02f3d7e352ec17295b88d8cfae87af6a342f622 SHA512 b4e6c76962eb47f15096e7d77658cf41ca372a9389967e5204e865b253da4f4e248e7b893aa4c6624bb1178e3985667d018849df6d9a07aa6b9a707c743fe64b
 DIST XML_Parser-1.3.8.tgz 13534 BLAKE2B c0227d48b43b9b0fec3251c81e56017344101b4a2dc9a5eb85310d1130148a1d7e365b3b6e3f4fcab03aeac1f702f81f22d45c4db67ff515836ef8a173cd7d4c SHA512 f840acf2e068d642177d37958487021b5bf57cd33048738f2f18fa35d83dfe428ce327900a9a141c2a184e4dbdddc9e8eefaf87604131f516f016aee30aad603
-EBUILD PEAR-XML_Parser-1.3.7-r1.ebuild 340 BLAKE2B 461b24d6f9999b41213f3cbd93d8ed6ed9682497ef744d2b63ded72c340f5ce227a19ebe514380abf1005db18864f92164a070f148d90b173f20a467d5b4a83e SHA512 603a7209d4fc2e78241967d66111044827b74b8709965c8f359ce7f70faae23982948ced4560e3a4ed60e01c42901b5d547ffe613be0d9288b3986f6108cf81e
-EBUILD PEAR-XML_Parser-1.3.8.ebuild 345 BLAKE2B 1c29d6abe713bfacbcad861c42bdd9d2102898d70a0297a6a9c92c31bf7fc564a2e749b3bc04c3e1f0f7dd48c074520601cb02b388e6994476abe84e138157aa SHA512 c2988d38a8ecbeff0945d695878ee8f9068a91f7685c14a505b65361f350b69faa794adecbf4f07ad49dcb23c28db7168539380fab763c397c81126e42f4d36c
+EBUILD PEAR-XML_Parser-1.3.7-r1.ebuild 334 BLAKE2B be69242c296986e9de587d25dad835a3ea9a8c60ac8b9763c44b5db1cc7f95772be37c7ab015b1ad379d4ed176b8d8cb99d8d9756f8c729a01f3fe3e6427039d SHA512 5f8922661cfb1fb190ad65b9d10c537e69e0bcbbf53ca4e732737f6566d0fa359447716553f733bbf772c953cc09949da9d8c24b5274d511b124362a84638241
+EBUILD PEAR-XML_Parser-1.3.8.ebuild 341 BLAKE2B dc7dd85a9ce752a957097bc131fcc7ac565139ebb5f693d8731a2f191ba20e3e17ba9a72cfbf024eb86f8858497b9fb23a3eff58e7b174ca89d7c7c47667d19a SHA512 7ea194eca487b19e8d95f3c182fe3dca4e3a07bcac0758c6e2bcafea7774bddc3cd1c362157b6ce6249f79e97aa7ebecf02286453a481bf435cc94ecee16065c
 MISC metadata.xml 235 BLAKE2B 5b10304feea18aae1822be7d29bcce06c8715193b14a3dd2c4d79eb75e2767670352e2ca11e06b9a10ec04b63020a18254cd167e6d6be9072f4a200ca5d11ec4 SHA512 0b3e95bbf68eddf74289dad50f8828cffce2d904ff6f9bd5468177de979677cac11da84d1e0302c52b72085915b9d1b3496107172e5726520d51dad1981daf64
diff --git a/dev-php/PEAR-XML_Parser/PEAR-XML_Parser-1.3.7-r1.ebuild b/dev-php/PEAR-XML_Parser/PEAR-XML_Parser-1.3.7-r1.ebuild
index 64adb34b1c03..51a979e0e4df 100644
--- a/dev-php/PEAR-XML_Parser/PEAR-XML_Parser-1.3.7-r1.ebuild
+++ b/dev-php/PEAR-XML_Parser/PEAR-XML_Parser-1.3.7-r1.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
@@ -9,7 +9,7 @@ DESCRIPTION="XML parsing class based on PHP's SAX parser"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 src_test() {
diff --git a/dev-php/PEAR-XML_Parser/PEAR-XML_Parser-1.3.8.ebuild b/dev-php/PEAR-XML_Parser/PEAR-XML_Parser-1.3.8.ebuild
index 067f292a84c5..0ed52ec9f9b8 100644
--- a/dev-php/PEAR-XML_Parser/PEAR-XML_Parser-1.3.8.ebuild
+++ b/dev-php/PEAR-XML_Parser/PEAR-XML_Parser-1.3.8.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
@@ -9,7 +9,7 @@ DESCRIPTION="XML parsing class based on PHP's SAX parser"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE=""
 
 src_test() {
diff --git a/dev-php/PEAR-XML_RSS/Manifest b/dev-php/PEAR-XML_RSS/Manifest
index 0c2a2e3607ab..00645616c8b2 100644
--- a/dev-php/PEAR-XML_RSS/Manifest
+++ b/dev-php/PEAR-XML_RSS/Manifest
@@ -1,5 +1,5 @@
 DIST XML_RSS-1.1.0.tgz 8178 BLAKE2B da290ea2e656372478435451b5043f3254e1a06423495c62c753b636208ece31e5b9aebe59a9b84254aac70d2088b4c35f78b763b6045d29c467ff0989bbc6fa SHA512 947b040ec71728328bad0130da874132c12e8c14a37f57b0ebc4e9db26aed49d0f9702e20ae401bd92782e1895de71dbd5daf09adebec0eaf268c77dfe183c24
 DIST XML_RSS-1.1.0a1.tgz 6717 BLAKE2B f38aaa6981d94668031272cd48f5648ce9fec499fde4627b6291d1a9c0dea4db72779e3ce7a089be9ee5d23ad56d05c6bd3ffce031b9ef3f4fac5360c3da4420 SHA512 e88c7618cad60a775c07ac26aedf05b7ce7ab3c9f012f3e638031b3567227db237ee2e1238fa051f9f415388a5d7c131af02b8200e08c01a9078654ea5877ce8
-EBUILD PEAR-XML_RSS-1.1.0.ebuild 494 BLAKE2B 81e459768c0ab8d048f6765c65ce5427e9f32aa5a9a9a55df0f6b46796b68e194d7d2bbf20d81f2ef5ac746e3cdd311968b62fe7796a9f6c7648fe4e938848b0 SHA512 5c3d036faf76e1c9efe9bb61c0b8604f953d4b9db00d2cd169694fd26b7ef87a847abcf547c91db7939b494883216c29ca8beb2b8ff54cda771311fb7cecb9d3
-EBUILD PEAR-XML_RSS-1.1.0_alpha1.ebuild 746 BLAKE2B 554c68510078b822c2b47e753490691d68bdeb61eca3862edae897f02efb1a723ddd443dce26992ec2cde24c22a89b087798b25557772224f39e09094bb242e4 SHA512 8f4affe7a06b34b42df6f75940862beb900ac19c470f0852a2815f160287306f5eef5491776539609ab472bd44310f34fc46ee04a1c7367a6b1bb36e7527ad3b
+EBUILD PEAR-XML_RSS-1.1.0.ebuild 487 BLAKE2B 8440250374caa8e0576b6fce03b94365a20fe427d9426c940a0f2d157b1fd32d908e260909fb751a11741f05c5dba16f35de902202d95b46a232c33186f520a6 SHA512 f7057116b01bcb37cc34080458443c1df0e4a1d4ac539643183883ff5709f496620797f635a3e17cfe3b6ffb85137c4e45a5a67a0d6a3d83694f83a9e4b1e41c
+EBUILD PEAR-XML_RSS-1.1.0_alpha1.ebuild 743 BLAKE2B 67d9ab981aedb3b2d5891e2527687d6056da53e4a601609e329b9cdb703bec6f840439eba624e25af67fec487a39da60b601924a60a5ce61525fd5549524d98f SHA512 f519723e8cdd39d770024e211eda1932fc3075d5dfad8ca847ae37869f33e8498d9f7b83e0940491588131584aa29de31f7b7165108638b27cbba5c65d9a46b3
 MISC metadata.xml 373 BLAKE2B 23ac6ae6766ff928da3558d2c05d6ff025f56b76045044634d1706b046bfd1fe741dafc1ed10489113521f23e2ccd95f8d529d8be240948ee90f09ba236d9dae SHA512 e5be199ccfe81e85816b693f8b624ad2346e8948717dd26496e8e9f4b048c9189515fb11cabbe55a26f81e448937db5f1f16f37cb59bf3d24c3e3a68725e4e30
diff --git a/dev-php/PEAR-XML_RSS/PEAR-XML_RSS-1.1.0.ebuild b/dev-php/PEAR-XML_RSS/PEAR-XML_RSS-1.1.0.ebuild
index bd575d2b9911..f564a5c6a962 100644
--- a/dev-php/PEAR-XML_RSS/PEAR-XML_RSS-1.1.0.ebuild
+++ b/dev-php/PEAR-XML_RSS/PEAR-XML_RSS-1.1.0.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
@@ -8,7 +8,7 @@ inherit php-pear-r2
 DESCRIPTION="PHP parser for RDF and RSS documents"
 LICENSE="PHP-3.01"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE=""
 
 # Only needs PEAR_Exception (not in the tree), not all of PEAR.
diff --git a/dev-php/PEAR-XML_RSS/PEAR-XML_RSS-1.1.0_alpha1.ebuild b/dev-php/PEAR-XML_RSS/PEAR-XML_RSS-1.1.0_alpha1.ebuild
index e19a5909491b..7065b7a8d229 100644
--- a/dev-php/PEAR-XML_RSS/PEAR-XML_RSS-1.1.0_alpha1.ebuild
+++ b/dev-php/PEAR-XML_RSS/PEAR-XML_RSS-1.1.0_alpha1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://pear.php.net/package/XML_RSS"
 SRC_URI="http://download.pear.php.net/package/${MY_P}.tgz"
 LICENSE="PHP-3.01"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 # Only needs PEAR_Exception (not in the tree), not all of PEAR.
diff --git a/dev-php/PEAR-XML_Serializer/Manifest b/dev-php/PEAR-XML_Serializer/Manifest
index 4b729a8b85ca..27ff68e05417 100644
--- a/dev-php/PEAR-XML_Serializer/Manifest
+++ b/dev-php/PEAR-XML_Serializer/Manifest
@@ -1,3 +1,3 @@
 DIST XML_Serializer-0.21.0.tgz 33362 BLAKE2B dc7d9f5d40f538e4cdb6a9046bd5ba4d3970fe710dca5b809a808e057f782628aa124a6f541b800f55e15c5f5aaef335150c7342a2a96845ae60eb275bc897a3 SHA512 f547fc92d5b102681229c8c8830ca8201ba529c06a720ad761f2c3cedd757d858711c3d8b0dbd2f88b0815758561acc297cee002162bdee6002c1c7310c8f67a
-EBUILD PEAR-XML_Serializer-0.21.0-r1.ebuild 651 BLAKE2B dc21ca9b6914653f9de3ed858828a5e2da4eda499d234f59fbe2195e39eefabe08455b38555a6284583426982a22c100bbfc6b99d99466486ecd5c9cfead54f9 SHA512 3c8aa596bfc75faeaaa3f9a1661deccbcd2a4b90f5f24079724fd16fbd9abfab2d5078a728175e01bb7262d821daebe6cb55a9698e8dd2aa101f5bf43a2f095f
+EBUILD PEAR-XML_Serializer-0.21.0-r1.ebuild 648 BLAKE2B 20bc8f856059584d8b4c916af8d935d4e4d61f306aa0e3871b6d38717147eca36e1b655618abcfd659c3e2b9f18897610d9380c7bcff224b51b71a21c480204d SHA512 c02b75ca717670709d050f4941cf3e04ab58f16a22b82970b111c6e3454d12ca74021f0521bac898d53177025f9339bd6337da3932c61521e6a593d7caa66c58
 MISC metadata.xml 316 BLAKE2B 901abfe1e0ca8a6a60797d2376d048547811123601008200b10f48784af8d0e92eca6bc0ce38d8d2b2cf8c0c98d47666bf9215546cf53d7a1558dd8018c03c8c SHA512 c8b05d370fd3dad6cda63253224f1e5cb331efbbbcc1915d5ca90551b79754c6a18f590278595128a46c39d8721f913ec5dbe01b08874a64584d722853dafdef
diff --git a/dev-php/PEAR-XML_Serializer/PEAR-XML_Serializer-0.21.0-r1.ebuild b/dev-php/PEAR-XML_Serializer/PEAR-XML_Serializer-0.21.0-r1.ebuild
index c9a0413d9dcf..149c678a9679 100644
--- a/dev-php/PEAR-XML_Serializer/PEAR-XML_Serializer-0.21.0-r1.ebuild
+++ b/dev-php/PEAR-XML_Serializer/PEAR-XML_Serializer-0.21.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"
@@ -8,7 +8,7 @@ DESCRIPTION="Swiss-army knife for reading and writing XML files"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE="examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-php/PEAR-XML_Util/Manifest b/dev-php/PEAR-XML_Util/Manifest
index 1849483ad0e9..466af37e5f9d 100644
--- a/dev-php/PEAR-XML_Util/Manifest
+++ b/dev-php/PEAR-XML_Util/Manifest
@@ -1,7 +1,7 @@
 DIST XML_Util-1.4.2.tgz 18993 BLAKE2B b2667aed3b3ec75dd8fca1625c6fa3d03a7662c24ce0fce69cb983f42fc3f45bc0bf27bdee7353c1d29fe0eabc181f2cbd415883575f5d6cf7163097c10f6d9c SHA512 e0a328f92cdcd09277238e14d68b73cba319ab9b4e9c50ab102b43f73c889599f5933415dc228bd1feb56a48c1527e0e9a86999ee2209b2d84131691aee74cbe
 DIST XML_Util-1.4.3.tgz 18842 BLAKE2B 1cd0065b84e07a8cbc7f4d44c10362d40e71254b4964b3aa3d4d11cad5cb7e5bce780f926c69cc4fc871ac3c28d8239a428c145389950b4d6f6e626b6215dfc9 SHA512 c21a7cef90743e124c4bc8e0453b634de8f6a6b0aac060acc1a17f481a2eb8757d322b05c69151280b7651cea927b2c64b7d49b9fd815dcdc606d0472d967310
 DIST XML_Util-1.4.4.tgz 19069 BLAKE2B bd809d8a3250e5d08793f6d6ae50ebdbd0e95e46b667edf7176ac125b902cee8334bc6abe85704a945a508cba6a2146e5bbcb6039a40316ea8d2b1b30590d139 SHA512 3c2ae4492e76729da561398a43416cd540284297b497d2c1526515c00ba2918b9d520b580e21111cf9f9e133d473289cc9c896bc28ddd0c64a849ee66f897e42
-EBUILD PEAR-XML_Util-1.4.2.ebuild 647 BLAKE2B 7fda91830bb003fa4c85c7aa60a7c165b2ea0d78d65c04c18577694f40efe00ec071f656bf87e2a522fb898539f36aa248779c120da46cc952b8b3729a8de0c7 SHA512 d9042e3142a596a4594eb11106bf45c532e8e5b87fdf70318c91ab467760d033b1aa5b4deedacc7a0b44c023ba6a3b7f2ed54254d1f8a5fe2c7837ca947f05b8
-EBUILD PEAR-XML_Util-1.4.3.ebuild 657 BLAKE2B cc6b49689d3af6cd1da56bc6ddf18967959936a8d5a937d52f6b4ad0800d257d60489049a51c68372e3556c4369253e4f7d4859c43338eb055cc22c7bc93c920 SHA512 5f4633e7b102d5ece34a90939b79bce7e1c0527245222ddae9c0ed81ba5ce77527c97239d64452c096c899f9a0930c39ae4f624def3caed7298c8b7db5256806
-EBUILD PEAR-XML_Util-1.4.4.ebuild 657 BLAKE2B cc6b49689d3af6cd1da56bc6ddf18967959936a8d5a937d52f6b4ad0800d257d60489049a51c68372e3556c4369253e4f7d4859c43338eb055cc22c7bc93c920 SHA512 5f4633e7b102d5ece34a90939b79bce7e1c0527245222ddae9c0ed81ba5ce77527c97239d64452c096c899f9a0930c39ae4f624def3caed7298c8b7db5256806
+EBUILD PEAR-XML_Util-1.4.2.ebuild 644 BLAKE2B 717f57dc48c6e2c6bd16d2e904127d2c4e8342799adae57280dbdc92b4cad69d05ef6af7733ba42560aa362b0dc9ba75e57879d473cc6bfc84d33367ae8a084e SHA512 7b598dce906169b7028b2d21b01b2086433648e4648d8b9ea67ed85c7e1a4b42e7cce18dc3918fbdf0007de5a8088b405f40420701efdcff917df9ce636ee4c2
+EBUILD PEAR-XML_Util-1.4.3.ebuild 653 BLAKE2B 3c6d1e9fa538c15bb9e0759c8deafed0b3d089bcccd36f92480984792c2147c4b9b9bc260e1d396f9d61af07e246fb6fa294f20c05b5d6f918a40279bd6e7f5e SHA512 2c3498f89487c86f1a4d95c30a7fcbf8a6ffee8d749faf7fe63dae599935fe667c8c69c3f777c4948ed3680a4a3169bc883e41aa3b54f33d8ac9c411c211750c
+EBUILD PEAR-XML_Util-1.4.4.ebuild 653 BLAKE2B 3c6d1e9fa538c15bb9e0759c8deafed0b3d089bcccd36f92480984792c2147c4b9b9bc260e1d396f9d61af07e246fb6fa294f20c05b5d6f918a40279bd6e7f5e SHA512 2c3498f89487c86f1a4d95c30a7fcbf8a6ffee8d749faf7fe63dae599935fe667c8c69c3f777c4948ed3680a4a3169bc883e41aa3b54f33d8ac9c411c211750c
 MISC metadata.xml 310 BLAKE2B d264a3ec20fb493c77b95f1225895c3a77d0abbe96f7c5240b804b785211d9aa0b2b26e1efd39e2592d96fd6f2ba42568e97428f944ee6952e101d577bb3e99b SHA512 a0726d245546336d0efa22151520fc51461ec1bdb31f2a4012ffcd5fd94858168f621aa903e489e44c43023c8d1a2b3f8aa05d995975b1abf7332e7cf3eed5e8
diff --git a/dev-php/PEAR-XML_Util/PEAR-XML_Util-1.4.2.ebuild b/dev-php/PEAR-XML_Util/PEAR-XML_Util-1.4.2.ebuild
index 249fbef1f8ed..cea5e82621d9 100644
--- a/dev-php/PEAR-XML_Util/PEAR-XML_Util-1.4.2.ebuild
+++ b/dev-php/PEAR-XML_Util/PEAR-XML_Util-1.4.2.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://pear.php.net/package/XML_Util"
 SRC_URI="https://pear.php.net/get/${MY_P}.tgz"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE="examples"
 
 # PCRE is needed for a few calls to preg_replace and preg_match.
diff --git a/dev-php/PEAR-XML_Util/PEAR-XML_Util-1.4.3.ebuild b/dev-php/PEAR-XML_Util/PEAR-XML_Util-1.4.3.ebuild
index 5cbcfd31b559..1c013e52239f 100644
--- a/dev-php/PEAR-XML_Util/PEAR-XML_Util-1.4.3.ebuild
+++ b/dev-php/PEAR-XML_Util/PEAR-XML_Util-1.4.3.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://pear.php.net/package/XML_Util"
 SRC_URI="https://pear.php.net/get/${MY_P}.tgz"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="examples"
 
 # PCRE is needed for a few calls to preg_replace and preg_match.
diff --git a/dev-php/PEAR-XML_Util/PEAR-XML_Util-1.4.4.ebuild b/dev-php/PEAR-XML_Util/PEAR-XML_Util-1.4.4.ebuild
index 5cbcfd31b559..1c013e52239f 100644
--- a/dev-php/PEAR-XML_Util/PEAR-XML_Util-1.4.4.ebuild
+++ b/dev-php/PEAR-XML_Util/PEAR-XML_Util-1.4.4.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://pear.php.net/package/XML_Util"
 SRC_URI="https://pear.php.net/get/${MY_P}.tgz"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="examples"
 
 # PCRE is needed for a few calls to preg_replace and preg_match.
diff --git a/dev-php/PHPMailer/Manifest b/dev-php/PHPMailer/Manifest
index 33784b97d0fb..dfc8945e4d09 100644
--- a/dev-php/PHPMailer/Manifest
+++ b/dev-php/PHPMailer/Manifest
@@ -1,11 +1,15 @@
 DIST PHPMailer-5.2.27.tar.gz 159227 BLAKE2B e5ff2dd62cb12396bee58f0dce2fec3148dcf425cd91d69b76659ded7c38d8d5dea4830649dbeaa4732e098deecfe7ee77e338497b080997a44fbcf28d0833c7 SHA512 5a466133feec323d3739b9a1bde36731f5e65ecf61aa3f2fa6cc4ed0bd6f9280f8e2a17b6b7ac481846509ba3e8b0b97062f0dbbd644ccec3884b7a03f489a1b
+DIST PHPMailer-5.2.28.tar.gz 159284 BLAKE2B 866a38c60ac55cbd8aefec5ad82211575e672578ddff1af435e676c7058b0a090884f3e5f2c1e6f30c94b01e393f982f644e578ea22c931ffb8a93be717e379b SHA512 c2dd762b8958d1dc68fec52d7daae7337e05cadcbcf9e67c27247c808877cf3132e80cf6d4c9c577f8ad9203e433282e45f2166bccce025bcc4477724eb7036f
 DIST PHPMailer-6.0.7.tar.gz 91706 BLAKE2B 1d3d22dea463040840c1259cfbdbcf2da59cd31e915ea8a73bb9981844e9ae6e32ca1e9a40a576fedcd8c0a049f92f9b5422040e12dcc66b2c555dbd36126c67 SHA512 0d00ff177fc82c3cc54ed04cfd333739c9346f89dba1ccb8bdcccc01abd3de4c55c96dbd51cc0f4cc76d6690acd22c6bb4f632dcfb785ec1d0a32a8751ddf6e9
 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
+DIST PHPMailer-6.1.5.tar.gz 94435 BLAKE2B 8c4f515af8260d20524636be6c89a3d6a8824691037d956141a2822163d1e59676c0dcf96683b0e4434e94ffb3f57235afc758840920156a7aa664290ad04b65 SHA512 a741dd4fa585619892cc1d8b4ce35fee7c1f5f44d946b368e1a363eff77e5afe1553ac295db49c6110131561c1124b1dc184c9a405fb1652e7aeab9d7b0323a8
 EBUILD PHPMailer-5.2.27.ebuild 1962 BLAKE2B e5386bf9d75ae81df44fa8703e2183ff79b39054c14bf49a1b57774d148aa5d460c7f5310a98d447a114187844c0453e4017eb5cfb1f679e4910ad60b83cd6d7 SHA512 b6eab2bf9413f7af3083f92a0d8f3252a3773526711c724786df3b3c056472f6a0d7a0725ae58adc3860cff8c5ee9707a7198e0193a7fedf31c878408d385b85
+EBUILD PHPMailer-5.2.28.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
+EBUILD PHPMailer-6.1.5.ebuild 2219 BLAKE2B 08a599591d6bee673c5df6b47d9c9aea0db8e7ba8d46d7568afbb3d72ee65d0e23215d5f77ac3ac04e70ca26a98847323b9a54dd4adef8f453efc90e89d52a3f SHA512 c69da2436be943fb96828db9268f73d34ac129b21521800f510ef79db257b090627f8bc5c384708f38bc9aec024116461b1a9bfce2dc9b0b7e20c23fc41dad27
 MISC metadata.xml 446 BLAKE2B 178ea98081e664641c7a8632a1c7dac9b5cac8992b0b945208f5ef654633340daced2473bbdc342b70d8b168ac2206ba132f7ab9601f61b5436f3eb3e0441ca1 SHA512 3dfce858cb0e00b526f04a5764a6173d4711db4f21f52b6d827b82f1cddea4e33f533e645dae95d0bb6a69699b00520a414f2e322c76b56aee1e4ea047bb4bb5
diff --git a/dev-php/PHPMailer/PHPMailer-5.2.28.ebuild b/dev-php/PHPMailer/PHPMailer-5.2.28.ebuild
new file mode 100644
index 000000000000..160382537ad9
--- /dev/null
+++ b/dev-php/PHPMailer/PHPMailer-5.2.28.ebuild
@@ -0,0 +1,64 @@
+# 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"
+IUSE="doc examples 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] )
+	)"
+DEPEND="${RDEPEND}
+	doc? ( dev-php/phpDocumentor )"
+
+src_compile() {
+	if use doc; then
+		phpdoc --filename="class.*.php" \
+			   --target="./html" \
+			   --cache-folder="${T}" \
+			   --title="${PN}" \
+			   --sourcecode \
+			   --force \
+			   --progressbar \
+			   || die "failed to generate API documentation"
+	fi
+}
+
+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}"
+	doins -r *.php language extras
+
+	use examples && dodoc -r examples
+	use doc && dodoc -r html/*
+}
+
+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"
+	elog "the documentation should work without further modification."
+}
diff --git a/dev-php/PHPMailer/PHPMailer-6.1.5.ebuild b/dev-php/PHPMailer/PHPMailer-6.1.5.ebuild
new file mode 100644
index 000000000000..e27c5fd93328
--- /dev/null
+++ b/dev-php/PHPMailer/PHPMailer-6.1.5.ebuild
@@ -0,0 +1,73 @@
+# 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/PHP_CodeCoverage/Manifest b/dev-php/PHP_CodeCoverage/Manifest
index cd7ef120da37..eba6c0ab02e6 100644
--- a/dev-php/PHP_CodeCoverage/Manifest
+++ b/dev-php/PHP_CodeCoverage/Manifest
@@ -2,6 +2,6 @@ AUX autoload-7.0.10.php 646 BLAKE2B 71515ed7d8eb3339e2756e8f1af7bba2e0f1cf1b0fc3
 AUX autoload.php 3859 BLAKE2B 65cc25809352182d5c852743a25e2e297fe0819d2feac0fb47cd9f80e9ea36a16f7f2dbc2657bd73d1e484c1b851b5603eaec8c6d0f7fa5e6582876661587fbe SHA512 c33ce039a84f0f6d260bf46e8308df806968328c80dd89b778c76a0620d514c5e101ac3c741a3b68aba07cb59ccfae4a0dfb6157fb056e03ce65c1478300655a
 DIST PHP_CodeCoverage-4.0.7.tar.gz 349906 BLAKE2B 2ba665efa2d20a5eb66c66375a095425057e883697dd1d3ba7214e56de29c96451516adb2843589e64732c994aac7289afa0e34a74d56ef9bc36f36e635eb944 SHA512 8418efa2585d05b3004ab50e7ba77513429d649f71fdb2479412424a0f40a698a962e1d87852db08fec8f92e569a9a5767dad66d5d64e072637dde33182e71e9
 DIST PHP_CodeCoverage-7.0.10.tar.gz 237217 BLAKE2B bd2dc397c15a85ca020abf3d9a1dfb5f438020b577cded7942110dd8affa2d703ed40bf01ae68f38c6ae9383ba59bc9f7706af99596bce0b40cef6d2a7e92fb2 SHA512 37cda2d3687f62b5546372507954eeedd4da1c03fa9cab147b578d035046763799ca1535310ba458403094714060fe8f1327bed6951440392fee3df551be73b1
-EBUILD PHP_CodeCoverage-4.0.7-r2.ebuild 1233 BLAKE2B 7914fca282b0f34d24b556f979a4d3447d8565c13cea2f9c7eb98362571cd21c1617660be8b0371aa03a33f4f2a0e56e6ad3fce3083c7bb93d0210075aaf755f SHA512 fe88f5144c50c39c7ef9ee61100c721a7ff356cc9b53391bbf64ea0b306589d244b039a161a499f51b5902ba774186bdf72593d8a08a6564b45fd9d74d56728d
-EBUILD PHP_CodeCoverage-7.0.10-r1.ebuild 1954 BLAKE2B 8231f32894f4bbbab91a5fe18487ef52b14d150a06cb616b4a50e5cb68268c94cded840df667dc400db95a813a0a66b841418975735c7d26a177e234175d270c SHA512 8026c5371053cb53345287149af7a9097b5e0bb0486cab71011b6fd4960b37931d2819b4ea43315392313c6f001a13ab22a09506f50b4b33a45c198a73eab970
+EBUILD PHP_CodeCoverage-4.0.7-r2.ebuild 1229 BLAKE2B 5ced7e458099c4b413c07866278b5eca7c222cbcfc6c9fd8e6e51ad6fb7dec7ee41864092ee7d7351237dcff4e02b77861d9f6ad96545320c7b1b9f89471390c SHA512 facfdc792174d39f30d0426d112760e50ce377854add38f72974cb3ac870a1d561744a6258a341790548e419b92478f8994886e0b62ffe47588398d70012e08f
+EBUILD PHP_CodeCoverage-7.0.10-r1.ebuild 1950 BLAKE2B f4d7c6741c7ce8633759ff2746725e54a2c59b9a2fd9b89ae9d2d8d91615a003f17021b032239d3bcf6ca0f515cd350a3d3a855dd84335ce094f7a93651e5d82 SHA512 bbfaf0bb0d726343a8125cadea2ae56a4f42285c2169fc8661ef02b9d357b0d3fc57a22dbbf25fc35d55e2883b3dacde20aa52ba30500279c01d5fd394b20edc
 MISC metadata.xml 339 BLAKE2B a9f68f1bacb42eb4e4a6463dc03080c343501c0f6525ed08556f9d04606b42c2744f458ba35fff8cd4f5c8e68f81f226193dc79bf7808da8c4229588f34dc3dc SHA512 5057d1d80d43e4e8f8a6f2bbddabda7c7f639eb26a7be8f534ac2c470341834c7d99e78a20f18062ef1c7252b75428af122f2858dac78f88f8ab6d50a6f66f4a
diff --git a/dev-php/PHP_CodeCoverage/PHP_CodeCoverage-4.0.7-r2.ebuild b/dev-php/PHP_CodeCoverage/PHP_CodeCoverage-4.0.7-r2.ebuild
index 2f76b6139f1b..d6400d0c181a 100644
--- a/dev-php/PHP_CodeCoverage/PHP_CodeCoverage-4.0.7-r2.ebuild
+++ b/dev-php/PHP_CodeCoverage/PHP_CodeCoverage-4.0.7-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=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> $
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-php/PHP_CodeCoverage/PHP_CodeCoverage-7.0.10-r1.ebuild b/dev-php/PHP_CodeCoverage/PHP_CodeCoverage-7.0.10-r1.ebuild
index ab03fa0af49e..8d9aa8f32d3a 100644
--- a/dev-php/PHP_CodeCoverage/PHP_CodeCoverage-7.0.10-r1.ebuild
+++ b/dev-php/PHP_CodeCoverage/PHP_CodeCoverage-7.0.10-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
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> $
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="test"
 
 S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-php/PHP_Timer/Manifest b/dev-php/PHP_Timer/Manifest
index c98129ed63b4..5040b0c1527a 100644
--- a/dev-php/PHP_Timer/Manifest
+++ b/dev-php/PHP_Timer/Manifest
@@ -5,6 +5,6 @@ DIST PHP_Timer-1.0.5.tgz 3597 BLAKE2B cf82c3ff61a1f96a94a5d3743270be3262bc2ea28d
 DIST PHP_Timer-1.0.9.tar.gz 3740 BLAKE2B d551fd676046e6bb653fb9a9bde7a976b9b2081d26caee23177b899fa01e11ae1fb2183234ab43745798c058222574b1523064cc07d25485315eef9090f892a5 SHA512 96db90cf2af18fabcf44bdd4dbb5d298402ed2c8e49f3033fd1b89b3aa8c880d9f8677897d4d542a0db6348bdd9c697042deb0b6e26242adebfde1bcdb4bc559
 DIST PHP_Timer-2.1.2.tar.gz 7090 BLAKE2B c99dd69433b3579e9ed81f06188cac280b6ac383bce12acd9c6a00b5a6d6017a94c427692b639ad1516c1faebec8e160b7cd5c7e5e96043dd3dcb6d283d2095b SHA512 199175e048560756867180cd99a3ca1766431d14091f1448cd8011df5f7824504a6c586ef15d9e53374bdb9dbd1731c05b44509e59d92d725908ec2c46d7d576
 EBUILD PHP_Timer-1.0.5.ebuild 427 BLAKE2B 7f8cd242ba49525527a20fad8dc4997e4dd451d4049962de71978afc5350e2beee40de331f414930bb2f50c8beed03727ec3e840cc13d5324f01b69efb5b6ba5 SHA512 802255716d8340c81bb2c0073064c511eaa4591f8061155cddd30cd53084100e55e71572b7378d7680dcb23cc4811d36cf527d6850ca9a4b6d1ce48ee1820525
-EBUILD PHP_Timer-1.0.9.ebuild 749 BLAKE2B 3dfbb0e374ff57e69d8616b522fc9ab6bb904936f85898ca780e17e94d70d9e5dbcf09451213d4837151a72893dee9ce960fd8b32833d34b16a08a88a7ce2c36 SHA512 5db2aaae6ebaa5bff70f0b7b98f1dea2a5fdb70ebd227494455431418e07b986a50789386c57d6a560207dffa44332a541118fb2993394e87e727488b82b93b0
-EBUILD PHP_Timer-2.1.2-r1.ebuild 805 BLAKE2B aa46c463b94513b992d2bf1856765aa29b4b08cac2f18298acd689bef46dcdb1515efac276bed9cae130d8ba383f120e2d577deaa6aa46f9040f33eef1f0641c SHA512 5aec98ccc3f63c0851c9a910750ca0626876b64daaf696a8728a40d46a89fca33399a3d39f61d2bde0707f212c7d87cbabaca4bf02cab3c3f167d23ec2d314b5
+EBUILD PHP_Timer-1.0.9.ebuild 746 BLAKE2B 39d3e566eb473056187ea889b5930790020f15aa6009a52dcdcfd7ead2f70f04d4be07b2f254dfabd709fcb4ff908e219243a3b0dd0a3d979d7c3e6d021872fc SHA512 26475c0072437edb886d79a7349859e73837fe9531af84fba83140843608e177490ff25c472cd338f229a2e48dcae8d528cd2a3502498e0da66b802ed6adde14
+EBUILD PHP_Timer-2.1.2-r1.ebuild 801 BLAKE2B 39ead1428d8d0122159074136271ca6d611569abd78cd6d3ee35397e95715eeb6e76d49f9253c009e9f03b44fb07585d50d4d404cfb673826fd94603b2c2084f SHA512 e948958d4da8ca1841bf806ee9fdeec9bd8041231447314a68f2cb91694be22fe784065a23e8de7aea3c9ed99d80291810891733bd143853cb3747b1d074c133
 MISC metadata.xml 331 BLAKE2B a4a67930fc96c32bc75804af627a97742700619e362bf59992ee8a8882b2cffcd4fa6de297abbcc42d6e33119fd10933e65a1291484acf4dd091c5ed55dcd81f SHA512 e3e0aaa2728b2f5f65592f56027ae9674e7e9abf4bdb2fef90854b6d8d270f4f6a103c4588401ef076d53fd3c4c2fceb2d9b5145dc3af43c8913ccd5f0e2ee53
diff --git a/dev-php/PHP_Timer/PHP_Timer-1.0.9.ebuild b/dev-php/PHP_Timer/PHP_Timer-1.0.9.ebuild
index 65be6c5fa0d5..66d7999f6a01 100644
--- a/dev-php/PHP_Timer/PHP_Timer-1.0.9.ebuild
+++ b/dev-php/PHP_Timer/PHP_Timer-1.0.9.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
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> $
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-php/PHP_Timer/PHP_Timer-2.1.2-r1.ebuild b/dev-php/PHP_Timer/PHP_Timer-2.1.2-r1.ebuild
index a0785cb680f7..73db2978201f 100644
--- a/dev-php/PHP_Timer/PHP_Timer-2.1.2-r1.ebuild
+++ b/dev-php/PHP_Timer/PHP_Timer-2.1.2-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
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> $
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE=""
 
 S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-php/PHP_TokenStream/Manifest b/dev-php/PHP_TokenStream/Manifest
index cae983777df5..1eb824d230f0 100644
--- a/dev-php/PHP_TokenStream/Manifest
+++ b/dev-php/PHP_TokenStream/Manifest
@@ -2,6 +2,6 @@ AUX autoload-3.1.1.php 2833 BLAKE2B 594aafd23673466891934600e0620437390703a3a3e4
 AUX autoload.php 407 BLAKE2B 8f8afa7524cd277d498acbbc468ad6a7a2b57223111fa459c63a545251430f18be06e7f8079a3ae4f959338530e211d6d7a770bc0739668b9b612b4fbabc1719 SHA512 f80a008f1f443c90814c034822211e94e76d8af31b7da6fb39bbb5aace6473bab8befcd177fd3c2b5b2891bdb62bac66fb03ae6e0fe9429335950b134fccdeab
 DIST PHP_TokenStream-1.4.11.tar.gz 13388 BLAKE2B 20ef9907ce660e2958ffd50f588ead563efa04c9fc4adda4a823830000f73ee7a4c988adc79d14e549c4f02836b7128aa42b01b26996a090595d34a191282b67 SHA512 4e8d8d1eb16169d46b64a43d91f3066d49fe8e3f184d90c5c7cf4234ebfe4eac271a811744b201f05dc86976b3c5b8ad4ae9f2532165a3849980663f1ac5852e
 DIST PHP_TokenStream-3.1.1.tar.gz 14275 BLAKE2B 5300768f79cba17a08f55a58a05744eef55df00fc0f0144612bddd3ba5d0494fe19bd5b74d56b57d345f5d98b63033aa05e6d157c0979be163e51dc7cc5ad19f SHA512 3a1e36d13b8d77d6fe7d1617fc43a8d59b68af6ee6182afdecf5c970c844f7cb63f3056ce7f6aaae17237b948c5ff9862438d823c2eda179e24c1bb4fc4f4e02
-EBUILD PHP_TokenStream-1.4.11-r1.ebuild 783 BLAKE2B 3e2b005138362ce8ace2032b42fd9e9be1a4064e0414e92d53ad2da48aca43869471075bbab7faf1c2b5d967f7eaf573086b764fb3258e3824107a0bb0df482d SHA512 5a5edd0479b64399dc476c190a7782c6c96ffe26bd30e2d3f273542f474be99ac254b57c597496028b9c9e0201b97e0ddb1e29dc857e1973d76cc9d1730f4a4b
-EBUILD PHP_TokenStream-3.1.1.ebuild 1378 BLAKE2B f138bb9ce3d3d297afadf2f93edf22c745a2c3328e08c1220cb4f60f0489bf75da8bb362b290718e9e858cbed8acb8757afc6b2045380a26f7f24d1d400060f0 SHA512 a42603239c2c8021c53854a2a250ad2863ccbbe80bb465e67b0a1335967b8ceee2b975cd152a2d668b26ec3dfdbd5315cf1631a57d32d46048920bdfe38f37b5
+EBUILD PHP_TokenStream-1.4.11-r1.ebuild 780 BLAKE2B 0597f73cd5b89cde44414a54370e47e39d55b8bfb2310464bfa0c2fbb8364a50fc280d6d9222285d24adeaa7480aaebda76c1bb7fd76f55e308240fe3e61d87d SHA512 ba550b9327dd713b750c7938441a434b1628692efee4155dc5f7bfa537410854aac97035b29c937fe23440a9af0f8015fb564f7c2d8312423709bf12eff13222
+EBUILD PHP_TokenStream-3.1.1.ebuild 1374 BLAKE2B 01c501a49dd3e3769c5035a16b407712c4f5606b2c88aab58d09013fbe1f5ee2a131b4666e918698155862f9858f0b8c3ecb0e865d8ab0a448a1feade1fc7d5d SHA512 e31f779346bd409c3e89b9c86740084c97f559024b06193404b392f6b3b7b35cf233a3d6cee5834b0620acaa741d1e611067dfc312ea627d8f55c9ad23926d3b
 MISC metadata.xml 338 BLAKE2B d6fc1656deef3d826ef47d31a4c02b873a71c287f2d349f96dffa1fcc0b3006a3549a80872efd23b09288d144d18776aefe6e7e6c52045eedc53beeb1331c794 SHA512 1f758ba782eba886cefecaacc81c4c1e77c6e00f6a1e265f5fdf789f757b3c2e3ca742f9c3c1f6427920b6ab42388b34cf2c7d50b11247c4a94a3fee69993e47
diff --git a/dev-php/PHP_TokenStream/PHP_TokenStream-1.4.11-r1.ebuild b/dev-php/PHP_TokenStream/PHP_TokenStream-1.4.11-r1.ebuild
index 4cf938f01d85..9aa26e094500 100644
--- a/dev-php/PHP_TokenStream/PHP_TokenStream-1.4.11-r1.ebuild
+++ b/dev-php/PHP_TokenStream/PHP_TokenStream-1.4.11-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
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> $
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-php/PHP_TokenStream/PHP_TokenStream-3.1.1.ebuild b/dev-php/PHP_TokenStream/PHP_TokenStream-3.1.1.ebuild
index 106234e79bf1..dd4a45a86757 100644
--- a/dev-php/PHP_TokenStream/PHP_TokenStream-3.1.1.ebuild
+++ b/dev-php/PHP_TokenStream/PHP_TokenStream-3.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
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> $
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="test"
 
 S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-php/Text_Template/Manifest b/dev-php/Text_Template/Manifest
index bd8dd31c6534..958a582c79e2 100644
--- a/dev-php/Text_Template/Manifest
+++ b/dev-php/Text_Template/Manifest
@@ -3,5 +3,5 @@ AUX channel.xml 804 BLAKE2B d6a965a41a220f07e3a0d206bc3359e2649b55d186e7975726c1
 DIST Text_Template-1.1.1.tgz 3444 BLAKE2B 7b063aefa5d1cd8b8faf4f68c12552a50eac8d2bb0007ccde632c88325974c32734cbd76d922e0132acdf9e6cb157eb229bf7edcf2697d7f1cfc789b3f33529e SHA512 0eaf43ab8c0810f63d81ddaf62a5e81b2e244161fe79fe09bec05ef732ee07012a1c6c3711885a118cf38334131c57ac1d326e0a711eb3e6d3099c5475f80e7f
 DIST Text_Template-1.2.1.tar.gz 2561 BLAKE2B 24871781f622fbd35cc0f524a092eaed2de0988137a52f05a559e89bcdc9248807a677b164f5ef9a246848709d3bd3ae0c4cd5e738fe6cd42ff0a2ea8aba577c SHA512 d8277f24782d0897b26d2e4922c2658047c484cb86f477916d6ad6dad3e5150bfa0a1ad38c79463a3fde97702bc65edb207a481b6f6cd8346c5fcc33b4cff8ca
 EBUILD Text_Template-1.1.1.ebuild 503 BLAKE2B 6abf128379c8f4e72e427bbee57501381abb0aa414de5bd5fcf1fa7b036bace681730475cc634a33d01f7f9731d1c7bd923656bf0f0e0bbc50088a39f777f769 SHA512 5c578722c7752f36b87f2557db82bc0b3a71c9e1c9cff729fb81b35b5eb592ecfc9be4581f0a81df7571a7c2ff519d50cdd065de81c12748957681a72b21e7c4
-EBUILD Text_Template-1.2.1.ebuild 759 BLAKE2B bb6d95a626d529aa34121a8659b038a693bf04255db94b9404d0b00ed5b35f32f0069e6bf198b858208d9b794360f6217e33abde99f9e21e2fe3925c8170f1e3 SHA512 f81004ec333d247fd09556a99d6b3e8ca4b686546aa56de92c8baa8028a61a86a61e7de24833ccb23209f074d498b3749f2a0b24faed6fa88c86d97887e57ca1
+EBUILD Text_Template-1.2.1.ebuild 753 BLAKE2B e06cf884de7a2ce3c5bd71cc56b6ffb0ee7ec895e7e41ba6fdfa1187a0ed69c74ec15935c22c35a1c3eba57e586a69917c54bc01e76ee1b54c16eea483e391eb SHA512 c55a729a73c787508f61630b47bed5394cce2a348a6ee54984fd2239ed233477789cb238239ba9509cee7d96abc58e7dc446aaceb1b6a4c699af51e3eed42636
 MISC metadata.xml 339 BLAKE2B c5e702f4976f584f0e7e9818f8c1c12a3ac5cd693faa20afb9f60444306f8be4820efef2cb1786508efb51f80241998abeb1c5b7cfe530d4ab86f4e8617be9ea SHA512 5a723a5167a669b4fe417f81d895d9de2b3ab6767b54f68cd246e8f3e446c841ddba918cb83575cb3c21b1051a1973e4eecd8f5c9f7c708b5911fe4473fb4ce6
diff --git a/dev-php/Text_Template/Text_Template-1.2.1.ebuild b/dev-php/Text_Template/Text_Template-1.2.1.ebuild
index b5ac4d6fbd9d..6b48de388a3f 100644
--- a/dev-php/Text_Template/Text_Template-1.2.1.ebuild
+++ b/dev-php/Text_Template/Text_Template-1.2.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
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> $
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-php/adodb/Manifest b/dev-php/adodb/Manifest
index 9801bb638769..e6e3d90f1a3d 100644
--- a/dev-php/adodb/Manifest
+++ b/dev-php/adodb/Manifest
@@ -1,5 +1,5 @@
 DIST adodb-5.20.14.tar.gz 465896 BLAKE2B acd8494141584b0c02c2e30aa59b3916ae811b8095ca724d22f44ed2cb1456b8e8afc7ff9af41e7476f4a93809e762c44a175fd3775b69654107813342b3a47a SHA512 fa9b764742f3edf15e79da7a34ca52b19f51454fa20bc963cce963cdd40f7e78671e993cd672a21e9917aa2440c63601fbf768b5259dccb64b458a5be6f4b0eb
 DIST adodb-5.20.15.tar.gz 466749 BLAKE2B ca232e15094eaf728dd82b449cfded4f84fc773e5dbe1a06b7bb15fc18487080131c52d7ae9d77e6a401bfd53baa7875810c94b6bda615d0a836a715914de9d7 SHA512 87c6f508f49a54e436b56d47d3c0b2801f4f022876013a2ffa23e751cc4c7aa83aa359e51acc4f8351fd596ad4f5d71326204ae3d57514c4354f68669e412c73
-EBUILD adodb-5.20.14.ebuild 1444 BLAKE2B 2319ca487ac6443446d2b53a33bd731f77db4b01ca5d62d964a94deebe3df16fa527ad1f26477156b1c0073a7e0f2005a72a95e4a4277358d2615ded2cb3d375 SHA512 ef9092b2504eadb5d4b8a3a7939cc17ed4e6cb8760ffaa77ec7f3f9a1b65c94345ad53ecb33de06e7c48626ee59f4fcf65adf666eb3b4d49df59b7c15e48a95e
+EBUILD adodb-5.20.14.ebuild 1445 BLAKE2B 7beb52ccfc3211800b38230d5699e446cf95c263a49971065cd62944aae9c6aa9b612508af0b1c186edb9fb0be45115a10910214d019ca97fe90db50183f7bf7 SHA512 41f97b3992ba0898746d321a3b099f1309794bd38ddaf4ff15c7567bf97ee74e71da73179e1b21afcd9ad73f0f62d960fe4429d393cb1eb65ae52eaa39c07650
 EBUILD adodb-5.20.15.ebuild 1452 BLAKE2B e5286f48e8bdf5fdae03893ea87292ed6da2dffae801140e2dfcd31c1a5994f205d2a17b1f58bcf757f14f1bc6230d367a4deb007facfd097f298982529fac98 SHA512 20efbbea0b7a1db0aae61b433faab6d4ec222c8082c37a5a34875cf214794e1a104a4b5e47e84f822b43576f64233ecea9a1a19e5759c98cef28c80aac4b1444
 MISC metadata.xml 490 BLAKE2B fe6674acd3eb6a1c95ae4deb6f4215b0c31251918cc96eef1d6c784914d8e3c7eb273b868b90d7b8585421acb58172b7ce6a54d99b6b41abfed923b6e34abfd3 SHA512 c81b170a7a9532e27707f6bccea90be62a8504228571eae8b5564eea37c6789bafcb2681e4de8cc99916e1304056121575c3d8487cc1102f13909d14a7565fcb
diff --git a/dev-php/adodb/adodb-5.20.14.ebuild b/dev-php/adodb/adodb-5.20.14.ebuild
index 8c4f1d98e6f0..8e3d846c988f 100644
--- a/dev-php/adodb/adodb-5.20.14.ebuild
+++ b/dev-php/adodb/adodb-5.20.14.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="BSD LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 sparc x86"
 IUSE=""
 
 # If you want to be picky, we should require that PHP be built with at
diff --git a/dev-php/composer/Manifest b/dev-php/composer/Manifest
index 6fc16d2b9e2a..80729ef9b811 100644
--- a/dev-php/composer/Manifest
+++ b/dev-php/composer/Manifest
@@ -1,12 +1,6 @@
 AUX autoload-r1.php 973 BLAKE2B d01d694be6f50af0e995dc24da1545b666609ce0098b4206a1843b249fedcbf983f1826a3158e98ad7cfe675057b12fe52ff82b6b66e2d582ccf983b929c2f90 SHA512 06f9e2862521c54b765f55fe1c1e02728befd296916d0f41357d4e6004f2d00ddaa533ed5210e92e4642eb548a2d5fabf80604fc09ef7e871742716f4c02d112
-DIST composer-1.8.6.tar.gz 409002 BLAKE2B 15d9621e062646b81518aff816a3e0b187bf1d9cd617c32e3a19167ba0c89b9ee8f55503e7d2e6d3515939f7d50131c5be0786fc04518409584960290eb32118 SHA512 97ab93acba24307897fe64b3762e77ebca9fa794c5eb476a9d774feb124dbd53b090c36b0fa9d1da38ea26d13af8bf13d7bc733c9c465fba6b908e590ea96dbc
-DIST composer-1.9.0.tar.gz 410267 BLAKE2B 5bbba9eefe703eb55a7d63647e8ecb3e4560b4ffeff321282f4f0c0db1aca143e210b517f98cf5fd9a9839d714b9badb1092b9d1430d65f29e5b134d9321370f SHA512 70e484404752a6b4aa94dc2c5999ab615c5518b60a580399096c7d2b0a026feadc7c10509a00920eab8f0298015fb1f5f82abc426927a35b8bc3c3e454d0b20e
-DIST composer-1.9.1.tar.gz 411432 BLAKE2B a5f495f2358166aa04062fa16074fed3978eacce864d0497a0c0ecc9ff130068d37435c15d972740d663acfb1b313276c9b6bcfa32e3e6860e0c0b15045e5d9b SHA512 34ab19a61285ccc065dbedb276677919deaff35a0e963e361d9f2dfb183e80bcea9fb04931ab7cc9fd4088a8806cf516acf0651c692d00d1cee515f7fe46de82
-DIST composer-1.9.2.tar.gz 412196 BLAKE2B 7ded79c5eb9a6446fd5eb442f443dcd45746504d940d133c67df6ccb68ce7e5ba905dc1f719b914563884396cd8914fc5b0606441692248fbbae0dafac838d69 SHA512 fbdb6f0204deb0756c8a4e496b12e4200071263bb6a23b521c880a0da547d6cbea294dcb66875f4de85369bec12a9553355ae8b33dffab387ae69de42cd1d5a0
+DIST composer-1.10.1.tar.gz 421852 BLAKE2B a40f59ab0af5eba777f1926bab78e55fd1973e53b324eec73fdca70678fc1cfe6f892790a61a66dbdbe07caa03343bfd109318daec99c2c18707785c6bf149e0 SHA512 ebc3ee48bf0d2597e7221e9ac0ab7188e7a99096d5dacdee4176b4c7b4d252d079c117b5bd9131ff38d8963f95930fa9c83fa51ed542d4f7d58276561de1f2b8
 DIST composer-1.9.3.tar.gz 412212 BLAKE2B fc293a38baaf87cc2581304e1438d48e94a85ca2c5da4eff388b1307dadacb67327d9612211af70f1734872c7a377b8713492839c2d330c9e0e7226206cdc1f6 SHA512 42a37b2187895e06f2dc8c5225a1328377afc408ad28af12d9ef5d15fe083dcf22459ce0f482abfd528683113af5f9fd1a19758294c59c69b59a5bb32e65f2cc
-EBUILD composer-1.8.6.ebuild 1232 BLAKE2B 09ef27512b2029bc3201939bfea919540ec53e704479edf8fd7551bb7e6423f1ad3438603d620dd501dc5ab7c7aeaa725b5f5d6a8ec94216f9a1a3b73ab43c74 SHA512 863ccfd1e0be4e415028d7aa59f5635b0d743b16e19a9b5f2f70b952103a5d7ddd4655c0fd478ed029a272bd264825f1432c2cd6208000a3c30908e565b089e0
-EBUILD composer-1.9.0.ebuild 1232 BLAKE2B 09ef27512b2029bc3201939bfea919540ec53e704479edf8fd7551bb7e6423f1ad3438603d620dd501dc5ab7c7aeaa725b5f5d6a8ec94216f9a1a3b73ab43c74 SHA512 863ccfd1e0be4e415028d7aa59f5635b0d743b16e19a9b5f2f70b952103a5d7ddd4655c0fd478ed029a272bd264825f1432c2cd6208000a3c30908e565b089e0
-EBUILD composer-1.9.1.ebuild 1232 BLAKE2B 09ef27512b2029bc3201939bfea919540ec53e704479edf8fd7551bb7e6423f1ad3438603d620dd501dc5ab7c7aeaa725b5f5d6a8ec94216f9a1a3b73ab43c74 SHA512 863ccfd1e0be4e415028d7aa59f5635b0d743b16e19a9b5f2f70b952103a5d7ddd4655c0fd478ed029a272bd264825f1432c2cd6208000a3c30908e565b089e0
-EBUILD composer-1.9.2.ebuild 1232 BLAKE2B 584b0a2251e7f63a1bdc9d5c32524690d4dabe7668220fdf8678c0fc8749044334db0b5d39385e8fc181b3c25ec3d955e7dc73f9e0d2bde5d27724b4566fedee SHA512 597a47db43a02071beec253a84b1c548ccba8c6e9604a538055a6de268bba0e0c87b04dae897c15d95a807730c789ad6a15a4eb6b6eb0a850ea94571f7de73ac
+EBUILD composer-1.10.1.ebuild 1232 BLAKE2B 584b0a2251e7f63a1bdc9d5c32524690d4dabe7668220fdf8678c0fc8749044334db0b5d39385e8fc181b3c25ec3d955e7dc73f9e0d2bde5d27724b4566fedee SHA512 597a47db43a02071beec253a84b1c548ccba8c6e9604a538055a6de268bba0e0c87b04dae897c15d95a807730c789ad6a15a4eb6b6eb0a850ea94571f7de73ac
 EBUILD composer-1.9.3.ebuild 1232 BLAKE2B 584b0a2251e7f63a1bdc9d5c32524690d4dabe7668220fdf8678c0fc8749044334db0b5d39385e8fc181b3c25ec3d955e7dc73f9e0d2bde5d27724b4566fedee SHA512 597a47db43a02071beec253a84b1c548ccba8c6e9604a538055a6de268bba0e0c87b04dae897c15d95a807730c789ad6a15a4eb6b6eb0a850ea94571f7de73ac
 MISC metadata.xml 774 BLAKE2B 8a1f75c0c7da6f0d193a981c6db3888d62e2223b6368c4a7dece62ae33cc9a2a8c0b34714170462f262569954e70cc9b976012ff864ccfa36a46da3c719169ae SHA512 1a17bfae65923a3bea593c57d7ecf4fb2aeef43d0537636105e52294de295cbfeaed4b3c36ffb8675a563f657f4f969e62096cee20b9ab178c962acf2f68ac3a
diff --git a/dev-php/composer/composer-1.9.2.ebuild b/dev-php/composer/composer-1.10.1.ebuild
index 29915836e3cf..29915836e3cf 100644
--- a/dev-php/composer/composer-1.9.2.ebuild
+++ b/dev-php/composer/composer-1.10.1.ebuild
diff --git a/dev-php/composer/composer-1.8.6.ebuild b/dev-php/composer/composer-1.8.6.ebuild
deleted file mode 100644
index d39d5769d38e..000000000000
--- a/dev-php/composer/composer-1.8.6.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Dependency Manager for PHP"
-HOMEPAGE="https://github.com/composer/composer"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-lang/php:*[curl]
-	>=dev-php/ca-bundle-1.1.3
-	>=dev-php/psr-log-1.1.0
-	dev-php/fedora-autoloader
-	>=dev-php/json-schema-5.2.7
-	>=dev-php/jsonlint-1.7.1
-	>=dev-php/phar-utils-1.0.1
-	>=dev-php/semver-1.4.2
-	>=dev-php/spdx-licenses-1.5.0
-	>=dev-php/symfony-console-2.8.48
-	>=dev-php/symfony-filesystem-2.8.48
-	>=dev-php/symfony-finder-2.8.49
-	>=dev-php/symfony-process-2.8.48
-	>=dev-php/xdebug-handler-1.3.1"
-
-src_install() {
-	insinto "/usr/share/${PN}"
-
-	# Composer expects the LICENSE file to be there, and the
-	# easiest thing to do is to give it what it wants.
-	doins -r src res LICENSE
-
-	insinto "/usr/share/${PN}/vendor"
-	newins "${FILESDIR}"/autoload-r1.php autoload.php
-
-	exeinto "/usr/share/${PN}/bin"
-	doexe "bin/${PN}"
-	dosym "../share/${PN}/bin/${PN}" "/usr/bin/${PN}"
-
-	dodoc CHANGELOG.md README.md doc/*.md
-	dodoc -r doc/articles doc/faqs
-}
diff --git a/dev-php/composer/composer-1.9.0.ebuild b/dev-php/composer/composer-1.9.0.ebuild
deleted file mode 100644
index d39d5769d38e..000000000000
--- a/dev-php/composer/composer-1.9.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Dependency Manager for PHP"
-HOMEPAGE="https://github.com/composer/composer"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-lang/php:*[curl]
-	>=dev-php/ca-bundle-1.1.3
-	>=dev-php/psr-log-1.1.0
-	dev-php/fedora-autoloader
-	>=dev-php/json-schema-5.2.7
-	>=dev-php/jsonlint-1.7.1
-	>=dev-php/phar-utils-1.0.1
-	>=dev-php/semver-1.4.2
-	>=dev-php/spdx-licenses-1.5.0
-	>=dev-php/symfony-console-2.8.48
-	>=dev-php/symfony-filesystem-2.8.48
-	>=dev-php/symfony-finder-2.8.49
-	>=dev-php/symfony-process-2.8.48
-	>=dev-php/xdebug-handler-1.3.1"
-
-src_install() {
-	insinto "/usr/share/${PN}"
-
-	# Composer expects the LICENSE file to be there, and the
-	# easiest thing to do is to give it what it wants.
-	doins -r src res LICENSE
-
-	insinto "/usr/share/${PN}/vendor"
-	newins "${FILESDIR}"/autoload-r1.php autoload.php
-
-	exeinto "/usr/share/${PN}/bin"
-	doexe "bin/${PN}"
-	dosym "../share/${PN}/bin/${PN}" "/usr/bin/${PN}"
-
-	dodoc CHANGELOG.md README.md doc/*.md
-	dodoc -r doc/articles doc/faqs
-}
diff --git a/dev-php/composer/composer-1.9.1.ebuild b/dev-php/composer/composer-1.9.1.ebuild
deleted file mode 100644
index d39d5769d38e..000000000000
--- a/dev-php/composer/composer-1.9.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Dependency Manager for PHP"
-HOMEPAGE="https://github.com/composer/composer"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-lang/php:*[curl]
-	>=dev-php/ca-bundle-1.1.3
-	>=dev-php/psr-log-1.1.0
-	dev-php/fedora-autoloader
-	>=dev-php/json-schema-5.2.7
-	>=dev-php/jsonlint-1.7.1
-	>=dev-php/phar-utils-1.0.1
-	>=dev-php/semver-1.4.2
-	>=dev-php/spdx-licenses-1.5.0
-	>=dev-php/symfony-console-2.8.48
-	>=dev-php/symfony-filesystem-2.8.48
-	>=dev-php/symfony-finder-2.8.49
-	>=dev-php/symfony-process-2.8.48
-	>=dev-php/xdebug-handler-1.3.1"
-
-src_install() {
-	insinto "/usr/share/${PN}"
-
-	# Composer expects the LICENSE file to be there, and the
-	# easiest thing to do is to give it what it wants.
-	doins -r src res LICENSE
-
-	insinto "/usr/share/${PN}/vendor"
-	newins "${FILESDIR}"/autoload-r1.php autoload.php
-
-	exeinto "/usr/share/${PN}/bin"
-	doexe "bin/${PN}"
-	dosym "../share/${PN}/bin/${PN}" "/usr/bin/${PN}"
-
-	dodoc CHANGELOG.md README.md doc/*.md
-	dodoc -r doc/articles doc/faqs
-}
diff --git a/dev-php/doctrine-instantiator/Manifest b/dev-php/doctrine-instantiator/Manifest
index dc61631892df..f3fa24de992f 100644
--- a/dev-php/doctrine-instantiator/Manifest
+++ b/dev-php/doctrine-instantiator/Manifest
@@ -2,7 +2,7 @@ AUX autoload.php 258 BLAKE2B 3ed7c897b02b90914e7ba7fa06e79805586b0b5bf2b614e8b81
 DIST doctrine-instantiator-1.0.5.tar.gz 10202 BLAKE2B 77ab3fba96672f6aa2826002510c99c21beccdc09e92dbc2c09426f8fc47590554ef5d32b6bec92ea2dc2ab1c61a178c280ab01090b3aafc14a10a4b4fec3628 SHA512 78b00b2550b47772b5825fbde59729e0613a90c1d9dacf1b7b7d13ccb5bbd8534af7e732dcc1b5b6f9bbafa2f9c3e7418e184851ab0f3a37c0c945b5eed1e229
 DIST doctrine-instantiator-1.1.0.tar.gz 5343 BLAKE2B 73f737f19c8ae7a3fa9a7dcaa760246da6d688e28f15be0c40e031be8147887885bba2ec0a7770ead7de7b718247108b41b4c1d08712137c9c06911bde263176 SHA512 7f59dd7f80df02fd1e46f4b0ecd8488022b34933effddfc40d3424b279a35928adfc0fb7567172149338a8d4273b24305eaa46fc51aa0af45a7b230646354f09
 DIST doctrine-instantiator-1.3.0.tar.gz 6299 BLAKE2B 6eb41562f52965381a780243475bda73a921d44784a66cf23816dd228efe4299d225f0cd52a4625a3516d8ae22b7f691a2724b477b944211e8d1ffd2c4c90540 SHA512 989b14bb28f75d091243dd5833a0a7c91889b45a1fcafb425b38de223485aae4470e1f1877b024ca58c5cf3539f8b39ef337166dbbd664bede7a5f3adde623a9
-EBUILD doctrine-instantiator-1.0.5.ebuild 693 BLAKE2B 4949d8e4318d8865254ab218dbfc4c277af5e72d6ee0b9c5d25b84eba1d7f7d11bd2ca2621e61d7343c95b7e534e2cf1771061aa0ab902066a0f1b74fb79a175 SHA512 248e702b452941fd2f58a1e2efb63be83401dc4383f26e7fc48262c9b0bec7e6ad11947bef38e870a1e139ea9ece3599d0f830fdc5d50f8fab069bfa985061e6
-EBUILD doctrine-instantiator-1.1.0.ebuild 701 BLAKE2B 446de8476ea6c3182dddeb50d7368f55a0087c53860d678b54550d30029bcebec5de8959170eab48ac70de117af188fdf9ef6d05d8977c8cacd2ad36b985b883 SHA512 799c67d4e13e73d280c97fafa2a1181f1b597ab41e6432d5fabe53a3ca53a6b8fd1ba0ab3368e4e950d4a3c78fda9dd32b351a5a843c7b3af567bbd79a51628c
-EBUILD doctrine-instantiator-1.3.0.ebuild 701 BLAKE2B 70f882195b24306adc61350c6c5cca0f84d4b9d8868cd0fe609184d8403686a5f654494047af254ab00e8683b422953b25137d2705c564c7a90d5d8f800575e1 SHA512 8d82b0ced7121653b086ee923d4956db390887f654e3d6611d8de3bd5ebeefafa97dea9ea490d11359b8e0409f954ed92ec6a1681ba90b2a31dacd4805e63d02
+EBUILD doctrine-instantiator-1.0.5.ebuild 690 BLAKE2B 180913a6404d78bc1d72666f37cfbba9bc969a4062674ab11ae30c2e67fdbf6a98728ccad8a38ab8a8cec98916bbe11a3ff66290ff856e4904531cbe108e2bc2 SHA512 b60307c07d87b4a4f0565de9c9a3ca36ab06e9817285b14e50d8e6525c7785dd021b6200342c179bd39d43ac39e2e0913907dade85d49c67d312afc1927492a6
+EBUILD doctrine-instantiator-1.1.0.ebuild 697 BLAKE2B 71bf053159eb6c319c443d2312388d4ff2aa763f1c59f36b3f69cb00c5b775ae2d8a75f8497b35a182505e65872b7941a90c59ad941b1082b74c6f6ea1d5bef4 SHA512 faf9997e0a6c727c1ec3d3e4e8b3026f6dc8098b34add642f53d1670a2b47e30fc245bb5d0e21c651046837b0cac9dd6611c91bceb45c7a7f4373b1d47617687
+EBUILD doctrine-instantiator-1.3.0.ebuild 697 BLAKE2B d649a6ae7e681c1caf12860c61eb8380c4b5b11b4b41f7a20c441643b24102808cad942df3530731cdc4a48b6a00883b97cf76c81210f21c8c13a19f2e10a777 SHA512 457bc64ede2268c0c7af6bd7e748183587dc821a9ed138b300687c25b54fef9464d10b5c1af2e3a63d095110c2324973a7cc2c73c4b5ab28a9ae920e88517e86
 MISC metadata.xml 313 BLAKE2B 76bc8cb4562afb0810ab8a4a79265bc44ba328370c3ab64d3599c6971ee1005f75cca364a00bfca316584c00c28d1c9ad5b0eb3c86889426852af9a6bca31986 SHA512 6a34d1c5966ec568eb1cdc499ef9ea9c799e104a4c47aa061b3197ecafce3a49a372e5f4d92b834b3b725c7697ed1e5e85be4654b3159a2427f5d649b11bf93d
diff --git a/dev-php/doctrine-instantiator/doctrine-instantiator-1.0.5.ebuild b/dev-php/doctrine-instantiator/doctrine-instantiator-1.0.5.ebuild
index 9ae6f1d8f1e5..db9de5fabfe4 100644
--- a/dev-php/doctrine-instantiator/doctrine-instantiator-1.0.5.ebuild
+++ b/dev-php/doctrine-instantiator/doctrine-instantiator-1.0.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/doctrine/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-php/doctrine-instantiator/doctrine-instantiator-1.1.0.ebuild b/dev-php/doctrine-instantiator/doctrine-instantiator-1.1.0.ebuild
index 635b41134dd2..9801eecf5b4f 100644
--- a/dev-php/doctrine-instantiator/doctrine-instantiator-1.1.0.ebuild
+++ b/dev-php/doctrine-instantiator/doctrine-instantiator-1.1.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/doctrine/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE=""
 
 S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-php/doctrine-instantiator/doctrine-instantiator-1.3.0.ebuild b/dev-php/doctrine-instantiator/doctrine-instantiator-1.3.0.ebuild
index 52ebd8e4eb09..6b79666dab62 100644
--- a/dev-php/doctrine-instantiator/doctrine-instantiator-1.3.0.ebuild
+++ b/dev-php/doctrine-instantiator/doctrine-instantiator-1.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=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/doctrine/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE=""
 
 S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-php/fedora-autoloader/Manifest b/dev-php/fedora-autoloader/Manifest
index 9d9cc004e027..1925ec9fbae6 100644
--- a/dev-php/fedora-autoloader/Manifest
+++ b/dev-php/fedora-autoloader/Manifest
@@ -1,7 +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
+EBUILD fedora-autoloader-0.2.1.ebuild 720 BLAKE2B 50088c9a26c7cd1184eea71635dc03a1c6b3f7b25e514b9a88012bbe0ba877f29a410db2f19ddba626c5c4658e575a055af848c9bee95a1343ee7086e51df2b3 SHA512 7bf6e1f88fc11903f88ca97865d22f895276d70b2c64dc2258d0fadbe21d1953b24fbae11025e9fb6c826a6710a2dd982622a4deec9a0d076df0d997b262a1ba
+EBUILD fedora-autoloader-1.0.0.ebuild 718 BLAKE2B 97334b3097831daec99ed17ae46513276c6d89f89a5eb98499c0729b7a5127810a9e5c7cc8e38e4944efbd70268a2ec3ef15e3df174f330ebb7fee4fe4aa474f SHA512 841ae8fbac7f68ae0fe8c035ff0da1ad41b557666fc26357eb19119c9bb1f9f6c85cdd189b9b8688b4d25de8db559525d1d3ee9525c45428b42ebd96336133c5
+EBUILD fedora-autoloader-1.0.1.ebuild 718 BLAKE2B e0ef0a90c397f7a03ed78a983716e99871ca73371f0e16e584c52f9236c9e1e0bf370847587d448342ecb1fff63994eb4702521546bef7996feb8227b567e53c SHA512 1c9ad0951b6b06f1e129361ecbc8cbf4b9269f4f0bf8453c626d0b5e54f90eae4d393f26e26981defa2a8b0fede4f43315ff8e1c79bc93a2cf328aad1e38dd74
 MISC metadata.xml 710 BLAKE2B 8ce6437cfec2d52048b7107c177bc025ea7770ac3aea2c86782f9b61ad6ba05b9c3df2f377ef97291356f97822721bda247047577383374252170f5835ee7f10 SHA512 f12b4505ad34c9171cb4547793c17406e4bee91f6b97efc39825d981d426fd729304ee72ac51471e8b4fea8cf6d194bc32990bec2206d661e510847729fc3819
diff --git a/dev-php/fedora-autoloader/fedora-autoloader-0.2.1.ebuild b/dev-php/fedora-autoloader/fedora-autoloader-0.2.1.ebuild
index fd25bcc763e0..1356394d53cd 100644
--- a/dev-php/fedora-autoloader/fedora-autoloader-0.2.1.ebuild
+++ b/dev-php/fedora-autoloader/fedora-autoloader-0.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=6
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/php-fedora/autoloader/archive/${PV}.tar.gz -> ${P}.t
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-php/fedora-autoloader/fedora-autoloader-1.0.0.ebuild b/dev-php/fedora-autoloader/fedora-autoloader-1.0.0.ebuild
index 0decde9fce07..ee12d3f5e31f 100644
--- a/dev-php/fedora-autoloader/fedora-autoloader-1.0.0.ebuild
+++ b/dev-php/fedora-autoloader/fedora-autoloader-1.0.0.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
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/php-fedora/autoloader/archive/${PV}.tar.gz -> ${P}.t
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 
 IUSE="test"
 
diff --git a/dev-php/fedora-autoloader/fedora-autoloader-1.0.1.ebuild b/dev-php/fedora-autoloader/fedora-autoloader-1.0.1.ebuild
index 81eea1238509..144c288ef542 100644
--- a/dev-php/fedora-autoloader/fedora-autoloader-1.0.1.ebuild
+++ b/dev-php/fedora-autoloader/fedora-autoloader-1.0.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/php-fedora/autoloader/archive/${PV}.tar.gz -> ${P}.t
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 
 IUSE="test"
 
diff --git a/dev-php/myclabs-deepcopy/Manifest b/dev-php/myclabs-deepcopy/Manifest
index faa197bf94b0..d06d3596e07f 100644
--- a/dev-php/myclabs-deepcopy/Manifest
+++ b/dev-php/myclabs-deepcopy/Manifest
@@ -2,7 +2,7 @@ AUX autoload.php 239 BLAKE2B c67e02841a85ce3cb1cb27286eaf799a8060644d35dad28c9a3
 DIST myclabs-deepcopy-1.6.0.tar.gz 43612 BLAKE2B 18e3f532043cfbf700230a82772938082611922b9a04c7a99d63f79210e6c6f144521a29356977f4c44843cae6628e0a13fa0a46e0d34cb2e251f138ed60ab44 SHA512 a1d0ce8386172b963bca1e34e0e6d69268177f6aaf5309498780e4f9e43b9126916937e0b422644199b96f46212d0267af9b56993b9ffe295adb5f872c24584c
 DIST myclabs-deepcopy-1.6.1.tar.gz 43589 BLAKE2B e62ed5384bf9d4ad0286189772de8eeb9fed9962cf1d109b9e282c37ceadc885c6850fbed1695de35935b85fcc789a796485f44e97269a556d3498be8b691af4 SHA512 6cf13127401304ff92277c7c433353ecc20764fd5b8db0f8ae8d6767d8d9bc9c2f6b6ed3d68eeca5960357517038062c6f6b82831f433596d0a05cd0cea916d4
 DIST myclabs-deepcopy-1.9.4.tar.gz 44812 BLAKE2B bdc273f55b082ccd728ce786bb573dec5e96427f1692e3f502e2ee7eddd804e9a1589efe1323e3961d2c4e2b210f597c1ba80bbd8fcedeca77a7440df8925fb1 SHA512 879ecc6409ecb21a90e87b8368f64fce57e692f0e2916fc341d55744c2663163d6bac70562c0d8a1a1a51a409121f5e5905979dbb9fd2842cda7f21cda33e50a
-EBUILD myclabs-deepcopy-1.6.0.ebuild 650 BLAKE2B 730a416ec8f87d3c5f74778ce439fbae8e88dde6fa27433150f6a5682362cadf04520744ffbf4c697578a8b39d90be39f5b7523627fb15aa1a4bc8adc9221ce4 SHA512 c1bb2c16dd1998bac85abcd786db4889276a776ca51bcd111c09a68560d6a91a3075f50c28f3e749d92971c75ed797f87d92782e5974b8635ab765c6f5bf13d0
-EBUILD myclabs-deepcopy-1.6.1.ebuild 658 BLAKE2B be2728e89cfad2f1785672f88ad739611605141c35ac9493186220fde8b22bdaaf4232a3d8aaba8373e9918243d907a2092d484b7384c5721c907a90539dd15a SHA512 825d4ffbb1197e1161110e5537148d38dd5fe538c9e5136d59fdee1c7219bbc49c138cb6be4d5291a10c7d633a9cb50e529457af685c41a9b40984ee0cc42b7e
-EBUILD myclabs-deepcopy-1.9.4.ebuild 658 BLAKE2B 5100633dae669cd61922ce62565b7bd445577e93aee647ea7d1f5bfeea392f145488886ac9f5efed3f9d16dd69f4dabb69719e4d21663c264521f7b7dcec72af SHA512 8e9d0904b9344558f7e1dda7a732ebabc7800028c9590c69bf177d3bd1b58794e57766f7c3af221833148c42a414c27292bf40612cf6833618091d3a6c567a2a
+EBUILD myclabs-deepcopy-1.6.0.ebuild 647 BLAKE2B 9014e8bc8c59bbf9b666bf6072ee02c73f1ce8ac2aa617c06a9ba5a8730db753fa9c4c05b9c70d6fff40254e5d13ef68081aa2410e0e9d0c5e67963ee8d1fd6c SHA512 1ce25d46c63a84eb99e1d032d1595918eef59df4aae700f7ecf99315a3d3e147c6dd30df49ff8aadbad73d0b6598990d030a20bb5d9f3df8b4d2096df964cb0e
+EBUILD myclabs-deepcopy-1.6.1.ebuild 654 BLAKE2B 216541ee72e5454c8ef5a1fe23a664e43f10e131fb9d221c66a12a3430addec7dad56ce53ebbb90166645f5d28e9af93bee0c573ceb5c2eda6464c0ef389a23e SHA512 8956ac9933609b03f71ad2149660b7c224c0ba33abbbbdabfc88179748f6a78ff182c6668431cd48610929b1b6dab604eccfe72cd93a4dc772a382c73fa3bd13
+EBUILD myclabs-deepcopy-1.9.4.ebuild 654 BLAKE2B 40936ed9f955bbb554b48ec355cdccc9b5402135ca88d5c84da460f459ae2f69cbcecfc1a124d0d9c6438c4dcfe0871174c5322892e95949a284f96f1698eaf9 SHA512 28c15466c4bf23aba8234121d5ce207bc29dee38bad1294dec822a16665a269cb2bb283e873e1999daa6786b3f58d326a83ad9085dfbafd7ef2f03fc3118a6ad
 MISC metadata.xml 320 BLAKE2B 7a39e30db8d713926fe221be630c6ff660222d62b47d5b7e561127bc63f522fa813d2ce6ba83276600cc2e3e942e27758e8268d784dd1f3bb36f182c5da3026f SHA512 a4610b9b7fc96287c53bc0501afdded0b917d842e2a263308fe20aab65678c569d6ace0576596e7d4cb75dc3af3b3af2896ac7aeb867237206b7ca3c6c8b30e8
diff --git a/dev-php/myclabs-deepcopy/myclabs-deepcopy-1.6.0.ebuild b/dev-php/myclabs-deepcopy/myclabs-deepcopy-1.6.0.ebuild
index 2891cfdd09b1..f82af5c8af5c 100644
--- a/dev-php/myclabs-deepcopy/myclabs-deepcopy-1.6.0.ebuild
+++ b/dev-php/myclabs-deepcopy/myclabs-deepcopy-1.6.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/myclabs/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-php/myclabs-deepcopy/myclabs-deepcopy-1.6.1.ebuild b/dev-php/myclabs-deepcopy/myclabs-deepcopy-1.6.1.ebuild
index d52dd641b456..f8f0d622d18f 100644
--- a/dev-php/myclabs-deepcopy/myclabs-deepcopy-1.6.1.ebuild
+++ b/dev-php/myclabs-deepcopy/myclabs-deepcopy-1.6.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/myclabs/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE=""
 
 S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-php/myclabs-deepcopy/myclabs-deepcopy-1.9.4.ebuild b/dev-php/myclabs-deepcopy/myclabs-deepcopy-1.9.4.ebuild
index a1af25373993..85a4c29148a5 100644
--- a/dev-php/myclabs-deepcopy/myclabs-deepcopy-1.9.4.ebuild
+++ b/dev-php/myclabs-deepcopy/myclabs-deepcopy-1.9.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
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/myclabs/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE=""
 
 S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-php/pear/Manifest b/dev-php/pear/Manifest
index eb869a718bf1..e5440164ab37 100644
--- a/dev-php/pear/Manifest
+++ b/dev-php/pear/Manifest
@@ -1,3 +1,3 @@
-EBUILD pear-1.10.1-r1.ebuild 367 BLAKE2B 844cb74839a96e71bb68bb60b692a82303a22331cc6a8c797b2aa408423be97178c85efee3195809de9532a961c3bc2644a03bcbe681ead0ecc695ca58c497e9 SHA512 a954eda883d2db44333162d38fb36270bd36a24c0ae104cbccc6fd18520531b872ddeb541842eee3fcab9b1fbf832b6f65ab522ca89499d31ec993943eb28760
-EBUILD pear-1.10.3.ebuild 375 BLAKE2B cc76b12eac8c043b7f901dec9a61bfd97ea3bdecdf563c63b344187e9de91d8e80809e07fbfa88d7b7c63fbf451cc4f4dc2bf70305e4cb4f9862e3663fa1275c SHA512 73c95a48353de6e9cb8ee3600d364df6896a1099fc514b429d19ab99e639b1ca9f2974e5ed89c4227ac748694fae10526be5df268ef74200f611a3872c7cf090
+EBUILD pear-1.10.1-r1.ebuild 364 BLAKE2B 803cf6241c66e099449f8c36ad28251c09258223c3b02ecc113f3810bb1b1af938bbfc1f53267faf98e7e1fb4a8f5dc0ebb37e85dc463bd7e18b9a90d55ae92b SHA512 2024caf532305fd01f96682e9fedb6c42f85124fb0a38119564f6fc383fac1bfd49861ad34507e27d8b8a2d82f76091d9ec049a54ba4676ca5db9abddc8f1dff
+EBUILD pear-1.10.3.ebuild 371 BLAKE2B 73ea3f6c9bf928cec15f5b28d6ce39201acdcec788819ec931287116528196ffc706201c704b7fc5483bde5a1aa934f008699123c0fa4c5298c834bcdf8a4fc2 SHA512 63cc94b09215a1dd5a386f91487672c9af1dcd710726deb2ce492a4800fd59acbda63611f946436e47a3f8051d01c7480f85bc642a8fdd45e3eb7f3810279d20
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/pear/pear-1.10.1-r1.ebuild b/dev-php/pear/pear-1.10.1-r1.ebuild
index 86e5e4d071dd..88fc33f6e0b4 100644
--- a/dev-php/pear/pear-1.10.1-r1.ebuild
+++ b/dev-php/pear/pear-1.10.1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 
 DESCRIPTION="PEAR - PHP Extension and Application Repository"
 HOMEPAGE="https://pear.php.net/"
diff --git a/dev-php/pear/pear-1.10.3.ebuild b/dev-php/pear/pear-1.10.3.ebuild
index 30e171344ed8..321c226df4b6 100644
--- a/dev-php/pear/pear-1.10.3.ebuild
+++ b/dev-php/pear/pear-1.10.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 
 DESCRIPTION="PEAR - PHP Extension and Application Repository"
 HOMEPAGE="https://pear.php.net/"
diff --git a/dev-php/pecl-apcu/Manifest b/dev-php/pecl-apcu/Manifest
index edea3e79a3ef..e6d310ee2931 100644
--- a/dev-php/pecl-apcu/Manifest
+++ b/dev-php/pecl-apcu/Manifest
@@ -3,5 +3,5 @@ DIST apcu-5.1.17.tgz 94814 BLAKE2B 2e49f08b9445f04fd036bc949c9099ee045c3ecd460b3
 DIST apcu-5.1.18.tgz 94668 BLAKE2B c88af867a5f0f3feb550b4b93b83451d972d8f9c2281af8b000b45cb42e2d005f82fe626da8665e0490c79bc378cf9ee5c9a0136d0b490a1155a885bb56fe4f2 SHA512 5e9c5b4540be7abdf2f473d2f8955d8708934a1d6e05cb2c99154cc7ba8a2bbf9afde51769e20f46ef278efd6f60b9172e0864c31e0976b9d3096a337035e7a9
 EBUILD pecl-apcu-5.1.12.ebuild 2091 BLAKE2B f0d62746f48ad4110941d369da65f38858a1834152a33a56ab0b1eea53a5d1b52fbe5bc3effe2defc724729c6865b34e9a765092ecccf4b32ff2b1c76949ad97 SHA512 81f2c1edb96dc7383fb4b91774c1b985754031ce4f4796860825a7e226c345145c84662d80f0d8f834006697d45d5010863590107ab472574c715b3e85b857d6
 EBUILD pecl-apcu-5.1.17-r1.ebuild 1548 BLAKE2B d60a97e831b68873e09e79d3efa1042bdeb1b2a39858fc9e5eb18f6e690188989d950b0a919d26345d3bc8217d8e5e7b78410511248785698215045e2f5a7a96 SHA512 647e12e2a890ab531840bd9c87827e5bcf3bbd1ee82505420b16b69312dc20776ebe0df39b39f51277cb8959652faa33f52f044531494cc151f6ad0c8511192e
-EBUILD pecl-apcu-5.1.18.ebuild 1546 BLAKE2B efac91b618cce89bedd5a92bfe70052b0e4c1a4000c0fe9f934299d6d467feba5831880b92092d8cd1756250f53f34a623985c37f4d4ff533d9788f515bb1643 SHA512 20ac8e6651905fac5e15b7c802e3049d291d8e36c24ce9236e07e3acb505a76c764de74b2b99156da94bb652804c9d9a06242e518f091e01cbbefc99775d17a8
+EBUILD pecl-apcu-5.1.18.ebuild 1545 BLAKE2B a10003e1378a8f18df700d56ff24ae436da3d0c5024156ee57b9ba2469c99e0a499ab989e64f68409c7d175cdfca16366dcd6fa764b14297e9fec4e8082ccf2f SHA512 a9591492b4f53e90bc29a3cb6c666096732437d7eccbc0843191992a67e1a2aca4a1969a5dba3598d2e40c4451b0b837062ab81cb30c2f4cf763127e440a1854
 MISC metadata.xml 540 BLAKE2B a29196911604b13d643db1b09cdae2c578c52f3b3ce92f9d6ae534c6fe9872435a46b15dca79ce8ccf5ca02070f2e694f518c69524ea9380eff8e597d8d4124d SHA512 acd09a9a8e52ddc7e4cde2f048db7f7721fcbe3e24b7b628bf1c14b17381a75b463dede6faa0acfecf8e270693001c30b83758f8ad761979fcbdccb454098e56
diff --git a/dev-php/pecl-apcu/pecl-apcu-5.1.18.ebuild b/dev-php/pecl-apcu/pecl-apcu-5.1.18.ebuild
index df758bf3f797..187fdd7b9eff 100644
--- a/dev-php/pecl-apcu/pecl-apcu-5.1.18.ebuild
+++ b/dev-php/pecl-apcu/pecl-apcu-5.1.18.ebuild
@@ -12,7 +12,7 @@ USE_PHP="php7-1 php7-2 php7-3 php7-4"
 
 inherit php-ext-pecl-r3
 
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="amd64 arm64 x86"
 
 DESCRIPTION="Stripped down version of APC supporting only user cache"
 LICENSE="PHP-3.01"
diff --git a/dev-php/pecl-event/Manifest b/dev-php/pecl-event/Manifest
index 9fecdeb69336..5a0c9b9fa276 100644
--- a/dev-php/pecl-event/Manifest
+++ b/dev-php/pecl-event/Manifest
@@ -1,3 +1,5 @@
+AUX pecl-event-2.5.3-no-sockets.patch 638 BLAKE2B 868bff8eb515cf466d9b844baf7322999520c8829f49fb3547229b884b090fd130b72c7b27c74297d3c3d7567f7b5056484a4624dcf6e5010ae8213f01ac8ffa SHA512 482338228ec8e6ea2d91c77e6fe4b2a5619ee39880824bdac134d9f2cd23a2363df2f68eac4a849579c02d9fc140112887d30b601e36d96e4e93837a3c6a653d
 DIST event-2.5.3.tgz 140913 BLAKE2B e9b1886b65d1c307bf4a40ebe20e19f33d9e422ce98fb704c7174e953c2488b87f941fc5615bfee07e7d51e1775a0256349e023e6d8921fdd237e527ab108151 SHA512 359eee2f501444f444904ee1960d85af0b77259e59a06d9c6ae1ec008f7bda9bda5bf999d437d84416150a965466519c04e4c2f36dbca44367075fcbb46cd917
-EBUILD pecl-event-2.5.3.ebuild 1227 BLAKE2B 1559dda6c8d99bce99d0983f547aeb06ac3d230e0edb1ae0d66b73d29c4394ded587c5985acb5d9cbb0c546b29170eda9437d3b88c1f81a769834167cff21e97 SHA512 9251964129944e2cb59888aef1b7a37069527a91672c0875cf6e3bd64d0aa3a71e4776b0939bec06edb23df17da6e1dc53dc16dcb5805c4032c812bab412e780
+EBUILD pecl-event-2.5.3-r1.ebuild 1287 BLAKE2B 0997b61878600d61f4c7bed21dae3779cd94969822e251b6f8058e278af2618f95750303153f5a6994936b292bb9abb9027adea1119460ba1dff8845f6c45c88 SHA512 0e812328044810c6637a59664f130d67d3d169f99e86f53ac928b97efd797d37318dcaa098ce96ccdc03044f3b4e367446ea993817bb3ca3a13cb723b5aa703a
+EBUILD pecl-event-2.5.3.ebuild 1228 BLAKE2B 404fb20be843887e48696ff4bf0bc0f795b2fc8257d3e41771d23762a2b1b94851262bcc9c3dbbf87cbf98d909f814db5d6c60ac70ec064c3db6508929c96910 SHA512 112041bcedb204a3e978f691ca608569f821e305409f5a0d29148315555a1795737ef6040ffa472e0d095e03a896083f63e09af410b07dd0ea08de4eb445ea3d
 MISC metadata.xml 431 BLAKE2B 25421824761cdcc90c610236ac4acfd85e18fb63e4f92ff3fa5e51698a7e2004812a7193ced70646baf02bacd0bc896a5959ee88bd88dd5de68db729661ad02f SHA512 6349913306ea30f9ee6cd5ad862e0323d143815f4db47da14e5d54d0dcfb604118e3845f664f2a9b8527797b262c9567bbf5f189426f9becbd169be0ec111056
diff --git a/dev-php/pecl-event/files/pecl-event-2.5.3-no-sockets.patch b/dev-php/pecl-event/files/pecl-event-2.5.3-no-sockets.patch
new file mode 100644
index 000000000000..9b95708a6e7b
--- /dev/null
+++ b/dev-php/pecl-event/files/pecl-event-2.5.3-no-sockets.patch
@@ -0,0 +1,12 @@
+--- a/php7/src/fe-orig.c	2020-02-23 15:50:42.159505602 +0300
++++ b/php7/src/fe.c	2020-02-23 15:51:09.985462245 +0300
+@@ -640,7 +640,9 @@
+ 	PHP_ME(EventUtil, getSocketName,   arginfo_event_util_get_socket_name,   ZEND_ACC_PUBLIC | ZEND_ACC_STATIC)
+ 	PHP_ME(EventUtil, getSocketFd,     arginfo_event_util_get_socket_fd,     ZEND_ACC_PUBLIC | ZEND_ACC_STATIC)
+ 	PHP_ME(EventUtil, setSocketOption, arginfo_event_util_set_socket_option, ZEND_ACC_PUBLIC | ZEND_ACC_STATIC)
++#ifdef PHP_EVENT_SOCKETS_SUPPORT
+ 	PHP_ME(EventUtil, createSocket,    arginfo_event_util_create_socket,     ZEND_ACC_PUBLIC | ZEND_ACC_STATIC)
++#endif
+ 
+ 	PHP_FE_END
+ };
diff --git a/dev-php/pecl-event/pecl-event-2.5.3-r1.ebuild b/dev-php/pecl-event/pecl-event-2.5.3-r1.ebuild
new file mode 100644
index 000000000000..b30711ec149f
--- /dev/null
+++ b/dev-php/pecl-event/pecl-event-2.5.3-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PHP_EXT_NAME="event"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+DOCS=( README.md )
+
+USE_PHP="php7-1 php7-2 php7-3 php7-4"
+
+inherit php-ext-pecl-r3
+
+KEYWORDS="~amd64 ~ia64 ~x86"
+LICENSE="PHP-3.01"
+
+DESCRIPTION="PHP wrapper for libevent2"
+SLOT="0"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.5.3-no-sockets.patch"
+)
+
+DEPEND="
+	>=dev-libs/libevent-2.0.2
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	php_targets_php7-1? ( dev-lang/php:7.1[sockets?] )
+	php_targets_php7-2? ( dev-lang/php:7.2[sockets?] )
+	php_targets_php7-3? ( dev-lang/php:7.3[sockets?] )
+	php_targets_php7-4? ( dev-lang/php:7.4[sockets?] )"
+
+RDEPEND="
+	${DEPEND}
+	!dev-php/pecl-libevent"
+
+IUSE="debug examples +extra libressl +sockets +ssl threads"
+
+src_configure() {
+	local PHP_EXT_ECONF_ARGS=(
+		--with-event-core
+		$(use_enable debug event-debug)
+		$(use_with extra event-extra)
+		$(use_with ssl event-openssl)
+		$(use_with threads event-pthreads)
+		$(use_enable sockets event-sockets)
+	)
+	php-ext-source-r3_src_configure
+}
+
+src_test() {
+	local slot
+	for slot in $(php_get_slots); do
+		php_init_slot_env "${slot}"
+		SKIP_ONLINE_TESTS="yes" NO_INTERACTION="yes" emake test
+	done
+}
diff --git a/dev-php/pecl-event/pecl-event-2.5.3.ebuild b/dev-php/pecl-event/pecl-event-2.5.3.ebuild
index 8e0f7b205017..1cb12cf06a50 100644
--- a/dev-php/pecl-event/pecl-event-2.5.3.ebuild
+++ b/dev-php/pecl-event/pecl-event-2.5.3.ebuild
@@ -12,7 +12,7 @@ USE_PHP="php7-1 php7-2 php7-3 php7-4"
 
 inherit php-ext-pecl-r3
 
-KEYWORDS="amd64 ia64 x86"
+KEYWORDS="amd64 ~ia64 x86"
 LICENSE="PHP-3.01"
 
 DESCRIPTION="PHP wrapper for libevent2"
diff --git a/dev-php/pecl-mongodb/Manifest b/dev-php/pecl-mongodb/Manifest
index cd583088b270..ed30c096f77d 100644
--- a/dev-php/pecl-mongodb/Manifest
+++ b/dev-php/pecl-mongodb/Manifest
@@ -1,8 +1,10 @@
 DIST mongodb-1.5.3.tgz 1059580 BLAKE2B 23bd5f6b0f218cf55bd5713a770f3990d5c1492925623712583356d8aee42a1b47519b93ba64036aaf98f97ab4b1b30de9d8aa39659f2575c4f4dba3892d574d SHA512 35704e75bd7867a436d953c00c7560c9a08a4fa8f3555d7cc00aeda34e87c6c7aa7ecc1d7f674747e34f4f8dac35d320f6317e60229528ea9782bbe669bafec0
 DIST mongodb-1.5.5.tgz 1060017 BLAKE2B 475ca0f6a1cbd5270c9bde0f195d6092ef25441e0cee0a45ed378a868bd1ad27c7a77c4f4702b6f82004433805563cdaa728cbc11bb5beff83b982122cad339b SHA512 1eefc8f8e359a979082dc7808e89ff5418cd2dc73d4250638e33dc32cce40ef42502e9dbbb07303381e0062b84818568034f4e4cda8c8bf905513d00bf008392
 DIST mongodb-1.6.0.tgz 1096156 BLAKE2B 16c3b1d07d31d29a214aba320347f8e40cfc4f0dae8b0713b02cd0e3ff98fd54b09217472f333722228efdfcae755bbdbfe58da7db89d4dda2893ba7b3b0e8bb SHA512 e75dc607bf41bb71a0fce3b73785ef4203af97a3e8b21bf70a80c2216e9530463a6aaca55b013a4fa2f3c4eb72405a25209935ea1a238475f990763af54aa641
+DIST mongodb-1.7.4.tgz 1223416 BLAKE2B 9db40284eb2b70e242f26c1661923c5f33de8ab1e33a7e816863b61fcbc49040204ca556b1f384cab958f9dc2cf4e49e97840b78bd520a4e374b83210a964e5d SHA512 6805ce1d0958e24e1edf3bc9698bc1f4a9d31c26250624fd35aebf7a7d310af30050e1974cd9571f989303fce4c5522e793a8cb41388397df66e8f5fe0a648f2
 EBUILD pecl-mongodb-1.5.3-r1.ebuild 1009 BLAKE2B 4c1e9184619bc2f90558608f5ab5e2413c969e99bab0a8fcfb50b5a6fd6e5cbbf7f05f1a5155e2805a22aecee5f3a09e7e1c80d17b79cfcbfcdfaadeae6c13fd SHA512 7cf1a6fca2ce421abfd4f5509c585eff0627bd638749c2fda2be9be0fe12044ace79fab604cba54ba153d24cb8bc677ecb7c64c5cedd2af2e2361950e87a4b7e
 EBUILD pecl-mongodb-1.5.3.ebuild 1019 BLAKE2B cf4f6615b0d70b685817105fb53227bddc4b85d9ef60000eed1a48b5f8601d3868ed5e7af096b7df7c4882d2fbdf22c56d21bf512c5b267a8893443e14ca7c3d SHA512 ddba025e9e91ab5fa2b065ebdef36b61510bd589afa09611dafe4e5b27f1af35019f3dc0ef7a6915d035225dcd13ef5e6cb91c2c0a9e6b0699f335d6b8d211b8
 EBUILD pecl-mongodb-1.5.5.ebuild 1009 BLAKE2B 4c1e9184619bc2f90558608f5ab5e2413c969e99bab0a8fcfb50b5a6fd6e5cbbf7f05f1a5155e2805a22aecee5f3a09e7e1c80d17b79cfcbfcdfaadeae6c13fd SHA512 7cf1a6fca2ce421abfd4f5509c585eff0627bd638749c2fda2be9be0fe12044ace79fab604cba54ba153d24cb8bc677ecb7c64c5cedd2af2e2361950e87a4b7e
 EBUILD pecl-mongodb-1.6.0.ebuild 1426 BLAKE2B 4b32da42a4141f6db317f0f77b5207f623e17560a6964d27700dbccd13caee470e29005fc97b2b1c3c1e5b59b40c5a84bb8d399b8d4b6f4c43db6bc972314675 SHA512 b185eb19982a9acd6a49b9be5f33da6106ba452d9402bd4b514f56eabcfc63637e111bfe4d0042483f826a4d5a8fb71714c900b9f398ab4c1d0611643bfdfc5a
+EBUILD pecl-mongodb-1.7.4.ebuild 1362 BLAKE2B 2c67c1e96efc216049391b62f3cfd2f718ace1d651d67b55d8f60229a83463fe4444294bda20ac86c9d67c8a8fd4b7428cd1cc88d249acf98ca203ab061d719b SHA512 88f67bebfd812b8544a263715e725ad4c3f010993ed5c546ffe5fbfe3cb6c32a7a29815c2522be9e9f3fc36bd0c86f6bb58240dbf7e1905717d1860862c586aa
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/pecl-mongodb/pecl-mongodb-1.7.4.ebuild b/dev-php/pecl-mongodb/pecl-mongodb-1.7.4.ebuild
new file mode 100644
index 000000000000..eac00d3079f4
--- /dev/null
+++ b/dev-php/pecl-mongodb/pecl-mongodb-1.7.4.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PHP_EXT_NAME="mongodb"
+USE_PHP="php7-2 php7-3 php7-4"
+
+inherit php-ext-pecl-r3
+
+DESCRIPTION="MongoDB database driver for PHP"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="libressl sasl test"
+
+PHP_DEPEND="
+	php_targets_php7-2? ( dev-lang/php:7.2[json,ssl,zlib] )
+	php_targets_php7-3? ( dev-lang/php:7.3[json,ssl,zlib] )
+	php_targets_php7-4? ( dev-lang/php:7.4[json,ssl,zlib] )"
+COMMON_DEPEND="${PHP_DEPEND}
+	>=dev-libs/libbson-1.16.2
+	>=dev-libs/mongo-c-driver-1.16.2[sasl?,ssl]
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	sasl? ( dev-libs/cyrus-sasl )"
+DEPEND="${COMMON_DEPEND}
+	test? ( dev-db/mongodb )"
+RDEPEND="${COMMON_DEPEND}"
+BDEPEND="${PHP_DEPEND}
+	virtual/pkgconfig"
+
+# No tests on x86 because tests require dev-db/mongodb which don't support
+# x86 anymore (bug #645994)
+RESTRICT="x86? ( test )
+	!test? ( test )"
+
+src_configure() {
+	local PHP_EXT_ECONF_ARGS=(
+		--enable-mongodb
+		--with-libbson
+		--with-libmongoc
+		--with-mongodb-sasl=$(usex sasl)
+	)
+	php-ext-source-r3_src_configure
+}
+
+src_test() {
+	local PORT=27017
+	mongod --port ${PORT} --bind_ip 127.0.0.1 --nounixsocket --fork \
+		--dbpath="${T}" --logpath="${T}/mongod.log" || die
+	php-ext-pecl-r3_src_test
+	kill $(<"${T}/mongod.lock")
+}
diff --git a/dev-php/pecl-timezonedb/Manifest b/dev-php/pecl-timezonedb/Manifest
index faaf6a5cd9dd..ed935dcd19f2 100644
--- a/dev-php/pecl-timezonedb/Manifest
+++ b/dev-php/pecl-timezonedb/Manifest
@@ -1,3 +1,3 @@
 DIST timezonedb-2019.3.tgz 413166 BLAKE2B 99542a2c0dc50d96316dc14b22c8a2404db07a88d3f46050a954f10bfb501cd81fb7161805a91336075d607ac106208285e6d2281a9ed68b344fd4837fabcb49 SHA512 8342a0ed83a52ade0415430751d4efeaa84fb72e7da3aec8921338e9dfbf37ff1f098f6b6e1ed9c8f1c9c62017a0fe9c14f86a53be72f8b9f1ec137fa45d057d
-EBUILD pecl-timezonedb-2019.3.ebuild 461 BLAKE2B 4b7f7c5c3798ed0848f27b86896fba98241c0cc89606c5eeb990d4c73a4b321d40f6c7c05b903857416168d749eced8dfabf194e30716f598a8bd68b208345b4 SHA512 b6d09de437db07580eb2ef534ac9562bc4c4cdd098c318e06095225f942f95e2c0714c5a6399a2748846ff7860a4a6db847838fb1b8cd59542eca5c781d4932f
+EBUILD pecl-timezonedb-2019.3.ebuild 457 BLAKE2B 11e94c73d390e4df765d0d302ceb86b85bdc7896ca13db1c6ed5bc420041d114f420da7bd65eea558790dd2a4cb855c9da365264670efd2853822377bc8f0b9d SHA512 333a3b507cd55a817dad36564758565ad1b7b0210860c7f2392239ff63d95c3058008e9edcb659a4156dc2d498fc8323f15abcfba29b2965b4465b53db84c27d
 MISC metadata.xml 635 BLAKE2B 9c3fa685e184fdb85fd630b9bbbd69bfc20569455f1fa84f147b2d2404739077f5bffbe2c4e5d1a1ff28a9f2ec36bb04d7d55952c7cee4cc5ee3dbc1b11bbc40 SHA512 3b06142a7f995b5859650fa156973deb5cf783be8ee123dc2820f1c4a0d8588d6c73a739a3fe547a3b450ee544a0a69abd260c44d53c87ba0c9911cd68e539dc
diff --git a/dev-php/pecl-timezonedb/pecl-timezonedb-2019.3.ebuild b/dev-php/pecl-timezonedb/pecl-timezonedb-2019.3.ebuild
index 94ab6de33e60..ce13c87b5e74 100644
--- a/dev-php/pecl-timezonedb/pecl-timezonedb-2019.3.ebuild
+++ b/dev-php/pecl-timezonedb/pecl-timezonedb-2019.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"
@@ -14,6 +14,6 @@ inherit php-ext-pecl-r3
 DESCRIPTION="Timezone Database to be used with PHP's date and time functions"
 LICENSE="PHP-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE=""
 PHP_EXT_ECONF_ARGS=""
diff --git a/dev-php/pecl-uploadprogress/Manifest b/dev-php/pecl-uploadprogress/Manifest
index e4285a30f21f..359825ca5cb8 100644
--- a/dev-php/pecl-uploadprogress/Manifest
+++ b/dev-php/pecl-uploadprogress/Manifest
@@ -1,4 +1,3 @@
-AUX 1.0.3.1-php7.patch 4948 BLAKE2B 12ee139944a17989429e696e7457a3926d18f4300bf5bc2f9bfab2a036be88a47ea03ca64f06e378bb2811fdaba390e29a905eae87362c4a979c17407de53f3c SHA512 5b913ac4c006cee917ddb7140dd2e34dee6da9fac11001e6ee9f41ac0b65e3caa493c81612b05ef8ff99fec9c9a4cd4a2c2c275fc6124223d04648d43cae4fe4
-DIST uploadprogress-1.0.3.1.tgz 9040 BLAKE2B b926ee0cc7d40276425ea8eed86c5934c35ff2436b5785888394927a145620caa335d4eae87fd85bd754f8a67c1562f3b8d23a2c626f0d0ca4bed4bf4872e465 SHA512 c317a30ed81430184b643e2755867cdccf9848312aa31a5527e4fe229ac19ee3099121de8e253207b55dd7e788c28720bd3c477663c4ca15100478647a6dc1bb
-EBUILD pecl-uploadprogress-1.0.3.1-r4.ebuild 676 BLAKE2B f8e74b00e3aa1b6358b9cb390e828b584dc15cd6fadf46700811f52be62629b5647d74a29b968cddc24ad61b741f294cbfd7c942083c7e7c6ebe3b6826be74a5 SHA512 a2989c7597e2a522dc3f2e813c383f3bd9f59a8a9a0baed0baabc422b6d53fc53fe17e1c41228daf812e4546666a59a08183e823b25f915049d89fb16cf8c75c
+DIST uploadprogress-1.1.3.tgz 14798 BLAKE2B 5edda3e8672bb0e0829d100284240fcceac26be695386225a18446c742f59edfd906a9ae2f17b594816d3cddea02eb648db01a3352d7f8bd764ad2f6b2e03628 SHA512 2202f419be852a71eadae47eaa83909a032e5a6bbe4ce17ae5d45ea4e9f6d9c9edceb2111630d1f0e277b531d463accf540288ecbcca9bf154fe01754f225686
+EBUILD pecl-uploadprogress-1.1.3.ebuild 528 BLAKE2B d2932e5326d27397ae42a82c5a51960af322453a7dfb04b369485387cced547ca3228605be6906a2cf77acce18686285bb88e0372d9021958d1af884d3f9559f SHA512 1ba6eab0bafca47f4d8f96af9a3ac511575daa290e5b12d1f76c5e7fd5d6d40e52d9626199bcbb49945abe02d2c7d7e286f86dc6c9872ab0edc7128f41ddee31
 MISC metadata.xml 667 BLAKE2B d007dcf3d963b7994a461dc554075eeaa013628b194ae355dfc39fe44ef892d28597673a472de482608501a05183838e428e2794b4d7d4069c8b50aaa2ed81c4 SHA512 a6a5cfc834367a2f9ed9fcff1830212e527572af9bdac0a41d52434b4085a5d848e3a9b9d7c8473492c13addf2560a54f4b6cf57d4f5ac14a482391f33987dfa
diff --git a/dev-php/pecl-uploadprogress/files/1.0.3.1-php7.patch b/dev-php/pecl-uploadprogress/files/1.0.3.1-php7.patch
deleted file mode 100644
index c90f4bd9539f..000000000000
--- a/dev-php/pecl-uploadprogress/files/1.0.3.1-php7.patch
+++ /dev/null
@@ -1,148 +0,0 @@
-From 7a4d6b3ac3575caedf9429940f54688411cbf5e9 Mon Sep 17 00:00:00 2001
-From: Jan-E <github@ehrhardt.nl>
-Date: Sun, 19 Apr 2015 18:49:48 +0200
-Subject: [PATCH 1/2] PHP7 compatibility
-
----
- uploadprogress.c | 36 +++++++++++++++++++++++++++++++++---
- 1 file changed, 33 insertions(+), 3 deletions(-)
-
-diff --git a/uploadprogress.c b/uploadprogress.c
-index 30f6758..7a52ba7 100644
---- a/uploadprogress.c
-+++ b/uploadprogress.c
-@@ -71,7 +71,7 @@ PHPAPI extern int (*php_rfc1867_callback)(unsigned int , void *, void ** TSRMLS_
-  */
- static int uploadprogress_php_rfc1867_file(unsigned int event, void  *event_data, void **data TSRMLS_DC)
- {
--    zval handler;
-+    //zval handler;
-     char *callable = NULL;
-     uploadprogress_data * progress;
-     int read_bytes;
-@@ -157,7 +157,11 @@ static int uploadprogress_php_rfc1867_file(unsigned int event, void  *event_data
- 
-             if (get_contents) {
-                 php_stream *stream;
-+#if defined(ZEND_ENGINE_3)
-+                int options = 0;
-+#else
-                 int options = ENFORCE_SAFE_MODE;
-+#endif
- 
-                 stream = php_stream_open_wrapper(progress->data_filename, "ab", options, NULL);
-                 if (stream) {
-@@ -301,7 +305,7 @@ PHP_FUNCTION(uploadprogress_get_info)
- {
-     char * id;
-     int id_lg;
--    char method;
-+    //char method;
- 
-     if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &id, &id_lg) == FAILURE) {
-         return;
-@@ -417,7 +421,11 @@ static void uploadprogress_file_php_get_info(char * id, zval * return_value)
-                         v[index] = 0;
-                     }
-                 }
-+#if defined(ZEND_ENGINE_3)
-+                add_assoc_string( return_value, k, v );
-+#else
-                 add_assoc_string( return_value, k, v, 1 );
-+#endif
-             }
-             fclose(F);
-         }
-@@ -432,10 +440,22 @@ static void uploadprogress_file_php_get_info(char * id, zval * return_value)
-  */
- static void uploadprogress_file_php_get_contents(char *id, char *fieldname, long maxlen, zval *return_value)
- {
-+#if defined(ZEND_ENGINE_3)
-+    char *filename, *template, *data_identifier;
-+    zend_string *contents;
-+#else
-     char *filename, *template, *contents, *data_identifier;
-+#endif
-     php_stream *stream;
-+#if defined(ZEND_ENGINE_3)
-+    int options = 0;
-+#else
-     int options = ENFORCE_SAFE_MODE;
--    int len, newlen;
-+#endif
-+    int len;
-+#if PHP_API_VERSION < 20100412
-+    int newlen;
-+#endif
-     TSRMLS_FETCH();
- 
-     template = INI_STR("uploadprogress.file.contents_template");
-@@ -455,7 +475,13 @@ static void uploadprogress_file_php_get_contents(char *id, char *fieldname, long
-         }
- 
-         /* uses mmap if possible */
-+#if defined(ZEND_ENGINE_3)
-+        contents = php_stream_copy_to_mem(stream, maxlen, 0);
-+        len = contents->len;
-+        if (contents && len > 0) {
-+#else
-         if ((len = php_stream_copy_to_mem(stream, &contents, maxlen, 0)) > 0) {
-+#endif
- 
- #if PHP_API_VERSION < 20100412
-             if (PG(magic_quotes_runtime)) {
-@@ -463,7 +489,11 @@ static void uploadprogress_file_php_get_contents(char *id, char *fieldname, long
-                 len = newlen;
-             }
- #endif
-+#if defined(ZEND_ENGINE_3)
-+            RETVAL_STR(contents);
-+#else
-             RETVAL_STRINGL(contents, len, 0);
-+#endif
-         } else if (len == 0) {
-             RETVAL_EMPTY_STRING();
-         } else {
--- 
-2.1.4
-
-
-From 95d8a0fd4554e10c215d3ab301e901bd8f99c5d9 Mon Sep 17 00:00:00 2001
-From: Jan-E <github@ehrhardt.nl>
-Date: Mon, 20 Apr 2015 22:20:40 +0200
-Subject: [PATCH 2/2] int id_lg should be size_t id_lg
-
----
- uploadprogress.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/uploadprogress.c b/uploadprogress.c
-index 7a52ba7..3d73d15 100644
---- a/uploadprogress.c
-+++ b/uploadprogress.c
-@@ -304,7 +304,11 @@ PHP_MINFO_FUNCTION(uploadprogress)
- PHP_FUNCTION(uploadprogress_get_info)
- {
-     char * id;
-+#if defined(ZEND_ENGINE_3)
-+    size_t id_lg;
-+#else
-     int id_lg;
-+#endif
-     //char method;
- 
-     if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &id, &id_lg) == FAILURE) {
--- 
-2.1.4
-
---- a/uploadprogress.c	2011-08-15 09:21:10.000000000 -0400
-+++ b/uploadprogress.c	2016-12-07 11:05:47.961377088 -0500
-@@ -213,7 +213,7 @@
-             FILE *F;
-             F = VCWD_FOPEN(progress->identifier_tmp, "wb");
-             if (F) {
--                fprintf(F, "upload_id=%s\nfieldname=%s\nfilename=%s\ntime_start=%d\ntime_last=%d\nspeed_average=%d\nspeed_last=%d\nbytes_uploaded=%d\nbytes_total=%d\nfiles_uploaded=%d\nest_sec=%d\n",
-+                fprintf(F, "upload_id=%s\nfieldname=%s\nfilename=%s\ntime_start=%ld\ntime_last=%ld\nspeed_average=%d\nspeed_last=%d\nbytes_uploaded=%ld\nbytes_total=%ld\nfiles_uploaded=%d\nest_sec=%d\n",
-                 progress->upload_id, progress->fieldname, progress->filename,
-                 progress->time_start, progress->time_last,
-                 progress->speed_average, progress->speed_last,
diff --git a/dev-php/pecl-uploadprogress/pecl-uploadprogress-1.0.3.1-r4.ebuild b/dev-php/pecl-uploadprogress/pecl-uploadprogress-1.1.3.ebuild
index a11f8d2eeeac..a19bb78b273d 100644
--- a/dev-php/pecl-uploadprogress/pecl-uploadprogress-1.0.3.1-r4.ebuild
+++ b/dev-php/pecl-uploadprogress/pecl-uploadprogress-1.1.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-USE_PHP="php5-6 php7-0 php7-1 php7-2 php7-3 php7-4"
+USE_PHP="php7-2 php7-3 php7-4"
 
 inherit php-ext-pecl-r3
 
@@ -11,14 +11,15 @@ DESCRIPTION="An extension to track progress of a file upload"
 LICENSE="PHP-3.01"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
+IUSE="examples"
 
 RDEPEND="
-	php_targets_php5-6? ( dev-lang/php:5.6[apache2] )
-	php_targets_php7-0? ( dev-lang/php:7.0[apache2] )
-	php_targets_php7-1? ( dev-lang/php:7.1[apache2] )
 	php_targets_php7-2? ( dev-lang/php:7.2[apache2] )
 	php_targets_php7-3? ( dev-lang/php:7.3[apache2] )
 	php_targets_php7-4? ( dev-lang/php:7.4[apache2] )
 "
-PATCHES=( "${FILESDIR}/1.0.3.1-php7.patch" )
+
+src_install() {
+	default
+	use examples && dodoc -r examples
+}
diff --git a/dev-php/pecl-yaz/Manifest b/dev-php/pecl-yaz/Manifest
index f62bc97e7b5b..e9cf95f5a57e 100644
--- a/dev-php/pecl-yaz/Manifest
+++ b/dev-php/pecl-yaz/Manifest
@@ -1,5 +1,5 @@
 DIST yaz-1.2.2.tgz 20131 BLAKE2B 7aa0729ba6033870099ed7c0d4961eac02d74d5aed6c7a58c0ccf59f57401cd7b438594c388ffc7c7b9d73cfc9f1c466c718ad685cc638651a9ac4e605b38ed5 SHA512 cb90d4ac9fcdadcb9215f7b795657dd3fdff69f2b2d399beb2afa6327a0be733d2a563863e2ca861182eadcc2faccfbe64e72d108662afc68d393a6bc5cc4bb2
 DIST yaz-1.2.3.tgz 20059 BLAKE2B 3fbf6d57e8519f6d363dbf308cb6ba259098521ae352f8886e8e12ca2a0d8119eaa31fc30301aea6979b32c6c321c4de0ad63ebe72e8f52cbb630d7f136f3e60 SHA512 5e6ebccac05fa44b0758b6817530e8cb436e45ead659f6a5029383515213bcce8c8cc7ceb8ef5ff4ec2335ad5c3009c6ccf8786116b115c24a013329d107bd7a
-EBUILD pecl-yaz-1.2.2-r1.ebuild 536 BLAKE2B d5071f9fd78642010d196167d47e502b840ec7be81e3e2ebb146d5168804a5c1b8dca24c10f6985bfd96b1a4fd9bf5dffcb50ef6e17a53df8e058904eea6ccb6 SHA512 fa6b20c9e37a963aba3c23f4a333c9ebafda2e5c6d8f14d403b5119fcaaa7943f91b47ffc01d2b84244f10d609df8ab81ba24c0421d30a571ce31c1ddcab1620
-EBUILD pecl-yaz-1.2.3.ebuild 588 BLAKE2B 4a43e17df50613ca83eba08d8852e8fece5c765a59cbd8651b56ad05c79dd0cb498664556af62f5e4a1b868e14f5ce69f0071bc7a1e9c7752f7a54880200123f SHA512 ae121f6b794a8fa8be779c8245c9f79614b15cb867365d2aafa8e64ce9fcb76687fb84e5418e67930901aa20cd625fc3768290c66e1f96e5b8339e203df8c7da
+EBUILD pecl-yaz-1.2.2-r1.ebuild 532 BLAKE2B 5c6248437834e1fc7a5c50dbcdd4cd342f8696d81464d37c63d1f030b5ef0144885f1db5fde2588bd1d7030ae17f7f3f193580b850a11347aacb0f9d97169bf4 SHA512 2b7414f681dbaaeb84836e1cd52bb80fa551706631280749258f694cd04095e50322fbef5e4b88f7ea24ba37aba10ad8bad60b5bfe534cbda90bca6f82a472e4
+EBUILD pecl-yaz-1.2.3.ebuild 584 BLAKE2B 0aec00fbd3dc3b434df70b9c227cd8bcf51d584e731a31e803c06f9300c5cd6ab2d3ece95ee205998b9b81f246bff72688ab084db30fc18b4bef5c650e08cdc9 SHA512 fe28350195e696523aacfc1d4a68937d6163b59c89995a95eaffed221c815a04714e2c9376993c4838af85bd62991fc1a81febedc1441e85500db9f40b39886c
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/pecl-yaz/pecl-yaz-1.2.2-r1.ebuild b/dev-php/pecl-yaz/pecl-yaz-1.2.2-r1.ebuild
index 8ce081b12ebb..62628afaecf6 100644
--- a/dev-php/pecl-yaz/pecl-yaz-1.2.2-r1.ebuild
+++ b/dev-php/pecl-yaz/pecl-yaz-1.2.2-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
@@ -12,7 +12,7 @@ USE_PHP="php5-6 php7-0 php7-1 php7-2"
 
 inherit php-ext-pecl-r3
 
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 
 DESCRIPTION="This extension implements a Z39.50 client for PHP using the YAZ toolkit"
 LICENSE="BSD"
diff --git a/dev-php/pecl-yaz/pecl-yaz-1.2.3.ebuild b/dev-php/pecl-yaz/pecl-yaz-1.2.3.ebuild
index 9f0cd35777ae..21295a2e6faf 100644
--- a/dev-php/pecl-yaz/pecl-yaz-1.2.3.ebuild
+++ b/dev-php/pecl-yaz/pecl-yaz-1.2.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
@@ -12,7 +12,7 @@ USE_PHP="php5-6 php7-0 php7-1 php7-2 php7-3 php7-4"
 
 inherit php-ext-pecl-r3
 
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86"
 
 DESCRIPTION="This extension implements a Z39.50 client for PHP using the YAZ toolkit"
 LICENSE="BSD"
diff --git a/dev-php/phar-io-manifest/Manifest b/dev-php/phar-io-manifest/Manifest
index af0ed398a040..95df4b297f76 100644
--- a/dev-php/phar-io-manifest/Manifest
+++ b/dev-php/phar-io-manifest/Manifest
@@ -1,4 +1,4 @@
 AUX autoload.php 3913 BLAKE2B a3c8a3b75e2b150157892bc8ea168e7c60e5cef95cdee1279579a4b1efd4a4647bb5ec22f272575342d8945674fce048b1a091cd48977cdc77a975668c3a0849 SHA512 d43f3a726eb79ee88e674ac0ec3fb4d175ac0041b96638e4d2a40a47720ebd3a983cd36dd943fff9c0220dda68549361628636e94f595b0601d6eddf2b937fe6
 DIST phar-io-manifest-1.0.3.tar.gz 21903 BLAKE2B 48fb8858ea6c89415e78da399e2d3b6660e1857958094bf5e6c42465cfc32e34122ec1ab6e413f36f48e288ef40af7b85f93c80e6a2cfa547a166557de04ec97 SHA512 f8f9a6d4b761b739ec24a9f94ae5d4ac74f7276621675e3f3c7c3085aa7662c73cc703b1c86531d327199cf42074bb19446c14f78a3c8a888b1d236dc59bed94
-EBUILD phar-io-manifest-1.0.3.ebuild 717 BLAKE2B 9c31bf26ce2f7259c0c3fcec8cdfd157838c850ea40afd23149de416d20fa416393ac8a447fa3bd6182f8ced558ff4d682301b7a648418a93a5c5c0611efb843 SHA512 6df0759ff0e2203318e3fe92716182f56cac2d0a445839366094999f58d3c3b369cd1fab7a666d067ca8d3262c3278050f971e3ebff9bbeba9d59ddcd52112dd
+EBUILD phar-io-manifest-1.0.3.ebuild 713 BLAKE2B a3da061066e1f007d6e490f2f24bc6d96a061de10eb4f58bc7de628d1e586f4ecd270d3ae942c30fe6eb8318e09d17370da349d2f61c9651e44638de8d7074ed SHA512 21252049850d19473bb59559fa560c2fbe89c23d7a6fe57708582f9aa008e94686a277c037441649825b377f98b572860fe4c0fa4176e4ac132eab0e7bf23c53
 MISC metadata.xml 320 BLAKE2B 2a537b76317bec0310e9c6912562d75b512f00dae3ae411aff048a15e7b0986328699427135dedeb990f3f64f3b4b012e139349c5c082a7ba4c6447ce7b68143 SHA512 7ddc7f302bdafae9be276682a0c57125beeb45a9b96afd3fa1662cb699b95c96c36151ab91027e890c33054bd735ae250667292552ea20397587e6f547ad5aa6
diff --git a/dev-php/phar-io-manifest/phar-io-manifest-1.0.3.ebuild b/dev-php/phar-io-manifest/phar-io-manifest-1.0.3.ebuild
index ce651fab76f1..53576524a259 100644
--- a/dev-php/phar-io-manifest/phar-io-manifest-1.0.3.ebuild
+++ b/dev-php/phar-io-manifest/phar-io-manifest-1.0.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"
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/phar-io/manifest/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="examples"
 
 S="${WORKDIR}/manifest-${PV}"
diff --git a/dev-php/phar-io-version/Manifest b/dev-php/phar-io-version/Manifest
index 8dc68abf7dbe..fad393f8405f 100644
--- a/dev-php/phar-io-version/Manifest
+++ b/dev-php/phar-io-version/Manifest
@@ -1,4 +1,4 @@
 AUX autoload.php 168 BLAKE2B 8a0af6dc727f5f2fb7d43beda5e7d83bf5879117b4017ca3467d7f5da2e76dd50e58260ee0c3dd043a2da04693cca0fde4f1124aab317ef52cbc3855bd305683 SHA512 d02b31090ab4b2efe92ed0243c4a877a4a0731fc65fc7dd688087b08b3ced80c33570d9f081829354b35612e80b22f28df14cb35faad7466f925aa1c523f7404
 DIST phar-io-version-2.0.1.tar.gz 10348 BLAKE2B 22a4f8426c14662781534e63ddb62e4e783fe563ae061c0c3ae87960e0c649d68adff9b19e4388e9aafc52184aa273e8ecc5df08f16e0918258a2a4862950181 SHA512 068d872ecafc3491c7cd27068fa2b35cf1d7e3abe21649677c935e897b6582d2efcdcbcef71a00f3b9b416320f6139c671411821ad41e3b7c906fac5288646ec
-EBUILD phar-io-version-2.0.1.ebuild 630 BLAKE2B 55fa6b9e180a6e111dae3fa9a9ba06d782d65b1105992b5cd477572a947226056cf84fdad5d1160239fde8c61d43dba1d4d9738f134257d9426d659e2c22d37d SHA512 4cc0a93141c83b4230ae37c52276e6115dd0101a34d7c9ab6d82add69a4022a733afd7a7b364bac444ab17c355e2d278e7d14f721c8209be1692014e56c7fb90
+EBUILD phar-io-version-2.0.1.ebuild 626 BLAKE2B bb58bf5ce5bad440cded14ae6b45c10832072d855942d5fa1aa540562dcc144a3597e22dca57a1609323e4460ada61cb22617507beba772c938019a7e17e823a SHA512 cb148093c8b627faadf704cdcfab356a5d43c1e4aa866d389949461553124e7883dc127f2aa209faf1206b7484bc33149faf78a4f9de0c2a2c0b6d44d7da05c2
 MISC metadata.xml 319 BLAKE2B 7b19dcdee79f5b221681a56499a5b1a088bb6b8bb1b98d4c38a0d9c65212f26cc9fc8e830ed60eb077b9804b9d9d8cf3033ef809ebbb4de14b23507d8ca9e1c3 SHA512 c229ce6bba2b1abd6e744e26e8d9f4653ee53567d6eee13fb2b2b485db84963a121349fd9a26c5c89c63e52545605903a3d066bce5aed1ab17ed75d57bf96b11
diff --git a/dev-php/phar-io-version/phar-io-version-2.0.1.ebuild b/dev-php/phar-io-version/phar-io-version-2.0.1.ebuild
index c0576cc49ef8..1ddbd002159e 100644
--- a/dev-php/phar-io-version/phar-io-version-2.0.1.ebuild
+++ b/dev-php/phar-io-version/phar-io-version-2.0.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"
@@ -9,7 +9,7 @@ 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 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE=""
 
 S="${WORKDIR}/version-${PV}"
diff --git a/dev-php/phar-utils/Manifest b/dev-php/phar-utils/Manifest
index c4e07f7cbf3b..f20a37edb361 100644
--- a/dev-php/phar-utils/Manifest
+++ b/dev-php/phar-utils/Manifest
@@ -1,6 +1,8 @@
 AUX autoload.php 261 BLAKE2B e3aef92345eb95b936a4b3edc12e9518804c9f75087d73deec3882c113a913a17f2bad46c6a2e9c7c6e396e795863cf930775b566cccee77fb275013fb29c0bb SHA512 9e4820ee718f642ff95baaff3cd848b868465d5b6538377517f384aa6e0198e0cd3298e98ddd4ffa86e6669f438a6ce8236f4d56440e9e77b3df20599699753d
 DIST phar-utils-1.0.0.tar.gz 3152 BLAKE2B c4dfd3d659989bc22adcc14c79e28d623753988742d2fdd178dfd98590b629083ad85c9f112ab23c6213fa70cdad838ebbdc01c45551892ed9a20a3374abd28c SHA512 bf3d7074a3f1101a7f03e8fb8a5bc1456674bf2f9ded6a5fc5fb2f892c1cc3c4643fab6c003851ed12ea16ce6390f482cf897beee7d7c38922b6c54c90b0934e
 DIST phar-utils-1.0.1.tar.gz 3251 BLAKE2B 4d12701c53c3a17a141dd35210bbac16b84be7bb6d87b459d13114b09188487f86aedc13afbf510a2e01741a72e1929e25ee5204b729fa5b23801e429f844a58 SHA512 a1fb09b712add948f7b5c19e2f9e81869c76f91dd7d41c981b3f06870a6f7a15d0c413338751587642e3dc538e181336b9fe80f61148ce304025434e9d01d6bd
+DIST phar-utils-1.1.0.tar.gz 3742 BLAKE2B 8be6dd17cd7b6641b52a30f58d0f5615e966b8eaad0f2d9c2927eee98f24a840b4751ba779af2d5b27e05c2ab07333475c22896e165589b4091770356039bf82 SHA512 2d715da6deea878db0ff9dce1aa7ec46c4b25d74411df2498a55228ee9fec9bdc350003f829495dfdebf3f5bbec58810afeaa58c7f762f32af6f26ced8569e58
 EBUILD phar-utils-1.0.0.ebuild 540 BLAKE2B db97fcd60bf5c51010548dd186b3957f277b2a2818d8cd60b7cbc62457a96850956012a44ceddb663931fb2ee4035cadca813373ce5f16c9046c667abcc47ef3 SHA512 d3e797a0fdfa3a43717d8947fb0b4e1d1dc3720ef9303dd8dd27ee77e3e6bbf603d00a2b4fec9dddab7f1d6f9102e63ea7426cd13ac226fc701c7c28d84be6c2
 EBUILD phar-utils-1.0.1.ebuild 540 BLAKE2B f46c41b1c9949a8544be7a0ae5eb8af7bc9702ede67076972ddb6f7b17b5cda174d91b06e4ba5b9baa9da7d6be22a215dbae139378f8251343cf97a5b76a4f5f SHA512 06c23e48d0e8158d37977e903c288dce1c9462bc37cf814356aabe03e25edd90acae57dc83547697f3c7692220f793959b20762943a93cf2af2939e2f4e2047a
+EBUILD phar-utils-1.1.0.ebuild 537 BLAKE2B 24488b103cf1e17a63a1befe6984fddc842c6d7a8133f766fb390b7f666a0e11f69f99b1fabde66b1a270f86bcf0ab05e26c0b886930d5f0a01d223316eadc3e SHA512 3c1b7f9bbce383b9d97f3a260e47b394c14d9697e19d412a9543b12cfb0bd30a31b18296846c6278838a9490a2e13ac7ac76935846231bef409618f0a7fcc6da
 MISC metadata.xml 655 BLAKE2B 141d8e0009997b21831892bdc2b8765bbfabb21d9f26a4d5af6a5193373e05cccde913fad8320593d2c394ef8af26ec7bc7b13ae89642420363bc4efe3fee3e0 SHA512 98e651be3649ef21f90165756ab53052bee40104a6e819f29e56565436c3ad9ec853ae5a9cbaf9fed911d579c7d16a22a68f328103a2ef23a66ad6e550163d70
diff --git a/dev-php/phar-utils/phar-utils-1.1.0.ebuild b/dev-php/phar-utils/phar-utils-1.1.0.ebuild
new file mode 100644
index 000000000000..20800e163108
--- /dev/null
+++ b/dev-php/phar-utils/phar-utils-1.1.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="PHAR file format utilities, for when PHP phars you up"
+HOMEPAGE="https://github.com/Seldaek/phar-utils"
+SRC_URI="https://github.com/Seldaek/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-lang/php:*[phar]
+	dev-php/fedora-autoloader"
+
+src_install() {
+	insinto "/usr/share/php/Seld/PharUtils"
+	doins -r src/. "${FILESDIR}"/autoload.php
+	dodoc README.md
+}
diff --git a/dev-php/phpdocumentor-reflection-common/Manifest b/dev-php/phpdocumentor-reflection-common/Manifest
index ed994a151d4f..47f3bfb94486 100644
--- a/dev-php/phpdocumentor-reflection-common/Manifest
+++ b/dev-php/phpdocumentor-reflection-common/Manifest
@@ -1,4 +1,4 @@
 AUX autoload.php 271 BLAKE2B 755d18da274f77605c5873c2ddfde9ff2f47ea325f647d405a1519b660d51bd057a2e299cc4797ad4578ee3af1d56e05ce6cf272fd7e4019d2ad86f4e12dd324 SHA512 7aae3acc76199fd18558d5ae048e6d32d122a2b5310709f7b6129e3ea53be140e290b0ef8e1f69a153f9ee387de959047a6a8c4ec780df98e51c9f56a7af6e81
 DIST phpdocumentor-reflection-common-1.0.tar.gz 7746 BLAKE2B 0e7119b9a55e4408160c7e04f569831b491c801f4a12e4b17af21eb4a1fcd9b7f84f23548551f829506649d3accbd3a890bae7ba8ef4390051f45f68143f76a2 SHA512 63d76282d0921535af70e084d3621d8cc6b07f49bc5348429a340730212f3c99f8e64636e43cebb3140fa4f6363b4f2a0c02cbe38036a28123e7bbeb67c61a0d
-EBUILD phpdocumentor-reflection-common-1.0.ebuild 686 BLAKE2B 9c129cc21352034282390ee24f2b99a77158aa02ff1ada0a8e6e35a3238facd71add7efd6b31fc7321f556d07082fcf7ce88e28d1ee8068fa26de8a2ba441bc6 SHA512 f82c20293d8436c726330de5b4c1604f7f533c7720e8d6e2fa0e8f8e6d824f21a6354bde194227293222a1f5cb466fc4b386610c086afbadbec90768108ae5af
+EBUILD phpdocumentor-reflection-common-1.0.ebuild 680 BLAKE2B 843bc2ac974597dc055ba76ea085f0de2d2aab0294b9fab903c542cac02c397420177eca32ad4692eb806d41517c20ab3681ff30a158d0e2709a822c3b7caa59 SHA512 1961bd25c6507b43082e9f68c09a5aef0e5a26e2ca380f736da4f2bc5c897d0afe4429fab9e78887a02247ce72df7ad437d9b1eb5e2be8a5ff0afb536a890e2d
 MISC metadata.xml 334 BLAKE2B 1b34b1832ed2c8cde0a91717334174f49fb69986aceac768cecf15e1898acf8b5e1ed12ff361be20cce83e8e8b7c31c87408b924b5e6a8d17700b5d6a88285bc SHA512 9db658eed874814225b9a118d88b900e7a6965cd629da7aa98cbbac2f1708425ae463a9dee7ce12cf9dc9b78cd2c123a0b5bd4056ca25feb47e5747112a4d0e5
diff --git a/dev-php/phpdocumentor-reflection-common/phpdocumentor-reflection-common-1.0.ebuild b/dev-php/phpdocumentor-reflection-common/phpdocumentor-reflection-common-1.0.ebuild
index a1ff303c1d7b..df7fc22e980b 100644
--- a/dev-php/phpdocumentor-reflection-common/phpdocumentor-reflection-common-1.0.ebuild
+++ b/dev-php/phpdocumentor-reflection-common/phpdocumentor-reflection-common-1.0.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
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/${MY_VENDOR}/${MY_PN}/archive/${PV}.tar.gz -> ${P}.t
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-php/phpdocumentor-reflection-docblock/Manifest b/dev-php/phpdocumentor-reflection-docblock/Manifest
index 332fd676ca86..9f296a2ff690 100644
--- a/dev-php/phpdocumentor-reflection-docblock/Manifest
+++ b/dev-php/phpdocumentor-reflection-docblock/Manifest
@@ -1,4 +1,4 @@
 AUX autoload.php 499 BLAKE2B 8e159b25c5682a68259674aa256c667da624f17b1b784c93cbdcd792f4fe4066122f5848ddb99a7011022b389a1cf2dc955c1b45c4771446363f1e873b32b3ac SHA512 9674ebd512047c27ac986eb63395cc4762c4b0dce3ad5ba1fd76284767e1c724c1b61855a32d96fe925bc1d8c1f76e8c12e016156028a66f7d909dbbf4d676ad
 DIST phpdocumentor-reflection-docblock-3.1.1.tar.gz 42935 BLAKE2B a18fbc5012a28e9f0ab59c6f485bec692aed5e7d245845be1c20a34e51b646b3cfd57d84f10f60a5e64c3ad0cc916b1bd97f07629035d3d4991056665012bb39 SHA512 43f1824db3a7a3793db88817e3cedd6379c8e9074fac1a3e781d049a74a13bde3c519c0a9b2a9219d7869339ab16276229d5d3d9398d9bf7f6cdac6dea5a12d5
-EBUILD phpdocumentor-reflection-docblock-3.1.1.ebuild 769 BLAKE2B 7d89cb2002ecb923a914da58d4189a1bf9891ab3dce022d2f13006f144b8f256ac63471bbfa24ddffa93cf856a2a6285106c390a7eb72f827ce1bd7a54b759a0 SHA512 5d259ef42f5852e86cc51f381cc4854a48997c4d042f330f4df3ac7208306f24830f138b7baa75846b6e625def0709e02562b2c1aa7693651c1f9b902e731429
+EBUILD phpdocumentor-reflection-docblock-3.1.1.ebuild 763 BLAKE2B b80f043ae320b6e573eb23c416a246cb989a95367550929c896e0762cffe5149f9bb04748bc6ecdaf6907b0691ec0a80d9945ca16f396a253bcd88b23361edba SHA512 2c0f28be8b08baa817929d0ea9c4b6228513b187df62740ca89ef8c687ce8b934fa9866eee2d1c6e30c590059b99975e066b46c653b7075db55fbbfb848901b1
 MISC metadata.xml 336 BLAKE2B b7192560a302045b5f417f3e9c1330c0e73b0fe6c95b79dcacdcae41db70b8b4ef749b7eec902dacbd9e11750d5487c6260013446044dd0cc4a610bcfc83a697 SHA512 6e525276f4719b05ca8d891b76a742450940dd4b6a2bbdb839a5c7556f3ddff370f3e504f9a05449161105b838228519d5d14be2d3994335d7f8e4f90d7eec61
diff --git a/dev-php/phpdocumentor-reflection-docblock/phpdocumentor-reflection-docblock-3.1.1.ebuild b/dev-php/phpdocumentor-reflection-docblock/phpdocumentor-reflection-docblock-3.1.1.ebuild
index 78383aea327f..bade1b51f23c 100644
--- a/dev-php/phpdocumentor-reflection-docblock/phpdocumentor-reflection-docblock-3.1.1.ebuild
+++ b/dev-php/phpdocumentor-reflection-docblock/phpdocumentor-reflection-docblock-3.1.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
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/${MY_VENDOR}/${MY_PN}/archive/${PV}.tar.gz -> ${P}.t
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-php/phpdocumentor-type-resolver/Manifest b/dev-php/phpdocumentor-type-resolver/Manifest
index f60fbd1a819c..d95e326e0d25 100644
--- a/dev-php/phpdocumentor-type-resolver/Manifest
+++ b/dev-php/phpdocumentor-type-resolver/Manifest
@@ -1,4 +1,4 @@
 AUX autoload.php 271 BLAKE2B 755d18da274f77605c5873c2ddfde9ff2f47ea325f647d405a1519b660d51bd057a2e299cc4797ad4578ee3af1d56e05ce6cf272fd7e4019d2ad86f4e12dd324 SHA512 7aae3acc76199fd18558d5ae048e6d32d122a2b5310709f7b6129e3ea53be140e290b0ef8e1f69a153f9ee387de959047a6a8c4ec780df98e51c9f56a7af6e81
 DIST phpdocumentor-type-resolver-0.2.1.tar.gz 15231 BLAKE2B 1c47c8de34bf97cbfd7fa8c5c138a61e77f8897ab8009ae24b4a05e83bd58b9a0990bf365d3578d6b15f642cdb53b9a62a6485887350e19763320d46bf59d7b7 SHA512 888d165b397831d7319116c71dc34a3c738601bdb9956d250f80ee89374a9f063449ae9a82a43646e9156ad720e84e5d951c35dee746a37354388cd1f69d5154
-EBUILD phpdocumentor-type-resolver-0.2.1.ebuild 720 BLAKE2B 2ff55ee66ea9c95306782e0f6a1bbfc023b609e56af02da430cd225b971a8b9c4f97d4a659d84a7acc947f9725e3f8c4a5e3cb9f3326f913befc56dc2a8d0398 SHA512 bb791f2e3f6850e713eecdfcd6f6cf3b0508c2da1222df6e631741d1b84c6167d5785eed6f5f01bda3b91035e7d12667332238945306f9812e5f45576394b46f
+EBUILD phpdocumentor-type-resolver-0.2.1.ebuild 714 BLAKE2B 7035a7b6bd96d625b62a09c9724031a99cb0e99163e47862f6988262b2d0434573200614d2c209195f6834057ff8f5a3e5dad3cc56adf54bbcd9ad75887dae29 SHA512 07caa08d48b84ec886cc6eeaf87a41d16ac3937d5a527e6dcae46f977f8154aee01e155fbf89b13e3e7daff34d42957695944783559bb68509932e661fb4e59d
 MISC metadata.xml 330 BLAKE2B a68bfeb6fd53ba7c9ee80e5ea5ea50bdc531eccd13caf0b6e9efc0d4585a6d05e782312bfb4bf4fac4a3df596f029cf0e42a23d9a70ea66fbbd95eae1e259d73 SHA512 3c2e71a10cb0191aa7ab5332bdce3e38465514611dabd3374bb29fe4411f68e0382e5bcc66a0782ba56b1bbc823dd0f435f830809c1bd36e9fb142a68774f353
diff --git a/dev-php/phpdocumentor-type-resolver/phpdocumentor-type-resolver-0.2.1.ebuild b/dev-php/phpdocumentor-type-resolver/phpdocumentor-type-resolver-0.2.1.ebuild
index c23aafba32d5..7cbd16a1c114 100644
--- a/dev-php/phpdocumentor-type-resolver/phpdocumentor-type-resolver-0.2.1.ebuild
+++ b/dev-php/phpdocumentor-type-resolver/phpdocumentor-type-resolver-0.2.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
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/${MY_VENDOR}/${MY_PN}/archive/${PV}.tar.gz -> ${P}.t
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-php/phpspec-prophecy/Manifest b/dev-php/phpspec-prophecy/Manifest
index f6e8cbcd0c8a..43f173ce4545 100644
--- a/dev-php/phpspec-prophecy/Manifest
+++ b/dev-php/phpspec-prophecy/Manifest
@@ -5,9 +5,9 @@ DIST phpspec-prophecy-1.10.1.tar.gz 38707 BLAKE2B 1eaa3fe0043b0d03341778679683cd
 DIST phpspec-prophecy-1.7.0.tar.gz 60338 BLAKE2B 8171120d8407f2e554150d5e3ea1972c54d4e2ce0e6698763f0b3c7e1645340ce22404da7844fed8412579c46f372852b4553c6d8a65c8094ef3065b0dbbd80c SHA512 e8efb3882d869f10fe39dff7c2185e1ec6f044c794fd6a5785e1c1c69c71b91dc3997f61bd2566d3243dde0becce568beba9a18fa0fd152e6ce74ca43a9a0fb0
 DIST phpspec-prophecy-1.8.0.tar.gz 37907 BLAKE2B 4bdd55d7fc14604c9fade23c60bf51f4c03accc182d7c5ad445dc6212a1e41b1bf392fe8f4a29768ecfcb2af479c0db3e29d5787d12e1f3222b032ba7e64dbc8 SHA512 992673f7cd148cf0b8752bbad614bbe34175a761cd4bf8849625794b505342d1bd918212a0f1463d94513f9e805d3dd127ba129d6622bcda29ea2b5c57a5582f
 DIST phpspec-prophecy-1.9.0.tar.gz 38262 BLAKE2B 1642d38afa368be504da73c0bcf34921fe167dff5665651af23142f33979a35d8d10112e3d1c5b1b38448b92b4741ebda2c183dca10473dce833090a603f95f6 SHA512 d0ba1840ca84cf4b0642083858326c593086f35ba3a6d83746956efbe5d538910efc01655eaa14b4e2b7e17e7bd19cd2494cdfad0dd5bdfb43cdee2402a55b05
-EBUILD phpspec-prophecy-1.10.0.ebuild 834 BLAKE2B 1d8182c93eaa7523df81ab98ade00d782537ad1c7c04a935ca4504cf54b24d09b15c49319c25c9903926d2f409a255d65314599135170be296de764321609642 SHA512 ce91aa05484beee0d3ccf791f1f18c9d02915a35a8bbf6423308609fa8902fc38b4727ca7e71a0c61ba3e35eccc0f82c2f22b9dc6f37d65c3e8dba17965a0f15
-EBUILD phpspec-prophecy-1.10.1.ebuild 834 BLAKE2B 818910e931068d317fae0e36f6a103ac85840cc67cf1c016c3908b25f02fb795b5a48ac8489505ae552c6c32e50c8eea196deeefec00272eddfcda847a0c8467 SHA512 d6070fd3a984bb9680687edb8a99b109d31ea08bbe6e269606cffc99df6c8472f1aaa7744ccf51a8d987f837f1b0c32040dced0769f4e89a5cce32b264fd9c7b
-EBUILD phpspec-prophecy-1.7.0.ebuild 804 BLAKE2B 654aa9b3f0ee0b74948ccbc032c4e7cb397a3a62127250aaa1922a13c1f76540e1925e22117c6733039003402d6a10a95d0ad755e52099d1ca140e0c8aaddcd9 SHA512 6b93221d188bac75c4e3290335245c1918a494b9adc6259556af604d57ecd3272db0b7c6e8ac08f0baad41e9322047c059be88c11d99136602894faaeb7cc1db
-EBUILD phpspec-prophecy-1.8.0.ebuild 813 BLAKE2B d6273c8ea1b67ab7d57efa1dd95318f3fe579f4052fb3cfefaa5933537de985d0cf2eac356dfe6b8b03a71ac45a4428b0756839b55f8cf7a003e0148ffde8c27 SHA512 dfe5cc0f952053671ca11df8be66e8f786492031b082d233fb6eecfaba8d34813d485081da204dc1bb1107a173edfa59dfd6b493316e20b72ad88d54fbc07b47
-EBUILD phpspec-prophecy-1.9.0.ebuild 813 BLAKE2B d6273c8ea1b67ab7d57efa1dd95318f3fe579f4052fb3cfefaa5933537de985d0cf2eac356dfe6b8b03a71ac45a4428b0756839b55f8cf7a003e0148ffde8c27 SHA512 dfe5cc0f952053671ca11df8be66e8f786492031b082d233fb6eecfaba8d34813d485081da204dc1bb1107a173edfa59dfd6b493316e20b72ad88d54fbc07b47
+EBUILD phpspec-prophecy-1.10.0.ebuild 830 BLAKE2B e9972a363e07fe83f00a282b6c8f1404fcf7d8418c43cab20f72cd4a6b36880fa62e04149b2d82a657feb95719fffd31e58ea40508ab5be27ea10c2df7074f75 SHA512 3e381d989326b6f55ce31738eb4227dab625e1a8c9ddbbb236251ced16f68e103247a47f1ccca89730af2110f164009d5b1468247f0895ba270347d8d8b2d730
+EBUILD phpspec-prophecy-1.10.1.ebuild 830 BLAKE2B e9972a363e07fe83f00a282b6c8f1404fcf7d8418c43cab20f72cd4a6b36880fa62e04149b2d82a657feb95719fffd31e58ea40508ab5be27ea10c2df7074f75 SHA512 3e381d989326b6f55ce31738eb4227dab625e1a8c9ddbbb236251ced16f68e103247a47f1ccca89730af2110f164009d5b1468247f0895ba270347d8d8b2d730
+EBUILD phpspec-prophecy-1.7.0.ebuild 801 BLAKE2B 07c8a7cbee0def8cf2f9762f6aeb01418193d16c16b2be983d78d67d7477b3f4d42c12f65432e9dc321510d7d0e4197cc3d17b616cb6d16c86c662d9704f841d SHA512 7dc9aaed41286dc22fb624b3d5762b493ae5c590ed5d5c0c0229a91650bff0676e6391aa59ad4ad09b7837b7d7ff1c296492fa98c18aa1d835172e46bf16c4df
+EBUILD phpspec-prophecy-1.8.0.ebuild 809 BLAKE2B 26753f262d4b9005ef9e5ee2fc0888687023aad9cb7608d22e713270755ee1214f46ae2535e04d2627e10c534b0aacbc1b904f48c6740fa678d2900c9978cd47 SHA512 9484b2eb57540008f72f7b653c6b953ba706ca83b87e041df7f476ed3529fbfbe8c5b8d15fb8b27d7917116c6060df75aa2307bb36756e7c3e5f6013d59bd705
+EBUILD phpspec-prophecy-1.9.0.ebuild 809 BLAKE2B 26753f262d4b9005ef9e5ee2fc0888687023aad9cb7608d22e713270755ee1214f46ae2535e04d2627e10c534b0aacbc1b904f48c6740fa678d2900c9978cd47 SHA512 9484b2eb57540008f72f7b653c6b953ba706ca83b87e041df7f476ed3529fbfbe8c5b8d15fb8b27d7917116c6060df75aa2307bb36756e7c3e5f6013d59bd705
 MISC metadata.xml 320 BLAKE2B 52dc068f02b6134f5fb38c8a527e6c2cd4f47e260654e0558377fa7b188d5beebcc1c503137014842ff6081f576986e8b1585f61047e019facf4261d54437c6f SHA512 1772f2d920e747cc7e4b1bd32dcc503f72f17c7bcb964e01c74df781a114e0c4879d6018bab9c9244be3adcdc52a5f36e0de9b4ea34743fa9b64313a6a691ad3
diff --git a/dev-php/phpspec-prophecy/phpspec-prophecy-1.10.0.ebuild b/dev-php/phpspec-prophecy/phpspec-prophecy-1.10.0.ebuild
index 77a6e0f02b05..bdb25fc6a8fd 100644
--- a/dev-php/phpspec-prophecy/phpspec-prophecy-1.10.0.ebuild
+++ b/dev-php/phpspec-prophecy/phpspec-prophecy-1.10.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="7"
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/${MY_VENDOR}/${MY_PN}/archive/${PV}.tar.gz -> ${P}.t
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE=""
 
 S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-php/phpspec-prophecy/phpspec-prophecy-1.10.1.ebuild b/dev-php/phpspec-prophecy/phpspec-prophecy-1.10.1.ebuild
index 0e13a51b2a3e..bdb25fc6a8fd 100644
--- a/dev-php/phpspec-prophecy/phpspec-prophecy-1.10.1.ebuild
+++ b/dev-php/phpspec-prophecy/phpspec-prophecy-1.10.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/${MY_VENDOR}/${MY_PN}/archive/${PV}.tar.gz -> ${P}.t
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE=""
 
 S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-php/phpspec-prophecy/phpspec-prophecy-1.7.0.ebuild b/dev-php/phpspec-prophecy/phpspec-prophecy-1.7.0.ebuild
index ea30e9b74742..e4e8addb9b61 100644
--- a/dev-php/phpspec-prophecy/phpspec-prophecy-1.7.0.ebuild
+++ b/dev-php/phpspec-prophecy/phpspec-prophecy-1.7.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
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/${MY_VENDOR}/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-php/phpspec-prophecy/phpspec-prophecy-1.8.0.ebuild b/dev-php/phpspec-prophecy/phpspec-prophecy-1.8.0.ebuild
index cb4ce58cf354..37aeac8fe4fa 100644
--- a/dev-php/phpspec-prophecy/phpspec-prophecy-1.8.0.ebuild
+++ b/dev-php/phpspec-prophecy/phpspec-prophecy-1.8.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="7"
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/${MY_VENDOR}/${MY_PN}/archive/${PV}.tar.gz -> ${P}.t
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE=""
 
 S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-php/phpspec-prophecy/phpspec-prophecy-1.9.0.ebuild b/dev-php/phpspec-prophecy/phpspec-prophecy-1.9.0.ebuild
index cb4ce58cf354..37aeac8fe4fa 100644
--- a/dev-php/phpspec-prophecy/phpspec-prophecy-1.9.0.ebuild
+++ b/dev-php/phpspec-prophecy/phpspec-prophecy-1.9.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="7"
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/${MY_VENDOR}/${MY_PN}/archive/${PV}.tar.gz -> ${P}.t
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE=""
 
 S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-php/phpunit-mock-objects/Manifest b/dev-php/phpunit-mock-objects/Manifest
index ea813a996d25..ab44f941320f 100644
--- a/dev-php/phpunit-mock-objects/Manifest
+++ b/dev-php/phpunit-mock-objects/Manifest
@@ -1,5 +1,5 @@
 AUX autoload.php 3973 BLAKE2B 0d76a132dd080b8f8fe839b1c3cb750372440ff903e464232bdcbaf2fc499c96a7579c63735631885b7e7422b3f6646179a0c4748d3885b81b53fc6652d1c164 SHA512 aee22419472bbca6c5b6a951a41c0a4098071679e5ddd40282a2d717a854189546ac8d2a8d2a9aad43e28b6ff831cedd6541c3b5e19d5599d62ffe2815204ea0
 DIST phpunit-mock-objects-3.4.3.tar.gz 37921 BLAKE2B 1d1cb1dc0bf024525f3d226d1fa67eb27a6de747ac90d58c54d145d284bb0edc06821f45b7b7bb8a3378bd68baa01c31e773da9ff522a410b3f5038746eadf67 SHA512 c9305796062a9ef412c194a82322c913b695c74fd9505580707381f9d9f96f6d69a16bde2c35226240e3c2bfaa6f0f9bf1c94c178b8a1f050b5afef7e53611de
-EBUILD phpunit-mock-objects-3.4.3-r1.ebuild 750 BLAKE2B 981ca01325cc3f5623371c834ef2f1a4d45240e8c4c1677cf8f8daabbc4d5927eb74c47f815714031e05751ab61aa811f5a88c5a7c500e402c6445d2859a4f37 SHA512 5de3bfd256abe1ad818955d383c2fb35a721ddaef8e9348f515fe3405b4031e30441eaf5bcbcf5e04327290ec37fb6ac64ef366eb43fd5014edc66129c65e869
-EBUILD phpunit-mock-objects-3.4.3.ebuild 747 BLAKE2B ecba9b3f20bfb047bfe6babcfc6a5d838546807261655f6dce06d08feb0fcbb502acd29a7ab1d6658b3076b27e795a5190e9dab3b8f65c4e8cfb3d32f00b0475 SHA512 ae5f81092e743f770a7a248120c486c3baa8145119aa181a30ac5d5225c7df354c0336f6db70703232a035be2a32ad0dac8a2c6ae041610148f43359c0908e69
+EBUILD phpunit-mock-objects-3.4.3-r1.ebuild 746 BLAKE2B 4e2424463a960a778c5a3b87ffcb285da3d3c62441c1d0ade2a592b86c01038b680af6eed4c92db3c58a9d9cdd4488a7f032b03db954bd60088bcfe41bde2d9c SHA512 baed2c07c589d8898804171f3fa179ab4b3739521a177fd0847f74f31a24a27b33e84329cc12867d8603d0cef4e6fd8dcadefd2cda64b5dafcf0089607c2a2a1
+EBUILD phpunit-mock-objects-3.4.3.ebuild 741 BLAKE2B 96c2aa9959da8d77e675aef0e6cfd4dce0319d8c7125f8b486ae76a16b5391854652ba2b67a15a45d78e0023937c2889e3f0dfb7261de735159bf8fe84c39963 SHA512 c5019c5da6a6edb6cbff39b061f06579fdd1a4a2c43e8e7b53e45d544d8be2675b391dae331105c0390f298274d5c38b68a60be00e7307b301004f1b1ec9677c
 MISC metadata.xml 342 BLAKE2B 1dd45edd9b24f97ff402f3b3821e9019873024d52cf1dad8541fbb165393ef9b6f38834744c9093ea033eec4b901c91e59713d3c879a6f93c8ae5f3863980b42 SHA512 81c56c098a010d97eada1ff754710726c9ede41eec3605bd7dc0e69e5066b58afcab886d4a55fa2977482cee82f7c203ae6f9e794b4c190359e66b5a756ece51
diff --git a/dev-php/phpunit-mock-objects/phpunit-mock-objects-3.4.3-r1.ebuild b/dev-php/phpunit-mock-objects/phpunit-mock-objects-3.4.3-r1.ebuild
index a1d2fd9ecf64..686be65e1e3e 100644
--- a/dev-php/phpunit-mock-objects/phpunit-mock-objects-3.4.3-r1.ebuild
+++ b/dev-php/phpunit-mock-objects/phpunit-mock-objects-3.4.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/sebastianbergmann/${PN}/archive/${PV}.tar.gz -> ${P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE=""
 
 RDEPEND="dev-php/fedora-autoloader
diff --git a/dev-php/phpunit-mock-objects/phpunit-mock-objects-3.4.3.ebuild b/dev-php/phpunit-mock-objects/phpunit-mock-objects-3.4.3.ebuild
index bfd3cf992671..0ec23481430d 100644
--- a/dev-php/phpunit-mock-objects/phpunit-mock-objects-3.4.3.ebuild
+++ b/dev-php/phpunit-mock-objects/phpunit-mock-objects-3.4.3.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
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/sebastianbergmann/${PN}/archive/${PV}.tar.gz -> ${P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 RDEPEND="dev-php/fedora-autoloader
diff --git a/dev-php/phpunit/Manifest b/dev-php/phpunit/Manifest
index 1c7a5ada8550..45faafee5bcd 100644
--- a/dev-php/phpunit/Manifest
+++ b/dev-php/phpunit/Manifest
@@ -4,8 +4,8 @@ DIST phpunit-5.7.15.tar.gz 205474 BLAKE2B 0220edd59fc3f191b7621f275d3e4ee8f8bf51
 DIST phpunit-8.5.0.tar.gz 311500 BLAKE2B 1b21b898f8a933a228bb6f0197e1a884fe1ab67e7774194d32d23393b2ee649a307e0d00cc6a3b89bad19ab5abc22de8fbc99ff41dc69a006117eabe626cd86a SHA512 3f2c615fbe05c2c04db71b237716ffa3a9ac2c0a5e490fea5db9780efe7f825d47ebb04e81dcdbd4c55f2c3667caf2de79cdbeece6c10ec999c9786fee245721
 DIST phpunit-8.5.1.tar.gz 311607 BLAKE2B be746b70df855dd53a7faf61801258e2a3ec4f1ea008575328505e174193990d60d35533a220e03c93a4a013bcf177de71c3f8c1b856767a7cc52ab6aaaef0d6 SHA512 ab2d01d924ed34fc843f33f917e8aab6987ec547e02cdc662ce1f6d6ee383b064bb63a6f71420daee49ef87499471aa4e98b99ab6fc585229738efcbfb87fd46
 DIST phpunit-8.5.2.tar.gz 311677 BLAKE2B 7cc42db3618a9e6ffcc35a7a38a6691193814a036869c78af6ef4d020f43fe00633eeebc81cf5c4cb2db04b06706206d78885a1a2e39deea4d20e55a0f8189b2 SHA512 2b8c82381b3a4712c8cae453924b5b0ec25e6c4ef2de6d36ab31f6414a32806abfaa0de5068e585f203dcdd0f228b7ddffb930f394ca5af325c1f222e0523642
-EBUILD phpunit-5.7.15-r3.ebuild 1536 BLAKE2B 26e6af82204855dda03e57bf92fe1965ad58270752cf91f3f7be83e1129e8d79ee5c58b54c12aa7a82813a90af5b0dd1c43701d26637d9ab6a8bc1bc53392f5c SHA512 8e793fac8e12a1c792a920a08712726e8489ce213d424f23d1a0457c979fa13c7b08ac7a46c79acafb5bcf3890d6761c04830b93e03d8d9acb4272e368181126
-EBUILD phpunit-8.5.0.ebuild 2157 BLAKE2B 40dc6661a0bc87ed271f407354e7db36ba5e6f12804d36b25a552de4297dbeac9a1dd5126d8b4fc41cab676fcaafcccaf21c73dce16e18fbe309c024a6a4fde9 SHA512 969c59044ce166135ee478ec8ff69935754b7251d821b893fd03de681c5803d749394a6bd3366358116e10cdf8691a50e9b0eacf07a7d8d2950b690d3ee61ee8
-EBUILD phpunit-8.5.1.ebuild 2157 BLAKE2B 890dcbc8c8c2e6fcaaf69d078614427867800ca6f9d0d6c720af4336b472df5fc4755e29865c5ed09967c0494cd6a02bb62b7f2495e3d4a75e26c29aa4f19fc0 SHA512 15121696cde2d6c9d50ead3d58688d50e30f6a930df7d8f7fa17d32ccd226b98dc1d59d7a75886156be01c6f0756acda70b07ca2ac16fc7e6230be5021850aa9
-EBUILD phpunit-8.5.2.ebuild 2157 BLAKE2B 890dcbc8c8c2e6fcaaf69d078614427867800ca6f9d0d6c720af4336b472df5fc4755e29865c5ed09967c0494cd6a02bb62b7f2495e3d4a75e26c29aa4f19fc0 SHA512 15121696cde2d6c9d50ead3d58688d50e30f6a930df7d8f7fa17d32ccd226b98dc1d59d7a75886156be01c6f0756acda70b07ca2ac16fc7e6230be5021850aa9
+EBUILD phpunit-5.7.15-r3.ebuild 1533 BLAKE2B 418617cc755f9fbb4844f52f39df977874f8b8d8fbe5456bcbc7d85697531e18657b20e1bfb035b85d519580926b5ead4cd2dd422ea75c35aa2c35ac70a9a63b SHA512 a4cd3eb30b0712a7c26e15435663290661cbaecbcb5ecfb687112b5f17cd569f74d4335c076bf6e096c86ecdcf7d18454f9703bfc2c9b72dc0fafe83e1af0f59
+EBUILD phpunit-8.5.0.ebuild 2153 BLAKE2B 3aad48d90e8889d6688c2afc0f4059bdf6d81b6dc7a56153c5ce50b9d4ac70ec758818c2a8308bc0d6bf0d33f74c54912c8da2c58efd39fdc6c82e291848e31d SHA512 ec7631988c46ca0e390fd52fa454dba6e8a53f76949848e647b6d98fd5e924f2057aa262c0a305615fe33c19671043db5487fbe7b7f3288f406a9be9b0fa9c72
+EBUILD phpunit-8.5.1.ebuild 2153 BLAKE2B 3aad48d90e8889d6688c2afc0f4059bdf6d81b6dc7a56153c5ce50b9d4ac70ec758818c2a8308bc0d6bf0d33f74c54912c8da2c58efd39fdc6c82e291848e31d SHA512 ec7631988c46ca0e390fd52fa454dba6e8a53f76949848e647b6d98fd5e924f2057aa262c0a305615fe33c19671043db5487fbe7b7f3288f406a9be9b0fa9c72
+EBUILD phpunit-8.5.2.ebuild 2153 BLAKE2B 3aad48d90e8889d6688c2afc0f4059bdf6d81b6dc7a56153c5ce50b9d4ac70ec758818c2a8308bc0d6bf0d33f74c54912c8da2c58efd39fdc6c82e291848e31d SHA512 ec7631988c46ca0e390fd52fa454dba6e8a53f76949848e647b6d98fd5e924f2057aa262c0a305615fe33c19671043db5487fbe7b7f3288f406a9be9b0fa9c72
 MISC metadata.xml 329 BLAKE2B 45eb57929680d3c3d1c60a22dd1b760db42b1ce2a157c9b87209c391a08022c01a103972267b2f36cea142681d3cc3691a27c726b9a132974d7bb418e5316928 SHA512 007a4fea4de75a468e377398bb1539e25eedc8009ad6dcb6c170be653821b73d8eaaaeb236e207a2e33a509d2966f6a9571d8f0219d90b1662d4da1cdc7de896
diff --git a/dev-php/phpunit/phpunit-5.7.15-r3.ebuild b/dev-php/phpunit/phpunit-5.7.15-r3.ebuild
index a3a224587d3d..c52d43b51830 100644
--- a/dev-php/phpunit/phpunit-5.7.15-r3.ebuild
+++ b/dev-php/phpunit/phpunit-5.7.15-r3.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
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/sebastianbergmann/${PN}/archive/${PV}.tar.gz -> ${P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 RDEPEND="dev-php/fedora-autoloader
diff --git a/dev-php/phpunit/phpunit-8.5.0.ebuild b/dev-php/phpunit/phpunit-8.5.0.ebuild
index b15fb5689e7c..8cef7953bc08 100644
--- a/dev-php/phpunit/phpunit-8.5.0.ebuild
+++ b/dev-php/phpunit/phpunit-8.5.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=7
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/sebastianbergmann/${PN}/archive/${PV}.tar.gz -> ${P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE=""
 
 RDEPEND="dev-php/fedora-autoloader
diff --git a/dev-php/phpunit/phpunit-8.5.1.ebuild b/dev-php/phpunit/phpunit-8.5.1.ebuild
index 515d2106064b..8cef7953bc08 100644
--- a/dev-php/phpunit/phpunit-8.5.1.ebuild
+++ b/dev-php/phpunit/phpunit-8.5.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/sebastianbergmann/${PN}/archive/${PV}.tar.gz -> ${P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE=""
 
 RDEPEND="dev-php/fedora-autoloader
diff --git a/dev-php/phpunit/phpunit-8.5.2.ebuild b/dev-php/phpunit/phpunit-8.5.2.ebuild
index 515d2106064b..8cef7953bc08 100644
--- a/dev-php/phpunit/phpunit-8.5.2.ebuild
+++ b/dev-php/phpunit/phpunit-8.5.2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/sebastianbergmann/${PN}/archive/${PV}.tar.gz -> ${P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE=""
 
 RDEPEND="dev-php/fedora-autoloader
diff --git a/dev-php/sebastian-code-unit-reverse-lookup/Manifest b/dev-php/sebastian-code-unit-reverse-lookup/Manifest
index 6625a8a17861..e8de6d341a51 100644
--- a/dev-php/sebastian-code-unit-reverse-lookup/Manifest
+++ b/dev-php/sebastian-code-unit-reverse-lookup/Manifest
@@ -1,4 +1,4 @@
 AUX autoload.php 312 BLAKE2B 9552693fde0e523fb2d9e5b23e9a9463ef365a3804648a1c416d201d6a3dc2ed9f1b8893c05cfb93a91a70005fb95d26cb1949cf5758cde12b6a8effa602fe92 SHA512 ff06926ebe557373a0e0b5b19b2c10c6104693ba1dcc4f1c0fdfeccb9ca499d43fcbb476816f6e861f48f8636534892851f2ac4831ed153da108e6f0b24d1dd0
 DIST sebastian-code-unit-reverse-lookup-1.0.1.tar.gz 4326 BLAKE2B 1c1f65d70a90b9f6d665cb80f3272d95f003bb61e7f682b7c2d7d0010ddd2b26a90ce0cb2a217445df6fff6aa0c7d414e8951d7ad5a0763fc715504e8f649c5d SHA512 bb6419a13b645a4f35d688d3dd47b0d10de8c996721e95805c08119925fa66ef89cca38f94d3818c62c2eb9a978ee231e91fdeb47bf3b640eeefceaaca135469
-EBUILD sebastian-code-unit-reverse-lookup-1.0.1.ebuild 661 BLAKE2B 0ab699cef6907728d2ad38fdb6b621222e8b4757695f99703c42d4e8119764286b4438a51c03aa54295d5442edb6b0fbe1720490b90b03269d635a87ab126181 SHA512 8a94b986f1dd87e96b05f2dad8eee430e0ae1c7654baae5c7956007b6a4ecd109382b3b3719e773af15d85f3952fd7001f979038f42e79a29fc40763a7dcdeff
+EBUILD sebastian-code-unit-reverse-lookup-1.0.1.ebuild 655 BLAKE2B a8dac3a84936cb75db618570393181c30c98ca088f6fad0c8916314bd2dc75790db6f6677600d947e099a148ae9512c8e172b6263c3939cbe624ebd57f8f56d7 SHA512 ea7792e2a69246d8876ed433fc081d002d9a6ee8310ad45995383dcca91c51dc4ea9de8f1855b550f1976fbe3233ac70b972063bd683914079882fc6c240e1c9
 MISC metadata.xml 346 BLAKE2B 9379848a8118427efc3ec84f4896f1ce436658dfb852aaf94bda1b2057d47647dad6486664ebeb4eb0498462ba0c58b5d902ff5df748f7555e91ce652d60ee68 SHA512 61330d4e03be274063d0bae2f4259a6c4a0f14d97d68dcf6dafd7fed090e7c76bac945d67d925f4d512735c2d5145c50f14f7b1ca17c31ce843113c2c7f6d723
diff --git a/dev-php/sebastian-code-unit-reverse-lookup/sebastian-code-unit-reverse-lookup-1.0.1.ebuild b/dev-php/sebastian-code-unit-reverse-lookup/sebastian-code-unit-reverse-lookup-1.0.1.ebuild
index 3dc346a203bd..0512947115d5 100644
--- a/dev-php/sebastian-code-unit-reverse-lookup/sebastian-code-unit-reverse-lookup-1.0.1.ebuild
+++ b/dev-php/sebastian-code-unit-reverse-lookup/sebastian-code-unit-reverse-lookup-1.0.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
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> $
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-php/sebastian-comparator/Manifest b/dev-php/sebastian-comparator/Manifest
index 309ea9987289..6dc861e67071 100644
--- a/dev-php/sebastian-comparator/Manifest
+++ b/dev-php/sebastian-comparator/Manifest
@@ -1,6 +1,6 @@
 AUX autoload.php 1601 BLAKE2B f3f668b40b4d8a3259e11fc0fbe3a810157c2bcf40c3d8372dcebf2bdcec7fa999654d88db19fd50169563d34e3b4754101010bb80cef39ed71c0747d3d3c9b6 SHA512 477a0610c65ad7f6fa07532c97f62ec6968fe88810782fd37024767d89dc1e8e59de1e1cbfbf8fdf8d6a363d0e202ae659c6fffda8cd8cf7916b2ed089aa3457
 DIST sebastian-comparator-1.2.4.tar.gz 13402 BLAKE2B 5fc664e42408a188ed8601f2413f0b6517e5fd9b26f85be3177f09d6aaf4fda8eaa2e9e643e08914fb18aca0c795989d1e341d28476e3857c7d991bd2c06d51c SHA512 b7ca4bbdd91c9d59f83c4ccbd63d7755205f6686de7d7e41808faba404df8f58173a0699a0e4d1fbc09914c2fcf841ddc4df41a86aa5cd0fdffa3be4d438a8aa
 DIST sebastian-comparator-3.0.2.tar.gz 16305 BLAKE2B 3cc8551fad28542823fba182abf6e9f33bafa0fea004ceee7d2b192f250678ec7f2014b7e9ae16eee1ec84ff37e656f5612a0d45d3bc10c5959831d39d851fee SHA512 05d5cdb5ce6346325c3f7c6f7b6669de7d599e0b65a95505a85aca887df5498d5baa22f22e9065bf185ac50df1abc969bf86263d31a3923034607938a5eace58
-EBUILD sebastian-comparator-1.2.4.ebuild 685 BLAKE2B 6fad215d3cc1a3587b9b26af4679c446cb95de808da9cab99cc3b2d4677883cbf37b93972007aaf3e6d99f132e46a39536b6092aa102327f46b17dca5e14f30f SHA512 1ce336f5353769788cfa17530e6b5eb0096f82cc3bbb8e8f68f6c9ade266f9cc34aa0d8941d64643a3e004252407884abbf679873ea46cb8c83471b624295189
-EBUILD sebastian-comparator-3.0.2.ebuild 754 BLAKE2B 4f20bbffcc13540cb7652f95bc1aeda6201f706f73cc932282ff1a4c7d43ab5d7614a7c19dc015bb0279e1ae6109f8416254389866c23ab28b601d372773cef9 SHA512 660fee15cac432375e18319fdcee611ea69104a84d2da799a8593c0c7bf8b3a029324c25b6a526a9838c6d197e3965c863d212055c05341570ba206dd610f87c
+EBUILD sebastian-comparator-1.2.4.ebuild 679 BLAKE2B 8281654cb0e9a405f5478a759b04e04a5d7808dd565e939d205fd312e0f77ad827d05db378bc106e826ba67bf092e018f7b7a6b786675acfbb9d9cd87f95239e SHA512 d0ea4b063e8e0222a8e9d85d7b02b0a00a8d5394a797ff7b35c8a2db4e1f2b7ddda8cfd230fa08d912ca7343d0f6fa2364be339d9d603d87f3b77c5c505169b7
+EBUILD sebastian-comparator-3.0.2.ebuild 750 BLAKE2B ebbb47bec0e2549030be7ddd67f24cede796c8b607bd886ee92a608fd16e0de015514cf3670ca0ea5b2afa5ddef869c2d06067dcf095929a5f40954cb9063a50 SHA512 e17bf76f5e0a229e168533c4fff33fc52838fa87c5f03f16d2cd8876b1ae9bb9a620eafe4fc328ac5cc1afb3019237d8f79def9e20bae997ed07c183b8e0d39d
 MISC metadata.xml 322 BLAKE2B b031a3917e07e8c98b19228e012a05a46e4ad57b59e394efc345092541c652f2df5f2fe4fe35be69eb9c62f64bf55f0a12636ff9cafa2f510d06b86916f869cb SHA512 e345c6459f1c0f795081e2874aa4a4023998d0a0f6b28462468ef89c7cfaf38366671a68d05516e6d0f3e03b0cdfcbe849c1e224f7b1e3a723232c7db32281b6
diff --git a/dev-php/sebastian-comparator/sebastian-comparator-1.2.4.ebuild b/dev-php/sebastian-comparator/sebastian-comparator-1.2.4.ebuild
index 230b9a7987dd..d2f76ac1f2ac 100644
--- a/dev-php/sebastian-comparator/sebastian-comparator-1.2.4.ebuild
+++ b/dev-php/sebastian-comparator/sebastian-comparator-1.2.4.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
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> $
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-php/sebastian-comparator/sebastian-comparator-3.0.2.ebuild b/dev-php/sebastian-comparator/sebastian-comparator-3.0.2.ebuild
index cb5336b6e085..9223bafe9002 100644
--- a/dev-php/sebastian-comparator/sebastian-comparator-3.0.2.ebuild
+++ b/dev-php/sebastian-comparator/sebastian-comparator-3.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
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> $
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE=""
 
 S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-php/sebastian-diff/Manifest b/dev-php/sebastian-diff/Manifest
index f23fc67cd8c1..054348630dcb 100644
--- a/dev-php/sebastian-diff/Manifest
+++ b/dev-php/sebastian-diff/Manifest
@@ -2,6 +2,6 @@ AUX autoload-3.0.2.php 1685 BLAKE2B d99042706fb97d9d1fe500a82a09e16230b62c0aa1b5
 AUX autoload.php 859 BLAKE2B 00158f99e34866d4cb452af6a27a7b02678c09217d9e0b4f88bb6283b5268a91af56ae948639defdd48cdf35dc97642b11e3dd26685422df565cac57b70a2780 SHA512 0d1a073f461947956fb61d8eaae06765b0f24fba3e01bddd9a75f6a9e8abd0edecaf0266c457df39d2dc02eecfc1947cdc6da589ce38a6db8ad1716ba62a0e30
 DIST sebastian-diff-1.4.1.tar.gz 10310 BLAKE2B facb81bb6ec7a60714493b531eecd0cea6fc8fde0811de982f3a149b2446cfe71f32bfca62bb830dee734966ac6161990e14b666426f5b34c4068922c544f36f SHA512 b355f1407619ea6f1e9153a7946c339e790530c1c86369005998dc0c1078b96ef1ca369fec32f134b056dd8833770fcdb30443334275c8cb17b69e95ef8325a9
 DIST sebastian-diff-3.0.2.tar.gz 30918 BLAKE2B 33c307c97d30573c913e4a696710c7b0091b3d0a612661b900dfdb749e4fa5c8970d993c0ee8828c4b0342336c39db4c74702114a5a6ae0daf650fc625baade7 SHA512 c06176de492970f3e55a5fdf1901eb56299b3e49cb838b8cdcbb93bc9cfe9fe9c1b693acb0c598c618760c4de0e49deb2f7bad15a929bd13ef08d30fab41b677
-EBUILD sebastian-diff-1.4.1-r1.ebuild 595 BLAKE2B d7fa8087568487006ad9b9e0732d9177bec5183380c0eda3a24b72f259bf311776089f813e5457a3ccd01031b741c04c782cef93242a6181a7307e59862b9be6 SHA512 229eb881fd8f4369c7c3c7afb0b4bbfdf258a97929d64a56185ba633734cd1dc9693b936a1ad16ca6b2e4868ac363edee674d4dcfc0f6552715a97f291a35f8f
-EBUILD sebastian-diff-3.0.2.ebuild 620 BLAKE2B ece506d11e53f89ed169430b4c094413c11f205d82be3deed483e67f072e2b41892d172958a8e58f8f231ca5c16ed04ed5c580cb700ca58f4dfe56fe964ae512 SHA512 a35f2982459fa6fdaec0715d051623f434d59e00ec598f533f5f103b04f60ee3cd1d7f0b42f3d5830ee5fef7ee17ebf5492edb8c9693e6539a0bbdf507d57f49
+EBUILD sebastian-diff-1.4.1-r1.ebuild 589 BLAKE2B cdf5195e5568e780c6a5d2539436d3501a3647516908a241a4987371587f30cc62cd69b8889ddb695691c882adbe152b70fdc38267554f3c2355220103dea95e SHA512 801b034f821f4886d2b041c3c966b7751ace568c36ea6f9ce9d1459831ba624b68cf330a977a19c42199c3a28edfaf63c76aa6ec17ce834e4b08cd128aee117d
+EBUILD sebastian-diff-3.0.2.ebuild 616 BLAKE2B 04d3cab3e0165bdf8a79815a749dcfc698c99cd14f38b18a8e1d76a15f7b2e2a321ce2df9c23c7828735e69a509dca4e6fa3a9c017ecfa422af04e5f41d31de3 SHA512 b386f947721d1d9c2439661a617c6b04b744854531551fcfc0be4ccb19f2e0725666c4821aef3ea837da306761e1dc0ec7ce775515d9bd997c96bb02d9b3fe0b
 MISC metadata.xml 326 BLAKE2B f5c8c04139228c5dc8b69de1a7503814e75e363a79563dd816763301e5e56a617fa7f24aa58b81f82acd1b2bb304d89873dd32df3d645752b1fe90db655d7bae SHA512 b209d3b3b9d215d0f5549baedc6ecd6a03b0ce461dd276f20f794f4e17c500b02a53885fc2926675ccb1669e5335f4bd5ce75552470abef1b73bf9cb3e3e6e74
diff --git a/dev-php/sebastian-diff/sebastian-diff-1.4.1-r1.ebuild b/dev-php/sebastian-diff/sebastian-diff-1.4.1-r1.ebuild
index 069a9ecf83b2..1d8a42e7f893 100644
--- a/dev-php/sebastian-diff/sebastian-diff-1.4.1-r1.ebuild
+++ b/dev-php/sebastian-diff/sebastian-diff-1.4.1-r1.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
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> $
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-php/sebastian-diff/sebastian-diff-3.0.2.ebuild b/dev-php/sebastian-diff/sebastian-diff-3.0.2.ebuild
index 20aa53030521..1376982558e7 100644
--- a/dev-php/sebastian-diff/sebastian-diff-3.0.2.ebuild
+++ b/dev-php/sebastian-diff/sebastian-diff-3.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
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> $
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE=""
 
 S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-php/sebastian-environment/Manifest b/dev-php/sebastian-environment/Manifest
index ebcb7ba11c45..6bf5db77720c 100644
--- a/dev-php/sebastian-environment/Manifest
+++ b/dev-php/sebastian-environment/Manifest
@@ -2,6 +2,6 @@ AUX autoload-4.2.3.php 444 BLAKE2B 607f48a38674187ea4c2e57e4877630df0268bca00574
 AUX autoload.php 372 BLAKE2B 3d2843946daf17f3c367b04f1b5295ac67bdff8e1a409537f895eb7ed06a946ca3bc52647e8454d398b574ca948588951b29156d553b0a5f4b741b9dc828c708 SHA512 7fc348367571b5c7409635ec61c2b06f7fea3b640998f93eca87423529ecc4c933cfb5b033152081dd42817e9861d2fdfddcfb5f0d08d51ccf60d5c12f56a76d
 DIST sebastian-environment-2.0.0.tar.gz 5607 BLAKE2B 3c34c6e61d9a0bdc5df8083331390935bd513d735a1509890a9af05be8b5a718bbb1d5826ab0cb80da2ee5c4cd436b22ef4ccb50c7b4e1c11d361a78b51621c3 SHA512 cf91f0a5f057007f318c5d6b11f8a1345b8df35d513c6291c5b725f0874ed301a64d1097c3fac1e6b32533caa96b3f78ac415d99b9b6ef63dc4a303b90d49c88
 DIST sebastian-environment-4.2.3.tar.gz 9622 BLAKE2B d90b181c3aae7c4ea8e172e5b7f897f8a93bf1edbeca19cc8a7a6f10963730ece1f267fed325a6734b1677b75cc8f5b84a5aa55be383a40b1ec2aa7a603bc668 SHA512 871a15297196b21364000d72afa73c2319e741a284c5446443ae3cacd8ce1a07b1ea3b1d8b6b1a88356fb261d093b889508cea63706341413b15f23348f77e80
-EBUILD sebastian-environment-2.0.0.ebuild 657 BLAKE2B c42763e09ed10d9c4a8a12196e92366b3c21a1ec9de75704d0a8e446866e19d3e5a69da04d558d7faa2e7378b62d69e7d7e94709247882e9846e7cef071db5d2 SHA512 3bf3497c54bec8dfce4c92c2d185a11fcd1dd652afd36f34b2be01d5890411cbd238c60ede0c672c08b4769b6004c205864e6539c12b9ee89a0c4952581d8a4c
-EBUILD sebastian-environment-4.2.3.ebuild 682 BLAKE2B fc3865746758458ee745e1d2afa19361cc71f1110ef5dc4424ccef049db87fa49a35cd5871e89aea7c6dd7ccfb5d2a7de9c49ed1f7bbc943f14c5b6b3bb210d5 SHA512 5c68cdb1f82d4452a83663fe3121a2826831621f9fa5f269418ed14dde59f1b049755cff1b1c20bd9e8e9ab45b5b08913a54238491e189e4f7222df4966062ac
+EBUILD sebastian-environment-2.0.0.ebuild 651 BLAKE2B f5ce75a5f37cfdc8141880a5562ddd56f2cd2a57e02ce1a79c1ac881055a58dea23a7de86494d06649ab2d0be974160f7711435eef959b047c454123a09cbb53 SHA512 ac64e7e72b7241e2326db65c51ffaee4ec8705e0e569fb327ae566019b843363870c7289c47e104b4006a282ddd610728e1ab4394e46874cb1d93f3952aec77a
+EBUILD sebastian-environment-4.2.3.ebuild 678 BLAKE2B 27f33d378d04630e404de2dfd1309835dcd792ab46a6fe7a2e21189c0ce4b3280a6fd5a570ecd4a3505da7b73f77391b82b9fefbec1ff85d4ca19d36415e1ccc SHA512 791e19f4c90619735163e700ab9dcec252e280504cc4d9aad8b1f360b202c454d46f9e04c9cf084fb42c44a48816b6cb57d769b92327263a8bd7d9e3904916ae
 MISC metadata.xml 322 BLAKE2B b031a3917e07e8c98b19228e012a05a46e4ad57b59e394efc345092541c652f2df5f2fe4fe35be69eb9c62f64bf55f0a12636ff9cafa2f510d06b86916f869cb SHA512 e345c6459f1c0f795081e2874aa4a4023998d0a0f6b28462468ef89c7cfaf38366671a68d05516e6d0f3e03b0cdfcbe849c1e224f7b1e3a723232c7db32281b6
diff --git a/dev-php/sebastian-environment/sebastian-environment-2.0.0.ebuild b/dev-php/sebastian-environment/sebastian-environment-2.0.0.ebuild
index f7b031b0807b..baf3982dcd3a 100644
--- a/dev-php/sebastian-environment/sebastian-environment-2.0.0.ebuild
+++ b/dev-php/sebastian-environment/sebastian-environment-2.0.0.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
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> $
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-php/sebastian-environment/sebastian-environment-4.2.3.ebuild b/dev-php/sebastian-environment/sebastian-environment-4.2.3.ebuild
index 49b0a247a1d0..96358f0ee240 100644
--- a/dev-php/sebastian-environment/sebastian-environment-4.2.3.ebuild
+++ b/dev-php/sebastian-environment/sebastian-environment-4.2.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
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> $
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE=""
 
 S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-php/sebastian-exporter/Manifest b/dev-php/sebastian-exporter/Manifest
index 59433e8f607a..028d258c016f 100644
--- a/dev-php/sebastian-exporter/Manifest
+++ b/dev-php/sebastian-exporter/Manifest
@@ -1,6 +1,6 @@
 AUX autoload.php 429 BLAKE2B 7fb7aabe5cee47b74491d50a2a01f60ee45f5d0698f5bd5c908ec1796bbd31cb003de188c61dd4492a5e1556b47e3ab8ef77019ce4dc9cfb90a2e3af96527694 SHA512 06f8a87461a518009d2dd4298637ede677d6304b36d25d94c75472420cf2e4a8fa6aef23b5e21f98ee4ad03b2886fc946c5b0213944947290a3dd9c5308f8509
 DIST sebastian-exporter-2.0.0.tar.gz 7473 BLAKE2B c8f39c9fb19d146959e184ca1356a2f802bb29d31792575fe624072fcc7fc44f5d5d619dbc9dafc9114c46e91ba64338af6902abc2fecc96cfbd0b28294a97cc SHA512 0d418973a6e272e327c16f2393bde09424f8dea6991a804259ac57261efddeb99e33a904bbf2ede99b07def897c0baa12ad9fc04c8c33af684f1fd19d976948a
 DIST sebastian-exporter-3.1.2.tar.gz 9996 BLAKE2B 214acefe5679a45d5e67ce635790a12002aca0e380a087e96358200001400458ce907bb4f424ee3683b2fe17fb4bfbb674ebe0afbdcd51b24c654de2b4075736 SHA512 bc6cb070c8c7cd5262262337950ffc70081137c4513c427cc94ac491e2ebe0e91ca4caf7858eb7957f9abe5b4b2b2d6237020a0a6df556439191724f3cda1db8
-EBUILD sebastian-exporter-2.0.0.ebuild 669 BLAKE2B 409870cd9843f7bd50b389ff4ec345dca5e96fc3321b541f9e7da9108fc8e42ab9783872b8b5007b97f5ecf7a37418409761d8066e2a0b7e536798858f5657f7 SHA512 31dde7d441047ff3aeefe681be0df800c7960cea3df4706e18a9054f94490ee3cc0c98c8ac1e0e79bbc606d3ee6a72d3a81b040aec6d9ebb18802a6b421da72f
-EBUILD sebastian-exporter-3.1.2.ebuild 672 BLAKE2B 8a9fa21993ba806c7804315ecd64ae33ca3b0b81d1fecd93535e55661ba6a48c792e5d07d91c161d7aac3748ae925d518b502c3fa12fb7aea0764c272c775297 SHA512 a0e6bad6c31efdca2589bf26a28d6a3f836439f805c2e93cc5bcfdafcd92307a94e2f03276874ea9a1ae7e506779bc785232a87e0c52e4fa549ef1b6ad23781e
+EBUILD sebastian-exporter-2.0.0.ebuild 663 BLAKE2B 79d755e9fe438a2f24dde0a48a4ab0126df5b68bec0ae3f024dc0291721e767285b026119f9c13cefc5cdd4906a8af498a99d434b00649eedab589449a65f290 SHA512 71214f97c4d0b25f38416ba02e3944e9f0b10242ee28fa8de408a81ef4ba3488f46f29be96e6e9589cf4c1c8b9bbbdbcdbc0741d21a2d280608e944cc85f406c
+EBUILD sebastian-exporter-3.1.2.ebuild 668 BLAKE2B ea2f6b468ed4658c133473cf961d913ed2317f257de793d07d3c331511c59ba70cef0c6c367a718b5475b84b04478a828bcdf1623bae24a7ab1aaed90e006caf SHA512 4cc0d5d924c0a62e5df9ee94479d254e4d99995c1a0b126baee3357200f9fb7205e34a56fd44b2bce1803cb4ec5fb007ab1875fd3bc0b8c685d260c16dcb4d7e
 MISC metadata.xml 322 BLAKE2B b031a3917e07e8c98b19228e012a05a46e4ad57b59e394efc345092541c652f2df5f2fe4fe35be69eb9c62f64bf55f0a12636ff9cafa2f510d06b86916f869cb SHA512 e345c6459f1c0f795081e2874aa4a4023998d0a0f6b28462468ef89c7cfaf38366671a68d05516e6d0f3e03b0cdfcbe849c1e224f7b1e3a723232c7db32281b6
diff --git a/dev-php/sebastian-exporter/sebastian-exporter-2.0.0.ebuild b/dev-php/sebastian-exporter/sebastian-exporter-2.0.0.ebuild
index a24377f31360..a7f3fc57c5af 100644
--- a/dev-php/sebastian-exporter/sebastian-exporter-2.0.0.ebuild
+++ b/dev-php/sebastian-exporter/sebastian-exporter-2.0.0.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
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> $
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-php/sebastian-exporter/sebastian-exporter-3.1.2.ebuild b/dev-php/sebastian-exporter/sebastian-exporter-3.1.2.ebuild
index 380721a6128a..cf83726503b1 100644
--- a/dev-php/sebastian-exporter/sebastian-exporter-3.1.2.ebuild
+++ b/dev-php/sebastian-exporter/sebastian-exporter-3.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
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> $
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE=""
 
 S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-php/sebastian-global-state/Manifest b/dev-php/sebastian-global-state/Manifest
index 44ec51b711d8..94c0617b902d 100644
--- a/dev-php/sebastian-global-state/Manifest
+++ b/dev-php/sebastian-global-state/Manifest
@@ -2,6 +2,6 @@ AUX autoload-3.0.0.php 843 BLAKE2B 0a040782b66fb717f3de580e455ce2d186dd30ffa9b57
 AUX autoload.php 657 BLAKE2B 239a7bcc4ac117a513f807d8c3266c4951e4b3bf86a6c2625c2ab480905a99b5e9175238b8d8bec080228f7f7c734eefe5325fc147dfadb73a988aaa7ac3fcf1 SHA512 26f6a18f580a3080c80ef6abe8598fa589ade4343152fffcf3e967a208ec1e28b3231f241402cb6f8e22b8f6c1d248f0d999186846d5ced069a624571133f7f5
 DIST sebastian-global-state-1.1.1.tar.gz 7659 BLAKE2B 9793e68f226901cb2d67e3d4ac03cc41323485a1b7d819dfe0a4cd9c00b19eb79ebf539a8705545a4c132ef8a2a286edc804016cb76400256008ecd298f2f3c5 SHA512 dec6387183ea6cf869b1302e641a9d85b6dd69ebf299354825ab2f8a06a82609f8e3a2bdeea6924b5520f813af7493fc8e957c3f9876dcaa302066770997186c
 DIST sebastian-global-state-3.0.0.tar.gz 10550 BLAKE2B 58ad62cce7f94805add12105b3000c54e73624c780fa12970e779538f3ff06f145001c6d19e98e817982b092be992b4e1e55638f727fb3e7bad9d12c242546a5 SHA512 2a081fbf7b26afab0eeaf1933887dea12973c6cde1fe7115fe560d56e81ab69dceb7b3431818c51641778f6526abb0055e2a27420e53b2fe90e3f95ee57b01d0
-EBUILD sebastian-global-state-1.1.1.ebuild 621 BLAKE2B 890667fd54ae090e4c6ebdb13c87ea8c09e80f1130351963b22d6b848e42f2d6c58379a7b88b46be0c41ee58b84473998d53937fb7d35e8616dfa650475e5ef2 SHA512 5e3edebd2412cb6e6557eb0a93cca2d8e30d698a0d38d25f4401be7b04ed343b180744fe044688a2a938bade39e02e5a3c7a612c1344ae6077930329ca02e66a
-EBUILD sebastian-global-state-3.0.0.ebuild 773 BLAKE2B 25b594674ea150cfbe5b0b627e38947dc840c46ebe1a96be94cd2bdd46d91af718df37cd36e5ab9a3319cd1ac230d09bdaba1c6351ea4c063788730ac0d54615 SHA512 a324f4e19e440f351725d78dfd158f9ef3770beef862216c4370039f459b22f8a4a473d6bf84defecdbbc7f44243d947aa3b4fc518f1631fe7d8242e4e3971b2
+EBUILD sebastian-global-state-1.1.1.ebuild 615 BLAKE2B 0718cb9c8e04f043cf647a581970505f7d4eea535ae8cb89a73ef9965f9c226f6f0e01244743b445f263a18038ce19e9828d70b0a51eb0068dc5d9c779492de7 SHA512 9924e4401add065703151a70d8b519a94399de4c24aaf074911e7d48dfc4b07330cbc11bc611459521d94f3e68434a911d20b7431aa8ffeec3f5c3621c751c9f
+EBUILD sebastian-global-state-3.0.0.ebuild 769 BLAKE2B f9dceb4f1fb20fc53d9921f082b08296ee573d5feaa5424b63b7b11607df35aa79ac1ad43955af9331fe551c92beb706ce69894d2553906e987aec7a0f2f8d5f SHA512 3ebc939fc8fbac9adf0fec8ae41037c070ed8f0761b533b9e6c45ce593381b5d69c2bd3ba44e922e3a34de09b6c604a2bf470bd8c8f8af79d75e93046261ddea
 MISC metadata.xml 322 BLAKE2B b031a3917e07e8c98b19228e012a05a46e4ad57b59e394efc345092541c652f2df5f2fe4fe35be69eb9c62f64bf55f0a12636ff9cafa2f510d06b86916f869cb SHA512 e345c6459f1c0f795081e2874aa4a4023998d0a0f6b28462468ef89c7cfaf38366671a68d05516e6d0f3e03b0cdfcbe849c1e224f7b1e3a723232c7db32281b6
diff --git a/dev-php/sebastian-global-state/sebastian-global-state-1.1.1.ebuild b/dev-php/sebastian-global-state/sebastian-global-state-1.1.1.ebuild
index 6012cdf2f579..fcf144c6e5ae 100644
--- a/dev-php/sebastian-global-state/sebastian-global-state-1.1.1.ebuild
+++ b/dev-php/sebastian-global-state/sebastian-global-state-1.1.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
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> $
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-php/sebastian-global-state/sebastian-global-state-3.0.0.ebuild b/dev-php/sebastian-global-state/sebastian-global-state-3.0.0.ebuild
index 42c9de8f21cc..9dad483f6a64 100644
--- a/dev-php/sebastian-global-state/sebastian-global-state-3.0.0.ebuild
+++ b/dev-php/sebastian-global-state/sebastian-global-state-3.0.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=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> $
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE=""
 
 S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-php/sebastian-object-enumerator/Manifest b/dev-php/sebastian-object-enumerator/Manifest
index 49178796f926..aedf38ebe91f 100644
--- a/dev-php/sebastian-object-enumerator/Manifest
+++ b/dev-php/sebastian-object-enumerator/Manifest
@@ -2,6 +2,6 @@ AUX autoload-3.0.3.php 635 BLAKE2B 089dea0d15cef507d15d966e64eceba547bf8825c1d72
 AUX autoload.php 620 BLAKE2B 0f78748010526a3f72d61ef23121a573fba13b7c945e66056888e833673dba8dbe691087910a8d6e72c9a3a4febe6c3f6897bcdb1b8cb846dd832bc30dc864a5 SHA512 6b7ea509b19366d7de9a5e7c45e5f11f56824d19b6af08af8523d1a02bdb690b6f5639b0a324966bf14a9ef06c0ed5c224c52e9d5bc529095f1125507bd94aa9
 DIST sebastian-object-enumerator-2.0.1.tar.gz 4861 BLAKE2B cc68da9e38e756e478eedab588c023ebbf15d28d6f9e5399f178c581765aa02324ffe6f0bdf5e561f61791f449d8763e6cfdb572c779adaa9c7dedcc8b0f15a8 SHA512 087ef23c079be2ef56948c734cbdefbf4d8cad36c6c26aae5e38401ec3f306d91067aea28a2226811d1ed90611c7c8070a4f5c3733a24eb56f6a177eb332a9b3
 DIST sebastian-object-enumerator-3.0.3.tar.gz 4989 BLAKE2B 8d2314daf82280dc746cdc91c3c927d012440ef162a59918e038a15775f0113cf7bc0ae0eafb83d6d6992cdb2680bdd92935789584305906747fd71f13fcad5a SHA512 9bbff5081e1627d7ab98e01830cf6245f15b3ca96a56f6074e090f10862d19d0849251d69bf1117d3634b7e0ef86e266b2e9d4062e75eff9c9bc5f994dfe9a2d
-EBUILD sebastian-object-enumerator-2.0.1.ebuild 720 BLAKE2B f90b71a973138039b020f60ec3f443ac081f81259fb07c64a0e144d3d0fc8270ff4b2c7557f4dfcb33a4700d0340a7247ee4233ab32534857e063768cc72bc34 SHA512 d507b7e8803bb8e4111e1948bf728e802bc3e6c35a3fb24ff6152391e356c5bcbacaa55df3ad2dc050dbc5cbbc358bc82d981c36ea06abdb3448a5d9d51d7b2a
-EBUILD sebastian-object-enumerator-3.0.3.ebuild 827 BLAKE2B 9c165f99cb7be527ff775a666eb5030435933fed2dce9b84d86d540ab4cc729b15603fd72abd15b5e2a7d9c494868b1a41fcd8e33d2481e3b6bceff667a8f8fa SHA512 e5adaddc89654172a8b6975018dc63b42e915bebcb0d738cc34c523b8663079188763172f11c58d2688b99a0b10170749b88b79fda9ddda0fd24291c9747fee4
+EBUILD sebastian-object-enumerator-2.0.1.ebuild 714 BLAKE2B f8d9024ab15329d956843ed370a5e0958fadca3ed95250770408ceff3e858eef9a853817d444000326d15882912b6e2fd205e4680ae7156a3f3a791030b70afa SHA512 800f5896e53a2a89b9143f9606927be3e2362ea5e438a8cbfc7481f028a40f3c9d711ee3de43402e92b3b996c034e993deaad0b7bf0698f02b433759f85ba340
+EBUILD sebastian-object-enumerator-3.0.3.ebuild 823 BLAKE2B 2a73f578a83d38c9bf6eb8e2055e38162ddde4a8e7e7197c9f3b493424532de6b5588d36c5cec7e3f12f36eccf6ffa11334fa0be2d360aeeb31a8235b35f14ad SHA512 69746c117b75284b0e03b8be8bae981c9833d9725e64dccf4f864409c4b8448f183ad932b4c2415aea82b66afda83255d2fb703c13e2d39fca0b5cee6ee963fa
 MISC metadata.xml 322 BLAKE2B b031a3917e07e8c98b19228e012a05a46e4ad57b59e394efc345092541c652f2df5f2fe4fe35be69eb9c62f64bf55f0a12636ff9cafa2f510d06b86916f869cb SHA512 e345c6459f1c0f795081e2874aa4a4023998d0a0f6b28462468ef89c7cfaf38366671a68d05516e6d0f3e03b0cdfcbe849c1e224f7b1e3a723232c7db32281b6
diff --git a/dev-php/sebastian-object-enumerator/sebastian-object-enumerator-2.0.1.ebuild b/dev-php/sebastian-object-enumerator/sebastian-object-enumerator-2.0.1.ebuild
index 4ab07e9e2e99..c3dd088b8045 100644
--- a/dev-php/sebastian-object-enumerator/sebastian-object-enumerator-2.0.1.ebuild
+++ b/dev-php/sebastian-object-enumerator/sebastian-object-enumerator-2.0.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
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> $
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-php/sebastian-object-enumerator/sebastian-object-enumerator-3.0.3.ebuild b/dev-php/sebastian-object-enumerator/sebastian-object-enumerator-3.0.3.ebuild
index ec2f666727bf..18dce0809092 100644
--- a/dev-php/sebastian-object-enumerator/sebastian-object-enumerator-3.0.3.ebuild
+++ b/dev-php/sebastian-object-enumerator/sebastian-object-enumerator-3.0.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
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> $
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE=""
 
 S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-php/sebastian-object-reflector/Manifest b/dev-php/sebastian-object-reflector/Manifest
index bb98122b829c..3ae10376a2b0 100644
--- a/dev-php/sebastian-object-reflector/Manifest
+++ b/dev-php/sebastian-object-reflector/Manifest
@@ -1,4 +1,4 @@
 AUX autoload.php 495 BLAKE2B 1ddad60e63bd386b4c0c50592134ee2f06622ae13e99d97d79009f42431078481a3732c7bbfc4385a75d25f4172553aebf0c6bb5c09b6e4134c62cf3c2960da0 SHA512 727da79b8fba9c3a8d2b781ac7e0185b6d219732c28fe942ebaec79251c2e40580841a559d4aaefcf5b8692e09308284a95670ea0e4fb99e167d3263e2b2b429
 DIST sebastian-object-reflector-1.1.1.tar.gz 4755 BLAKE2B c549186722bde6625d44478dc90023511cd4e2fb9fe206b08881746e4443275b20eaad86a13bc202b3f464cad7239aac28da9962db7a97b9c789534424cb3ead SHA512 42dc43d1a606b1aedf2cc40443139d115fc38a50a2e51d2b4d72ecededf39bf5cecbed6d1bb002dbb6f7bd3c7da50d9436f7489f9078d52d61af7777f31f5e57
-EBUILD sebastian-object-reflector-1.1.1.ebuild 726 BLAKE2B 96ed87a44a7139263eebaa4b0398f695b0f37821b217ace6c4b94d61fbdcff6ef196351dcf11dac379047f21732b48048002290b25c32e2dc26583a66c770714 SHA512 d9e21bc9df7689afee6a6d584aa01f69217581f74b716e0a2fa230f2f348a86cb922cb34f3f96be4eb06c7907d884a2bf218e89cc985f82118f245ac5291cdb2
+EBUILD sebastian-object-reflector-1.1.1.ebuild 722 BLAKE2B e9a5f4ee03d2d7371e41a883095168d03793a35379eadc671d2a596f01131f697a5a1f48134669f0b5330733e2c3077b4117abb731590938544d7de129019545 SHA512 7c059795273262a206168c989b97780f62d7df3d85df2125586b92be28ebcd8054cb9500726680ccd9cd5db2c8815c859c857535f2bca0ed160e1765b57f2cd1
 MISC metadata.xml 329 BLAKE2B 9d69f662322b740a5b9f215d24bde8b76d01bf1de4fe251c9c0a5e3ca3a6254e20b5fc64e06b8f29a060e9336573121e0f63bc1b276f397c0c455af5f376533c SHA512 1c8237de0ca8ba4b3bf588e100df2b966a496ba96dd29ab2cc78cdacec00836e017bc7a32be5f31471eefbe50a144d583d1220a91523dca329d0369920ee15ad
diff --git a/dev-php/sebastian-object-reflector/sebastian-object-reflector-1.1.1.ebuild b/dev-php/sebastian-object-reflector/sebastian-object-reflector-1.1.1.ebuild
index c7d927bc2c56..34f338d41120 100644
--- a/dev-php/sebastian-object-reflector/sebastian-object-reflector-1.1.1.ebuild
+++ b/dev-php/sebastian-object-reflector/sebastian-object-reflector-1.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
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> $
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE=""
 
 S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-php/sebastian-recursion-context/Manifest b/dev-php/sebastian-recursion-context/Manifest
index 775ec4ba072a..194b119d4671 100644
--- a/dev-php/sebastian-recursion-context/Manifest
+++ b/dev-php/sebastian-recursion-context/Manifest
@@ -1,6 +1,6 @@
 AUX autoload.php 492 BLAKE2B 141d4ab79acd2614a81a85411eb7514489e0e34256c50d9bae5b82106e24d84d03b465dce5a29e254ec2b7989d24f5fb3adb457e71e5026cf7445801a36f1d92 SHA512 6850fe9b76c5055d42cb8fd21496082b626c113fccbaa9048c7fc07c4853c610f91f83665df441964175265ab2df7244e7ae67c7ed5664ed2850886b973fcf97
 DIST sebastian-recursion-context-2.0.0.tar.gz 4526 BLAKE2B 54ecdfc255c3bdbedc2a909f5b569c62b19e2e66fc5ea4ae7be8401516c142b43e611d5e8f1c056be329983f21e1a8b85e7fb2ff1ddb92a2f6aad4d4191418a6 SHA512 9d25d148decc81f5a21d7a4e1f966563bf6ec765fcc1b1ce779668b74dfa39959db07cf296e9cffcbcb3943c8911709bb73f22c5bfcc81c5d2fcbb51967cf75e
 DIST sebastian-recursion-context-3.0.0.tar.gz 4414 BLAKE2B 04a0aca4b6012013306c813109c0ed6f60d2f4f1381ba6506398388b5065d69375191290d33cdc4b82359dc30b1fd98ef61005a657fa8db302472597950255b5 SHA512 0fce5709cb22818de6bbfda1ba2a99fea511d5b36bcbe7955661d756a6f82ba84cbf8fb4eb421d6b51ae9e36a8edac56c5bafbccf8b665a0296883ea0dbb3b91
-EBUILD sebastian-recursion-context-2.0.0.ebuild 631 BLAKE2B ad54deaeb0508c3550b9164d235bf770613cd90d2f8e76e9e23ff4f7e52c3cac5705e201b5f3267bdc65314351539eadc6a1337f4b7cc7a8ffab71a85ad039fc SHA512 a1b4091f425fbdcdfaba9ed0ffac59e5f129434aff7be9d746042812b875265cbf17a439bdcbb264541d4cd8b0f4fb71b6a65afa0833776f3873836720e1404c
-EBUILD sebastian-recursion-context-3.0.0.ebuild 634 BLAKE2B e2b45c5fadb11861c412a2346d9da39289908d3b831d9da19454a7b6212206b46887043174598c43533d3e581b2a3855eae17bc557595d8c1e05ce48ed875fee SHA512 eba6792ae42d19e991c2299d0dcfb429ed3d126aca5030c0753f2090e98dcbe90cd9b166ccd0185649d9c0dbd21875b1353a958fc0b017a629ee9492181a9a6b
+EBUILD sebastian-recursion-context-2.0.0.ebuild 625 BLAKE2B e66bc5e4c1b98137ee1dc8b9a84fc3274d23c04ce336638b0a448f663f96e9a35ce11ac20e4869f6aa3186574cd86810a18ce8cde30d8b368cd7ab797ca0d64e SHA512 553f5885f9a9488337bea5b9e920da45316fa8fa63c83180414671a159a6155b276045f9d146b2ea9da195d7f8472007858c7cd376c86dd3fb337c97c56169c1
+EBUILD sebastian-recursion-context-3.0.0.ebuild 630 BLAKE2B 63b28d2cabd5bf1624c675b8c7f0461a206108e65a359db5d808983f90b1eb45cc8bf4bc59defaba6adfc3abfb4bea419144b0366fde311eca63bf5561ae3901 SHA512 cc7717cf2704340dd8fbd6115c6992e99c436aa61661b8bb9ffcae1d971e8f2df099b30e42e897bdf96791202f3c9591f55c0769ef1a5e74c6f6a788935101c4
 MISC metadata.xml 322 BLAKE2B b031a3917e07e8c98b19228e012a05a46e4ad57b59e394efc345092541c652f2df5f2fe4fe35be69eb9c62f64bf55f0a12636ff9cafa2f510d06b86916f869cb SHA512 e345c6459f1c0f795081e2874aa4a4023998d0a0f6b28462468ef89c7cfaf38366671a68d05516e6d0f3e03b0cdfcbe849c1e224f7b1e3a723232c7db32281b6
diff --git a/dev-php/sebastian-recursion-context/sebastian-recursion-context-2.0.0.ebuild b/dev-php/sebastian-recursion-context/sebastian-recursion-context-2.0.0.ebuild
index 8590a31b02c1..72896d8f8348 100644
--- a/dev-php/sebastian-recursion-context/sebastian-recursion-context-2.0.0.ebuild
+++ b/dev-php/sebastian-recursion-context/sebastian-recursion-context-2.0.0.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
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> $
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-php/sebastian-recursion-context/sebastian-recursion-context-3.0.0.ebuild b/dev-php/sebastian-recursion-context/sebastian-recursion-context-3.0.0.ebuild
index d604ca506884..e90e11f60111 100644
--- a/dev-php/sebastian-recursion-context/sebastian-recursion-context-3.0.0.ebuild
+++ b/dev-php/sebastian-recursion-context/sebastian-recursion-context-3.0.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=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> $
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE=""
 
 S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-php/sebastian-resource-operations/Manifest b/dev-php/sebastian-resource-operations/Manifest
index 6abef41f2b57..323278824fd3 100644
--- a/dev-php/sebastian-resource-operations/Manifest
+++ b/dev-php/sebastian-resource-operations/Manifest
@@ -1,6 +1,6 @@
 AUX autoload.php 348 BLAKE2B 541a6d82f57c1b48b0087ac070058c1f5e575d35e7a69bec64ac18971a64f609beb65bbbaf58a9c1aed6293f863ed9c866024ad2c1531f8f8ec91893d2dfcce2 SHA512 8a6c7dbddc55527db9bdc1973682b09a3e615c3fbb0b473cb3b93b88acba62a7ac46e297582ab4a6611d99325d557425f40f83ed9afe6d82d6073f56e66fd0a4
 DIST sebastian-resource-operations-1.0.0.tar.gz 6449 BLAKE2B 0f748d4792a3d4705560c79047fbdb9c6371435600dbd8373e4c60c8edc436f3487264107b7f3d76125bde3ec7b30062587c96dad7612fdc4e4132d3912813ef SHA512 d11d06c9b8b4a1507238443588f34a85836fcd65d2afdb9bcf3cecfe352cba46c9349988550e901c301db8a21f19cc960a8164653ac66e57661cebddf52ad906
 DIST sebastian-resource-operations-2.0.1.tar.gz 17772 BLAKE2B 8a98c2735973f063fefba9079bf10e1b4a1317eab2e9326bf338d50b2c278673ade93bc20fb415d4d33046575045d0e2d147b5b1ba38812c84031c7a691d1946 SHA512 991716a948f3492b2f3c886f07485fec26ad7e31f8588a2cbf6deff8ef4791e403962578590b117ed43def7753a5f44f0f8c8f92994bc58295d58db3f7d71021
-EBUILD sebastian-resource-operations-1.0.0.ebuild 669 BLAKE2B 50c694363768a16fd7c6e3e6f95a4545db7b8a3f6ae7a3dd6d7b1999664e1e8b97bdae4647b6a387045ae16661eb67cc53ef7a9008c09d378c593d59f9cb4185 SHA512 3190e5dc33055f5e7599c7ca33ba31a516cb701c5f620150f2106ccb9aa13aabe9b46fa42b776f45a90cc8ed3c8ca0cab31d281ed1b7f52b4fe641ea8b7ca181
-EBUILD sebastian-resource-operations-2.0.1.ebuild 674 BLAKE2B 9e54cf487078e8c03ea451158de7240188255ca60330039d057f5e8689444943d1e57b86342fe7418b0a7f9738900d81375e42bbb43e4022627938efb7cbd754 SHA512 f90527dd7a2896b43d3ecd6860f9dc56123503ea1d5f4cb41fdea01423676c45e27bc88d856b0d8c6d3dcb15765a4cd80ac32696541e100d396e286a98909e6d
+EBUILD sebastian-resource-operations-1.0.0.ebuild 663 BLAKE2B 5f1c2284fc1a21644e034fefc0747f1d1c30c7f2474a75887c2d0b66b92f984e4fd26d8fc3b6b5611d88bdbecd9ea9c358979ad95543ca3994f6760879b8f8dd SHA512 81589551f6effcd8967c4d23dd9206f55b762e0508f1810ff8daf79ef4a0859b58820de2db5a525ac908240981f9c4399d8449945d76c81fabda9a1356590d8e
+EBUILD sebastian-resource-operations-2.0.1.ebuild 670 BLAKE2B 42aedc738623a0f3f18bc8c02b1c091d2fc00951e93d54373846d71164cc8e8ad923b11bf2153e91b629e6443532a5d8aa02c5d4c0f44fda9f4db51c1433fa9a SHA512 07595f7fb777ea8838890da62dcc657b91d665d863d9ecbf633b682aa289ec0685bd62d8fca1f13afd03c871dc4e925f9a9a8d29c4af19e70f395799cad5321a
 MISC metadata.xml 322 BLAKE2B b031a3917e07e8c98b19228e012a05a46e4ad57b59e394efc345092541c652f2df5f2fe4fe35be69eb9c62f64bf55f0a12636ff9cafa2f510d06b86916f869cb SHA512 e345c6459f1c0f795081e2874aa4a4023998d0a0f6b28462468ef89c7cfaf38366671a68d05516e6d0f3e03b0cdfcbe849c1e224f7b1e3a723232c7db32281b6
diff --git a/dev-php/sebastian-resource-operations/sebastian-resource-operations-1.0.0.ebuild b/dev-php/sebastian-resource-operations/sebastian-resource-operations-1.0.0.ebuild
index 0f3667dd93b5..eb3623b447e1 100644
--- a/dev-php/sebastian-resource-operations/sebastian-resource-operations-1.0.0.ebuild
+++ b/dev-php/sebastian-resource-operations/sebastian-resource-operations-1.0.0.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
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> $
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-php/sebastian-resource-operations/sebastian-resource-operations-2.0.1.ebuild b/dev-php/sebastian-resource-operations/sebastian-resource-operations-2.0.1.ebuild
index 68a1a80abaca..36986e772e73 100644
--- a/dev-php/sebastian-resource-operations/sebastian-resource-operations-2.0.1.ebuild
+++ b/dev-php/sebastian-resource-operations/sebastian-resource-operations-2.0.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
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> $
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE=""
 
 S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-php/sebastian-type/Manifest b/dev-php/sebastian-type/Manifest
index 1db317c680e6..834a4472d190 100644
--- a/dev-php/sebastian-type/Manifest
+++ b/dev-php/sebastian-type/Manifest
@@ -1,4 +1,4 @@
 AUX autoload.php 987 BLAKE2B 0df6eddcfe9551d42430d60c490def57e0b8426412f20964716b595345513bbbce293d8f6fb9157e1e7aaf1e1d08beeeac5cd4826e063542f05fdf66447bfe9e SHA512 104c4841f8c6994bd4b7b8b57253ec41adf823b14fb0545b1d5c8c31066a1dbc8ad79de6b2140eb395a4ad24093231cdc5a72f27f254b3cf7fa3299890871386
 DIST sebastian-type-1.1.3.tar.gz 19031 BLAKE2B 5e0d191cbc9315661f226aca14849ac4afa6d9e1dc59ca6033c60e425c94ee8b9ad49ab1c2b94c7814654bbadbaadd0164fadb1494f88c9521b2583985ba0281 SHA512 27b455c7a5f1125c916ea56fd933ef9ffa659b3fa6addf8d2c5956e4efef5bd8ffadc686e5dddfc50ba09a300c8148af7dded4249f404e15923e77102ab777fc
-EBUILD sebastian-type-1.1.3.ebuild 652 BLAKE2B ab32e14b06e9a3bc6f7ee688953edd326352507b53847d9c354e353ec125e5a487a543f4af73911c2e91ac4d2a149ead762dfff6923d8432945bcc8f87152ea4 SHA512 13091d9185a11a0c282e0ac66828e64d4ea1cd99b2596f01a2f821bca7edbfbcbd258c9a461dd76ce42733b2db9cb63e240ddd27b86a343000ee6fa5d977b6d7
+EBUILD sebastian-type-1.1.3.ebuild 648 BLAKE2B 06eced764929b78deb32938e9e3ee6721792246eb35c234cecbcde7721c71b262013a50147626d3b1094cb378dbdcb40fa0373c477b012c6a6dd26fe6c05db36 SHA512 4934e3091a01f3812a5a27912e85569479a6a5a96c45a406f5fc72de5997f40fa84f6d07362c887b275309b57185c0119fe269dc341f825b145705a3f56fe427
 MISC metadata.xml 326 BLAKE2B f8c5ba19312b005175c9631474a3ce08f75bd91d278e25e413e1c5b38862518993ca241ebcc4b15db5458e5a012937996bf3087bf2cecfd759a0d06b504bbd4f SHA512 8587dcecc21296546628406891914d9962adcaedeef9d3248e6e4f0d48992cffa90a2bb4c71a00fd78eedc2d02f16a1b3e49a089e84e1fca116118b52fa1841a
diff --git a/dev-php/sebastian-type/sebastian-type-1.1.3.ebuild b/dev-php/sebastian-type/sebastian-type-1.1.3.ebuild
index 4721b8b1b52d..fba05ed59db3 100644
--- a/dev-php/sebastian-type/sebastian-type-1.1.3.ebuild
+++ b/dev-php/sebastian-type/sebastian-type-1.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
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> $
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE=""
 
 S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-php/sebastian-version/Manifest b/dev-php/sebastian-version/Manifest
index 66e99354afba..5606543a7e02 100644
--- a/dev-php/sebastian-version/Manifest
+++ b/dev-php/sebastian-version/Manifest
@@ -1,4 +1,4 @@
 AUX autoload.php 305 BLAKE2B fd6d3f90f1a7b421f68876765e7a5646c291bd7a72b06a6827c1472f5a772cfd4afb23a597ba63dbce0cb2dd999d2ea43b61c9d8e559ffa5ae4a7c3669f9dc9a SHA512 8a3e0a151a2d6b33e168907a3e30778104d2f33ece499b9f6836be807a16bad4f234fddeaae61f56a69f085b3e7e5e4434297e2557b36b62c8e124ba041cb5e1
 DIST sebastian-version-2.0.1.tar.gz 3581 BLAKE2B c6da754aa5ef6f46309d52f7d36a30a1d1b9b847aa90d62481633e0c290fe58554772d4016aa90f79b153b0e3df377269f7dbf007dc7049226899ef9bc2aa868 SHA512 12a813ff08996f8a6e53069ea297fb00f5fc9b58ce463b4008791cadc19575539bdb17acbf1f2fa67b18ce5a9207c9acd47183d520b60d6a188569f513d8a661
-EBUILD sebastian-version-2.0.1.ebuild 692 BLAKE2B 574125c5b485d8323db6e57aa79f8742383337c21fe1e4cd40473959259344dc8bb7f4f53da06a79a6afe063d071b8d01953b87639e39e2c20ece2c46e417907 SHA512 114f65db9f30b00bc88467bf69bfd051bec8c45b8406c8c1a0a733a028bfc5aaa6abf46b1229d3bd9636a1788b156ad2970a0258cf8e6637f31dd438d5962699
+EBUILD sebastian-version-2.0.1.ebuild 686 BLAKE2B 7ab3cf314ff45dd74892a5f7450f19d85768b5cef4e4267b748c535bcb8f5ded8f7628bf7310e341f4554bc878e3f49e7c72692ea3534dbc18e3ef877e9868de SHA512 afac89b38f18bca9c71d57261829ae5583021cfbfadde80985795f1e3bc06f97f9340230581ebb39ab3299b701c5395f0f1d560c921d6afd02825e373cd7e161
 MISC metadata.xml 329 BLAKE2B 9d69f662322b740a5b9f215d24bde8b76d01bf1de4fe251c9c0a5e3ca3a6254e20b5fc64e06b8f29a060e9336573121e0f63bc1b276f397c0c455af5f376533c SHA512 1c8237de0ca8ba4b3bf588e100df2b966a496ba96dd29ab2cc78cdacec00836e017bc7a32be5f31471eefbe50a144d583d1220a91523dca329d0369920ee15ad
diff --git a/dev-php/sebastian-version/sebastian-version-2.0.1.ebuild b/dev-php/sebastian-version/sebastian-version-2.0.1.ebuild
index 8d66eed9bdff..a0b3a653c00c 100644
--- a/dev-php/sebastian-version/sebastian-version-2.0.1.ebuild
+++ b/dev-php/sebastian-version/sebastian-version-2.0.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
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> $
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-php/semver/Manifest b/dev-php/semver/Manifest
index 283adf16631b..843af62688a3 100644
--- a/dev-php/semver/Manifest
+++ b/dev-php/semver/Manifest
@@ -1,4 +1,6 @@
 AUX autoload.php 251 BLAKE2B 6d0768402735be6031c510b158bf29c0bc38a7c59317319e7b3240275903ece9a24c6eecacdac60b7dcb41c8b06513972cc649f7a36064adf7be33e1fa25ab67 SHA512 acae828e0308a02338aa850f4ba68a8becf171e9ddc6d9d6d1f48dfe24b100b53cd7b5d42d723f69e4e19aded8fe36c86ea3172b5681b0d96ec9e1a9661460f1
 DIST semver-1.4.2.tar.gz 10408 BLAKE2B 1504b6dff157e1b3c5ca338060e668f478fdd4e6a61be7835af6da669d22ef15a2143551e96bd01926fd2b408736fd8e70df22e1364b80712dc7d65608889b27 SHA512 2e41e2e70e9e62b280bff40b1a05b3803d95fb088eb4ce395e1f1fed79a40efc3a0ad16f8506d83a81b0e1d08e069640b2b084cc91aeb1ed41d934fd18249fe2
+DIST semver-1.5.1.tar.gz 10534 BLAKE2B ca6743415867db96696cc604c00a1ffabb35617af055a621079621fb73d951453f4c893ccf1377a142c05f5481a42884b380455c37e4e945c382f811a3917f72 SHA512 c9b582217060124fe20dcd7821e669173b9deffa976ad8921f48d22793f03af5deb4006380932e49e06da13a63db9aaa63254118d43448575446b78226d9cf3f
 EBUILD semver-1.4.2.ebuild 650 BLAKE2B 51835a3f2e3f7885b685b7d6e39a8974133d02952b774d5747c19ff5b2e02ccca0cfeb778ee5ff346829904bf26d09cd30f1d6c735c5e7fbf79c50cb78156907 SHA512 ffa8c080827f77ba52151a95612a979f882b99a61990fcad378b5a0783b50172f70f35b4def84ae1262e1292d2a0dba6ca407a88e3d49053247bfecae2e1fd68
+EBUILD semver-1.5.1.ebuild 650 BLAKE2B fa3328c96907a5076d8bdeba7f212aca9cd18502395c4bbaf127a3c3aa2883cd9302cac9b043b17be92f394da400a0416e79e9b43529ee80886207a9a44712fe SHA512 7ca5c9cd89cf86a0725e7aa068ed16782403a68cf0a14c67deb3a172073b33620cc18af29c6d5ca870e85c97a2670fd581baeaf292a9b5541a8223ca47619779
 MISC metadata.xml 691 BLAKE2B d635ca9e1849cddd3377081ddd927fcb15d092728a624c408d17aa0a307751150212f1a4abacec0dc03618402f05cdd226f0cbbaea4b47d66141637f7d5c6aad SHA512 58d106fb2642c5445fcc487b818a7d0ddb21bf56d17455fd21cab83d9941437a4f339cdd192ca212645891bce3da01bf936e503b63665cf014d55ebe12b635d4
diff --git a/dev-php/semver/semver-1.5.1.ebuild b/dev-php/semver/semver-1.5.1.ebuild
new file mode 100644
index 000000000000..1301f1d01d41
--- /dev/null
+++ b/dev-php/semver/semver-1.5.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Semantic versioning utilities, constraint parsing, and checking"
+HOMEPAGE="https://github.com/composer/semver"
+SRC_URI="https://github.com/composer/semver/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-lang/php:*
+	dev-php/fedora-autoloader"
+
+# The releases don't contain the test suite at the moment, see
+# https://github.com/composer/semver/issues/59
+
+src_install() {
+	insinto '/usr/share/php/Composer/Semver'
+	doins -r src/. "${FILESDIR}/autoload.php"
+	dodoc README.md
+}
diff --git a/dev-php/smarty/Manifest b/dev-php/smarty/Manifest
index 1b594d0d8053..49d82213a1c6 100644
--- a/dev-php/smarty/Manifest
+++ b/dev-php/smarty/Manifest
@@ -1,4 +1,4 @@
 DIST manual-en.3.1.14.zip 408414 BLAKE2B 03d4e7a386eb3bd5b19e5c555ec34b86812838a5b5fac8ec0ab9701fba89a5867714da57d950f68224a89bbe2267c18d638ee850681860de309c74bbfb3d0a0b SHA512 d384e3856b45ed3f992f3732a5465120abe9fb947cdf13ff67a9c4264f72987d24885ee61cd7309b728e64cdfe4f34c3e7f757096d35de56d962f3b78def9e58
 DIST smarty-3.1.33.tar.gz 249999 BLAKE2B 1e174b190238c8b20d5dae9c0c9fdf264c4716ba850599a2a028fe6c307eb3d9d2611e3b928efb9471e051496e4e31502458cd7a71a9318e012d5af7eca2c50e SHA512 443473cf12c7e053744daef7a70d4172979d760278aa1593216d0b70f0c12ca2b48eb79486a1c10a1cf2264da671804b94ee9d538b9013ff0bdc42e28639ca5d
-EBUILD smarty-3.1.33.ebuild 1330 BLAKE2B fe6a2bc48bec01af1c5f39023da1e56bfc68846730481d111b068fe729d444a78c8e3af881bd08ada0e9c52b2b75219747f2d4efbaec3ff13b3ac4c2928bfcec SHA512 d1410ba3dbeccf10015fa94ad39098a5bd4e90506d3f340ff6f50c3b64f90a548582c7e3c2251639a91bb85add57fc66ee6e71d3e8eef8133ae07e097d7ee56b
+EBUILD smarty-3.1.33.ebuild 1331 BLAKE2B 0b86c4a49113cda43350ccceff5a38ddf304d025bf8cc19cad0d47755effd2d4a736bc67073671a043b8477c19835ffb6cb2f567ffd94df99d013cc6c08b20d2 SHA512 6e5017f5ddc74705c34a5f1e3a27d045c2b6969cc03d0148ab583ec13488bea209e50c8172aee59c8af5f0afcc698f533c1cb26e4ff210c12f3902551a68fc1b
 MISC metadata.xml 716 BLAKE2B 8abe288ed9a4ebaf525d4fe9bf2db14a9b345570298a4f024a034802326e5f87b99530380638eb06697a18e2aea2b605bac197bf2325d15c5f278b2a764b0e11 SHA512 eb97ed210a66eb9e46f228736008d207183f73b48ce5fa4947596935b9200f4444bd54726fa5ec01cd75c8d988e8d357d5d8c56055d3ce3d9f97e797365e8779
diff --git a/dev-php/smarty/smarty-3.1.33.ebuild b/dev-php/smarty/smarty-3.1.33.ebuild
index 810acceff138..17f7e0785596 100644
--- a/dev-php/smarty/smarty-3.1.33.ebuild
+++ b/dev-php/smarty/smarty-3.1.33.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/smarty-php/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="doc"
 
 BDEPEND="doc? ( app-arch/unzip )"
diff --git a/dev-php/spdx-licenses/Manifest b/dev-php/spdx-licenses/Manifest
index e7d58dd1491b..4da590396fdf 100644
--- a/dev-php/spdx-licenses/Manifest
+++ b/dev-php/spdx-licenses/Manifest
@@ -2,7 +2,9 @@ AUX autoload.php 264 BLAKE2B f5084534435d4e00c9a97ff6a068ff94b32b5e533095046357d
 DIST spdx-licenses-1.2.0.tar.gz 10974 BLAKE2B 52cba9837202b1ae598b6d3b36f4ef67ec27988fa5911f2dfff92d39515d0401f5636922a3d205413489d21fd1dfacbf68f72c907503807317c7c9e51392e016 SHA512 fdb63dd29a099afbc116b30d1deec3d2b46be998a55fd741126f1bc393c5037a9a7477e55f7e030585d826be7d72db26be5ce0b5bb57dd536137cc45890ea9c9
 DIST spdx-licenses-1.4.0.tar.gz 11318 BLAKE2B bbeca0301c98bcbefe9ab09ab3f421480a4a777cd666dcbd870c193bb9af3083853561a3a49ea37a4534bef6c8f7e7c31d85b62355ab11dce006fe5f36864a10 SHA512 0ed7bc6e42e7cebe0763dcda8180d1c20da3f79587457e04be0f1331aa8464a1459ec584a8ef06db76b90eff1b6fd365196a2402384d00ddb5352afdc07afb0d
 DIST spdx-licenses-1.5.0.tar.gz 11576 BLAKE2B a427969df68a0ecc0f1234b1da3945c50f5f8163d182ec47a1fef31d309f216a410db95a9dd9e5b6057659a4a0afd5fad01919624e0b6ff0aee20d5bfff7d88a SHA512 184dc4c07f1d7b55539d32e4793c3ffbd8aa5a0b23439965a44450154e63e9afb74adb82031544e9e76e2ea9c5f57308d876c541dbd1583d498d3db71097fb06
+DIST spdx-licenses-1.5.3.tar.gz 12132 BLAKE2B c4f4086903769f8dffba496ed07fb490bd8def142be60c808726e52f4e059df1ffb1a2e8bd3d557b6c531c62d7e64776da1d482ff5958bfc687c11ef963925eb SHA512 b6e7fbaa422ff6d2f227f8fea24de514c0e2c34c7381930f1aabac9523a56565ab2a3df524029143f2e305967dcc0af09721ed9cf74b6e8780306c91d42c74ee
 EBUILD spdx-licenses-1.2.0.ebuild 540 BLAKE2B 5408ae142e124053f36c38f211f8cbd7cd4cd37cf34d4a6bdf9049458107d9b3fc1c9b7f70168e67eaf2bcb0ad8b62b382f3312928bb013e2dfac1748a9203e7 SHA512 61e9ef062aec32f723ce485dd5f1b0dd84355894571f78f38c13dca00756d9bbb8de0703b2fd5466e806efb0b7e5e147d87061e95d003c81fc2b4f0cd789c3b3
 EBUILD spdx-licenses-1.4.0-r1.ebuild 592 BLAKE2B 51d43eb90c272c90b2f74a8a7569039604ed3a8e1d3e1aa84823aa2ecebfff13c03d518096f7ea087f0cf91268f0e9f5df64199872fcaef5aad68de9ed45d3a8 SHA512 b5ce0761d3bbb97547a639582e9d27b10033ed229467d353fc692907f54f9fa1cfdb70c313accfaf2cc14c705940bcc7e693d1a6162b38c685e104c4558dfd14
 EBUILD spdx-licenses-1.5.0.ebuild 589 BLAKE2B 98b09d9588f1730200ccbf89bb508b57e3ce0a5d845945c20b853e0eca19dcd82c6d03e1752918da5d3b7321338bb923b1c74fb5dd7974fb597fb6bc9609c369 SHA512 f067b98af3569e534c20ee26c170c41794ff303601d4da917e33a37cf6b04e51dfee1bafe1b128e10f41369d2d90e32f50e15828a559e2104a2e37a3a24d9d87
+EBUILD spdx-licenses-1.5.3.ebuild 589 BLAKE2B d833a009d0c37e17b0570069667325e9d70f0e7005bbdfdcdf92c2af0239af7b2a1f75f32f3e230b82e44bef36ac46c289f37291ad02a62d8be89e11692e2047 SHA512 1aed6d44847dadf8d8d305b5874f7a67cba24c5dab981e9bfe59461f2dacc361b9043ad8aacd88c15098a28524f8ddae930ec583d981ff35c1b1d7da3112c9d7
 MISC metadata.xml 675 BLAKE2B 6ae4ff5df27e2d6334deee789bf253f71f6b55999e2cd9f0c4a1be6358c63c74f668624025f0d8fedb24dea3ccb36ad7d97972f1f627979b7c40e5ca1c389eeb SHA512 f660171c2d2bf3582a91e72a9a92b8f1270a1339c8f68d47c3d6abc2d642027873b8c6a4b2ec7c8bf968cfc37de208c3505899bc2d4fd472cfd403b73dd9fefa
diff --git a/dev-php/spdx-licenses/spdx-licenses-1.5.3.ebuild b/dev-php/spdx-licenses/spdx-licenses-1.5.3.ebuild
new file mode 100644
index 000000000000..98621560f378
--- /dev/null
+++ b/dev-php/spdx-licenses/spdx-licenses-1.5.3.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Tools for working with and validating SPDX licenses"
+HOMEPAGE="https://github.com/composer/spdx-licenses"
+SRC_URI="https://github.com/composer/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-lang/php:*
+	dev-php/fedora-autoloader"
+
+src_install() {
+	insinto "/usr/share/php/Composer/res"
+	doins -r res/.
+
+	insinto "/usr/share/php/Composer/Spdx"
+	doins -r src/. "${FILESDIR}"/autoload.php
+	dodoc README.md
+}
diff --git a/dev-php/swoole-async/Manifest b/dev-php/swoole-async/Manifest
index 429235fd59e7..d6ec756f3aca 100644
--- a/dev-php/swoole-async/Manifest
+++ b/dev-php/swoole-async/Manifest
@@ -1,3 +1,5 @@
 DIST swoole-async-4.4.12.tar.gz 417674 BLAKE2B 77a96f53b1b159b558eb4759fe172e4a3b8f2648cd9f49252d89508eb56b4d342b178fa3c84d6a425c300a286063b4d32a05d09a3da4f3769be4c25a9800783c SHA512 adfb761803e5ec93c30aa2a4bbc312a2f43287a54cd237c0a87237dfcbfe1e6daa3d57ec2cdf15720202aa9a7830ed67ab2efdf2f7dd81989c3693e91bc22143
+DIST swoole-async-4.4.16.tar.gz 419094 BLAKE2B 7b93a0d2eb8a9597a68871783c60746c832b2eb1dce89a0f82ca6df2ee20151f910ad4f8ebb6a453bea3b7c2cc274266614f147b34c21a089ff9cc4ca0f73d1c SHA512 cf4bfc3c86740e343774b2cddc0ef2386f522e7929c160bc10d47ebe0b8f8d63dbcc82e70b7f3f30e7f7c102ebd42b02cddf4c3e1a0289f0e45147ddbd9aa546
 EBUILD swoole-async-4.4.12.ebuild 1057 BLAKE2B d27170880db3dd533f0bf66b08e2656bc4694a4ed38a3e45b7aad1db5ed94b205633ce4041486c87697a29eed857c930d77f208fca94d5e29ee29de51c5e57a7 SHA512 edb52f3826228bd5a20d316f62467bef487792ed081934d9dd71d02a411bfc7ddc61fc696e4f70d3cf99f2a182b6033e8242f9553ed2b365a009f121b8a2686d
+EBUILD swoole-async-4.4.16.ebuild 1057 BLAKE2B 8688cb941e2f0acd5ca924d4adbe8d563770e3ad6df48619999858c33bdb0e301f18af277485d9adf56624330b608ada599a30a87d0ea29e002d7975021c7be1 SHA512 65ae560828a28c0e4f0780a4492d3b4749b2a5056492e91bbe91d27afd5ae67c905be4c7cd93a42ffc382f72a95c6a1d53a8aebf35b2b0cd7fa1ce1508c5369b
 MISC metadata.xml 247 BLAKE2B b04f62f80c1381c62e7020a89486538dd3b4968a281721cf8213e25782a6e5bdf1a7199b2ae675bdcfbb954bc429f2b8af387d78523abe990ac881effbbfe67b SHA512 910677640181b5d854b46c6808d68ab56d826998ef3806d3915a98183cdc05cc81aebb02c8e13cbb26ba5c56c6db7020c97e7ba058e472e00a5530cf341c4012
diff --git a/dev-php/swoole-async/swoole-async-4.4.16.ebuild b/dev-php/swoole-async/swoole-async-4.4.16.ebuild
new file mode 100644
index 000000000000..09b9d48a22e1
--- /dev/null
+++ b/dev-php/swoole-async/swoole-async-4.4.16.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PHP_EXT_NAME="swoole_async"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+PHP_EXT_SAPIS="cli"
+DOCS=( README.md )
+
+USE_PHP="php7-1 php7-2 php7-3 php7-4"
+
+inherit php-ext-pecl-r3
+
+SRC_URI="https://github.com/swoole/ext-async/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/ext-async-${PV}"
+PHP_EXT_S="${S}"
+
+HOMEPAGE="https://www.swoole.co.uk"
+KEYWORDS="~amd64 ~x86"
+
+DESCRIPTION="An extension of Swoole, including the async callback style API"
+LICENSE="Apache-2.0"
+SLOT="0"
+# Tests will require pre-configured endpoint
+RESTRICT="test"
+
+DEPEND=">=dev-php/swoole-4.3"
+
+RDEPEND="${DEPEND}"
+
+IUSE="debug"
+
+src_configure() {
+	local PHP_EXT_ECONF_ARGS=(
+		--enable-swoole_async
+		$(use_enable debug)
+	)
+
+	php-ext-source-r3_src_configure
+}
+
+src_test() {
+	local slot
+	for slot in $(php_get_slots); do
+		php_init_slot_env "${slot}"
+		[[ -f tests/template.phpt ]] && rm tests/template.phpt
+		SKIP_ONLINE_TESTS="yes" NO_INTERACTION="yes" emake test
+	done
+}
diff --git a/dev-php/swoole/Manifest b/dev-php/swoole/Manifest
index fa6c69a50715..b047e13f641b 100644
--- a/dev-php/swoole/Manifest
+++ b/dev-php/swoole/Manifest
@@ -2,8 +2,10 @@ DIST swoole-4.2.13.tgz 1305634 BLAKE2B bb30180f7ca7b024a2aab8aff1149f6b19035315c
 DIST swoole-4.4.12.tgz 1436554 BLAKE2B cc9e64e108aa9b393265708a6922f53824c2e9941c0f47f4f6aacf93239829381cdf4625af8f30e2ca8ceb1663047c6be8b2d7808dbc29d27100135288f7ac85 SHA512 8899bb048b85c048903c80fe1af045ea4f82a25b3b4fd9995d51c8a2ab144306f9f5651276776e3f6a29c83322fb0aeee2822d131247070fe9e2e87b26f2e0e9
 DIST swoole-4.4.14.tgz 1440095 BLAKE2B 8a893604a84f750b95bb63a3c6ce9869a80a700b58e744e0da588dcdb88b9d9ae8fa5b73548cc182e255d7fe4e49139c3da9bcec40a54af94c35d355ee4cbfe0 SHA512 73b598069d38dcc3201a31fdd93c1bcf0ce31ab5399bade8c31f6decae25ef6e9c0aefe0412409158c1dd0fe502751c8e669e0a34561cb1b36448366708572c6
 DIST swoole-4.4.15.tgz 1454897 BLAKE2B 38f804e5f2f41ba2bc32ac2e6fd7be3e03f7a361487d7dad41bdc2ee3f2489d41824f60a841de1e3dea0cbf105d11dc1b5c2225ae49a02155604bc09c990ed61 SHA512 5ad797b38a20cfa17b0aa1fc5ab4f6446b84debb38babc05630e07833895401c778f1c6cf9eb32d7204b02c0e170ba6e613f356a054baa29ac511c19ce59620f
+DIST swoole-4.4.16.tgz 1457270 BLAKE2B 4b65270aa1014ea68cadae8eb021d37498dc3fe0bf2d681c95bf7113928138bc26ab73f3be91185eb5ecebcb4940906814913c7908c87592aafd33fbc1820bf7 SHA512 7be4705967ed6b7a955f679f8c39585d34dc8c87ba608ac3ae2b0fc3cae9513d9639c8e9aac4278ce85acc215b500044626aab9b2aac725c9ffaef72dfb02dd7
 EBUILD swoole-4.2.13.ebuild 1789 BLAKE2B 043b1bf3d91ef7f60c7a659c7c9ba0795bd3d8cbfdb8abab88e5ea78234368ce2c793684f18b537831c34ca02148c58e27b253794398470bb9ba8de4a8a4889c SHA512 ccba3090b0f05821e5c8784672c787545774e138b5ad94098be81d535158f551648c81dc790846106caa690417a3d7480c2f709e740dd3e5c8b2760f235e822a
 EBUILD swoole-4.4.12.ebuild 1872 BLAKE2B fd616184c677b17df98f51216296eb7d0bf3e1262ead010c18da737638a8bc5a4709117770148a5fb361cff41e26df075ca1573d92e3d58f4c2dce37a3c50471 SHA512 35c05d7c7719498e1056af08ab9ab0d76ebdb38632836447294709feb0201a3c4adac45f7b4ce94e653afaa90afa1f9df9c56a1c0dcac1e85d16348a0dbce54e
 EBUILD swoole-4.4.14.ebuild 1872 BLAKE2B 35afca5e687dcf37f1fb24d478d174d6c77d440ec0afdcbb02cd49bedf377378544fe6cc0db714dc217339a21514c51e5ff49ef95e338fd42c0a7e75aeb17e3a SHA512 7bfd6458d0ac351eb266004c754d6219c796d906fa25c430bcc565b4e0da799f86380440929804c93c5149308afb92e32cd9e1dcae482d7cf0352f096cf586df
 EBUILD swoole-4.4.15.ebuild 1872 BLAKE2B 35afca5e687dcf37f1fb24d478d174d6c77d440ec0afdcbb02cd49bedf377378544fe6cc0db714dc217339a21514c51e5ff49ef95e338fd42c0a7e75aeb17e3a SHA512 7bfd6458d0ac351eb266004c754d6219c796d906fa25c430bcc565b4e0da799f86380440929804c93c5149308afb92e32cd9e1dcae482d7cf0352f096cf586df
+EBUILD swoole-4.4.16.ebuild 1872 BLAKE2B 35afca5e687dcf37f1fb24d478d174d6c77d440ec0afdcbb02cd49bedf377378544fe6cc0db714dc217339a21514c51e5ff49ef95e338fd42c0a7e75aeb17e3a SHA512 7bfd6458d0ac351eb266004c754d6219c796d906fa25c430bcc565b4e0da799f86380440929804c93c5149308afb92e32cd9e1dcae482d7cf0352f096cf586df
 MISC metadata.xml 344 BLAKE2B b6bba613a547a33d17c214859118a6f8c499b65763a8373dde96b955efc9609ddb2f2de6cf678a5f0f1552ac1b054661d2771b68cc007327950721b9e36417aa SHA512 8fe672a189916bf935ff0bc312b617658d3fd789bceb0305dbe9745600690cc2b9d93d2bf60b1bd517c1824c5cef2ea8ebe4eab69716ecba5763742b15cf61c0
diff --git a/dev-php/swoole/swoole-4.4.16.ebuild b/dev-php/swoole/swoole-4.4.16.ebuild
new file mode 100644
index 000000000000..146edf124e9f
--- /dev/null
+++ b/dev-php/swoole/swoole-4.4.16.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PHP_EXT_NAME="swoole"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+PHP_EXT_SAPIS="cli"
+DOCS=( README.md )
+
+USE_PHP="php7-1 php7-2 php7-3 php7-4"
+
+inherit php-ext-pecl-r3
+
+HOMEPAGE="https://www.swoole.co.uk"
+KEYWORDS="~amd64 ~x86"
+
+DESCRIPTION="Event-driven asynchronous & concurrent & coroutine networking engine"
+LICENSE="Apache-2.0"
+SLOT="0"
+# Tests can hang.  Disable until this no longer happens
+RESTRICT="test"
+
+DEPEND="
+	app-arch/brotli:0=
+	dev-libs/libaio
+	dev-libs/boost:0=
+	dev-libs/libpcre
+	sys-libs/zlib:0=
+	http2? ( net-libs/nghttp2:0= )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	php_targets_php7-1? ( dev-lang/php:7.1[cli,sockets?] )
+	php_targets_php7-2? ( dev-lang/php:7.2[cli,sockets?] )
+	php_targets_php7-3? ( dev-lang/php:7.3[cli,sockets?] )
+	php_targets_php7-4? ( dev-lang/php:7.4[cli,sockets?] )
+	mysql? (
+		php_targets_php7-1? ( dev-lang/php:7.1[mysql,mysqli(+)] )
+		php_targets_php7-2? ( dev-lang/php:7.2[mysql,mysqli(+)] )
+		php_targets_php7-3? ( dev-lang/php:7.3[mysql,mysqli(+)] )
+		php_targets_php7-4? ( dev-lang/php:7.4[mysql,mysqli(+)] )
+	)
+"
+
+RDEPEND="${DEPEND}"
+
+IUSE="debug http2 libressl mysql sockets ssl"
+
+src_configure() {
+	# JEMalloc not included as it refuses to find a ${EROOT}/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_enable sockets)
+	)
+
+	php-ext-source-r3_src_configure
+}
+
+src_test() {
+	local slot
+	for slot in $(php_get_slots); do
+		php_init_slot_env "${slot}"
+		[[ -f tests/template.phpt ]] && rm tests/template.phpt
+		SKIP_ONLINE_TESTS="yes" NO_INTERACTION="yes" emake test
+	done
+}
diff --git a/dev-php/symfony-console/Manifest b/dev-php/symfony-console/Manifest
index 11d1d50b77ee..ab01d1b41177 100644
--- a/dev-php/symfony-console/Manifest
+++ b/dev-php/symfony-console/Manifest
@@ -3,8 +3,10 @@ DIST symfony-console-2.7.9.tar.gz 116610 BLAKE2B 1b1da6f81a88b2887a6a5eb5553c4aa
 DIST symfony-console-2.8.43.tar.gz 131451 BLAKE2B f3a0c57f6c746c9cf18b0b9f6ae32aea055f0c3d5ba0c1a43d5492efcfab897184db49dc8ace1c465ca8b04194d10f1acab6b2c1ea2d3c62c3aa54524f514f39 SHA512 e5177052bb826fe5f023c569e24440588f75d34d4caf56f69ee1a88a5e7d3b639741c1262600543d617b80d5a086472d54b45f48e7eb79375759d4e5cce742d8
 DIST symfony-console-2.8.48.tar.gz 132206 BLAKE2B 970d4e7526681159aa76fdede0e533875c163cb7fdb2156f0eebb9540602c8e29b3ee8b5a9bb5509a629b9a910d00cfc5625f203a77807ed0da670a0e41e4be9 SHA512 358e0f44e516ffdb626bd7da29b415f1a563bd400b627991928e5014aee8a5ec9bd1c61fa4f6c25f6f28b1f88f6f16d9d718bdda22b9f3b906db4cc85cfadb1a
 DIST symfony-console-2.8.50.tar.gz 132180 BLAKE2B 25611de88061feafb6fcf26bc5c89145d02ddacff1f6bc3d81a30ea89314a33c5231dcf050f5c22817eed3c2bb7e2defcd820bf586436693c47a9ceca7384ffe SHA512 e1229f8855ad6d48e75abddc2953c3e48c6ceb025536c748c4aec75e9b1c4c482bf36de2070b62c0d31904e45df02b3241c42b48e24c2d609c8280b6126a49bd
+DIST symfony-console-2.8.52.tar.gz 132191 BLAKE2B 0eb276cb1d7faac0e21558906d4c7f299901cd06911d8bcdbf5842dec508ed5ec48bd8fc32d186dff24968471549912083864b726ec177eb53cfb11bcbae7604 SHA512 a066c6e81e7cb64a819271e188e25fcc7bced16a9f2408fd55d765dff052d331b2e68df05b2c107070a67c919eb46619a5626aaf4866620d9075653390824e5c
 EBUILD symfony-console-2.7.9-r1.ebuild 666 BLAKE2B fc6405f880bf61141284960755ff4e0737edd3a1dae204316289b930035aa14a6afa7afc556a06ab181737f339d717d94e9fd5abb219204d1cc39632f29b6fcf SHA512 0e65babf5287b41f5e2ce9d435e1fb5a8c3ec3326f6be7a70cb1a4aa5b5e38ea03fd9473ae86e3dc59950e127380fcc275c6d86e6783f5b41237fc0fb26d9ab8
 EBUILD symfony-console-2.8.43.ebuild 666 BLAKE2B df20a7988cf452daf7225a10e1faa82ef2e38142e9788ef51ae0f8d0fe0744b6f77557c8624ef77120c77a93acc15bc7bcb512f1bcda7f9503432cb829d53b3c SHA512 87bcd21dda39c819e492275fde4b123360f5724e0d44ba33e857840cfc1f2f6f0680a4089eb6218ba5d0e74948b035c721347cb078b833e8172b5ae272de7ee3
 EBUILD symfony-console-2.8.48.ebuild 663 BLAKE2B 1ad76e0692275d73f79e19621f599d8b662602631ffdfeb945094c416a33e1efae1e0f2084e9be4fa2a57f736a3e37277816618b704c65c871431a2dc7998c1d SHA512 80aa352748e9a6956c14bed659a3b01685077ac34805688e03e8bed49794052dfbfa54b7e04770655524d5b3e3a6a4641b4394f6378209781937345a6ce2b9be
 EBUILD symfony-console-2.8.50.ebuild 663 BLAKE2B 2e03e16e05cc6f8d8a02b8ef6b26e59e192e1d53355c150c26a5c9a48d96be67c556dab083e937bfac805ee31cb5fe900c0833cdc931b624c9f428ec87c80779 SHA512 d3b8c317097ebe81025c8b953116c3be6d51a4b3910c4c220f8522a63669f683a54c8a735d3b80ba9b65201a2aff1387cd6b44428b65da4e2c485c84adbc099c
+EBUILD symfony-console-2.8.52.ebuild 663 BLAKE2B 979248dc713cee6e58f8f4fd8b6fefad918c649dde75b308d127dcd736791e499426d7a4979a9e322f2f052aebbe80214c3eb3fd3c31646787a53c55996848a4 SHA512 fe410c552ec30c28aea00dcdf4790cee2c4e02f167172e12a5db826e3405cf9234f4bc1378a5540473044cf343cf9a52736a6d63e0128d5ae194cd0da8b5ddb5
 MISC metadata.xml 694 BLAKE2B 9305b006f06841ee70939962c1a72d5efab4b6e3065ad720bb83ce84ee210bab45dee93dba63c19d74e7227c458a347346c5f5a3d5724b682047f5212e83f495 SHA512 abc6b86ecc143c9a02616b46628129fa02c00e693af762a220bdb4fbd4abca4bf304dc4526dbadee11672123cc743fbe89969fbb6af3b6c6c85f6864fcc4ccb8
diff --git a/dev-php/symfony-console/symfony-console-2.8.52.ebuild b/dev-php/symfony-console/symfony-console-2.8.52.ebuild
new file mode 100644
index 000000000000..492cf785652a
--- /dev/null
+++ b/dev-php/symfony-console/symfony-console-2.8.52.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Subtree split of the Symfony Console Component"
+HOMEPAGE="https://github.com/symfony/console"
+SRC_URI="https://github.com/symfony/console/archive/v${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-lang/php:*
+	dev-php/fedora-autoloader
+	>=dev-php/psr-log-1.0.2
+	>=dev-php/symfony-event-dispatcher-2.1.0
+	>=dev-php/symfony-process-2.8.12"
+
+S="${WORKDIR}/console-${PV}"
+
+src_install() {
+	insinto "/usr/share/php/Symfony/Component/Console"
+	doins -r . "${FILESDIR}"/autoload.php
+	dodoc README.md
+}
diff --git a/dev-php/symfony-filesystem/Manifest b/dev-php/symfony-filesystem/Manifest
index 5f4271aa9789..6328ecd74926 100644
--- a/dev-php/symfony-filesystem/Manifest
+++ b/dev-php/symfony-filesystem/Manifest
@@ -1,4 +1,6 @@
 AUX autoload.php 280 BLAKE2B f482a272729d9e859d789f38b8ae9179c4e79132019e62c5ab2c215697a99f29f89b80d10cdeb2d3a8cbc130fc5ad15c32ee217c80c1e93390d730254c5e3815 SHA512 27642698b0f10e96c8fb3ba5619c8b230bc830140d87593c61351c43b1eddb10f82770b37899f305587c9187c673f4b8f889ead8d34926c02e99957620693a0a
 DIST symfony-filesystem-3.4.28.tar.gz 19238 BLAKE2B dcb9752a5691834aa87b3866b6c2f53b54d5953cf721547cf3ae8aa03e826bcacb2393f324bf9a767013a2daebcf9654c7ce18822ac40758d96b35b174b8ab6d SHA512 4a2e19bf6df69396e503e11112d9b37e9deaaba5eb4fa95857b7b19e1ce073462d2ca18442b6cc1c30021f925d0878f635aa9bc1c5de55318f0c521a291efcc8
+DIST symfony-filesystem-3.4.36.tar.gz 19282 BLAKE2B fd084715356b49588ff6a589372ab1958e3bd58b3af690b554ef1562553bf57504ca184fea06a3aa58ea12381773cebb57e11ba385be5c23ebce3f9e576413ec SHA512 2a43d22e64adfe50a1915f3833c70962f90a8da3cf7bb8b7bf30b1e0f17d6bd4857b35687207e019037d24ad71f46228ddd6eb46713117b82a92f94653cb2384
 EBUILD symfony-filesystem-3.4.28.ebuild 913 BLAKE2B 391eac0cf1dd4052206b1c23adb2d4ba9135a208ed1aa3eff465df5e6b10afcfe904c13f5e00fb0c460c893bde234eb7de86a23966ca8bf0919e47dbd8ee4807 SHA512 5b83ca824b09e73e5c4e46b4aa5ea27fbad9266a36c95f92f775e2ae93bfbc62b4c71b8a383339bcd2a871aa924d732c91e7f557e2de7c94a13a43f5159eebac
+EBUILD symfony-filesystem-3.4.36.ebuild 913 BLAKE2B 3d77359c8b7386d436c7e3383d9cb1e3540dd5c1c5cfcb25c402e48b7d08ffb1fa513bf9f7e57dba84414a6bdc105eebe28575f2b8af6a23a754bbafa3aef5e9 SHA512 7967f3fc9e525dd867b27b08a5edba4afaf5f9b94a1927a8073beef5a8a04eb5529ba2014783d409b9144cd013c0adaff04804a6dce700080c93222c6ffd3442
 MISC metadata.xml 671 BLAKE2B 6bac5eae2bf1dcf6ee982be6ee6bddf3c3e0b767b6fc1920f2bc7d7bd3798f6b1567a4ee9fe79c7ebe704572b633d129ea7eef0828a481bfc19fe2d4ae3fc87d SHA512 bbc967795d3f2cac6bca2c94805e8e412cacf7a32699222b27f8f658c54363c1ab49cb0e68b2323ad7d8dd71a5983aeae5e2ad52e23759b3cf9f0ff8662d4e6c
diff --git a/dev-php/symfony-filesystem/symfony-filesystem-3.4.36.ebuild b/dev-php/symfony-filesystem/symfony-filesystem-3.4.36.ebuild
new file mode 100644
index 000000000000..03a6ae68819b
--- /dev/null
+++ b/dev-php/symfony-filesystem/symfony-filesystem-3.4.36.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Symfony Filesystem Component"
+HOMEPAGE="https://github.com/symfony/filesystem"
+SRC_URI="https://github.com/symfony/filesystem/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-lang/php:*
+	dev-php/fedora-autoloader"
+DEPEND="test? ( ${RDEPEND} >=dev-php/phpunit-5.7.15 )"
+
+S="${WORKDIR}/filesystem-${PV}"
+
+src_prepare() {
+	default
+	if use test; then
+		cp "${FILESDIR}/autoload.php" "${S}/autoload-test.php" || die
+	fi
+}
+
+src_install() {
+	insinto "/usr/share/php/Symfony/Component/Filesystem"
+	doins -r Exception
+	doins *.php "${FILESDIR}/autoload.php"
+	dodoc CHANGELOG.md README.md
+}
+
+src_test() {
+	phpunit --bootstrap "${S}/autoload-test.php" \
+		--exclude-group network || die 'test suite failed'
+}
diff --git a/dev-php/symfony-finder/Manifest b/dev-php/symfony-finder/Manifest
index 90b8cf693978..a848e97ddf44 100644
--- a/dev-php/symfony-finder/Manifest
+++ b/dev-php/symfony-finder/Manifest
@@ -3,6 +3,8 @@ AUX skip-file-time-sort-tests.patch 1211 BLAKE2B 84e77e610c1c57e54063d50e7ed4fe7
 AUX symfony-finder-3.4.28-skip-file-time-sort-tests.patch 1026 BLAKE2B aab5d755792961baf53217710f9d196663f5dbcf96cb524a5850cf681abdef6c0b60e2af08e4c7e01f135f95d750d3c0532e190dd009f7c9213adc70085b2da2 SHA512 836689dce3d9ae230a0d2d8ae7df6f9cd592853f14c6b56f0daffe9ee474fd3ecdedbd05bd9a1e344d6af5c2ec6ba04c1fb5fdbc60e70a843e6e02ae3de922c1
 DIST symfony-finder-3.2.8.tar.gz 24452 BLAKE2B eed88ea672381fa3a0fef9390109fa7b89b8de87f4e0174fcb24c009044818b7c56846eec0b3240eed1c05fe7d682713fdd41c84e5d766cc2632e5576b38b741 SHA512 7eff457c6c70bf58b4af7e9adbeeb68a1ad684b95510d929f137545be6b755ece37949687f4de27c7fb4d5f208e30c6b0b3a32a804f7a6a6b8ed0d4ed7dfd9cd
 DIST symfony-finder-3.4.28.tar.gz 25618 BLAKE2B 592a10a5e8d7f1782242d79bc11ebfde6d528025a65bb18d5c36b238c418a3df10e637a285d0859bb79ab152aafdad5d61d32396efed6f6fe0e800aff03fae69 SHA512 5b1754e47eb484fddfb1d29f181efaabb371e62c2afe5c7c1d0552ac82de81aff0fbc6594498b859b64cd34cf35e57cf29110d59e5f376263f1b136a4d184b69
+DIST symfony-finder-3.4.38.tar.gz 25631 BLAKE2B e15224294373f35222ba5af10598339714892d637e7ee6e52ad6e0fd22802c3ea7fd9eda2e172ff0f73a3788afc640ff8093440ab71f1182d13783f96d5b70df SHA512 60987869275547b097ce8492164a443f4535d41d8b4453da3aadf96af536dd1ed6148fbb7100959e5ca7f560b2333359c9256e5d76a71e98aa6e3ccd808df051
 EBUILD symfony-finder-3.2.8.ebuild 960 BLAKE2B b9be05dabce7f2b73f61063d51b69ac6b48825113c9f5c72e77a09489a76686ef3cbaf410a0fb6fa5ce189d9e339a0b855668b56eb08e3ca58fc18b3bd71fcbf SHA512 55c995258c4405fa2417ed1d14d19cb9a15716e6e8489b682f8f96cc54f1cc864bc9e7f277f53a0947b6c52c438ab3e7e4b35e4e6f1b371b95a6ba34c71784c8
 EBUILD symfony-finder-3.4.28.ebuild 973 BLAKE2B 8feee88ca9bc72477f719e5c0182905116f8ded4bca3e678c6241833604559e22963fe5e26ce1e2b2134b06177e775ae3127a65d695bb767755636724ea34b69 SHA512 8745fdeb25cfa360259bd7d7477a3db2cd5b898738739aed7b0f7924963aa95da8502ffc1cafa6d2130f97c8f513847d4fbe1821251d9576fa716d42f47a8bca
+EBUILD symfony-finder-3.4.38.ebuild 973 BLAKE2B 00a1ef4f6214657e36cc2d219f4ff4f987f1112cd033aeb202db5a812f9f79c02372e44f8e7620724d9ed1328098bf9b7d626ea755160160ee12efada2864e4a SHA512 2f9dd1019426d37f7e1884ad69c58663c60f1f73400e24f2e1e1445b8d1c7955b578463c7f5b56b0680a7ae203ac500dc6db3d82ef00072ebf80d754d41af1da
 MISC metadata.xml 685 BLAKE2B feba013286ccce28abfb477e4c32c105bced39a175c00aab8c2413144100758914f93380418fbf9acce9c44ea9887b34b77cc674240edcac687449b1c5a7e36c SHA512 664abc5b0e4894c547f4d39ed3cc3c4f4b6526e0ad9dec4a83f43410121b2aaeccc969bf4393a899d309e71c21fd6e06df7f4547927a8ae1ee0b1382a8c5dc92
diff --git a/dev-php/symfony-finder/symfony-finder-3.4.38.ebuild b/dev-php/symfony-finder/symfony-finder-3.4.38.ebuild
new file mode 100644
index 000000000000..cf2ac3ad9a12
--- /dev/null
+++ b/dev-php/symfony-finder/symfony-finder-3.4.38.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Symfony Finder Component"
+HOMEPAGE="https://github.com/symfony/finder"
+SRC_URI="https://github.com/symfony/finder/archive/v${PV}.tar.gz -> symfony-finder-${PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-lang/php:*
+	dev-php/fedora-autoloader"
+DEPEND="test? ( ${RDEPEND} >=dev-php/phpunit-5.7.15 )"
+
+S="${WORKDIR}/finder-${PV}"
+
+PATCHES=( "${FILESDIR}"/${PN}-3.4.28-skip-file-time-sort-tests.patch )
+
+src_prepare() {
+	default
+	if use test; then
+		cp "${FILESDIR}/autoload.php" "${S}/autoload-test.php" || die
+	fi
+}
+
+src_install() {
+	insinto "/usr/share/php/Symfony/Component/Finder"
+	doins -r Comparator Exception Iterator
+	doins *.php "${FILESDIR}"/autoload.php
+	dodoc CHANGELOG.md README.md
+}
+
+src_test() {
+	phpunit --bootstrap "${S}/autoload-test.php" || die 'test suite failed'
+}
diff --git a/dev-php/symfony-process/Manifest b/dev-php/symfony-process/Manifest
index 2fc51974c640..deeeb3597652 100644
--- a/dev-php/symfony-process/Manifest
+++ b/dev-php/symfony-process/Manifest
@@ -1,4 +1,6 @@
 AUX autoload.php 305 BLAKE2B 2f3deeaeeea219b68e90d366779152d17ce734001f208d169c7e4b70cd1050a09225cd8a49b3028995862f6578a9cde3b9a4d4497598c2574f6ecc81db4ed5cf SHA512 339e20b7d5ea454a8d5dc25ebdd4690067f39966a985071fc584652b8df15c0513b2673107e6beee58c412e203f0fcef9915a93ffce6e62c78b3b5b6f3eb26bc
 DIST symfony-process-3.4.29.tar.gz 34684 BLAKE2B 87f79a17ac321b395a634f0b83a0d218c39a06f0b5b553904c1c00431ffaf94f7bd26aa015cd426f5ba7726f09328b4b1d4475f4f8c229eedc1d52fc3f0142c1 SHA512 9e19406cad79f51d4ec811460a762c3a5004679e53777ca37049f5d8eb73bc3b569e266bd11ecddfc42481d7f05a4850bd6901c3ec2dd1d398d5077cdbe2e0bd
+DIST symfony-process-3.4.38.tar.gz 34424 BLAKE2B d990ba77e1d1e9b00e1b22381c9b3c454d94a8705ff7bd9830b59a32108f590efbb7e434e0f11421ccb143aa72d659d7211062c07c0cb36d18aae1f01e073b3a SHA512 14ff5f874904166978cb4021c87fde42611f05505498a8257089f97ae6f65051427c0f8e720a28b57e64de436818967676e35ddfc273e86b809ea0bf590662af
 EBUILD symfony-process-3.4.29.ebuild 980 BLAKE2B 8c1858094e929565c68f17752abb7afce91f041848ac83df321fb0971f2af3c64afe4816b8ba1bbf38c49b2cd984e8ad2a8dc0a0afb114cbadc80e1db646cbf1 SHA512 d8ffa811b7f68ce0acce37fd7f1c4af08d8ff1ac9d9c1b4f1f19d7754b198e13f9b42e39bf236ea2d6c5c7dff3719fc5a4f023e5483d541cbcdba0a75cc03e8f
+EBUILD symfony-process-3.4.38.ebuild 980 BLAKE2B 09e7f76e081893252becde8b59b7704d34722c8869ae1874e919c75ad5ce06f6bca5e57dbc19eedda5b9d64c5dd73fba4d6801f95044185508181b3193ff9e41 SHA512 cb6af4ea246bf95536e58cf7737f9a17285fc8755b90a5dde54a42ccb1c666b9c448d3a2aadccbd67bdf55c7134a272534a182e6bb8534a93a1252bac9766fd6
 MISC metadata.xml 656 BLAKE2B b24f6c06a9b8eafa0e4855d25d863bdb10e06a701937661cde7bcbf5d0bacec793c6e6aa4be7d2cab34f711e07e5432f987ff401dfa6e517ef14664c7fbe07fb SHA512 6018e74e6aa1b03d8723f33f38fc8855f1ba1d4316472d960f4a296748a7aa9a6282c51c243b0cac98148ec9a921545c8a1947d5f32f4f5853ead46c9bcf19a0
diff --git a/dev-php/symfony-process/symfony-process-3.4.38.ebuild b/dev-php/symfony-process/symfony-process-3.4.38.ebuild
new file mode 100644
index 000000000000..569fa48b0205
--- /dev/null
+++ b/dev-php/symfony-process/symfony-process-3.4.38.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+DESCRIPTION="Symfony Process Component"
+HOMEPAGE="https://github.com/symfony/process"
+SRC_URI="https://github.com/symfony/process/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="test"
+
+RDEPEND="
+	dev-lang/php:*
+	dev-php/fedora-autoloader"
+DEPEND="
+	test? (
+		${RDEPEND}
+		dev-php/phpunit )"
+
+S="${WORKDIR}/process-${PV}"
+
+src_prepare() {
+	default
+	if use test; then
+		cp "${FILESDIR}"/autoload.php "${S}"/autoload-test.php || die
+	fi
+}
+
+src_install() {
+	insinto "/usr/share/php/Symfony/Component/Process"
+	doins -r Exception/ Pipes/ ExecutableFinder.php InputStream.php \
+	LICENSE PhpExecutableFinder.php PhpProcess.php ProcessBuilder.php \
+	Process.php ProcessUtils.php "${FILESDIR}"/autoload.php
+	dodoc README.md
+}
+
+src_test() {
+	phpunit --bootstrap "${S}"/autoload-test.php || die "test suite failed"
+}
diff --git a/dev-php/symfony-yaml/Manifest b/dev-php/symfony-yaml/Manifest
index 90f43e1eb6a4..4ef4d2f8e4ce 100644
--- a/dev-php/symfony-yaml/Manifest
+++ b/dev-php/symfony-yaml/Manifest
@@ -1,4 +1,4 @@
 AUX autoload.php 276 BLAKE2B 1eac0f1626d3639f38c44ee0408a44c90961773c155a5ee40dc20060acac55fca1ceb6b07579d136120dd5070b1383677a7bee3134325eeba5e5ac62bf8b9694 SHA512 1b5cff9898160608f4fa4e639d73ee3f561136797a9d85216b9342c6a7b11cf4b5fe3dc548baf3494a0a9387761ffaa1f0bb09aa1ebac181705000cf6ac62a84
 DIST symfony-yaml-2.1.0.tar.gz 37056 BLAKE2B df1eb0164db026e8157ec8e61941b158b252c048349acc37a060ab44e27004653c3deafc48d6d99e61cda1d67978742d1dd7e74e144adf114d8bcc39610a2b9a SHA512 984fbd624d4bf70ae964da60d55b6d9883642eabce54f080c04d3d12b4d64e63f036683bc12052b0958bd4575f1b693f1453b2505e5e5666ddf2fb13c40e927f
-EBUILD symfony-yaml-2.1.0.ebuild 857 BLAKE2B 69db083200f890665eb28080dc1012340a62fb4ecc71a0e9f4c759b66a0754ca2f4abeaa3ed7e74ee3895d4b199e04b5942952cd2ae03a6e81d053088548a206 SHA512 e015c7d48e42385ea009b6cc9d3a2169e0b09670282506233c7ab0d7804f6fb51a706bfd89b0ff13f93682cc7ad31e329c15764f23933a013ff637d9c6e959eb
+EBUILD symfony-yaml-2.1.0.ebuild 851 BLAKE2B ed76ed8c57c0e6fc56cfc446d1bf3f03a12519df17797209893f44e54235ad48421bfc1c6a4095096efdc08884bab31236cdd2673c1ec924775d8047b51c2475 SHA512 5e37715ac2d0ea8ec8eec2b50fca1cb441d134e5a6c2038e54f428e0378c01a6ed5658dd37ac97c5b4bb5f55bf1df260d68a634eea00d50f0df59bee86d1f911
 MISC metadata.xml 642 BLAKE2B 3a3a88d5c5e4836915d9e34c2b5e8caa8a98a040be40b40224143381b632508c16a2352ef2a56a001af7293fb34022570e55c94590949a585f96df6c5106904a SHA512 69b107f86e884aa73cf8280bc3e375dfff7af3ea28dc844e874c5c47d5ff1604a1f285ef19d66f6c18eda2394344cec34fba32dfc0e079a602bd50699d5ddeb9
diff --git a/dev-php/symfony-yaml/symfony-yaml-2.1.0.ebuild b/dev-php/symfony-yaml/symfony-yaml-2.1.0.ebuild
index c43174b65320..cb87bb539e18 100644
--- a/dev-php/symfony-yaml/symfony-yaml-2.1.0.ebuild
+++ b/dev-php/symfony-yaml/symfony-yaml-2.1.0.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
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/symfony/yaml/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE="test"
 RESTRICT="test"
 
diff --git a/dev-php/theseer-tokenizer/Manifest b/dev-php/theseer-tokenizer/Manifest
index b4429648b990..ba343f82d7c6 100644
--- a/dev-php/theseer-tokenizer/Manifest
+++ b/dev-php/theseer-tokenizer/Manifest
@@ -1,6 +1,6 @@
 AUX autoload.php 740 BLAKE2B 1776060d0cbd86a165e293cf24ba31c7c6eef748f7d34681d110f1f99f62909f6619f4917743a995c2c9f2edc5de99b5762d3997d09f14c66a6bfe3569f5e17a SHA512 23ec36f9afc24a4df46a866376db86727127351a1c6d9c16f864804ff31fe64c0c0c8a8306fb1a91fce0dd165cbf5fb02cbe545b4f00dc96bcff2dcce7a82b7c
 DIST theseer-tokenizer-1.1.0.tar.gz 10163 BLAKE2B b2360f901d60f784db2045912707a8e293a55967d60d4e72168a1c4b0c9a2d5bdb739fbed9bfec02075476e7bf6762eb1cc7e36870b84fcc341b609527579ca2 SHA512 8b500565dc0d6c8513db3aa72a7ee1fa04510a712ce9b0977feccddc6b2dae53825e39182d43508e196f326776115789e81697116418f6f9f63d08f0c05d0543
 DIST theseer-tokenizer-1.1.3.tar.gz 10553 BLAKE2B 4bed1623abe110cec432a97fbd28752618420a188b450c935c77b5771d6986be9a51c8f100fd81a89d892b0c1e2b46b0124e3c35e3cbe2138eee2d520c74933a SHA512 e29fd41b311bac8021f4c0593d79a9c1bde4b6ccf4774e94d27a0e8a97bac3844109f9312c4aab6e239365630394b602b56a084c291dc13fb439dc8ac22944e3
-EBUILD theseer-tokenizer-1.1.0.ebuild 838 BLAKE2B 7330514a58ed439162ba8e4673ecf1bb9c2a754cd9279ee457b5667ba91222ca4bb79c756501e5cfcaf378e816931fffb80eb9242c36a3106d9498cb720a4f29 SHA512 45cf1d3481aeb6950dcac62c378c10af0ffcdbd6e0a412310008b0fa2095704adeca25e90c0e62f312f5b055ef368ef52c5f8ffbfeb6edf34511ff33f877ff45
-EBUILD theseer-tokenizer-1.1.3.ebuild 838 BLAKE2B 1e960b74da6e8dd886dcd57a1c3796ea11db25ac2e1bcaa33e788bf42362c3f06512a2f49b88c6266c4e5536ff69098dbfc64850a728ca6e5b17881060818cd6 SHA512 a354444d077638e3b2cb810684b3635bfb19e1f0ab8ad7d9e4dc1db22d8854cd12baead07a60548d73299b31a1172a11bbc2fa649625a38085f015435c07c94c
+EBUILD theseer-tokenizer-1.1.0.ebuild 834 BLAKE2B 79ca12311b476cf6528502bfb4302b7e4d65a96c20e9c5c18494bb52d898181099730d78dbffaa6d0e2060c993b85c2629c84269c1e9629df396058c5f2b80ce SHA512 9cb0686954506ccdc4ce6a2e972bf54c482e260205700e521085609872c88f7d59fc966077a1ba062d621502a2f59d5048f2af2279ef08061f7b42a19df655e2
+EBUILD theseer-tokenizer-1.1.3.ebuild 834 BLAKE2B 02ed175c1a5d4c8395b1d049125316dc19a1b87404ca27950869a0ea7e98972bee58ea656f386341f6d623627c797722e69861f59dc96c280296423cbdfb3ac2 SHA512 9b5fff439ac870a1cb80cab1bd048207616bd810e627e4c8c1ab72080565888e12b626d670292d68574a814444a6e299c4feaf073aef1b6e4df0407e9656c95d
 MISC metadata.xml 321 BLAKE2B c4c16164af66494e41a3bfe90f4943c905560440eaea9de1a4f82148e1cdc353f9b6871efb618af4ab7ddb8c9fa1dfd931e0610b79c41750744aa6e5dd70580d SHA512 75a4155fe11d88a9d1bde7d46f68954c175c2b8d89872bd53496f11ffd22aa4cbf9f487e36217522e7201aae85c089422a3c7bea3fdec21fc3048b20aad6e5a9
diff --git a/dev-php/theseer-tokenizer/theseer-tokenizer-1.1.0.ebuild b/dev-php/theseer-tokenizer/theseer-tokenizer-1.1.0.ebuild
index dfed89b2df76..f55bd6c3895a 100644
--- a/dev-php/theseer-tokenizer/theseer-tokenizer-1.1.0.ebuild
+++ b/dev-php/theseer-tokenizer/theseer-tokenizer-1.1.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
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/theseer/tokenizer/archive/${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-php/theseer-tokenizer/theseer-tokenizer-1.1.3.ebuild b/dev-php/theseer-tokenizer/theseer-tokenizer-1.1.3.ebuild
index 5e52b63d58ae..88e27eb644ac 100644
--- a/dev-php/theseer-tokenizer/theseer-tokenizer-1.1.3.ebuild
+++ b/dev-php/theseer-tokenizer/theseer-tokenizer-1.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
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/theseer/tokenizer/archive/${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-php/webmozart-assert/Manifest b/dev-php/webmozart-assert/Manifest
index d10fe7ee0742..6c09e6ad52b8 100644
--- a/dev-php/webmozart-assert/Manifest
+++ b/dev-php/webmozart-assert/Manifest
@@ -1,6 +1,6 @@
 AUX autoload.php 248 BLAKE2B c849a044a627ed56e60c90aa46711a63507f3eaa5837234d0ed02136f1c99f55d28d7c216830d9ed71290bcfabd7ce4ba47ff1f84d454e98181bbdb809eead27 SHA512 3fcb244b4801ae29b4972d3e1008570f2bd392339539d0d6cff465b0724f9df581935a0d2e2ad4369bf7350678e24d624ec63a2ce966ded0cb4f60d5c02becbd
 DIST webmozart-assert-1.2.0.tar.gz 11866 BLAKE2B 86cb0f299efff9822ea79964153b17337eac3e17a968b5201680186cfb3f6721b2ca561e041e71b304c6d29d227b446f7f52b65d5a6fc490c8535dd4fee0160c SHA512 36bae648cfe5bbd258d738574a820ea3de2e95b59700d556dd5eadbb1657bc09a7e73000e3436d020e060ecd2a99944199795f315a278acbeeea90570b0a4a22
 DIST webmozart-assert-1.4.0.tar.gz 9241 BLAKE2B bbe5d42732c99700f11db6a3a8b6d6753d60b3e6fbfb8412383459199139f31e3ec55e4abee03295adea19c9c48edb0f13a11597b654fdd0de0a7823ed545586 SHA512 1ed2328de800bb98b7c00264009182934006ae146d86aa313f3478b9f3a7e6eed9dee026ed80d18393724840711ecd9891ee34178676470d12cac8124f819309
-EBUILD webmozart-assert-1.2.0.ebuild 657 BLAKE2B 10091de433a696b2d142342daeda0e6c3b4b536d9128de2f1455ef2b30ab07abe7e701e323301df586bb32fcfc6c4332a2ccbbad13f23aa4447a7e12ef84a061 SHA512 5f73c0b90e10abf9b24c79263b11ddad604e45c339a62b5d593411bae0fbea6fe18946f5983b98bad8f8935c6840125cc92c57dd12b0d3cdee275093244451c6
-EBUILD webmozart-assert-1.4.0.ebuild 664 BLAKE2B 25dadb510d384925f306eef2a41fc326c0368ebd45b06eb29b4ad4d1a165e4ac0cbf9fe7a5a4575439c5c4e899bac0ef8968f7c2406cd1e46c8d1a436f277036 SHA512 a34367b866bbfc1ee923fcd179282070c5b044550b45b1fec6082596b53bf2756a95d3ac5279ed131794f401d4fbfa64114dddf52469b6f9bd76cdda200bbc5f
+EBUILD webmozart-assert-1.2.0.ebuild 651 BLAKE2B 74f71125c87a71a58ac404a55f685870be9fadd78e3a32f6c7938da5b038fdc58dc3b020e7f1375e8b537128f70d4c769b2578b876c882f35d169c1510439bca SHA512 69c7111d18de455db50727e8f315768bf21e452979de0d5f2e80a1dfa3b65d59f6eb224c0866c4c5d897f5252d0337ac2509270615517b17b8e95c8d0537f309
+EBUILD webmozart-assert-1.4.0.ebuild 660 BLAKE2B aa39d00b2bc04c94fc3429bc16cdf8674eaa9cd135554c87e1b247fd5ee6ea762bf5deab1681ab8c36c1c68c7705f20814affb2e40ef70144ab36d645c8a40be SHA512 03798afbc67ba06f1473d4b8003e3cb6818e4a81bf7075f43af2a1bb676da155507f57470154bd825af175a95fb5e9321d4ebaccf96b141f01670964ee633b50
 MISC metadata.xml 314 BLAKE2B 4fd853abe0d4a1c6d7f1e64b55116e8e02d4b800ec5ef7d7026a004d634b5c50dc40f8f826465dae59138cc1bad91ff842cb0cca348fb8d8acc9b3a75ca8cb4c SHA512 fad867b572c3a97beb2cc361fccb6cbfe6ca7c9bd421937c99783f25287cd2017df54b8d7b5f067a1f65528d3bb284140a9decc3701e2ef753cf6eaa4c2511a1
diff --git a/dev-php/webmozart-assert/webmozart-assert-1.2.0.ebuild b/dev-php/webmozart-assert/webmozart-assert-1.2.0.ebuild
index ea11955c91fb..2aa48ea7b94c 100644
--- a/dev-php/webmozart-assert/webmozart-assert-1.2.0.ebuild
+++ b/dev-php/webmozart-assert/webmozart-assert-1.2.0.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
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/webmozart/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-php/webmozart-assert/webmozart-assert-1.4.0.ebuild b/dev-php/webmozart-assert/webmozart-assert-1.4.0.ebuild
index 77df9aa06b41..fcfe27496da6 100644
--- a/dev-php/webmozart-assert/webmozart-assert-1.4.0.ebuild
+++ b/dev-php/webmozart-assert/webmozart-assert-1.4.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="7"
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/webmozart/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE=""
 
 S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-php/xdebug-client/Manifest b/dev-php/xdebug-client/Manifest
index d92744937ccd..91a8ae0c9971 100644
--- a/dev-php/xdebug-client/Manifest
+++ b/dev-php/xdebug-client/Manifest
@@ -1,5 +1,9 @@
 DIST xdebug-2.6.1.tgz 283961 BLAKE2B 4478d591591102a9efa248820831e4d43d89eb9b80379c92fe85c888377a31d855ac4ea98c13ad87da68f7e7f659483cfa36fd4651f245d5603fcada2e2fcf73 SHA512 31f26e592b3888d7cc74c6a7c51e0cc1151cf8a32100dda78098fb5b3e307cf8d0445b97247986c75b303a787f89b3937bc042dc52f19ca995753a6843bbd80b
 DIST xdebug-2.9.2.tar.gz 432926 BLAKE2B 3d524e5a1aec0621389970e80cdc23dfd40a17113ad09294de65290531cac1b33cbc248be341e0c29d9ebb825be25dd6d6b65b9ebcca0c2c3ca43784d2bf9d50 SHA512 ef1780f34572ea47de7e107b5120a0ec640e0ce4ec2a1c98c128c4f69ec9916879d82b11d2eb94d9630ed27b2d20afec7ccda9f79040d47dbaba9e1933331d03
+DIST xdebug-2.9.3.tar.gz 434509 BLAKE2B dd6a42518e9100db32a4858f131fc5cd8f6ed715bbf16a8d20fbba40b7503a897dd6d010af81d0001301b999a64b5d67b193c72a456e396b54ddd61823556d57 SHA512 ec77a036e622a867d4ef46aa844d4d3a2b9ce04c8ce64300451f50539c9889dd10cec96b18292268540e2aee0260caeffbd9fa03abd24891b4c9fe68d02598d5
+DIST xdebug-2.9.4.tar.gz 434622 BLAKE2B bd0d0c6a46867ffba88693f142346d11b5abfab3254c549b74ff9169536c42903b1fb1cb94c3344060590b63e287878ea05c6ef7ad8343234bada3857e0dbe75 SHA512 cf19fb9fd12c32e04c18f296694d0667dfe6e14617da932804d17526c88ab19dd2307ad43d036a8c0cb1f871a964523473879da8815f346faf83ec3b9e3952e3
 EBUILD xdebug-client-2.6.1.ebuild 606 BLAKE2B ed52f2ee0fa29ad7c1d6eded2a57c4461e0bce96017084c82ce04f334bc7df458f9a343191969e71f37eabb6f7e30522241942548e388ed516393f6844311cb2 SHA512 e6fa101dd1a18fdd60de9ca6c246a62956c766ceeeb87a11f4f6d7a0f5700137e7dca8c4057a30467a39cc227bde15d4eabf1260effde54b460086b6292bb7ab
 EBUILD xdebug-client-2.9.2.ebuild 818 BLAKE2B 8cb831537f4919e004b7b6b683d9cca39d3abc7a82a1ca22181e0d626bd0781396128fe8d6fa6ec8396b7025460f3b7e4e295126489c6b85ce8b8f8347b463f2 SHA512 7440d82ecf5685dc1832e34912aa9aff85e0bdb2da42ee5fd02249aa3e07945b3ac095300bdd3344e0583d5a64c58abe28e5cdbf4be96131b7c90db840e663ac
+EBUILD xdebug-client-2.9.3.ebuild 818 BLAKE2B 8cb831537f4919e004b7b6b683d9cca39d3abc7a82a1ca22181e0d626bd0781396128fe8d6fa6ec8396b7025460f3b7e4e295126489c6b85ce8b8f8347b463f2 SHA512 7440d82ecf5685dc1832e34912aa9aff85e0bdb2da42ee5fd02249aa3e07945b3ac095300bdd3344e0583d5a64c58abe28e5cdbf4be96131b7c90db840e663ac
+EBUILD xdebug-client-2.9.4.ebuild 818 BLAKE2B 8cb831537f4919e004b7b6b683d9cca39d3abc7a82a1ca22181e0d626bd0781396128fe8d6fa6ec8396b7025460f3b7e4e295126489c6b85ce8b8f8347b463f2 SHA512 7440d82ecf5685dc1832e34912aa9aff85e0bdb2da42ee5fd02249aa3e07945b3ac095300bdd3344e0583d5a64c58abe28e5cdbf4be96131b7c90db840e663ac
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/xdebug-client/xdebug-client-2.9.3.ebuild b/dev-php/xdebug-client/xdebug-client-2.9.3.ebuild
new file mode 100644
index 000000000000..ad1c2866a297
--- /dev/null
+++ b/dev-php/xdebug-client/xdebug-client-2.9.3.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+
+MY_PN="xdebug"
+MY_PV="${PV/_/}"
+MY_PV="${MY_PV/rc/RC}"
+
+inherit autotools
+
+DESCRIPTION="Xdebug client for the Common Debugger Protocol (DBGP)"
+HOMEPAGE="https://xdebug.org/"
+# Using tarball from GitHub for tests
+#SRC_URI="http://pecl.php.net/get/xdebug-${MY_PV}.tgz"
+SRC_URI="https://github.com/xdebug/xdebug/archive/${MY_PV}.tar.gz -> ${MY_PN}-${PV}.tar.gz"
+LICENSE="Xdebug"
+SLOT="0"
+IUSE="libedit"
+
+S="${WORKDIR}/${MY_PN}-${MY_PV}/debugclient"
+
+DEPEND="libedit? ( dev-libs/libedit ) net-libs/libnsl:0="
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_with libedit)
+}
+
+src_install() {
+	newbin debugclient xdebug
+}
diff --git a/dev-php/xdebug-client/xdebug-client-2.9.4.ebuild b/dev-php/xdebug-client/xdebug-client-2.9.4.ebuild
new file mode 100644
index 000000000000..ad1c2866a297
--- /dev/null
+++ b/dev-php/xdebug-client/xdebug-client-2.9.4.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+
+MY_PN="xdebug"
+MY_PV="${PV/_/}"
+MY_PV="${MY_PV/rc/RC}"
+
+inherit autotools
+
+DESCRIPTION="Xdebug client for the Common Debugger Protocol (DBGP)"
+HOMEPAGE="https://xdebug.org/"
+# Using tarball from GitHub for tests
+#SRC_URI="http://pecl.php.net/get/xdebug-${MY_PV}.tgz"
+SRC_URI="https://github.com/xdebug/xdebug/archive/${MY_PV}.tar.gz -> ${MY_PN}-${PV}.tar.gz"
+LICENSE="Xdebug"
+SLOT="0"
+IUSE="libedit"
+
+S="${WORKDIR}/${MY_PN}-${MY_PV}/debugclient"
+
+DEPEND="libedit? ( dev-libs/libedit ) net-libs/libnsl:0="
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_with libedit)
+}
+
+src_install() {
+	newbin debugclient xdebug
+}
diff --git a/dev-php/xdebug-handler/Manifest b/dev-php/xdebug-handler/Manifest
index 4be104a37011..a002ec8b1377 100644
--- a/dev-php/xdebug-handler/Manifest
+++ b/dev-php/xdebug-handler/Manifest
@@ -1,6 +1,8 @@
 AUX autoload.php 273 BLAKE2B e898a6f52339faf4a22f81207bef6a9c8620e5756b30c462f420f8b6c865ee7af33f3d23e7b251e096f25882310789da5e2f50e064ab614d59eede463befc26a SHA512 a7a63031a709deaaa2cc8a673f22252df716fd7e2d531e6207052dc3acb361cb8384e7456b949e19e00753b9693fdd0d7c65e6105c7f32d86b8800b4373ab57d
 DIST xdebug-handler-1.3.0.tar.gz 12363 BLAKE2B ad89580e57728a444958d72f236fee14665f6fbed998018a28b181cdfc3a448da0a06dc335c3d95413eff6f6b92fc3d44ac8c03da282eb3dc65ae14600430825 SHA512 ed0206982c5ffab3c8ff56dcf8055230aaa358fbe89c15880cfce33abc27adb3b13f75bf7d78988f6bae4d0d072c66f557cd93082e89e7ca7993b257c04a2c61
 DIST xdebug-handler-1.3.1.tar.gz 12589 BLAKE2B fcee0a2412473f5e7a07defa96b991803728f831c8ab0dfa053c3ff8671a2dd187d5199e51ac90579830f5a005038411c2097be8a1f1370e8e06d090922f508a SHA512 a00d9cb8e23cd6bbad6c25f82c8db314451a88f49d90e755a9c81fa57794ecc79612481e031d60cdb2ee4fd4e256ffc02e847c76089daf720f8811659799131e
+DIST xdebug-handler-1.4.1.tar.gz 13190 BLAKE2B 05637bbe52896f779026258e5b69d6fae03d575e8a497ea983fe67354af6277a7769ec32ce3c10682ce2f654c135086710836005561211b04958546180228d50 SHA512 ac79debf0cb6a31f90354115b6fda1d373b148691dd0b86044ae7a257f2fc6998a773e1b150519d12e6dcbeddf326ed38f9b8fbdc0dec736ebfc4cc6e83a462d
 EBUILD xdebug-handler-1.3.0.ebuild 583 BLAKE2B ca7e5750e9cd190cdf2b0aacda0ecb74bf562a624a0845ab9e85747e83f306d17e917d2043bef6902791e3476e2f4593efea1283b08287592ae460aab45ea5bc SHA512 418ffe4a0c15365922b146cdfbb282d7fdb3776c39aeda149b087ea2a6904a598a1c1f85695cdd12a0e94a136ea3e87ad4e363ec2d90e5be076b135d1b5732cf
 EBUILD xdebug-handler-1.3.1.ebuild 583 BLAKE2B ca7e5750e9cd190cdf2b0aacda0ecb74bf562a624a0845ab9e85747e83f306d17e917d2043bef6902791e3476e2f4593efea1283b08287592ae460aab45ea5bc SHA512 418ffe4a0c15365922b146cdfbb282d7fdb3776c39aeda149b087ea2a6904a598a1c1f85695cdd12a0e94a136ea3e87ad4e363ec2d90e5be076b135d1b5732cf
+EBUILD xdebug-handler-1.4.1.ebuild 583 BLAKE2B ca7e5750e9cd190cdf2b0aacda0ecb74bf562a624a0845ab9e85747e83f306d17e917d2043bef6902791e3476e2f4593efea1283b08287592ae460aab45ea5bc SHA512 418ffe4a0c15365922b146cdfbb282d7fdb3776c39aeda149b087ea2a6904a598a1c1f85695cdd12a0e94a136ea3e87ad4e363ec2d90e5be076b135d1b5732cf
 MISC metadata.xml 476 BLAKE2B b4633f1f38fbb6e7a1a62cae819e0ac0ad72171efea4a371535b0728cda77f4ed25a98af77552125b9b02b8dfe2e8c053b23bd0af32286d0faffd626072bfa2a SHA512 45602542f487a5670b3ff938809bac80bdb5c6875549f31704a0e3b319128b685c51aa6fba145b393be20ead836582f24ccce3fd212c9c2c09979c6024524880
diff --git a/dev-php/xdebug-handler/xdebug-handler-1.4.1.ebuild b/dev-php/xdebug-handler/xdebug-handler-1.4.1.ebuild
new file mode 100644
index 000000000000..806a747fbd38
--- /dev/null
+++ b/dev-php/xdebug-handler/xdebug-handler-1.4.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Restart a CLI process without loading the xdebug extension"
+HOMEPAGE="https://github.com/composer/xdebug-handler"
+SRC_URI="https://github.com/composer/xdebug-handler/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-lang/php:*
+	dev-php/fedora-autoloader
+	>=dev-php/psr-log-1.0.2"
+
+src_install() {
+	insinto /usr/share/php/Composer/XdebugHandler
+	doins src/*.php "${FILESDIR}/autoload.php"
+	dodoc README.md
+}
diff --git a/dev-php/xdebug/Manifest b/dev-php/xdebug/Manifest
index 3279d99e2f00..68b5229a176e 100644
--- a/dev-php/xdebug/Manifest
+++ b/dev-php/xdebug/Manifest
@@ -1,6 +1,10 @@
 AUX 2.6.0-xdebug.ini 1623 BLAKE2B 6d8c3352dc55778e29cce92794ae36421a6e696244e3c7e1dd4e98d2ff0a6c86ce91e4e4ff2749cd58135e838ff61e2cad5bca8879caf9928d82e2f4bf17af80 SHA512 fe715f986fc5fbc0b92f8d708281feb5b9f6e0a054537ad7883c11acd035d0ddfc20812d64b35a616e0e8048b6332a097a0103329e2c96221571eeecbaaa963f
 DIST xdebug-2.6.1.tgz 283961 BLAKE2B 4478d591591102a9efa248820831e4d43d89eb9b80379c92fe85c888377a31d855ac4ea98c13ad87da68f7e7f659483cfa36fd4651f245d5603fcada2e2fcf73 SHA512 31f26e592b3888d7cc74c6a7c51e0cc1151cf8a32100dda78098fb5b3e307cf8d0445b97247986c75b303a787f89b3937bc042dc52f19ca995753a6843bbd80b
 DIST xdebug-2.9.2.tar.gz 432926 BLAKE2B 3d524e5a1aec0621389970e80cdc23dfd40a17113ad09294de65290531cac1b33cbc248be341e0c29d9ebb825be25dd6d6b65b9ebcca0c2c3ca43784d2bf9d50 SHA512 ef1780f34572ea47de7e107b5120a0ec640e0ce4ec2a1c98c128c4f69ec9916879d82b11d2eb94d9630ed27b2d20afec7ccda9f79040d47dbaba9e1933331d03
+DIST xdebug-2.9.3.tar.gz 434509 BLAKE2B dd6a42518e9100db32a4858f131fc5cd8f6ed715bbf16a8d20fbba40b7503a897dd6d010af81d0001301b999a64b5d67b193c72a456e396b54ddd61823556d57 SHA512 ec77a036e622a867d4ef46aa844d4d3a2b9ce04c8ce64300451f50539c9889dd10cec96b18292268540e2aee0260caeffbd9fa03abd24891b4c9fe68d02598d5
+DIST xdebug-2.9.4.tar.gz 434622 BLAKE2B bd0d0c6a46867ffba88693f142346d11b5abfab3254c549b74ff9169536c42903b1fb1cb94c3344060590b63e287878ea05c6ef7ad8343234bada3857e0dbe75 SHA512 cf19fb9fd12c32e04c18f296694d0667dfe6e14617da932804d17526c88ab19dd2307ad43d036a8c0cb1f871a964523473879da8815f346faf83ec3b9e3952e3
 EBUILD xdebug-2.6.1.ebuild 1032 BLAKE2B 71cd322d334d47194e8fa317e5f0722fa944f4612c2bd45cb1d56241495c891702ca2ad5e647e1356af0d51307f7e752c1e37f57b5044ea8f085209332091cb1 SHA512 b0ffe7473f0c0e79d470fd6f7ab9526918817bb6256a88b69e1f53e99d2e8270530174e991093b8be8af3ef54d6f85e3d5a5affd9fe703e51babeaaf5c431aa8
 EBUILD xdebug-2.9.2.ebuild 1155 BLAKE2B 82a9636995566fd9143a02281c2114f98dfdea9f6d721f3e5916dbeac3d6d07d1a24a73cad866fad8729c472daa416c89ab95c41f0d84e258d4075a5a95dadfb SHA512 76d4db91e8346cc5a8ce97abe00994ac5773b9c55359ff596d61b6e2bf73539fbe968dc6aa00f98b372bc390381c9ec70f6ec0db1d92e3de20e3a1d82f6275be
+EBUILD xdebug-2.9.3.ebuild 1155 BLAKE2B 82a9636995566fd9143a02281c2114f98dfdea9f6d721f3e5916dbeac3d6d07d1a24a73cad866fad8729c472daa416c89ab95c41f0d84e258d4075a5a95dadfb SHA512 76d4db91e8346cc5a8ce97abe00994ac5773b9c55359ff596d61b6e2bf73539fbe968dc6aa00f98b372bc390381c9ec70f6ec0db1d92e3de20e3a1d82f6275be
+EBUILD xdebug-2.9.4.ebuild 1155 BLAKE2B 82a9636995566fd9143a02281c2114f98dfdea9f6d721f3e5916dbeac3d6d07d1a24a73cad866fad8729c472daa416c89ab95c41f0d84e258d4075a5a95dadfb SHA512 76d4db91e8346cc5a8ce97abe00994ac5773b9c55359ff596d61b6e2bf73539fbe968dc6aa00f98b372bc390381c9ec70f6ec0db1d92e3de20e3a1d82f6275be
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/xdebug/xdebug-2.9.3.ebuild b/dev-php/xdebug/xdebug-2.9.3.ebuild
new file mode 100644
index 000000000000..95745e2c779d
--- /dev/null
+++ b/dev-php/xdebug/xdebug-2.9.3.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PHP_EXT_NAME="xdebug"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="yes"
+PHP_EXT_INIFILE="2.6.0-xdebug.ini"
+
+USE_PHP="php7-2 php7-3 php7-4"
+
+MY_PV="${PV/_/}"
+MY_PV="${MY_PV/rc/RC}"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+inherit php-ext-source-r3
+
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+
+DESCRIPTION="A PHP debugging and profiling extension"
+HOMEPAGE="https://xdebug.org/"
+# Using tarball from GitHub for tests
+#SRC_URI="https://pecl.php.net/get/${PN}-${MY_PV}.tgz"
+SRC_URI="https://github.com/xdebug/xdebug/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="Xdebug"
+SLOT="0"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}
+		~dev-php/xdebug-client-${PV}"
+DOCS=( README.rst CREDITS )
+PHP_EXT_ECONF_ARGS=()
+
+pkg_postinst() {
+	ewarn "We have set xdebug.default_enable to 0 (off), as xdebug can be"
+	ewarn "installed as a dependency, and not all users will want xdebug to be"
+	ewarn "enabled by default. If you want to enable it, you should edit the"
+	ewarn "ini file and set xdebug.default_enable to 1. Alternatively you can"
+	ewarn "call xdebug_enable() in your code."
+}
diff --git a/dev-php/xdebug/xdebug-2.9.4.ebuild b/dev-php/xdebug/xdebug-2.9.4.ebuild
new file mode 100644
index 000000000000..95745e2c779d
--- /dev/null
+++ b/dev-php/xdebug/xdebug-2.9.4.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PHP_EXT_NAME="xdebug"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="yes"
+PHP_EXT_INIFILE="2.6.0-xdebug.ini"
+
+USE_PHP="php7-2 php7-3 php7-4"
+
+MY_PV="${PV/_/}"
+MY_PV="${MY_PV/rc/RC}"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+inherit php-ext-source-r3
+
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+
+DESCRIPTION="A PHP debugging and profiling extension"
+HOMEPAGE="https://xdebug.org/"
+# Using tarball from GitHub for tests
+#SRC_URI="https://pecl.php.net/get/${PN}-${MY_PV}.tgz"
+SRC_URI="https://github.com/xdebug/xdebug/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="Xdebug"
+SLOT="0"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}
+		~dev-php/xdebug-client-${PV}"
+DOCS=( README.rst CREDITS )
+PHP_EXT_ECONF_ARGS=()
+
+pkg_postinst() {
+	ewarn "We have set xdebug.default_enable to 0 (off), as xdebug can be"
+	ewarn "installed as a dependency, and not all users will want xdebug to be"
+	ewarn "enabled by default. If you want to enable it, you should edit the"
+	ewarn "ini file and set xdebug.default_enable to 1. Alternatively you can"
+	ewarn "call xdebug_enable() in your code."
+}
author	V3n3RiX <venerix@redcorelinux.org>	2020-04-12 03:41:30 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2020-04-12 03:41:30 +0100
commit	623ee73d661e5ed8475cb264511f683407d87365 (patch)
tree	993eb27c93ec7a2d2d19550300d888fc1fed9e69 /dev-php
parent	ceeeb463cc1eef97fd62eaee8bf2196ba04bc384 (diff)