gentoo resync : 25.11.2020

27 files changed, 381 insertions, 755 deletions

diff --git a/dev-php/Manifest.gz b/dev-php/Manifest.gz
index 274d5d728a14..a3a83475aac0 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 069cb395b15a..5c3b1affe056 100644
--- a/dev-php/PEAR-Archive_Tar/Manifest
+++ b/dev-php/PEAR-Archive_Tar/Manifest
@@ -1,3 +1,5 @@
 DIST Archive_Tar-1.4.10.tgz 21481 BLAKE2B d6658f344baee4c70aedc7c8e59d8e4e481a5c2fbd72920d65943e2d9cf3a6d955a77c62c58fe3391a9250206f105d96b2cf186cefd13a261269d29b27722350 SHA512 265a00b0e71e718a0a0f1f5640b2a95c3b5f3a62235477a22ef762109cb2f6dbdaa0319f2f5aed5fdd9b4f52317bf761b3fcefd03a82c941e71e04c1a3e4d2a9
+DIST Archive_Tar-1.4.11.tgz 21556 BLAKE2B f7e450f4581400159099dba023192ec4026da8867c675119001085651c20315523a58180e0ccd4528e3b1764e222945055702e0fd8e42bb5976b891230351f29 SHA512 a67ff191eb1d814094fc752b58b5d4b4d3db0fd2476fce403f8e5cac49a35fd1219167817dc84d6f957af87d326435aef000e2e0b16357a0d051ab407b76d2cc
 EBUILD PEAR-Archive_Tar-1.4.10.ebuild 747 BLAKE2B 99bbb190966cc20f9f249b140ae738fc588f7caa579f0089e24f090ce149d2d788a5c9dc5b8cff9835d8e6dbc278919cee1f7748319e8755e1aaa1761be1a7c9 SHA512 9ef3018d22c99f8116e5192dec05314c5aa251f42b91c6b828398663e5eb7926cbd343b90de9e01b236245df93a6508ef30e7338c9b3ffc5fd535772dbc84680
