gentoo resync : 25.09.2021

29 files changed, 137 insertions, 598 deletions

diff --git a/dev-php/Manifest.gz b/dev-php/Manifest.gz
index 4c89487f8c5e..1c620585adf1 100644
--- a/dev-php/Manifest.gz
+++ b/dev-php/Manifest.gz
diff --git a/dev-php/composer/Manifest b/dev-php/composer/Manifest
index e9f94f582fd8..ec161bb7827f 100644
--- a/dev-php/composer/Manifest
+++ b/dev-php/composer/Manifest
@@ -8,6 +8,7 @@ DIST composer-2.1.2.tar.gz 513790 BLAKE2B cc1c807ae4d69537541acf3ec384dbad64bf31
 DIST composer-2.1.3.tar.gz 514147 BLAKE2B 3abf64aceea5b95b72419b60fc74d23e42c652036690c2e31b4250eb4a0e3607a1b4080745642fb085be75dd1174073164f9a8a1422745b4bff5887df694fd99 SHA512 d3214f39651e323b419979ed150d5239f992a6b643048a73a777ece0a1b3d5e3dc2c58a5084b3e825834acc258c18947b0c6461c47960a10552617c8f541df86
 DIST composer-2.1.5.tar.gz 515243 BLAKE2B 078b14727aba1d6278e046e0a1a7b90edae6532ae5874093824db39bb10a0f663543944fe0bb17ddad3dbf40736eef1bb1a8049f5e4dd557f6f01e0d854c213b SHA512 cd4f166d3d1ca7edc8b473ac47775caca98dc2a8bc758b34e6fdd4669ffbe0aa71f900a366e40ff73f830aa602377a5ef3f40022006138e216f0127c75120b96
 DIST composer-2.1.6.tar.gz 517576 BLAKE2B 27a7c76d36a0c86110c2e39ba5977b7ea04bd10897dda4b563edad9cdf2b7e134d3545e5efa5eeb1518f1f0d5366c29de7fb1d6e9032b567195676de121bedbd SHA512 244d64c3c1eadb58ea945e8d448c3fdcf83a6bb3c09eede63c36a6e11f7b2131a797a9ca10c5447bf868ea3439681f9f9079933e26953b5387b7e0c3333480e2
+DIST composer-2.1.8.tar.gz 522462 BLAKE2B 12fb95088146e56568b05ad13ae7630b664337ca338d4cb3e8cc126bc90173a21da6f8e4d2cd883ad15a7b67670bae297a6e02518de3dbaf9d980a74afd6c60c SHA512 00816294a2837934a846a672d34ac830ae36b063d6ffb57d883f553b69cf205822d5d9994c3f6fa67e324ff9d47740bb1b843ad68cf911b220f411cc0b0fe1d2
 EBUILD composer-1.10.22.ebuild 1233 BLAKE2B 8ca659735c9256070bdf634a96eb790a23ef4a5f6e9bc1c4d488d2082d97d87a043b8becc944f9e33479516b40c29b2ddd93c7fe4219c1a3b143c333464b160d SHA512 5cf952c3bda93befd1a77ed5330905f3be8bddb254cdb3d52c6ea6c24eba0bfd32cb936fbbbe18e18dcdf1362b5e423b45f47346f1fd5e5192753c66f51e00e6
 EBUILD composer-2.0.13.ebuild 2228 BLAKE2B f12244d8bada90f5ebd47e5c4d4b706c48153e6f56948103bf17e6ebd6fdbc44056e97ad67bd4fd423bcce9fba03584369c9025d3ed936f8ba1c1bca14a79b7a SHA512 8eee72c7edfd358f0dbb69c334d3df62dd3e0c1d74ac17ef49ca53655934ef5ae6e6c1a4d2263e766afcb0204eb72cd886ca9f1a0ad5e825d41a7eb38243d344
 EBUILD composer-2.0.14.ebuild 2228 BLAKE2B befd0486765faf001bcf4f2cb98ceea1d4535ceb142e6bca6ded35413a5e8c42009850e902b49fe59418b69e76e5043f0d7f585a2a61888b98d9e82edf80a0b9 SHA512 e007b668692c68b321be874639cf77366d81172b1314e316f04e785e4ba9e065785d95509d24624eadab38ee8ce154ec0f5797438a7b7dfc59fc85dac092f5a6
@@ -16,4 +17,5 @@ EBUILD composer-2.1.2.ebuild 2228 BLAKE2B befd0486765faf001bcf4f2cb98ceea1d4535c
 EBUILD composer-2.1.3.ebuild 2228 BLAKE2B befd0486765faf001bcf4f2cb98ceea1d4535ceb142e6bca6ded35413a5e8c42009850e902b49fe59418b69e76e5043f0d7f585a2a61888b98d9e82edf80a0b9 SHA512 e007b668692c68b321be874639cf77366d81172b1314e316f04e785e4ba9e065785d95509d24624eadab38ee8ce154ec0f5797438a7b7dfc59fc85dac092f5a6
 EBUILD composer-2.1.5.ebuild 2228 BLAKE2B a0655fea3563734d657745a9fa9c8f785cf234d879033f43a4e98d333dfe51d011401db8fb7d16cad3191c86bb330ddaad759a3600c6dd8668bc4963c0adb253 SHA512 e5490a298b4a5ca5133ace4bf3ca317ea1b35b212b2574d0e8fd1dcc22226cdd32849f57c0a26f0be03586c602c9d3f4b70442bb1b9316984276aaaac120b635
 EBUILD composer-2.1.6.ebuild 2228 BLAKE2B a0655fea3563734d657745a9fa9c8f785cf234d879033f43a4e98d333dfe51d011401db8fb7d16cad3191c86bb330ddaad759a3600c6dd8668bc4963c0adb253 SHA512 e5490a298b4a5ca5133ace4bf3ca317ea1b35b212b2574d0e8fd1dcc22226cdd32849f57c0a26f0be03586c602c9d3f4b70442bb1b9316984276aaaac120b635
+EBUILD composer-2.1.8.ebuild 2228 BLAKE2B ebf3d7fe1a1d890650a861bc5a08878501e7a8994cd12c1e2b55e632293f7e004f28bd490ef40ecbd8268ab625ca56c4caa69791a36dd4549b5106dcf2923dd2 SHA512 62afde69ee98ab14cc9bbb90df16ca70927fa1cbbd0c69ceb3bc2a9bd237aa8a3eb96f2acfdc88244d2e5e5d7c9ee32776764cc4750f1619e7c4296ca57737b8
 MISC metadata.xml 805 BLAKE2B bfbb9828e372e477d471698865c97fd36a9287e257b36fbd1d489cad92ad131a6b2d30910379b126d82d3f81b479854da7a50596b1b63e6982c0bc402caae574 SHA512 33cf199e2cc7fd8ddbd46d9782fb5a5e9e655f9fb8c607a68744f4165fc62edfce6bd324bf883d5d5b143963cc3ef986609e22d24809c190b508e814249fe99f
