From 752d6256e5204b958b0ef7905675a940b5e9172f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 12 May 2022 16:42:50 +0300 Subject: gentoo resync : 12.05.2022 --- dev-php/Manifest.gz | Bin 39746 -> 39927 bytes dev-php/ca-bundle/Manifest | 2 +- dev-php/ca-bundle/ca-bundle-1.3.1.ebuild | 4 +- dev-php/composer/Manifest | 2 +- dev-php/composer/composer-2.1.12.ebuild | 4 +- dev-php/json-schema/Manifest | 2 +- dev-php/json-schema/json-schema-5.2.11.ebuild | 4 +- dev-php/pecl-mailparse/Manifest | 4 +- dev-php/pecl-mailparse/pecl-mailparse-3.1.2.ebuild | 22 - dev-php/pecl-mailparse/pecl-mailparse-3.1.3.ebuild | 22 + dev-php/pecl-memcached/Manifest | 7 +- dev-php/pecl-memcached/files/3.1.5-fix-tests.patch | 41 -- .../pecl-memcached-3.1.5_p20210807.ebuild | 87 ---- dev-php/pecl-memcached/pecl-memcached-3.2.0.ebuild | 56 +++ .../pecl-memcached/pecl-memcached-3.2.0_rc2.ebuild | 56 --- dev-php/pecl-ps/Manifest | 2 - dev-php/pecl-ps/pecl-ps-1.4.1-r1.ebuild | 25 -- dev-php/pecl-psr/Manifest | 3 + dev-php/pecl-psr/metadata.xml | 8 + dev-php/pecl-psr/pecl-psr-1.2.0.ebuild | 21 + dev-php/pecl-xdiff/Manifest | 7 +- dev-php/pecl-xdiff/files/2.1.0_pre-php8-2.patch | 214 ---------- dev-php/pecl-xdiff/files/2.1.0_pre-php8-3.patch | 39 -- dev-php/pecl-xdiff/files/2.1.0_pre-php8.patch | 467 --------------------- dev-php/pecl-xdiff/pecl-xdiff-2.1.0.ebuild | 22 + dev-php/pecl-xdiff/pecl-xdiff-2.1.0_pre.ebuild | 30 -- dev-php/psr-log/Manifest | 2 +- dev-php/psr-log/psr-log-1.1.4.ebuild | 4 +- dev-php/semver/Manifest | 2 +- dev-php/semver/semver-3.2.6.ebuild | 4 +- dev-php/twig/Manifest | 2 +- dev-php/twig/metadata.xml | 4 - dev-php/xdebug-handler/Manifest | 2 +- dev-php/xdebug-handler/xdebug-handler-2.0.1.ebuild | 4 +- 34 files changed, 157 insertions(+), 1018 deletions(-) delete mode 100644 dev-php/pecl-mailparse/pecl-mailparse-3.1.2.ebuild create mode 100644 dev-php/pecl-mailparse/pecl-mailparse-3.1.3.ebuild delete mode 100644 dev-php/pecl-memcached/files/3.1.5-fix-tests.patch delete mode 100644 dev-php/pecl-memcached/pecl-memcached-3.1.5_p20210807.ebuild create mode 100644 dev-php/pecl-memcached/pecl-memcached-3.2.0.ebuild delete mode 100644 dev-php/pecl-memcached/pecl-memcached-3.2.0_rc2.ebuild delete mode 100644 dev-php/pecl-ps/pecl-ps-1.4.1-r1.ebuild create mode 100644 dev-php/pecl-psr/Manifest create mode 100644 dev-php/pecl-psr/metadata.xml create mode 100644 dev-php/pecl-psr/pecl-psr-1.2.0.ebuild delete mode 100644 dev-php/pecl-xdiff/files/2.1.0_pre-php8-2.patch delete mode 100644 dev-php/pecl-xdiff/files/2.1.0_pre-php8-3.patch delete mode 100644 dev-php/pecl-xdiff/files/2.1.0_pre-php8.patch create mode 100644 dev-php/pecl-xdiff/pecl-xdiff-2.1.0.ebuild delete mode 100644 dev-php/pecl-xdiff/pecl-xdiff-2.1.0_pre.ebuild (limited to 'dev-php') diff --git a/dev-php/Manifest.gz b/dev-php/Manifest.gz index 69b6ff58d021..243f8fdcb97e 100644 Binary files a/dev-php/Manifest.gz and b/dev-php/Manifest.gz differ diff --git a/dev-php/ca-bundle/Manifest b/dev-php/ca-bundle/Manifest index 6ae52318a5b1..25588e46b5ee 100644 --- a/dev-php/ca-bundle/Manifest +++ b/dev-php/ca-bundle/Manifest @@ -4,5 +4,5 @@ DIST ca-bundle-1.2.11.tar.gz 124268 BLAKE2B 537128647522c00a8ab3d445bfcc27648c42 DIST ca-bundle-1.3.1.tar.gz 127597 BLAKE2B e3f19e3a9e8285b9dcbfe1b488566392424249f0a366696f895761edfcfb597ece06ef0c87380b44083dcf5f598000a83ed9fefec20b58336f47277a205e2467 SHA512 12a5a83f3783491086614e79517e945892a3cb1230705650e12a3f9863bbeec628b8bea228f5d12d23c790a3b912c88536182c059108acb6860e2ceabae8c7c6 EBUILD ca-bundle-1.1.3.ebuild 547 BLAKE2B bcaa79c70e881a68b414559da2ef8afbbdf9ccc620205df22f5c80a3f907e09d79f9d7eadf78eac9c77b6ac632536f37c8806f0c5da980da76658f5408088d8d SHA512 b88506a7800d36434b2a9c9f64ecdd4cecaea2f50ee88bb326a4f480da66b8f1e05d4b6bb8befbda22972c80b6981c28186ae12c19562102276de4bfea01b139 EBUILD ca-bundle-1.2.11.ebuild 547 BLAKE2B 0dd394f704ac0922b8925caec28085e578c184d17af169b83ca06b314dac9ca11d16894c6a48ac85786185d2381c522e8abb6578870dc11d4bbf845e98cdd74d SHA512 b28e4fc2fddd4ca8c90337d47cfeedf54388fd0e409683083540304a382913df966341d3b1167c55c6320ce7ea272f0968f919640b1e38a25d19b7523c324610 -EBUILD ca-bundle-1.3.1.ebuild 549 BLAKE2B a38eed2ae3a6582f8634529720d1fd73361a2d2eb31ecfe351741f5baeceeb810f5b4808ed177f591285e733b7e4870d83cf2ab7031b1854d891ed27fabe8c8f SHA512 16eda356bdba94896427e58586ca620d09ef9fb7ab192c090881a5a9b550376791aca2c1aeb9c38b85c3c5de7c2165eeeece7ad9124aaab35743d94e239b43d9 +EBUILD ca-bundle-1.3.1.ebuild 547 BLAKE2B 63534f592b2891e3f344d33c0e682db6bc494a054e4edb3d3b22a201d3fba48ee57d7c494f08998cbddff32a78b7c2e1eac9c359ae0320004e10070913739e23 SHA512 55fdd9f009f1b3da9d8591a44dcdb8ad89b3747851a14aec2a8171569e06a4644ed7ee7eca3a2b779ac94910a0e28761884176c15011165a50e164b84fb654c3 MISC metadata.xml 874 BLAKE2B 7a79033100c420d679ee1bfb5252c78830e946ae4576aca01e67f32bb663277112a16fccb73f24e6e62f60ec7605bda3c1ee0bfd3cee495522adb4d1aac0842a SHA512 b2f3c3c9771a18dfcb71441b061b664f958d86cd561db026ef5b0f50c29f5500956f877056bea19076d8dce75b82808c56dbc1db1ffc0a4497a89edffcef00a0 diff --git a/dev-php/ca-bundle/ca-bundle-1.3.1.ebuild b/dev-php/ca-bundle/ca-bundle-1.3.1.ebuild index 7aec6369c373..e16650d74abd 100644 --- a/dev-php/ca-bundle/ca-bundle-1.3.1.ebuild +++ b/dev-php/ca-bundle/ca-bundle-1.3.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -9,7 +9,7 @@ SRC_URI="https://github.com/composer/ca-bundle/archive/${PV}.tar.gz -> ${P}.tar. LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" RDEPEND=" dev-lang/php:* diff --git a/dev-php/composer/Manifest b/dev-php/composer/Manifest index 3ac1d22d6a23..1f62aa2912a1 100644 --- a/dev-php/composer/Manifest +++ b/dev-php/composer/Manifest @@ -19,7 +19,7 @@ EBUILD composer-2.0.14.ebuild 2228 BLAKE2B befd0486765faf001bcf4f2cb98ceea1d4535 EBUILD composer-2.1.1.ebuild 2228 BLAKE2B befd0486765faf001bcf4f2cb98ceea1d4535ceb142e6bca6ded35413a5e8c42009850e902b49fe59418b69e76e5043f0d7f585a2a61888b98d9e82edf80a0b9 SHA512 e007b668692c68b321be874639cf77366d81172b1314e316f04e785e4ba9e065785d95509d24624eadab38ee8ce154ec0f5797438a7b7dfc59fc85dac092f5a6 EBUILD composer-2.1.10.ebuild 2228 BLAKE2B ebf3d7fe1a1d890650a861bc5a08878501e7a8994cd12c1e2b55e632293f7e004f28bd490ef40ecbd8268ab625ca56c4caa69791a36dd4549b5106dcf2923dd2 SHA512 62afde69ee98ab14cc9bbb90df16ca70927fa1cbbd0c69ceb3bc2a9bd237aa8a3eb96f2acfdc88244d2e5e5d7c9ee32776764cc4750f1619e7c4296ca57737b8 EBUILD composer-2.1.11.ebuild 2228 BLAKE2B ebf3d7fe1a1d890650a861bc5a08878501e7a8994cd12c1e2b55e632293f7e004f28bd490ef40ecbd8268ab625ca56c4caa69791a36dd4549b5106dcf2923dd2 SHA512 62afde69ee98ab14cc9bbb90df16ca70927fa1cbbd0c69ceb3bc2a9bd237aa8a3eb96f2acfdc88244d2e5e5d7c9ee32776764cc4750f1619e7c4296ca57737b8 -EBUILD composer-2.1.12.ebuild 2228 BLAKE2B ebf3d7fe1a1d890650a861bc5a08878501e7a8994cd12c1e2b55e632293f7e004f28bd490ef40ecbd8268ab625ca56c4caa69791a36dd4549b5106dcf2923dd2 SHA512 62afde69ee98ab14cc9bbb90df16ca70927fa1cbbd0c69ceb3bc2a9bd237aa8a3eb96f2acfdc88244d2e5e5d7c9ee32776764cc4750f1619e7c4296ca57737b8 +EBUILD composer-2.1.12.ebuild 2226 BLAKE2B 2f3d6f9bce54f392f9e50dc54d5b7506a24aef21ebf6bb4deaef8d1b9f82f40be7a4b625c742a1a13864cd11245cdb61d8480265c8dd7c5fba4e514b14e55c96 SHA512 370115fb8cd69b5c332f7542906c9ac25e6e9d8ee1a4990e6a191b4b4e0ca4bb94bf11c149bcdea18da644a960155b19a13ae09276e1076577bcf6540bc2283f EBUILD composer-2.1.2.ebuild 2228 BLAKE2B befd0486765faf001bcf4f2cb98ceea1d4535ceb142e6bca6ded35413a5e8c42009850e902b49fe59418b69e76e5043f0d7f585a2a61888b98d9e82edf80a0b9 SHA512 e007b668692c68b321be874639cf77366d81172b1314e316f04e785e4ba9e065785d95509d24624eadab38ee8ce154ec0f5797438a7b7dfc59fc85dac092f5a6 EBUILD composer-2.1.3.ebuild 2228 BLAKE2B befd0486765faf001bcf4f2cb98ceea1d4535ceb142e6bca6ded35413a5e8c42009850e902b49fe59418b69e76e5043f0d7f585a2a61888b98d9e82edf80a0b9 SHA512 e007b668692c68b321be874639cf77366d81172b1314e316f04e785e4ba9e065785d95509d24624eadab38ee8ce154ec0f5797438a7b7dfc59fc85dac092f5a6 EBUILD composer-2.1.5.ebuild 2228 BLAKE2B a0655fea3563734d657745a9fa9c8f785cf234d879033f43a4e98d333dfe51d011401db8fb7d16cad3191c86bb330ddaad759a3600c6dd8668bc4963c0adb253 SHA512 e5490a298b4a5ca5133ace4bf3ca317ea1b35b212b2574d0e8fd1dcc22226cdd32849f57c0a26f0be03586c602c9d3f4b70442bb1b9316984276aaaac120b635 diff --git a/dev-php/composer/composer-2.1.12.ebuild b/dev-php/composer/composer-2.1.12.ebuild index 1eb058b7a474..d8a511f21018 100644 --- a/dev-php/composer/composer-2.1.12.ebuild +++ b/dev-php/composer/composer-2.1.12.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="8" @@ -9,7 +9,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" BDEPEND="dev-php/theseer-Autoload" diff --git a/dev-php/json-schema/Manifest b/dev-php/json-schema/Manifest index 31e235f2620d..e6a69ce35cb3 100644 --- a/dev-php/json-schema/Manifest +++ b/dev-php/json-schema/Manifest @@ -2,5 +2,5 @@ AUX autoload.php 272 BLAKE2B 35cf5eb6efc11395c45a12a98d2882bc249b4496cba7b1ceba2 DIST json-schema-5.2.10.tar.gz 31261 BLAKE2B 2f2e3f562552105e924aa3e4408e50c6e42171cb8440ca8009166d956dcb9d4d6a3903c3b7e62bcfa228069c1e17f4faeab56e56ff935fd59fe251d27d12ab3a SHA512 b6d31b5478b93ef7dea741307648734d4d93aa4c0518b0037e81f5411810ea0570a046adb314cbee3f06da4cc9e654c419ff0be75b6ad0f5d3770c03be5707c8 DIST json-schema-5.2.11.tar.gz 31273 BLAKE2B 7b5309c772816de08a6a3b600cef1291385357879cfb1e48f548ca2cb666fc87454064d090d4ab662d7937f0bec99bc4f0f304876dd2482896aa5bf41b2ed85e SHA512 1b1981dd12fd8642c26d3be75b40111320f89b6a917dabad087ff40d3baea78304e5611cf2b931e6f8e48f5ee4d14fcbe18c68ba76a90b59702783aea5d63477 EBUILD json-schema-5.2.10.ebuild 858 BLAKE2B e8f206b58487a01e3830d8b6aee6a065db5fef28026168b70e67aa0962e7562e0281c4e7e4b0330dfa54421a06bbb760a4cdc5752eaee4c19937c7af60ca13cc SHA512 fa9780f06d4a76609e9ba9e5a6c7c5b6c576cf3538245c1ce00db8aede778d0628cd53aca985b4e83cd59d81844d2e358ceea5607935c34f01ec143fbe18f758 -EBUILD json-schema-5.2.11.ebuild 860 BLAKE2B 64f52cb1a1a872c96b204977b21241e7ac181ec134f2e4684bfcdde592469bee858b53061c79735fbed294bae22bd193c94b98441504af3149b53d7326a89c54 SHA512 42c9a9b3363e0402fad0910576b9ee949066439074ab8e657fb21c6955a2b74ce4ca9488408461c14c95549389b2bf712f8dace61eea365a7e4112f7bc191547 +EBUILD json-schema-5.2.11.ebuild 858 BLAKE2B cafd10ab1e9f99bac34d4288569eff9d6cf1dcb128a119e37a3c54c4b88cc2e54d7d12f31b18dc35655cac8eb9d33b9aa1d5f4dc9b266cc60d02edfad9400ac9 SHA512 180552a839558925b1d9bcb514193bbb1505cc4414344549d9affbf89a5f97f3152a261b6f20c3c2d2ec7c21ac92c4688f4d6d9d9e68f90da5c64160b0fcb326 MISC metadata.xml 594 BLAKE2B 04ab8c043900cb2907dd0c9e724931bf28b3ec2ed012a3bd1e48fd97a203663ad51dfb1c6848528a06711d23a403fc2950daa70edcee368c8787c881fa86e233 SHA512 788ab7d0bdaf654787c402eb01ff3f113c5f5bc24cb0e5f1c8dc7f8a5e179dcb0b6799bb7da1f8a9c7f5bf85c93e4708bd476a35319b3ef931c6375fe2bbdda3 diff --git a/dev-php/json-schema/json-schema-5.2.11.ebuild b/dev-php/json-schema/json-schema-5.2.11.ebuild index 88ece98fe120..ebc719f456ab 100644 --- a/dev-php/json-schema/json-schema-5.2.11.ebuild +++ b/dev-php/json-schema/json-schema-5.2.11.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -9,7 +9,7 @@ SRC_URI="https://github.com/justinrainbow/json-schema/archive/${PV}.tar.gz -> ${ LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="test" # Tests are not in the release tarball RESTRICT="test" diff --git a/dev-php/pecl-mailparse/Manifest b/dev-php/pecl-mailparse/Manifest index b06e5e9f9b87..df3fc2c239b2 100644 --- a/dev-php/pecl-mailparse/Manifest +++ b/dev-php/pecl-mailparse/Manifest @@ -1,5 +1,5 @@ DIST mailparse-3.1.1.tgz 941192 BLAKE2B 00b5a506031cd03439e3d67172c17aeeb6af3b950694251f7654007642bf80fff3cda900fc97ba177b91ca970e47416132080793ce64d8038e7aecbf2fdaf6c0 SHA512 01ddb8d4d27a74c14f70b02b49322c60fc79affab374205fee91b9da21e5148e08dba024f6bc620e4f26c2c937675e09092c52ca69172d2f7797c3e2bf374bee -DIST mailparse-3.1.2.tgz 941292 BLAKE2B 855d0b6d34664f090ee3fc6aaa7a260651b9e98b1237c29f66c151ff2b6d8dbbd8cad2757e202fad5a2d0a339fca1e37464a5bcfe7f12b9b1dee975f4330aa1f SHA512 f60671b2bbe09c858a5d9d27fb8ac314d98d0635eeaa682a28171f85bc71d1c9c3ab92c6931883a42619e96bfe96fdf1b43b570c5c2bc1d2b243b541fb533d24 +DIST mailparse-3.1.3.tgz 943785 BLAKE2B 03cb7d4d4ac78d04f710155fdd9282250dc686dbab3a6d9dfb8e3ff82fda07faf02680ad86a810cd7ee2f38c8980fbdc9ad67399f3164506e523a98ce3ffb0a9 SHA512 93659e479d8ab61ae473f6dc002b7198903eebdcfb4aa515e76952f5050fd1a815baccfcb57bd32fb9be6108dfed6dc73172067a58c9e6098058999bb3802000 EBUILD pecl-mailparse-3.1.1.ebuild 492 BLAKE2B a0beb3508e7d216b889015a393d4ce5f11bceb65910306e3bf1bae303c06e18a9b0f8fdf568877a032e1518f1c8274b2695c083ac4b4cc7fa60946537a6be558 SHA512 3b585bd494f72d10fcf2a4e0be4418d531ca6d02a2ebc98bdb4710e49d6251b7f5cfb2bdf946a0b3c329b8ce9f65de8c28b5d6d2023ef24272e6b0f5f8fa5680 -EBUILD pecl-mailparse-3.1.2.ebuild 503 BLAKE2B 2fe64e994a64c33c54360b5a497e3ae01c6370edfe5196d322530078063f10ad9281c534822233c1eab9937e7340fa34fbe8fff52bf45a0ba91e93a2909d019c SHA512 e91d4d842b2136c60927a4f60f4f2295b46bf93a9f710238368baacfdd32dc1864e1f6d27ba4312e1da8cb1f7327a2988128bf3cb6328c9732e037c3de65b771 +EBUILD pecl-mailparse-3.1.3.ebuild 492 BLAKE2B f213192c7654c7bdd68a4da72a238876ed60b966bc9bf1930f6057ddc6b22830399282d8c5dc065c1198cae64d49c9548ff339c379aab9b8d5e272ab008767fb SHA512 b57735b7831226cb8ff51c9bba58d413af7b2d9ffb4cf379a717066a66dcbbd4a5912cfb92d8466c676cd56482215eb3ba71fb6dca309d375dc16a9ce92fc454 MISC metadata.xml 240 BLAKE2B f60f325331d493a555e53c29c7cf2742a415356da28a467505f1441f3fd790fd0d59050df84854bdc379d19d94a46121216479807975a2922d5a2fefde83416b SHA512 fada9d69055f2be962b95aac82f260ec5db7a3f4392d10f0458a1d125938fa17539f7ec486000f3a95cff85a3fbb6bbf1f6f4fe6c2de7aa420a7543a3e89d03e diff --git a/dev-php/pecl-mailparse/pecl-mailparse-3.1.2.ebuild b/dev-php/pecl-mailparse/pecl-mailparse-3.1.2.ebuild deleted file mode 100644 index 29f9a2bfeb51..000000000000 --- a/dev-php/pecl-mailparse/pecl-mailparse-3.1.2.ebuild +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -WANT_AUTOMAKE="none" -PHP_EXT_NAME="mailparse" -PHP_EXT_INI="yes" -PHP_EXT_ZENDEXT="no" -PHP_EXT_ECONF_ARGS="" -USE_PHP="php7-2 php7-3 php7-4 php8-0 php8-1" -PHP_EXT_NEEDED_USE="unicode" -DOCS=( README.md ) - -inherit php-ext-pecl-r3 - -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" - -DESCRIPTION="PHP extension for parsing and working with RFC822 and MIME compliant messages" -LICENSE="PHP-3.01" -SLOT="7" -IUSE="" diff --git a/dev-php/pecl-mailparse/pecl-mailparse-3.1.3.ebuild b/dev-php/pecl-mailparse/pecl-mailparse-3.1.3.ebuild new file mode 100644 index 000000000000..369af592dbe1 --- /dev/null +++ b/dev-php/pecl-mailparse/pecl-mailparse-3.1.3.ebuild @@ -0,0 +1,22 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +WANT_AUTOMAKE="none" +PHP_EXT_NAME="mailparse" +PHP_EXT_INI="yes" +PHP_EXT_ZENDEXT="no" +PHP_EXT_ECONF_ARGS="" +USE_PHP="php7-4 php8-0 php8-1" +PHP_EXT_NEEDED_USE="unicode(-)" +DOCS=( README.md ) + +inherit php-ext-pecl-r3 + +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" + +DESCRIPTION="PHP extension for parsing and working with RFC822 and MIME compliant messages" +LICENSE="PHP-3.01" +SLOT="7" +IUSE="" diff --git a/dev-php/pecl-memcached/Manifest b/dev-php/pecl-memcached/Manifest index 083b60481dd3..2da976c0ef2f 100644 --- a/dev-php/pecl-memcached/Manifest +++ b/dev-php/pecl-memcached/Manifest @@ -1,8 +1,5 @@ -AUX 3.1.5-fix-tests.patch 1032 BLAKE2B 15b91b77b645ea298f2334df6d4a0b804735d38dca3067f1cac7fb8fdf30d5ccb4895cc431b5dd6cc0bd8b5be9983b48e157694bc437fc057aed0c9879480bc4 SHA512 1fd27bbae55a0e0ed12ca8422fc8969b9d69ae2c26d9b991648bc2cd7d39f6ede621e453aa12a6ec027c69791988f5db4117c32a31aab20836bdd565d7c62dc2 DIST memcached-3.1.5.tgz 83015 BLAKE2B 80f5cbed8e34f867962792d95d242015690f64ab3b462e09813a11b8b86234b0b05b0f6a78f7c6184482b66ba8015064b37f77bbb816a3aee2edd0ce97ab0cbc SHA512 87d5fd079fcaad81139785d6766da71b23a1a0fe907d4b22f3a787af148a20412c11df11c4d98c165241658baf0d87c8a6b29de15db07a0f9d1fabc8aec8f0e9 -DIST memcached-3.2.0RC2.tgz 90731 BLAKE2B 69e163f7375c94d9e8f49890f169708e2286ed96b82f13b0a6fad092870f03c6aaba0ef3a23de8775575a1b135783a0e27404120a2bbeef9bdbc73735461b1a3 SHA512 056dec58734dc2171429d1b33a74be829f78ab993f0f1699d9f61b105d4252e35c4e05dbda9e045ed3364d82779c662c2f28c63cdac1b81027549335b5376845 -DIST pecl-memcached-3.1.5_p20210807.tar.gz 99221 BLAKE2B 7a6a92701d17ce2c108cda862d52cebbae38e993e4182fd23ce78ea1cbebbdba6d46a71258b7dd388ff38f2b7b04c94ca822954ff931111fd9bfc64d578a6f26 SHA512 3c124f969efcd3bcc513e3e347828ac6e0a5540379f7d3a83c306d65a02ece3c76f87e3db52153c5d2f2c03c5fafb646f6b3b33c0b1d5afbb71ffa22d2df6f90 +DIST memcached-3.2.0.tgz 90722 BLAKE2B 5bc3ce40803004f45ad397684277862dbaffce467b3026e33d9737d4d93a82f2c89e32a256ebf6db3117a462ff8f81a517ed9950773cb4a0e927aa8af4e834be SHA512 ece5759a9d6d52afd46beb0821811e5d4830e75ad8564af395e2107fd349e271c6e6cf20eeacd9ad15ee2e99ccf0118ccc83c5810e2f3fa7c61f1984b0b26514 EBUILD pecl-memcached-3.1.5-r1.ebuild 1582 BLAKE2B 7cb8c180c14bf80a1e4447bfde1c1087f483c582b3f748c819b2e1d9393e5eb5c8a3ac7c4c0cd99d8dd62ecfd2eb302cf83224fdf7de370d21e9a2520b6990cf SHA512 b9aa92fafe9a68a647e3e76212b40c36b65ebcfed423d82a22fe3aad146149a1d915a895cf77c06830b9a0bb589d992d4470e640365f3beb7f46d5c5b3e70662 -EBUILD pecl-memcached-3.1.5_p20210807.ebuild 2650 BLAKE2B 06d94ad81a17dd31d9b1988907cb540385ce816bf2b649f6cb5b1b9aca9b986996d1b6375f7168d096b7435ead2a5bf1f54eeb1a82bc3cf3e244f3548148b758 SHA512 946d76c95f96ca6e0d4b416f4c5d145eff164144c7aa71be7a3e0bdb077e7c99fadff9ee20bd2cc9d23c4690a1954c55e98071bb2fa52068c5c78ad7c7e321c5 -EBUILD pecl-memcached-3.2.0_rc2.ebuild 1527 BLAKE2B 00b017f2620871b04c87b0da4d2754ab8680a071e9687899dbdda0229c7f137344b1d471750f8079ee9194267113e4107cc75cc72e35387683de358f4dc36f8f SHA512 300580410c2e5e07fca52c4d0c4035650e59e81bb0b31d6320fedbcb61da7cf8875c20cade2c8a4530fae570d6bfb4305247c85281a22d6209a68b1bb9f9a89f +EBUILD pecl-memcached-3.2.0.ebuild 1527 BLAKE2B 00b017f2620871b04c87b0da4d2754ab8680a071e9687899dbdda0229c7f137344b1d471750f8079ee9194267113e4107cc75cc72e35387683de358f4dc36f8f SHA512 300580410c2e5e07fca52c4d0c4035650e59e81bb0b31d6320fedbcb61da7cf8875c20cade2c8a4530fae570d6bfb4305247c85281a22d6209a68b1bb9f9a89f MISC metadata.xml 569 BLAKE2B 686b6c91f4d91fb82bd90b08af6627a8211e9676139417551e8a8425da410c15a77b79ff51760c2a16815c84c55c1e81ff462af17282ffa198db0829b20566c6 SHA512 8f3154fc7f3c9d1707b121ddc8d94d8d5570f7ca0cc93c0f732cda3ba6a756ed421a6facd96000ade0c22af9a78efbdd69ec118bd195c4c83fc523f2cd7e1cc7 diff --git a/dev-php/pecl-memcached/files/3.1.5-fix-tests.patch b/dev-php/pecl-memcached/files/3.1.5-fix-tests.patch deleted file mode 100644 index 08a881c182d8..000000000000 --- a/dev-php/pecl-memcached/files/3.1.5-fix-tests.patch +++ /dev/null @@ -1,41 +0,0 @@ ---- a/tests/experimental/session_gc.phpt 2021-08-23 01:05:26.000000000 -0400 -+++ b/tests/experimental/session_gc.phpt 2021-08-27 14:30:01.504619748 -0400 -@@ -20,22 +20,23 @@ - - session_start(); - $_SESSION['foo'] = 1; --var_dump($_SESSION); -+$session1 = $_SESSION; - session_write_close(); - - $_SESSION = NULL; --var_dump($_SESSION); -+$session2 = $_SESSION; - - session_start(); --var_dump($_SESSION); -+$session3 = $_SESSION; - session_write_close(); - - sleep(3); - - session_start(); --var_dump($_SESSION); -+$session4 = $_SESSION; - session_write_close(); - -+var_dump($session1, $session2, $session3, $session4); - - --EXPECT-- - array(1) { ---- a/tests/experimental/extreme_floats.phpt 2021-08-23 01:05:26.000000000 -0400 -+++ b/tests/experimental/extreme_floats.phpt 2021-08-27 14:40:03.223499433 -0400 -@@ -2,6 +2,8 @@ - Extreme floats: max, min, Inf, -Inf, and NaN - --SKIPIF-- - -+--INI-- -+serialize_precision = 14 - --FILE-- - ${P}.tar.gz" - -RESTRICT="!test? ( test )" - -COMMON_DEPEND=">=dev-libs/libmemcached-1.0.14[sasl(-)?] - sys-libs/zlib -" - -RDEPEND=" - php_targets_php7-3? ( - ${COMMON_DEPEND} dev-lang/php:7.3[session(-)?,json(-)?] - igbinary? ( dev-php/igbinary[php_targets_php7-3(-)] ) - ) - php_targets_php7-4? ( - ${COMMON_DEPEND} dev-lang/php:7.4[session(-)?,json(-)?] - igbinary? ( dev-php/igbinary[php_targets_php7-4(-)] ) - ) - php_targets_php8-0? ( - ${COMMON_DEPEND} dev-lang/php:8.0[session(-)?] - igbinary? ( dev-php/igbinary[php_targets_php8-0(-)] ) - ) - php_targets_php8-1? ( - ${COMMON_DEPEND} dev-lang/php:8.1[session(-)?] - igbinary? ( dev-php/igbinary[php_targets_php8-1(-)] ) - ) -" -DEPEND="${RDEPEND} test? ( net-misc/memcached )" - -PATCHES=( "${FILESDIR}/3.1.5-fix-tests.patch" ) - -src_unpack() { - default - mv "${WORKDIR}/php-memcached-${REPO_COMMIT}" "${S}" || die - ln -s "${S}/tests/skipif.inc" "${S}/tests/experimental/skipif.inc" || die - ln -s "${S}/tests/skipif.inc" "${S}/tests/experimental/serializer/skipif.inc" || die - local x - local broken_tests=( - # Known broken tests. https://github.com/php-memcached-dev/php-memcached/issues/386 - get_bykey_cas getdelayed_bykey_cas getdelayed_cbthrows - stats stats_badserver getmulti_badserver - # Excessive warnings make them "BORK" - serializer/serializer_php_bad_serialize serializer/serializer_php_bad_unserialize - ) - for x in "${broken_tests[@]}" ; do - rm "${S}/tests/experimental/${x}.phpt" || die - done -} - -src_configure() { - local PHP_EXT_ECONF_ARGS="--enable-memcached - $(use_enable session memcached-session) - $(use_enable sasl memcached-sasl) - $(use_enable json memcached-json) - $(use_enable igbinary memcached-igbinary)" - - php-ext-source-r3_src_configure -} - -src_test() { - touch "${T}/memcached.pid" || die - local memcached_opts=( -d -P "${T}/memcached.pid" -p 11211 -l 127.0.0.1 -U 11211 ) - [[ ${EUID} == 0 ]] && memcached_opts+=( -u portage ) - memcached "${memcached_opts[@]}" || die "Can't start memcached test server" - - local exit_status - php-ext-source-r3_src_test - exit_status=$? - - kill "$(<"${T}/memcached.pid")" - return ${exit_status} -} diff --git a/dev-php/pecl-memcached/pecl-memcached-3.2.0.ebuild b/dev-php/pecl-memcached/pecl-memcached-3.2.0.ebuild new file mode 100644 index 000000000000..09b3c0ce9508 --- /dev/null +++ b/dev-php/pecl-memcached/pecl-memcached-3.2.0.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +PHP_EXT_NAME="memcached" +DOCS=( ChangeLog README.markdown ) + +USE_PHP="php7-4 php8-0 php8-1" +PHP_EXT_NEEDED_USE="json(+)?,session(-)?" +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="Interface PHP with memcached via libmemcached library" +LICENSE="PHP-3.01" +SLOT="7" +KEYWORDS="~amd64 ~arm ~arm64 ~x86" +IUSE="igbinary json sasl +session test" + +RESTRICT="!test? ( test )" + +COMMON_DEPEND=">=dev-libs/libmemcached-1.0.14[sasl(-)?] + sys-libs/zlib + igbinary? ( dev-php/igbinary[php_targets_php7-4(-)?,php_targets_php8-0(-)?,php_targets_php8-1(-)?] ) +" +DEPEND="${COMMON_DEPEND}" +RDEPEND="${COMMON_DEPEND}" +BDEPEND="${COMMON_DEPEND} test? ( net-misc/memcached )" + +S="${WORKDIR}/${MY_P}" + +src_configure() { + local PHP_EXT_ECONF_ARGS="--enable-memcached + $(use_enable session memcached-session) + $(use_enable sasl memcached-sasl) + $(use_enable json memcached-json) + $(use_enable igbinary memcached-igbinary)" + + php-ext-source-r3_src_configure +} + +src_test() { + touch "${T}/memcached.pid" || die + local memcached_opts=( -d -P "${T}/memcached.pid" -p 11211 -l 127.0.0.1 -U 11211 ) + [[ ${EUID} == 0 ]] && memcached_opts+=( -u portage ) + memcached "${memcached_opts[@]}" || die "Can't start memcached test server" + + local exit_status + php-ext-source-r3_src_test + exit_status=$? + + kill "$(<"${T}/memcached.pid")" + return ${exit_status} +} diff --git a/dev-php/pecl-memcached/pecl-memcached-3.2.0_rc2.ebuild b/dev-php/pecl-memcached/pecl-memcached-3.2.0_rc2.ebuild deleted file mode 100644 index 09b3c0ce9508..000000000000 --- a/dev-php/pecl-memcached/pecl-memcached-3.2.0_rc2.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -PHP_EXT_NAME="memcached" -DOCS=( ChangeLog README.markdown ) - -USE_PHP="php7-4 php8-0 php8-1" -PHP_EXT_NEEDED_USE="json(+)?,session(-)?" -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="Interface PHP with memcached via libmemcached library" -LICENSE="PHP-3.01" -SLOT="7" -KEYWORDS="~amd64 ~arm ~arm64 ~x86" -IUSE="igbinary json sasl +session test" - -RESTRICT="!test? ( test )" - -COMMON_DEPEND=">=dev-libs/libmemcached-1.0.14[sasl(-)?] - sys-libs/zlib - igbinary? ( dev-php/igbinary[php_targets_php7-4(-)?,php_targets_php8-0(-)?,php_targets_php8-1(-)?] ) -" -DEPEND="${COMMON_DEPEND}" -RDEPEND="${COMMON_DEPEND}" -BDEPEND="${COMMON_DEPEND} test? ( net-misc/memcached )" - -S="${WORKDIR}/${MY_P}" - -src_configure() { - local PHP_EXT_ECONF_ARGS="--enable-memcached - $(use_enable session memcached-session) - $(use_enable sasl memcached-sasl) - $(use_enable json memcached-json) - $(use_enable igbinary memcached-igbinary)" - - php-ext-source-r3_src_configure -} - -src_test() { - touch "${T}/memcached.pid" || die - local memcached_opts=( -d -P "${T}/memcached.pid" -p 11211 -l 127.0.0.1 -U 11211 ) - [[ ${EUID} == 0 ]] && memcached_opts+=( -u portage ) - memcached "${memcached_opts[@]}" || die "Can't start memcached test server" - - local exit_status - php-ext-source-r3_src_test - exit_status=$? - - kill "$(<"${T}/memcached.pid")" - return ${exit_status} -} diff --git a/dev-php/pecl-ps/Manifest b/dev-php/pecl-ps/Manifest index 5a2faf438e4f..51c282ffa661 100644 --- a/dev-php/pecl-ps/Manifest +++ b/dev-php/pecl-ps/Manifest @@ -1,6 +1,4 @@ AUX ps-1.4.4-fix-gd-detection.patch 230 BLAKE2B b052d4dbb6e802c9d25620dd2516b03492a7493518af5d26a97b58b7a2990c558ec64cc3a6eb36aa62d93829e040980c11e56b3133bb345eb8cb7795e71a1f6c SHA512 b9ed97bf9fe8b841b4d25870db036b95f1a744f5d9fc0d59b89f43f76e23dd27d2cca877086b7e66b8dfddbd0fc0fbdf34ba490c9546c54087772d9e0eeb1537 -DIST ps-1.4.1.tgz 578991 BLAKE2B 549fae78ffb6e91f39b6292d969b9b80adba1a5911fb52e99c5fcbc940b9470205556e3e11c2940fadc7cc084400bc08ae7255b79e175d705c9bacb8eb3d6e71 SHA512 e9eeb5ad1c9314af0fcfd33e461b560f6cc599a679bc0a5541994fa698e3da63b7cb523f617647bdb2ac1c8fc090263e314ddf956a1e6126f8813de92e49f3af DIST ps-1.4.4.tgz 637247 BLAKE2B 19dd32a2321fd53224c662e68603c7c330fcf8fe0d3e4e3d4a6e75e211c876225f1f6cf9325b117f7a3713abd87e6acfe25c4c9b0c161e6d6717f94cc90b7649 SHA512 42ab1fff661da68afb42d90dc7fb07761698f191beaf09b6dd4b2c3e7e67949ef06b2f6389738a462f58722f863c6b80f55a00a57dddc860250a4500cbfecf8b -EBUILD pecl-ps-1.4.1-r1.ebuild 482 BLAKE2B d468f58e4169eb1902b75bc28061a9a4b2a0500fe1e8ae51b678c49a9624a1a3e0bdc36f4ff96e5436425e1c04141f57ad66b4b17659fac12a9a9bb59ec61340 SHA512 9d793f9bbb0d353602a1ba53f7e9e5f280f5bb9d7dc940ebea46710ec7480e481086cc028e6b05cd018476672e20efceb30e3c68350c8a0fc4f90f8b850eaffa EBUILD pecl-ps-1.4.4.ebuild 683 BLAKE2B 4672023d236ebfa4380b927f5d041000d22d02498cc6a3aa017a6c477500e8e645d191d279b670b7211c4832a060eb91a84264886b2acd534028df864a9e4a53 SHA512 b759d49858432970debb16f7c04296ea8162fb9512c3b09c98afac892a91511478ef61d6d74d07183b4db8ddb049c793cc7459bbcc4b7ac5bb4587356120c064 MISC metadata.xml 240 BLAKE2B f60f325331d493a555e53c29c7cf2742a415356da28a467505f1441f3fd790fd0d59050df84854bdc379d19d94a46121216479807975a2922d5a2fefde83416b SHA512 fada9d69055f2be962b95aac82f260ec5db7a3f4392d10f0458a1d125938fa17539f7ec486000f3a95cff85a3fbb6bbf1f6f4fe6c2de7aa420a7543a3e89d03e diff --git a/dev-php/pecl-ps/pecl-ps-1.4.1-r1.ebuild b/dev-php/pecl-ps/pecl-ps-1.4.1-r1.ebuild deleted file mode 100644 index 34f9154d7935..000000000000 --- a/dev-php/pecl-ps/pecl-ps-1.4.1-r1.ebuild +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -PHP_EXT_NAME="ps" -USE_PHP="php7-3 php7-4" - -inherit php-ext-pecl-r3 - -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" - -DESCRIPTION="PHP extension for creating PostScript files" -LICENSE="BSD" -SLOT="7" -IUSE="examples" - -DEPEND="dev-libs/pslib" -RDEPEND="${DEPEND}" -PHP_EXT_ECONF_ARGS="" - -src_test() { - # tests/004.phpt depends on set numeric format - LC_ALL=C php-ext-pecl-r3_src_test -} diff --git a/dev-php/pecl-psr/Manifest b/dev-php/pecl-psr/Manifest new file mode 100644 index 000000000000..bbba5aea3a96 --- /dev/null +++ b/dev-php/pecl-psr/Manifest @@ -0,0 +1,3 @@ +DIST psr-1.2.0.tgz 28238 BLAKE2B c8a3b81b1442c0bda2041aa3ca8d0b37759ff44fd36dd896b3b639e2deeb0767f8baaa699f6b6db063c7deb2f7b217a665d0306a75cc5d783bb635c6c0bf72a4 SHA512 90d4bc1cd2364a15775024806ec5bc1b8f60ed44569162016a0a78fca89f4ad0f0e0b1f9f09ebdcfe6a803e888bddd1d8ce73100eec52ecc21c2e505a35ee5dd +EBUILD pecl-psr-1.2.0.ebuild 423 BLAKE2B 0d0cd45b8e2291195c9d79863548c3ce293fbabae75c6a5d4465a5d50aad3c9129dddeadabfdff4a0187dd16a85db8e115fbf610a7e199e12ee73ca72aa22d1b SHA512 f95c860023ea19d4dc83bbca42590122926a6379c6302376de3fd703213234de134ddd1c3c82111fab6c1f28cc8ae66b39060f3557c351103a6b631a31c94890 +MISC metadata.xml 240 BLAKE2B f60f325331d493a555e53c29c7cf2742a415356da28a467505f1441f3fd790fd0d59050df84854bdc379d19d94a46121216479807975a2922d5a2fefde83416b SHA512 fada9d69055f2be962b95aac82f260ec5db7a3f4392d10f0458a1d125938fa17539f7ec486000f3a95cff85a3fbb6bbf1f6f4fe6c2de7aa420a7543a3e89d03e diff --git a/dev-php/pecl-psr/metadata.xml b/dev-php/pecl-psr/metadata.xml new file mode 100644 index 000000000000..222c77f3742a --- /dev/null +++ b/dev-php/pecl-psr/metadata.xml @@ -0,0 +1,8 @@ + + + + + php-bugs@gentoo.org + PHP + + diff --git a/dev-php/pecl-psr/pecl-psr-1.2.0.ebuild b/dev-php/pecl-psr/pecl-psr-1.2.0.ebuild new file mode 100644 index 000000000000..5c8d5d107d00 --- /dev/null +++ b/dev-php/pecl-psr/pecl-psr-1.2.0.ebuild @@ -0,0 +1,21 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PHP_EXT_NAME="psr" +PHP_EXT_INI="yes" +PHP_EXT_ZENDEXT="no" +PHP_EXT_ECONF_ARGS="" +DOCS=( README.md CHANGELOG.md ) + +USE_PHP="php7-4 php8-0 php8-1" + +inherit php-ext-pecl-r3 + +KEYWORDS="~amd64" + +DESCRIPTION="Provides the accepted PSR interfaces, so they can be used in an extension" +LICENSE="BSD-2" +SLOT="0" +IUSE="" diff --git a/dev-php/pecl-xdiff/Manifest b/dev-php/pecl-xdiff/Manifest index f801f2438abb..d5e6db1188f7 100644 --- a/dev-php/pecl-xdiff/Manifest +++ b/dev-php/pecl-xdiff/Manifest @@ -1,6 +1,3 @@ -AUX 2.1.0_pre-php8-2.patch 7546 BLAKE2B fc865765641195bce5ca2411ec1bf5153846a6289a6849a0029091bc66fdf9a30d4c44c198d20afa33432a4946a3976093cabfb146a1c4c2874a5265b04d7cc4 SHA512 8fcb7de738503a38a939bee7d58b1303e09faa2753b1a69f03813051ef79d7df2603342445350a30a0a194d1bb7e204526580d2f007d9e2a924f03c216d74ff4 -AUX 2.1.0_pre-php8-3.patch 1029 BLAKE2B a13459bf89ff56f2015e9c2c5a443af2217f83704d9e5abed6d532e512d850a3a2b03e33820d58d92db047d35d9229b1cb592e65fca89e34a342a545be52c0df SHA512 c428fbf2250dcc82977457c75610cea2f7bdd8bb3b45cf36520e7eb62bee5983fddfcc91cf6cebc144fb82d5421002af4fc5aba4320cd136360593d8cc665694 -AUX 2.1.0_pre-php8.patch 16933 BLAKE2B d2dcd690d756307b1ca30d7ff74a66d93cd51ee99c4caf007b9f9de05035326cae0782e155285db7a8c74ac59a2afaea9c3c3fed6c818431de87f77d50170f23 SHA512 89e1ce8f169624c1f5c3d1ae9f4dda5bba5bea3a43d351fe294551d1e41970069a173b352ee653435d74578933646decb6c36ae468c12a0cf0631c99b3ee83fd -DIST xdiff-2.0.1.tgz 10418 BLAKE2B d80afd629db788343e5804925fb8a9971cb0df2db6462be5adcace7e15e9b7fb2bf52cbb49f900878659fcf5e91c69b721c01e01f04876e8245ecc8094f0be61 SHA512 43f2bddac82ac19ac688ae7dad3fef65b0d8887c0e6adefd1fc15236582c31d78a54538903760270dee294ca8b8ba3def48bfa9b1d44160bcc450f5c6516402a -EBUILD pecl-xdiff-2.1.0_pre.ebuild 644 BLAKE2B 4779987df63e9bc76140318358bc9068b24abd1942013cd79b7dd8bb5e79224578638977a547fedfc682555d97c2b9c76e7b21319ec50884c10e58d5d80e6f27 SHA512 f24eeac4813cfec63c89d5dc6681e52d8686474947d274ee37d0368a5ca590ac1679c5c2c8a34fbbb1668114dbc474b662c8862c9c9a8b71630737c3bca6060d +DIST xdiff-2.1.0.tgz 25150 BLAKE2B 3325cc5d3494ec0eb1e161b5321554b60aedaa90e1173a4d1e9b530f734ce80b39dc680fdc4bd5379094175a8719586e5900d5426f4df0ef78b5b40839515664 SHA512 6576f60d7e7a49bcfac3ba51c72ed0ed9ab1b7c1c9bb1e97923fc431cf033c907aa150ddecd452e4bc6c5338ed4110584464428fcd8c34a6c4c536412204a548 +EBUILD pecl-xdiff-2.1.0.ebuild 413 BLAKE2B 1884374cb863fede26cc85f07d05d767768890cb63850dbd443d92e487c27d867f21ec7d7171a82206f7f6a693b2d042aba8724d716ce9d967b29ac75566ff6d SHA512 944e5033ff1b472144f02fbc7707c99512dfa5c24d1a6065311519702b8ff9ce4a3302bd732c710f067cf61b0a63785cdc14aedeccd851d319f6217b50ee9f19 MISC metadata.xml 334 BLAKE2B 1ee64cfc85a8f5f434d752262416140a3ab219dd3e38654575ee43b80b45edba6d51b6a611d462dfe7327548523cbc75b62584fd3f344e82d95c27f06a04e6e9 SHA512 18e619cfc3f34a22e442ba7507e8fe0051e7b2fb0ff8480b26bbd2835cc262065ea98a263d40fbd77e1a044514cbd766111793549ad6b9df361d4b0c355d8b5b diff --git a/dev-php/pecl-xdiff/files/2.1.0_pre-php8-2.patch b/dev-php/pecl-xdiff/files/2.1.0_pre-php8-2.patch deleted file mode 100644 index 80bebf7dfddd..000000000000 --- a/dev-php/pecl-xdiff/files/2.1.0_pre-php8-2.patch +++ /dev/null @@ -1,214 +0,0 @@ -From 2afb71ae1d6bcebe66f2e52019222a117c607f66 Mon Sep 17 00:00:00 2001 -From: Rasmus Lerdorf -Date: Thu, 14 Jan 2021 08:23:43 -0800 -Subject: [PATCH] Version 2.1.0 PHP 8 support Drop PHP 5 support - -diff --git a/xdiff.stub.php b/xdiff.stub.php -new file mode 100644 -index 0000000..4597e7f ---- /dev/null -+++ b/xdiff.stub.php -@@ -0,0 +1,84 @@ -+ -Date: Thu, 14 Jan 2021 15:23:43 -0800 -Subject: [PATCH] Don't need these here - ---- - php_xdiff.h | 16 ---------------- - 1 file changed, 16 deletions(-) - -diff --git a/php_xdiff.h b/php_xdiff.h -index de882fa..1b9a699 100644 ---- a/php_xdiff.h -+++ b/php_xdiff.h -@@ -39,22 +39,6 @@ extern zend_module_entry xdiff_module_entry; - PHP_MINIT_FUNCTION(xdiff); - PHP_MINFO_FUNCTION(xdiff); - --PHP_FUNCTION(xdiff_file_diff); --PHP_FUNCTION(xdiff_file_bdiff); --PHP_FUNCTION(xdiff_file_patch); --PHP_FUNCTION(xdiff_file_bpatch); --PHP_FUNCTION(xdiff_file_merge3); --PHP_FUNCTION(xdiff_file_rabdiff); --PHP_FUNCTION(xdiff_file_bdiff_size); -- --PHP_FUNCTION(xdiff_string_diff); --PHP_FUNCTION(xdiff_string_bdiff); --PHP_FUNCTION(xdiff_string_patch); --PHP_FUNCTION(xdiff_string_bpatch); --PHP_FUNCTION(xdiff_string_merge3); --PHP_FUNCTION(xdiff_string_rabdiff); --PHP_FUNCTION(xdiff_string_bdiff_size); -- - #endif /* PHP_XDIFF_H */ - - --- -2.11.0 - diff --git a/dev-php/pecl-xdiff/files/2.1.0_pre-php8.patch b/dev-php/pecl-xdiff/files/2.1.0_pre-php8.patch deleted file mode 100644 index 8a8f3ab43299..000000000000 --- a/dev-php/pecl-xdiff/files/2.1.0_pre-php8.patch +++ /dev/null @@ -1,467 +0,0 @@ -From 2afb71ae1d6bcebe66f2e52019222a117c607f66 Mon Sep 17 00:00:00 2001 -From: Rasmus Lerdorf -Date: Thu, 14 Jan 2021 08:23:43 -0800 -Subject: [PATCH] Version 2.1.0 PHP 8 support Drop PHP 5 support - -diff --git a/php_xdiff.h b/php_xdiff.h -index c79ad63..de882fa 100644 ---- a/php_xdiff.h -+++ b/php_xdiff.h -@@ -24,7 +24,7 @@ - extern zend_module_entry xdiff_module_entry; - #define phpext_xdiff_ptr &xdiff_module_entry - --#define PHP_XDIFF_VERSION "2.0.1" -+#define PHP_XDIFF_VERSION "2.1.0" - - #ifdef PHP_WIN32 - #define PHP_XDIFF_API __declspec(dllexport) -diff --git a/xdiff.c b/xdiff.c -index 0756c5a..f4c09f2 100644 ---- a/xdiff.c -+++ b/xdiff.c -@@ -27,6 +27,29 @@ - #include "ext/standard/info.h" - #include "php_xdiff.h" - -+#ifndef ZEND_ARG_INFO_WITH_DEFAULT_VALUE -+#define ZEND_ARG_INFO_WITH_DEFAULT_VALUE(pass_by_ref, name, default_value) \ -+ ZEND_ARG_INFO(pass_by_ref, name) -+#endif -+#if PHP_VERSION_ID < 70200 -+#undef ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX -+#define ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(name, return_reference, required_num_args, class_name, allow_null) \ -+ static const zend_internal_arg_info name[] = { \ -+ { (const char*)(zend_uintptr_t)(required_num_args), ( #class_name ), 0, return_reference, allow_null, 0 }, -+#endif -+ -+#ifndef ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX -+#define ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(name, return_reference, required_num_args, class_name, allow_null) \ -+ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(name, return_reference, required_num_args, class_name, allow_null) -+#endif -+ -+#ifndef ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE -+#define ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(pass_by_ref, name, type_hint, allow_null, default_value) \ -+ ZEND_ARG_TYPE_INFO(pass_by_ref, name, type_hint, allow_null) -+#endif -+ -+#include "xdiff_arginfo.h" -+ - #include - - /* Not exported by header file */ -@@ -37,14 +60,7 @@ struct string_buffer { - unsigned long size; - }; - -- ZEND_BEGIN_ARG_INFO(xdiff_arg_force_ref, 0) -- ZEND_ARG_PASS_INFO(0) -- ZEND_ARG_PASS_INFO(0) -- ZEND_ARG_PASS_INFO(0) -- ZEND_ARG_PASS_INFO(1) -- ZEND_END_ARG_INFO() -- --static int load_mm_file(const char *filepath, mmfile_t *dest TSRMLS_DC); -+static int load_mm_file(const char *filepath, mmfile_t *dest); - static int load_into_mm_file(const char *buffer, unsigned long size, mmfile_t *dest); - static int append_string(void *ptr, mmbuffer_t *buffer, int array_size); - static int append_stream(void *ptr, mmbuffer_t *buffer, int array_size); -@@ -52,17 +68,17 @@ static int init_string(struct string_buffer *string); - static void free_string(struct string_buffer *string); - static void invalidate_string(struct string_buffer *string); - --static int make_diff(char *filepath1, char *filepath2, xdemitcb_t *output, int context, int minimal TSRMLS_DC); -+static int make_diff(char *filepath1, char *filepath2, xdemitcb_t *output, int context, int minimal); - static int make_diff_str(char *str1, int size1, char *str2, int size2, xdemitcb_t *output, int context, int minimal); --static int make_bdiff(char *filepath1, char *filepath2, xdemitcb_t *output TSRMLS_DC); -+static int make_bdiff(char *filepath1, char *filepath2, xdemitcb_t *output); - static int make_bdiff_str(char *str1, int size1, char *str2, int size2, xdemitcb_t *output); --static int make_patch(char *file_path, char *patch_path, xdemitcb_t *output, xdemitcb_t *error, int flags TSRMLS_DC); -+static int make_patch(char *file_path, char *patch_path, xdemitcb_t *output, xdemitcb_t *error, int flags); - static int make_patch_str(char *file, int size1, char *patch, int size2, xdemitcb_t *output, xdemitcb_t *error, int flags); --static int make_bpatch(char *file_path, char *patch_path, xdemitcb_t *output TSRMLS_DC); -+static int make_bpatch(char *file_path, char *patch_path, xdemitcb_t *output); - static int make_bpatch_str(char *file, int size1, char *patch, int size2, xdemitcb_t *output); --static int make_merge3(char *filepath1, char *filepath2, char *filepath3, xdemitcb_t *output, xdemitcb_t *error TSRMLS_DC); -+static int make_merge3(char *filepath1, char *filepath2, char *filepath3, xdemitcb_t *output, xdemitcb_t *error); - static int make_merge3_str(char *content1, int size1, char *content2, int size2, char *content3, int size3, xdemitcb_t *output, xdemitcb_t *error); --static int make_rabdiff(char *filepath1, char *filepath2, xdemitcb_t *output TSRMLS_DC); -+static int make_rabdiff(char *filepath1, char *filepath2, xdemitcb_t *output); - static int make_rabdiff_str(char *str1, int size1, char *str2, int size2, xdemitcb_t *output); - - static void *xdiff_malloc(void *foo, unsigned int size) -@@ -84,33 +100,6 @@ static void *xdiff_realloc(void *foo, void *ptr, unsigned int nsize) - - static memallocator_t allocator = { NULL, xdiff_malloc, xdiff_free, xdiff_realloc }; - --/* {{{ xdiff_functions[] -- * -- * Every user visible function must have an entry in xdiff_functions[]. -- */ --zend_function_entry xdiff_functions[] = { -- PHP_FE(xdiff_file_diff, NULL) -- PHP_FE(xdiff_file_bdiff, NULL) -- PHP_FE(xdiff_file_patch, NULL) -- PHP_FE(xdiff_file_bpatch, NULL) -- PHP_FE(xdiff_file_merge3, NULL) -- PHP_FE(xdiff_file_rabdiff, NULL) -- PHP_FE(xdiff_file_bdiff_size, NULL) -- PHP_FE(xdiff_string_diff, NULL) -- PHP_FE(xdiff_string_bdiff, NULL) -- PHP_FE(xdiff_string_patch, xdiff_arg_force_ref) -- PHP_FE(xdiff_string_bpatch, NULL) -- PHP_FE(xdiff_string_merge3, xdiff_arg_force_ref) -- PHP_FE(xdiff_string_rabdiff, NULL) -- PHP_FE(xdiff_string_bdiff_size, NULL) -- PHP_FALIAS(xdiff_file_diff_binary, xdiff_file_bdiff, NULL) -- PHP_FALIAS(xdiff_file_patch_binary, xdiff_file_bpatch, NULL) -- PHP_FALIAS(xdiff_string_diff_binary, xdiff_string_bdiff, NULL) -- PHP_FALIAS(xdiff_string_patch_binary, xdiff_string_bpatch, NULL) -- {NULL, NULL, NULL} --}; --/* }}} */ -- - /* {{{ xdiff_module_entry - */ - zend_module_entry xdiff_module_entry = { -@@ -118,7 +107,7 @@ zend_module_entry xdiff_module_entry = { - STANDARD_MODULE_HEADER, - #endif - "xdiff", -- xdiff_functions, -+ ext_functions, - PHP_MINIT(xdiff), - NULL, - NULL, -@@ -172,7 +161,7 @@ PHP_FUNCTION(xdiff_string_diff) - xdemitcb_t output; - struct string_buffer string; - -- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "SS|lb", &str1, &str2, &context, &minimal) == FAILURE) { -+ if (zend_parse_parameters(ZEND_NUM_ARGS(), "SS|lb", &str1, &str2, &context, &minimal) == FAILURE) { - RETURN_FALSE; - } - -@@ -204,7 +193,7 @@ PHP_FUNCTION(xdiff_file_diff) - xdemitcb_t output; - php_stream *output_stream; - -- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "SSS|lb", &filepath1, &filepath2, &dest, &context, &minimal) == FAILURE) { -+ if (zend_parse_parameters(ZEND_NUM_ARGS(), "SSS|lb", &filepath1, &filepath2, &dest, &context, &minimal) == FAILURE) { - RETURN_FALSE; - } - -@@ -217,7 +206,7 @@ PHP_FUNCTION(xdiff_file_diff) - output.priv = output_stream; - output.outf = append_stream; - -- retval = make_diff(filepath1->val, filepath2->val, &output, context, minimal TSRMLS_CC); -+ retval = make_diff(filepath1->val, filepath2->val, &output, context, minimal); - if (!retval) - goto out_stream_close; - -@@ -239,7 +228,7 @@ PHP_FUNCTION(xdiff_string_bdiff) - xdemitcb_t output; - struct string_buffer string; - -- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "SS", &str1, &str2) == FAILURE) { -+ if (zend_parse_parameters(ZEND_NUM_ARGS(), "SS", &str1, &str2) == FAILURE) { - RETURN_FALSE; - } - -@@ -270,7 +259,7 @@ PHP_FUNCTION(xdiff_file_bdiff) - xdemitcb_t output; - php_stream *output_stream; - -- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "SSS", &filepath1, &filepath2, &result) == FAILURE) { -+ if (zend_parse_parameters(ZEND_NUM_ARGS(), "SSS", &filepath1, &filepath2, &result) == FAILURE) { - RETURN_FALSE; - } - -@@ -283,7 +272,7 @@ PHP_FUNCTION(xdiff_file_bdiff) - output.priv = output_stream; - output.outf = append_stream; - -- retval = make_bdiff(filepath1->val, filepath2->val, &output TSRMLS_CC); -+ retval = make_bdiff(filepath1->val, filepath2->val, &output); - if (!retval) - goto out_stream_close; - -@@ -305,7 +294,7 @@ PHP_FUNCTION(xdiff_string_rabdiff) - xdemitcb_t output; - struct string_buffer string; - -- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "SS", &str1, &str2) == FAILURE) { -+ if (zend_parse_parameters(ZEND_NUM_ARGS(), "SS", &str1, &str2) == FAILURE) { - RETURN_FALSE; - } - -@@ -336,7 +325,7 @@ PHP_FUNCTION(xdiff_file_rabdiff) - xdemitcb_t output; - php_stream *output_stream; - -- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "SSS", &filepath1, &filepath2, &result) == FAILURE) { -+ if (zend_parse_parameters(ZEND_NUM_ARGS(), "SSS", &filepath1, &filepath2, &result) == FAILURE) { - RETURN_FALSE; - } - -@@ -349,7 +338,7 @@ PHP_FUNCTION(xdiff_file_rabdiff) - output.priv = output_stream; - output.outf = append_stream; - -- retval = make_rabdiff(filepath1->val, filepath2->val, &output TSRMLS_CC); -+ retval = make_rabdiff(filepath1->val, filepath2->val, &output); - if (!retval) - goto out_stream_close; - -@@ -371,13 +360,13 @@ PHP_FUNCTION(xdiff_file_bdiff_size) - long result; - mmfile_t file; - -- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "S", &filepath) == FAILURE) { -+ if (zend_parse_parameters(ZEND_NUM_ARGS(), "S", &filepath) == FAILURE) { - RETURN_FALSE; - } - - RETVAL_FALSE; - -- retval = load_mm_file(filepath->val, &file TSRMLS_CC); -+ retval = load_mm_file(filepath->val, &file); - if (!retval) - goto out; - -@@ -403,7 +392,7 @@ PHP_FUNCTION(xdiff_string_bdiff_size) - long result; - mmfile_t file; - -- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "S", &patch) == FAILURE) { -+ if (zend_parse_parameters(ZEND_NUM_ARGS(), "S", &patch) == FAILURE) { - RETURN_FALSE; - } - -@@ -437,7 +426,7 @@ PHP_FUNCTION(xdiff_file_patch) - xdemitcb_t output, error_output; - struct string_buffer error_string; - -- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "SSS|l", &src_path, &patch_path, &dest_path, &flags) == FAILURE) { -+ if (zend_parse_parameters(ZEND_NUM_ARGS(), "SSS|l", &src_path, &patch_path, &dest_path, &flags) == FAILURE) { - RETURN_FALSE; - } - -@@ -457,7 +446,7 @@ PHP_FUNCTION(xdiff_file_patch) - error_output.priv= &error_string; - error_output.outf = append_string; - -- retval = make_patch(src_path->val, patch_path->val, &output, &error_output, flags TSRMLS_CC); -+ retval = make_patch(src_path->val, patch_path->val, &output, &error_output, flags); - if (retval < 0) - goto out_free_string; - -@@ -487,7 +476,7 @@ PHP_FUNCTION(xdiff_string_patch) - xdemitcb_t output, error_output; - struct string_buffer output_string, error_string; - -- if (zend_parse_parameters_ex(0, ZEND_NUM_ARGS() TSRMLS_CC, "SS|lz", &src, &patch, &flags, &error_ref) == FAILURE) { -+ if (zend_parse_parameters_ex(0, ZEND_NUM_ARGS(), "SS|lz", &src, &patch, &flags, &error_ref) == FAILURE) { - RETURN_FALSE; - } - -@@ -539,7 +528,7 @@ PHP_FUNCTION(xdiff_file_bpatch) - int retval; - xdemitcb_t output; - -- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "SSS", &src_path, &patch_path, &dest_path) == FAILURE) { -+ if (zend_parse_parameters(ZEND_NUM_ARGS(), "SSS", &src_path, &patch_path, &dest_path) == FAILURE) { - RETURN_FALSE; - } - -@@ -552,7 +541,7 @@ PHP_FUNCTION(xdiff_file_bpatch) - output.outf = append_stream; - output.priv = output_stream; - -- retval = make_bpatch(src_path->val, patch_path->val, &output TSRMLS_CC); -+ retval = make_bpatch(src_path->val, patch_path->val, &output); - php_stream_close(output_stream); - - if (retval == 0) -@@ -572,7 +561,7 @@ PHP_FUNCTION(xdiff_string_bpatch) - xdemitcb_t output; - struct string_buffer output_string; - -- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "SS", &src, &patch) == FAILURE) { -+ if (zend_parse_parameters(ZEND_NUM_ARGS(), "SS", &src, &patch) == FAILURE) { - RETURN_FALSE; - } - -@@ -608,7 +597,7 @@ PHP_FUNCTION(xdiff_file_merge3) - xdemitcb_t output, error_output; - int retval; - -- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "SSSS", &file1, &file2, &file3, &dest) == FAILURE) { -+ if (zend_parse_parameters(ZEND_NUM_ARGS(), "SSSS", &file1, &file2, &file3, &dest) == FAILURE) { - RETURN_FALSE; - } - -@@ -628,7 +617,7 @@ PHP_FUNCTION(xdiff_file_merge3) - error_output.priv = &string; - error_output.outf = append_string; - -- retval = make_merge3(file1->val, file2->val, file3->val, &output, &error_output TSRMLS_CC); -+ retval = make_merge3(file1->val, file2->val, file3->val, &output, &error_output); - if (!retval) - goto out_free_string; - -@@ -657,7 +646,7 @@ PHP_FUNCTION(xdiff_string_merge3) - xdemitcb_t output, error_output; - int retval; - -- if (zend_parse_parameters_ex(0, ZEND_NUM_ARGS() TSRMLS_CC, "SSS|z", &file1, &file2, &file3, &error_ref) == FAILURE) { -+ if (zend_parse_parameters_ex(0, ZEND_NUM_ARGS(), "SSS|z", &file1, &file2, &file3, &error_ref) == FAILURE) { - RETURN_FALSE; - } - -@@ -700,7 +689,7 @@ out: - } - /* }}} */ - --static int load_mm_file(const char *filepath, mmfile_t *dest TSRMLS_DC) -+static int load_mm_file(const char *filepath, mmfile_t *dest) - { - int retval; - off_t filesize; -@@ -789,7 +778,6 @@ static int append_stream(void *ptr, mmbuffer_t *buffer, int array_size) - { - php_stream *stream = ptr; - unsigned int i; -- TSRMLS_FETCH(); - - for (i = 0; i < array_size; i++) { - php_stream_write(stream, buffer[i].ptr, buffer[i].size); -@@ -821,18 +809,18 @@ static void free_string(struct string_buffer *string) - efree(string->ptr); - } - --static int make_diff(char *filepath1, char *filepath2, xdemitcb_t *output, int context, int minimal TSRMLS_DC) -+static int make_diff(char *filepath1, char *filepath2, xdemitcb_t *output, int context, int minimal) - { - mmfile_t file1, file2; - xpparam_t params; - xdemitconf_t conf; - int retval, result = 0; - -- retval = load_mm_file(filepath1, &file1 TSRMLS_CC); -+ retval = load_mm_file(filepath1, &file1); - if (!retval) - goto out; - -- retval = load_mm_file(filepath2, &file2 TSRMLS_CC); -+ retval = load_mm_file(filepath2, &file2); - if (!retval) - goto out_free_mmfile; - -@@ -885,17 +873,17 @@ out: - return result; - } - --static int make_bdiff(char *filepath1, char *filepath2, xdemitcb_t *output TSRMLS_DC) -+static int make_bdiff(char *filepath1, char *filepath2, xdemitcb_t *output) - { - mmfile_t file1, file2; - bdiffparam_t params; - int retval, result = 0; - -- retval = load_mm_file(filepath1, &file1 TSRMLS_CC); -+ retval = load_mm_file(filepath1, &file1); - if (!retval) - goto out; - -- retval = load_mm_file(filepath2, &file2 TSRMLS_CC); -+ retval = load_mm_file(filepath2, &file2); - if (!retval) - goto out_free_mmfile; - -@@ -945,16 +933,16 @@ out: - return result; - } - --static int make_rabdiff(char *filepath1, char *filepath2, xdemitcb_t *output TSRMLS_DC) -+static int make_rabdiff(char *filepath1, char *filepath2, xdemitcb_t *output) - { - mmfile_t file1, file2; - int retval, result = 0; - -- retval = load_mm_file(filepath1, &file1 TSRMLS_CC); -+ retval = load_mm_file(filepath1, &file1); - if (!retval) - goto out; - -- retval = load_mm_file(filepath2, &file2 TSRMLS_CC); -+ retval = load_mm_file(filepath2, &file2); - if (!retval) - goto out_free_mmfile; - -@@ -999,16 +987,16 @@ out: - return result; - } - --static int make_patch(char *file_path, char *patch_path, xdemitcb_t *output, xdemitcb_t *error, int flags TSRMLS_DC) -+static int make_patch(char *file_path, char *patch_path, xdemitcb_t *output, xdemitcb_t *error, int flags) - { - mmfile_t file, patch; - int retval, result = 0; - -- retval = load_mm_file(file_path, &file TSRMLS_CC); -+ retval = load_mm_file(file_path, &file); - if (!retval) - goto out; - -- retval = load_mm_file(patch_path, &patch TSRMLS_CC); -+ retval = load_mm_file(patch_path, &patch); - if (!retval) - goto out_free_mmfile; - -@@ -1053,16 +1041,16 @@ out: - return result; - } - --static int make_bpatch(char *file_path, char *patch_path, xdemitcb_t *output TSRMLS_DC) -+static int make_bpatch(char *file_path, char *patch_path, xdemitcb_t *output) - { - mmfile_t file_mm, patch_mm; - int retval, result = 0; - -- retval = load_mm_file(file_path, &file_mm TSRMLS_CC); -+ retval = load_mm_file(file_path, &file_mm); - if (!retval) - goto out; - -- retval = load_mm_file(patch_path, &patch_mm TSRMLS_CC); -+ retval = load_mm_file(patch_path, &patch_mm); - if (!retval) - goto out_free_mmfile; - -@@ -1107,20 +1095,20 @@ out: - return result; - } - --static int make_merge3(char *filepath1, char *filepath2, char *filepath3, xdemitcb_t *output, xdemitcb_t *error TSRMLS_DC) -+static int make_merge3(char *filepath1, char *filepath2, char *filepath3, xdemitcb_t *output, xdemitcb_t *error) - { - mmfile_t file1, file2, file3; - int retval, result = 0; - -- retval = load_mm_file(filepath1, &file1 TSRMLS_CC); -+ retval = load_mm_file(filepath1, &file1); - if (!retval) - goto out; - -- retval = load_mm_file(filepath2, &file2 TSRMLS_CC); -+ retval = load_mm_file(filepath2, &file2); - if (!retval) - goto out_free_mmfile; - -- retval = load_mm_file(filepath3, &file3 TSRMLS_CC); -+ retval = load_mm_file(filepath3, &file3); - if (!retval) - goto out_free_mmfile2; - diff --git a/dev-php/pecl-xdiff/pecl-xdiff-2.1.0.ebuild b/dev-php/pecl-xdiff/pecl-xdiff-2.1.0.ebuild new file mode 100644 index 000000000000..9d05cd85f871 --- /dev/null +++ b/dev-php/pecl-xdiff/pecl-xdiff-2.1.0.ebuild @@ -0,0 +1,22 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PHP_EXT_NAME="xdiff" +PHP_EXT_PECL_PKG="xdiff" +DOCS=( README.API ) + +USE_PHP="php7-4 php8-0 php8-1" + +inherit php-ext-pecl-r3 + +KEYWORDS="~amd64 ~x86" + +DESCRIPTION="PHP extension for generating diff files" +LICENSE="PHP-3.01" +SLOT="7" + +DEPEND="dev-libs/libxdiff" +RDEPEND="${DEPEND}" +PHP_EXT_ECONF_ARGS=() diff --git a/dev-php/pecl-xdiff/pecl-xdiff-2.1.0_pre.ebuild b/dev-php/pecl-xdiff/pecl-xdiff-2.1.0_pre.ebuild deleted file mode 100644 index 336f7f480f72..000000000000 --- a/dev-php/pecl-xdiff/pecl-xdiff-2.1.0_pre.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PHP_EXT_NAME="xdiff" -PHP_EXT_PECL_PKG="xdiff" -DOCS=( README.API ) - -USE_PHP="php7-3 php7-4 php8-0" -PHP_EXT_PECL_FILENAME="${PN/pecl-/}-2.0.1.tgz" - -inherit php-ext-pecl-r3 - -KEYWORDS="~amd64 ~x86" - -DESCRIPTION="PHP extension for generating diff files" -LICENSE="PHP-3.01" -SLOT="7" - -DEPEND="dev-libs/libxdiff" -RDEPEND="${DEPEND}" -PHP_EXT_ECONF_ARGS=() -PATCHES=( -"${FILESDIR}/2.1.0_pre-php8.patch" -"${FILESDIR}/2.1.0_pre-php8-2.patch" -"${FILESDIR}/2.1.0_pre-php8-3.patch" -) -S="${WORKDIR}/${PHP_EXT_PECL_FILENAME/.tgz/}" -PHP_EXT_S="${S}" diff --git a/dev-php/psr-log/Manifest b/dev-php/psr-log/Manifest index aac4f35eb1f6..02a3589d2c64 100644 --- a/dev-php/psr-log/Manifest +++ b/dev-php/psr-log/Manifest @@ -2,5 +2,5 @@ AUX autoload.php 258 BLAKE2B 64c22f9d35d5b8a66d0823348273123a8440eb3f93b3627767e DIST psr-log-1.1.3.tar.gz 5863 BLAKE2B 6eb823853d69900f6b265448312cc351f3bbe90b26cf3f01bc108c9508a40d19f8cf52bd157da3481d6fd4bf96f0e40932fa5501226955a87e23bd84ddb36ce0 SHA512 e78f0d2343f0e5e59d3d343d9f122bea9962f8fc9bc66e52838c6ab5047929bfd5178ee63713f12a93889da28d1bd5c8e55243d42110264e32f7d5f207a597bc DIST psr-log-1.1.4.tar.gz 5843 BLAKE2B b8cd6304495d4e10e4fbc137c226880fdfe8f5e9ce44f72f9389d3d560db1d8a91ea832c9f89772d329c0bd65fc8710ae4125845cda3d0316de307dd39d1b14f SHA512 fca99e74f357c8da9f726a1f83825aa0d2fdda4ce31c67099818c4aa724fcc1293cecd446476697d244f192e92bf6bc2eed39c197028611589825c677a15f3ac EBUILD psr-log-1.1.3.ebuild 528 BLAKE2B cdac444935705a5bba73ad90da978db48c17529f7311f8043ce321dfe741568d5e411895ae2c784f38341a32726ff31d2aae178aed401bcc779affe9b29c9e69 SHA512 038bfd108409aef11848d534e96acdd29f21b6093606930ef18b0b1f13eb6a035c034eaae8c497cd1eb89134a9a38552fe403f20d5579de01e74f1473a80f025 -EBUILD psr-log-1.1.4.ebuild 530 BLAKE2B 096b7a67ee436673c8c7b25c076de7092f36de197df872487c796be856a8fe12399e55d99bd585f6f282b6abdec59741d11ba4affae404d21f8a62c1a19ea0bc SHA512 83ec39a0bb106c1726f47e31eb6ed53411394467e282e19b75bb5b852152cf3f4ecceb2f05e728b83b1a727b5bee4c79b126bf8c147fc14484f6944e1a870648 +EBUILD psr-log-1.1.4.ebuild 528 BLAKE2B f1b7e7204780b8a27674fa59f75236d9a93d98effac504c63bce2b89457133c46481793a6cc4e301598767e747f978b2a412a32e73a3e035bed529e8ce7aef39 SHA512 bed87fa0b7c485465944fb58cee99a597e6f73fc79832c382587384e6b7e3ee5ed31837876c34e3e1e93805807e6d828015e08bc75380050de6ebffcdb3243ce MISC metadata.xml 833 BLAKE2B da451803fd18b26a1b9a59da7d79b2f4d59cb8dfdd1013167f12912c9c4a7c80eb86e7eca83b2ca3ee585a3775dadd76109f1a6dd94f546b106a70b270b60585 SHA512 354c29721e6abb7d8da3c4bf66667231cd03f4e88061ef86d9fc08ecf21e18b3e419908eb067695b84fc5f8d258d96bf4ef8bfa500213674f1ddbf47456f435e diff --git a/dev-php/psr-log/psr-log-1.1.4.ebuild b/dev-php/psr-log/psr-log-1.1.4.ebuild index db272717331e..8f88b46dfd69 100644 --- a/dev-php/psr-log/psr-log-1.1.4.ebuild +++ b/dev-php/psr-log/psr-log-1.1.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -9,7 +9,7 @@ SRC_URI="https://github.com/php-fig/log/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" RDEPEND=" dev-lang/php:* diff --git a/dev-php/semver/Manifest b/dev-php/semver/Manifest index 675dbc85a761..3e4618404320 100644 --- a/dev-php/semver/Manifest +++ b/dev-php/semver/Manifest @@ -10,5 +10,5 @@ EBUILD semver-1.5.1.ebuild 650 BLAKE2B fa3328c96907a5076d8bdeba7f212aca9cd185023 EBUILD semver-1.7.0.ebuild 650 BLAKE2B 48f33a5b5cfc3897c26def0674632aeb716a7b47d1c618a683cf9546896fb09ff861bdda63c5604b9451057ac91f15582ebe41d570282a43d7a6c5f17f2030fa SHA512 41bffeb1143f9545379e3db6b37603a2190e2cc2e959900019ac38a60a795e2991c2b73cdc5f6d2b15a281c1629533defd9eab8fff1c023541e0ee4313fa3ddf EBUILD semver-1.7.1.ebuild 650 BLAKE2B 48f33a5b5cfc3897c26def0674632aeb716a7b47d1c618a683cf9546896fb09ff861bdda63c5604b9451057ac91f15582ebe41d570282a43d7a6c5f17f2030fa SHA512 41bffeb1143f9545379e3db6b37603a2190e2cc2e959900019ac38a60a795e2991c2b73cdc5f6d2b15a281c1629533defd9eab8fff1c023541e0ee4313fa3ddf EBUILD semver-3.2.4.ebuild 676 BLAKE2B 4be9d19d0efaff2b319db77a53d303ded8b98d355f384652098099975e15cc102f61f602c74a8bf925a1d0e6c1c4654c7f799780a5dddc9728e9091d5ec197f8 SHA512 ef9204d2a0525416ba4b46599e227abf004fb7ecf0022e56a3d0a6c2113e44e97c50a65bba496360c46a30b532785c1d9e641a3fe0dd45e494e98d1b30e59822 -EBUILD semver-3.2.6.ebuild 678 BLAKE2B 9af1b5890e3f142927f10e8705575f0f10801225dfe8e833cd0992ea1814dd77dcbc589af3416052452b2074e78a288a73f0ba9eebab7499d7570dcf3d73937a SHA512 55b2c8fcc02006f4f07e251dddc32a63fe4cbe06625553b2b3976339bde26f3cb1e4a47b54808cf93f0c3851669f8f0abed045d41acfe65bc11043b7d1310de0 +EBUILD semver-3.2.6.ebuild 676 BLAKE2B 43a57b19d033211606d3e1fc5cc70098e342a1c4cac484728f4c7fc3dbd8ec07e2db5c8d6130c0e4d22efcf1d7c22371052cd96e0c31ce55b6fd7317939e8a99 SHA512 550159dc1b026bde28545186855bab759d2f21859edafc3908444ef282032295a4d7268a764aaf694e63592be160ad7f9e6946c0ae64de09ec9e03aa176f7d74 MISC metadata.xml 584 BLAKE2B cd695933be9a29d3f6e0db1273411549d1e2f9a1d2052da5f3de54329d6888e31a67560f296b63ecd3b0bf97c8c5f76907c9ed688582b5d61bb2ee952d2844dc SHA512 72b03e4a7eaf6804298ff169888cb1aa40a2f9975ba2be3735e0677446ef64af82432546771aeba308ec673c9e0ebe9ab875dfb9bdcd90631f4cde2e7836244d diff --git a/dev-php/semver/semver-3.2.6.ebuild b/dev-php/semver/semver-3.2.6.ebuild index ba48da91ec5f..bbee567c21ef 100644 --- a/dev-php/semver/semver-3.2.6.ebuild +++ b/dev-php/semver/semver-3.2.6.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -9,7 +9,7 @@ SRC_URI="https://github.com/composer/semver/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" BDEPEND="dev-php/theseer-Autoload" diff --git a/dev-php/twig/Manifest b/dev-php/twig/Manifest index 9a214c523c2b..762a04a67d0b 100644 --- a/dev-php/twig/Manifest +++ b/dev-php/twig/Manifest @@ -1,4 +1,4 @@ AUX Autoloader.php 503 BLAKE2B 57679179226098eea818df53154b98afd3249f12a219fc894a7529bdcb8ceb39c7c5c20f14263ce03875983ab0acaeaa6e09ca8446ee5b9a591b6e284e7f9238 SHA512 054a9420a23b67c57ca0780fdbc3c817436dea71780714654469efa23c0d17173e1c87b2f3c6ce48e26e4dd49a92f1f17e2e23472a666513e9fb8903a4f11699 DIST twig-1.44.6.tar.gz 126880 BLAKE2B a838a5ae8bc82b6e0a39b55ba7d3817dd0ac0c2995881662fc5e7327a5dea83dea4740952282c9320016b379c08f02cb53a850004ecd2c919ca84da6267d0a56 SHA512 a443a700b71f982ea47187d9753ba9903e879f272ed53ff399211f5a76e7dd84774d5071a24cb8d5df6ffa754ce989fac152d0fe124ca460b8f167a553be86e7 EBUILD twig-1.44.6.ebuild 1380 BLAKE2B 0db79b98e60fe42c1260922ae5a40bdc19c46619d735f92ad7317f2fe5b2c57c677cec695f642cd3ffa221fafe86769b32eee38045df13c1695e1b6f5cd25691 SHA512 9ebecbaa4b6eee4f12926d158173edfd7c2bbd27692249fb9cd9ed9794939c46e72afcbdc016c3f94c8cfa2097d6b9f5467218ca58ebbf50ccf7b8d622144e89 -MISC metadata.xml 439 BLAKE2B 27da78ff42447ff34923822ed56ad44183aa7d93ac23ab32bcc1b433a4df1e6e44b853cc36754497b0911ebc9dcbe143149bde1cdcd86eb479d11dc72d347758 SHA512 bedb9bc4acd125c8c1b548767f99e18a4cbbd6cb77a7e6e1631b7b4c58442900ead5d3954a84c6a5c79aadef9d6d4be848a1dbc5d8796d87e39545ca082147ae +MISC metadata.xml 327 BLAKE2B 88fc2dfec2042f7687e80bdbdff6f6d4ff93f0e35ff4215d2b0bab384d0110cc9510f00589028b24be51bd6f2260f422fd016d20f7d4fec15f8d7bb34ff33bc1 SHA512 356774e50c461602c6731d809b689c354455b3f36a2d5cad1913f829cfa1a0e8034cd79eb3299bd5d7ac6d37144e8334dddfb226aea3e171fda1343a5c90cce0 diff --git a/dev-php/twig/metadata.xml b/dev-php/twig/metadata.xml index 6619337fad39..10c660f698a7 100644 --- a/dev-php/twig/metadata.xml +++ b/dev-php/twig/metadata.xml @@ -1,10 +1,6 @@ - - djc@gentoo.org - Dirkjan Ochtman - php-bugs@gentoo.org PHP diff --git a/dev-php/xdebug-handler/Manifest b/dev-php/xdebug-handler/Manifest index 871ab9411bce..61cac34c23f6 100644 --- a/dev-php/xdebug-handler/Manifest +++ b/dev-php/xdebug-handler/Manifest @@ -2,5 +2,5 @@ AUX autoload.php 273 BLAKE2B e898a6f52339faf4a22f81207bef6a9c8620e5756b30c462f42 DIST xdebug-handler-1.4.3.tar.gz 13660 BLAKE2B 2edbd2755102ced0183e6d7ade341ed830b4c1d923f453868d29f39aa7de5159758fd162a369246adf4551a8a06c0bc6f1a29921369e47ba645f9aed2707a5b3 SHA512 ed92ca769276e66611de3cf9d44a03fd163516b973486ac5339dfe9cd9fbab8fb5f754799f59505f03aa5eb4ad175e804c6e61d0a5db63a558edf7ef1aff438c DIST xdebug-handler-2.0.1.tar.gz 14212 BLAKE2B 01200a86794145132a4c8d1b851a3131d73c23ca33d27fa9da26988f48a6c0df3552322f8fad0559ac00adf1605f35a65aa21591bc221d239ad2d8cbf4c303cd SHA512 6cc1d336a82f1edf6fb9dd317d0275c79754eb7a01fa34e0cc85c24b0a02363ccb2ff42e8b692d90077745f4db8409e7e66bef64f30a89b364eff71a4af7f4f1 EBUILD xdebug-handler-1.4.3.ebuild 581 BLAKE2B f3d38d96a7fdad9b32d04042d87c1ec35eafc5404a0f1f17fcce7212aa3db9e4f1750584cca044680da2887224f51bffab3235bf49a17eb181f88a8a7a3a4091 SHA512 4f07479ea7beebdcc6b28ff6a145a19c103f28e51caabbf311a9ad8eeb8bd34fc54b3f0ae13b32febe4ad9d2b07ea6374fd68d13f22e684051836eda15683333 -EBUILD xdebug-handler-2.0.1.ebuild 583 BLAKE2B 401593cd32d8d83bcd72dbc8c294e0f2c65d20abb7c0fd47395ab36283da5edf45be1d6431864aa96f2a10b0f7fcd4ca8f2c0d6debb9ce71ddc90fe9df34265f SHA512 e741bd7c3a359f9dafe07a4851fa89e7f58486af7ebb02254b0f8510f50f7b3846f6b5e3e322057d21d512a5d87e2600e9ff4bb86ad3816bd1dbd95323432b8b +EBUILD xdebug-handler-2.0.1.ebuild 581 BLAKE2B bf1c1d8326692f6dddd8d860fc4b154838e55429dfc30aed1d6f9a0cd0e59ffd2f897d4df1322217201b5cf6c45db8a68ccd2f9772e12a4f19afea4e9f2a8bd7 SHA512 6ce72dc4286b217a28e076255affcbbe672f23cb5e391488c1a5a79a2464604adb1bc91cac947653b143eff88d4fd606ccdcb6087365e2d5f85d856fff9ed640 MISC metadata.xml 507 BLAKE2B 5a0f62f14cc10116ea76c15f91f1a1cdc6ac3028709e478f3409de805f3e1532a0234a7dabcf18aaeecec57ed0dad4c0b02909c0d7d3be77b0ea8c377d867c70 SHA512 da124a12f5dda571aa6ad13f99d6a36934dce71dc839da8f478d3de04ff413e36caa01a88c2df5b5a1c92c81952e8d65a9911a5c4e801a6681050818c0e12d0f diff --git a/dev-php/xdebug-handler/xdebug-handler-2.0.1.ebuild b/dev-php/xdebug-handler/xdebug-handler-2.0.1.ebuild index ad9f7604ad52..10d6a07ffb26 100644 --- a/dev-php/xdebug-handler/xdebug-handler-2.0.1.ebuild +++ b/dev-php/xdebug-handler/xdebug-handler-2.0.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -9,7 +9,7 @@ SRC_URI="https://github.com/composer/xdebug-handler/archive/${PV}.tar.gz -> ${P} LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" RDEPEND=" dev-lang/php:* -- cgit v1.2.3