-MISC metadata.xml 313 BLAKE2B 96717f88c6747b4b6dc814ffee022a1bfe7965ca71f0d1dff4acae773d37ba43d21b92343993b19c753360651ae63c7e0cea16d51c12d4fee03d6852a50be7ff SHA512 189683deca6b9b76a4ca070938afa484580b57a8c799f49f26e9b123165d545ab6aec31bc2b96400cfc5390f3837477a8d58b461e317ab14bf1152292880ece1
+EBUILD PEAR-Archive_Tar-1.4.11.ebuild 754 BLAKE2B e862af920b6f550e73fafef286cd5de5d1148e7233a58056913c1e77acd8721fd1c7f88f8ea9c6c91f059d0d5f99967c55640e5f8fef5d0b8351cddf02e584ab SHA512 be1307b048050ee7ff0c87ee833e1afbd24da2af7e4c71c5e3f4501688375df75efe206308fd3820d961e132097f9692f19e42d2be810a05e1f3a5f422d1dfd4
+MISC metadata.xml 337 BLAKE2B def75fcf8f3291007347252cd8885def7980837bf24cef97f5709ff0166792bb6597d2d0395425e897a8a0afee7fc5436ecfd745e66e4b9147f76f93cb92f923 SHA512 c77cfe795995f88c94b790ac8900e1366e2d4b4adf12f5d18284687145bd37177052ee6f39bf66fe97d8f254366b83019ba51632e15cbfdf7c93d7f08d8f48e7
diff --git a/dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.4.11.ebuild b/dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.4.11.ebuild
new file mode 100644
index 000000000000..ec77b9463d55
--- /dev/null
+++ b/dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.4.11.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="${PN/PEAR-/}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Tar file management class"
+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 ~sparc ~x86"
+IUSE=""
+
+# bzip2 and zlib are needed for compressed tarballs, and there's one
+# call to preg_match to test paths against a pattern of files and
+# directories that will be ignored.
+RDEPEND="dev-lang/php:*[bzip2,pcre(+),zlib]"
+PDEPEND="dev-php/PEAR-PEAR"
+DEPEND=""
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+	insinto /usr/share/php
+	doins -r Archive
+
+	dodoc docs/*
+}
diff --git a/dev-php/PEAR-Archive_Tar/metadata.xml b/dev-php/PEAR-Archive_Tar/metadata.xml
index 75a6ba446036..76c401f1f8cd 100644
--- a/dev-php/PEAR-Archive_Tar/metadata.xml
+++ b/dev-php/PEAR-Archive_Tar/metadata.xml
@@ -8,4 +8,5 @@
 	<upstream>
 		<remote-id type="pear">Archive_Tar</remote-id>
 	</upstream>
+	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/dev-php/PEAR-Net_DNS2/Manifest b/dev-php/PEAR-Net_DNS2/Manifest
index 128d620fab61..a856ebb2963a 100644
--- a/dev-php/PEAR-Net_DNS2/Manifest
+++ b/dev-php/PEAR-Net_DNS2/Manifest
@@ -1,3 +1,5 @@
 DIST Net_DNS2-1.4.4.tgz 83242 BLAKE2B 107e57406fcc308e3f83c71df0425081ba3d6638f457877e5ed42bfea8abed65ee520e228a379b71cc1462960e995d9c6592ad03afad78b36191f03d1f1513d6 SHA512 fa9df14585b3e41b13f4b52521b8fc05b239c39bccd4baf776dc632913777962dc527b9ff5de2337c9c0d78c6908d555d14167991dfe368426aee57a415f7e78
+DIST Net_DNS2-1.5.0.tgz 81188 BLAKE2B 5cddc998a376cd79adaaaa1e8cd5198ed463563159d342916adb0c77546dbf4d07214a55ba71b8c0e375d47e4ba6e96a847bc71e7ddfead892dd2c57a010d40c SHA512 c0125c1c8bb7ce6256d0b57605de0adc3a2a706f4cc22624f0fac88629aa0f138cdb258742f2d2224893c565e2d7dde9f14f2a4dde86831b2e015473c28d5e4d
 EBUILD PEAR-Net_DNS2-1.4.4.ebuild 362 BLAKE2B 0b208e032ffb7a9b9deb45839b1e840f43df0961066bc3d9111894652d7168dbe260b2537b5df05bb96acd8e30b8b6d8c755e63278faf2fa652cb35c5c478436 SHA512 bec210587978a1523cbe6f9c4cb24e14dc870ac9d22921177524d7c4c333bbf4add241b5de24c2e5bef9ae0f61d827615c6bfbda0554a5da2b222811426420fe
+EBUILD PEAR-Net_DNS2-1.5.0.ebuild 359 BLAKE2B 03668387f46ceeb41be0bf98b9e1490b982ef06277ef0f2d23cee3c2fb4b6dbaa4289113e1d1e8740c120cb64ede8e58d2c3f4bd40b6c5afee6c3e86be345c3a SHA512 997a4bb41e09385157df22710669dde6226892594b393d201635f995390254aedb03bc5a87d0327ce4b7c8d6e9f268795238cbe12e6ca03d89eb4c744218af84
 MISC metadata.xml 310 BLAKE2B c5dac87062361446d899a645418ae14a5fdb979f958087c4c2ef4cbe3afca4a37586a58bbeeede802af76f7f2d1c654eebb64eb17be4393359fffd1335faf2ef SHA512 897094fc61846e1417e87ea8c9d76f824babb9ffa1fab3ffb5a63f2ab1c24842ebcf360a33c971a172fde70017a179e23c2677d5eef5939c01bb132fb1aa1e4a
diff --git a/dev-php/PEAR-Net_DNS2/PEAR-Net_DNS2-1.5.0.ebuild b/dev-php/PEAR-Net_DNS2/PEAR-Net_DNS2-1.5.0.ebuild
new file mode 100644
index 000000000000..063594722722
--- /dev/null
+++ b/dev-php/PEAR-Net_DNS2/PEAR-Net_DNS2-1.5.0.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit php-pear-r2
+
+DESCRIPTION="Object-oriented PHP5 resolver library used to communicate with a DNS server"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-php/PEAR-PEAR >=dev-lang/php-5.3:*[sockets]"
+
+DOCS=( README.md )
diff --git a/dev-php/composer/Manifest b/dev-php/composer/Manifest
index ff7c8fd67bf6..5995b7682fb6 100644
--- a/dev-php/composer/Manifest
+++ b/dev-php/composer/Manifest
@@ -2,6 +2,7 @@ AUX autoload-r1.php 973 BLAKE2B d01d694be6f50af0e995dc24da1545b666609ce0098b4206
 DIST composer-1.10.1.tar.gz 421852 BLAKE2B a40f59ab0af5eba777f1926bab78e55fd1973e53b324eec73fdca70678fc1cfe6f892790a61a66dbdbe07caa03343bfd109318daec99c2c18707785c6bf149e0 SHA512 ebc3ee48bf0d2597e7221e9ac0ab7188e7a99096d5dacdee4176b4c7b4d252d079c117b5bd9131ff38d8963f95930fa9c83fa51ed542d4f7d58276561de1f2b8
 DIST composer-1.10.10.tar.gz 426836 BLAKE2B 46266e0338e4bad201d6f025ffb3ae6a4441543cb6aeec27502e43127cb6e109a2824960f774d2996b231e469639a6fa6f58f831e82f6a7313364049ddb626e7 SHA512 a859026dc2b6dc5f3bf8a03f305b7eb59339bc13148036c3b23c24a1136cc53c50217277d8877987e441e3de80d97d771d014f2a60e76bb09513827be2ce71e7
 DIST composer-1.10.13.tar.gz 427175 BLAKE2B f81a108028f8697af9f1e624681fd924d30daa9e7d3b4ec7a6661c517393aa2c33f964b85b73824d24e023acbe0c8ce835b6c3897084b1112fd606c27d7fcf97 SHA512 f16baf2d063ea30b0099f604998857e027b3e2c0c8fbf62aee735d721788e2316261414785ee99945c254ea1e82fc37f72a2b83ee817ecf3aa6521c311e4c53e
+DIST composer-1.10.15.tar.gz 427919 BLAKE2B 38d2e1c795385dd13bedbf5283cf76b04efb54db8dc72eff05370b9505382e2e43f10e1528f148186edb759a098b948d1fee36ac99ab6a5591858723100a27aa SHA512 f8544632e00a08ec75b327e6eac2c96bff60ba78c238863c8ab6b4d82239997f11140a049df0d6c0338bb7523b52fc3ea6f767b9418f75b51535ccfde44fa68c
 DIST composer-1.10.5.tar.gz 423065 BLAKE2B 0c8595f3583a692f89294455984aeff2ad9cbf2a39541355cbb736e717baacae8245fa81e6b9fde11dd5bb56ad3a074262f6f8ecb65b4bef9c782ef39887deec SHA512 cdadb2d146afcc140316b83d3b4f4c018d79e8222f6a6207cdd52db75ae9c78e787a509d88a3fe113f8218df2ace56ba2dd043e1b6e6c3dbb5129fd51d8e9925
 DIST composer-1.10.6.tar.gz 423789 BLAKE2B 74d93e769c660f2c74e0ad5dd3ed5e5279c217552eb6d342ffd43d7fba10647865ade7b284c811f63504e0335e5655eae681cf14ae4d876eb56ff6a306c61268 SHA512 fdc209a82d3adda2728190282327b02d2b71bb9b1a80cbcda3699a826ee56451c997edac13d76e2784ebd4297d413bd46dd47b9538accd4bfe6c569464696779
 DIST composer-1.10.7.tar.gz 424264 BLAKE2B 9939e4d1f29071ca4467076c13e0ceab32d10282876ebb0a76f41dd3efbd9c40a50dbf278dd0a12b2119d40ff9424c171f07381fbaadb94218b1fdf69f403fdb SHA512 81ece3314cddced101b0be491e40b60d42ef503cef4b1d5598c32f3378f10524004a7a8ef4360453a4cdaaf9d3b986ce07696de075dc424deae7703945f6d577
@@ -11,6 +12,7 @@ DIST composer-1.9.3.tar.gz 412212 BLAKE2B fc293a38baaf87cc2581304e1438d48e94a85c
 EBUILD composer-1.10.1.ebuild 1232 BLAKE2B 584b0a2251e7f63a1bdc9d5c32524690d4dabe7668220fdf8678c0fc8749044334db0b5d39385e8fc181b3c25ec3d955e7dc73f9e0d2bde5d27724b4566fedee SHA512 597a47db43a02071beec253a84b1c548ccba8c6e9604a538055a6de268bba0e0c87b04dae897c15d95a807730c789ad6a15a4eb6b6eb0a850ea94571f7de73ac
 EBUILD composer-1.10.10.ebuild 1232 BLAKE2B 584b0a2251e7f63a1bdc9d5c32524690d4dabe7668220fdf8678c0fc8749044334db0b5d39385e8fc181b3c25ec3d955e7dc73f9e0d2bde5d27724b4566fedee SHA512 597a47db43a02071beec253a84b1c548ccba8c6e9604a538055a6de268bba0e0c87b04dae897c15d95a807730c789ad6a15a4eb6b6eb0a850ea94571f7de73ac
 EBUILD composer-1.10.13.ebuild 1232 BLAKE2B 584b0a2251e7f63a1bdc9d5c32524690d4dabe7668220fdf8678c0fc8749044334db0b5d39385e8fc181b3c25ec3d955e7dc73f9e0d2bde5d27724b4566fedee SHA512 597a47db43a02071beec253a84b1c548ccba8c6e9604a538055a6de268bba0e0c87b04dae897c15d95a807730c789ad6a15a4eb6b6eb0a850ea94571f7de73ac
+EBUILD composer-1.10.15.ebuild 1232 BLAKE2B 584b0a2251e7f63a1bdc9d5c32524690d4dabe7668220fdf8678c0fc8749044334db0b5d39385e8fc181b3c25ec3d955e7dc73f9e0d2bde5d27724b4566fedee SHA512 597a47db43a02071beec253a84b1c548ccba8c6e9604a538055a6de268bba0e0c87b04dae897c15d95a807730c789ad6a15a4eb6b6eb0a850ea94571f7de73ac
 EBUILD composer-1.10.5.ebuild 1232 BLAKE2B 584b0a2251e7f63a1bdc9d5c32524690d4dabe7668220fdf8678c0fc8749044334db0b5d39385e8fc181b3c25ec3d955e7dc73f9e0d2bde5d27724b4566fedee SHA512 597a47db43a02071beec253a84b1c548ccba8c6e9604a538055a6de268bba0e0c87b04dae897c15d95a807730c789ad6a15a4eb6b6eb0a850ea94571f7de73ac
 EBUILD composer-1.10.6.ebuild 1232 BLAKE2B 584b0a2251e7f63a1bdc9d5c32524690d4dabe7668220fdf8678c0fc8749044334db0b5d39385e8fc181b3c25ec3d955e7dc73f9e0d2bde5d27724b4566fedee SHA512 597a47db43a02071beec253a84b1c548ccba8c6e9604a538055a6de268bba0e0c87b04dae897c15d95a807730c789ad6a15a4eb6b6eb0a850ea94571f7de73ac
 EBUILD composer-1.10.7.ebuild 1232 BLAKE2B 584b0a2251e7f63a1bdc9d5c32524690d4dabe7668220fdf8678c0fc8749044334db0b5d39385e8fc181b3c25ec3d955e7dc73f9e0d2bde5d27724b4566fedee SHA512 597a47db43a02071beec253a84b1c548ccba8c6e9604a538055a6de268bba0e0c87b04dae897c15d95a807730c789ad6a15a4eb6b6eb0a850ea94571f7de73ac
diff --git a/dev-php/composer/composer-1.10.15.ebuild b/dev-php/composer/composer-1.10.15.ebuild
new file mode 100644
index 000000000000..29915836e3cf
--- /dev/null
+++ b/dev-php/composer/composer-1.10.15.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Dependency Manager for PHP"
+HOMEPAGE="https://github.com/composer/composer"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-lang/php:*[curl]
+	>=dev-php/ca-bundle-1.1.3
+	>=dev-php/psr-log-1.1.0
+	dev-php/fedora-autoloader
+	>=dev-php/json-schema-5.2.7
+	>=dev-php/jsonlint-1.7.1
+	>=dev-php/phar-utils-1.0.1
+	>=dev-php/semver-1.4.2
+	>=dev-php/spdx-licenses-1.5.0
+	>=dev-php/symfony-console-2.8.48
+	>=dev-php/symfony-filesystem-2.8.48
+	>=dev-php/symfony-finder-2.8.49
+	>=dev-php/symfony-process-2.8.48
+	>=dev-php/xdebug-handler-1.3.1"
+
+src_install() {
+	insinto "/usr/share/${PN}"
+
+	# Composer expects the LICENSE file to be there, and the
+	# easiest thing to do is to give it what it wants.
+	doins -r src res LICENSE
+
+	insinto "/usr/share/${PN}/vendor"
+	newins "${FILESDIR}"/autoload-r1.php autoload.php
+
+	exeinto "/usr/share/${PN}/bin"
+	doexe "bin/${PN}"
+	dosym "../share/${PN}/bin/${PN}" "/usr/bin/${PN}"
+
+	dodoc CHANGELOG.md README.md doc/*.md
+	dodoc -r doc/articles doc/faqs
+}
diff --git a/dev-php/igbinary/Manifest b/dev-php/igbinary/Manifest
index b68d1b5ee77d..886189fe9c0a 100644
--- a/dev-php/igbinary/Manifest
+++ b/dev-php/igbinary/Manifest
@@ -1,3 +1,5 @@
 DIST igbinary-3.1.5.tar.gz 216569 BLAKE2B 3aa453fc0669c331202f38d41a80fa34332033d272a7b6e523988923d84a1e93967e4d588ac32d4a2ac3ed5d0bc832bf0380293604f67350557628ecbcded91a SHA512 af0e473673e624635cad44a6f34aa2e4d655e8f2dc3df8a9e0cf9b241ef1f53c627edb508b5bb41c7f8925c2256a4a4d0b4c083227564212cb7747a810dfc83d
+DIST igbinary-3.1.6.tar.gz 220415 BLAKE2B 62bc77d5b3ecbccb9e928e30f33a598630d3ee9f394f4e78c0978b316d4dbc29656f98773e9ff6bd6b9cd4961f4e00c6c760b1a07234849736d4e0d9e3199d5b SHA512 55f7fd1a6e2a422cf04e944c4c15126167c4aab6d4f5f1e6af8be6c345ec6ff0c25d7ea8c023062bdd4882484cede155ea7a598666e4616985873a32a0a272d1
 EBUILD igbinary-3.1.5.ebuild 597 BLAKE2B 8f09f317dfc74612c30bdf35905411ad3c26077c02579b8fafedf2cd79d0aaf95ef275e0396dace13d0ae733d7cdf5b29cd9f5c419845c942ee49df44e9a2470 SHA512 b352c8647cf6faa2c7fc223d5b78514225bf04c308cf4e802f6c6305fe4b4470db33af634a34fbc3c67849ba933aad9b4ac77113eac940e4a7eff40e55ce7225
+EBUILD igbinary-3.1.6.ebuild 595 BLAKE2B 5cd27a7fec301252289616350fb56f599fa9f1d5e660fb8cf140be2e3c737b1151bb66f857fa7e47c942742441f65cc3e63a4a76f0d5061e29da3592f9e207a8 SHA512 4c1636cd05f1d1eb86a136cf044138029e7c3124c67ab8089b388bd07aca1ea801d4b7cb4914d61fe17b3ad2fe0c03f5574c2d588f1a8a8b1edad2de1ef45e4a
 MISC metadata.xml 331 BLAKE2B 4187300236aa128879679c7cb4a8ddfa19dfd512a76466e835224c30323f2fafd55189228bdced507ababd5b90f561f6bb44c1554392eb0682b6ba5c7a20b681 SHA512 86f467f549b36915940e45a4e151742f2925293106dd3da2958e6153aaa8fed378b2eb563bf69da0d38101409858a4abe308f608bd94de6b4517daf9da092405
diff --git a/dev-php/igbinary/igbinary-3.1.6.ebuild b/dev-php/igbinary/igbinary-3.1.6.ebuild
new file mode 100644
index 000000000000..579c0d91867e
--- /dev/null
+++ b/dev-php/igbinary/igbinary-3.1.6.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PHP_EXT_NAME="${PN}"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+DOCS=( CREDITS NEWS README.md )
+PHP_EXT_ECONF_ARGS=( --enable-${PN} )
+
+USE_PHP="php7-1 php7-2 php7-3 php7-4"
+
+inherit php-ext-source-r3
+
+KEYWORDS="amd64 arm arm64 x86"
+
+DESCRIPTION="A fast drop-in replacement for the standard PHP serialize"
+HOMEPAGE="https://github.com/igbinary/igbinary"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+#IUSE=""
+
+#DEPEND=""
+#RDEPEND=""
diff --git a/dev-php/jsonlint/Manifest b/dev-php/jsonlint/Manifest
index 115a73bfc9f1..8e8b09a25626 100644
--- a/dev-php/jsonlint/Manifest
+++ b/dev-php/jsonlint/Manifest
@@ -4,5 +4,5 @@ DIST jsonlint-1.7.2.tar.gz 11915 BLAKE2B 4fb1bb526c64ad2db442bca4c2c609e7d589ed8
 DIST jsonlint-1.8.2.tar.gz 13729 BLAKE2B 80cbe2e1dc6bcbc0d75d04f34a36deb8b53ebd78bc4dcff0dd1195549ae2eaa02360b642d91c6a848cba9a3f502ed0618937c149663d6d0c9c7ad0f33897b7c1 SHA512 675ae7bf6cddd83bb2fab60f4c2ac4a8b4bf0068e630f266511a1805682cadefc9a44006623448364ceb73c5e211739787643d9196794349b992cca4d5fc737c
 EBUILD jsonlint-1.7.1.ebuild 875 BLAKE2B 1b764c3a4e90e84131dda4b4a6a33a0c6ae64767102610725f21808000b369bdf0b54ce78126dfefed89abbd7cf8fefef5e120ddeb399a5cdcca36ae3480130b SHA512 aff41e22bc041b38e70e8e17a734d1b0a627aa74c553c073ed1f0f256711ddf449ab5938b9cdbb5f18561e402263f32a02d78056eb6a57129ea9d3b774659f8c
 EBUILD jsonlint-1.7.2.ebuild 875 BLAKE2B 1b764c3a4e90e84131dda4b4a6a33a0c6ae64767102610725f21808000b369bdf0b54ce78126dfefed89abbd7cf8fefef5e120ddeb399a5cdcca36ae3480130b SHA512 aff41e22bc041b38e70e8e17a734d1b0a627aa74c553c073ed1f0f256711ddf449ab5938b9cdbb5f18561e402263f32a02d78056eb6a57129ea9d3b774659f8c
-EBUILD jsonlint-1.8.2.ebuild 860 BLAKE2B f09bbb2fdb6a78f761b071263fe01d84a63594987d461c307cd16b0f56b8ffa3c2a542d876276e06bdb8a0be9e942528505792b956dea164ae139f67d337b41c SHA512 d81edec7b20872f4414556db0e89023c14c7479d80b7830df42113fa63962419c7562db23c4e10b2bd049c06a28f7077144eebcf6573dff4226acdb6d62bde19
+EBUILD jsonlint-1.8.2.ebuild 887 BLAKE2B 0743d13b44a4a5b8c203fbed8c0080abe564f59e1b5951339b588c2e33df9c356e1622b8c2104abdf89bbb78d09f47fdce25508809b121abc3517f6da6fee994 SHA512 086309631776a66ee68a796c0dc791722374637bd06d971e92aeeb401b5b302dc9e04708004c1067fe4dc698838aaf853a405c297805de19fcc7bc46a37b88cd
 MISC metadata.xml 554 BLAKE2B d3e5440418af5ffa8bcf2188f4733fdea1f0b352482b36611f97e3574dc8046dcaa492961d9934215656ce954e7a20506f5208df1c09f052fd7cf06f83538c9a SHA512 78495ee38c55d98dd9368ea8f185d4c0a19f98b49da20aa9721c975d4df4279fe4df842fe55e351ebf1280569172be0877705266d2cfb90e0c52f3374506595e
diff --git a/dev-php/jsonlint/jsonlint-1.8.2.ebuild b/dev-php/jsonlint/jsonlint-1.8.2.ebuild
index aee6c195dba0..222fedc3e9da 100644
--- a/dev-php/jsonlint/jsonlint-1.8.2.ebuild
+++ b/dev-php/jsonlint/jsonlint-1.8.2.ebuild
@@ -11,6 +11,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-lang/php:*
diff --git a/dev-php/pecl-apcu/Manifest b/dev-php/pecl-apcu/Manifest
index 0c917aaf18b5..5b6bc641e1d0 100644
--- a/dev-php/pecl-apcu/Manifest
+++ b/dev-php/pecl-apcu/Manifest
@@ -1,3 +1,5 @@
 DIST apcu-5.1.18.tgz 94668 BLAKE2B c88af867a5f0f3feb550b4b93b83451d972d8f9c2281af8b000b45cb42e2d005f82fe626da8665e0490c79bc378cf9ee5c9a0136d0b490a1155a885bb56fe4f2 SHA512 5e9c5b4540be7abdf2f473d2f8955d8708934a1d6e05cb2c99154cc7ba8a2bbf9afde51769e20f46ef278efd6f60b9172e0864c31e0976b9d3096a337035e7a9
+DIST apcu-5.1.19.tgz 96583 BLAKE2B 330c08a4e557691d0b402111877b3caf56b211256db17cce52a76aeefce7237505eca4ecd71f3770ef3c405182a1604a92cc458cb9bca435b42370fe917e21a7 SHA512 45077e3bd0eac207539e2eafe21968c71f49b8c8920168dbafa87961b041f1d348b6bf1c130104744bc541e1f690854f0a29062e9520db81c04edeee3ef2ed99
 EBUILD pecl-apcu-5.1.18.ebuild 1545 BLAKE2B a10003e1378a8f18df700d56ff24ae436da3d0c5024156ee57b9ba2469c99e0a499ab989e64f68409c7d175cdfca16366dcd6fa764b14297e9fec4e8082ccf2f SHA512 a9591492b4f53e90bc29a3cb6c666096732437d7eccbc0843191992a67e1a2aca4a1969a5dba3598d2e40c4451b0b837062ab81cb30c2f4cf763127e440a1854
+EBUILD pecl-apcu-5.1.19.ebuild 1548 BLAKE2B ee3ff6320e07737f0f144085275f5291115181c94431268453cf051d795afd2462c08b99e4a582fc0e505b7ec1ae768f9e202946748f538933599a5f75b5b36a SHA512 9c5219e2a63f1420777ecc5c270d0d7819619717ac1da0736a9c42f85a9b92aa51c5ece6731de2c7bbf42c51cc7f325d70cadcf9b05bac5a610c9235e2c963a8
 MISC metadata.xml 540 BLAKE2B a29196911604b13d643db1b09cdae2c578c52f3b3ce92f9d6ae534c6fe9872435a46b15dca79ce8ccf5ca02070f2e694f518c69524ea9380eff8e597d8d4124d SHA512 acd09a9a8e52ddc7e4cde2f048db7f7721fcbe3e24b7b628bf1c14b17381a75b463dede6faa0acfecf8e270693001c30b83758f8ad761979fcbdccb454098e56
diff --git a/dev-php/pecl-apcu/pecl-apcu-5.1.19.ebuild b/dev-php/pecl-apcu/pecl-apcu-5.1.19.ebuild
new file mode 100644
index 000000000000..2b180c6dc0d5
--- /dev/null
+++ b/dev-php/pecl-apcu/pecl-apcu-5.1.19.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PHP_EXT_NAME="apcu"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+DOCS=( NOTICE README.md TECHNOTES.txt )
+
+USE_PHP="php7-1 php7-2 php7-3 php7-4"
+
+inherit php-ext-pecl-r3
+
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+DESCRIPTION="Stripped down version of APC supporting only user cache"
+LICENSE="PHP-3.01"
+SLOT="7"
+
+LOCKS="pthreadmutex pthreadrw spinlock semaphore"
+
+LUSE=""
+for l in ${LOCKS}; do
+	LUSE+="lock-${l} "
+done
+
+IUSE="+mmap ${LUSE/lock-pthreadrw/+lock-pthreadrw}"
+
+REQUIRED_USE="^^ ( $LUSE )"
+
+src_prepare() {
+	php-ext-source-r3_src_prepare
+	# Remove broken tests from php 7.4 due to trivial output differences
+	if use php_targets_php7-4 ; then
+		php_init_slot_env "php7.4"
+		rm "${PHP_EXT_S}"/tests/apc_entry_00{2,3}.phpt || die
+	fi
+}
+
+src_configure() {
+	local PHP_EXT_ECONF_ARGS=(
+		--enable-apcu
+		$(use_enable mmap apcu-mmap)
+		$(use_enable lock-spinlock apcu-spinlocks)
+	)
+	# Broken upstream autoconf test disables if present at all
+	use lock-pthreadrw || PHP_EXT_ECONF_ARGS+=( --disable-apcu-rwlocks )
+
+	php-ext-source-r3_src_configure
+}
+
+src_install() {
+	php-ext-pecl-r3_src_install
+
+	insinto /usr/share/php7/apcu
+	doins apc.php
+}
+
+pkg_postinst() {
+	elog "The apc.php file shipped with this release of pecl-apcu was"
+	elog "installed to ${EPREFIX}/usr/share/php7/apcu/."
+	elog
+	elog "If you depend on the apc_* functions,"
+	elog "please install dev-php/pecl-apcu_bc as this extension no longer"
+	elog "provides backwards compatibility."
+}
diff --git a/dev-php/pecl-memcached/Manifest b/dev-php/pecl-memcached/Manifest
index 67057c7c0233..3d5604bf19f2 100644
--- a/dev-php/pecl-memcached/Manifest
+++ b/dev-php/pecl-memcached/Manifest
@@ -1,5 +1,5 @@
 DIST memcached-3.1.3.tgz 82673 BLAKE2B ccb9267cbd974337b7cd8836ab6e35c4fd9398d731dcd333bcb664b91037d1775651e6bb5d00b602767834681289064ede678ea2e6e3641631bba4990a380dee SHA512 9c09648c26011c5e749bee1a556c976e6e5e648dc65580e7caa296dab79e3764edf1408f96edcaca5efb0229320c86fcfa0422e55d486beb6466892f7e08c4a3
 DIST memcached-3.1.5.tgz 83015 BLAKE2B 80f5cbed8e34f867962792d95d242015690f64ab3b462e09813a11b8b86234b0b05b0f6a78f7c6184482b66ba8015064b37f77bbb816a3aee2edd0ce97ab0cbc SHA512 87d5fd079fcaad81139785d6766da71b23a1a0fe907d4b22f3a787af148a20412c11df11c4d98c165241658baf0d87c8a6b29de15db07a0f9d1fabc8aec8f0e9
 EBUILD pecl-memcached-3.1.3-r1.ebuild 2179 BLAKE2B ec037ba55dd9cf0a41779d04c7d1b9e3f4c48c8fc9ff9c62db32c8128c1231891da49fcb9c5b190105e04b76b51e26e4979ee97be4a99de63494d404058b5e95 SHA512 fdabf00ea90160f615698325a74d9abfd5cd6f476f910d20c06ff4fe0b3ef8fe0e01b915615ec764e05fc565cf4cfbe3b940c496511d5d800740f34ab2002cbf
-EBUILD pecl-memcached-3.1.5-r1.ebuild 1586 BLAKE2B f676fe674e5e61de6c34cbb8ce78d1be5b3015886653a9145a41de71934aeff6d1d65c39047ebdf213095230c26d549b5a953f02ed856d944ecacb46d2c36a61 SHA512 f81ac04354d6d5330ecb78cdbbca475b22c81652b509c42042ae63d2681e2d7a2f631517f589475c3f652e359b540ffa06476d7fbd314cef26152aa1482b837b
+EBUILD pecl-memcached-3.1.5-r1.ebuild 1582 BLAKE2B 7cb8c180c14bf80a1e4447bfde1c1087f483c582b3f748c819b2e1d9393e5eb5c8a3ac7c4c0cd99d8dd62ecfd2eb302cf83224fdf7de370d21e9a2520b6990cf SHA512 b9aa92fafe9a68a647e3e76212b40c36b65ebcfed423d82a22fe3aad146149a1d915a895cf77c06830b9a0bb589d992d4470e640365f3beb7f46d5c5b3e70662
 MISC metadata.xml 568 BLAKE2B f99b2eb530ffd87100256bb477bfbd50e48b28283bc01147b0cb1e3dd7dbfb940cd8e16e24c68723fe764df0cbdb1ecb0b995e151c67a37673a19a2cfeb1bcfa SHA512 9fb2c3ea2dba6b4b1cdda8acc02afa006a95651b4fdb5011b15e4046bc44742cc5306d20db070f4f1977352873576040a34ed24a660ec2c640e118115359f2c6
diff --git a/dev-php/pecl-memcached/pecl-memcached-3.1.5-r1.ebuild b/dev-php/pecl-memcached/pecl-memcached-3.1.5-r1.ebuild
index b96743374b3c..281bbb0a15f7 100644
--- a/dev-php/pecl-memcached/pecl-memcached-3.1.5-r1.ebuild
+++ b/dev-php/pecl-memcached/pecl-memcached-3.1.5-r1.ebuild
@@ -11,7 +11,7 @@ inherit php-ext-pecl-r3
 DESCRIPTION="Interface PHP with memcached via libmemcached library"
 LICENSE="PHP-3.01"
 SLOT="7"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 arm arm64 x86"
 IUSE="igbinary json sasl +session test"
 
 RESTRICT="!test? ( test )"
diff --git a/dev-php/pecl-mongodb/Manifest b/dev-php/pecl-mongodb/Manifest
index 0e1da29d30f5..05eb32828065 100644
--- a/dev-php/pecl-mongodb/Manifest
+++ b/dev-php/pecl-mongodb/Manifest
@@ -4,6 +4,7 @@ DIST mongodb-1.6.0.tgz 1096156 BLAKE2B 16c3b1d07d31d29a214aba320347f8e40cfc4f0da
 DIST mongodb-1.7.4.tgz 1223416 BLAKE2B 9db40284eb2b70e242f26c1661923c5f33de8ab1e33a7e816863b61fcbc49040204ca556b1f384cab958f9dc2cf4e49e97840b78bd520a4e374b83210a964e5d SHA512 6805ce1d0958e24e1edf3bc9698bc1f4a9d31c26250624fd35aebf7a7d310af30050e1974cd9571f989303fce4c5522e793a8cb41388397df66e8f5fe0a648f2
 DIST mongodb-1.7.5.tgz 1223892 BLAKE2B c30a217d1170c31be00259f4bb58cfea186947fa0bf1653de32e228a8eb8d3fb25b52d7a5a9e16f6b311418d977f7aa00bf96ca9d7e9ac9a8fa7b6fe05eace8f SHA512 f0565adc42659d4070e42122d02a8306f29d6d70fe0b5e9a92144df346a8c672aafdf36613435b9dc8d50db5e98c2359fdf97408c45439d4d447257b85e93122
 DIST mongodb-1.8.0.tgz 1292928 BLAKE2B 3bd9e5eb6b981010637b9e478928fa21268e1d1447f3ff345bfdb45c93637990e261c46b2ce09560cd4e284df73494dac210436cf700b588803e4ceffb8dc67c SHA512 7fd54dabde8df9533abd36d159c3da1c2b4606e7788b8a6d41faf83d0710b74885e8bfb4e1f4837a50248f3af1df2e7414b90f99227fc92c9084f779c7e68698
+DIST mongodb-1.8.1.tgz 1292453 BLAKE2B 25fe36b7d966a4dcf631764aeb93c09932cc0643e46fe5e594d9223a9d3f099b75211a813114c3e8cd4a1722da774b669ef968fdbb1d4877a81cf1f637890997 SHA512 a80682e3a90ead699a930185c3d10bc3a86b335b45891be6d41ef829fab6f2f2468adb5973735048fa98bb6aaa9c8568ba9f7df5709916d5b6f7676c77188d0c
 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
@@ -11,4 +12,5 @@ EBUILD pecl-mongodb-1.6.0.ebuild 1426 BLAKE2B 4b32da42a4141f6db317f0f77b5207f623
 EBUILD pecl-mongodb-1.7.4.ebuild 1360 BLAKE2B 694ac42a3fdaf5ab1b2fe968dd3cb473022b5cffebdec5da6510bc5eebe34980e9a7ebe0bdd5036ffab306bf854dd00797c25cecd6ecb1da110e940b1869e385 SHA512 c699a3790c2e0f9ecd94f2dbc6f3a5200a374fe3c9a10ac0e8ad5f7d356d9b844393114bbe5b1090b88a7d1e13b6202781064800716c9b9149f61696968471ab
 EBUILD pecl-mongodb-1.7.5.ebuild 1362 BLAKE2B d2727126b6a41701aa3855f7cddaaf5cf9ca1fa69998a98a14d16509b87319c79d30c08e66483a85f08a8f7d6f5fac030357a6f5baa08f01bf211b844d2919b8 SHA512 7ec2c9c6bf1514a655222febae3bbf40ecfde2180308d65fdc8dbf7d4fdf50cf6c736a328384cc14abfb8d0eb6f66c9fedb18946c722c27b5683d6b71e5d81f8
 EBUILD pecl-mongodb-1.8.0.ebuild 1362 BLAKE2B da7514971e440ed3938edbc1b74fa02fdc3c7f7ebf94783aada4094a9d80271a390830161f187bf6d05f179825318617a4d6e999517d92b3b7db963fcf8f8dee SHA512 13bd15a1774e8ed26332b80c83f4313c3199c95aee2361a1bed82a55fc68cebecab3f1b4b51155eafad5393117a5a2338fdc000f604dfb348b82c4e916ed5604
+EBUILD pecl-mongodb-1.8.1.ebuild 1362 BLAKE2B da7514971e440ed3938edbc1b74fa02fdc3c7f7ebf94783aada4094a9d80271a390830161f187bf6d05f179825318617a4d6e999517d92b3b7db963fcf8f8dee SHA512 13bd15a1774e8ed26332b80c83f4313c3199c95aee2361a1bed82a55fc68cebecab3f1b4b51155eafad5393117a5a2338fdc000f604dfb348b82c4e916ed5604
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/pecl-mongodb/pecl-mongodb-1.8.1.ebuild b/dev-php/pecl-mongodb/pecl-mongodb-1.8.1.ebuild
new file mode 100644
index 000000000000..f2435b28dc82
--- /dev/null
+++ b/dev-php/pecl-mongodb/pecl-mongodb-1.8.1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2020 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.17.0
+	>=dev-libs/mongo-c-driver-1.17.0[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-redis/Manifest b/dev-php/pecl-redis/Manifest
index bcabf5f54288..be771f6243f8 100644
--- a/dev-php/pecl-redis/Manifest
+++ b/dev-php/pecl-redis/Manifest
@@ -2,8 +2,10 @@ DIST redis-5.1.1.tgz 245205 BLAKE2B b7177be5282b081562a446b1b37c7b46ba0ef382e55f
 DIST redis-5.2.1.tgz 251570 BLAKE2B 297d6130469735a53f6dfb6ffea8c7c813363099eb76f25619f0cbb05cd06f5ecad9c0f30c370e33985523cf26488cf133aa0a48a99075bc6d5796309e3d914d SHA512 de90bf65cce0cb8c5ea28415e4f7bfff23c8bb3dc96ddca3158f94be2e4bd051e13ec3f34429b0e8ceb436096520e3998f544f377d5ef7d4d1df4edba7f66bc2
 DIST redis-5.2.2.tgz 251629 BLAKE2B e6ca740412dd1ba4ee960e1c71b3f75ebb1a1e2605bc93159395c657ab61eda4c8222b6e890a447c06cd1ef016e061861ffc5d8a6fd6e7e324353a148b54c593 SHA512 0020c572bcd24cdb479046727fba2d30ca87c9a7111c51e5fe3be0b85459e3e7dfc8892b690650de0a7dc80c1a8921f9de45590f6e60257fbf0534729c6e6f4f
 DIST redis-5.3.1.tgz 264485 BLAKE2B 51f68841d51329cbbbd2012e539351b3220dc1361ae5a3782b6c3e9620ed14b9a0b9097a0d6ba6e2fa60e8a794fd2ea57fff871d2fceb7bcdb4a2ab4a6d8789f SHA512 dca62e0e87d22c25818f0eb84ec0a4ae8ab4c1a2de295b7d56d10548c95448637e1b1ca86c55adf0f801fe22bf3c05fad4ff58f3823e5d74c506d041b64f1d4a
+DIST redis-5.3.2.tgz 266814 BLAKE2B 2be79d850e5958bcaf4fddcbdef0a402e62a522f260ae94c0fdc931a988e9b266c7a4e049b89b507a29a8e9085590e4077e336b85974d70a7cb9b3d6c806949d SHA512 95ce960b78cf94ecd212ec88914935167af37e4176d4b111dfc8c6f1a0846a34beba7f9f516cd7a5e1c9dda23f46cce44c99aaa5b42724c0c2a188b0698af414
 EBUILD pecl-redis-5.1.1.ebuild 1288 BLAKE2B 59d4de29ee1b61edede0c31ab5bb4fc40885c3d13744125f0838052299ead06f10965e5a5b9f269b368d3d4981e309fc1ee168f9a1cdbefe8eaee1554bd4c1cb SHA512 90bc2609cb87d3d3aacb72bd507a5895b5b531d243363676bbda1fb14548960b0073b61bac44e77b983570a9c116b2f369ab835bfd179e9af610deb0afadf994
 EBUILD pecl-redis-5.2.1.ebuild 1262 BLAKE2B d29de451a8f863b87a77a356f52b781c94fd448c3ba1e4ab5c74a35e0d977d64a70412fc2b51f7e2267eda03dd2e886d1faa11bb4fe5bdf186682052f3b7b52b SHA512 1d975f3afc197a779295686e9645f24dd82611e326e1c89c387f3dcc8ce20f32cf68ebd5d2fe2f8451329c7d6c655ee998cd602ba0821227319ff84c85f705a0
 EBUILD pecl-redis-5.2.2.ebuild 1262 BLAKE2B d29de451a8f863b87a77a356f52b781c94fd448c3ba1e4ab5c74a35e0d977d64a70412fc2b51f7e2267eda03dd2e886d1faa11bb4fe5bdf186682052f3b7b52b SHA512 1d975f3afc197a779295686e9645f24dd82611e326e1c89c387f3dcc8ce20f32cf68ebd5d2fe2f8451329c7d6c655ee998cd602ba0821227319ff84c85f705a0
 EBUILD pecl-redis-5.3.1.ebuild 1486 BLAKE2B 718fe2c3f07f6d6088ea908b4e0c41dc8a996bf09a5ac75c2ab0716afcb843aed71547cb10118df3b1d670ee678f6fd14b3b1acfb32813000fb47cad517c7a1d SHA512 98412ca22de8a169b782ff44b9120ad328e55a99e15fc162d067046c71b545db00c2a5179ee8b6e8814b302898c7ab4215151f0da8a90635903a8b8ef6ae18b0
+EBUILD pecl-redis-5.3.2.ebuild 1486 BLAKE2B 718fe2c3f07f6d6088ea908b4e0c41dc8a996bf09a5ac75c2ab0716afcb843aed71547cb10118df3b1d670ee678f6fd14b3b1acfb32813000fb47cad517c7a1d SHA512 98412ca22de8a169b782ff44b9120ad328e55a99e15fc162d067046c71b545db00c2a5179ee8b6e8814b302898c7ab4215151f0da8a90635903a8b8ef6ae18b0
 MISC metadata.xml 383 BLAKE2B b7a47896565db2f132479963a5479262864421a8388bd262ba9aa8eb6445e0d351478530475b5dba12cc9cbbc33089a904f9945816d3009c75f09dcea9c4cfdc SHA512 da5c3918a6652f1f3ae58a5bcd2c5eb3308d764df1a14bae1658f5f2022ee364b6cd288c4a3c700cf27b70b2f967f66668c17ea9850fc48910005310d16125b0
diff --git a/dev-php/pecl-redis/pecl-redis-5.3.2.ebuild b/dev-php/pecl-redis/pecl-redis-5.3.2.ebuild
new file mode 100644
index 000000000000..9f7ec9e88930
--- /dev/null
+++ b/dev-php/pecl-redis/pecl-redis-5.3.2.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PHP_EXT_NAME="redis"
+USE_PHP="php7-2 php7-3 php7-4"
+PHP_EXT_NEEDED_USE="json?,session?"
+DOCS=( arrays.markdown cluster.markdown README.markdown CREDITS )
+MY_P="${PN/pecl-/}-${PV/_rc/RC}"
+PHP_EXT_PECL_FILENAME="${MY_P}.tgz"
+PHP_EXT_S="${WORKDIR}/${MY_P}"
+
+inherit php-ext-pecl-r3
+
+DESCRIPTION="PHP extension for interfacing with Redis"
+LICENSE="PHP-3.01"
+SLOT="0"
+KEYWORDS="~amd64 ~arm"
+IUSE="igbinary +json lz4 +session zstd"
+
+DEPEND="
+	igbinary? ( >=dev-php/igbinary-3.0.1-r1[php_targets_php7-2?,php_targets_php7-3?,php_targets_php7-4?] )
+	lz4? ( app-arch/lz4:= )
+	zstd? ( app-arch/zstd:= )
+"
+RDEPEND="${DEPEND}
+	!dev-php/pecl-redis:7"
+
+# The test suite requires network access.
+RESTRICT=test
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+	local PHP_EXT_ECONF_ARGS=(
+		--enable-redis
+		--disable-redis-lzf
+		--disable-redis-msgpack
+		$(use_enable igbinary redis-igbinary)
+		$(use_enable json redis-json)
+		$(use_enable lz4 redis-lz4)
+		$(use_with lz4 liblz4)
+		$(use_enable session redis-session)
+		$(use_enable zstd redis-zstd)
+		$(use_with zstd libzstd)
+	)
+	php-ext-source-r3_src_configure
+}
+
+src_test() {
+	local slot
+	for slot in $(php_get_slots); do
+		php_init_slot_env "${slot}"
+		# Run tests for Redis class
+		${PHPCLI} -d extension=modules/redis.so \
+				  tests/TestRedis.php \
+				  --class Redis \
+				  --host ${PECL_REDIS_HOST} || die 'test suite failed'
+	done
+}
diff --git a/dev-php/pecl-ssh2/Manifest b/dev-php/pecl-ssh2/Manifest
index bdfdcc91a001..6cfb27dc0d00 100644
--- a/dev-php/pecl-ssh2/Manifest
+++ b/dev-php/pecl-ssh2/Manifest
@@ -1,8 +1,8 @@
-AUX pecl-ssh2-1.1.2-fix-php7-port.patch 27860 BLAKE2B 23054187608bdcf79f53ce638e37c646f44297aa7d1e8f7a7c85fd922977ab835b915d541fbae327a30d2e863b503ed4822a82c1b242346290ceb94d49c97020 SHA512 1c2ecc990323a77fb2b69be0d6649f96dd7ad2d06c62f4fcb79a9ef4f89e066d463301668a044d37d717c99837c5d7d3f621f61119543445bd05c3229d9270e9
 AUX pecl-ssh2-1.1.2-fix-php_url-fields-usage-for-php7-3.patch 11461 BLAKE2B 62b07aa1c70c14ed3a1bebb633c47a39f39be120df29ad85e6abacd276fef214cfd85ec07d8504b51c423cc7971fe4eb293e9fb6c8423a3505323f6535a01655 SHA512 86f460c280a83718e195bb255ef686a3632e98ab598ebcb7fa05b5e5727800729c91de9efd60dc19884f015c06d0a7675beecc296d259f493b2f697aaf143e34
+DIST pecl-ssh2-1.1.2-fix-php7-port.patch 27860 BLAKE2B 23054187608bdcf79f53ce638e37c646f44297aa7d1e8f7a7c85fd922977ab835b915d541fbae327a30d2e863b503ed4822a82c1b242346290ceb94d49c97020 SHA512 1c2ecc990323a77fb2b69be0d6649f96dd7ad2d06c62f4fcb79a9ef4f89e066d463301668a044d37d717c99837c5d7d3f621f61119543445bd05c3229d9270e9
 DIST pecl-ssh2-1.2.tar.gz 32447 BLAKE2B 3a9d0f205097a381d07fb9dd5ab4dcb8e361f555dbc633abb8fa895c83024b70e85cd87602da1ceeb1018a7b07c474720b02810ef0689e9294fc33b129b6c738 SHA512 7b7d311cd5f88835e124d70a0295468f75d0fa6936a58808c936d1a185bb630b9e02c21f49b4bd777194a7b104aa3ff85c4fbf480f43d5906787e532ba2d3e04
 DIST ssh2-1.1.2.tgz 32057 BLAKE2B 88ffb3fb608687a086bbe345677982e944210791acc100312ba56ac7c35188a52cde5529d78caf473d19710e9965fba853ea9ff046715413a0b488ae2d8b690c SHA512 36793191448745b8a9b3cc628fe9fb431480792c7a2ff0bf2eccd58cda1cf944933be1d301c455d4a6f3dabf7e04ffef248bc402a8ff99bfafcba0deddb25c36
-EBUILD pecl-ssh2-1.1.2.ebuild 807 BLAKE2B cf68352b3b686837294c7996b0684b27e640f1b24eab513de1134fef0a8597db65a9ccb8867a8e245a75b8a5825bbf0570343532d06e1f2cd9cc07eecf9da99b SHA512 1fe74ed851795f46ae3832ff2b54005846d9c33df6d38946414e82c6f2136854167c005931b030ab6f825494d5c4322b41c2be87da80afa387422e5a26268030
+EBUILD pecl-ssh2-1.1.2.ebuild 893 BLAKE2B 22fdf4b37e9f003d9ff65df2a28b7d434d43fdd12604f8ee86e51ff3f8985dd88ea6c721ba599f85fcd215eee3e82c4695b026d59200fb9bc66731b265c06c56 SHA512 f35b181900d8bd252fb1f248c0327b57fcc1f204e40741f327a6624427546a7ef9b58dbad59f6d16c42d6481cda865741f71cc346ecce0714084a723d6606f32
 EBUILD pecl-ssh2-1.2.ebuild 866 BLAKE2B caa168d611c4ce00afee58568ef3ae39a19e81b978f9c49d9eab58b300ce30b97650bc88145a4b4dd1e532de6a4078b2e53d785519ec054f731a28453ce864da SHA512 0e873df6151fcbd7892b85ed8681c1a5da398e5fe5a11e9bf5b179046aeaa5195efb72cdc320656c80b4e82826020a0c5d8829d26bf851c3522177d904c194c8
 EBUILD pecl-ssh2-9999.ebuild 470 BLAKE2B 52a706cd1ae45c62ec273770e887f793c2f26cc0e6dbf4558edd0460b835c6bb53400fd23374492a6e29cf22a37d1074470227ed6df71383b7d0332f53785894 SHA512 8b946aa5cd6ba27c1f84bc74fb287a2d89f6cb8c59188877f167f66d879f142a3bca0154d9e79fad8f272f75c021bd0ba65c8d7112d052a0684199598b47e37a
 MISC metadata.xml 235 BLAKE2B 5b10304feea18aae1822be7d29bcce06c8715193b14a3dd2c4d79eb75e2767670352e2ca11e06b9a10ec04b63020a18254cd167e6d6be9072f4a200ca5d11ec4 SHA512 0b3e95bbf68eddf74289dad50f8828cffce2d904ff6f9bd5468177de979677cac11da84d1e0302c52b72085915b9d1b3496107172e5726520d51dad1981daf64
diff --git a/dev-php/pecl-ssh2/files/pecl-ssh2-1.1.2-fix-php7-port.patch b/dev-php/pecl-ssh2/files/pecl-ssh2-1.1.2-fix-php7-port.patch
deleted file mode 100644
index 9d4f9bd166ec..000000000000
--- a/dev-php/pecl-ssh2/files/pecl-ssh2-1.1.2-fix-php7-port.patch
+++ /dev/null
@@ -1,746 +0,0 @@
-From 073067ba96ac99ed5696d27f13ca6c8124986e74 Mon Sep 17 00:00:00 2001
-From: Jan-E <github@ehrhardt.nl>
-Date: Thu, 28 Jun 2018 08:43:48 +0200
-Subject: [PATCH] @dstogov Fixed PHP7 port. Restored commented reference
- counting.
-
----
- php_ssh2.h            |  14 +++---
- ssh2.c                |  26 +++++-----
- ssh2_fopen_wrappers.c | 129 ++++++++++++++++++++++----------------------------
- ssh2_sftp.c           |  59 ++++++++++-------------
- 4 files changed, 102 insertions(+), 126 deletions(-)
-
-diff --git a/php_ssh2.h b/php_ssh2.h
-index d010ff9..2bbaa26 100644
---- a/php_ssh2.h
-+++ b/php_ssh2.h
-@@ -73,14 +73,14 @@ typedef struct _php_ssh2_sftp_data {
- 	LIBSSH2_SESSION *session;
- 	LIBSSH2_SFTP *sftp;
- 
--	int session_rsrcid;
-+	zend_resource *session_rsrc;
- } php_ssh2_sftp_data;
- 
- typedef struct _php_ssh2_listener_data {
- 	LIBSSH2_SESSION *session;
- 	LIBSSH2_LISTENER *listener;
- 
--	int session_rsrcid;
-+	zend_resource *session_rsrc;
- } php_ssh2_listener_data;
- 
- #include "libssh2_publickey.h"
-@@ -89,7 +89,7 @@ typedef struct _php_ssh2_pkey_subsys_data {
- 	LIBSSH2_SESSION *session;
- 	LIBSSH2_PUBLICKEY *pkey;
- 
--	int session_rsrcid;
-+	zend_resource *session_rsrc;
- } php_ssh2_pkey_subsys_data;
- 
- #define SSH2_FETCH_NONAUTHENTICATED_SESSION(session, zsession) \
-@@ -118,8 +118,8 @@ typedef struct _php_ssh2_channel_data {
- 	char is_blocking;
- 	long timeout;
- 
--	/* Resource ID */
--	int session_rsrcid;
-+	/* Resource */
-+	zend_resource *session_rsrc;
- 
- 	/* Allow one stream to be closed while the other is kept open */
- 	unsigned char *refcount;
-@@ -151,8 +151,8 @@ PHP_FUNCTION(ssh2_sftp_realpath);
- LIBSSH2_SESSION *php_ssh2_session_connect(char *host, int port, zval *methods, zval *callbacks);
- void php_ssh2_sftp_dtor(zend_resource *rsrc);
- php_url *php_ssh2_fopen_wraper_parse_path(const char *path, char *type, php_stream_context *context,
--											LIBSSH2_SESSION **psession, int *presource_id,
--											LIBSSH2_SFTP **psftp, int *psftp_rsrcid);
-+											LIBSSH2_SESSION **psession, zend_resource **presource,
-+											LIBSSH2_SFTP **psftp, zend_resource **psftp_rsrc);
- 
- extern php_stream_ops php_ssh2_channel_stream_ops;
- 
-diff --git a/ssh2.c b/ssh2.c
-index e73867e..849766b 100644
---- a/ssh2.c
-+++ b/ssh2.c
-@@ -772,9 +772,8 @@ PHP_FUNCTION(ssh2_forward_listen)
- 
- 	data = emalloc(sizeof(php_ssh2_listener_data));
- 	data->session = session;
--	data->session_rsrcid = Z_LVAL_P(zsession);
--	//TODO Sean-Der
--	//zend_list_addref(data->session_rsrcid);
-+	data->session_rsrc = Z_RES_P(zsession);
-+	Z_ADDREF_P(zsession);
- 	data->listener = listener;
- 
- 	RETURN_RES(zend_register_resource(data, le_ssh2_listener));
-@@ -810,7 +809,7 @@ PHP_FUNCTION(ssh2_forward_accept)
- 	channel_data->channel = channel;
- 	channel_data->streamid = 0;
- 	channel_data->is_blocking = 0;
--	channel_data->session_rsrcid = data->session_rsrcid;
-+	channel_data->session_rsrc = data->session_rsrc;
- 	channel_data->refcount = NULL;
- 
- 	stream = php_stream_alloc(&php_ssh2_channel_stream_ops, channel_data, 0, "r+");
-@@ -820,8 +819,12 @@ PHP_FUNCTION(ssh2_forward_accept)
- 		libssh2_channel_free(channel);
- 		RETURN_FALSE;
- 	}
--	//TODO Sean-Der
--	//zend_list_addref(channel_data->session_rsrcid);
-+
-+#if PHP_VERSION_ID < 70300
-+	GC_REFCOUNT(channel_data->session_rsrc)++;
-+#else
-+	GC_ADDREF(channel_data->session_rsrc);
-+#endif
- 
- 	php_stream_to_zval(stream, return_value);
- }
-@@ -975,9 +978,8 @@ PHP_FUNCTION(ssh2_publickey_init)
- 
- 	data = emalloc(sizeof(php_ssh2_pkey_subsys_data));
- 	data->session = session;
--	data->session_rsrcid = Z_RES_P(zsession)->handle;
--	//TODO Sean-Der
--	//zend_list_addref(data->session_rsrcid);
-+	data->session_rsrc = Z_RES_P(zsession);
-+	Z_ADDREF_P(zsession);
- 	data->pkey = pkey;
- 
- 	RETURN_RES(zend_register_resource(data, le_ssh2_pkey_subsys));
-@@ -1280,8 +1282,7 @@ static void php_ssh2_listener_dtor(zend_resource *rsrc)
- 	LIBSSH2_LISTENER *listener = data->listener;
- 
- 	libssh2_channel_forward_cancel(listener);
--	// TODO Sean-Der
--	//zend_list_delete(data->session_rsrcid);
-+	zend_list_delete(data->session_rsrc);
- 	efree(data);
- }
- 
-@@ -1291,8 +1292,7 @@ static void php_ssh2_pkey_subsys_dtor(zend_resource *rsrc)
- 	LIBSSH2_PUBLICKEY *pkey = data->pkey;
- 
- 	libssh2_publickey_shutdown(pkey);
--	// TODO Sean-Der
--	//zend_list_delete(data->session_rsrcid);
-+	zend_list_delete(data->session_rsrc);
- 	efree(data);
- }
- 
-diff --git a/ssh2_fopen_wrappers.c b/ssh2_fopen_wrappers.c
-index f2f3475..c4eb9dc 100644
---- a/ssh2_fopen_wrappers.c
-+++ b/ssh2_fopen_wrappers.c
-@@ -47,11 +47,9 @@ static size_t php_ssh2_channel_stream_write(php_stream *stream, const char *buf,
- 	php_ssh2_channel_data *abstract = (php_ssh2_channel_data*)stream->abstract;
- 	size_t writestate;
- 	LIBSSH2_SESSION *session;
--	zval *zresource;
- 
- 	libssh2_channel_set_blocking(abstract->channel, abstract->is_blocking);
--	zresource = php_ssh2_zval_from_resource_handle(abstract->session_rsrcid);
--	session = (LIBSSH2_SESSION *)zend_fetch_resource(Z_RES_P(zresource), PHP_SSH2_SESSION_RES_NAME, le_ssh2_session);
-+	session = (LIBSSH2_SESSION *)zend_fetch_resource(abstract->session_rsrc, PHP_SSH2_SESSION_RES_NAME, le_ssh2_session);
- 
- 
- 
-@@ -90,12 +88,10 @@ static size_t php_ssh2_channel_stream_read(php_stream *stream, char *buf, size_t
- 	php_ssh2_channel_data *abstract = (php_ssh2_channel_data*)stream->abstract;
- 	ssize_t readstate;
- 	LIBSSH2_SESSION *session;
--	zval *zresource;
- 
- 	stream->eof = libssh2_channel_eof(abstract->channel);
- 	libssh2_channel_set_blocking(abstract->channel, abstract->is_blocking);
--	zresource = php_ssh2_zval_from_resource_handle(abstract->session_rsrcid);
--	session = (LIBSSH2_SESSION *)zend_fetch_resource(Z_RES_P(zresource), PHP_SSH2_SESSION_RES_NAME, le_ssh2_session);
-+	session = (LIBSSH2_SESSION *)zend_fetch_resource(abstract->session_rsrc, PHP_SSH2_SESSION_RES_NAME, le_ssh2_session);
- 
- #ifdef PHP_SSH2_SESSION_TIMEOUT
- 	if (abstract->is_blocking) {
-@@ -137,8 +133,7 @@ static int php_ssh2_channel_stream_close(php_stream *stream, int close_handle)
- 		}
- 		libssh2_channel_eof(abstract->channel);
- 		libssh2_channel_free(abstract->channel);
--		//TODO Sean-Der
--		//zend_list_delete(abstract->session_rsrcid);
-+		zend_list_delete(abstract->session_rsrc);
- 	}
- 	efree(abstract);
- 
-@@ -207,8 +202,8 @@ php_stream_ops php_ssh2_channel_stream_ops = {
-  * Parse an ssh2.*:// path
-  */
- php_url *php_ssh2_fopen_wraper_parse_path(const char *path, char *type, php_stream_context *context,
--											LIBSSH2_SESSION **psession, int *presource_id,
--											LIBSSH2_SFTP **psftp, int *psftp_rsrcid)
-+											LIBSSH2_SESSION **psession, zend_resource **presource,
-+											LIBSSH2_SFTP **psftp, zend_resource **psftp_rsrc)
- {
- 	php_ssh2_sftp_data *sftp_data = NULL;
- 	LIBSSH2_SESSION *session;
-@@ -283,11 +278,10 @@ php_url *php_ssh2_fopen_wraper_parse_path(const char *path, char *type, php_stre
- 			sftp_data = (php_ssh2_sftp_data *)zend_fetch_resource(Z_RES_P(zresource), PHP_SSH2_SFTP_RES_NAME, le_ssh2_sftp);
- 			if (sftp_data) {
- 				/* Want the sftp layer */
--				//TODO Sean-Der
--				//zend_list_addref(resource_id);
--				*psftp_rsrcid = resource_id;
-+				Z_ADDREF_P(zresource);
-+				*psftp_rsrc = Z_RES_P(zresource);
- 				*psftp = sftp_data->sftp;
--				*presource_id = sftp_data->session_rsrcid;
-+				*presource = sftp_data->session_rsrc;
- 				*psession = sftp_data->session;
- 				return resource;
- 			}
-@@ -305,18 +299,16 @@ php_url *php_ssh2_fopen_wraper_parse_path(const char *path, char *type, php_stre
- 				sftp_data = emalloc(sizeof(php_ssh2_sftp_data));
- 				sftp_data->sftp = sftp;
- 				sftp_data->session = session;
--				sftp_data->session_rsrcid = resource_id;
--				//TODO Sean-Der
--				//zend_list_addref(resource_id);
--				*psftp_rsrcid = zend_register_resource(sftp_data, le_ssh2_sftp)->handle;
-+				sftp_data->session_rsrc = Z_RES_P(zresource);
-+				Z_ADDREF_P(zresource);
-+				*psftp_rsrc = zend_register_resource(sftp_data, le_ssh2_sftp);
- 				*psftp = sftp;
--				*presource_id = resource_id;
-+				*presource = Z_RES_P(zresource);
- 				*psession = session;
- 				return resource;
- 			}
--			//TODO Sean-Der
--			//zend_list_addref(resource_id);
--			*presource_id = resource_id;
-+			Z_ADDREF_P(zresource);
-+			*presource = Z_RES_P(zresource);
- 			*psession = session;
- 			return resource;
- 		}
-@@ -330,9 +322,9 @@ php_url *php_ssh2_fopen_wraper_parse_path(const char *path, char *type, php_stre
- 		sftp_data = (php_ssh2_sftp_data *)zend_fetch_resource(Z_RES_P(tmpzval), PHP_SSH2_SFTP_RES_NAME, le_ssh2_sftp);
- 		if (sftp_data) {
- 			Z_ADDREF_P(tmpzval);
--			*psftp_rsrcid = Z_LVAL_P(tmpzval);
-+			*psftp_rsrc = Z_RES_P(tmpzval);
- 			*psftp = sftp_data->sftp;
--			*presource_id = sftp_data->session_rsrcid;
-+			*presource = sftp_data->session_rsrc;
- 			*psession = sftp_data->session;
- 			return resource;
- 		}
-@@ -354,17 +346,17 @@ php_url *php_ssh2_fopen_wraper_parse_path(const char *path, char *type, php_stre
- 				sftp_data = emalloc(sizeof(php_ssh2_sftp_data));
- 				sftp_data->sftp = sftp;
- 				sftp_data->session = session;
--				sftp_data->session_rsrcid = Z_LVAL_P(tmpzval);
-+				sftp_data->session_rsrc = Z_RES_P(tmpzval);
- 				Z_ADDREF_P(tmpzval);
--				*psftp_rsrcid = zend_register_resource(sftp_data, le_ssh2_sftp)->handle;
-+				*psftp_rsrc = zend_register_resource(sftp_data, le_ssh2_sftp);
- 				*psftp = sftp;
--				*presource_id = Z_RES_P(tmpzval)->handle;
-+				*presource = Z_RES_P(tmpzval);
- 				*psession = session;
- 				return resource;
- 			}
- 			Z_ADDREF_P(tmpzval);
- 			*psession = session;
--			*presource_id = Z_LVAL_P(tmpzval);
-+			*presource = Z_RES_P(tmpzval);
- 			return resource;
- 		}
- 	}
-@@ -465,8 +457,7 @@ php_url *php_ssh2_fopen_wraper_parse_path(const char *path, char *type, php_stre
- 
- 	/* Auth failure */
- 	php_url_free(resource);
--	//TODO Sean-Der
--	//zend_list_delete(Z_LVAL(zsession));
-+	zend_list_delete(Z_RES(zsession));
- 	return NULL;
- 
- session_authed:
-@@ -480,24 +471,22 @@ session_authed:
- 		sftp = libssh2_sftp_init(session);
- 		if (!sftp) {
- 			php_url_free(resource);
--			//TODO Sean-Der
--			//zend_list_delete(Z_LVAL(zsession));
-+			zend_list_delete(Z_RES(zsession));
- 			return NULL;
- 		}
- 
- 		sftp_data = emalloc(sizeof(php_ssh2_sftp_data));
- 		sftp_data->session = session;
- 		sftp_data->sftp = sftp;
--		sftp_data->session_rsrcid = Z_LVAL(zsession);
-+		sftp_data->session_rsrc = Z_RES(zsession);
- 
- 		//TODO Sean-Der
- 		//ZEND_REGISTER_RESOURCE(sftp_data, le_ssh2_sftp);
--		*psftp_rsrcid = Z_LVAL(zsftp);
-+		*psftp_rsrc = Z_RES(zsftp);
- 		*psftp = sftp;
- 	}
- 
--	//TODO may be undefined
--	*presource_id = Z_LVAL(zsession);
-+	*presource = Z_RES(zsession);
- 	*psession = session;
- 
- 	return resource;
-@@ -511,7 +500,7 @@ session_authed:
- /* {{{ php_ssh2_shell_open
-  * Make a stream from a session
-  */
--static php_stream *php_ssh2_shell_open(LIBSSH2_SESSION *session, int resource_id, char *term, int term_len, zval *environment, long width, long height, long type)
-+static php_stream *php_ssh2_shell_open(LIBSSH2_SESSION *session, zend_resource *resource, char *term, int term_len, zval *environment, long width, long height, long type)
- {
- 	LIBSSH2_CHANNEL *channel;
- 	php_ssh2_channel_data *channel_data;
-@@ -578,7 +567,7 @@ static php_stream *php_ssh2_shell_open(LIBSSH2_SESSION *session, int resource_id
- 	channel_data->streamid = 0;
- 	channel_data->is_blocking = 0;
- 	channel_data->timeout = 0;
--	channel_data->session_rsrcid = resource_id;
-+	channel_data->session_rsrc = resource;
- 	channel_data->refcount = NULL;
- 
- 	stream = php_stream_alloc(&php_ssh2_channel_stream_ops, channel_data, 0, "r+");
-@@ -599,11 +588,12 @@ static php_stream *php_ssh2_fopen_wrapper_shell(php_stream_wrapper *wrapper, con
- 	zend_long width = PHP_SSH2_DEFAULT_TERM_WIDTH;
- 	zend_long height = PHP_SSH2_DEFAULT_TERM_HEIGHT;
- 	zend_long type = PHP_SSH2_DEFAULT_TERM_UNIT;
--	int resource_id = 0, terminal_len = sizeof(PHP_SSH2_DEFAULT_TERMINAL) - 1;
-+	zend_resource *rsrc = NULL;
-+	int terminal_len = sizeof(PHP_SSH2_DEFAULT_TERMINAL) - 1;
- 	php_url *resource;
- 	char *s;
- 
--	resource = php_ssh2_fopen_wraper_parse_path(path, "shell", context, &session, &resource_id, NULL, NULL);
-+	resource = php_ssh2_fopen_wraper_parse_path(path, "shell", context, &session, &rsrc, NULL, NULL);
- 	if (!resource || !session) {
- 		return NULL;
- 	}
-@@ -677,10 +667,9 @@ static php_stream *php_ssh2_fopen_wrapper_shell(php_stream_wrapper *wrapper, con
- 	/* TODO: Accept resolution and environment vars as URL style parameters
- 	 * ssh2.shell://hostorresource/terminal/99x99c?envvar=envval&envvar=envval....
- 	 */
--	stream = php_ssh2_shell_open(session, resource_id, terminal, terminal_len, environment, width, height, type);
-+	stream = php_ssh2_shell_open(session, rsrc, terminal, terminal_len, environment, width, height, type);
- 	if (!stream) {
--		//TODO Sean-Der
--		//zend_list_delete(resource_id);
-+		zend_list_delete(rsrc);
- 	}
- 	php_url_free(resource);
- 
-@@ -730,7 +719,7 @@ PHP_FUNCTION(ssh2_shell)
- 
- 	SSH2_FETCH_AUTHENTICATED_SESSION(session, zsession);
- 
--	stream = php_ssh2_shell_open(session, Z_RES_P(zsession)->handle, term, term_len, environment, width, height, type);
-+	stream = php_ssh2_shell_open(session, Z_RES_P(zsession), term, term_len, environment, width, height, type);
- 	if (!stream) {
- 		RETURN_FALSE;
- 	}
-@@ -749,7 +738,7 @@ PHP_FUNCTION(ssh2_shell)
- /* {{{ php_ssh2_exec_command
-  * Make a stream from a session
-  */
--static php_stream *php_ssh2_exec_command(LIBSSH2_SESSION *session, int resource_id, char *command, char *term, int term_len, zval *environment, long width, long height, long type)
-+static php_stream *php_ssh2_exec_command(LIBSSH2_SESSION *session, zend_resource *rsrc, char *command, char *term, int term_len, zval *environment, long width, long height, long type)
- {
- 	LIBSSH2_CHANNEL *channel;
- 	php_ssh2_channel_data *channel_data;
-@@ -819,7 +808,7 @@ static php_stream *php_ssh2_exec_command(LIBSSH2_SESSION *session, int resource_
- 	channel_data->streamid = 0;
- 	channel_data->is_blocking = 0;
- 	channel_data->timeout = 0;
--	channel_data->session_rsrcid = resource_id;
-+	channel_data->session_rsrc = rsrc;
- 	channel_data->refcount = NULL;
- 
- 	stream = php_stream_alloc(&php_ssh2_channel_stream_ops, channel_data, 0, "r+");
-@@ -836,7 +825,7 @@ static php_stream *php_ssh2_fopen_wrapper_exec(php_stream_wrapper *wrapper, cons
- 	LIBSSH2_SESSION *session = NULL;
- 	php_stream *stream;
- 	zval *tmpzval, *environment = NULL;
--	int resource_id = 0;
-+	zend_resource *rsrc = NULL;
- 	php_url *resource;
- 	char *terminal = NULL;
- 	int terminal_len = 0;
-@@ -844,14 +833,13 @@ static php_stream *php_ssh2_fopen_wrapper_exec(php_stream_wrapper *wrapper, cons
- 	long height = PHP_SSH2_DEFAULT_TERM_HEIGHT;
- 	long type = PHP_SSH2_DEFAULT_TERM_UNIT;
- 
--	resource = php_ssh2_fopen_wraper_parse_path(path, "exec", context, &session, &resource_id, NULL, NULL);
-+	resource = php_ssh2_fopen_wraper_parse_path(path, "exec", context, &session, &rsrc, NULL, NULL);
- 	if (!resource || !session) {
- 		return NULL;
- 	}
- 	if (!resource->path) {
- 		php_url_free(resource);
--		//TODO Sean-Der
--		//zend_list_delete(resource_id);
-+		zend_list_delete(rsrc);
- 		return NULL;
- 	}
- 
-@@ -893,10 +881,9 @@ static php_stream *php_ssh2_fopen_wrapper_exec(php_stream_wrapper *wrapper, cons
- 		zval_ptr_dtor(copyval);
- 	}
- 
--	stream = php_ssh2_exec_command(session, resource_id, SSH2_URL_STR(resource->path) + 1, terminal, terminal_len, environment, width, height, type);
-+	stream = php_ssh2_exec_command(session, rsrc, SSH2_URL_STR(resource->path) + 1, terminal, terminal_len, environment, width, height, type);
- 	if (!stream) {
--		// TODO Sean-Der
--		//zend_list_delete(resource_id);
-+		zend_list_delete(rsrc);
- 	}
- 	php_url_free(resource);
- 
-@@ -963,7 +950,7 @@ PHP_FUNCTION(ssh2_exec)
- 
- 	SSH2_FETCH_AUTHENTICATED_SESSION(session, zsession);
- 
--	stream = php_ssh2_exec_command(session, Z_RES_P(zsession)->handle, command, term, term_len, environment, width, height, type);
-+	stream = php_ssh2_exec_command(session, Z_RES_P(zsession), command, term, term_len, environment, width, height, type);
- 	if (!stream) {
- 		RETURN_FALSE;
- 	}
-@@ -982,7 +969,7 @@ PHP_FUNCTION(ssh2_exec)
- /* {{{ php_ssh2_scp_xfer
-  * Make a stream from a session
-  */
--static php_stream *php_ssh2_scp_xfer(LIBSSH2_SESSION *session, int resource_id, char *filename)
-+static php_stream *php_ssh2_scp_xfer(LIBSSH2_SESSION *session, zend_resource *rsrc, char *filename)
- {
- 	LIBSSH2_CHANNEL *channel;
- 	php_ssh2_channel_data *channel_data;
-@@ -1002,7 +989,7 @@ static php_stream *php_ssh2_scp_xfer(LIBSSH2_SESSION *session, int resource_id,
- 	channel_data->streamid = 0;
- 	channel_data->is_blocking = 0;
- 	channel_data->timeout = 0;
--	channel_data->session_rsrcid = resource_id;
-+	channel_data->session_rsrc = rsrc;
- 	channel_data->refcount = NULL;
- 
- 	stream = php_stream_alloc(&php_ssh2_channel_stream_ops, channel_data, 0, "r");
-@@ -1018,28 +1005,26 @@ static php_stream *php_ssh2_fopen_wrapper_scp(php_stream_wrapper *wrapper, const
- {
- 	LIBSSH2_SESSION *session = NULL;
- 	php_stream *stream;
--	int resource_id = 0;
-+	zend_resource *rsrc = NULL;
- 	php_url *resource;
- 
- 	if (strchr(mode, '+') || strchr(mode, 'a') || strchr(mode, 'w')) {
- 		return NULL;
- 	}
- 
--	resource = php_ssh2_fopen_wraper_parse_path(path, "scp", context, &session, &resource_id, NULL, NULL);
-+	resource = php_ssh2_fopen_wraper_parse_path(path, "scp", context, &session, &rsrc, NULL, NULL);
- 	if (!resource || !session) {
- 		return NULL;
- 	}
- 	if (!resource->path) {
- 		php_url_free(resource);
--		//TODO Sean-Der
--		//zend_list_delete(resource_id);
-+		zend_list_delete(rsrc);
- 		return NULL;
- 	}
- 
--	stream = php_ssh2_scp_xfer(session, resource_id, SSH2_URL_STR(resource->path));
-+	stream = php_ssh2_scp_xfer(session, rsrc, SSH2_URL_STR(resource->path));
- 	if (!stream) {
--		//TODO Sean-Der
--		//zend_list_delete(resource_id);
-+		zend_list_delete(rsrc);
- 	}
- 	php_url_free(resource);
- 
-@@ -1231,7 +1216,7 @@ PHP_FUNCTION(ssh2_scp_send)
- /* {{{ php_ssh2_direct_tcpip
-  * Make a stream from a session
-  */
--static php_stream *php_ssh2_direct_tcpip(LIBSSH2_SESSION *session, int resource_id, char *host, int port)
-+static php_stream *php_ssh2_direct_tcpip(LIBSSH2_SESSION *session, zend_resource *rsrc, char *host, int port)
- {
- 	LIBSSH2_CHANNEL *channel;
- 	php_ssh2_channel_data *channel_data;
-@@ -1251,7 +1236,7 @@ static php_stream *php_ssh2_direct_tcpip(LIBSSH2_SESSION *session, int resource_
- 	channel_data->streamid = 0;
- 	channel_data->is_blocking = 0;
- 	channel_data->timeout = 0;
--	channel_data->session_rsrcid = resource_id;
-+	channel_data->session_rsrc = rsrc;
- 	channel_data->refcount = NULL;
- 
- 	stream = php_stream_alloc(&php_ssh2_channel_stream_ops, channel_data, 0, "r+");
-@@ -1270,9 +1255,9 @@ static php_stream *php_ssh2_fopen_wrapper_tunnel(php_stream_wrapper *wrapper, co
- 	php_url *resource;
- 	char *host = NULL;
- 	int port = 0;
--	int resource_id = 0;
-+	zend_resource *rsrc;
- 
--	resource = php_ssh2_fopen_wraper_parse_path(path, "tunnel", context, &session, &resource_id, NULL, NULL);
-+	resource = php_ssh2_fopen_wraper_parse_path(path, "tunnel", context, &session, &rsrc, NULL, NULL);
- 	if (!resource || !session) {
- 		return NULL;
- 	}
-@@ -1303,15 +1288,13 @@ static php_stream *php_ssh2_fopen_wrapper_tunnel(php_stream_wrapper *wrapper, co
- 	if ((port <= 0) || (port > 65535) || !host || (strlen(host) == 0)) {
- 		/* Invalid connection criteria */
- 		php_url_free(resource);
--		//TODO Sean-Der
--		//zend_list_delete(resource_id);
-+		zend_list_delete(rsrc);
- 		return NULL;
- 	}
- 
--	stream = php_ssh2_direct_tcpip(session, resource_id, host, port);
-+	stream = php_ssh2_direct_tcpip(session, rsrc, host, port);
- 	if (!stream) {
--		// TODO Sean-Der
--		//zend_list_delete(resource_id);
-+		zend_list_delete(rsrc);
- 	}
- 	php_url_free(resource);
- 
-@@ -1352,7 +1335,7 @@ PHP_FUNCTION(ssh2_tunnel)
- 
- 	SSH2_FETCH_AUTHENTICATED_SESSION(session, zsession);
- 
--	stream = php_ssh2_direct_tcpip(session, Z_RES_P(zsession)->handle, host, port);
-+	stream = php_ssh2_direct_tcpip(session, Z_RES_P(zsession), host, port);
- 	if (!stream) {
- 		RETURN_FALSE;
- 	}
-diff --git a/ssh2_sftp.c b/ssh2_sftp.c
-index 6332be8..256fc70 100644
---- a/ssh2_sftp.c
-+++ b/ssh2_sftp.c
-@@ -40,8 +40,7 @@ void php_ssh2_sftp_dtor(zend_resource *rsrc)
- 
- 	libssh2_sftp_shutdown(data->sftp);
- 
--	// TODO Sean-Der
--	//zend_list_delete(data->session_rsrcid);
-+	zend_list_delete(data->session_rsrc);
- 
- 	efree(data);
- }
-@@ -50,7 +49,7 @@ void php_ssh2_sftp_dtor(zend_resource *rsrc)
-    * SFTP File Ops *
-    ***************** */
- 
--inline unsigned long php_ssh2_parse_fopen_modes(char *openmode) {
-+unsigned long php_ssh2_parse_fopen_modes(char *openmode) {
- 	unsigned long flags = 0;
- 
- 	if (strchr(openmode, 'a')) {
-@@ -101,7 +100,7 @@ inline int php_ssh2_sftp_attr2ssb(php_stream_statbuf *ssb, LIBSSH2_SFTP_ATTRIBUT
- typedef struct _php_ssh2_sftp_handle_data {
- 	LIBSSH2_SFTP_HANDLE *handle;
- 
--	long sftp_rsrcid;
-+	zend_resource *sftp_rsrc;
- } php_ssh2_sftp_handle_data;
- 
- /* {{{ php_ssh2_sftp_stream_write
-@@ -139,8 +138,7 @@ static int php_ssh2_sftp_stream_close(php_stream *stream, int close_handle)
- 	php_ssh2_sftp_handle_data *data = (php_ssh2_sftp_handle_data*)stream->abstract;
- 
- 	libssh2_sftp_close(data->handle);
--	//TODO Sean-Der
--	//zend_list_delete(data->sftp_rsrcid);
-+	zend_list_delete(data->sftp_rsrc);
- 	efree(data);
- 
- 	return 0;
-@@ -226,12 +224,12 @@ static php_stream *php_ssh2_sftp_stream_opener(php_stream_wrapper *wrapper, cons
- 	LIBSSH2_SFTP *sftp = NULL;
- 	LIBSSH2_SFTP_HANDLE *handle;
- 	php_stream *stream;
--	int resource_id = 0, sftp_rsrcid = 0;
-+	zend_resource *rsrc = NULL, *sftp_rsrc = NULL;
- 	php_url *resource;
- 	unsigned long flags;
- 	long perms = 0644;
- 
--	resource = php_ssh2_fopen_wraper_parse_path(filename, "sftp", context, &session, &resource_id, &sftp, &sftp_rsrcid);
-+	resource = php_ssh2_fopen_wraper_parse_path(filename, "sftp", context, &session, &rsrc, &sftp, &sftp_rsrc);
- 	if (!resource || !session || !sftp) {
- 		return NULL;
- 	}
-@@ -242,20 +240,18 @@ static php_stream *php_ssh2_sftp_stream_opener(php_stream_wrapper *wrapper, cons
- 	if (!handle) {
- 		php_error_docref(NULL, E_WARNING, "Unable to open %s on remote host", filename);
- 		php_url_free(resource);
--		//TODO Sean-Der
--		//zend_list_delete(sftp_rsrcid);
-+		zend_list_delete(sftp_rsrc);
- 		return NULL;
- 	}
- 
- 	data = emalloc(sizeof(php_ssh2_sftp_handle_data));
- 	data->handle = handle;
--	data->sftp_rsrcid = sftp_rsrcid;
-+	data->sftp_rsrc = sftp_rsrc;
- 
- 	stream = php_stream_alloc(&php_ssh2_sftp_stream_ops, data, 0, mode);
- 	if (!stream) {
- 		libssh2_sftp_close(handle);
--		// TODO Sean-Der
--		//zend_list_delete(sftp_rsrcid);
-+		zend_list_delete(sftp_rsrc);
- 		efree(data);
- 	}
- 	php_url_free(resource);
-@@ -303,8 +299,7 @@ static int php_ssh2_sftp_dirstream_close(php_stream *stream, int close_handle)
- 	php_ssh2_sftp_handle_data *data = (php_ssh2_sftp_handle_data*)stream->abstract;
- 
- 	libssh2_sftp_close(data->handle);
--	//TODO Sean_der
--	//zend_list_delete(data->sftp_rsrcid);
-+	zend_list_delete(data->sftp_rsrc);
- 	efree(data);
- 
- 	return 0;
-@@ -333,10 +328,10 @@ static php_stream *php_ssh2_sftp_dirstream_opener(php_stream_wrapper *wrapper, c
- 	LIBSSH2_SFTP *sftp = NULL;
- 	LIBSSH2_SFTP_HANDLE *handle;
- 	php_stream *stream;
--	int resource_id = 0, sftp_rsrcid = 0;
-+	zend_resource *rsrc = NULL, *sftp_rsrc = NULL;
- 	php_url *resource;
- 
--	resource = php_ssh2_fopen_wraper_parse_path(filename, "sftp", context, &session, &resource_id, &sftp, &sftp_rsrcid);
-+	resource = php_ssh2_fopen_wraper_parse_path(filename, "sftp", context, &session, &rsrc, &sftp, &sftp_rsrc);
- 	if (!resource || !session || !sftp) {
- 		return NULL;
- 	}
-@@ -345,20 +340,18 @@ static php_stream *php_ssh2_sftp_dirstream_opener(php_stream_wrapper *wrapper, c
- 	if (!handle) {
- 		php_error_docref(NULL, E_WARNING, "Unable to open %s on remote host", filename);
- 		php_url_free(resource);
--		//TODO Sean-Der
--		//zend_list_delete(sftp_rsrcid);
-+		zend_list_delete(sftp_rsrc);
- 		return NULL;
- 	}
- 
- 	data = emalloc(sizeof(php_ssh2_sftp_handle_data));
- 	data->handle = handle;
--	data->sftp_rsrcid = sftp_rsrcid;
-+	data->sftp_rsrc = sftp_rsrc;
- 
- 	stream = php_stream_alloc(&php_ssh2_sftp_dirstream_ops, data, 0, mode);
- 	if (!stream) {
- 		libssh2_sftp_close(handle);
--		//TODO Sean-Der
--		//zend_list_delete(sftp_rsrcid);
-+		zend_list_delete(sftp_rsrc);
- 		efree(data);
- 	}
- 	php_url_free(resource);
-@@ -378,10 +371,10 @@ static int php_ssh2_sftp_urlstat(php_stream_wrapper *wrapper, const char *url, i
- 	LIBSSH2_SFTP_ATTRIBUTES attrs;
- 	LIBSSH2_SESSION *session = NULL;
- 	LIBSSH2_SFTP *sftp = NULL;
--	int resource_id = 0, sftp_rsrcid = 0;
-+	zend_resource *rsrc = NULL, *sftp_rsrc = NULL;
- 	php_url *resource;
- 
--	resource = php_ssh2_fopen_wraper_parse_path(url, "sftp", context, &session, &resource_id, &sftp, &sftp_rsrcid);
-+	resource = php_ssh2_fopen_wraper_parse_path(url, "sftp", context, &session, &rsrc, &sftp, &sftp_rsrc);
- 	if (!resource || !session || !sftp || !resource->path) {
- 		return -1;
- 	}
-@@ -408,11 +401,11 @@ static int php_ssh2_sftp_unlink(php_stream_wrapper *wrapper, const char *url, in
- {
- 	LIBSSH2_SESSION *session = NULL;
- 	LIBSSH2_SFTP *sftp = NULL;
--	int resource_id = 0, sftp_rsrcid = 0;
-+	zend_resource *rsrc = NULL, *sftp_rsrc = NULL;
- 	php_url *resource;
- 	int result;
- 
--	resource = php_ssh2_fopen_wraper_parse_path(url, "sftp", context, &session, &resource_id, &sftp, &sftp_rsrcid);
-+	resource = php_ssh2_fopen_wraper_parse_path(url, "sftp", context, &session, &rsrc, &sftp, &sftp_rsrc);
- 	if (!resource || !session || !sftp || !resource->path) {
- 		if (resource) {
- 			php_url_free(resource);
-@@ -436,7 +429,7 @@ static int php_ssh2_sftp_rename(php_stream_wrapper *wrapper, const char *url_fro
- {
- 	LIBSSH2_SESSION *session = NULL;
- 	LIBSSH2_SFTP *sftp = NULL;
--	int resource_id = 0, sftp_rsrcid = 0;
-+	zend_resource *rsrc = NULL, *sftp_rsrc = NULL;
- 	php_url *resource, *resource_to;
- 	int result;
- 
-@@ -453,7 +446,7 @@ static int php_ssh2_sftp_rename(php_stream_wrapper *wrapper, const char *url_fro
- 		return 0;
- 	}
- 
--	resource = php_ssh2_fopen_wraper_parse_path(url_from, "sftp", context, &session, &resource_id, &sftp, &sftp_rsrcid);
-+	resource = php_ssh2_fopen_wraper_parse_path(url_from, "sftp", context, &session, &rsrc, &sftp, &sftp_rsrc);
- 	if (!resource || !session || !sftp || !resource->path) {
- 		if (resource) {
- 			php_url_free(resource);
-@@ -479,11 +472,11 @@ static int php_ssh2_sftp_mkdir(php_stream_wrapper *wrapper, const char *url, int
- {
- 	LIBSSH2_SESSION *session = NULL;
- 	LIBSSH2_SFTP *sftp = NULL;
--	int resource_id = 0, sftp_rsrcid = 0;
-+	zend_resource *rsrc = NULL, *sftp_rsrc = NULL;
- 	php_url *resource;
- 	int result;
- 
--	resource = php_ssh2_fopen_wraper_parse_path(url, "sftp", context, &session, &resource_id, &sftp, &sftp_rsrcid);
-+	resource = php_ssh2_fopen_wraper_parse_path(url, "sftp", context, &session, &rsrc, &sftp, &sftp_rsrc);
- 	if (!resource || !session || !sftp || !resource->path) {
- 		if (resource) {
- 			php_url_free(resource);
-@@ -515,11 +508,11 @@ static int php_ssh2_sftp_rmdir(php_stream_wrapper *wrapper, const char *url, int
- {
- 	LIBSSH2_SESSION *session = NULL;
- 	LIBSSH2_SFTP *sftp = NULL;
--	int resource_id = 0, sftp_rsrcid = 0;
-+	zend_resource *rsrc = NULL, *sftp_rsrc = NULL;
- 	php_url *resource;
- 	int result;
- 
--	resource = php_ssh2_fopen_wraper_parse_path(url, "sftp", context, &session, &resource_id, &sftp, &sftp_rsrcid);
-+	resource = php_ssh2_fopen_wraper_parse_path(url, "sftp", context, &session, &rsrc, &sftp, &sftp_rsrc);
- 	if (!resource || !session || !sftp || !resource->path) {
- 		if (resource) {
- 			php_url_free(resource);
-@@ -591,7 +584,7 @@ PHP_FUNCTION(ssh2_sftp)
- 	data = emalloc(sizeof(php_ssh2_sftp_data));
- 	data->session = session;
- 	data->sftp = sftp;
--	data->session_rsrcid = Z_RES_P(zsession)->handle;
-+	data->session_rsrc = Z_RES_P(zsession);
- 	Z_ADDREF_P(zsession);
- 
- 	RETURN_RES(zend_register_resource(data, le_ssh2_sftp));
--- 
-2.1.4
-
diff --git a/dev-php/pecl-ssh2/pecl-ssh2-1.1.2.ebuild b/dev-php/pecl-ssh2/pecl-ssh2-1.1.2.ebuild
index 7001e2010d53..a27f6970b153 100644
--- a/dev-php/pecl-ssh2/pecl-ssh2-1.1.2.ebuild
+++ b/dev-php/pecl-ssh2/pecl-ssh2-1.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"
@@ -14,7 +14,8 @@ USE_PHP="php7-1 php7-2 php7-3"
 DESCRIPTION="PHP bindings for the libssh2 library"
 LICENSE="PHP-3.01"
 SLOT="7"
-IUSE=""
+
+SRC_URI+=" https://dev.gentoo.org/~juippis/distfiles/tmp/pecl-ssh2-1.1.2-fix-php7-port.patch"
 KEYWORDS="amd64 x86"
 # Upstream notes say there are errors with gcrypt backend
 DEPEND=">=net-libs/libssh2-1.2[-gcrypt]"
@@ -23,7 +24,7 @@ RDEPEND="${DEPEND}
 
 PATCHES=(
 	"${FILESDIR}"/${P}-fix-php_url-fields-usage-for-php7-3.patch
-	"${FILESDIR}"/${P}-fix-php7-port.patch
+	"${DISTDIR}"/${P}-fix-php7-port.patch
 )
 
 src_prepare() {
diff --git a/dev-php/pecl-uuid/Manifest b/dev-php/pecl-uuid/Manifest
index ec2e741533b5..7f1fabe749e4 100644
--- a/dev-php/pecl-uuid/Manifest
+++ b/dev-php/pecl-uuid/Manifest
@@ -1,3 +1,5 @@
 DIST uuid-1.1.0.tgz 15225 BLAKE2B 0a5a326076707e0d3e7c779151a13853e52d026ebdf62c9ab147cf5d00bbc68a3d82e15101c1d4a232d96ea7e988304a25517723adb3127938474172dfab16c2 SHA512 aea814a12e266e4a9e36c58bae78927fa9de6d2b7bf9c75a911710b26958aeecd31d972f56519cf4882a4b13864bc0740ad968b06e704ce7642279253009e76d
+DIST uuid-1.2.0.tgz 16270 BLAKE2B a3746dce1c27973247fd84ccdf8d73809fae775fa0cf133c3bf09c862d93c6c3a53f2d093a1df3dd8bab90f4e58c326e6e7944bfdf436723c79ad5b634e46e18 SHA512 bd557823a8c2b78f74675a2554445eafc69193c6fe5af1f9435cdd90a8efdec0d3974ae8af759fe7d30b2f805876fc2ef55058dea245c9d89a792f634fdb0a10
 EBUILD pecl-uuid-1.1.0.ebuild 422 BLAKE2B 9365759899e4c20d1c12e2b54c19f1f9bdd981f8ece3e0ef187cda55144581b2f6779fa372e7f8dbe1d1b1b87c3f3e651d0d1765373fad29648f5d8138b6514b SHA512 269853f1eb67f90e89b2ed2a6155cacd1c2f55627cbc75c5fd2e4ffd3e8185d55dc93c7e29d4e3113127641afe957bbd0166de6bbedbd75b9bf0f48bee9b1f07
+EBUILD pecl-uuid-1.2.0.ebuild 422 BLAKE2B 9365759899e4c20d1c12e2b54c19f1f9bdd981f8ece3e0ef187cda55144581b2f6779fa372e7f8dbe1d1b1b87c3f3e651d0d1765373fad29648f5d8138b6514b SHA512 269853f1eb67f90e89b2ed2a6155cacd1c2f55627cbc75c5fd2e4ffd3e8185d55dc93c7e29d4e3113127641afe957bbd0166de6bbedbd75b9bf0f48bee9b1f07
 MISC metadata.xml 245 BLAKE2B 7d88a41bb224d6e6c8bc6ed766d24c4141ff7079307fc4e2dadd0d2300b565f5d8332f5a61ad49896af208f136f102bbfedb7b1f61241a82f21cbb6b0d9cc7e9 SHA512 81a613ac5d1bbcb88aad55e16c2b878dcc3a985a8c0d3b802a302067d94c3f878fa8b10aa4804a799a4180464b523eac2ee1bd6547d8baca8647e1e5cce38897
diff --git a/dev-php/pecl-uuid/pecl-uuid-1.2.0.ebuild b/dev-php/pecl-uuid/pecl-uuid-1.2.0.ebuild
new file mode 100644
index 000000000000..f030569d725f
--- /dev/null
+++ b/dev-php/pecl-uuid/pecl-uuid-1.2.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PHP_EXT_NAME="uuid"
+PHP_EXT_INIT="yes"
+PHP_EXT_ZENDEXT="no"
+DOCS=( CREDITS )
+
+USE_PHP="php7-1 php7-2 php7-3 php7-4"
+
+inherit php-ext-pecl-r3
+
+DESCRIPTION="A wrapper around libuuid"
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="sys-apps/util-linux"
+RDEPEND="${DEPEND}"
+PHP_EXT_ECONF_ARGS=()
diff --git a/dev-php/semver/Manifest b/dev-php/semver/Manifest
index a96b03159bbd..71243ff7261c 100644
--- a/dev-php/semver/Manifest
+++ b/dev-php/semver/Manifest
@@ -2,7 +2,9 @@ AUX autoload.php 251 BLAKE2B 6d0768402735be6031c510b158bf29c0bc38a7c59317319e7b3
 DIST semver-1.4.2.tar.gz 10408 BLAKE2B 1504b6dff157e1b3c5ca338060e668f478fdd4e6a61be7835af6da669d22ef15a2143551e96bd01926fd2b408736fd8e70df22e1364b80712dc7d65608889b27 SHA512 2e41e2e70e9e62b280bff40b1a05b3803d95fb088eb4ce395e1f1fed79a40efc3a0ad16f8506d83a81b0e1d08e069640b2b084cc91aeb1ed41d934fd18249fe2
 DIST semver-1.5.1.tar.gz 10534 BLAKE2B ca6743415867db96696cc604c00a1ffabb35617af055a621079621fb73d951453f4c893ccf1377a142c05f5481a42884b380455c37e4e945c382f811a3917f72 SHA512 c9b582217060124fe20dcd7821e669173b9deffa976ad8921f48d22793f03af5deb4006380932e49e06da13a63db9aaa63254118d43448575446b78226d9cf3f
 DIST semver-1.7.0.tar.gz 11249 BLAKE2B 8997f07f009f64472762fdccc8255d7149a03416bf912d74bb818d8bb3b31e81c5897d15e3a0dc0b6ad28fe2e0ddadc13f8c4f9ff63bfb05f6c5880a74d90a89 SHA512 7d90d172c91d56218b44d994d9b997486c950c72d19026c9a9cccd594348896222aa4b74ba9fd0735e2702b7a63133fb6a16089ace97bd2b8f97dbe862b07e82
+DIST semver-1.7.1.tar.gz 11433 BLAKE2B 9f0f054bd657081efd73a23c2ce3d04d12c2fbd8115c54d5b17ca895e7a6bf47a50fdd13213560dd7a0c75a427dbc2aba5c610a726dcc2729d7a531e0c6c1d7d SHA512 7e2f60dfbe7b39eb2a6fcb0439e4ad94d981f4b7b467f0853e923bc22dfe95d1ecaf6ae537ddc46f774cddd0d01b4cf73b6588dbcac45edc7811cacf26f3d23f
 EBUILD semver-1.4.2.ebuild 650 BLAKE2B 51835a3f2e3f7885b685b7d6e39a8974133d02952b774d5747c19ff5b2e02ccca0cfeb778ee5ff346829904bf26d09cd30f1d6c735c5e7fbf79c50cb78156907 SHA512 ffa8c080827f77ba52151a95612a979f882b99a61990fcad378b5a0783b50172f70f35b4def84ae1262e1292d2a0dba6ca407a88e3d49053247bfecae2e1fd68
 EBUILD semver-1.5.1.ebuild 650 BLAKE2B fa3328c96907a5076d8bdeba7f212aca9cd18502395c4bbaf127a3c3aa2883cd9302cac9b043b17be92f394da400a0416e79e9b43529ee80886207a9a44712fe SHA512 7ca5c9cd89cf86a0725e7aa068ed16782403a68cf0a14c67deb3a172073b33620cc18af29c6d5ca870e85c97a2670fd581baeaf292a9b5541a8223ca47619779
 EBUILD semver-1.7.0.ebuild 650 BLAKE2B 48f33a5b5cfc3897c26def0674632aeb716a7b47d1c618a683cf9546896fb09ff861bdda63c5604b9451057ac91f15582ebe41d570282a43d7a6c5f17f2030fa SHA512 41bffeb1143f9545379e3db6b37603a2190e2cc2e959900019ac38a60a795e2991c2b73cdc5f6d2b15a281c1629533defd9eab8fff1c023541e0ee4313fa3ddf
+EBUILD semver-1.7.1.ebuild 650 BLAKE2B 48f33a5b5cfc3897c26def0674632aeb716a7b47d1c618a683cf9546896fb09ff861bdda63c5604b9451057ac91f15582ebe41d570282a43d7a6c5f17f2030fa SHA512 41bffeb1143f9545379e3db6b37603a2190e2cc2e959900019ac38a60a795e2991c2b73cdc5f6d2b15a281c1629533defd9eab8fff1c023541e0ee4313fa3ddf
 MISC metadata.xml 553 BLAKE2B 7237fb4cb467d7bf22fe07ccd7b6cfc9d046ca184aabbad0f70312a4874b37aa81fe315921d574b19e115ee9d12c978524fa27b739d4a348ea276e341769c275 SHA512 abce730eef9026ee6e6df2c217624d8d588db4aa0ea7027b5f933e24d1ce5f277f24f033b1bcbc1185b0cdebf9e1f289137e75735a7bbb41f899c1e31c88efae
diff --git a/dev-php/semver/semver-1.7.1.ebuild b/dev-php/semver/semver-1.7.1.ebuild
new file mode 100644
index 000000000000..56bf1017f3b7
--- /dev/null
+++ b/dev-php/semver/semver-1.7.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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
+}