diff --git a/dev-php/composer/composer-2.1.8.ebuild b/dev-php/composer/composer-2.1.8.ebuild
new file mode 100644
index 000000000000..1eb058b7a474
--- /dev/null
+++ b/dev-php/composer/composer-2.1.8.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+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"
+
+BDEPEND="dev-php/theseer-Autoload"
+
+RDEPEND="dev-lang/php:*[curl]
+	>=dev-php/ca-bundle-1.0
+	dev-php/fedora-autoloader
+	>=dev-php/jsonlint-1.4
+	>=dev-php/json-schema-5.2.11
+	>=dev-php/metadata-minifier-1.0
+	>=dev-php/phar-utils-1.0
+	>=dev-php/psr-log-1.0
+	>=dev-php/reactphp-promise-2.7
+	>=dev-php/semver-3.0
+	>=dev-php/spdx-licenses-1.2
+	>=dev-php/symfony-console-2.8.52
+	>=dev-php/symfony-filesystem-2.8.52
+	>=dev-php/symfony-finder-2.8.52
+	>=dev-php/symfony-process-2.8.52
+	>=dev-php/xdebug-handler-2"
+
+src_prepare() {
+	default
+
+	mkdir vendor || die
+
+	phpab \
+		--output vendor/autoload.php \
+		--template "${FILESDIR}"/autoload.php.tpl \
+		--basedir src \
+		src \
+		|| die
+
+	cat >> vendor/autoload.php <<EOF || die "failed to extend autoload.php"
+
+// Dependencies
+\Fedora\Autoloader\Dependencies::required([
+	'/usr/share/php/Composer/CaBundle/autoload.php',
+	'/usr/share/php/Composer/MetadataMinifier/autoload.php',
+	'/usr/share/php/Composer/Semver/autoload.php',
+	'/usr/share/php/Composer/Spdx/autoload.php',
+	'/usr/share/php/Composer/XdebugHandler/autoload.php',
+	'/usr/share/php/JsonSchema/autoload.php',
+	'/usr/share/php/Psr/Log/autoload.php',
+	'/usr/share/php/Seld/JsonLint/autoload.php',
+	'/usr/share/php/Seld/PharUtils/autoload.php',
+	'/usr/share/php/Symfony/Component/Console/autoload.php',
+	'/usr/share/php/Symfony/Component/Filesystem/autoload.php',
+	'/usr/share/php/Symfony/Component/Finder/autoload.php',
+	'/usr/share/php/Symfony/Component/Process/autoload.php',
+	'/usr/share/php/React/Promise/autoload.php'
+]);
+EOF
+}
+
+src_install() {
+	insinto "/usr/share/${PN}"
+
+	# Composer expects the LICENSE file to be there, and the
+	# easiest thing to do is to give it what it wants.
+	doins -r LICENSE res src vendor
+
+	exeinto "/usr/share/${PN}/bin"
+	doexe "bin/${PN}"
+	dosym "../share/${PN}/bin/${PN}" "/usr/bin/${PN}"
+
+	dodoc CHANGELOG.md README.md doc/*.md
+	dodoc -r doc/articles doc/faqs
+}
diff --git a/dev-php/igbinary/Manifest b/dev-php/igbinary/Manifest
index ea5dd48f2e57..6046009e41e2 100644
--- a/dev-php/igbinary/Manifest
+++ b/dev-php/igbinary/Manifest
@@ -10,5 +10,5 @@ EBUILD igbinary-3.1.6.ebuild 595 BLAKE2B 5cd27a7fec301252289616350fb56f599fa9f1d
 EBUILD igbinary-3.2.1.ebuild 559 BLAKE2B bb66e2fb19636f4cd24c24643a629968af03f77b2444543997cef0c3576438ac2538e5880617a24ff0e57bb611a92fb797d305441877ebde4753ba144740e1de SHA512 65ae0c5964423f647d9b31515bf6377187352c6a77490eda0937a97771023d76cad304544dc7898003040bec6322484004f52a2c1ef20f85ef533c6144218df2
 EBUILD igbinary-3.2.2.ebuild 559 BLAKE2B 4c897036852ccc6c0b1528044f8a753ca2a25f5c637d593caea0c8312e4de75b36e5839445ff4bb9da111aa3292fcefe449648eaf6e5ac33250107094f080f41 SHA512 db78195cf2749499f0f6f38bc578175b7fc4a0612e99e331db7f0ac575804515b1a9ee067a04e8bfcd05cd844efaf76c7a7b11a0d7fa211861cfa4cd5a6a0aad
 EBUILD igbinary-3.2.4.ebuild 559 BLAKE2B 4c897036852ccc6c0b1528044f8a753ca2a25f5c637d593caea0c8312e4de75b36e5839445ff4bb9da111aa3292fcefe449648eaf6e5ac33250107094f080f41 SHA512 db78195cf2749499f0f6f38bc578175b7fc4a0612e99e331db7f0ac575804515b1a9ee067a04e8bfcd05cd844efaf76c7a7b11a0d7fa211861cfa4cd5a6a0aad
-EBUILD igbinary-3.2.6.ebuild 559 BLAKE2B 4c897036852ccc6c0b1528044f8a753ca2a25f5c637d593caea0c8312e4de75b36e5839445ff4bb9da111aa3292fcefe449648eaf6e5ac33250107094f080f41 SHA512 db78195cf2749499f0f6f38bc578175b7fc4a0612e99e331db7f0ac575804515b1a9ee067a04e8bfcd05cd844efaf76c7a7b11a0d7fa211861cfa4cd5a6a0aad
+EBUILD igbinary-3.2.6.ebuild 557 BLAKE2B 3a7bd3392bbf62629034acd9332ac298b3691d6b851c6a94ddbb21b64e35d794a15020ceae5d0b8cf23e50bdc8630f2456d0728e0601830d9eb21269e99c6a38 SHA512 d05640228b1a43058c6068bf470abc9bdd8e8078c7a3bcad56009cb8dc86ad5f1e71bfe8b284a8ee243aff711e9119a0877d628e9ef01ab8bb073edd1fb241ab
 MISC metadata.xml 332 BLAKE2B dd842052dec2b48669fb7d85ee2637132f64d64d56ac9ece1394222211f3cc1a698e0d5e4dda6d4d5289a4debfe7a44c0c776ec2399d3384874be03278995af2 SHA512 0e2d8ac966bb0f3e40fcf96e0ff93ebd9353a0629129e14f9be2186fe7fc3db8cb5fafc3af795b59005332d66085f1636df62b5454998cb9bd09bfacc1ced0a6
diff --git a/dev-php/igbinary/igbinary-3.2.6.ebuild b/dev-php/igbinary/igbinary-3.2.6.ebuild
index a4b536d340b9..cca0a9856217 100644
--- a/dev-php/igbinary/igbinary-3.2.6.ebuild
+++ b/dev-php/igbinary/igbinary-3.2.6.ebuild
@@ -12,7 +12,7 @@ USE_PHP="php7-3 php7-4 php8-0"
 
 inherit php-ext-source-r3
 
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 DESCRIPTION="A fast drop-in replacement for the standard PHP serialize"
 HOMEPAGE="https://github.com/igbinary/igbinary"
diff --git a/dev-php/pecl-gnupg/Manifest b/dev-php/pecl-gnupg/Manifest
index a2a3841deeb0..51dac310bf42 100644
--- a/dev-php/pecl-gnupg/Manifest
+++ b/dev-php/pecl-gnupg/Manifest
@@ -1,6 +1,3 @@
-AUX 1.3.2/01-large_file_system.patch 260 BLAKE2B 21c52e406ee1d28c8ad0fef1cac7a4c7bb486b856a55423108daca9113416b2e906ae398ac081ce2b813f110e9cc4ce5a20ec04646c4247fe3427aa7440988f9 SHA512 095c5dc8e321c771c8a62054255f3616f3651dae470b78d47cd6032dd8ac76450a366b6a2988ca2cd510102dcedab86c05cd8cd84dbe65d6eca515e487d6dbb5
-DIST gnupg-1.4.0.tgz 28349 BLAKE2B d023746b104db38bcf7617d79570aa3c38d318879d34b1d4df7fc0c28b4e435deadc2a1a4827922cc14a8068b578896e297c8fe8461afebd2768ffb63ddc502d SHA512 70fa1d2956bc5caedbeadf556f9f40a7b963d3b519d6574b0c7695d9fb4c7f9d612306f475a90a1125661407c11de97040e54b158f38d71f239c1fe436d48018
 DIST gnupg-1.5.0.tgz 37045 BLAKE2B 61031a493fc460b102c0a2e831e7523c4eeafc203d51a40d8aa902992740d96e3f1f46437a51a65dceefa283845d00d0b39db90163b7901a29cd133ddfc34d7c SHA512 1b4f9a39a2c585c5f8d749f8e2e2256d9765480ef8ef93c24c538b2f1284dacf8e9f71a42f96fa3150ace1a6ff37256a7a849f29a3e57332fe3b05656e4199cc
-EBUILD pecl-gnupg-1.4.0-r2.ebuild 755 BLAKE2B 13790a952d22a9393781e3dc86366b403c19e1e60af0202a4989f9b20ca4fb07cd3ad08bec2a8e34d415fb129abf4be1ce8b334853867f98d7c2c16deac322f2 SHA512 01c23d7e62f8255c27417a805741538d85f0af23b8ed4fec6cbade6d3a1e7d8937fa938a87a83f42dc203741b24abb373ce57699bd3218c4dfcbfc6ed80bb99e
 EBUILD pecl-gnupg-1.5.0.ebuild 520 BLAKE2B 2cb55233be9dadb82cd4a391f45886aecd73663b0976dd29bfa4f865f51a5f364f1a50ff17aa25bdf35d3df136cc6d170c42b8ceb629ec8bab286664f02f1365 SHA512 e7353fed5f3ad02b2efe7f60b227690237fa459aaccbf2cbf71b5b904364ffe27dd03ddda617fb5dcbcb2cb7cd2a9de304bbdc5d35a4139bb3d6554485d3d512
 MISC metadata.xml 236 BLAKE2B 55612da78a71f8cee31c387a5862636996734210d765fac66d8c7706acc5151e6a9e7ff5123aeb097c911495c6220ba3b5d2f1355f46e8ab6bdb240e1697e26d SHA512 2782b20a65dca663ff7c64b7e67db05641abed478fd5996e5750b2e52ba870829f89125baa8967dd29fd20ef9b46ad233b0dd08801308b7756717ec2f292446c
diff --git a/dev-php/pecl-gnupg/files/1.3.2/01-large_file_system.patch b/dev-php/pecl-gnupg/files/1.3.2/01-large_file_system.patch
deleted file mode 100644
index c679bad631da..000000000000
--- a/dev-php/pecl-gnupg/files/1.3.2/01-large_file_system.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- a/config.m4	2007-05-04 13:23:41.000000000 +0000
-+++ b/config.m4	2010-03-28 01:13:10.000000000 +0000
-@@ -41,4 +41,6 @@
-   PHP_SUBST(GNUPG_SHARED_LIBADD)
- 
-   PHP_NEW_EXTENSION(gnupg, [gnupg.c gnupg_keylistiterator.c], $ext_shared)
-+
-+  AC_SYS_LARGEFILE
- fi
diff --git a/dev-php/pecl-gnupg/pecl-gnupg-1.4.0-r2.ebuild b/dev-php/pecl-gnupg/pecl-gnupg-1.4.0-r2.ebuild
deleted file mode 100644
index ce3a3f298456..000000000000
--- a/dev-php/pecl-gnupg/pecl-gnupg-1.4.0-r2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-MY_P="${PN/pecl-/}-${PV/_rc/RC}"
-PHP_EXT_NAME="gnupg"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-PHP_EXT_PECL_FILENAME="${MY_P}.tgz"
-PHP_EXT_S="${WORKDIR}/${MY_P}"
-
-USE_PHP="php5-6 php7-1 php7-2 php7-3 php7-4"
-
-inherit php-ext-pecl-r3
-
-S="${PHP_EXT_S}"
-
-KEYWORDS="~amd64 ~x86"
-DESCRIPTION="PHP wrapper around the gpgme library"
-LICENSE="BSD-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="app-crypt/gpgme app-crypt/gnupg"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}"/1.3.2/01-large_file_system.patch )
-
-# tests are broken with gnupg 2.0/2.1, see:
-# https://github.com/php-gnupg/php-gnupg/issues/2
-# https://github.com/php-gnupg/php-gnupg/issues/3
-RESTRICT="test"
diff --git a/dev-php/pecl-http/Manifest b/dev-php/pecl-http/Manifest
index 3e9bab47960c..5d858307a2b6 100644
--- a/dev-php/pecl-http/Manifest
+++ b/dev-php/pecl-http/Manifest
@@ -1,10 +1,8 @@
-AUX pecl-http-4.1.0-use-getenv.patch 903 BLAKE2B 1cbf60b5c28918a203f46690cf9c0c7e1d61493582dca79f4933c0354c44f25df8c346ce6cd964e9e9eef5e15ba0f39b7d9229a8bcd566447a816ad3bd4f20e0 SHA512 6242db71bc36de20064e787b435e91e27d4ae98685c2fb050c2247d241c4bd81383d71f7e204e57a86403b1392da4bba4a6be92d1b3628322a2227b895ad8a91
+AUX pecl-http-3.2.4-curl-cookies.patch 502 BLAKE2B b2ac97150edc35e649bcf5674be59401753413bef6d920beee1f50b3a9f9519545fc3ceb5ed030ce28acf4469ab69323a96bc07cdc7a3993b0033f039964d9ca SHA512 19c24fe2701ec6bf360a9e780a3573ea5ce2aad519412d66c18b9c331083c50e4dbbc453d04e931c7df0b9016a4407f316646ab00537a538bb5fdc9d84a97e54
 DIST pecl_http-3.2.1.tgz 221244 BLAKE2B b6581829fb8a800e24ccedd4d0f3efbaf558850bdc356d27a6e1d1097a8e2cfc61963a1daccd1d0f269a7cef5b243d45cdfaff5138321fe20df615dde44d19e3 SHA512 e67d4b32ba6f524e3fcf65f5497b94275e1a4a14fce97c57afe366369f368b3acdbedf364ed73cf983fb2c5f57f498adaa1100e7c936f11cbc5de1caedad7b51
 DIST pecl_http-3.2.4.tgz 220631 BLAKE2B 996236cf9dd2f7d9bfaf046306e99c3ccf778261df19df8fd828b5811798f784841d89a6890e7347bd20cc6da71c966ea3ac9b17bf058e0bb766db7e1a8a6c49 SHA512 59c41d57c94a6e50e2f0b261130a24791b2845246f783b55e7f644f9a897d3650da364c5b38a860761b4a23f9266ed05000d6348bae2a7941e59d6bf5fb61a9e
-DIST pecl_http-4.0.0.tgz 218259 BLAKE2B c9f5973686fd4db95a24dd4c50f217b93becc6a439066a395b0b7fec6e977154e5ae8f2261414458aed8e4a9d1281f44da2ecc67a05127610579f5be91196a88 SHA512 268b569c23f10ed72fe3c84fc5e5bf526c3e5ac345ca0556a24fbd01ce95da468d4e9aac6300d058001534ab826836793bf901e9560b744f1e20d7059be2ec79
-DIST pecl_http-4.1.0.tgz 220349 BLAKE2B 71152ee20930843636d90547339270fecf5569cb9a252a516c8150a134bf75fcb88b4fcfd129af1ca1366f4df775653b4dcdddbf0eb02426625550c1b1a0b483 SHA512 653c1dd8ec6dc738ce2dbf235a3c92522858e17ab9c0d00dd75a51bcfeb836f3fb02a6040b8b67d8d6839055286599958db844891686ca70c36031500be0bc1c
+DIST pecl_http-4.2.1.tgz 224452 BLAKE2B 58d2e1159aa64b9893b2b8b67c8444801308084ac13a743760c25cb3d0456fb586f69dc6b9e77db53341e4e9e45ce68f954c47b4e2663afe86de67d63db5e8e2 SHA512 2ad7e57fae313a7b46ba88e528e124ac9d83804827131a6ef478ccf3cf5883dec2d928b8ceb377ee7f5947c76f24d640d77533a9946612419e526786a79877e6
 EBUILD pecl-http-3.2.1.ebuild 2263 BLAKE2B 10fbe37789566e35b728134e8a8a5f3f8b5bb14175d471c112c68f5d8163bce79f4d57b419d9e707456227155827b5061da21f799500fd38b93a4e0526a1be75 SHA512 93c5002b610f37af407f632c16337bacefd0429492a158413757559063888d30b2eedc1f3ec4c823fcbdeb9e3143143344a9a1485e15d5854c332a1c926050ba
-EBUILD pecl-http-3.2.4.ebuild 2021 BLAKE2B f5cb3e15af3e2d4e263df6fe5b6a17f2beb2708950ba9259a2e571f18ff6da387390b42931adcc9251c4973fca9c5b9833659bf21918310f4400d4619aac4dc1 SHA512 86e25ed3765edf637cf9fbcb3d670366d82bba7a3f83542217693f6df530379baeb80ebe5a2c5a5f731497fc557e24aec866dd5980af4a79aff56f6e5b4f2676
-EBUILD pecl-http-4.0.0.ebuild 1747 BLAKE2B e73bd951bab8c3b1fc2da5e28557f77bf5b9dbad70440960ed43068ad4c1af26fa7d4745d05f4c5490bbf7cfcb8d47740e7e39d70323adcae83a89ca08500aa3 SHA512 c5e8b1b34da25acc2698dd6d1eab1d84dacb67730e28cf594f9084575cd2264a33e2b250d37fcb690bbfdecb52eb2c032e629e180bffa5781d5e7ce3d785e34e
-EBUILD pecl-http-4.1.0.ebuild 1879 BLAKE2B 7e22bd02d6ef7dff6089da17643d124a10a1f4a0e23aab29152ae11d950d044f6b5b7437af817a9a6aefc7a1f7503cefc4839e02583cea7aae46faac57ecc08c SHA512 f477e7613249544d842ae5277dc33a90df0097b05bb9d56e5200662bf8e380a5581b2b31ea60ba9278a1fe71331bb97677e54c91746f3b4052296cd8350427e3
+EBUILD pecl-http-3.2.4-r1.ebuild 2229 BLAKE2B 445ce6fc6ea5179cce22a9fb5a0d014d43a0da20d812ea45b190b3cf1fe4aecfac1d87ca15b478f5c671aa74a2e5bbefb37ed0d2ea60524442cb2649af2892be SHA512 8f72982eabfc0bc712d54890baf4dabb07c4ca2bec89df91904484bbbef321f7496e5037dc6b6e30064c661f8f3f9d99161d077fe9b92105ad1c16ba488877dc
+EBUILD pecl-http-4.2.1.ebuild 1830 BLAKE2B d4150e54da5c4c74685971133e9abe32af0c37b3e34e085dc23cdd64133884478df6fda8561a447fd3ef54939f5551eb416920f017c98e4ee29d097337febab0 SHA512 29bb1775656308df9c88e5cc2801b6f185b3ed4077b793f0c51da6b62b0cc520cf6fca5c0c04796817d059cec032f2321c2944e26773db095fea40f1afb0c178
 MISC metadata.xml 240 BLAKE2B f60f325331d493a555e53c29c7cf2742a415356da28a467505f1441f3fd790fd0d59050df84854bdc379d19d94a46121216479807975a2922d5a2fefde83416b SHA512 fada9d69055f2be962b95aac82f260ec5db7a3f4392d10f0458a1d125938fa17539f7ec486000f3a95cff85a3fbb6bbf1f6f4fe6c2de7aa420a7543a3e89d03e
diff --git a/dev-php/pecl-http/files/pecl-http-3.2.4-curl-cookies.patch b/dev-php/pecl-http/files/pecl-http-3.2.4-curl-cookies.patch
new file mode 100644
index 000000000000..3c124b4624a6
--- /dev/null
+++ b/dev-php/pecl-http/files/pecl-http-3.2.4-curl-cookies.patch
@@ -0,0 +1,11 @@
+--- a/src/php_http_client_curl.c	2021-01-13 10:34:34.000000000 -0500
++++ b/src/php_http_client_curl.c	2021-09-22 10:38:58.854615743 -0400
+@@ -834,7 +834,7 @@
+ 	} else {
+ 		storage->cookiestore = NULL;
+ 	}
+-	if (	CURLE_OK != curl_easy_setopt(ch, CURLOPT_COOKIEFILE, storage->cookiestore)
++	if (	CURLE_OK != curl_easy_setopt(ch, CURLOPT_COOKIEFILE, storage->cookiestore ? storage->cookiestore : "")
+ 		||	CURLE_OK != curl_easy_setopt(ch, CURLOPT_COOKIEJAR, storage->cookiestore)
+ 	) {
+ 		return FAILURE;
diff --git a/dev-php/pecl-http/files/pecl-http-4.1.0-use-getenv.patch b/dev-php/pecl-http/files/pecl-http-4.1.0-use-getenv.patch
deleted file mode 100644
index c3ad7d968360..000000000000
--- a/dev-php/pecl-http/files/pecl-http-4.1.0-use-getenv.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-commit a4f66fb42bb5203e9d1897a6cf554aa702ce0380
-Author:     Thomas Deutschmann <whissi@gentoo.org>
-AuthorDate: Tue May 18 19:55:47 2021 +0200
-Commit:     Thomas Deutschmann <whissi@gentoo.org>
-CommitDate: Tue May 18 19:55:47 2021 +0200
-
-    tests: use getenv() to access environment variable
-    
-    Fixes
-    
-      Warning: Undefined array key "PATH" in pecl-http-4.1.0/work/php8.0/tests/skipif.inc on line 56
-
-diff --git a/tests/skipif.inc b/tests/skipif.inc
-index 51272fb..76c3bd7 100644
---- a/tests/skipif.inc
-+++ b/tests/skipif.inc
-@@ -53,7 +53,7 @@ function skip_http2_test($message = "skip need http2 support") {
- 	if (!(http\Client\Curl\FEATURES & http\Client\Curl\Features\HTTP2)) {
- 		die("$message (FEATURES & HTTP2)\n");
- 	}
--	foreach (explode(":", $_ENV["PATH"]) as $path) {
-+	foreach (explode(":", getenv("PATH")) as $path) {
- 		if (is_executable($path . "/nghttpd")) {
- 			return;
- 		}
diff --git a/dev-php/pecl-http/pecl-http-3.2.4.ebuild b/dev-php/pecl-http/pecl-http-3.2.4-r1.ebuild
index 0a717e5377db..94c0833cc07d 100644
--- a/dev-php/pecl-http/pecl-http-3.2.4.ebuild
+++ b/dev-php/pecl-http/pecl-http-3.2.4-r1.ebuild
@@ -22,14 +22,16 @@ LICENSE="BSD-2 MIT"
 SLOT="7"
 IUSE="ssl curl_ssl_gnutls curl_ssl_nss +curl_ssl_openssl"
 
+# Patch gets cookies working with curl 7.77, but further interop work was done later
+# Just set min version for this short time to live branch
 COMMON_DEPEND="app-arch/brotli:=
 	dev-libs/libevent
 	dev-php/pecl-propro:7[php_targets_php7-3(-)?,php_targets_php7-4(-)?]
 	>=dev-php/pecl-raphf-2.0.1:7[php_targets_php7-3(-)?,php_targets_php7-4(-)?]
 	net-dns/libidn2
 	sys-libs/zlib
-	ssl? ( net-misc/curl[ssl,curl_ssl_gnutls(-)=,curl_ssl_nss(-)=,curl_ssl_openssl(-)=] )
-	!ssl? ( net-misc/curl[-ssl] )
+	ssl? ( >=net-misc/curl-7.77[ssl,curl_ssl_gnutls(-)=,curl_ssl_nss(-)=,curl_ssl_openssl(-)=] )
+	!ssl? ( >=net-misc/curl-7.77[-ssl] )
 "
 DEPEND="
 	php_targets_php7-3? ( ${COMMON_DEPEND} dev-lang/php:7.3[hash(+),session(-),iconv(-)] )
@@ -39,6 +41,8 @@ RDEPEND="${DEPEND}
 
 PHP_EXT_ECONF_ARGS=( --with-http --without-http-shared-deps --without-http-libidn-dir )
 
+PATCHES=( "${FILESDIR}/${P}-curl-cookies.patch" )
+
 src_prepare() {
 	if use php_targets_php7-3 || use php_targets_php7-4 ; then
 		php-ext-source-r3_src_prepare
diff --git a/dev-php/pecl-http/pecl-http-4.0.0.ebuild b/dev-php/pecl-http/pecl-http-4.0.0.ebuild
deleted file mode 100644
index 92ccc331b626..000000000000
--- a/dev-php/pecl-http/pecl-http-4.0.0.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PHP_EXT_NAME="http"
-PHP_EXT_PECL_PKG="pecl_http"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-PHP_INI_NAME="50-http"
-
-USE_PHP="php7-3 php7-4 php8-0"
-
-inherit php-ext-pecl-r3
-
-USE_PHP="php8-0"
-
-KEYWORDS="~amd64 ~x86"
-
-DESCRIPTION="Extended HTTP Support for PHP"
-LICENSE="BSD-2 MIT"
-SLOT="8"
-IUSE="ssl curl_ssl_gnutls curl_ssl_nss +curl_ssl_openssl"
-
-COMMON_DEPEND="app-arch/brotli:=
-	dev-libs/libevent
-	>=dev-php/pecl-raphf-2.0.1:7[php_targets_php8-0(-)?]
-	net-dns/libidn2
-	sys-libs/zlib
-	ssl? ( net-misc/curl[ssl,curl_ssl_gnutls(-)=,curl_ssl_nss(-)=,curl_ssl_openssl(-)=] )
-	!ssl? ( net-misc/curl[-ssl] )
-"
-DEPEND="
-	php_targets_php8-0? ( ${COMMON_DEPEND} dev-lang/php:8.0[session(-),iconv(-)] )"
-RDEPEND="${DEPEND}
-	php_targets_php7-3? ( dev-php/pecl-http:7[php_targets_php7-3(-)] )
-	php_targets_php7-4? ( dev-php/pecl-http:7[php_targets_php7-4(-)] )"
-
-PHP_EXT_ECONF_ARGS=( --with-http --without-http-shared-deps --without-http-libidn-dir )
-
-src_prepare() {
-	if use php_targets_php8-0 ; then
-		php-ext-source-r3_src_prepare
-	else
-		default_src_prepare
-	fi
-}
-
-src_install() {
-	if use php_targets_php8-0 ; then
-		php-ext-pecl-r3_src_install
-	fi
-}
-
-src_test() {
-	# Cannot use eclass function due to required modules
-	# All tests SKIP otherwise
-	for slot in $(php_get_slots); do
-		php_init_slot_env "${slot}"
-		# Link in required modules for testing
-		ln -s "${EXT_DIR}/raphf.so" "modules/raphf.so" || die
-		sed -i \
-			's/PHP_TEST_SHARED_EXTENSIONS)/PHP_TEST_SHARED_EXTENSIONS) -d extension=raphf/' \
-			Makefile || die
-		SKIP_ONLINE_TESTS=yes NO_INTERACTION="yes" emake test
-		# Clean up testing links
-		rm modules/raphf.so || die
-	done
-}
diff --git a/dev-php/pecl-http/pecl-http-4.1.0.ebuild b/dev-php/pecl-http/pecl-http-4.2.1.ebuild
index 9ffc9765e462..00f8de1189da 100644
--- a/dev-php/pecl-http/pecl-http-4.1.0.ebuild
+++ b/dev-php/pecl-http/pecl-http-4.2.1.ebuild
@@ -38,8 +38,6 @@ RDEPEND="${DEPEND}
 
 PHP_EXT_ECONF_ARGS=( --with-http --without-http-shared-deps --without-http-libidn-dir )
 
-PATCHES=( "${FILESDIR}"/${P}-use-getenv.patch )
-
 src_prepare() {
 	if use php_targets_php8-0 ; then
 		php-ext-source-r3_src_prepare
diff --git a/dev-php/pecl-imagick/Manifest b/dev-php/pecl-imagick/Manifest
index a8937fe38621..acf2e5ceb08f 100644
--- a/dev-php/pecl-imagick/Manifest
+++ b/dev-php/pecl-imagick/Manifest
@@ -1,7 +1,3 @@
-DIST imagick-3.4.4.tgz 253434 BLAKE2B 73ce21547881b60733dbc19ae83cd2e60135dbb4052ea723f1ee10b3759ce12065a0cab2a7e4923b78e9e68b12fd7b875c7d1bd7b2a14ce4e4d7ff5b9c7fbc06 SHA512 73145a1f095849c32760db2dfc4acc13c57d99a037d65eca9b0ddf8f8e81cf6d28a50f2614e44bae1d90b4f881a2e9a64926e0e3b9403e491fd903ffeb30c4b7
-DIST imagick-3.5.0.tgz 300657 BLAKE2B 7cf2c34b84a10f451851493b27a33f7188da0ad53673589db494a6b1a9ae089c5b3e646de4f7b76c29ffb8cbe1c8154ebc8b69d61bc597b082d33778e8f3a18f SHA512 4176494797c78fee28fbf076ee67afe4a634703dd19fa2f727aeb6accc2d65a3fc6224c3131f25d3ac60b2e8d531da2cf76d35800d1f10071cf362067cf531ec
 DIST imagick-3.5.1.tgz 301411 BLAKE2B 551c8a0aa07b18938fce3e39ee503ed053efb261fab712d1c1ba2fb941a911307b8d9e88257dddde19dfa77886688b5b704eb7e1cd65bba734e10b5391661374 SHA512 b922c4fad994a4bf26f4d92b6e81bb761bd8d4d1b52f4b7099cf944cdaed4e44d0318beccfb2cf3bee2605ce33b0ad764d9e3d2ba99c9a6f624ca569a4ac73ad
-EBUILD pecl-imagick-3.4.4.ebuild 756 BLAKE2B 454d515c41354657474a6cef529c09144a5d4c6485b2796691ddfbd6bb4cc1af3ca7cadae84e00c568f7c0e9139c24ff8e5f65db0afce6aaf53293cec8912015 SHA512 f39ceb78e5510351762a2f3c15808976d4ecb044476860b559a78b2bd0cb959cc0e9b213800f701f1e0f1ef1c0ba1da919787dc930696445212b25971b4426db
-EBUILD pecl-imagick-3.5.0.ebuild 863 BLAKE2B f32530e9e27ae8a11db644dbf2c232d28ebad9bc7c60237879c9980f4d2cc5256920dedd2a01fab822d96cf742bdf3a537d010d83729e73a191bcaa92a91cbdc SHA512 f909dd4b728049b76ec3c835dc2de58b4ddfb3c19276ccb3fd43f666cec17f1def25b15645798e0f7b6a0fa108ad552280957c5effb4298a245b79c5eb190425
-EBUILD pecl-imagick-3.5.1.ebuild 863 BLAKE2B f32530e9e27ae8a11db644dbf2c232d28ebad9bc7c60237879c9980f4d2cc5256920dedd2a01fab822d96cf742bdf3a537d010d83729e73a191bcaa92a91cbdc SHA512 f909dd4b728049b76ec3c835dc2de58b4ddfb3c19276ccb3fd43f666cec17f1def25b15645798e0f7b6a0fa108ad552280957c5effb4298a245b79c5eb190425
+EBUILD pecl-imagick-3.5.1.ebuild 861 BLAKE2B 31072a907b40812bb1a970aadfb637bfc89409a980fe788020d3a94f717967f7d9df9556aff63539a8702084bb154ddf03757874311900a2b662c8c9544b5486 SHA512 382263c9b9175c1dae501729142d950006e402fd72f3fbbfdc671bd89ee33731b4e3257ba86998296936afd323e10553edad30f3fc3574091a325c659b4b1db7
 MISC metadata.xml 359 BLAKE2B d4097f49cede8e9756516f72966ca0eb1a3dae8655db21065fe2196442aa0e23b63f070b8510f031ce189620efc8b293de00266e14c120d3efe84312da737019 SHA512 c5eeeb6eb11fce27a705cd4d75719af7557a5c11cf391f7191dc482b8518a19211e114dfd82cf897a7891affbd6ff6ab4aebd00fe78e79a7d53305517664face
diff --git a/dev-php/pecl-imagick/pecl-imagick-3.4.4.ebuild b/dev-php/pecl-imagick/pecl-imagick-3.4.4.ebuild
deleted file mode 100644
index c2972c5a4363..000000000000
--- a/dev-php/pecl-imagick/pecl-imagick-3.4.4.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PHP_EXT_NAME="imagick"
-USE_PHP="php5-6 php7-1 php7-2 php7-3 php7-4"
-
-inherit php-ext-pecl-r3
-
-KEYWORDS="amd64 ~arm ~arm64 x86"
-
-DESCRIPTION="PHP wrapper for the ImageMagick library"
-HOMEPAGE="https://pecl.php.net/imagick https://github.com/mkoppanen/imagick"
-LICENSE="PHP-3.01"
-SLOT="0"
-IUSE="examples test"
-RESTRICT="!test? ( test )"
-
-# imagemagick[-openmp] is needed wrt bug 547922 and upstream
-# https://github.com/mkoppanen/imagick#openmp
-RDEPEND=">=media-gfx/imagemagick-6.2.4:=[-openmp]"
-DEPEND="${RDEPEND}
-	test? ( >=media-gfx/imagemagick-6.2.4:=[hdri,jpeg,png,svg,truetype,xml] )"
-
-PHP_EXT_ECONF_ARGS="--with-imagick=${EPREFIX}/usr"
diff --git a/dev-php/pecl-imagick/pecl-imagick-3.5.0.ebuild b/dev-php/pecl-imagick/pecl-imagick-3.5.0.ebuild
deleted file mode 100644
index b9df58ef938a..000000000000
--- a/dev-php/pecl-imagick/pecl-imagick-3.5.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PHP_EXT_NAME="imagick"
-USE_PHP="php7-3 php7-4 php8-0"
-
-inherit php-ext-pecl-r3
-
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-DESCRIPTION="PHP wrapper for the ImageMagick library"
-HOMEPAGE="https://pecl.php.net/package/imagick https://github.com/Imagick/imagick"
-LICENSE="PHP-3.01"
-SLOT="0"
-IUSE="examples test"
-RESTRICT="!test? ( test )"
-
-# imagemagick[-openmp] is needed wrt bug 547922 and upstream
-# https://github.com/Imagick/imagick#openmp
-RDEPEND=">=media-gfx/imagemagick-6.2.4:=[-openmp]"
-DEPEND="${RDEPEND}
-	test? ( >=media-gfx/imagemagick-6.2.4:=[hdri,jpeg,png,svg,truetype,xml] )"
-
-PHP_EXT_ECONF_ARGS="--with-imagick=${EPREFIX}/usr"
-
-src_install() {
-	php-ext-pecl-r3_src_install
-
-	php-ext-source-r3_addtoinifiles "imagick.skip_version_check" "1"
-}
diff --git a/dev-php/pecl-imagick/pecl-imagick-3.5.1.ebuild b/dev-php/pecl-imagick/pecl-imagick-3.5.1.ebuild
index b9df58ef938a..bc3b95efa6d7 100644
--- a/dev-php/pecl-imagick/pecl-imagick-3.5.1.ebuild
+++ b/dev-php/pecl-imagick/pecl-imagick-3.5.1.ebuild
@@ -8,7 +8,7 @@ USE_PHP="php7-3 php7-4 php8-0"
 
 inherit php-ext-pecl-r3
 
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 DESCRIPTION="PHP wrapper for the ImageMagick library"
 HOMEPAGE="https://pecl.php.net/package/imagick https://github.com/Imagick/imagick"
diff --git a/dev-php/pecl-mcrypt/Manifest b/dev-php/pecl-mcrypt/Manifest
index da012dac2c31..33f4574a07bd 100644
--- a/dev-php/pecl-mcrypt/Manifest
+++ b/dev-php/pecl-mcrypt/Manifest
@@ -1,5 +1,5 @@
 DIST mcrypt-1.0.3.tgz 33590 BLAKE2B 5de1108f53604fffea9e3cb64d9efdae2008da164acd47b27fd0df8f12a0f508345d63bee4d588c1eecd9a935f8be3b2db5c3d119c5b3013955c54085ebe9e9f SHA512 ef215b576b471d6e1ecac4bb097f518fa57fd551b678b7fdddd9d5058f6667b0ee757e887f00b61672b89cd86f1962cbfe0e355681fa47daba9873c3bf4db679
 DIST mcrypt-1.0.4.tgz 27056 BLAKE2B 3faa77299ef1b5ab3f5a427b57d64f5f5ec54bc41f83924bfd285289c168341c0f044970fb0c37ca8561e68be165a40b2d6fd423ed6d5aa74225d5a3fb349546 SHA512 6a8244761035640366041a5f26057ab14bb85eaaa973ddf604e152b786ef750ec775ae91d7582044700d6fdef902425f3a9d6839113a52e0a9f957bf9d0c189a
 EBUILD pecl-mcrypt-1.0.3.ebuild 726 BLAKE2B 869726eb6c6e36082f3ca9e1c23f993d46b9733de66a087a4e0139f8703f2bfb4759ca15d259bd4c9f2a13e5d752ef63e33e533a3dff150f5c8e9d3a3490e397 SHA512 a1dfe478a62d2f93bfe5cdf93da2ad15a0d731f2f4869c1a37be2fef187b61884d87e86e661d19b122b53123035eb0fed8fb7738133198f8e71762a3d9309727
-EBUILD pecl-mcrypt-1.0.4.ebuild 529 BLAKE2B 98566f6d80cab2ea9dfe3c942bb69f04b648c3e8551409b38d04cea62ab816e004126e1516f0617fcdc1ef3c989865d25ea1c780780bec7269a1b857f6d3cee9 SHA512 376f11b1df559092041c96c1171baab6e100d56fbeb6b4d8e1e6c7ce903513672725bbc751a04ae374b950109c60936565d6c28879d4e0057d01fc62e98ca7bc
+EBUILD pecl-mcrypt-1.0.4.ebuild 528 BLAKE2B fc56eb2a581e1ba1edf7adb4b952b8305245ecc67eb2e3449fd83d57029dd224be26d77e34bfa8d135ae53b6daeff6301d45356042735108d091519a9bb782f3 SHA512 da4dd33965d8e855dd2543d82dba4de557e48a53db648c236d42d3ce59dfe5365bf54f6b02ba564dee62aca83291f37cfc10234b575771b5d032b8dfbba86776
 MISC metadata.xml 410 BLAKE2B f833751f407d57c96e4e2f2dd05520c55037ba7874e753750df8a22d4c18a5edaf0925982b2b04c4e7e541bd691c6d7798bef0079fe980b35a9f71f5e2405793 SHA512 cf4f51a91d42ff06b0d628c44ee66463a1903de18e749d690a722e2fe77d95d83ba709595adc20e27976de502c5a5e232065d394eb41c03f9d39a8291a874841
diff --git a/dev-php/pecl-mcrypt/pecl-mcrypt-1.0.4.ebuild b/dev-php/pecl-mcrypt/pecl-mcrypt-1.0.4.ebuild
index e7895b657c1a..1eeeafa5540d 100644
--- a/dev-php/pecl-mcrypt/pecl-mcrypt-1.0.4.ebuild
+++ b/dev-php/pecl-mcrypt/pecl-mcrypt-1.0.4.ebuild
@@ -15,7 +15,7 @@ inherit php-ext-pecl-r3
 DESCRIPTION="Bindings for the libmcrypt library"
 LICENSE="PHP-3.01"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 
 DEPEND="dev-libs/libmcrypt"
 RDEPEND="${DEPEND}"
diff --git a/dev-php/pecl-ssh2/Manifest b/dev-php/pecl-ssh2/Manifest
index cdd97d9110b7..5550c2fd126e 100644
--- a/dev-php/pecl-ssh2/Manifest
+++ b/dev-php/pecl-ssh2/Manifest
@@ -1,10 +1,4 @@
-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
 DIST ssh2-1.3.1.tgz 33838 BLAKE2B 05976ad143563fd9d51be3f8e23b5b22099e351d6f252b612aa1dcb56648dc337b623d2cddf7b9079f3e07c879ca69215a1987cd6f4326f97ba134e13c6d28e7 SHA512 c74d4f699853148b53cdca0eaf8837bfdbdd21d185761606acadf2442e84dbefdb00cde207e0ce4794ae1e4f8692a38ed903b6d11fdc57bca7b54a4250da9a76
-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-1.3.1.ebuild 454 BLAKE2B 992884788f2a0e2b537adee29cc8a3830fdc77a745be0f2779738c263513fec5b4bf4581aab9eb134892157677a14f4bf905d405437c1cf44559f1b90ad9ba71 SHA512 28eefb2d2f27d22affd5e6b4dd1745e4140a322133ad40ec2ce51954f671810be1991cbfedea60b86dc152a70cf0ce7ca1f1e39418c3dd1045412a6018dec89b
+EBUILD pecl-ssh2-1.3.1.ebuild 452 BLAKE2B c6a590ad15c9bcc6ae442a043b068e9f88d0e3ac4045b9c44f219fd9a18f98befc384fd1d513076c8f186df042076b626709109e9ce4fb458405081a1d36fb53 SHA512 103b73ce6f098782fc7a7b49644ccc6558cf0a9ad71f1556b002c76775969bb1cab7c7f450ef8dbd220b9067ea9745d32871617262a54ca71693c6284b850e34
 EBUILD pecl-ssh2-9999.ebuild 470 BLAKE2B df043a226f20088177b0734bcb88d4096fde26ddfcc9a328746c729a4d64aa6e9423bb027e096aa19ead8ec27532874e804cc72be78dd6ef7fc65b61449d832d SHA512 46e54835cf0b3c793eb821113d318b0a797409dc19833922369608eb42c7a877c039fb36243796cc69afcc9308f35832a8f8378b3715704642953d3e4b63e359
 MISC metadata.xml 236 BLAKE2B 55612da78a71f8cee31c387a5862636996734210d765fac66d8c7706acc5151e6a9e7ff5123aeb097c911495c6220ba3b5d2f1355f46e8ab6bdb240e1697e26d SHA512 2782b20a65dca663ff7c64b7e67db05641abed478fd5996e5750b2e52ba870829f89125baa8967dd29fd20ef9b46ad233b0dd08801308b7756717ec2f292446c
diff --git a/dev-php/pecl-ssh2/files/pecl-ssh2-1.1.2-fix-php_url-fields-usage-for-php7-3.patch b/dev-php/pecl-ssh2/files/pecl-ssh2-1.1.2-fix-php_url-fields-usage-for-php7-3.patch
deleted file mode 100644
index 1f1352564220..000000000000
--- a/dev-php/pecl-ssh2/files/pecl-ssh2-1.1.2-fix-php_url-fields-usage-for-php7-3.patch
+++ /dev/null
@@ -1,302 +0,0 @@
-From a8835aab2c15e794fce13bd927295719e384ad2d Mon Sep 17 00:00:00 2001
-From: Remi Collet <remi@php.net>
-Date: Thu, 28 Jun 2018 07:10:35 +0200
-Subject: [PATCH] fix php_url fields usage for PHP 7.3
-
----
- php_ssh2.h            |  8 ++++++++
- ssh2_fopen_wrappers.c | 55 ++++++++++++++++++++++++++++++++-------------------
- ssh2_sftp.c           | 20 +++++++++----------
- 3 files changed, 53 insertions(+), 30 deletions(-)
-
-diff --git a/php_ssh2.h b/php_ssh2.h
-index 734b795..d010ff9 100644
---- a/php_ssh2.h
-+++ b/php_ssh2.h
-@@ -166,6 +166,14 @@ extern php_stream_wrapper php_ssh2_sftp_wrapper;
- extern int le_ssh2_session;
- extern int le_ssh2_sftp;
- 
-+#if PHP_VERSION_ID < 70300
-+#define SSH2_URL_STR(a) (a)
-+#define SSH2_URL_LEN(a) strlen(a)
-+#else
-+#define SSH2_URL_STR(a) ZSTR_VAL(a)
-+#define SSH2_URL_LEN(a) ZSTR_LEN(a)
-+#endif
-+
- #endif	/* PHP_SSH2_H */
- 
- /*
-diff --git a/ssh2_fopen_wrappers.c b/ssh2_fopen_wrappers.c
-index 2f96ca4..f2f3475 100644
---- a/ssh2_fopen_wrappers.c
-+++ b/ssh2_fopen_wrappers.c
-@@ -215,7 +215,7 @@ php_url *php_ssh2_fopen_wraper_parse_path(const char *path, char *type, php_stre
- 	php_url *resource;
- 	zval *methods = NULL, *callbacks = NULL, zsession, *tmpzval;
- 	zend_long resource_id;
--	char *h, *s, *username = NULL, *password = NULL, *pubkey_file = NULL, *privkey_file = NULL;
-+	char *h, *username = NULL, *password = NULL, *pubkey_file = NULL, *privkey_file = NULL;
- 	int username_len = 0, password_len = 0;
- 
- 	h = strstr(path, "Resource id #");
-@@ -233,13 +233,13 @@ php_url *php_ssh2_fopen_wraper_parse_path(const char *path, char *type, php_stre
- 		return NULL;
- 	}
- 
--	if (strncmp(resource->scheme, "ssh2.", sizeof("ssh2.") - 1)) {
-+	if (strncmp(SSH2_URL_STR(resource->scheme), "ssh2.", sizeof("ssh2.") - 1)) {
- 		/* Not an ssh wrapper */
- 		php_url_free(resource);
- 		return NULL;
- 	}
- 
--	if (strcmp(resource->scheme + sizeof("ssh2.") - 1, type)) {
-+	if (strcmp(SSH2_URL_STR(resource->scheme) + sizeof("ssh2.") - 1, type)) {
- 		/* Wrong ssh2. wrapper type */
- 		php_url_free(resource);
- 		return NULL;
-@@ -253,13 +253,27 @@ php_url *php_ssh2_fopen_wraper_parse_path(const char *path, char *type, php_stre
- 		Find resource->path in the path string, then copy the entire string from the original path.
- 		This includes ?query#fragment in the path string
- 	*/
-+// TODO copy seems uneeded
-+#if PHP_VERSION_ID < 70300
-+	{
-+	char * s;
-+
- 	s = resource->path;
- 	resource->path = estrdup(strstr(path, resource->path));
- 	efree(s);
-+	}
-+#else
-+	{
-+	zend_string *tmp;
-+
-+	tmp = resource->path;
-+	resource->path = zend_string_init(ZSTR_VAL(resource->path), ZSTR_LEN(resource->path), 0);
-+	zend_string_release(tmp);
-+	}
-+#endif
- 
- 	/* Look for a resource ID to reuse a session */
--	s = resource->host;
--	if (is_numeric_string(s, strlen(s), &resource_id, NULL, 0) == IS_LONG) {
-+	if (is_numeric_string(SSH2_URL_STR(resource->host), SSH2_URL_LEN(resource->host), &resource_id, NULL, 0) == IS_LONG) {
- 		php_ssh2_sftp_data *sftp_data;
- 		zval *zresource;
- 
-@@ -309,7 +323,7 @@ php_url *php_ssh2_fopen_wraper_parse_path(const char *path, char *type, php_stre
- 	}
- 
- 	/* Fallback on finding it in the context */
--	if (resource->host[0] == 0 && context && psftp &&
-+	if (SSH2_URL_STR(resource->host)[0] == 0 && context && psftp &&
- 		(tmpzval = php_stream_context_get_option(context, "ssh2", "sftp")) != NULL &&
- 		Z_TYPE_P(tmpzval) == IS_RESOURCE) {
- 		php_ssh2_sftp_data *sftp_data;
-@@ -323,7 +337,7 @@ php_url *php_ssh2_fopen_wraper_parse_path(const char *path, char *type, php_stre
- 			return resource;
- 		}
- 	}
--	if (resource->host[0] == 0 && context &&
-+	if (SSH2_URL_STR(resource->host)[0] == 0 && context &&
- 		(tmpzval = php_stream_context_get_option(context, "ssh2", "session")) != NULL &&
- 		Z_TYPE_P(tmpzval) == IS_RESOURCE) {
- 		session = (LIBSSH2_SESSION *)zend_fetch_resource(Z_RES_P(tmpzval), PHP_SSH2_SESSION_RES_NAME, le_ssh2_session);
-@@ -399,19 +413,19 @@ php_url *php_ssh2_fopen_wraper_parse_path(const char *path, char *type, php_stre
- 	}
- 
- 	if (resource->user) {
--		int len = strlen(resource->user);
-+		int len = SSH2_URL_LEN(resource->user);
- 
- 		if (len) {
--			username = resource->user;
-+			username = SSH2_URL_STR(resource->user);
- 			username_len = len;
- 		}
- 	}
- 
- 	if (resource->pass) {
--		int len = strlen(resource->pass);
-+		int len = SSH2_URL_LEN(resource->pass);
- 
- 		if (len) {
--			password = resource->pass;
-+			password = SSH2_URL_STR(resource->pass);
- 			password_len = len;
- 		}
- 	}
-@@ -422,7 +436,7 @@ php_url *php_ssh2_fopen_wraper_parse_path(const char *path, char *type, php_stre
- 		return NULL;
- 	}
- 
--	session = php_ssh2_session_connect(resource->host, resource->port, methods, callbacks);
-+	session = php_ssh2_session_connect(SSH2_URL_STR(resource->host), resource->port, methods, callbacks);
- 	if (!session) {
- 		/* Unable to connect! */
- 		php_url_free(resource);
-@@ -482,6 +496,7 @@ session_authed:
- 		*psftp = sftp;
- 	}
- 
-+	//TODO may be undefined
- 	*presource_id = Z_LVAL(zsession);
- 	*psession = session;
- 
-@@ -527,7 +542,7 @@ static php_stream *php_ssh2_shell_open(LIBSSH2_SESSION *session, int resource_id
- 					zval_copy_ctor(&copyval);
- 					convert_to_string(&copyval);
- 					if (libssh2_channel_setenv_ex(channel, key->val, key->len, Z_STRVAL(copyval), Z_STRLEN(copyval))) {
--						php_error_docref(NULL, E_WARNING, "Failed setting %s=%s on remote end", key, Z_STRVAL(copyval));
-+						php_error_docref(NULL, E_WARNING, "Failed setting %s=%s on remote end", ZSTR_VAL(key), Z_STRVAL(copyval));
- 					}
- 					zval_dtor(&copyval);
- 				}
-@@ -631,7 +646,7 @@ static php_stream *php_ssh2_fopen_wrapper_shell(php_stream_wrapper *wrapper, con
- 		zval_ptr_dtor(&copyval);
- 	}
- 
--	s = resource->path ? resource->path : NULL;
-+	s = resource->path ? SSH2_URL_STR(resource->path) : NULL;
- 
- 	if (s && s[0] == '/') {
- 		/* Terminal type encoded into URL overrides context terminal type */
-@@ -766,7 +781,7 @@ static php_stream *php_ssh2_exec_command(LIBSSH2_SESSION *session, int resource_
- 					zval_copy_ctor(&copyval);
- 					convert_to_string(&copyval);
- 					if (libssh2_channel_setenv_ex(channel, key->val, key->len, Z_STRVAL(copyval), Z_STRLEN(copyval))) {
--						php_error_docref(NULL, E_WARNING, "Failed setting %s=%s on remote end", key, Z_STRVAL(copyval));
-+						php_error_docref(NULL, E_WARNING, "Failed setting %s=%s on remote end", ZSTR_VAL(key), Z_STRVAL(copyval));
- 					}
- 					zval_dtor(&copyval);
- 				}
-@@ -878,7 +893,7 @@ 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, resource->path + 1, terminal, terminal_len, environment, width, height, type);
-+	stream = php_ssh2_exec_command(session, resource_id, SSH2_URL_STR(resource->path) + 1, terminal, terminal_len, environment, width, height, type);
- 	if (!stream) {
- 		// TODO Sean-Der
- 		//zend_list_delete(resource_id);
-@@ -1021,7 +1036,7 @@ static php_stream *php_ssh2_fopen_wrapper_scp(php_stream_wrapper *wrapper, const
- 		return NULL;
- 	}
- 
--	stream = php_ssh2_scp_xfer(session, resource_id, resource->path);
-+	stream = php_ssh2_scp_xfer(session, resource_id, SSH2_URL_STR(resource->path));
- 	if (!stream) {
- 		//TODO Sean-Der
- 		//zend_list_delete(resource_id);
-@@ -1147,7 +1162,7 @@ PHP_FUNCTION(ssh2_scp_send)
- 		char *error_msg = NULL;
- 
- 		last_error = libssh2_session_last_error(session, &error_msg, NULL, 0);
--		php_error_docref(NULL, E_WARNING, "Failure creating remote file: %s", error_msg);
-+		php_error_docref(NULL, E_WARNING, "Failure creating remote file: %s (%d)", error_msg, last_error);
- 		php_stream_close(local_file);
- 		RETURN_FALSE;
- 	}
-@@ -1262,10 +1277,10 @@ static php_stream *php_ssh2_fopen_wrapper_tunnel(php_stream_wrapper *wrapper, co
- 		return NULL;
- 	}
- 
--	if (resource->path && resource->path[0] == '/') {
-+	if (resource->path && SSH2_URL_STR(resource->path)[0] == '/') {
- 		char *colon;
- 
--		host = resource->path + 1;
-+		host = SSH2_URL_STR(resource->path) + 1;
- 		if (*host == '[') {
- 			/* IPv6 Encapsulated Format */
- 			host++;
-diff --git a/ssh2_sftp.c b/ssh2_sftp.c
-index 13f89f0..6332be8 100644
---- a/ssh2_sftp.c
-+++ b/ssh2_sftp.c
-@@ -238,7 +238,7 @@ static php_stream *php_ssh2_sftp_stream_opener(php_stream_wrapper *wrapper, cons
- 
- 	flags = php_ssh2_parse_fopen_modes((char *)mode);
- 
--	handle = libssh2_sftp_open(sftp, resource->path, flags, perms);
-+	handle = libssh2_sftp_open(sftp, SSH2_URL_STR(resource->path), flags, perms);
- 	if (!handle) {
- 		php_error_docref(NULL, E_WARNING, "Unable to open %s on remote host", filename);
- 		php_url_free(resource);
-@@ -341,7 +341,7 @@ static php_stream *php_ssh2_sftp_dirstream_opener(php_stream_wrapper *wrapper, c
- 		return NULL;
- 	}
- 
--	handle = libssh2_sftp_opendir(sftp, resource->path);
-+	handle = libssh2_sftp_opendir(sftp, SSH2_URL_STR(resource->path));
- 	if (!handle) {
- 		php_error_docref(NULL, E_WARNING, "Unable to open %s on remote host", filename);
- 		php_url_free(resource);
-@@ -386,7 +386,7 @@ static int php_ssh2_sftp_urlstat(php_stream_wrapper *wrapper, const char *url, i
- 		return -1;
- 	}
- 
--	if (libssh2_sftp_stat_ex(sftp, resource->path, strlen(resource->path),
-+	if (libssh2_sftp_stat_ex(sftp, SSH2_URL_STR(resource->path), SSH2_URL_LEN(resource->path),
- 		(flags & PHP_STREAM_URL_STAT_LINK) ? LIBSSH2_SFTP_LSTAT : LIBSSH2_SFTP_STAT, &attrs)) {
- 		php_url_free(resource);
- 		//zend_list_delete(sftp_rsrcid);
-@@ -420,7 +420,7 @@ static int php_ssh2_sftp_unlink(php_stream_wrapper *wrapper, const char *url, in
- 		return 0;
- 	}
- 
--	result = libssh2_sftp_unlink(sftp, resource->path);
-+	result = libssh2_sftp_unlink(sftp, SSH2_URL_STR(resource->path));
- 	php_url_free(resource);
- 
- 	//zend_list_delete(sftp_rsrcid);
-@@ -462,7 +462,7 @@ static int php_ssh2_sftp_rename(php_stream_wrapper *wrapper, const char *url_fro
- 		return 0;
- 	}
- 
--	result = libssh2_sftp_rename(sftp, resource->path, resource_to->path);
-+	result = libssh2_sftp_rename(sftp, SSH2_URL_STR(resource->path), SSH2_URL_STR(resource_to->path));
- 	php_url_free(resource);
- 	php_url_free(resource_to);
- 
-@@ -493,13 +493,13 @@ static int php_ssh2_sftp_mkdir(php_stream_wrapper *wrapper, const char *url, int
- 
- 	if (options & PHP_STREAM_MKDIR_RECURSIVE) {
- 		/* Just attempt to make every directory, some will fail, but we only care about the last success/failure */
--		char *p = resource->path;
-+		char *p = SSH2_URL_STR(resource->path);
- 		while ((p = strchr(p + 1, '/'))) {
--			libssh2_sftp_mkdir_ex(sftp, resource->path, p - resource->path, mode);
-+			libssh2_sftp_mkdir_ex(sftp, SSH2_URL_STR(resource->path), p - SSH2_URL_STR(resource->path), mode);
- 		}
- 	}
- 
--	result = libssh2_sftp_mkdir(sftp, resource->path, mode);
-+	result = libssh2_sftp_mkdir(sftp, SSH2_URL_STR(resource->path), mode);
- 	php_url_free(resource);
- 
- 	//zend_list_delete(sftp_rsrcid);
-@@ -527,7 +527,7 @@ static int php_ssh2_sftp_rmdir(php_stream_wrapper *wrapper, const char *url, int
- 		return 0;
- 	}
- 
--	result = libssh2_sftp_rmdir(sftp, resource->path);
-+	result = libssh2_sftp_rmdir(sftp, SSH2_URL_STR(resource->path));
- 	php_url_free(resource);
- 
- 	//zend_list_delete(sftp_rsrcid);
-@@ -836,7 +836,7 @@ PHP_FUNCTION(ssh2_sftp_readlink)
- 	}
- 
- 	if ((targ_len = libssh2_sftp_symlink_ex(data->sftp, link->val, link->len, targ, 8192, LIBSSH2_SFTP_READLINK)) < 0) {
--		php_error_docref(NULL, E_WARNING, "Unable to read link '%s'", link);
-+		php_error_docref(NULL, E_WARNING, "Unable to read link '%s'", ZSTR_VAL(link));
- 		RETURN_FALSE;
- 	}
- 
--- 
-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
deleted file mode 100644
index a27f6970b153..000000000000
--- a/dev-php/pecl-ssh2/pecl-ssh2-1.1.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PHP_EXT_NAME="ssh2"
-
-USE_PHP="php5-6 php7-1 php7-2 php7-3"
-
-inherit php-ext-pecl-r3
-
-USE_PHP="php7-1 php7-2 php7-3"
-
-DESCRIPTION="PHP bindings for the libssh2 library"
-LICENSE="PHP-3.01"
-SLOT="7"
-
-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]"
-RDEPEND="${DEPEND}
-	php_targets_php5-6? ( dev-php/pecl-ssh2:0[php_targets_php5-6] )"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-fix-php_url-fields-usage-for-php7-3.patch
-	"${DISTDIR}"/${P}-fix-php7-port.patch
-)
-
-src_prepare() {
-	if use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3; then
-		php-ext-source-r3_src_prepare
-	else
-		default_src_prepare
-	fi
-}
diff --git a/dev-php/pecl-ssh2/pecl-ssh2-1.2.ebuild b/dev-php/pecl-ssh2/pecl-ssh2-1.2.ebuild
deleted file mode 100644
index ffc132c93745..000000000000
--- a/dev-php/pecl-ssh2/pecl-ssh2-1.2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PHP_EXT_NAME="ssh2"
-
-USE_PHP="php5-6 php7-1 php7-2 php7-3 php7-4"
-
-inherit php-ext-pecl-r3
-
-# https://pecl.php.net/get/ssh2-1.2.tgz isn't work for some weeks
-SRC_URI="https://dev.gentoo.org/~whissi/dist/${PN}/${P}.tar.gz"
-
-USE_PHP="php7-1 php7-2 php7-3 php7-4"
-
-DESCRIPTION="PHP bindings for the libssh2 library"
-LICENSE="PHP-3.01"
-SLOT="7"
-IUSE=""
-KEYWORDS="~amd64 ~x86"
-# Upstream notes say there are errors with gcrypt backend
-DEPEND=">=net-libs/libssh2-1.2[-gcrypt]"
-RDEPEND="${DEPEND}
-	php_targets_php5-6? ( dev-php/pecl-ssh2:0[php_targets_php5-6] )"
-
-src_prepare() {
-	if use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3 || use php_targets_php7-4 ; then
-		php-ext-source-r3_src_prepare
-	else
-		default_src_prepare
-	fi
-}
diff --git a/dev-php/pecl-ssh2/pecl-ssh2-1.3.1.ebuild b/dev-php/pecl-ssh2/pecl-ssh2-1.3.1.ebuild
index 09caa04b19ad..aa0a2f116be1 100644
--- a/dev-php/pecl-ssh2/pecl-ssh2-1.3.1.ebuild
+++ b/dev-php/pecl-ssh2/pecl-ssh2-1.3.1.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="PHP bindings for the libssh2 library"
 LICENSE="PHP-3.01"
 SLOT="7"
 IUSE=""
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 # Upstream notes say there are errors with gcrypt backend
 DEPEND=">=net-libs/libssh2-1.2[-gcrypt]"
 RDEPEND="${DEPEND}"
diff --git a/dev-php/pecl-yaz/Manifest b/dev-php/pecl-yaz/Manifest
index cee8ce1da522..1b9f3f60a49f 100644
--- a/dev-php/pecl-yaz/Manifest
+++ b/dev-php/pecl-yaz/Manifest
@@ -1,6 +1,6 @@
 AUX 1.2.3/0001-arginfo_php8-support.patch 7166 BLAKE2B 42859817ae81ba437670c721e3967e9ec3d5eaca15dacee049a0e57d84ef9df1ac6fcff564d3ab1ba07acb75a0ce15dfdfa761d6eda4556a129c91d317292ca4 SHA512 01e742cf947fa2d4e167d16e9112a863ab23911aace807ca6a9e17f66cb304c96aec2a93dcef9f712243b2eeaa24df3a51afd999fcdf95ee7345f2586ba9768b
 AUX 1.2.3/0002-arginfo-fixes.patch 1148 BLAKE2B 5910c1ccf81193cd4da155302c460b8a4859995c94bf2994631c288b60f4bc4681687a0426642b902c31e5ffd515c67346ad3fcd7e507fd45621a7f163a279d5 SHA512 5cb04810fc9dcf6cd6aa3b8f605dd8059c3e528b135c1433f2801c2737308341dc5f5475f5c14d91abe526d8fb86cbb13f62244ac26d223ad88aff2804e10d81
 DIST yaz-1.2.3.tgz 20059 BLAKE2B 3fbf6d57e8519f6d363dbf308cb6ba259098521ae352f8886e8e12ca2a0d8119eaa31fc30301aea6979b32c6c321c4de0ad63ebe72e8f52cbb630d7f136f3e60 SHA512 5e6ebccac05fa44b0758b6817530e8cb436e45ead659f6a5029383515213bcce8c8cc7ceb8ef5ff4ec2335ad5c3009c6ccf8786116b115c24a013329d107bd7a
-EBUILD pecl-yaz-1.2.3-r1.ebuild 600 BLAKE2B b9a06a24d1e1d3f4598469567481de50974c0ba6c45b4143c17c5a3d415669de28868944410e2bfc596289fc56d97604fbb808c6dc6cda83216fc5c135b74298 SHA512 0ecdcff2a264cc9461e62513241a8db02c547611c16b6901290a37931578de58e68caa945105eeb53e4ef9741f3e1e8980161c44266bade0ea2aa289eb925c6c
+EBUILD pecl-yaz-1.2.3-r1.ebuild 598 BLAKE2B b1d755ed816dfa724ca511555273104c09558e431fa62de5ed24abcc27393f92c3f7d872ced26497eb09af26857657e388d3fcbeebf101538630fafb266a4d45 SHA512 fcf3accfcd515cac5c5c9aec7ea0b87ff6103e465298a4f504d1c720ca4ab9f2a9956582fab5c052555c8e7e60a2e88ee86dd7df397f93ec4fe4d278237c8a32
 EBUILD pecl-yaz-1.2.3.ebuild 585 BLAKE2B 37e8fabd3f532839c24b42b5fecb7c524353c381ec86c783fe4d3a75143f0d59ea44a824dd1c4ad767810d10e1314950a29dda547caac4679741eb1893fece87 SHA512 e61ec097ebb350a9dde9c3bbe79380f22d00a685bcd3d65d28ebae37e92f1bdac233284b856835d836d001fd47c589eef2c1d976bb1375d475bf58d51769925e
 MISC metadata.xml 240 BLAKE2B f60f325331d493a555e53c29c7cf2742a415356da28a467505f1441f3fd790fd0d59050df84854bdc379d19d94a46121216479807975a2922d5a2fefde83416b SHA512 fada9d69055f2be962b95aac82f260ec5db7a3f4392d10f0458a1d125938fa17539f7ec486000f3a95cff85a3fbb6bbf1f6f4fe6c2de7aa420a7543a3e89d03e
diff --git a/dev-php/pecl-yaz/pecl-yaz-1.2.3-r1.ebuild b/dev-php/pecl-yaz/pecl-yaz-1.2.3-r1.ebuild
index 1b66eaf384cc..0c9e31ce61d6 100644
--- a/dev-php/pecl-yaz/pecl-yaz-1.2.3-r1.ebuild
+++ b/dev-php/pecl-yaz/pecl-yaz-1.2.3-r1.ebuild
@@ -12,7 +12,7 @@ USE_PHP="php7-3 php7-4 php8-0"
 
 inherit php-ext-pecl-r3
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~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-utils/Manifest b/dev-php/phar-utils/Manifest
index 4b4f029e23d0..2bd0c138ed04 100644
--- a/dev-php/phar-utils/Manifest
+++ b/dev-php/phar-utils/Manifest
@@ -1,4 +1,6 @@
 AUX autoload.php 261 BLAKE2B e3aef92345eb95b936a4b3edc12e9518804c9f75087d73deec3882c113a913a17f2bad46c6a2e9c7c6e396e795863cf930775b566cccee77fb275013fb29c0bb SHA512 9e4820ee718f642ff95baaff3cd848b868465d5b6538377517f384aa6e0198e0cd3298e98ddd4ffa86e6669f438a6ce8236f4d56440e9e77b3df20599699753d
 DIST phar-utils-1.1.1.tar.gz 4211 BLAKE2B 370c6e325dcef6fb8ac2ab12a661f59d1c5feb5135aa8bdf7c0b3beb31f90a309994e959b68a96d9da2ea2ae25d38ee5bda1d86a647b4958ce81bece3d02a935 SHA512 bfe7ce821767588032a2db8e2b80d827f33a5bd9049d74d6d1871b7e65878cf78a86162ed67e96edd363a3520f53723bdd496914e96d4ef8629880729bd812e3
+DIST phar-utils-1.1.2.tar.gz 4223 BLAKE2B fa64eb6f6a53f5a571c4cab21235269321055d09c4adb5d72baa1084d862a72f8ac010d1dd02fa8a3e1da4b8b8b449d648cfa4b47486832f85e68f222184518e SHA512 122c76ee29bb981b75f86f025235577bb9c1cf2b3f18c16740a000284a23e04b8ec7ee37a369513f7c44e4da8a8838d90384a02ce38bcb425f826ac2b6eb3b88
 EBUILD phar-utils-1.1.1.ebuild 535 BLAKE2B 189e2b67f4fa778a2e035001eb48579325c44c83352114d75d1f2dc99a867c98cf3fc36606839185ca51d84824379694722756f2f5adc41c820a4acc497ce36e SHA512 74a8fb1418320e21d1191ad08520b87ea7818d01a8ead37bc3fba741157c39a2e9feda74abebca91cc41504b5d4ee376935b58ec57cfc3fdc87b2357041dc91c
+EBUILD phar-utils-1.1.2.ebuild 535 BLAKE2B 189e2b67f4fa778a2e035001eb48579325c44c83352114d75d1f2dc99a867c98cf3fc36606839185ca51d84824379694722756f2f5adc41c820a4acc497ce36e SHA512 74a8fb1418320e21d1191ad08520b87ea7818d01a8ead37bc3fba741157c39a2e9feda74abebca91cc41504b5d4ee376935b58ec57cfc3fdc87b2357041dc91c
 MISC metadata.xml 587 BLAKE2B 299871f5f2397c3c8de1854ed71384772268d4cbbe1970adc57700e81942fd4becfcce03a100eac840407f265e2637ef5558292588ef8551cacfab72f0c0a6d2 SHA512 ac3b114d7a52cc71dcf8bb994ecc1051f07a02a0f7b953c4e9bfed211939f3ed560b4e88fe3cb3e9689f6dfca4dcdab5a9f054fdabd3922689270c9c74943269
diff --git a/dev-php/phar-utils/phar-utils-1.1.2.ebuild b/dev-php/phar-utils/phar-utils-1.1.2.ebuild
new file mode 100644
index 000000000000..43b1c5940fef
--- /dev/null
+++ b/dev-php/phar-utils/phar-utils-1.1.2.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2021 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
+}