summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'dev-php')
-rw-r--r--dev-php/File_Iterator/metadata.xml2
-rw-r--r--dev-php/PEAR-Archive_Tar/Manifest2
-rw-r--r--dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.4.12.ebuild50
-rw-r--r--dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.4.13.ebuild50
-rw-r--r--dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.4.14.ebuild2
-rw-r--r--dev-php/PEAR-Archive_Tar/metadata.xml2
-rw-r--r--dev-php/PEAR-Auth_SASL/metadata.xml2
-rw-r--r--dev-php/PEAR-Cache/metadata.xml2
-rw-r--r--dev-php/PEAR-Cache_Lite/metadata.xml2
-rw-r--r--dev-php/PEAR-Console_CommandLine/metadata.xml2
-rw-r--r--dev-php/PEAR-Console_Getargs/metadata.xml2
-rw-r--r--dev-php/PEAR-Console_Getopt/metadata.xml2
-rw-r--r--dev-php/PEAR-Console_Table/metadata.xml2
-rw-r--r--dev-php/PEAR-Crypt_CHAP/metadata.xml2
-rw-r--r--dev-php/PEAR-Crypt_GPG/Manifest1
-rw-r--r--dev-php/PEAR-Crypt_GPG/PEAR-Crypt_GPG-1.6.6.ebuild49
-rw-r--r--dev-php/PEAR-Crypt_GPG/metadata.xml2
-rw-r--r--dev-php/PEAR-Crypt_HMAC/metadata.xml2
-rw-r--r--dev-php/PEAR-Crypt_HMAC2/metadata.xml2
-rw-r--r--dev-php/PEAR-DB/Manifest1
-rw-r--r--dev-php/PEAR-DB/PEAR-DB-1.11.0.ebuild (renamed from dev-php/PEAR-Mail_Mime/PEAR-Mail_Mime-1.10.8.ebuild)17
-rw-r--r--dev-php/PEAR-DB/metadata.xml7
-rw-r--r--dev-php/PEAR-DB_DataObject/metadata.xml2
-rw-r--r--dev-php/PEAR-Date/metadata.xml2
-rw-r--r--dev-php/PEAR-Exception/metadata.xml2
-rw-r--r--dev-php/PEAR-File/metadata.xml2
-rw-r--r--dev-php/PEAR-File_Archive/metadata.xml2
-rw-r--r--dev-php/PEAR-File_Find/metadata.xml2
-rw-r--r--dev-php/PEAR-File_Fortune/metadata.xml2
-rw-r--r--dev-php/PEAR-File_Gettext/metadata.xml2
-rw-r--r--dev-php/PEAR-File_SMBPasswd/metadata.xml2
-rw-r--r--dev-php/PEAR-HTML_AJAX/metadata.xml2
-rw-r--r--dev-php/PEAR-HTML_CSS/metadata.xml2
-rw-r--r--dev-php/PEAR-HTML_Common/metadata.xml2
-rw-r--r--dev-php/PEAR-HTML_Common2/metadata.xml2
-rw-r--r--dev-php/PEAR-HTML_Javascript/metadata.xml2
-rw-r--r--dev-php/PEAR-HTML_QuickForm2/metadata.xml2
-rw-r--r--dev-php/PEAR-HTML_Table/metadata.xml2
-rw-r--r--dev-php/PEAR-HTML_Table_Matrix/metadata.xml2
-rw-r--r--dev-php/PEAR-HTML_Template_Flexy/metadata.xml2
-rw-r--r--dev-php/PEAR-HTML_Template_Sigma/metadata.xml2
-rw-r--r--dev-php/PEAR-HTTP/metadata.xml2
-rw-r--r--dev-php/PEAR-HTTP_Header/metadata.xml2
-rw-r--r--dev-php/PEAR-HTTP_Request2/metadata.xml2
-rw-r--r--dev-php/PEAR-HTTP_Session2/metadata.xml2
-rw-r--r--dev-php/PEAR-Image_Color2/metadata.xml2
-rw-r--r--dev-php/PEAR-Image_GraphViz/metadata.xml2
-rw-r--r--dev-php/PEAR-Image_IPTC/metadata.xml2
-rw-r--r--dev-php/PEAR-Image_Text/metadata.xml2
-rw-r--r--dev-php/PEAR-Log/metadata.xml2
-rw-r--r--dev-php/PEAR-MDB/metadata.xml2
-rw-r--r--dev-php/PEAR-MDB2/metadata.xml2
-rw-r--r--dev-php/PEAR-MDB2_Driver_mssql/metadata.xml2
-rw-r--r--dev-php/PEAR-MDB2_Driver_mysqli/metadata.xml2
-rw-r--r--dev-php/PEAR-MDB2_Driver_oci8/metadata.xml2
-rw-r--r--dev-php/PEAR-MDB2_Driver_pgsql/metadata.xml2
-rw-r--r--dev-php/PEAR-MIME_Type/metadata.xml2
-rw-r--r--dev-php/PEAR-Mail/metadata.xml2
-rw-r--r--dev-php/PEAR-Mail_Mime/Manifest6
-rw-r--r--dev-php/PEAR-Mail_Mime/PEAR-Mail_Mime-1.10.10.ebuild2
-rw-r--r--dev-php/PEAR-Mail_Mime/PEAR-Mail_Mime-1.10.11.ebuild (renamed from dev-php/PEAR-Mail_Mime/PEAR-Mail_Mime-1.10.7.ebuild)2
-rw-r--r--dev-php/PEAR-Mail_Mime/PEAR-Mail_Mime-1.10.4.ebuild26
-rw-r--r--dev-php/PEAR-Mail_Mime/PEAR-Mail_Mime-1.10.6.ebuild26
-rw-r--r--dev-php/PEAR-Mail_Mime/PEAR-Mail_Mime-1.10.9.ebuild26
-rw-r--r--dev-php/PEAR-Mail_Mime/metadata.xml3
-rw-r--r--dev-php/PEAR-Mail_mimeDecode/metadata.xml2
-rw-r--r--dev-php/PEAR-Math_BigInteger/metadata.xml2
-rw-r--r--dev-php/PEAR-Net_DNS/metadata.xml2
-rw-r--r--dev-php/PEAR-Net_DNS2/metadata.xml2
-rw-r--r--dev-php/PEAR-Net_DNSBL/metadata.xml2
-rw-r--r--dev-php/PEAR-Net_IDNA2/metadata.xml2
-rw-r--r--dev-php/PEAR-Net_IPv4/metadata.xml2
-rw-r--r--dev-php/PEAR-Net_IPv6/metadata.xml2
-rw-r--r--dev-php/PEAR-Net_LDAP2/metadata.xml2
-rw-r--r--dev-php/PEAR-Net_POP3/metadata.xml2
-rw-r--r--dev-php/PEAR-Net_Ping/metadata.xml2
-rw-r--r--dev-php/PEAR-Net_SMTP/metadata.xml2
-rw-r--r--dev-php/PEAR-Net_Sieve/metadata.xml2
-rw-r--r--dev-php/PEAR-Net_SmartIRC/metadata.xml2
-rw-r--r--dev-php/PEAR-Net_Socket/metadata.xml2
-rw-r--r--dev-php/PEAR-Net_Traceroute/metadata.xml2
-rw-r--r--dev-php/PEAR-Net_URL/metadata.xml2
-rw-r--r--dev-php/PEAR-Net_URL2/metadata.xml2
-rw-r--r--dev-php/PEAR-Net_UserAgent_Detect/metadata.xml2
-rw-r--r--dev-php/PEAR-Numbers_Words/metadata.xml2
-rw-r--r--dev-php/PEAR-OLE/metadata.xml2
-rw-r--r--dev-php/PEAR-PEAR/Manifest1
-rw-r--r--dev-php/PEAR-PEAR/PEAR-PEAR-1.10.13.ebuild177
-rw-r--r--dev-php/PEAR-PEAR/metadata.xml2
-rw-r--r--dev-php/PEAR-PEAR_PackageFileManager/metadata.xml2
-rw-r--r--dev-php/PEAR-PEAR_PackageFileManager2/metadata.xml2
-rw-r--r--dev-php/PEAR-PEAR_PackageFileManager_Plugins/metadata.xml2
-rw-r--r--dev-php/PEAR-PHP_Beautifier/metadata.xml2
-rw-r--r--dev-php/PEAR-PHP_Debug/metadata.xml2
-rw-r--r--dev-php/PEAR-Pager/metadata.xml2
-rw-r--r--dev-php/PEAR-Services_JSON/metadata.xml2
-rw-r--r--dev-php/PEAR-Services_TinyURL/metadata.xml2
-rw-r--r--dev-php/PEAR-Services_W3C_CSSValidator/metadata.xml2
-rw-r--r--dev-php/PEAR-Spreadsheet_Excel_Writer/metadata.xml2
-rw-r--r--dev-php/PEAR-Structures_Graph/metadata.xml2
-rw-r--r--dev-php/PEAR-System_Command/metadata.xml2
-rw-r--r--dev-php/PEAR-Text_CAPTCHA/metadata.xml2
-rw-r--r--dev-php/PEAR-Text_CAPTCHA_Numeral/metadata.xml2
-rw-r--r--dev-php/PEAR-Text_Figlet/metadata.xml2
-rw-r--r--dev-php/PEAR-Text_Highlighter/metadata.xml2
-rw-r--r--dev-php/PEAR-Text_Password/metadata.xml2
-rw-r--r--dev-php/PEAR-Text_Wiki/metadata.xml2
-rw-r--r--dev-php/PEAR-Text_Wiki_BBCode/metadata.xml2
-rw-r--r--dev-php/PEAR-Text_Wiki_Mediawiki/metadata.xml2
-rw-r--r--dev-php/PEAR-Validate/metadata.xml2
-rw-r--r--dev-php/PEAR-Var_Dump/metadata.xml2
-rw-r--r--dev-php/PEAR-VersionControl_SVN/metadata.xml2
-rw-r--r--dev-php/PEAR-XML_Parser/metadata.xml2
-rw-r--r--dev-php/PEAR-XML_RSS/metadata.xml2
-rw-r--r--dev-php/PEAR-XML_Serializer/metadata.xml2
-rw-r--r--dev-php/PEAR-XML_Util/metadata.xml2
-rw-r--r--dev-php/PHPMailer/Manifest1
-rw-r--r--dev-php/PHPMailer/PHPMailer-6.5.1.ebuild74
-rw-r--r--dev-php/PHPMailer/metadata.xml2
-rw-r--r--dev-php/PHP_CodeCoverage/metadata.xml2
-rw-r--r--dev-php/PHP_CodeSniffer/Manifest1
-rw-r--r--dev-php/PHP_CodeSniffer/PHP_CodeSniffer-3.6.1.ebuild55
-rw-r--r--dev-php/PHP_CodeSniffer/metadata.xml2
-rw-r--r--dev-php/PHP_Timer/metadata.xml2
-rw-r--r--dev-php/PHP_TokenStream/metadata.xml2
-rw-r--r--dev-php/SabreAMF/metadata.xml2
-rw-r--r--dev-php/Text_Template/metadata.xml2
-rw-r--r--dev-php/YAML/metadata.xml2
-rw-r--r--dev-php/adodb/metadata.xml2
-rw-r--r--dev-php/agavi/metadata.xml2
-rw-r--r--dev-php/awl/metadata.xml2
-rw-r--r--dev-php/ca-bundle/Manifest1
-rw-r--r--dev-php/ca-bundle/ca-bundle-1.2.11.ebuild22
-rw-r--r--dev-php/ca-bundle/metadata.xml2
-rw-r--r--dev-php/cli-prompt/metadata.xml2
-rw-r--r--dev-php/composer/Manifest3
-rw-r--r--dev-php/composer/composer-1.10.22-r1.ebuild (renamed from dev-php/composer/composer-1.10.22.ebuild)2
-rw-r--r--dev-php/composer/composer-2.1.6.ebuild80
-rw-r--r--dev-php/composer/composer-2.1.8.ebuild80
-rw-r--r--dev-php/composer/composer-2.1.9.ebuild80
-rw-r--r--dev-php/composer/metadata.xml2
-rw-r--r--dev-php/cphplib/metadata.xml2
-rw-r--r--dev-php/doctrine-instantiator/metadata.xml2
-rw-r--r--dev-php/doctrine/metadata.xml2
-rw-r--r--dev-php/fedora-autoloader/metadata.xml2
-rw-r--r--dev-php/geos-php/metadata.xml2
-rw-r--r--dev-php/igbinary/Manifest6
-rw-r--r--dev-php/igbinary/igbinary-3.1.5.ebuild26
-rw-r--r--dev-php/igbinary/igbinary-3.1.6-r1.ebuild26
-rw-r--r--dev-php/igbinary/igbinary-3.1.6.ebuild26
-rw-r--r--dev-php/igbinary/igbinary-3.2.1.ebuild22
-rw-r--r--dev-php/igbinary/igbinary-3.2.2.ebuild22
-rw-r--r--dev-php/igbinary/igbinary-3.2.6.ebuild (renamed from dev-php/igbinary/igbinary-3.2.4.ebuild)2
-rw-r--r--dev-php/igbinary/metadata.xml2
-rw-r--r--dev-php/jpgraph/metadata.xml2
-rw-r--r--dev-php/json-schema/metadata.xml2
-rw-r--r--dev-php/jsonlint/metadata.xml2
-rw-r--r--dev-php/libchart/metadata.xml2
-rw-r--r--dev-php/libvirt-php/metadata.xml2
-rw-r--r--dev-php/maxmind-db-reader/Manifest1
-rw-r--r--dev-php/maxmind-db-reader/maxmind-db-reader-1.10.1.ebuild78
-rw-r--r--dev-php/maxmind-db-reader/metadata.xml2
-rw-r--r--dev-php/metadata-minifier/metadata.xml2
-rw-r--r--dev-php/metadata.xml2
-rw-r--r--dev-php/mmslib/metadata.xml2
-rw-r--r--dev-php/mockery/metadata.xml2
-rw-r--r--dev-php/myclabs-deepcopy/metadata.xml2
-rw-r--r--dev-php/onphp/metadata.xml2
-rw-r--r--dev-php/pear/metadata.xml2
-rw-r--r--dev-php/pecl-amqp/metadata.xml2
-rw-r--r--dev-php/pecl-apcu/Manifest1
-rw-r--r--dev-php/pecl-apcu/metadata.xml2
-rw-r--r--dev-php/pecl-apcu/pecl-apcu-5.1.21.ebuild67
-rw-r--r--dev-php/pecl-apcu_bc/metadata.xml2
-rw-r--r--dev-php/pecl-crack/metadata.xml2
-rw-r--r--dev-php/pecl-dbase/metadata.xml2
-rw-r--r--dev-php/pecl-dio/metadata.xml2
-rw-r--r--dev-php/pecl-eio/Manifest1
-rw-r--r--dev-php/pecl-eio/metadata.xml2
-rw-r--r--dev-php/pecl-eio/pecl-eio-3.0.0_rc2.ebuild31
-rw-r--r--dev-php/pecl-event/metadata.xml2
-rw-r--r--dev-php/pecl-geoip/metadata.xml2
-rw-r--r--dev-php/pecl-gnupg/Manifest1
-rw-r--r--dev-php/pecl-gnupg/files/1.3.2/01-large_file_system.patch9
-rw-r--r--dev-php/pecl-gnupg/metadata.xml2
-rw-r--r--dev-php/pecl-gnupg/pecl-gnupg-1.4.0-r2.ebuild33
-rw-r--r--dev-php/pecl-http/Manifest3
-rw-r--r--dev-php/pecl-http/files/pecl-http-3.2.4-curl-cookies.patch242
-rw-r--r--dev-php/pecl-http/files/pecl-http-4.1.0-use-getenv.patch25
-rw-r--r--dev-php/pecl-http/metadata.xml2
-rw-r--r--dev-php/pecl-http/pecl-http-3.2.4-r1.ebuild (renamed from dev-php/pecl-http/pecl-http-3.2.4.ebuild)8
-rw-r--r--dev-php/pecl-http/pecl-http-4.0.0.ebuild69
-rw-r--r--dev-php/pecl-http/pecl-http-4.2.1.ebuild (renamed from dev-php/pecl-http/pecl-http-4.1.0.ebuild)2
-rw-r--r--dev-php/pecl-imagick/Manifest2
-rw-r--r--dev-php/pecl-imagick/metadata.xml2
-rw-r--r--dev-php/pecl-imagick/pecl-imagick-3.4.4.ebuild26
-rw-r--r--dev-php/pecl-imagick/pecl-imagick-3.5.0.ebuild32
-rw-r--r--dev-php/pecl-imagick/pecl-imagick-3.5.1.ebuild2
-rw-r--r--dev-php/pecl-lzf/metadata.xml2
-rw-r--r--dev-php/pecl-mailparse/Manifest1
-rw-r--r--dev-php/pecl-mailparse/metadata.xml2
-rw-r--r--dev-php/pecl-mailparse/pecl-mailparse-3.1.2.ebuild22
-rw-r--r--dev-php/pecl-mcrypt/Manifest1
-rw-r--r--dev-php/pecl-mcrypt/metadata.xml2
-rw-r--r--dev-php/pecl-mcrypt/pecl-mcrypt-1.0.4.ebuild23
-rw-r--r--dev-php/pecl-memcache/metadata.xml2
-rw-r--r--dev-php/pecl-memcached/Manifest1
-rw-r--r--dev-php/pecl-memcached/files/3.1.5-fix-tests.patch41
-rw-r--r--dev-php/pecl-memcached/metadata.xml2
-rw-r--r--dev-php/pecl-memcached/pecl-memcached-3.1.5_p20210807.ebuild82
-rw-r--r--dev-php/pecl-mongodb/metadata.xml2
-rw-r--r--dev-php/pecl-ncurses/metadata.xml2
-rw-r--r--dev-php/pecl-oauth/metadata.xml2
-rw-r--r--dev-php/pecl-pam/Manifest1
-rw-r--r--dev-php/pecl-pam/metadata.xml2
-rw-r--r--dev-php/pecl-pam/pecl-pam-2.2.3.ebuild35
-rw-r--r--dev-php/pecl-parallel/metadata.xml2
-rw-r--r--dev-php/pecl-propro/metadata.xml2
-rw-r--r--dev-php/pecl-ps/Manifest1
-rw-r--r--dev-php/pecl-ps/files/ps-1.4.4-fix-gd-detection.patch11
-rw-r--r--dev-php/pecl-ps/metadata.xml2
-rw-r--r--dev-php/pecl-ps/pecl-ps-1.4.1-r1.ebuild25
-rw-r--r--dev-php/pecl-ps/pecl-ps-1.4.1.ebuild49
-rw-r--r--dev-php/pecl-ps/pecl-ps-1.4.4.ebuild31
-rw-r--r--dev-php/pecl-radius/metadata.xml2
-rw-r--r--dev-php/pecl-raphf/metadata.xml2
-rw-r--r--dev-php/pecl-redis/metadata.xml2
-rw-r--r--dev-php/pecl-rrd/Manifest1
-rw-r--r--dev-php/pecl-rrd/metadata.xml2
-rw-r--r--dev-php/pecl-rrd/pecl-rrd-2.0.3.ebuild29
-rw-r--r--dev-php/pecl-ssh2/Manifest3
-rw-r--r--dev-php/pecl-ssh2/files/pecl-ssh2-1.1.2-fix-php_url-fields-usage-for-php7-3.patch302
-rw-r--r--dev-php/pecl-ssh2/metadata.xml2
-rw-r--r--dev-php/pecl-ssh2/pecl-ssh2-1.1.2.ebuild36
-rw-r--r--dev-php/pecl-ssh2/pecl-ssh2-1.2.ebuild33
-rw-r--r--dev-php/pecl-ssh2/pecl-ssh2-1.3.1.ebuild2
-rw-r--r--dev-php/pecl-stomp/metadata.xml2
-rw-r--r--dev-php/pecl-taint/metadata.xml2
-rw-r--r--dev-php/pecl-timezonedb/metadata.xml2
-rw-r--r--dev-php/pecl-translit/metadata.xml2
-rw-r--r--dev-php/pecl-uploadprogress/Manifest2
-rw-r--r--dev-php/pecl-uploadprogress/metadata.xml8
-rw-r--r--dev-php/pecl-uploadprogress/pecl-uploadprogress-2.0.1.ebuild21
-rw-r--r--dev-php/pecl-uploadprogress/pecl-uploadprogress-2.0.2.ebuild21
-rw-r--r--dev-php/pecl-uuid/metadata.xml2
-rw-r--r--dev-php/pecl-xdiff/metadata.xml2
-rw-r--r--dev-php/pecl-yaml/metadata.xml2
-rw-r--r--dev-php/pecl-yaz/metadata.xml2
-rw-r--r--dev-php/pecl-yaz/pecl-yaz-1.2.3-r1.ebuild2
-rw-r--r--dev-php/pecl-yaz/pecl-yaz-1.2.3.ebuild28
-rw-r--r--dev-php/pecl-zmq/metadata.xml2
-rw-r--r--dev-php/phar-io-manifest/Manifest1
-rw-r--r--dev-php/phar-io-manifest/metadata.xml2
-rw-r--r--dev-php/phar-io-manifest/phar-io-manifest-2.0.3.ebuild49
-rw-r--r--dev-php/phar-io-version/metadata.xml2
-rw-r--r--dev-php/phar-utils/Manifest1
-rw-r--r--dev-php/phar-utils/metadata.xml2
-rw-r--r--dev-php/phar-utils/phar-utils-1.1.2.ebuild22
-rw-r--r--dev-php/phing/metadata.xml2
-rw-r--r--dev-php/php-codebrowser/metadata.xml2
-rw-r--r--dev-php/php-redmine-api/metadata.xml2
-rw-r--r--dev-php/phpDocumentor/metadata.xml2
-rw-r--r--dev-php/phpcov/metadata.xml2
-rw-r--r--dev-php/phpdepend/metadata.xml2
-rw-r--r--dev-php/phpdocumentor-reflection-common/metadata.xml2
-rw-r--r--dev-php/phpdocumentor-reflection-docblock/metadata.xml2
-rw-r--r--dev-php/phpdocumentor-type-resolver/metadata.xml2
-rw-r--r--dev-php/phpmd/metadata.xml2
-rw-r--r--dev-php/phpspec-prophecy/Manifest1
-rw-r--r--dev-php/phpspec-prophecy/metadata.xml2
-rw-r--r--dev-php/phpspec-prophecy/phpspec-prophecy-1.14.0.ebuild31
-rw-r--r--dev-php/phptal/metadata.xml2
-rw-r--r--dev-php/phpunit-mock-objects/metadata.xml2
-rw-r--r--dev-php/phpunit/metadata.xml2
-rw-r--r--dev-php/psr-log/metadata.xml2
-rw-r--r--dev-php/reactphp-promise/metadata.xml2
-rw-r--r--dev-php/realpath_turbo/metadata.xml2
-rw-r--r--dev-php/recaptcha/metadata.xml2
-rw-r--r--dev-php/scrypt/metadata.xml2
-rw-r--r--dev-php/sebastian-code-unit-reverse-lookup/metadata.xml2
-rw-r--r--dev-php/sebastian-comparator/metadata.xml2
-rw-r--r--dev-php/sebastian-diff/metadata.xml2
-rw-r--r--dev-php/sebastian-environment/metadata.xml2
-rw-r--r--dev-php/sebastian-exporter/metadata.xml2
-rw-r--r--dev-php/sebastian-global-state/metadata.xml2
-rw-r--r--dev-php/sebastian-object-enumerator/metadata.xml2
-rw-r--r--dev-php/sebastian-object-reflector/metadata.xml2
-rw-r--r--dev-php/sebastian-recursion-context/metadata.xml2
-rw-r--r--dev-php/sebastian-resource-operations/metadata.xml2
-rw-r--r--dev-php/sebastian-type/metadata.xml2
-rw-r--r--dev-php/sebastian-version/metadata.xml2
-rw-r--r--dev-php/securimage/metadata.xml2
-rw-r--r--dev-php/semver/metadata.xml2
-rw-r--r--dev-php/simpletest/metadata.xml2
-rw-r--r--dev-php/smarty/metadata.xml2
-rw-r--r--dev-php/spdx-licenses/metadata.xml2
-rw-r--r--dev-php/stringparser_bbcode/metadata.xml2
-rw-r--r--dev-php/swoole-async/metadata.xml2
-rw-r--r--dev-php/swoole-async/swoole-async-4.4.12-r1.ebuild (renamed from dev-php/swoole-async/swoole-async-4.4.12.ebuild)5
-rw-r--r--dev-php/swoole-async/swoole-async-4.4.16-r1.ebuild (renamed from dev-php/swoole-async/swoole-async-4.4.16.ebuild)5
-rw-r--r--dev-php/swoole/metadata.xml2
-rw-r--r--dev-php/symfony-config/metadata.xml2
-rw-r--r--dev-php/symfony-console/metadata.xml2
-rw-r--r--dev-php/symfony-dependency-injection/metadata.xml2
-rw-r--r--dev-php/symfony-event-dispatcher/metadata.xml2
-rw-r--r--dev-php/symfony-filesystem/metadata.xml2
-rw-r--r--dev-php/symfony-finder/metadata.xml2
-rw-r--r--dev-php/symfony-process/metadata.xml2
-rw-r--r--dev-php/symfony-yaml/metadata.xml2
-rw-r--r--dev-php/tcpdf/metadata.xml2
-rw-r--r--dev-php/theseer-Autoload/Manifest1
-rw-r--r--dev-php/theseer-Autoload/metadata.xml2
-rw-r--r--dev-php/theseer-Autoload/theseer-Autoload-1.26.3.ebuild82
-rw-r--r--dev-php/theseer-DirectoryScanner/Manifest1
-rw-r--r--dev-php/theseer-DirectoryScanner/metadata.xml2
-rw-r--r--dev-php/theseer-DirectoryScanner/theseer-DirectoryScanner-1.3.3.ebuild25
-rw-r--r--dev-php/theseer-tokenizer/Manifest1
-rw-r--r--dev-php/theseer-tokenizer/metadata.xml2
-rw-r--r--dev-php/theseer-tokenizer/theseer-tokenizer-1.2.1.ebuild40
-rw-r--r--dev-php/twig/metadata.xml2
-rw-r--r--dev-php/webmozart-assert/metadata.xml2
-rw-r--r--dev-php/xdebug-client/metadata.xml2
-rw-r--r--dev-php/xdebug-handler/metadata.xml2
-rw-r--r--dev-php/xdebug/Manifest1
-rw-r--r--dev-php/xdebug/metadata.xml2
-rw-r--r--dev-php/xdebug/xdebug-3.1.1.ebuild58
-rw-r--r--dev-php/xhprof/Manifest1
-rw-r--r--dev-php/xhprof/metadata.xml2
-rw-r--r--dev-php/xhprof/xhprof-2.3.5.ebuild18
-rw-r--r--dev-php/zetacomponents-Base/Manifest1
-rw-r--r--dev-php/zetacomponents-Base/metadata.xml2
-rw-r--r--dev-php/zetacomponents-Base/zetacomponents-Base-1.9.3.ebuild26
-rw-r--r--dev-php/zetacomponents-ConsoleTools/metadata.xml2
333 files changed, 2031 insertions, 1223 deletions
diff --git a/dev-php/File_Iterator/metadata.xml b/dev-php/File_Iterator/metadata.xml
index acfdf8c42a73..51580992e25a 100644
--- a/dev-php/File_Iterator/metadata.xml
+++ b/dev-php/File_Iterator/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/PEAR-Archive_Tar/Manifest b/dev-php/PEAR-Archive_Tar/Manifest
index c7a855270a50..dba96eb21fc6 100644
--- a/dev-php/PEAR-Archive_Tar/Manifest
+++ b/dev-php/PEAR-Archive_Tar/Manifest
@@ -1,3 +1 @@
-DIST Archive_Tar-1.4.12.tgz 21665 BLAKE2B fc4d2d5128bfc02da5f7e2465834e2ff14554188ede7899856f200935a850c35bb74e6fcca5c4c4ae641a575725a3edba2878376a587304f133c8f16e1ee9336 SHA512 9f2e6ca4628ba4ec95a324c4a706b2d01d2323b5e5e77f1cc7425784d1a35d139b1604bffca10af8b04c4cc875cb6b1f40715a00208cd042aba37f089a586497
-DIST Archive_Tar-1.4.13.tgz 21836 BLAKE2B b150c7493995c889bd91d24fb7bc5374be6ae157e27522a0d1e5b8fa994a09fdd7a03288263d0931f1d46da3e1b37c80e67cee07d5f54f501531b2adb7f4bb8a SHA512 3ee3dd8c8c8af018eb6c6d32409f2867c49f5a8ef21efecd8fb0a36207ca211eb49aaef02806b2df35aa6613d5dd69c8d81c72f97d4297dee3f732a9ab6ff9a7
DIST Archive_Tar-1.4.14.tgz 21992 BLAKE2B e483ee9943c955dd6834538de70e8d6821b9abb250fca752e01fec7a62c28f59f65a6afe66adb804565c1f79cfc679fd72a32d0311f231dee424199b2600bb73 SHA512 a0277086221acf0cd01ec342af5afd62f01055a8b3bb4942d7a96d3517cce466a0c8a086411671a18d0f7a0a5e4187a76bad0d5c410c93fefe8cc58992327789
diff --git a/dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.4.12.ebuild b/dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.4.12.ebuild
deleted file mode 100644
index 09a18646d8e6..000000000000
--- a/dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.4.12.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN="${PN/PEAR-/}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Tar file management class"
-HOMEPAGE="https://pear.php.net/package/Archive_Tar"
-SRC_URI="https://pear.php.net/get/${MY_P}.tgz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
-IUSE=""
-
-# bzip2 and zlib are needed for compressed tarballs, and there's one
-# call to preg_match to test paths against a pattern of files and
-# directories that will be ignored.
-RDEPEND="dev-lang/php:*[bzip2,pcre(+),zlib]"
-PDEPEND="dev-php/PEAR-PEAR"
-DEPEND=""
-
-S="${WORKDIR}/${MY_P}"
-
-src_install() {
- insinto /usr/share/php
- doins -r Archive
-
- dodoc docs/*
-
- insinto /usr/share/php/.packagexml
- newins "${WORKDIR}/package.xml" "${MY_P}.xml"
-}
-
-pkg_postinst() {
- # It is not critical to complete so only warn on failure
- if [[ -f "${EROOT}/usr/share/php/.packagexml/${MY_P}.xml" && \
- -x "${EROOT}/usr/bin/peardev" ]] ; then
- "${EROOT}/usr/bin/peardev" install -nrO --force \
- "${EROOT}/usr/share/php/.packagexml/${MY_P}.xml" 2> /dev/null \
- || ewarn "Failed to insert package into local PEAR database"
- fi
-}
-
-pkg_postrm() {
- if [[ -x "${EROOT}/usr/bin/peardev" ]]; then
- "${EROOT}/usr/bin/peardev" uninstall -nrO "pear.php.net/${MY_PN}"
- fi
-}
diff --git a/dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.4.13.ebuild b/dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.4.13.ebuild
deleted file mode 100644
index 02c0db09b3a8..000000000000
--- a/dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.4.13.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN="${PN/PEAR-/}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Tar file management class"
-HOMEPAGE="https://pear.php.net/package/Archive_Tar"
-SRC_URI="https://pear.php.net/get/${MY_P}.tgz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE=""
-
-# bzip2 and zlib are needed for compressed tarballs, and there's one
-# call to preg_match to test paths against a pattern of files and
-# directories that will be ignored.
-RDEPEND="dev-lang/php:*[bzip2,pcre(+),zlib]"
-PDEPEND="dev-php/PEAR-PEAR"
-DEPEND=""
-
-S="${WORKDIR}/${MY_P}"
-
-src_install() {
- insinto /usr/share/php
- doins -r Archive
-
- dodoc docs/*
-
- insinto /usr/share/php/.packagexml
- newins "${WORKDIR}/package.xml" "${MY_P}.xml"
-}
-
-pkg_postinst() {
- # It is not critical to complete so only warn on failure
- if [[ -f "${EROOT}/usr/share/php/.packagexml/${MY_P}.xml" && \
- -x "${EROOT}/usr/bin/peardev" ]] ; then
- "${EROOT}/usr/bin/peardev" install -nrO --force \
- "${EROOT}/usr/share/php/.packagexml/${MY_P}.xml" 2> /dev/null \
- || ewarn "Failed to insert package into local PEAR database"
- fi
-}
-
-pkg_postrm() {
- if [[ -x "${EROOT}/usr/bin/peardev" ]]; then
- "${EROOT}/usr/bin/peardev" uninstall -nrO "pear.php.net/${MY_PN}"
- fi
-}
diff --git a/dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.4.14.ebuild b/dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.4.14.ebuild
index 02c0db09b3a8..09a18646d8e6 100644
--- a/dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.4.14.ebuild
+++ b/dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.4.14.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://pear.php.net/package/Archive_Tar"
SRC_URI="https://pear.php.net/get/${MY_P}.tgz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
IUSE=""
# bzip2 and zlib are needed for compressed tarballs, and there's one
diff --git a/dev-php/PEAR-Archive_Tar/metadata.xml b/dev-php/PEAR-Archive_Tar/metadata.xml
index 76c401f1f8cd..f68a465a15d4 100644
--- a/dev-php/PEAR-Archive_Tar/metadata.xml
+++ b/dev-php/PEAR-Archive_Tar/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/PEAR-Auth_SASL/metadata.xml b/dev-php/PEAR-Auth_SASL/metadata.xml
index 60c5dab7b70e..1f8ef726ccd6 100644
--- a/dev-php/PEAR-Auth_SASL/metadata.xml
+++ b/dev-php/PEAR-Auth_SASL/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/PEAR-Cache/metadata.xml b/dev-php/PEAR-Cache/metadata.xml
index aca42932b833..77793b997e9e 100644
--- a/dev-php/PEAR-Cache/metadata.xml
+++ b/dev-php/PEAR-Cache/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/PEAR-Cache_Lite/metadata.xml b/dev-php/PEAR-Cache_Lite/metadata.xml
index b86acf66c756..222c77f3742a 100644
--- a/dev-php/PEAR-Cache_Lite/metadata.xml
+++ b/dev-php/PEAR-Cache_Lite/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/PEAR-Console_CommandLine/metadata.xml b/dev-php/PEAR-Console_CommandLine/metadata.xml
index e0533582c0e0..ef95d9c7ac13 100644
--- a/dev-php/PEAR-Console_CommandLine/metadata.xml
+++ b/dev-php/PEAR-Console_CommandLine/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/PEAR-Console_Getargs/metadata.xml b/dev-php/PEAR-Console_Getargs/metadata.xml
index b86acf66c756..222c77f3742a 100644
--- a/dev-php/PEAR-Console_Getargs/metadata.xml
+++ b/dev-php/PEAR-Console_Getargs/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/PEAR-Console_Getopt/metadata.xml b/dev-php/PEAR-Console_Getopt/metadata.xml
index 1f65fc978455..0df589258df6 100644
--- a/dev-php/PEAR-Console_Getopt/metadata.xml
+++ b/dev-php/PEAR-Console_Getopt/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/PEAR-Console_Table/metadata.xml b/dev-php/PEAR-Console_Table/metadata.xml
index 15baf4c385c2..610d5fd374ac 100644
--- a/dev-php/PEAR-Console_Table/metadata.xml
+++ b/dev-php/PEAR-Console_Table/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/PEAR-Crypt_CHAP/metadata.xml b/dev-php/PEAR-Crypt_CHAP/metadata.xml
index b86acf66c756..222c77f3742a 100644
--- a/dev-php/PEAR-Crypt_CHAP/metadata.xml
+++ b/dev-php/PEAR-Crypt_CHAP/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/PEAR-Crypt_GPG/Manifest b/dev-php/PEAR-Crypt_GPG/Manifest
index a4fbd22ca525..3fc918e92fa8 100644
--- a/dev-php/PEAR-Crypt_GPG/Manifest
+++ b/dev-php/PEAR-Crypt_GPG/Manifest
@@ -2,3 +2,4 @@ DIST Crypt_GPG-1.6.2.tgz 346709 BLAKE2B abced2fe8c909f06690c38884506ce03df4c5ef3
DIST Crypt_GPG-1.6.3.tgz 346999 BLAKE2B 8402ef382a6393972a3fda7370fbd37dec19d0ebabb6b316d35783538dbc01746476977d7dc3da487876201cd678964d9572dc67a43911319b1b614004a3c909 SHA512 f1ad2560a43a1e8f5a33269bc4ae4067e19e5325fdbd8d2fc55f6cb8aad89258df45fbecedd93a21749f33024c819f07399580b1a4760f5740f26043109dc396
DIST Crypt_GPG-1.6.4.tgz 346390 BLAKE2B 22e9e9d893f96bb3c3dc538b168a35366d2b699e92bf832370223879e90e8018cfd3b736e099807fdcc897b7569a40af66e72f011eaeb7400477053b7838409d SHA512 3eee39702abe97fc322e5976ebe8a7f7ba07bc950d22aa6636cadf38b0bd9c6c6316d7be35f21a8d0e8dfdb66a76db33121edb34736869d31ae89b03468cf470
DIST Crypt_GPG-1.6.5.tgz 346966 BLAKE2B 5ca074b57c44d99159409b1c7ce0adcf672b59882f6f2dddf864df692243457ccd69c8018b5031dc6ab0ea0e88dba0586b8842992184be65c72100d3f34904c1 SHA512 86feeff3e698c8ce133b0481ca96a000f00801f52c128dc8cb4cfec37040494c1e7176138e9988ebf0e85206c5fe3b51f939b4d7ca6decc16a787be4f4e8f261
+DIST Crypt_GPG-1.6.6.tgz 343929 BLAKE2B 1cc5b01d5c44e614cc67e5f21298120aa44ff4b4efb933a8fdb64c02eb7f19c7299a7d53e7d032f9ab013b8d319798dec5732c382590bdb1da52998f30eab9b9 SHA512 38f721cf818972f835162b9e405efb55160276d759361e1f351645d585695f903445accf83f190f7f14f202e2bebe3c78b7ff2b8af2151c3d66bd6636f98859a
diff --git a/dev-php/PEAR-Crypt_GPG/PEAR-Crypt_GPG-1.6.6.ebuild b/dev-php/PEAR-Crypt_GPG/PEAR-Crypt_GPG-1.6.6.ebuild
new file mode 100644
index 000000000000..0315abb14ede
--- /dev/null
+++ b/dev-php/PEAR-Crypt_GPG/PEAR-Crypt_GPG-1.6.6.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="${PN/PEAR-/}"
+MY_PV="${PV/_/}"
+MY_P="${MY_PN}-${MY_PV}"
+
+DESCRIPTION="PHP interface to the GNU Privacy Guard (GnuPG)"
+HOMEPAGE="https://pear.php.net/package/Crypt_GPG"
+SRC_URI="http://download.pear.php.net/package/${MY_P}.tgz"
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="app-crypt/gnupg
+ dev-lang/php:*[posix,unicode]
+ dev-php/PEAR-Console_CommandLine
+ dev-php/PEAR-Exception"
+BDEPEND="test? ( ${RDEPEND} <dev-php/phpunit-9 )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+ default
+
+ sed -i "s|@bin-dir@|${EPREFIX}/usr/bin|" Crypt/GPG/Engine.php || die
+ sed -i "s|@package-name@|${MY_PN}|" Crypt/GPG/PinEntry.php || die
+ sed -i "s|@data-dir@|${EPREFIX}/usr/share|" Crypt/GPG/PinEntry.php || die
+}
+
+src_test() {
+ local -x GNUPGHOME="${HOME}"
+ phpunit --verbose tests/ || die "test suite failed"
+}
+
+src_install() {
+ dodoc README.md
+ dobin scripts/crypt-gpg-pinentry
+
+ insinto "/usr/share/${MY_PN}"
+ doins -r data
+
+ insinto /usr/share/php
+ doins -r Crypt
+}
diff --git a/dev-php/PEAR-Crypt_GPG/metadata.xml b/dev-php/PEAR-Crypt_GPG/metadata.xml
index 6d24d2bc5e13..67029d93f300 100644
--- a/dev-php/PEAR-Crypt_GPG/metadata.xml
+++ b/dev-php/PEAR-Crypt_GPG/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/PEAR-Crypt_HMAC/metadata.xml b/dev-php/PEAR-Crypt_HMAC/metadata.xml
index b86acf66c756..222c77f3742a 100644
--- a/dev-php/PEAR-Crypt_HMAC/metadata.xml
+++ b/dev-php/PEAR-Crypt_HMAC/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/PEAR-Crypt_HMAC2/metadata.xml b/dev-php/PEAR-Crypt_HMAC2/metadata.xml
index b86acf66c756..222c77f3742a 100644
--- a/dev-php/PEAR-Crypt_HMAC2/metadata.xml
+++ b/dev-php/PEAR-Crypt_HMAC2/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/PEAR-DB/Manifest b/dev-php/PEAR-DB/Manifest
index b36141385aa0..8e5fde48fa57 100644
--- a/dev-php/PEAR-DB/Manifest
+++ b/dev-php/PEAR-DB/Manifest
@@ -1,3 +1,4 @@
DIST DB-1.10.0.tgz 132485 BLAKE2B 10ddf37984f33effb913c9e307b8543af56e344863fea8fde01cfd4684b829353f0799dff6413cffff711418bf7e8cb7f5855bf6f312d41d92db55d363784796 SHA512 01855d0e26b4463fac1f3f9c84c7f3fed62c9087cdd95843340f6250fbd63f4d33f7e958d3f3895f9c2fa568015e86e660393a578c764fa0d39b36a6394dc48a
+DIST DB-1.11.0.tgz 132549 BLAKE2B 0925a551bbda04dd71a1d2ffaf462485a92b62a7f141a5f097614dde8a8c8d6098705116a6f7c0b3bdd62547ad5962381ef15fee3057ba054cead8998306232c SHA512 88488874ee1cb6ff228199106702b1992eab4c7dce44984639951c0693e37ace115214973ef9cbd79959f0602b58cce8a254b47e32dc3d44171d0d7bf78db825
DIST DB-1.9.2.tgz 133795 BLAKE2B 8b37b010145efd10a2b551392988a810c35b9a8c794eb0e162056fcded104276b19e97afb91149f1814f9f838a0db579a76578fb80d96d0574e5b7714d77aa91 SHA512 126bbbb847a24c20731f1e5f4a549e9d7e0651a760f10c49cfc7550f80dd8b05f3560bc80110bcaab9e79dcbb714c6113948f14a727f7f4087a23178b3db0afa
DIST DB-1.9.3.tgz 132290 BLAKE2B 8970697ac66bc9fe7f8c374431c59627133401e5b591fb3fc95ffc3a6ebb8cfe7e93982178e092eefc79d91657992eb539fc7211a237e3fe7407c75c7013831f SHA512 3fe98f97307818f65c0eaf291169fd13533a4d484d34d7fa7aa82580f6ec3d89b984292f173da2cf896f5f15531db9bde2be981e5a7679cc00c48aa2f9cc1142
diff --git a/dev-php/PEAR-Mail_Mime/PEAR-Mail_Mime-1.10.8.ebuild b/dev-php/PEAR-DB/PEAR-DB-1.11.0.ebuild
index a88d469a1fcd..1e96bfe6f5a9 100644
--- a/dev-php/PEAR-Mail_Mime/PEAR-Mail_Mime-1.10.8.ebuild
+++ b/dev-php/PEAR-DB/PEAR-DB-1.11.0.ebuild
@@ -1,23 +1,24 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="7"
+EAPI=7
inherit php-pear-r2
-DESCRIPTION="Create and manipulate mime messages with PHP"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
-LICENSE="BSD"
+DESCRIPTION="Database abstraction layer for PHP"
+LICENSE="PHP-3"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE="test"
-
RESTRICT="!test? ( test )"
-
DEPEND="test? ( dev-php/PEAR-PEAR )"
+DOCS=( doc/TESTERS doc/IDEAS doc/MAINTAINERS doc/STATUS )
+
src_test() {
- # Requires the "pear" executable from dev-php/PEAR-PEAR.
+ # Requires the "pear" executable from dev-php/PEAR-PEAR, and also
+ # a working version of the cli SAPI eselected.
pear run-tests tests || die
# The command succeeds regardless of whether or not the test suite
diff --git a/dev-php/PEAR-DB/metadata.xml b/dev-php/PEAR-DB/metadata.xml
index b86acf66c756..2d616c75d831 100644
--- a/dev-php/PEAR-DB/metadata.xml
+++ b/dev-php/PEAR-DB/metadata.xml
@@ -1,8 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
<name>PHP</name>
</maintainer>
+ <upstream>
+ <remote-id type="github">pear/DB</remote-id>
+ <remote-id type="pear">DB</remote-id>
+ </upstream>
+ <stabilize-allarches/>
</pkgmetadata>
diff --git a/dev-php/PEAR-DB_DataObject/metadata.xml b/dev-php/PEAR-DB_DataObject/metadata.xml
index b86acf66c756..222c77f3742a 100644
--- a/dev-php/PEAR-DB_DataObject/metadata.xml
+++ b/dev-php/PEAR-DB_DataObject/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/PEAR-Date/metadata.xml b/dev-php/PEAR-Date/metadata.xml
index b86acf66c756..222c77f3742a 100644
--- a/dev-php/PEAR-Date/metadata.xml
+++ b/dev-php/PEAR-Date/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/PEAR-Exception/metadata.xml b/dev-php/PEAR-Exception/metadata.xml
index 0d4a6d80c8fa..e29745256072 100644
--- a/dev-php/PEAR-Exception/metadata.xml
+++ b/dev-php/PEAR-Exception/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/PEAR-File/metadata.xml b/dev-php/PEAR-File/metadata.xml
index aca42932b833..77793b997e9e 100644
--- a/dev-php/PEAR-File/metadata.xml
+++ b/dev-php/PEAR-File/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/PEAR-File_Archive/metadata.xml b/dev-php/PEAR-File_Archive/metadata.xml
index dad5f85241bc..b4d16dbd9a7b 100644
--- a/dev-php/PEAR-File_Archive/metadata.xml
+++ b/dev-php/PEAR-File_Archive/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/PEAR-File_Find/metadata.xml b/dev-php/PEAR-File_Find/metadata.xml
index 5d3d9ddeb2db..00c5a562b643 100644
--- a/dev-php/PEAR-File_Find/metadata.xml
+++ b/dev-php/PEAR-File_Find/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/PEAR-File_Fortune/metadata.xml b/dev-php/PEAR-File_Fortune/metadata.xml
index aca42932b833..77793b997e9e 100644
--- a/dev-php/PEAR-File_Fortune/metadata.xml
+++ b/dev-php/PEAR-File_Fortune/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/PEAR-File_Gettext/metadata.xml b/dev-php/PEAR-File_Gettext/metadata.xml
index b86acf66c756..222c77f3742a 100644
--- a/dev-php/PEAR-File_Gettext/metadata.xml
+++ b/dev-php/PEAR-File_Gettext/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/PEAR-File_SMBPasswd/metadata.xml b/dev-php/PEAR-File_SMBPasswd/metadata.xml
index b86acf66c756..222c77f3742a 100644
--- a/dev-php/PEAR-File_SMBPasswd/metadata.xml
+++ b/dev-php/PEAR-File_SMBPasswd/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/PEAR-HTML_AJAX/metadata.xml b/dev-php/PEAR-HTML_AJAX/metadata.xml
index d7eb71f3cb2e..e126c564f436 100644
--- a/dev-php/PEAR-HTML_AJAX/metadata.xml
+++ b/dev-php/PEAR-HTML_AJAX/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/PEAR-HTML_CSS/metadata.xml b/dev-php/PEAR-HTML_CSS/metadata.xml
index b86acf66c756..222c77f3742a 100644
--- a/dev-php/PEAR-HTML_CSS/metadata.xml
+++ b/dev-php/PEAR-HTML_CSS/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/PEAR-HTML_Common/metadata.xml b/dev-php/PEAR-HTML_Common/metadata.xml
index aca42932b833..77793b997e9e 100644
--- a/dev-php/PEAR-HTML_Common/metadata.xml
+++ b/dev-php/PEAR-HTML_Common/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/PEAR-HTML_Common2/metadata.xml b/dev-php/PEAR-HTML_Common2/metadata.xml
index aca42932b833..77793b997e9e 100644
--- a/dev-php/PEAR-HTML_Common2/metadata.xml
+++ b/dev-php/PEAR-HTML_Common2/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/PEAR-HTML_Javascript/metadata.xml b/dev-php/PEAR-HTML_Javascript/metadata.xml
index 4787860c3221..b030959da397 100644
--- a/dev-php/PEAR-HTML_Javascript/metadata.xml
+++ b/dev-php/PEAR-HTML_Javascript/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/PEAR-HTML_QuickForm2/metadata.xml b/dev-php/PEAR-HTML_QuickForm2/metadata.xml
index aca42932b833..77793b997e9e 100644
--- a/dev-php/PEAR-HTML_QuickForm2/metadata.xml
+++ b/dev-php/PEAR-HTML_QuickForm2/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/PEAR-HTML_Table/metadata.xml b/dev-php/PEAR-HTML_Table/metadata.xml
index aca42932b833..77793b997e9e 100644
--- a/dev-php/PEAR-HTML_Table/metadata.xml
+++ b/dev-php/PEAR-HTML_Table/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/PEAR-HTML_Table_Matrix/metadata.xml b/dev-php/PEAR-HTML_Table_Matrix/metadata.xml
index aca42932b833..77793b997e9e 100644
--- a/dev-php/PEAR-HTML_Table_Matrix/metadata.xml
+++ b/dev-php/PEAR-HTML_Table_Matrix/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/PEAR-HTML_Template_Flexy/metadata.xml b/dev-php/PEAR-HTML_Template_Flexy/metadata.xml
index 177eaaa943d0..74106ec2e497 100644
--- a/dev-php/PEAR-HTML_Template_Flexy/metadata.xml
+++ b/dev-php/PEAR-HTML_Template_Flexy/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/PEAR-HTML_Template_Sigma/metadata.xml b/dev-php/PEAR-HTML_Template_Sigma/metadata.xml
index aca42932b833..77793b997e9e 100644
--- a/dev-php/PEAR-HTML_Template_Sigma/metadata.xml
+++ b/dev-php/PEAR-HTML_Template_Sigma/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/PEAR-HTTP/metadata.xml b/dev-php/PEAR-HTTP/metadata.xml
index aca42932b833..77793b997e9e 100644
--- a/dev-php/PEAR-HTTP/metadata.xml
+++ b/dev-php/PEAR-HTTP/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/PEAR-HTTP_Header/metadata.xml b/dev-php/PEAR-HTTP_Header/metadata.xml
index da7866059839..67ab349fc657 100644
--- a/dev-php/PEAR-HTTP_Header/metadata.xml
+++ b/dev-php/PEAR-HTTP_Header/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/PEAR-HTTP_Request2/metadata.xml b/dev-php/PEAR-HTTP_Request2/metadata.xml
index 50c6da14210c..8d1b88e9c494 100644
--- a/dev-php/PEAR-HTTP_Request2/metadata.xml
+++ b/dev-php/PEAR-HTTP_Request2/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/PEAR-HTTP_Session2/metadata.xml b/dev-php/PEAR-HTTP_Session2/metadata.xml
index aca42932b833..77793b997e9e 100644
--- a/dev-php/PEAR-HTTP_Session2/metadata.xml
+++ b/dev-php/PEAR-HTTP_Session2/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/PEAR-Image_Color2/metadata.xml b/dev-php/PEAR-Image_Color2/metadata.xml
index b86acf66c756..222c77f3742a 100644
--- a/dev-php/PEAR-Image_Color2/metadata.xml
+++ b/dev-php/PEAR-Image_Color2/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/PEAR-Image_GraphViz/metadata.xml b/dev-php/PEAR-Image_GraphViz/metadata.xml
index b86acf66c756..222c77f3742a 100644
--- a/dev-php/PEAR-Image_GraphViz/metadata.xml
+++ b/dev-php/PEAR-Image_GraphViz/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/PEAR-Image_IPTC/metadata.xml b/dev-php/PEAR-Image_IPTC/metadata.xml
index aca42932b833..77793b997e9e 100644
--- a/dev-php/PEAR-Image_IPTC/metadata.xml
+++ b/dev-php/PEAR-Image_IPTC/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/PEAR-Image_Text/metadata.xml b/dev-php/PEAR-Image_Text/metadata.xml
index b86acf66c756..222c77f3742a 100644
--- a/dev-php/PEAR-Image_Text/metadata.xml
+++ b/dev-php/PEAR-Image_Text/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/PEAR-Log/metadata.xml b/dev-php/PEAR-Log/metadata.xml
index 0b9fa8b836f2..cf03dc3f557f 100644
--- a/dev-php/PEAR-Log/metadata.xml
+++ b/dev-php/PEAR-Log/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/PEAR-MDB/metadata.xml b/dev-php/PEAR-MDB/metadata.xml
index aca42932b833..77793b997e9e 100644
--- a/dev-php/PEAR-MDB/metadata.xml
+++ b/dev-php/PEAR-MDB/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/PEAR-MDB2/metadata.xml b/dev-php/PEAR-MDB2/metadata.xml
index d6eee2d3d100..b62c78e02785 100644
--- a/dev-php/PEAR-MDB2/metadata.xml
+++ b/dev-php/PEAR-MDB2/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/PEAR-MDB2_Driver_mssql/metadata.xml b/dev-php/PEAR-MDB2_Driver_mssql/metadata.xml
index bfa764ce1662..57efc5c0cf1b 100644
--- a/dev-php/PEAR-MDB2_Driver_mssql/metadata.xml
+++ b/dev-php/PEAR-MDB2_Driver_mssql/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/PEAR-MDB2_Driver_mysqli/metadata.xml b/dev-php/PEAR-MDB2_Driver_mysqli/metadata.xml
index 9fdf27a5ba30..e24d7383a76a 100644
--- a/dev-php/PEAR-MDB2_Driver_mysqli/metadata.xml
+++ b/dev-php/PEAR-MDB2_Driver_mysqli/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/PEAR-MDB2_Driver_oci8/metadata.xml b/dev-php/PEAR-MDB2_Driver_oci8/metadata.xml
index 68a347a1a1c6..6788cd5c06cc 100644
--- a/dev-php/PEAR-MDB2_Driver_oci8/metadata.xml
+++ b/dev-php/PEAR-MDB2_Driver_oci8/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/PEAR-MDB2_Driver_pgsql/metadata.xml b/dev-php/PEAR-MDB2_Driver_pgsql/metadata.xml
index ad62d2e06153..6dad849108cc 100644
--- a/dev-php/PEAR-MDB2_Driver_pgsql/metadata.xml
+++ b/dev-php/PEAR-MDB2_Driver_pgsql/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/PEAR-MIME_Type/metadata.xml b/dev-php/PEAR-MIME_Type/metadata.xml
index dbd2241364cd..6d6f8377940a 100644
--- a/dev-php/PEAR-MIME_Type/metadata.xml
+++ b/dev-php/PEAR-MIME_Type/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/PEAR-Mail/metadata.xml b/dev-php/PEAR-Mail/metadata.xml
index d44800881814..a307dd57bffd 100644
--- a/dev-php/PEAR-Mail/metadata.xml
+++ b/dev-php/PEAR-Mail/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/PEAR-Mail_Mime/Manifest b/dev-php/PEAR-Mail_Mime/Manifest
index ab92da22637a..7240c41535b0 100644
--- a/dev-php/PEAR-Mail_Mime/Manifest
+++ b/dev-php/PEAR-Mail_Mime/Manifest
@@ -1,7 +1,3 @@
DIST Mail_Mime-1.10.10.tgz 40520 BLAKE2B a552ee3e374e7af078ea1a266793aa88b74cd98a630eeced9ef0525ada9dacd645b9182da91cf39b09e9824672478bc0bfc1d3370bf6d839cf11bd67a3e96cdc SHA512 0d1bd45424ee560961a827bdcc1c93516c6cd7987745a4571224aa42b7cc22c284931ff9c56c7df1371ae1d763449e04da5d4ccf0cc6ad00306c436fc81ae2e6
+DIST Mail_Mime-1.10.11.tgz 40930 BLAKE2B e02f5f8fc43949a32edf4a8fc835e4a6b4f44b509f3066b35ca0822a4cc723eb5fba860161a88d10d788811e5ef34d72e845fbf9b2768a83d87bc95445e8a967 SHA512 405873f92542f6f6d4433959ed3c741d64afe70852ddc9582d995485f327f662bccc82af0dfef3ccca61ec6497d67ea8f9d04d95f25443c57e3a319f96f7ac30
DIST Mail_Mime-1.10.2.tgz 36501 BLAKE2B 59e900b99061e84d307eb46d295f843404ae06b01936cec4ed610c298b6f7e8fcee15098fa6d935696122311eae2dbf733611410b2249f2535673a3031011fa3 SHA512 4e3b2a2adc58d8b4f16f56509c9f22638dc37aedf1bec60871706390198198be6ed6dccae8c250eb33de3a441aeb122097ffaddbc49191745f0f09693ec6612b
-DIST Mail_Mime-1.10.4.tgz 36909 BLAKE2B 101d050d96b717ad970a6f8c170ba8ea7d94252274f0b006a266a5ef4ac9d49fb350d3bf120ce645e5a54af1f0ad0ab664c828abfa8a4a96170e7204c73dfd82 SHA512 6e58e1078292cf43605313e2402b60deb97be0b56c8eb5dbbb501cf92ca836ca4bdbc9e1ab878c89f8e59941962a91b73dd917c8e678f0944f271e5537f065e5
-DIST Mail_Mime-1.10.6.tgz 38355 BLAKE2B d12b0496122c67236090db84710aa1fa660570d82952f037ddeb795ac3184a427965e12b21a6dcd6bfaea692299fb6e610822a364470c444455369f96dbbe972 SHA512 223e4a3a3ab52497d7cee551108642aa8c90328cd5d28ec0f215e16e0f2066fbaa3e4d51e62080d322846f8410c2e4641cd7c743e736062b6f8215e637877518
-DIST Mail_Mime-1.10.7.tgz 38445 BLAKE2B 4e990a9a704aa8fd918dcbcd271946cd5a76c55783cfa207a9a8d171c1e0d407e19e2a30ce46689c8afddeee0037082d77ecbc0e3fb0b4e94f82a2b242ef22c6 SHA512 b3ac0076d3519c14f0331b73940a4fa47cfeb1d2c31d5a5ffa820042fc9b56a8b4d479f349dbe213164c157d5c56caaf0b4f70ef422cc3eba40443433c813d60
-DIST Mail_Mime-1.10.8.tgz 38783 BLAKE2B 5a9410dd0778bbd765a6c6f2e7880d2e7951d131c3e2195a840e0b31579fc2c8b722db434d3d104fa3d178e7033cb08d9ac15a9ebfa38911566d5e52a2ddbae8 SHA512 3f32b894ded49fc848650d684d98c9db6394074491a0ef92ed97be01f35ad01aab96845d4bc590034767fcc92631fdf475db3d0c926a000ad7879d6a9ac824b5
-DIST Mail_Mime-1.10.9.tgz 38928 BLAKE2B aa55b61b6b683db8a8ec26c896f38b5c62376a39488dbfb5d56bca3b199086d3057533072fe2070859f12052207fde1f0bcad86b97830e66fef95f5b69381fb7 SHA512 aefaf0501c3876750b567a4d4c4edfb629b51f2a2bcf104705cf938611334bfb587a0cac270eed52c111819dd018199a3907916060b9b9fdbddf5ba143d71061
diff --git a/dev-php/PEAR-Mail_Mime/PEAR-Mail_Mime-1.10.10.ebuild b/dev-php/PEAR-Mail_Mime/PEAR-Mail_Mime-1.10.10.ebuild
index eb4747a42cf2..d160755e6c3f 100644
--- a/dev-php/PEAR-Mail_Mime/PEAR-Mail_Mime-1.10.10.ebuild
+++ b/dev-php/PEAR-Mail_Mime/PEAR-Mail_Mime-1.10.10.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Create and manipulate mime messages with PHP"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-php/PEAR-Mail_Mime/PEAR-Mail_Mime-1.10.7.ebuild b/dev-php/PEAR-Mail_Mime/PEAR-Mail_Mime-1.10.11.ebuild
index a88d469a1fcd..eb4747a42cf2 100644
--- a/dev-php/PEAR-Mail_Mime/PEAR-Mail_Mime-1.10.7.ebuild
+++ b/dev-php/PEAR-Mail_Mime/PEAR-Mail_Mime-1.10.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
diff --git a/dev-php/PEAR-Mail_Mime/PEAR-Mail_Mime-1.10.4.ebuild b/dev-php/PEAR-Mail_Mime/PEAR-Mail_Mime-1.10.4.ebuild
deleted file mode 100644
index a88d469a1fcd..000000000000
--- a/dev-php/PEAR-Mail_Mime/PEAR-Mail_Mime-1.10.4.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit php-pear-r2
-
-DESCRIPTION="Create and manipulate mime messages with PHP"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="test"
-
-RESTRICT="!test? ( test )"
-
-DEPEND="test? ( dev-php/PEAR-PEAR )"
-
-src_test() {
- # Requires the "pear" executable from dev-php/PEAR-PEAR.
- pear run-tests tests || die
-
- # The command succeeds regardless of whether or not the test suite
- # passed, but this file is only written when there was a failure.
- [[ -f run-tests.log ]] && die "test suite failed"
-}
diff --git a/dev-php/PEAR-Mail_Mime/PEAR-Mail_Mime-1.10.6.ebuild b/dev-php/PEAR-Mail_Mime/PEAR-Mail_Mime-1.10.6.ebuild
deleted file mode 100644
index a88d469a1fcd..000000000000
--- a/dev-php/PEAR-Mail_Mime/PEAR-Mail_Mime-1.10.6.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit php-pear-r2
-
-DESCRIPTION="Create and manipulate mime messages with PHP"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="test"
-
-RESTRICT="!test? ( test )"
-
-DEPEND="test? ( dev-php/PEAR-PEAR )"
-
-src_test() {
- # Requires the "pear" executable from dev-php/PEAR-PEAR.
- pear run-tests tests || die
-
- # The command succeeds regardless of whether or not the test suite
- # passed, but this file is only written when there was a failure.
- [[ -f run-tests.log ]] && die "test suite failed"
-}
diff --git a/dev-php/PEAR-Mail_Mime/PEAR-Mail_Mime-1.10.9.ebuild b/dev-php/PEAR-Mail_Mime/PEAR-Mail_Mime-1.10.9.ebuild
deleted file mode 100644
index a88d469a1fcd..000000000000
--- a/dev-php/PEAR-Mail_Mime/PEAR-Mail_Mime-1.10.9.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit php-pear-r2
-
-DESCRIPTION="Create and manipulate mime messages with PHP"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="test"
-
-RESTRICT="!test? ( test )"
-
-DEPEND="test? ( dev-php/PEAR-PEAR )"
-
-src_test() {
- # Requires the "pear" executable from dev-php/PEAR-PEAR.
- pear run-tests tests || die
-
- # The command succeeds regardless of whether or not the test suite
- # passed, but this file is only written when there was a failure.
- [[ -f run-tests.log ]] && die "test suite failed"
-}
diff --git a/dev-php/PEAR-Mail_Mime/metadata.xml b/dev-php/PEAR-Mail_Mime/metadata.xml
index 16ca6ff90970..5f468b1f635e 100644
--- a/dev-php/PEAR-Mail_Mime/metadata.xml
+++ b/dev-php/PEAR-Mail_Mime/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
@@ -9,4 +9,5 @@
<email>mjo@gentoo.org</email>
<name>Michael Orlitzky</name>
</maintainer>
+ <stabilize-allarches/>
</pkgmetadata>
diff --git a/dev-php/PEAR-Mail_mimeDecode/metadata.xml b/dev-php/PEAR-Mail_mimeDecode/metadata.xml
index fc41100f6739..6f1279cd96c2 100644
--- a/dev-php/PEAR-Mail_mimeDecode/metadata.xml
+++ b/dev-php/PEAR-Mail_mimeDecode/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/PEAR-Math_BigInteger/metadata.xml b/dev-php/PEAR-Math_BigInteger/metadata.xml
index dc55a2b192a1..e19e626a5475 100644
--- a/dev-php/PEAR-Math_BigInteger/metadata.xml
+++ b/dev-php/PEAR-Math_BigInteger/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/PEAR-Net_DNS/metadata.xml b/dev-php/PEAR-Net_DNS/metadata.xml
index aca42932b833..77793b997e9e 100644
--- a/dev-php/PEAR-Net_DNS/metadata.xml
+++ b/dev-php/PEAR-Net_DNS/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/PEAR-Net_DNS2/metadata.xml b/dev-php/PEAR-Net_DNS2/metadata.xml
index 115a72bf6b04..86a5931329f6 100644
--- a/dev-php/PEAR-Net_DNS2/metadata.xml
+++ b/dev-php/PEAR-Net_DNS2/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/PEAR-Net_DNSBL/metadata.xml b/dev-php/PEAR-Net_DNSBL/metadata.xml
index d1b90bd1a469..03c37ad58871 100644
--- a/dev-php/PEAR-Net_DNSBL/metadata.xml
+++ b/dev-php/PEAR-Net_DNSBL/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/PEAR-Net_IDNA2/metadata.xml b/dev-php/PEAR-Net_IDNA2/metadata.xml
index f268bf668c36..d2379f4337a2 100644
--- a/dev-php/PEAR-Net_IDNA2/metadata.xml
+++ b/dev-php/PEAR-Net_IDNA2/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/PEAR-Net_IPv4/metadata.xml b/dev-php/PEAR-Net_IPv4/metadata.xml
index aca42932b833..77793b997e9e 100644
--- a/dev-php/PEAR-Net_IPv4/metadata.xml
+++ b/dev-php/PEAR-Net_IPv4/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/PEAR-Net_IPv6/metadata.xml b/dev-php/PEAR-Net_IPv6/metadata.xml
index 40bf307f7a83..04d86b41f0c4 100644
--- a/dev-php/PEAR-Net_IPv6/metadata.xml
+++ b/dev-php/PEAR-Net_IPv6/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/PEAR-Net_LDAP2/metadata.xml b/dev-php/PEAR-Net_LDAP2/metadata.xml
index 63daabb13569..7ae408574ad3 100644
--- a/dev-php/PEAR-Net_LDAP2/metadata.xml
+++ b/dev-php/PEAR-Net_LDAP2/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/PEAR-Net_POP3/metadata.xml b/dev-php/PEAR-Net_POP3/metadata.xml
index aca42932b833..77793b997e9e 100644
--- a/dev-php/PEAR-Net_POP3/metadata.xml
+++ b/dev-php/PEAR-Net_POP3/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/PEAR-Net_Ping/metadata.xml b/dev-php/PEAR-Net_Ping/metadata.xml
index 89cc6c090db5..fc8c03c9aa10 100644
--- a/dev-php/PEAR-Net_Ping/metadata.xml
+++ b/dev-php/PEAR-Net_Ping/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/PEAR-Net_SMTP/metadata.xml b/dev-php/PEAR-Net_SMTP/metadata.xml
index dfe1c134cec2..8c8d10200a65 100644
--- a/dev-php/PEAR-Net_SMTP/metadata.xml
+++ b/dev-php/PEAR-Net_SMTP/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/PEAR-Net_Sieve/metadata.xml b/dev-php/PEAR-Net_Sieve/metadata.xml
index 75b702d088df..c78a0694b683 100644
--- a/dev-php/PEAR-Net_Sieve/metadata.xml
+++ b/dev-php/PEAR-Net_Sieve/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/PEAR-Net_SmartIRC/metadata.xml b/dev-php/PEAR-Net_SmartIRC/metadata.xml
index 341edc04699b..d44d8958cd4e 100644
--- a/dev-php/PEAR-Net_SmartIRC/metadata.xml
+++ b/dev-php/PEAR-Net_SmartIRC/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/PEAR-Net_Socket/metadata.xml b/dev-php/PEAR-Net_Socket/metadata.xml
index 0f52819d348d..3a1d20c4707f 100644
--- a/dev-php/PEAR-Net_Socket/metadata.xml
+++ b/dev-php/PEAR-Net_Socket/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/PEAR-Net_Traceroute/metadata.xml b/dev-php/PEAR-Net_Traceroute/metadata.xml
index aca42932b833..77793b997e9e 100644
--- a/dev-php/PEAR-Net_Traceroute/metadata.xml
+++ b/dev-php/PEAR-Net_Traceroute/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/PEAR-Net_URL/metadata.xml b/dev-php/PEAR-Net_URL/metadata.xml
index aca42932b833..77793b997e9e 100644
--- a/dev-php/PEAR-Net_URL/metadata.xml
+++ b/dev-php/PEAR-Net_URL/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/PEAR-Net_URL2/metadata.xml b/dev-php/PEAR-Net_URL2/metadata.xml
index 85371818ed52..3de98f2658fe 100644
--- a/dev-php/PEAR-Net_URL2/metadata.xml
+++ b/dev-php/PEAR-Net_URL2/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/PEAR-Net_UserAgent_Detect/metadata.xml b/dev-php/PEAR-Net_UserAgent_Detect/metadata.xml
index aca42932b833..77793b997e9e 100644
--- a/dev-php/PEAR-Net_UserAgent_Detect/metadata.xml
+++ b/dev-php/PEAR-Net_UserAgent_Detect/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/PEAR-Numbers_Words/metadata.xml b/dev-php/PEAR-Numbers_Words/metadata.xml
index d2c15155b757..cdea7028d66c 100644
--- a/dev-php/PEAR-Numbers_Words/metadata.xml
+++ b/dev-php/PEAR-Numbers_Words/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/PEAR-OLE/metadata.xml b/dev-php/PEAR-OLE/metadata.xml
index bae519a4738e..2d76cf770abf 100644
--- a/dev-php/PEAR-OLE/metadata.xml
+++ b/dev-php/PEAR-OLE/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/PEAR-PEAR/Manifest b/dev-php/PEAR-PEAR/Manifest
index e94b02351ee7..746d767db396 100644
--- a/dev-php/PEAR-PEAR/Manifest
+++ b/dev-php/PEAR-PEAR/Manifest
@@ -1 +1,2 @@
DIST PEAR-1.10.12.tgz 293220 BLAKE2B fb25123852a60e4bd2c041d1fb58174b3053b24ff8ec19b44efe02aee041bbed102b14b270dc1c9764150eea7c85862ad78adefdc1d789540da18ec0f3aeae68 SHA512 1ce478800a150d7906f8aa4fa4371d3d190fa2af44691c9aa193babfe76f1b031b493f48df15b93e93dd5518a6d62ba6a7d5b1799b62d5a968f7a84f3677b971
+DIST PEAR-1.10.13.tgz 293384 BLAKE2B 0adbf707d71cfd584b1338e906fbd38de038292a91153547ed87bdea4c0a7c9ee2ca01c25c91cf8246b8fba88b71126fa8b76ed7059b4338d5bbc65c3d53ce78 SHA512 2a08134365b7bd92840880a23149ef457b0a3a04b78dc71f5db475911b49def58d8cb825332151df8d3eb5941b54157ae80879f36fc8de59037f301fc0565740
diff --git a/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.13.ebuild b/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.13.ebuild
new file mode 100644
index 000000000000..5cc6db313633
--- /dev/null
+++ b/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.13.ebuild
@@ -0,0 +1,177 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="${PN/PEAR-/}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="PEAR Base System"
+HOMEPAGE="https://pear.php.net/package/PEAR"
+SRC_URI="https://pear.php.net/get/${MY_P}.tgz"
+LICENSE="MIT"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+SLOT="0"
+IUSE=""
+
+DEPEND=""
+RDEPEND="dev-lang/php:*[cli(-),xml(-),zlib(-)]
+ >=dev-php/PEAR-Archive_Tar-1.4.9
+ >=dev-php/PEAR-Console_Getopt-1.4.1
+ dev-php/PEAR-Exception
+ >=dev-php/PEAR-Structures_Graph-1.1.0
+ >=dev-php/PEAR-XML_Util-1.4.0"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=( "${FILESDIR}/gentoo-libtool-mismatch-fix-v2.patch" )
+
+pkg_setup() {
+ [[ -z "${PEAR_CACHEDIR}" ]] && PEAR_CACHEDIR="${EPREFIX}/var/cache/pear"
+ [[ -z "${PEAR_DOWNLOADDIR}" ]] && PEAR_DOWNLOADDIR="${EPREFIX}/var/tmp/pear"
+ [[ -z "${PEAR_TEMPDIR}" ]] && PEAR_TEMPDIR="${EPREFIX}/tmp"
+
+ elog
+ elog "cache_dir is set to: ${PEAR_CACHEDIR}"
+ elog "download_dir is set to: ${PEAR_DOWNLOADDIR}"
+ elog "temp_dir is set to: ${PEAR_TEMPDIR}"
+ elog
+ elog "If you want to change the above values, you need to set"
+ elog "PEAR_CACHEDIR, PEAR_DOWNLOADDIR and PEAR_TEMPDIR variable(s)"
+ elog "accordingly in /etc/portage/make.conf and re-emerge ${PN}."
+ elog
+}
+
+src_prepare() {
+ default
+ # Exception.php is part of dev-php/PEAR-Exception.
+ rm PEAR/Exception.php || die "failed to remove PEAR/Exception.php"
+}
+
+src_install() {
+ insinto /usr/share/php
+ doins -r PEAR/
+ doins -r OS/
+ doins PEAR.php System.php
+ doins scripts/pearcmd.php
+ doins scripts/peclcmd.php
+
+ newbin scripts/pear.sh pear
+ newbin scripts/peardev.sh peardev
+ newbin scripts/pecl.sh pecl
+
+ # adjust some scripts for current version
+ [[ -z "${PEAR}" ]] && PEAR="${PV}"
+ for i in pearcmd.php peclcmd.php ; do
+ sed "s:@pear_version@:${PEAR}:g" -i "${D}/usr/share/php/${i}" \
+ || die "failed to sed pear_version"
+ done
+
+ for i in pear peardev pecl ; do
+ sed "s:@bin_dir@:${EPREFIX}/usr/bin:g" -i "${D}/usr/bin/${i}" \
+ || die "failed to sed @bin_dir@ in ${i}"
+ sed "s:@php_dir@:${EPREFIX}/usr/share/php:g" -i "${D}/usr/bin/${i}" \
+ || die "failed to sed @php_dir@ in ${i}"
+ done
+
+ sed "s:-d output_buffering=1:-d output_buffering=1 -d memory_limit=32M:g" \
+ -i "${D}/usr/bin/pear" \
+ || die "failed to set PHP ini values in pear executable"
+
+ sed "s:@package_version@:${PEAR}:g" \
+ -i "${D}/usr/share/php/PEAR/Command/Package.php" \
+ || die "failed to sed @package_version@"
+
+ sed "s:@PEAR-VER@:${PEAR}:g" \
+ -i "${D}/usr/share/php/PEAR/Dependency2.php" \
+ || die "failed to sed @PEAR-VER@ in Dependency2.php"
+
+ sed "s:@PEAR-VER@:${PEAR}:g" \
+ -i "${D}/usr/share/php/PEAR/PackageFile/Parser/v1.php" \
+ || die "failed to sed @PEAR-VER@ in v1.php"
+
+ sed "s:@PEAR-VER@:${PEAR}:g" \
+ -i "${D}/usr/share/php/PEAR/PackageFile/Parser/v2.php" \
+ || die "failed to sed @PEAR-VER@ in v2.php"
+
+ # finalize install
+ insinto /etc
+ newins "${FILESDIR}"/pear.conf-r2 pear.conf
+
+ sed "s|s:PHPCLILEN:\"PHPCLI\"|s:${#PHPCLI}:\"${PHPCLI}\"|g" \
+ -i "${D}/etc/pear.conf" \
+ || die "failed to sed PHPCLILEN in pear.conf"
+
+ sed "s|s:CACHEDIRLEN:\"CACHEDIR\"|s:${#PEAR_CACHEDIR}:\"${PEAR_CACHEDIR}\"|g" \
+ -i "${D}/etc/pear.conf" \
+ || die "failed to sed CACHEDIRLEN in pear.conf"
+
+ sed "s|s:DOWNLOADDIRLEN:\"DOWNLOADDIR\"|s:${#PEAR_DOWNLOADDIR}:\"${PEAR_DOWNLOADDIR}\"|g" \
+ -i "${D}/etc/pear.conf" \
+ || die "failed to sed DOWNLOADDIRLEN in pear.conf"
+
+ sed "s|s:TEMPDIRLEN:\"TEMPDIR\"|s:${#PEAR_TEMPDIR}:\"${PEAR_TEMPDIR}\"|g" \
+ -i "${D}/etc/pear.conf" \
+ || die "failed to sed TEMPDIRLEN in pear.conf"
+
+ # Change the paths for eprefix!
+ sed "s|s:19:\"/usr/share/php/docs\"|s:$(( ${#EPREFIX}+19 )):\"${EPREFIX}/usr/share/php/docs\"|g" \
+ -i "${D}/etc/pear.conf" \
+ || die "failed to sed the docs path (prefix) in pear.conf"
+
+ sed "s|s:19:\"/usr/share/php/data\"|s:$(( ${#EPREFIX}+19 )):\"${EPREFIX}/usr/share/php/data\"|g" \
+ -i "${D}/etc/pear.conf" \
+ || die "failed to sed the data path (prefix) in pear.conf"
+
+ sed "s|s:20:\"/usr/share/php/tests\"|s:$(( ${#EPREFIX}+20 )):\"${EPREFIX}/usr/share/php/tests\"|g" \
+ -i "${D}/etc/pear.conf" \
+ || die "failed to sed the tests path (prefix) in pear.conf"
+
+ sed "s|s:14:\"/usr/share/php\"|s:$(( ${#EPREFIX}+14 )):\"${EPREFIX}/usr/share/php\"|g" \
+ -i "${D}/etc/pear.conf" \
+ || die "failed to sed the PHP include path (prefix) in pear.conf"
+
+ sed "s|s:8:\"/usr/bin\"|s:$(( ${#EPREFIX}+8 )):\"${EPREFIX}/usr/bin\"|g" \
+ -i "${D}/etc/pear.conf" \
+ || die "failed to sed the bin path (prefix) in pear.conf"
+
+ [[ "${PEAR_TEMPDIR}" != "/tmp" ]] && keepdir "${PEAR_TEMPDIR#${EPREFIX}}"
+ keepdir "${PEAR_CACHEDIR#${EPREFIX}}"
+ diropts -m1777
+ keepdir "${PEAR_DOWNLOADDIR#${EPREFIX}}"
+
+ insinto /usr/share/php/.packagexml
+ newins "${WORKDIR}/package.xml" "${MY_P}.xml"
+}
+
+pkg_config() {
+ # Update PEAR/PECL channels as needed, add new ones to the list if needed
+ elog "Updating PEAR/PECL channels"
+ local pearchans="pear.php.net pecl.php.net pear.symfony-project.com"
+
+ for chan in ${pearchans} ; do
+ # The first command may fail if, for example, the channels have
+ # already been initialized.
+ pear channel-discover ${chan}
+ pear channel-update ${chan} || die "failed to update channels: ${chan}"
+ done
+}
+
+pkg_postinst() {
+ pear clear-cache || die "failed to clear PEAR cache"
+
+ elog "Run 'emerge --config =${PF}' to automatically update the PEAR/PECL channels while online."
+
+ # Register the package from the package.xml file
+ # It is not critical to complete so only warn on failure
+ if [[ -f "${EROOT}/usr/share/php/.packagexml/${MY_P}.xml" ]] ; then
+ "${EROOT}/usr/bin/peardev" install -nrO --force \
+ "${EROOT}/usr/share/php/.packagexml/${MY_P}.xml" 2> /dev/null \
+ || ewarn "Failed to insert package into local PEAR database"
+ fi
+}
+
+pkg_prerm() {
+ # Uninstall known dependency
+ "${EROOT}/usr/bin/peardev" uninstall -nrO "pear.php.net/PEAR"
+}
diff --git a/dev-php/PEAR-PEAR/metadata.xml b/dev-php/PEAR-PEAR/metadata.xml
index ad42cd86df78..bd0c90eab0e2 100644
--- a/dev-php/PEAR-PEAR/metadata.xml
+++ b/dev-php/PEAR-PEAR/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/PEAR-PEAR_PackageFileManager/metadata.xml b/dev-php/PEAR-PEAR_PackageFileManager/metadata.xml
index fab171dfd1f8..98e5afa08817 100644
--- a/dev-php/PEAR-PEAR_PackageFileManager/metadata.xml
+++ b/dev-php/PEAR-PEAR_PackageFileManager/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/PEAR-PEAR_PackageFileManager2/metadata.xml b/dev-php/PEAR-PEAR_PackageFileManager2/metadata.xml
index b809fc597ff9..d4583a1190ac 100644
--- a/dev-php/PEAR-PEAR_PackageFileManager2/metadata.xml
+++ b/dev-php/PEAR-PEAR_PackageFileManager2/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/PEAR-PEAR_PackageFileManager_Plugins/metadata.xml b/dev-php/PEAR-PEAR_PackageFileManager_Plugins/metadata.xml
index d9b3b31f5004..1c8dc329dd56 100644
--- a/dev-php/PEAR-PEAR_PackageFileManager_Plugins/metadata.xml
+++ b/dev-php/PEAR-PEAR_PackageFileManager_Plugins/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/PEAR-PHP_Beautifier/metadata.xml b/dev-php/PEAR-PHP_Beautifier/metadata.xml
index 9321b4869241..b7ebf25c8498 100644
--- a/dev-php/PEAR-PHP_Beautifier/metadata.xml
+++ b/dev-php/PEAR-PHP_Beautifier/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/PEAR-PHP_Debug/metadata.xml b/dev-php/PEAR-PHP_Debug/metadata.xml
index b86acf66c756..222c77f3742a 100644
--- a/dev-php/PEAR-PHP_Debug/metadata.xml
+++ b/dev-php/PEAR-PHP_Debug/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/PEAR-Pager/metadata.xml b/dev-php/PEAR-Pager/metadata.xml
index 3562bff75a4d..e47097b57107 100644
--- a/dev-php/PEAR-Pager/metadata.xml
+++ b/dev-php/PEAR-Pager/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/PEAR-Services_JSON/metadata.xml b/dev-php/PEAR-Services_JSON/metadata.xml
index aca42932b833..77793b997e9e 100644
--- a/dev-php/PEAR-Services_JSON/metadata.xml
+++ b/dev-php/PEAR-Services_JSON/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/PEAR-Services_TinyURL/metadata.xml b/dev-php/PEAR-Services_TinyURL/metadata.xml
index aca42932b833..77793b997e9e 100644
--- a/dev-php/PEAR-Services_TinyURL/metadata.xml
+++ b/dev-php/PEAR-Services_TinyURL/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/PEAR-Services_W3C_CSSValidator/metadata.xml b/dev-php/PEAR-Services_W3C_CSSValidator/metadata.xml
index eb024985cc14..4825b35a864e 100644
--- a/dev-php/PEAR-Services_W3C_CSSValidator/metadata.xml
+++ b/dev-php/PEAR-Services_W3C_CSSValidator/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/PEAR-Spreadsheet_Excel_Writer/metadata.xml b/dev-php/PEAR-Spreadsheet_Excel_Writer/metadata.xml
index aca42932b833..77793b997e9e 100644
--- a/dev-php/PEAR-Spreadsheet_Excel_Writer/metadata.xml
+++ b/dev-php/PEAR-Spreadsheet_Excel_Writer/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/PEAR-Structures_Graph/metadata.xml b/dev-php/PEAR-Structures_Graph/metadata.xml
index 2b74bd726af2..9472561552eb 100644
--- a/dev-php/PEAR-Structures_Graph/metadata.xml
+++ b/dev-php/PEAR-Structures_Graph/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/PEAR-System_Command/metadata.xml b/dev-php/PEAR-System_Command/metadata.xml
index ec63f2f5e427..f71d72ea7eca 100644
--- a/dev-php/PEAR-System_Command/metadata.xml
+++ b/dev-php/PEAR-System_Command/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/PEAR-Text_CAPTCHA/metadata.xml b/dev-php/PEAR-Text_CAPTCHA/metadata.xml
index c0702f18b969..04e7e4d0db71 100644
--- a/dev-php/PEAR-Text_CAPTCHA/metadata.xml
+++ b/dev-php/PEAR-Text_CAPTCHA/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/PEAR-Text_CAPTCHA_Numeral/metadata.xml b/dev-php/PEAR-Text_CAPTCHA_Numeral/metadata.xml
index b86acf66c756..222c77f3742a 100644
--- a/dev-php/PEAR-Text_CAPTCHA_Numeral/metadata.xml
+++ b/dev-php/PEAR-Text_CAPTCHA_Numeral/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/PEAR-Text_Figlet/metadata.xml b/dev-php/PEAR-Text_Figlet/metadata.xml
index 422fb9a63b17..4bee62ba3ab5 100644
--- a/dev-php/PEAR-Text_Figlet/metadata.xml
+++ b/dev-php/PEAR-Text_Figlet/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/PEAR-Text_Highlighter/metadata.xml b/dev-php/PEAR-Text_Highlighter/metadata.xml
index ed8567959038..9a8d08177ca0 100644
--- a/dev-php/PEAR-Text_Highlighter/metadata.xml
+++ b/dev-php/PEAR-Text_Highlighter/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/PEAR-Text_Password/metadata.xml b/dev-php/PEAR-Text_Password/metadata.xml
index bea5e06ee13b..126a19ab5d0c 100644
--- a/dev-php/PEAR-Text_Password/metadata.xml
+++ b/dev-php/PEAR-Text_Password/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/PEAR-Text_Wiki/metadata.xml b/dev-php/PEAR-Text_Wiki/metadata.xml
index 96c2f7441792..34b3349410d6 100644
--- a/dev-php/PEAR-Text_Wiki/metadata.xml
+++ b/dev-php/PEAR-Text_Wiki/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/PEAR-Text_Wiki_BBCode/metadata.xml b/dev-php/PEAR-Text_Wiki_BBCode/metadata.xml
index aca42932b833..77793b997e9e 100644
--- a/dev-php/PEAR-Text_Wiki_BBCode/metadata.xml
+++ b/dev-php/PEAR-Text_Wiki_BBCode/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/PEAR-Text_Wiki_Mediawiki/metadata.xml b/dev-php/PEAR-Text_Wiki_Mediawiki/metadata.xml
index aca42932b833..77793b997e9e 100644
--- a/dev-php/PEAR-Text_Wiki_Mediawiki/metadata.xml
+++ b/dev-php/PEAR-Text_Wiki_Mediawiki/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/PEAR-Validate/metadata.xml b/dev-php/PEAR-Validate/metadata.xml
index 66df66eb4173..666e6402df14 100644
--- a/dev-php/PEAR-Validate/metadata.xml
+++ b/dev-php/PEAR-Validate/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/PEAR-Var_Dump/metadata.xml b/dev-php/PEAR-Var_Dump/metadata.xml
index eeacdbbaf53c..6ead3b8b703f 100644
--- a/dev-php/PEAR-Var_Dump/metadata.xml
+++ b/dev-php/PEAR-Var_Dump/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/PEAR-VersionControl_SVN/metadata.xml b/dev-php/PEAR-VersionControl_SVN/metadata.xml
index aca42932b833..77793b997e9e 100644
--- a/dev-php/PEAR-VersionControl_SVN/metadata.xml
+++ b/dev-php/PEAR-VersionControl_SVN/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/PEAR-XML_Parser/metadata.xml b/dev-php/PEAR-XML_Parser/metadata.xml
index aca42932b833..77793b997e9e 100644
--- a/dev-php/PEAR-XML_Parser/metadata.xml
+++ b/dev-php/PEAR-XML_Parser/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/PEAR-XML_RSS/metadata.xml b/dev-php/PEAR-XML_RSS/metadata.xml
index 8539c587325f..e20abea1376d 100644
--- a/dev-php/PEAR-XML_RSS/metadata.xml
+++ b/dev-php/PEAR-XML_RSS/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/PEAR-XML_Serializer/metadata.xml b/dev-php/PEAR-XML_Serializer/metadata.xml
index 4954ffe101ae..2fd4163055d5 100644
--- a/dev-php/PEAR-XML_Serializer/metadata.xml
+++ b/dev-php/PEAR-XML_Serializer/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/PEAR-XML_Util/metadata.xml b/dev-php/PEAR-XML_Util/metadata.xml
index 4a974d8a4708..569d21508998 100644
--- a/dev-php/PEAR-XML_Util/metadata.xml
+++ b/dev-php/PEAR-XML_Util/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/PHPMailer/Manifest b/dev-php/PHPMailer/Manifest
index 353f53822af8..082765170b57 100644
--- a/dev-php/PHPMailer/Manifest
+++ b/dev-php/PHPMailer/Manifest
@@ -1 +1,2 @@
DIST PHPMailer-6.5.0.tar.gz 99073 BLAKE2B dcb917233da29ab45305f7cf0405f9bb384bd4f98f062a74d94a168868d0cd92017e555bf8e7139130dd669e0a04917e3789c548b5165112d591aa403bfd56b8 SHA512 0632ec8b80c30393b00aebbadde7dd032eb2553232a100a74d69b6ed6465adf1eb3a4acca0aaf040665a978e7507aee9350b092336056ccb5306fbaea4640376
+DIST PHPMailer-6.5.1.tar.gz 99913 BLAKE2B bf51e2caa0ff1d113d6f96f5c1ee055bacd40f8a251302452eb2ebbe06d1f926935b5d85c1b9e85d115180473b76077f753f0c8af04aa86c86db3431c8a412f2 SHA512 0f8e9e3368edfdb67c701a0f42c548379c9528a90bc016444ebdc9614967ca421fa706b5f1b2de89a91fa98f7e535fb67da578ac6ba1b73f673ba7b45a198f0e
diff --git a/dev-php/PHPMailer/PHPMailer-6.5.1.ebuild b/dev-php/PHPMailer/PHPMailer-6.5.1.ebuild
new file mode 100644
index 000000000000..48dc349297f3
--- /dev/null
+++ b/dev-php/PHPMailer/PHPMailer-6.5.1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Full-featured email creation and transfer class for PHP"
+HOMEPAGE="https://github.com/PHPMailer/PHPMailer"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+# To help out the Composer children, the tests and examples are missing
+# from the release tarballs.
+IUSE="doc idn ssl"
+
+# The ctype and filter extensions get used unconditionally, with no
+# fallback and no "extension missing" exception. All of the other
+# extensions are technically optional, depending on how you use
+# PHPMailer and whether or not you're willing to settle for fallback
+# implementations.
+#
+# The insane dependency string is to prevent the ctype and filter
+# extensions from being provided by one version (i.e. slot) of PHP,
+# while intl and unicode are provided by another.
+RDEPEND="
+ ssl? (
+ idn? ( dev-lang/php:*[ctype,filter,intl,ssl,unicode] )
+ !idn? ( dev-lang/php:*[ctype,filter,ssl] )
+ )
+ !ssl? (
+ idn? ( dev-lang/php:*[ctype,filter,intl,unicode] )
+ !idn? ( dev-lang/php:*[ctype,filter] )
+ )"
+BDEPEND="doc? ( dev-php/phpDocumentor )"
+
+src_prepare() {
+ default
+
+ # OAuth.php relies on a (now non-nonexistent) autoloader. We remove
+ # it early so that we don't generate documentation for it later on.
+ rm src/OAuth.php || die 'failed to remove src/OAuth.php'
+}
+
+src_compile() {
+ if use doc; then
+ phpdoc --filename="src/*.php" \
+ --target="./html" \
+ --cache-folder="${T}" \
+ --title="${PN}" \
+ --sourcecode \
+ --force \
+ --progressbar \
+ || die "failed to generate API documentation"
+ fi
+}
+
+src_install() {
+ # The PHPMailer class loads its language files
+ # using a relative path, so we need to keep the "src" here.
+ insinto "/usr/share/php/${PN}"
+ doins -r language src
+
+ dodoc README.md SECURITY.md
+ use doc && dodoc -r html/*
+}
+
+pkg_postinst() {
+ elog "${PN} has been installed in /usr/share/php/${PN}/."
+ elog "Upstream no longer provides an autoloader, so you will need"
+ elog "to include each source file (for example: PHPMailer.php,"
+ elog "Exception.php,...) that you need."
+}
diff --git a/dev-php/PHPMailer/metadata.xml b/dev-php/PHPMailer/metadata.xml
index a670ac4443f8..5b9df5c68615 100644
--- a/dev-php/PHPMailer/metadata.xml
+++ b/dev-php/PHPMailer/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>mjo@gentoo.org</email>
diff --git a/dev-php/PHP_CodeCoverage/metadata.xml b/dev-php/PHP_CodeCoverage/metadata.xml
index e257fd4519cc..69fd27f3c89d 100644
--- a/dev-php/PHP_CodeCoverage/metadata.xml
+++ b/dev-php/PHP_CodeCoverage/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/PHP_CodeSniffer/Manifest b/dev-php/PHP_CodeSniffer/Manifest
index 43cfbe9df06a..b999f67fb969 100644
--- a/dev-php/PHP_CodeSniffer/Manifest
+++ b/dev-php/PHP_CodeSniffer/Manifest
@@ -2,3 +2,4 @@ DIST PHP_CodeSniffer-3.5.4.tgz 697668 BLAKE2B f5915bcb73c0db0d8dcab3eda5ab647268
DIST PHP_CodeSniffer-3.5.6.tgz 706080 BLAKE2B 1d9d097e7c60f520973a0dff16e6b31c9e259599ded3f58ac6dda2f10419969b03c18d1ce7c38f19a0f3474b0d5cf4afc5abb889f820da0d5d9e8f0574a0a354 SHA512 392c162cc8cb8d8fe455990d7f358cc59f486d8083387dc3bf60af6ca7aa0e75b72ed337f624b08948d8060cc96bd2d03373b7508fb9179da6a4e6b83adf06a7
DIST PHP_CodeSniffer-3.5.8.tgz 716472 BLAKE2B e56efedc07a9db63eb2f135d9fef69bf055cef09c23dd9cd1e0efeed865d559b428e9aec06393b1ec1f58d32add92b2773c3d9ce33377f2441de0145560045a8 SHA512 69ef3d86520f541f492c955bd8158664c78aac6ecd4550f2b996f59d882d91f1bec81da9bbd106edc35c4f1a4c260ef2d9a56ec257fc0b4044047b902403065e
DIST PHP_CodeSniffer-3.6.0.tgz 762998 BLAKE2B f83626a2a64dbb5c7ae2545368f1efdf74d87630720efe7466d9adfd6591cbcc95f2b74a17f54a935377519c6d909ba17f4056fff6d8f3870cefe782f32675dd SHA512 09c98ac460c6dc70637d2f4d81a1e46bdf742ee14d0b56032e8dbcaf7a0ff03f3fdb1abdf8144f664a33298cf397c732ba62027bcee41f1f4f740d12fa29f6a8
+DIST PHP_CodeSniffer-3.6.1.tgz 773181 BLAKE2B a85a0008fe9788bb48723fdd6a62d646a70bb342099693299def9320ca12971c48d8bc698e001f3249e8bb94963735c57529fe2d3101d53ded5ffd0946e07d4f SHA512 4992a460494cf58e5731e10df216204842168465731c0d002b7913fbaa85370f01077f70c96b4390158fbcf52ee021650ab6f13609ea3133370b89f34c73343c
diff --git a/dev-php/PHP_CodeSniffer/PHP_CodeSniffer-3.6.1.ebuild b/dev-php/PHP_CodeSniffer/PHP_CodeSniffer-3.6.1.ebuild
new file mode 100644
index 000000000000..f15c9ff98ca6
--- /dev/null
+++ b/dev-php/PHP_CodeSniffer/PHP_CodeSniffer-3.6.1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Detect violations of PHP code standards"
+HOMEPAGE="https://github.com/squizlabs/PHP_CodeSniffer"
+
+# The test suite isn't part of the Github tarball at the moment. Keep an
+# eye on https://github.com/squizlabs/PHP_CodeSniffer/issues/548
+SRC_URI="http://download.pear.php.net/package/${P}.tgz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-lang/php:*[cli(-),tokenizer(-),xmlwriter(-)]"
+DEPEND="test? (
+ ${RDEPEND}
+ <dev-php/phpunit-6
+ )"
+
+DOCS=( CONTRIBUTING.md README.md )
+
+src_prepare() {
+ sed -i "s~@data_dir@~${EPREFIX}/usr/share/php/data~" src/Config.php || die
+ default
+}
+
+src_test() {
+ # The test suite will fail if date.timezone isn't set in php.ini.
+ phpunit -d date.timezone=UTC tests/AllTests.php \
+ || die "test suite failed"
+}
+
+src_install() {
+ local MY_PN="PHP/CodeSniffer" script
+ # The PEAR eclass would install everything into the wrong location.
+ insinto "/usr/share/php/${MY_PN}"
+ doins -r src autoload.php
+
+ insinto "/usr/share/php/data/${MY_PN}"
+ doins CodeSniffer.conf.dist
+ # These load code via relative paths, so they have to be symlinked
+ # and not dobin'd.
+ exeinto "/usr/share/php/${MY_PN}/bin"
+ for script in phpcbf phpcs; do
+ doexe "bin/${script}"
+ dosym "../share/php/${MY_PN}/bin/${script}" "/usr/bin/${script}"
+ done
+
+ einstalldocs
+}
diff --git a/dev-php/PHP_CodeSniffer/metadata.xml b/dev-php/PHP_CodeSniffer/metadata.xml
index 2cc51883b469..ac54412ed8d6 100644
--- a/dev-php/PHP_CodeSniffer/metadata.xml
+++ b/dev-php/PHP_CodeSniffer/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/PHP_Timer/metadata.xml b/dev-php/PHP_Timer/metadata.xml
index 92e5cab77515..6a8916ce0954 100644
--- a/dev-php/PHP_Timer/metadata.xml
+++ b/dev-php/PHP_Timer/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/PHP_TokenStream/metadata.xml b/dev-php/PHP_TokenStream/metadata.xml
index c227741f682a..92954eeb18a6 100644
--- a/dev-php/PHP_TokenStream/metadata.xml
+++ b/dev-php/PHP_TokenStream/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/SabreAMF/metadata.xml b/dev-php/SabreAMF/metadata.xml
index 77ac9767605d..c3a2620ec7ae 100644
--- a/dev-php/SabreAMF/metadata.xml
+++ b/dev-php/SabreAMF/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/Text_Template/metadata.xml b/dev-php/Text_Template/metadata.xml
index 601a1f87ce47..f96cbe73d4b7 100644
--- a/dev-php/Text_Template/metadata.xml
+++ b/dev-php/Text_Template/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/YAML/metadata.xml b/dev-php/YAML/metadata.xml
index 034baa38a6ed..ad845d99d581 100644
--- a/dev-php/YAML/metadata.xml
+++ b/dev-php/YAML/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/adodb/metadata.xml b/dev-php/adodb/metadata.xml
index db62b9a48986..8abdc5150a6b 100644
--- a/dev-php/adodb/metadata.xml
+++ b/dev-php/adodb/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/agavi/metadata.xml b/dev-php/agavi/metadata.xml
index fb37a3a38209..33a2e0ebdc07 100644
--- a/dev-php/agavi/metadata.xml
+++ b/dev-php/agavi/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/awl/metadata.xml b/dev-php/awl/metadata.xml
index 067f0aa933fd..a21c2d9a5cb6 100644
--- a/dev-php/awl/metadata.xml
+++ b/dev-php/awl/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person" proxied="yes">
<email>till2.schaefer@uni-dortmund.de</email>
diff --git a/dev-php/ca-bundle/Manifest b/dev-php/ca-bundle/Manifest
index 869046bf79dd..746cdd913927 100644
--- a/dev-php/ca-bundle/Manifest
+++ b/dev-php/ca-bundle/Manifest
@@ -1 +1,2 @@
DIST ca-bundle-1.1.3.tar.gz 126613 BLAKE2B 6b1013c2544f8795a4d054c6807cc2a2c51d03547f0d404def311d7edde9891f27ca1a249bef90e10f129a85f0dea489e1fc933b4c5f3bd8213c3428dba588d2 SHA512 b3e1f6bc9196b6c70476a7b656fb3dc4d398cd033d223b436d50676f228b62b561075787df36b880b7b4eb7de677da19d3e597752f88f279279b8569cc865a5f
+DIST ca-bundle-1.2.11.tar.gz 124268 BLAKE2B 537128647522c00a8ab3d445bfcc27648c4257a9f9ed82d489e4a2324d3123db86c1eba311b723f1bfcb6271223c7c36ad43863b5fd7c3f18ce0c92e7e064555 SHA512 96cbeb00a6770ada746288e01359bf2865cf8bbf80bca64d666b6c18b7103185b18a4c343bd170495576d871b37c5b59f334124f827658b6065462f7946554ff
diff --git a/dev-php/ca-bundle/ca-bundle-1.2.11.ebuild b/dev-php/ca-bundle/ca-bundle-1.2.11.ebuild
new file mode 100644
index 000000000000..d430bcbd1dd5
--- /dev/null
+++ b/dev-php/ca-bundle/ca-bundle-1.2.11.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Find the system CA bundle or fall back to the Mozilla one"
+HOMEPAGE="https://github.com/composer/ca-bundle"
+SRC_URI="https://github.com/composer/ca-bundle/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+RDEPEND="
+ dev-lang/php:*
+ dev-php/fedora-autoloader"
+
+src_install() {
+ insinto /usr/share/php/Composer/CaBundle
+ doins src/CaBundle.php "${FILESDIR}/autoload.php"
+ dodoc README.md
+}
diff --git a/dev-php/ca-bundle/metadata.xml b/dev-php/ca-bundle/metadata.xml
index c95ddcd36f8d..dbe7e3cd77e9 100644
--- a/dev-php/ca-bundle/metadata.xml
+++ b/dev-php/ca-bundle/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person" proxied="yes">
<email>guillaumeseren@gmail.com</email>
diff --git a/dev-php/cli-prompt/metadata.xml b/dev-php/cli-prompt/metadata.xml
index 681ed26c3908..2dbbca79baa7 100644
--- a/dev-php/cli-prompt/metadata.xml
+++ b/dev-php/cli-prompt/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person" proxied="yes">
<email>guillaumeseren@gmail.com</email>
diff --git a/dev-php/composer/Manifest b/dev-php/composer/Manifest
index 065434653c97..85b0a4b68b5f 100644
--- a/dev-php/composer/Manifest
+++ b/dev-php/composer/Manifest
@@ -5,3 +5,6 @@ DIST composer-2.1.1.tar.gz 513391 BLAKE2B 9177eb7d1acfb3557dde0382e0d0b6fd367a16
DIST composer-2.1.2.tar.gz 513790 BLAKE2B cc1c807ae4d69537541acf3ec384dbad64bf3196067c5ad016b03903e9b47460a6757c0fe692600f3042650c030b323f0a0b5ef4c3933049899843cbdc8266dc SHA512 1835daeb943af2ff58e5f5b3966b59356c14ac740689779c05fa0021174a7d0ac2a45aae7f54fade0695ca7eedf59f7ac4c9c14ae4aa1e4a5fbfb1650aae8ca9
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
+DIST composer-2.1.9.tar.gz 523638 BLAKE2B fa5d9ce1d2bc65a8c92f9651f7b4fe4455d16d39798e79f43027f2617bd5d7245399f5a9bb772ff8fc64f055919836a5c575c7d0452657544495da547dbad447 SHA512 38377bde788443df234e2893efec90705dae0d4b7ee3b00f60c156e6471ba4c98c8ee64709ee1a06315702129dd716904f02439206a0a023ac2142359c6765cc
diff --git a/dev-php/composer/composer-1.10.22.ebuild b/dev-php/composer/composer-1.10.22-r1.ebuild
index d8c51c550e91..6d92252702fa 100644
--- a/dev-php/composer/composer-1.10.22.ebuild
+++ b/dev-php/composer/composer-1.10.22-r1.ebuild
@@ -21,7 +21,7 @@ RDEPEND="
>=dev-php/json-schema-5.2.10
>=dev-php/jsonlint-1.7.1
>=dev-php/phar-utils-1.0.1
- >=dev-php/semver-1.4.2
+ <dev-php/semver-3.0
>=dev-php/spdx-licenses-1.5.0
>=dev-php/symfony-console-2.8.48
>=dev-php/symfony-filesystem-2.8.48
diff --git a/dev-php/composer/composer-2.1.6.ebuild b/dev-php/composer/composer-2.1.6.ebuild
new file mode 100644
index 000000000000..1dd769c75b17
--- /dev/null
+++ b/dev-php/composer/composer-2.1.6.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+DESCRIPTION="Dependency Manager for PHP"
+HOMEPAGE="https://github.com/composer/composer"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+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/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/composer/composer-2.1.9.ebuild b/dev-php/composer/composer-2.1.9.ebuild
new file mode 100644
index 000000000000..1eb058b7a474
--- /dev/null
+++ b/dev-php/composer/composer-2.1.9.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/composer/metadata.xml b/dev-php/composer/metadata.xml
index 1cb173ff9a86..129c05e88ac9 100644
--- a/dev-php/composer/metadata.xml
+++ b/dev-php/composer/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person" proxied="yes">
<email>guillaumeseren@gmail.com</email>
diff --git a/dev-php/cphplib/metadata.xml b/dev-php/cphplib/metadata.xml
index ed619841de95..86a21b212527 100644
--- a/dev-php/cphplib/metadata.xml
+++ b/dev-php/cphplib/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/doctrine-instantiator/metadata.xml b/dev-php/doctrine-instantiator/metadata.xml
index 75fefe8c5c64..57e43c1d0f55 100644
--- a/dev-php/doctrine-instantiator/metadata.xml
+++ b/dev-php/doctrine-instantiator/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/doctrine/metadata.xml b/dev-php/doctrine/metadata.xml
index 938c67e8b180..5bc3fb21cbc5 100644
--- a/dev-php/doctrine/metadata.xml
+++ b/dev-php/doctrine/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/fedora-autoloader/metadata.xml b/dev-php/fedora-autoloader/metadata.xml
index abb6b8880a1a..565cdde98c8f 100644
--- a/dev-php/fedora-autoloader/metadata.xml
+++ b/dev-php/fedora-autoloader/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person" proxied="yes">
<email>guillaumeseren@gmail.com</email>
diff --git a/dev-php/geos-php/metadata.xml b/dev-php/geos-php/metadata.xml
index b86acf66c756..222c77f3742a 100644
--- a/dev-php/geos-php/metadata.xml
+++ b/dev-php/geos-php/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/igbinary/Manifest b/dev-php/igbinary/Manifest
index 569928310d92..c7c39923bb80 100644
--- a/dev-php/igbinary/Manifest
+++ b/dev-php/igbinary/Manifest
@@ -1,5 +1 @@
-DIST igbinary-3.1.5.tar.gz 216569 BLAKE2B 3aa453fc0669c331202f38d41a80fa34332033d272a7b6e523988923d84a1e93967e4d588ac32d4a2ac3ed5d0bc832bf0380293604f67350557628ecbcded91a SHA512 af0e473673e624635cad44a6f34aa2e4d655e8f2dc3df8a9e0cf9b241ef1f53c627edb508b5bb41c7f8925c2256a4a4d0b4c083227564212cb7747a810dfc83d
-DIST igbinary-3.1.6.tar.gz 220415 BLAKE2B 62bc77d5b3ecbccb9e928e30f33a598630d3ee9f394f4e78c0978b316d4dbc29656f98773e9ff6bd6b9cd4961f4e00c6c760b1a07234849736d4e0d9e3199d5b SHA512 55f7fd1a6e2a422cf04e944c4c15126167c4aab6d4f5f1e6af8be6c345ec6ff0c25d7ea8c023062bdd4882484cede155ea7a598666e4616985873a32a0a272d1
-DIST igbinary-3.2.1.tar.gz 227265 BLAKE2B 4eda60b49a2f1e3e822a0fbff8f23cd546517a51193f0f4f2d4646f99888552aad1877f80a67f0d655e0a51771c539efe5b0d8b5c8ce7d88c8403305dc7570df SHA512 fdab404eb6ab8e64c0d3b92c1c12e796a182a90084acc78a31a31dece62075d310d298c545d149d10b188f0467108a0429ee750747e073fa7fba752162b64eb4
-DIST igbinary-3.2.2.tar.gz 242955 BLAKE2B 479f1b79c84b3979659a1d596f78345e6c75e9444971b547e8f1a3fe9b4aec3ba321d7a325b734f069fb1d4cb0b5c4ea5ae6586d5e50026698dc6aaa2e972bbd SHA512 d9fd460e6d62c8ca86de0e99681714ae45b2f7c66ff76279cd376582f9e8e932e8fa0ee37c25fde82390643a543fefc3ba5cbf181d5ffa31a3ab8301c092e0ff
-DIST igbinary-3.2.4.tar.gz 245458 BLAKE2B f52f01ace2c24b9bc0c64b3421609ff390e10c1825e09b2bc7a294e902975988e4e9c658e87404f496d63701fc98c7aa2626ce3bb88871f429d7cda6b96092b9 SHA512 0f1d482f4615f8ec9b269d74e48f6b74b0e276b237a190e40ffc643afd6129d9e01be3375864e6e0be1b9666a75ca0e2a6a2dbf571384bfdffe497316168da78
+DIST igbinary-3.2.6.tar.gz 245899 BLAKE2B 05fd24a640ab9e1f2402645bf322b0a959be69c068ff203552f2806240d8504f1ff3c7b209d9b050ba7815a90bcec2aab823a24a2a2a1cc149da90d25166f18a SHA512 b6c9e7b68716052d93a8535af4666fa3d5b4071bc181819cdc0ecd7f8e1c099001905ff2134eec6343daa77102a423ad0903f8800808c30806d3cb7faa4c7a06
diff --git a/dev-php/igbinary/igbinary-3.1.5.ebuild b/dev-php/igbinary/igbinary-3.1.5.ebuild
deleted file mode 100644
index e56a7b7ca346..000000000000
--- a/dev-php/igbinary/igbinary-3.1.5.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PHP_EXT_NAME="${PN}"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-DOCS=( CREDITS NEWS README.md )
-PHP_EXT_ECONF_ARGS=( --enable-${PN} )
-
-USE_PHP="php7-1 php7-2 php7-3 php7-4"
-
-inherit php-ext-source-r3
-
-KEYWORDS="amd64 ~arm ~arm64 x86"
-
-DESCRIPTION="A fast drop-in replacement for the standard PHP serialize"
-HOMEPAGE="https://github.com/igbinary/igbinary"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-#IUSE=""
-
-#DEPEND=""
-#RDEPEND=""
diff --git a/dev-php/igbinary/igbinary-3.1.6-r1.ebuild b/dev-php/igbinary/igbinary-3.1.6-r1.ebuild
deleted file mode 100644
index 49b4f02bfb38..000000000000
--- a/dev-php/igbinary/igbinary-3.1.6-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PHP_EXT_NAME="${PN}"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-DOCS=( CREDITS NEWS README.md )
-PHP_EXT_ECONF_ARGS=( --enable-${PN} )
-
-USE_PHP="php7-2 php7-3 php7-4 php8-0"
-
-inherit php-ext-source-r3
-
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-DESCRIPTION="A fast drop-in replacement for the standard PHP serialize"
-HOMEPAGE="https://github.com/igbinary/igbinary"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-#IUSE=""
-
-#DEPEND=""
-#RDEPEND=""
diff --git a/dev-php/igbinary/igbinary-3.1.6.ebuild b/dev-php/igbinary/igbinary-3.1.6.ebuild
deleted file mode 100644
index 579c0d91867e..000000000000
--- a/dev-php/igbinary/igbinary-3.1.6.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PHP_EXT_NAME="${PN}"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-DOCS=( CREDITS NEWS README.md )
-PHP_EXT_ECONF_ARGS=( --enable-${PN} )
-
-USE_PHP="php7-1 php7-2 php7-3 php7-4"
-
-inherit php-ext-source-r3
-
-KEYWORDS="amd64 arm arm64 x86"
-
-DESCRIPTION="A fast drop-in replacement for the standard PHP serialize"
-HOMEPAGE="https://github.com/igbinary/igbinary"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-#IUSE=""
-
-#DEPEND=""
-#RDEPEND=""
diff --git a/dev-php/igbinary/igbinary-3.2.1.ebuild b/dev-php/igbinary/igbinary-3.2.1.ebuild
deleted file mode 100644
index 8dbeefb1a06f..000000000000
--- a/dev-php/igbinary/igbinary-3.2.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PHP_EXT_NAME="${PN}"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-DOCS=( CREDITS NEWS README.md )
-PHP_EXT_ECONF_ARGS=( --enable-${PN} )
-
-USE_PHP="php7-3 php7-4 php8-0"
-
-inherit php-ext-source-r3
-
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-DESCRIPTION="A fast drop-in replacement for the standard PHP serialize"
-HOMEPAGE="https://github.com/igbinary/igbinary"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
diff --git a/dev-php/igbinary/igbinary-3.2.2.ebuild b/dev-php/igbinary/igbinary-3.2.2.ebuild
deleted file mode 100644
index a4b536d340b9..000000000000
--- a/dev-php/igbinary/igbinary-3.2.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
-PHP_EXT_NAME="${PN}"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-DOCS=( CREDITS NEWS README.md )
-PHP_EXT_ECONF_ARGS=( --enable-${PN} )
-
-USE_PHP="php7-3 php7-4 php8-0"
-
-inherit php-ext-source-r3
-
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-DESCRIPTION="A fast drop-in replacement for the standard PHP serialize"
-HOMEPAGE="https://github.com/igbinary/igbinary"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
diff --git a/dev-php/igbinary/igbinary-3.2.4.ebuild b/dev-php/igbinary/igbinary-3.2.6.ebuild
index a4b536d340b9..c3306aa89d1c 100644
--- a/dev-php/igbinary/igbinary-3.2.4.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/igbinary/metadata.xml b/dev-php/igbinary/metadata.xml
index aa78522f3ec0..7aef975ec07d 100644
--- a/dev-php/igbinary/metadata.xml
+++ b/dev-php/igbinary/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/jpgraph/metadata.xml b/dev-php/jpgraph/metadata.xml
index b86acf66c756..222c77f3742a 100644
--- a/dev-php/jpgraph/metadata.xml
+++ b/dev-php/jpgraph/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/json-schema/metadata.xml b/dev-php/json-schema/metadata.xml
index a7c4a1c3879c..f9f1da4f17f5 100644
--- a/dev-php/json-schema/metadata.xml
+++ b/dev-php/json-schema/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person" proxied="yes">
<email>guillaumeseren@gmail.com</email>
diff --git a/dev-php/jsonlint/metadata.xml b/dev-php/jsonlint/metadata.xml
index 99bc258e7da3..bcfe56f9986c 100644
--- a/dev-php/jsonlint/metadata.xml
+++ b/dev-php/jsonlint/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person" proxied="yes">
<email>guillaumeseren@gmail.com</email>
diff --git a/dev-php/libchart/metadata.xml b/dev-php/libchart/metadata.xml
index fb6b9991bc6b..ba48139d30db 100644
--- a/dev-php/libchart/metadata.xml
+++ b/dev-php/libchart/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/libvirt-php/metadata.xml b/dev-php/libvirt-php/metadata.xml
index 5fb3e7c1f33e..77a2a28f5074 100644
--- a/dev-php/libvirt-php/metadata.xml
+++ b/dev-php/libvirt-php/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>virtualization@gentoo.org</email>
diff --git a/dev-php/maxmind-db-reader/Manifest b/dev-php/maxmind-db-reader/Manifest
index d1eea850d39e..f4cf7f13f7a2 100644
--- a/dev-php/maxmind-db-reader/Manifest
+++ b/dev-php/maxmind-db-reader/Manifest
@@ -1 +1,2 @@
+DIST MaxMind-DB-Reader-php-1.10.1.tar.gz 23083 BLAKE2B f6684b07a184c4db7feebd9bf6b9afdc34c3de3b62bed59b2d01e1751eb996442d769576fbaa48e2bfa0572e80b2e0491d16d1cd9d89d35ca329e6dc17f74765 SHA512 841a03cf043ee0557e2157daee50d7f73211f5e665436eca8be6067d5357205093e40bb0402248fd6881d0d330feac96b298ec18763b8cb7d6d6392d54c59265
DIST MaxMind-DB-Reader-php-1.6.0.tar.gz 20898 BLAKE2B cf6922bbd5b2c76fcb9b7a97299f0a73232686bf8facce39355f8a4cc55e98a4d8e64a51eae8427b5f14d6905d4cd85956effa5299cc493bd63708cf52ab30d0 SHA512 e8c0ccf2cfcedf7527b4e3f858d2ed0e70add60692fff4a65f08e5cb885516b7c2a3ceaa3c21713369cd8ffca2b671d764063236de1d729cfc5173f7d5dd4607
diff --git a/dev-php/maxmind-db-reader/maxmind-db-reader-1.10.1.ebuild b/dev-php/maxmind-db-reader/maxmind-db-reader-1.10.1.ebuild
new file mode 100644
index 000000000000..509cad6088ee
--- /dev/null
+++ b/dev-php/maxmind-db-reader/maxmind-db-reader-1.10.1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+MY_PN="MaxMind-DB-Reader-php"
+MY_P="${MY_PN}-${PV}"
+S="${WORKDIR}/${MY_P}"
+PHP_EXT_S="${S}/ext"
+PHP_EXT_NAME="maxminddb"
+PHP_EXT_OPTIONAL_USE="extension"
+
+USE_PHP="php7-3 php7-4 php8-0"
+
+inherit php-ext-source-r3
+
+DESCRIPTION="PHP reader for the MaxMind database format"
+HOMEPAGE="https://github.com/maxmind/MaxMind-DB-Reader-php"
+SRC_URI="https://github.com/maxmind/${MY_PN}/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="extension test"
+RESTRICT="!test? ( test )"
+
+DEPEND="extension? ( dev-libs/libmaxminddb )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+ # We need to call eapply_user ourselves, because it may be skipped
+ # if either the "extension" USE flag is not set, or if the user's
+ # PHP_TARGETS is essentially empty. In the latter case, the eclass
+ # src_prepare does nothing. We only call the eclass phase conditionally
+ # because the correct version of e.g. "phpize" may not be there
+ # unless USE=extension is set.
+ if use extension ; then
+ php-ext-source-r3_src_prepare
+ else
+ default
+ fi
+}
+
+src_configure() {
+ # The eclass phase will try to run the ./configure script even if it
+ # doesn't exist (in contrast to the default src_configure), so we
+ # need to skip it if the eclass src_prepare (that creates said
+ # script) is not run.
+ use extension && php-ext-source-r3_src_configure
+}
+
+src_compile() {
+ # Avoids the same problem as in src_configure.
+ use extension && php-ext-source-r3_src_compile
+}
+
+src_install() {
+ dodoc CHANGELOG.md README.md
+ insinto /usr/share/php
+ doins -r src/MaxMind
+ insinto /usr/share/php/MaxMind/Db
+ doins autoload.php
+
+ use extension && php-ext-source-r3_src_install
+}
+
+src_test() {
+ # The PHP API has its own set of tests that isn't shipped with the
+ # release tarballs at the moment (github issues 55).
+ use extension && php-ext-source-r3_src_test
+}
+
+pkg_postinst() {
+ elog "${PN} has been installed in /usr/share/php/MaxMind/Db/."
+ elog "To use it in a script, require('MaxMind/Db/autoload.php'),"
+ elog "and then most of the examples in the documentation should"
+ elog "work without further modification."
+}
diff --git a/dev-php/maxmind-db-reader/metadata.xml b/dev-php/maxmind-db-reader/metadata.xml
index 329d808d30df..f74314c43c0c 100644
--- a/dev-php/maxmind-db-reader/metadata.xml
+++ b/dev-php/maxmind-db-reader/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/metadata-minifier/metadata.xml b/dev-php/metadata-minifier/metadata.xml
index ce3c65e2b568..dcc8f0b4c363 100644
--- a/dev-php/metadata-minifier/metadata.xml
+++ b/dev-php/metadata-minifier/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/metadata.xml b/dev-php/metadata.xml
index 6ef3359ac60f..c394a45191bf 100644
--- a/dev-php/metadata.xml
+++ b/dev-php/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE catmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<catmetadata>
<longdescription lang="en">
The dev-php category contains libraries and utilities relevant to the
diff --git a/dev-php/mmslib/metadata.xml b/dev-php/mmslib/metadata.xml
index b86acf66c756..222c77f3742a 100644
--- a/dev-php/mmslib/metadata.xml
+++ b/dev-php/mmslib/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/mockery/metadata.xml b/dev-php/mockery/metadata.xml
index 03bef7dd7fdf..14d2be183b00 100644
--- a/dev-php/mockery/metadata.xml
+++ b/dev-php/mockery/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/myclabs-deepcopy/metadata.xml b/dev-php/myclabs-deepcopy/metadata.xml
index 96b9e4bda654..bdecf9f175f6 100644
--- a/dev-php/myclabs-deepcopy/metadata.xml
+++ b/dev-php/myclabs-deepcopy/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/onphp/metadata.xml b/dev-php/onphp/metadata.xml
index b86acf66c756..222c77f3742a 100644
--- a/dev-php/onphp/metadata.xml
+++ b/dev-php/onphp/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/pear/metadata.xml b/dev-php/pear/metadata.xml
index eba2ca288cb5..3b1963efeb6f 100644
--- a/dev-php/pear/metadata.xml
+++ b/dev-php/pear/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/pecl-amqp/metadata.xml b/dev-php/pecl-amqp/metadata.xml
index b86acf66c756..222c77f3742a 100644
--- a/dev-php/pecl-amqp/metadata.xml
+++ b/dev-php/pecl-amqp/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/pecl-apcu/Manifest b/dev-php/pecl-apcu/Manifest
index fdb813bf4adf..effbc39b4daf 100644
--- a/dev-php/pecl-apcu/Manifest
+++ b/dev-php/pecl-apcu/Manifest
@@ -1,2 +1,3 @@
DIST apcu-5.1.19.tgz 96583 BLAKE2B 330c08a4e557691d0b402111877b3caf56b211256db17cce52a76aeefce7237505eca4ecd71f3770ef3c405182a1604a92cc458cb9bca435b42370fe917e21a7 SHA512 45077e3bd0eac207539e2eafe21968c71f49b8c8920168dbafa87961b041f1d348b6bf1c130104744bc541e1f690854f0a29062e9520db81c04edeee3ef2ed99
DIST apcu-5.1.20.tgz 96727 BLAKE2B b8223856e0aaa52f90dffa674bbd9b047caa8c91d81b637eafc2f59fbbfdfe0d6ce30e990a87cb4833e895fcfd944f7d57eb6f7356b3e2361d6be5a535bb3a63 SHA512 3e10b7e5dc7481b1250610ef83954875f427b9114d6b232bad9064fc33d8c8906bcc317f94a6cfc9f76c720fa06a44270d259cf2ceef6c1ec9dcadc49254ee1b
+DIST apcu-5.1.21.tgz 92516 BLAKE2B 32d73b89bde9ef4eb01c9ad766930e87300b86776c95929607a8aaefba5043e3a7947d064416ac083ff38876fdb41bb03dab1552ac000082e54f809269b4c925 SHA512 a6ffe8349760d27cde0d86017a59a68e9639bf385e606622d807094f4e5fb305bb25b9ce00077d0856f4d223d44329f7a6314c229b62c78d8e2b085593c92bb3
diff --git a/dev-php/pecl-apcu/metadata.xml b/dev-php/pecl-apcu/metadata.xml
index 6344b62d774f..f7a831c66d81 100644
--- a/dev-php/pecl-apcu/metadata.xml
+++ b/dev-php/pecl-apcu/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/pecl-apcu/pecl-apcu-5.1.21.ebuild b/dev-php/pecl-apcu/pecl-apcu-5.1.21.ebuild
new file mode 100644
index 000000000000..525f58c9e981
--- /dev/null
+++ b/dev-php/pecl-apcu/pecl-apcu-5.1.21.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PHP_EXT_NAME="apcu"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+DOCS=( NOTICE README.md TECHNOTES.txt )
+
+USE_PHP="php7-2 php7-3 php7-4 php8-0 php8-1"
+
+inherit php-ext-pecl-r3
+
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+DESCRIPTION="Stripped down version of APC supporting only user cache"
+LICENSE="PHP-3.01"
+SLOT="7"
+
+LOCKS="pthreadmutex pthreadrw spinlock semaphore"
+
+LUSE=""
+for l in ${LOCKS}; do
+ LUSE+="lock-${l} "
+done
+
+IUSE="+mmap ${LUSE/lock-pthreadrw/+lock-pthreadrw}"
+
+REQUIRED_USE="^^ ( $LUSE )"
+
+src_prepare() {
+ php-ext-source-r3_src_prepare
+ # Remove broken tests from php 7.4 due to trivial output differences
+ if use php_targets_php7-4 ; then
+ php_init_slot_env "php7.4"
+ rm "${PHP_EXT_S}"/tests/apc_entry_00{2,3}.phpt || die
+ fi
+}
+
+src_configure() {
+ local PHP_EXT_ECONF_ARGS=(
+ --enable-apcu
+ $(use_enable mmap apcu-mmap)
+ $(use_enable lock-spinlock apcu-spinlocks)
+ )
+ # Broken upstream autoconf test disables if present at all
+ use lock-pthreadrw || PHP_EXT_ECONF_ARGS+=( --disable-apcu-rwlocks )
+
+ php-ext-source-r3_src_configure
+}
+
+src_install() {
+ php-ext-pecl-r3_src_install
+
+ insinto /usr/share/php7/apcu
+ doins apc.php
+}
+
+pkg_postinst() {
+ elog "The apc.php file shipped with this release of pecl-apcu was"
+ elog "installed to ${EPREFIX}/usr/share/php7/apcu/."
+ elog
+ elog "If you depend on the apc_* functions,"
+ elog "please install dev-php/pecl-apcu_bc as this extension no longer"
+ elog "provides backwards compatibility."
+}
diff --git a/dev-php/pecl-apcu_bc/metadata.xml b/dev-php/pecl-apcu_bc/metadata.xml
index b86acf66c756..222c77f3742a 100644
--- a/dev-php/pecl-apcu_bc/metadata.xml
+++ b/dev-php/pecl-apcu_bc/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/pecl-crack/metadata.xml b/dev-php/pecl-crack/metadata.xml
index b86acf66c756..222c77f3742a 100644
--- a/dev-php/pecl-crack/metadata.xml
+++ b/dev-php/pecl-crack/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/pecl-dbase/metadata.xml b/dev-php/pecl-dbase/metadata.xml
index b86acf66c756..222c77f3742a 100644
--- a/dev-php/pecl-dbase/metadata.xml
+++ b/dev-php/pecl-dbase/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/pecl-dio/metadata.xml b/dev-php/pecl-dio/metadata.xml
index aca42932b833..77793b997e9e 100644
--- a/dev-php/pecl-dio/metadata.xml
+++ b/dev-php/pecl-dio/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/pecl-eio/Manifest b/dev-php/pecl-eio/Manifest
index a7cfe5a8314e..e394309ac89c 100644
--- a/dev-php/pecl-eio/Manifest
+++ b/dev-php/pecl-eio/Manifest
@@ -1 +1,2 @@
DIST eio-2.0.4.tgz 74118 BLAKE2B 0228f0ca91ed6410614242e7ea1ddadaa1d1aa8211b3ea6f730c0711e4339bc158d661c5addee685d750a51e654874d35a04cf011d2a02ad06ab3f249b893753 SHA512 a74464752af5792c527b9149a7edff574952cac0b5b09e1e7ff3b7c0a2cc88ab171d916d94d508b9f92aa40bd5262a5b9f8d4ba239908f13ebcb89c6513da4d0
+DIST eio-3.0.0RC2.tgz 89591 BLAKE2B 7923f8715870cfd744148980e3ad6de8373384d85e45abc687be2cde22fd425a33b8c80fbd1226e23dbac417533826dfbf639fed751bfc2a88e118750e38d626 SHA512 23e7d88720222ac3f58015ba140e3338e100cf72cf64276fd7e0f0d63a5e50f878ab0a4a742eac7b51484c56ee438fcc3f7cbf7b1da5db44e0178a5098a4a6ae
diff --git a/dev-php/pecl-eio/metadata.xml b/dev-php/pecl-eio/metadata.xml
index a7f2cca502fe..bc93b0c7f4f9 100644
--- a/dev-php/pecl-eio/metadata.xml
+++ b/dev-php/pecl-eio/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person" proxied="yes">
<email>rrosmanov@gmail.com</email>
diff --git a/dev-php/pecl-eio/pecl-eio-3.0.0_rc2.ebuild b/dev-php/pecl-eio/pecl-eio-3.0.0_rc2.ebuild
new file mode 100644
index 000000000000..32a585eab37d
--- /dev/null
+++ b/dev-php/pecl-eio/pecl-eio-3.0.0_rc2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+MY_PN="${PN/pecl-}"
+MY_PV="${PV/_rc/RC}"
+MY_P="${MY_PN}-${MY_PV}"
+PHP_EXT_NAME="eio"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+PHP_EXT_PECL_FILENAME="${MY_P}.tgz"
+PHP_EXT_S="${WORKDIR}/${MY_P}"
+DOCS=( README.md )
+
+USE_PHP="php7-3 php7-4 php8-0"
+inherit php-ext-pecl-r3
+
+KEYWORDS="~amd64 ~x86"
+LICENSE="PHP-3.01"
+
+DESCRIPTION="PHP wrapper for libeio library"
+LICENSE="PHP-3"
+SLOT="0"
+IUSE="debug"
+
+S="${PHP_EXT_S}"
+
+src_configure() {
+ local PHP_EXT_ECONF_ARGS=("--with-eio" "$(use_enable debug eio-debug)" )
+ php-ext-source-r3_src_configure
+}
diff --git a/dev-php/pecl-event/metadata.xml b/dev-php/pecl-event/metadata.xml
index 34450cf3ba65..e88266cbe688 100644
--- a/dev-php/pecl-event/metadata.xml
+++ b/dev-php/pecl-event/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person" proxied="yes">
<email>rrosmanov@gmail.com</email>
diff --git a/dev-php/pecl-geoip/metadata.xml b/dev-php/pecl-geoip/metadata.xml
index b86acf66c756..222c77f3742a 100644
--- a/dev-php/pecl-geoip/metadata.xml
+++ b/dev-php/pecl-geoip/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/pecl-gnupg/Manifest b/dev-php/pecl-gnupg/Manifest
index 064537d02bec..b025f810f9b7 100644
--- a/dev-php/pecl-gnupg/Manifest
+++ b/dev-php/pecl-gnupg/Manifest
@@ -1,2 +1 @@
-DIST gnupg-1.4.0.tgz 28349 BLAKE2B d023746b104db38bcf7617d79570aa3c38d318879d34b1d4df7fc0c28b4e435deadc2a1a4827922cc14a8068b578896e297c8fe8461afebd2768ffb63ddc502d SHA512 70fa1d2956bc5caedbeadf556f9f40a7b963d3b519d6574b0c7695d9fb4c7f9d612306f475a90a1125661407c11de97040e54b158f38d71f239c1fe436d48018
DIST gnupg-1.5.0.tgz 37045 BLAKE2B 61031a493fc460b102c0a2e831e7523c4eeafc203d51a40d8aa902992740d96e3f1f46437a51a65dceefa283845d00d0b39db90163b7901a29cd133ddfc34d7c SHA512 1b4f9a39a2c585c5f8d749f8e2e2256d9765480ef8ef93c24c538b2f1284dacf8e9f71a42f96fa3150ace1a6ff37256a7a849f29a3e57332fe3b05656e4199cc
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/metadata.xml b/dev-php/pecl-gnupg/metadata.xml
index aca42932b833..77793b997e9e 100644
--- a/dev-php/pecl-gnupg/metadata.xml
+++ b/dev-php/pecl-gnupg/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
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 dc929ad0735f..c4cb9ac5c0cf 100644
--- a/dev-php/pecl-http/Manifest
+++ b/dev-php/pecl-http/Manifest
@@ -1,4 +1,3 @@
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
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..2f3a7c73a240
--- /dev/null
+++ b/dev-php/pecl-http/files/pecl-http-3.2.4-curl-cookies.patch
@@ -0,0 +1,242 @@
+diff --git a/autoconf/pecl/libbrotli.m4 b/autoconf/pecl/libbrotli.m4
+index f8916e2..575f635 100644
+--- a/autoconf/pecl/libbrotli.m4
++++ b/autoconf/pecl/libbrotli.m4
+@@ -1,5 +1,11 @@
+
+ AC_DEFUN([PECL_CHECK_LIBBROTLI], [
++ dnl config.m4 calls PECL_CHECK_DONE once more
++ PECL_COUNT_CHECKS([+1])
++ PECL_SAVE_ENV([CPPFLAGS], [libbrotli])
++ PECL_SAVE_ENV([LDFLAGS], [libbrotli])
++ PECL_SAVE_ENV([LIBS], [libbrotli])
++
+ PECL_CHECK_LIBBROTLI_COMMON([$1], [$2])
+ PECL_CHECK_DONE(libbrotlicommon, [$PECL_VAR([HAVE_LIBBROTLI_COMMON])])
+ PECL_CHECK_LIBBROTLI_DEC([$1], [$2])
+diff --git a/autoconf/pecl/libcurl.m4 b/autoconf/pecl/libcurl.m4
+index 4d99207..8de9499 100644
+--- a/autoconf/pecl/libcurl.m4
++++ b/autoconf/pecl/libcurl.m4
+@@ -160,6 +160,26 @@ AC_DEFUN([PECL_HAVE_LIBCURL_SSL], [dnl
+ fi
+ fi
+ ])
++
++ PECL_HAVE_CONST([curl/curl.h], [CURL_LOCK_DATA_SSL_SESSION], int, [
++ AC_CACHE_CHECK([whether curl_share accepts CURL_LOCK_DATA_SSL_SESSION], PECL_CACHE_VAR([LIBCURL_SHARE_SSL]), [
++ PECL_CACHE_VAR([LIBCURL_SHARE_SSL])=
++ AC_TRY_RUN([
++ #include <curl/curl.h>
++ int main(int argc, char *argv[]) {
++ CURLSH *ch = curl_share_init();
++ return curl_share_setopt(ch, CURLSHOPT_SHARE, CURL_LOCK_DATA_SSL_SESSION);
++ }
++ ], [
++ PECL_CACHE_VAR([LIBCURL_SHARE_SSL])=yes
++ ], [
++ PECL_CACHE_VAR([LIBCURL_SHARE_SSL])=no
++ ])
++ ])
++ if test "$PECL_CACHE_VAR([LIBCURL_SHARE_SSL])" = yes; then
++ PECL_DEFINE([HAVE_LIBCURL_SHARE_SSL], [1])
++ fi
++ ])
+ ])
+ ])
+ dnl
+diff --git a/autoconf/pecl/pecl.m4 b/autoconf/pecl/pecl.m4
+index ffa45ac..d8735b0 100644
+--- a/autoconf/pecl/pecl.m4
++++ b/autoconf/pecl/pecl.m4
+@@ -70,6 +70,12 @@ AC_DEFUN([PECL_RESTORE_ENV], [
+ $1=$PECL_SAVE_VAR([$2_$1])
+ ])
+ dnl
++dnl PECL_COUNT_CHECKS(incdec)
++dnl
++AC_DEFUN([PECL_COUNT_CHECKS], [
++ PECL_VAR([_checks])=$(($PECL_VAR([_checks])$1))
++])
++dnl
+ dnl PECL_EVAL_LIBLINE(libline)
+ dnl
+ AC_DEFUN([PECL_EVAL_LIBLINE], [
+@@ -244,6 +250,7 @@ dnl
+ dnl PECL_CHECK_CUSTOM(name, path, header, lib, version)
+ dnl
+ AC_DEFUN([PECL_CHECK_CUSTOM], [
++ PECL_COUNT_CHECKS([+1])
+ PECL_SAVE_ENV([CPPFLAGS], [$1])
+ PECL_SAVE_ENV([LDFLAGS], [$1])
+ PECL_SAVE_ENV([LIBS], [$1])
+@@ -260,10 +267,10 @@ AC_DEFUN([PECL_CHECK_CUSTOM], [
+ done
+ ])
+ if test -n "$PECL_CACHE_VAR([$1_prefix])"; then
+- CPPFLAGS="-I$PECL_CACHE_VAR([$1_prefix])/include"
+- LDFLAGS="-L$PECL_CACHE_VAR([$1_prefix])/$PHP_LIBDIR"
+- LIBS="-l$4"
+- PECL_EVAL_LIBLINE([$LDFLAGS $LIBS])
++ CPPFLAGS="$CPPFLAGS -I$PECL_CACHE_VAR([$1_prefix])/include"
++ LDFLAGS="$LDFLAGS -L$PECL_CACHE_VAR([$1_prefix])/$PHP_LIBDIR"
++ LIBS="$LIBS -l$4"
++ dnl PECL_EVAL_LIBLINE([$LDFLAGS $LIBS])
+
+ AC_CACHE_VAL(PECL_CACHE_VAR([$1_version]), [
+ pushd $PECL_CACHE_VAR([$1_prefix]) >/dev/null
+@@ -288,11 +295,11 @@ dnl
+ dnl PECL_CHECK_CONFIG(name, prog-config, version-flag, cppflags-flag, ldflags-flag, libs-flag)
+ dnl
+ AC_DEFUN([PECL_CHECK_CONFIG], [
++ PECL_COUNT_CHECKS([+1])
+ PECL_SAVE_ENV([CPPFLAGS], [$1])
+ PECL_SAVE_ENV([LDFLAGS], [$1])
+ PECL_SAVE_ENV([LIBS], [$1])
+
+-
+ AC_MSG_CHECKING([for $1])
+ ifelse($2, [$PKG_CONFIG $1], [
+ AC_CACHE_VAL(PECL_CACHE_VAR([$1_exists]), [
+@@ -311,20 +318,22 @@ AC_DEFUN([PECL_CHECK_CONFIG], [
+ AC_CACHE_VAL(PECL_CACHE_VAR([$1_cppflags]), [
+ PECL_CACHE_VAR([$1_cppflags])=$($2 $4)
+ ])
+- CPPFLAGS=$PECL_CACHE_VAR([$1_cppflags])
++ CPPFLAGS="$CPPFLAGS $PECL_CACHE_VAR([$1_cppflags])"
+ AC_CACHE_VAL(PECL_CACHE_VAR([$1_ldflags]), [
+ PECL_CACHE_VAR([$1_ldflags])=$($2 $5)
+ ])
+- LDFLAGS=$PECL_CACHE_VAR([$1_ldflags])
++ LDFLAGS="$LDFLAGS $PECL_CACHE_VAR([$1_ldflags])"
+ AC_CACHE_VAL(PECL_CACHE_VAR([$1_libs]), [
+ PECL_CACHE_VAR([$1_libs])=$($2 $6)
+ ])
+- LIBS=$PECL_CACHE_VAR([$1_libs])
+- PECL_EVAL_LIBLINE([$LDFLAGS $LIBS])
++ LIBS="$LIBS $PECL_CACHE_VAR([$1_libs])"
++ dnl PECL_EVAL_LIBLINE([$LDFLAGS $LIBS])
+ ifelse($2, [$PKG_CONFIG $1], [
+ fi
+ ])
+
++ AC_MSG_RESULT([${PECL_CHECKED_VERSION([$1]):-no}])
++
+ if test -n "$PECL_CHECKED_VERSION([$1])"; then
+ PECL_VAR([HAVE_$1])=true
+ PECL_DEFINE([HAVE_$1])
+@@ -332,8 +341,6 @@ AC_DEFUN([PECL_CHECK_CONFIG], [
+ else
+ PECL_VAR([HAVE_$1])=false
+ fi
+-
+- AC_MSG_RESULT([${PECL_CHECKED_VERSION([$1]):-no}])
+ ])
+ dnl
+ dnl PECL_CHECK_PKGCONFIG(pkg[, additional-pkg-config-path])
+@@ -355,9 +362,25 @@ dnl
+ dnl PECL_CHECK_DONE(name, success[, incline, libline])
+ dnl
+ AC_DEFUN([PECL_CHECK_DONE], [
+- if $2; then
+- incline=$CPPFLAGS
+- libline="$LDFLAGS $LIBS"
++ PECL_COUNT_CHECKS([-1])
++ success=$2
++ if $success && test -n "$LDFLAGS$LIBS"; then
++ AC_MSG_CHECKING([whether $1 can be linked])
++ AC_TRY_LINK([], [], [success=yes], [success=no])
++ AC_MSG_RESULT([$success])
++ if ! $success; then
++ AC_MSG_WARN([$1 was found, but fails to link with:])
++ AC_MSG_WARN([ LDFLAGS='$LDFLAGS'])
++ AC_MSG_WARN([ LIBS='$LIBS'])
++ AC_MSG_WARN([Missing or updated library paths?])
++ fi
++ fi
++ if $success; then
++ _cppflags=$PECL_SAVE_VAR([$1_CPPFLAGS])
++ _ldflags=$PECL_SAVE_VAR([$1_LDFLAGS])
++ _libs=$PECL_SAVE_VAR([$1_LIBS])
++ incline=${CPPFLAGS:${#_cppflags}}
++ libline=["${LDFLAGS:${#_ldflags}} ${LIBS:${#_libs}}"]
+ PECL_DEFINE([HAVE_$1])
+ else
+ incline=$3
+diff --git a/config9.m4 b/config9.m4
+index ef7d33e..695701b 100644
+--- a/config9.m4
++++ b/config9.m4
+@@ -24,6 +24,8 @@ if test "$PHP_HTTP" != "no"; then
+ AC_CHECK_LIB(nsl, getdomainname)
+ ])
+ AC_CHECK_FUNCS(mbrtowc mbtowc iswalnum inet_pton)
++
++ CFLAGS="$CFLAGS -Wno-strict-prototypes"
+
+ dnl ZLIB
+ PHP_ARG_WITH([http-zlib-dir], [whether/where to check for zlib],
+diff --git a/src/php_http_client_curl.c b/src/php_http_client_curl.c
+index 0e79f19..8898b5d 100644
+--- a/src/php_http_client_curl.c
++++ b/src/php_http_client_curl.c
+@@ -17,6 +17,8 @@
+
+ #if PHP_HTTP_HAVE_LIBCURL
+
++#define DEBUG_COOKIES 0
++
+ #if PHP_HTTP_HAVE_LIBCURL_OPENSSL
+ # include <openssl/ssl.h>
+ #endif
+@@ -834,6 +836,9 @@ static ZEND_RESULT_CODE php_http_curle_option_set_cookiesession(php_http_option_
+ return FAILURE;
+ }
+ if (Z_TYPE_P(val) == IS_TRUE) {
++#if DEBUG_COOKIES
++ fprintf(stderr, "CURLOPT_COOKIELIST: SESS\n");
++#endif
+ if (CURLE_OK != curl_easy_setopt(ch, CURLOPT_COOKIELIST, "SESS")) {
+ return FAILURE;
+ }
+@@ -856,9 +861,19 @@ static ZEND_RESULT_CODE php_http_curle_option_set_cookiestore(php_http_option_t
+ } else {
+ storage->cookiestore = NULL;
+ }
+- if ( CURLE_OK != curl_easy_setopt(ch, CURLOPT_COOKIEFILE, storage->cookiestore)
+- || CURLE_OK != curl_easy_setopt(ch, CURLOPT_COOKIEJAR, storage->cookiestore)
+- ) {
++
++#if DEBUG_COOKIES
++ fprintf(stderr, "CURLOPT_COOKIEFILE: %s\n", cookiestore);
++#endif
++ // does NOT enable ch->data.cookies until transfer; adds to ch->stsate.cookielist
++ if (CURLE_OK != curl_easy_setopt(ch, CURLOPT_COOKIEFILE, storage->cookiestore ? storage->cookiestore : "")) {
++ return FAILURE;
++ }
++#if DEBUG_COOKIES
++ fprintf(stderr, "CURLOPT_COOKIEJAR: %s\n", cookiestore);
++#endif
++ // enables ch->data.cookies
++ if (CURLE_OK != curl_easy_setopt(ch, CURLOPT_COOKIEJAR, storage->cookiestore)) {
+ return FAILURE;
+ }
+
+@@ -1919,7 +1934,7 @@ static ZEND_RESULT_CODE php_http_curlm_option_set_share_cookies(php_http_option_
+ return SUCCESS;
+ }
+
+-#if PHP_HTTP_CURL_VERSION(7,23,0)
++#if PHP_HTTP_HAVE_LIBCURL_SHARE_SSL
+ static ZEND_RESULT_CODE php_http_curlm_option_set_share_ssl(php_http_option_t *opt, zval *value, void *userdata)
+ {
+ php_http_client_t *client = userdata;
+@@ -1994,7 +2009,7 @@ static void php_http_curlm_options_init(php_http_options_t *registry)
+ opt->setter = php_http_curlm_option_set_share_cookies;
+ ZVAL_TRUE(&opt->defval);
+ }
+-#if PHP_HTTP_CURL_VERSION(7,23,0)
++#if PHP_HTTP_HAVE_LIBCURL_SHARE_SSL
+ if ((opt = php_http_option_register(registry, ZEND_STRL("share_ssl"), 0, _IS_BOOL))) {
+ opt->setter = php_http_curlm_option_set_share_ssl;
+ ZVAL_TRUE(&opt->defval);
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/metadata.xml b/dev-php/pecl-http/metadata.xml
index b86acf66c756..222c77f3742a 100644
--- a/dev-php/pecl-http/metadata.xml
+++ b/dev-php/pecl-http/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
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 c3124c2a6a47..f5f70c74df80 100644
--- a/dev-php/pecl-imagick/Manifest
+++ b/dev-php/pecl-imagick/Manifest
@@ -1,3 +1 @@
-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
diff --git a/dev-php/pecl-imagick/metadata.xml b/dev-php/pecl-imagick/metadata.xml
index 16ca6ff90970..2dd58015e1b4 100644
--- a/dev-php/pecl-imagick/metadata.xml
+++ b/dev-php/pecl-imagick/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
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-lzf/metadata.xml b/dev-php/pecl-lzf/metadata.xml
index aca42932b833..77793b997e9e 100644
--- a/dev-php/pecl-lzf/metadata.xml
+++ b/dev-php/pecl-lzf/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/pecl-mailparse/Manifest b/dev-php/pecl-mailparse/Manifest
index e22f8ecc188b..898fc8b6cfe0 100644
--- a/dev-php/pecl-mailparse/Manifest
+++ b/dev-php/pecl-mailparse/Manifest
@@ -1 +1,2 @@
DIST mailparse-3.1.1.tgz 941192 BLAKE2B 00b5a506031cd03439e3d67172c17aeeb6af3b950694251f7654007642bf80fff3cda900fc97ba177b91ca970e47416132080793ce64d8038e7aecbf2fdaf6c0 SHA512 01ddb8d4d27a74c14f70b02b49322c60fc79affab374205fee91b9da21e5148e08dba024f6bc620e4f26c2c937675e09092c52ca69172d2f7797c3e2bf374bee
+DIST mailparse-3.1.2.tgz 941292 BLAKE2B 855d0b6d34664f090ee3fc6aaa7a260651b9e98b1237c29f66c151ff2b6d8dbbd8cad2757e202fad5a2d0a339fca1e37464a5bcfe7f12b9b1dee975f4330aa1f SHA512 f60671b2bbe09c858a5d9d27fb8ac314d98d0635eeaa682a28171f85bc71d1c9c3ab92c6931883a42619e96bfe96fdf1b43b570c5c2bc1d2b243b541fb533d24
diff --git a/dev-php/pecl-mailparse/metadata.xml b/dev-php/pecl-mailparse/metadata.xml
index b86acf66c756..222c77f3742a 100644
--- a/dev-php/pecl-mailparse/metadata.xml
+++ b/dev-php/pecl-mailparse/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/pecl-mailparse/pecl-mailparse-3.1.2.ebuild b/dev-php/pecl-mailparse/pecl-mailparse-3.1.2.ebuild
new file mode 100644
index 000000000000..29f9a2bfeb51
--- /dev/null
+++ b/dev-php/pecl-mailparse/pecl-mailparse-3.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
+
+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-mcrypt/Manifest b/dev-php/pecl-mcrypt/Manifest
index 404b1e8693f0..b6efe99f588d 100644
--- a/dev-php/pecl-mcrypt/Manifest
+++ b/dev-php/pecl-mcrypt/Manifest
@@ -1 +1,2 @@
DIST mcrypt-1.0.3.tgz 33590 BLAKE2B 5de1108f53604fffea9e3cb64d9efdae2008da164acd47b27fd0df8f12a0f508345d63bee4d588c1eecd9a935f8be3b2db5c3d119c5b3013955c54085ebe9e9f SHA512 ef215b576b471d6e1ecac4bb097f518fa57fd551b678b7fdddd9d5058f6667b0ee757e887f00b61672b89cd86f1962cbfe0e355681fa47daba9873c3bf4db679
+DIST mcrypt-1.0.4.tgz 27056 BLAKE2B 3faa77299ef1b5ab3f5a427b57d64f5f5ec54bc41f83924bfd285289c168341c0f044970fb0c37ca8561e68be165a40b2d6fd423ed6d5aa74225d5a3fb349546 SHA512 6a8244761035640366041a5f26057ab14bb85eaaa973ddf604e152b786ef750ec775ae91d7582044700d6fdef902425f3a9d6839113a52e0a9f957bf9d0c189a
diff --git a/dev-php/pecl-mcrypt/metadata.xml b/dev-php/pecl-mcrypt/metadata.xml
index 051239844a94..63821063206c 100644
--- a/dev-php/pecl-mcrypt/metadata.xml
+++ b/dev-php/pecl-mcrypt/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person" proxied="yes">
<email>hydrapolic@gmail.com</email>
diff --git a/dev-php/pecl-mcrypt/pecl-mcrypt-1.0.4.ebuild b/dev-php/pecl-mcrypt/pecl-mcrypt-1.0.4.ebuild
new file mode 100644
index 000000000000..1eeeafa5540d
--- /dev/null
+++ b/dev-php/pecl-mcrypt/pecl-mcrypt-1.0.4.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PHP_EXT_NAME="mcrypt"
+USE_PHP="php7-3 php7-4 php8-0"
+MY_P="${PN/pecl-/}-${PV/_rc/RC}"
+PHP_EXT_ECONF_ARGS=()
+PHP_EXT_PECL_FILENAME="${MY_P}.tgz"
+PHP_EXT_S="${WORKDIR}/${MY_P}"
+
+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"
+
+DEPEND="dev-libs/libmcrypt"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
diff --git a/dev-php/pecl-memcache/metadata.xml b/dev-php/pecl-memcache/metadata.xml
index b86acf66c756..222c77f3742a 100644
--- a/dev-php/pecl-memcache/metadata.xml
+++ b/dev-php/pecl-memcache/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/pecl-memcached/Manifest b/dev-php/pecl-memcached/Manifest
index 64f9f062d021..83ba15d4a4be 100644
--- a/dev-php/pecl-memcached/Manifest
+++ b/dev-php/pecl-memcached/Manifest
@@ -1 +1,2 @@
DIST memcached-3.1.5.tgz 83015 BLAKE2B 80f5cbed8e34f867962792d95d242015690f64ab3b462e09813a11b8b86234b0b05b0f6a78f7c6184482b66ba8015064b37f77bbb816a3aee2edd0ce97ab0cbc SHA512 87d5fd079fcaad81139785d6766da71b23a1a0fe907d4b22f3a787af148a20412c11df11c4d98c165241658baf0d87c8a6b29de15db07a0f9d1fabc8aec8f0e9
+DIST pecl-memcached-3.1.5_p20210807.tar.gz 99221 BLAKE2B 7a6a92701d17ce2c108cda862d52cebbae38e993e4182fd23ce78ea1cbebbdba6d46a71258b7dd388ff38f2b7b04c94ca822954ff931111fd9bfc64d578a6f26 SHA512 3c124f969efcd3bcc513e3e347828ac6e0a5540379f7d3a83c306d65a02ece3c76f87e3db52153c5d2f2c03c5fafb646f6b3b33c0b1d5afbb71ffa22d2df6f90
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
new file mode 100644
index 000000000000..08a881c182d8
--- /dev/null
+++ b/dev-php/pecl-memcached/files/3.1.5-fix-tests.patch
@@ -0,0 +1,41 @@
+--- 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--
+ <?php include dirname(dirname(__FILE__)) . "/skipif.inc";?>
++--INI--
++serialize_precision = 14
+ --FILE--
+ <?php
+ include dirname(dirname(__FILE__)) . '/config.inc';
diff --git a/dev-php/pecl-memcached/metadata.xml b/dev-php/pecl-memcached/metadata.xml
index a3a0e753fbbd..1e2cd0417c05 100644
--- a/dev-php/pecl-memcached/metadata.xml
+++ b/dev-php/pecl-memcached/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>robbat2@gentoo.org</email>
diff --git a/dev-php/pecl-memcached/pecl-memcached-3.1.5_p20210807.ebuild b/dev-php/pecl-memcached/pecl-memcached-3.1.5_p20210807.ebuild
new file mode 100644
index 000000000000..246535a68f31
--- /dev/null
+++ b/dev-php/pecl-memcached/pecl-memcached-3.1.5_p20210807.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PHP_EXT_NAME="memcached"
+DOCS=( ChangeLog README.markdown )
+
+USE_PHP="php7-3 php7-4 php8-0"
+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"
+REPO_COMMIT="9cd4a01d99b701a2c1a42799afe80635dcfecfe4"
+SRC_URI="https://github.com/php-memcached-dev/php-memcached/archive/${REPO_COMMIT}.tar.gz -> ${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(-)] )
+ )"
+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-mongodb/metadata.xml b/dev-php/pecl-mongodb/metadata.xml
index b86acf66c756..222c77f3742a 100644
--- a/dev-php/pecl-mongodb/metadata.xml
+++ b/dev-php/pecl-mongodb/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/pecl-ncurses/metadata.xml b/dev-php/pecl-ncurses/metadata.xml
index b86acf66c756..222c77f3742a 100644
--- a/dev-php/pecl-ncurses/metadata.xml
+++ b/dev-php/pecl-ncurses/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/pecl-oauth/metadata.xml b/dev-php/pecl-oauth/metadata.xml
index b86acf66c756..222c77f3742a 100644
--- a/dev-php/pecl-oauth/metadata.xml
+++ b/dev-php/pecl-oauth/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/pecl-pam/Manifest b/dev-php/pecl-pam/Manifest
index e4605a375aad..7da8caaeff39 100644
--- a/dev-php/pecl-pam/Manifest
+++ b/dev-php/pecl-pam/Manifest
@@ -1 +1,2 @@
DIST pam-1.0.3.tgz 6671 BLAKE2B f416fd0e47d3fda6a1d86e44a7ca17fc9a0428f976f18e2b663a2fd1e09b790cd069ca16d930d6dca6554762ca59bda987929e52365ed813949c1a93291c1dcc SHA512 3580582f1456b31be30a713cadaaca106527f2d4f3f12032b5d3617cc361aaf49539a9db3dd27221ce40320187abaac0f6ad4e23cdfe5eaa94436e3eaef3fb9c
+DIST pam-2.2.3.tgz 9422 BLAKE2B 4d10ad40bdfbaa54225723a46a78dbe1609d89cf75d0ca73345e3346fb437a5500e451357b3b0bbcce88c13f8a54dec5b39e9c0741a6e89c0b3936cbb05da91a SHA512 1adc72b1517e224f36f960134d3444d36e6fa5a6868ce4bc1b87edbbfb09406910774061988300094ebf637ee54c5f5a43e0c42c8e2ab78c81a0910063d48c51
diff --git a/dev-php/pecl-pam/metadata.xml b/dev-php/pecl-pam/metadata.xml
index b86acf66c756..222c77f3742a 100644
--- a/dev-php/pecl-pam/metadata.xml
+++ b/dev-php/pecl-pam/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/pecl-pam/pecl-pam-2.2.3.ebuild b/dev-php/pecl-pam/pecl-pam-2.2.3.ebuild
new file mode 100644
index 000000000000..54ba34e572c7
--- /dev/null
+++ b/dev-php/pecl-pam/pecl-pam-2.2.3.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PHP_EXT_NAME="pam"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+PHP_EXT_ECONF_ARGS=( --with-pam=/usr )
+DOCS=( README )
+
+USE_PHP="php7-3 php7-4 php8-0"
+
+inherit php-ext-pecl-r3 pam
+
+KEYWORDS="~amd64 ~x86"
+
+DESCRIPTION="This extension provides PAM (Pluggable Authentication Modules) integration"
+LICENSE="PHP-3.01"
+SLOT="0"
+IUSE=""
+
+DEPEND="sys-libs/pam"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+ #Fix DOS line endings
+ sed -i 's/\r$//' -- pam.c || die
+ php-ext-source-r3_src_prepare
+}
+
+src_install() {
+ pamd_mimic_system php auth account password
+ php-ext-pecl-r3_src_install
+}
diff --git a/dev-php/pecl-parallel/metadata.xml b/dev-php/pecl-parallel/metadata.xml
index d06f5db0340a..6aebbc46f559 100644
--- a/dev-php/pecl-parallel/metadata.xml
+++ b/dev-php/pecl-parallel/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person" proxied="yes">
<email>jaco@uls.co.za</email>
diff --git a/dev-php/pecl-propro/metadata.xml b/dev-php/pecl-propro/metadata.xml
index b86acf66c756..222c77f3742a 100644
--- a/dev-php/pecl-propro/metadata.xml
+++ b/dev-php/pecl-propro/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/pecl-ps/Manifest b/dev-php/pecl-ps/Manifest
index 80b4ba920465..ca3953c93c2d 100644
--- a/dev-php/pecl-ps/Manifest
+++ b/dev-php/pecl-ps/Manifest
@@ -1 +1,2 @@
DIST ps-1.4.1.tgz 578991 BLAKE2B 549fae78ffb6e91f39b6292d969b9b80adba1a5911fb52e99c5fcbc940b9470205556e3e11c2940fadc7cc084400bc08ae7255b79e175d705c9bacb8eb3d6e71 SHA512 e9eeb5ad1c9314af0fcfd33e461b560f6cc599a679bc0a5541994fa698e3da63b7cb523f617647bdb2ac1c8fc090263e314ddf956a1e6126f8813de92e49f3af
+DIST ps-1.4.4.tgz 637247 BLAKE2B 19dd32a2321fd53224c662e68603c7c330fcf8fe0d3e4e3d4a6e75e211c876225f1f6cf9325b117f7a3713abd87e6acfe25c4c9b0c161e6d6717f94cc90b7649 SHA512 42ab1fff661da68afb42d90dc7fb07761698f191beaf09b6dd4b2c3e7e67949ef06b2f6389738a462f58722f863c6b80f55a00a57dddc860250a4500cbfecf8b
diff --git a/dev-php/pecl-ps/files/ps-1.4.4-fix-gd-detection.patch b/dev-php/pecl-ps/files/ps-1.4.4-fix-gd-detection.patch
new file mode 100644
index 000000000000..282bc7a34106
--- /dev/null
+++ b/dev-php/pecl-ps/files/ps-1.4.4-fix-gd-detection.patch
@@ -0,0 +1,11 @@
+--- a/config.m4
++++ b/config.m4
+@@ -38,7 +38,7 @@
+ PHP_ARG_ENABLE([gd],
+ [for GD support],
+ [AS_HELP_STRING([--enable-gd],
+- [Include GD support])])
++ [Include GD support])], no, no)
+
+ if test "$PHP_GD" != "no"; then
+
diff --git a/dev-php/pecl-ps/metadata.xml b/dev-php/pecl-ps/metadata.xml
index b86acf66c756..222c77f3742a 100644
--- a/dev-php/pecl-ps/metadata.xml
+++ b/dev-php/pecl-ps/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
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
new file mode 100644
index 000000000000..34f9154d7935
--- /dev/null
+++ b/dev-php/pecl-ps/pecl-ps-1.4.1-r1.ebuild
@@ -0,0 +1,25 @@
+# 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-ps/pecl-ps-1.4.1.ebuild b/dev-php/pecl-ps/pecl-ps-1.4.1.ebuild
deleted file mode 100644
index fd04378b47c9..000000000000
--- a/dev-php/pecl-ps/pecl-ps-1.4.1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PHP_EXT_NAME="ps"
-USE_PHP="php5-6 php7-1 php7-2 php7-3 php7-4"
-
-inherit php-ext-pecl-r3
-
-# Only really build for >=7.0
-USE_PHP="php7-1 php7-2 php7-3 php7-4"
-
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-
-DESCRIPTION="PHP extension for creating PostScript files"
-LICENSE="BSD"
-SLOT="7"
-IUSE="examples"
-
-DEPEND="
- php_targets_php7-1? ( dev-libs/pslib )
- php_targets_php7-2? ( dev-libs/pslib )
- php_targets_php7-3? ( dev-libs/pslib )
- php_targets_php7-4? ( dev-libs/pslib )
-"
-RDEPEND="${DEPEND} php_targets_php5-6? ( dev-php/pecl-ps:0[php_targets_php5-6] )"
-PHP_EXT_ECONF_ARGS=""
-
-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
-}
-
-src_install() {
- if use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3 || use php_targets_php7-4 ; then
- php-ext-pecl-r3_src_install
- fi
-}
-
-src_test() {
- if use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3 || use php_targets_php7-4 ; then
- # tests/004.phpt depends on set numeric format
- LC_ALL=C php-ext-pecl-r3_src_test
- fi
-}
diff --git a/dev-php/pecl-ps/pecl-ps-1.4.4.ebuild b/dev-php/pecl-ps/pecl-ps-1.4.4.ebuild
new file mode 100644
index 000000000000..e010eda79f51
--- /dev/null
+++ b/dev-php/pecl-ps/pecl-ps-1.4.4.ebuild
@@ -0,0 +1,31 @@
+# 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 php8-0"
+PHP_EXT_NEEDED_USE="gd(-)?"
+
+inherit php-ext-pecl-r3
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+DESCRIPTION="PHP extension for creating PostScript files"
+LICENSE="BSD"
+SLOT="7"
+IUSE="examples gd"
+
+DEPEND="dev-libs/pslib gd? ( media-libs/gd:2= )"
+RDEPEND="${DEPEND}"
+PATCHES=( "${FILESDIR}/ps-1.4.4-fix-gd-detection.patch" )
+
+src_configure() {
+ PHP_EXT_ECONF_ARGS=( $(use_enable gd) )
+ php-ext-source-r3_src_configure
+}
+
+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-radius/metadata.xml b/dev-php/pecl-radius/metadata.xml
index b86acf66c756..222c77f3742a 100644
--- a/dev-php/pecl-radius/metadata.xml
+++ b/dev-php/pecl-radius/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/pecl-raphf/metadata.xml b/dev-php/pecl-raphf/metadata.xml
index b86acf66c756..222c77f3742a 100644
--- a/dev-php/pecl-raphf/metadata.xml
+++ b/dev-php/pecl-raphf/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/pecl-redis/metadata.xml b/dev-php/pecl-redis/metadata.xml
index 25557ad02e0d..381f530243d9 100644
--- a/dev-php/pecl-redis/metadata.xml
+++ b/dev-php/pecl-redis/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/pecl-rrd/Manifest b/dev-php/pecl-rrd/Manifest
index 3f9af491a776..30056a01f5e4 100644
--- a/dev-php/pecl-rrd/Manifest
+++ b/dev-php/pecl-rrd/Manifest
@@ -1 +1,2 @@
DIST rrd-2.0.1.tgz 18880 BLAKE2B c3fb65e95aece39690085830ec1c43ba173e173591215d6a66145ac71079f8d5ba5b097acd9018c86d2342550001334f8e1c98e22204d94a24aee5cc086295ca SHA512 b6f7173f54fcf49bf014cc6c78263c169cdf53dac66c12f5f88db7e01b49ea74da84a55f61deb25c866e6e2e74275ec48fc4a3d1b46719f66b5b7b7eb000b6b3
+DIST rrd-2.0.3.tgz 19178 BLAKE2B 473fe53e858665372133db9f13d9aeac330da2ca57a8fb59f0eb280f1bdd40d2f0b28179a9b150acdf15d7bbc6fb5416a82dcd670c67ad39050cbd1c5795b62e SHA512 28679ccead54806d1e92accc6f5ebab582a41db802f95797ddb43e3e15690889be3437f22e2a14939d217422ac2700ef90ae0a9b36244ddead3856343b3e09b4
diff --git a/dev-php/pecl-rrd/metadata.xml b/dev-php/pecl-rrd/metadata.xml
index b86acf66c756..222c77f3742a 100644
--- a/dev-php/pecl-rrd/metadata.xml
+++ b/dev-php/pecl-rrd/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/pecl-rrd/pecl-rrd-2.0.3.ebuild b/dev-php/pecl-rrd/pecl-rrd-2.0.3.ebuild
new file mode 100644
index 000000000000..034811552435
--- /dev/null
+++ b/dev-php/pecl-rrd/pecl-rrd-2.0.3.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+USE_PHP="php7-3 php7-4 php8-0"
+
+inherit php-ext-pecl-r3
+
+DESCRIPTION="RRDtool bindings for PHP"
+LICENSE="BSD"
+SLOT="7"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="net-analyzer/rrdtool[graph(-)]"
+RDEPEND="${DEPEND}"
+
+#PATCHES=( "${FILESDIR}/${PV}" )
+PHP_EXT_ECONF_ARGS=()
+
+src_test() {
+ local slot
+ for slot in $(php_get_slots); do
+ php_init_slot_env "${slot}"
+ # Prepare test data
+ emake -C tests/data all
+ NO_INTERACTION="yes" emake test
+ done
+}
diff --git a/dev-php/pecl-ssh2/Manifest b/dev-php/pecl-ssh2/Manifest
index 4a420e281de7..0d800ebf183e 100644
--- a/dev-php/pecl-ssh2/Manifest
+++ b/dev-php/pecl-ssh2/Manifest
@@ -1,4 +1 @@
-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
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/metadata.xml b/dev-php/pecl-ssh2/metadata.xml
index aca42932b833..77793b997e9e 100644
--- a/dev-php/pecl-ssh2/metadata.xml
+++ b/dev-php/pecl-ssh2/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
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-stomp/metadata.xml b/dev-php/pecl-stomp/metadata.xml
index b86acf66c756..222c77f3742a 100644
--- a/dev-php/pecl-stomp/metadata.xml
+++ b/dev-php/pecl-stomp/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/pecl-taint/metadata.xml b/dev-php/pecl-taint/metadata.xml
index b86acf66c756..222c77f3742a 100644
--- a/dev-php/pecl-taint/metadata.xml
+++ b/dev-php/pecl-taint/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/pecl-timezonedb/metadata.xml b/dev-php/pecl-timezonedb/metadata.xml
index aed048d4616c..d86c62cbf4bc 100644
--- a/dev-php/pecl-timezonedb/metadata.xml
+++ b/dev-php/pecl-timezonedb/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/pecl-translit/metadata.xml b/dev-php/pecl-translit/metadata.xml
index 8b3c2e229aed..15bcddfaca9f 100644
--- a/dev-php/pecl-translit/metadata.xml
+++ b/dev-php/pecl-translit/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/pecl-uploadprogress/Manifest b/dev-php/pecl-uploadprogress/Manifest
index ce8d10d0aef5..b0c3e60a90c0 100644
--- a/dev-php/pecl-uploadprogress/Manifest
+++ b/dev-php/pecl-uploadprogress/Manifest
@@ -1 +1,3 @@
DIST uploadprogress-1.1.3.tgz 14798 BLAKE2B 5edda3e8672bb0e0829d100284240fcceac26be695386225a18446c742f59edfd906a9ae2f17b594816d3cddea02eb648db01a3352d7f8bd764ad2f6b2e03628 SHA512 2202f419be852a71eadae47eaa83909a032e5a6bbe4ce17ae5d45ea4e9f6d9c9edceb2111630d1f0e277b531d463accf540288ecbcca9bf154fe01754f225686
+DIST uploadprogress-2.0.1.tgz 19459 BLAKE2B 10143285da73a2fe1854c68d5f20ac6543695ccdf47835ff16f39b69e357e2ca32d2560ca1ced9238c6d21fb29379817b8a682d6aa24bf8c83b563127d2745a9 SHA512 81c846ea6e87c7c0621c22ee903b0937d533285bd0e3195de85803321260d4562e4c598332591afc7e985da57ed9422e37ed1c2927090474ddb7ec27314f1ae0
+DIST uploadprogress-2.0.2.tgz 19969 BLAKE2B 148cac83b00eb6b4f23861a04829280346957cdfc5bdbe94d687d0efb5da97b5f48162c59b07e0830a67350c7a2aa9a3085a4575f07b32016b01845301f04843 SHA512 b9ee5a09c3de78d58abd34da2d25d7b0cad38416309a9a69192f07e0c3fe2259de261bb3dee571e64e042753f861738ebcd67fa7fafeb595ec32ed3034c773cd
diff --git a/dev-php/pecl-uploadprogress/metadata.xml b/dev-php/pecl-uploadprogress/metadata.xml
index ce710ecbb07d..bde040ec7af5 100644
--- a/dev-php/pecl-uploadprogress/metadata.xml
+++ b/dev-php/pecl-uploadprogress/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
@@ -11,8 +11,8 @@
</maintainer>
<longdescription lang="en">
An extension to track the progress of a file upload. See
- http://svn.php.net/viewvc/pecl/uploadprogress/trunk/examples/ for
- an example. It is only known to work on apache with mod_php; other
- SAPI implementations unfortunately still have issues.
+ https://github.com/php/pecl-php-uploadprogress/tree/master/examples for
+ examples. It is known to work on apache with mod_php and, beginning with 2.0,
+ php-fpm with apache and nginx; other servers and SAPIs are not known to work.
</longdescription>
</pkgmetadata>
diff --git a/dev-php/pecl-uploadprogress/pecl-uploadprogress-2.0.1.ebuild b/dev-php/pecl-uploadprogress/pecl-uploadprogress-2.0.1.ebuild
new file mode 100644
index 000000000000..6bc6174856b0
--- /dev/null
+++ b/dev-php/pecl-uploadprogress/pecl-uploadprogress-2.0.1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_PHP="php7-3 php7-4 php8-0"
+PHP_EXT_SAPIS="apache2 fpm"
+
+inherit php-ext-pecl-r3
+
+DESCRIPTION="An extension to track progress of a file upload"
+LICENSE="PHP-3.01"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples"
+
+RDEPEND="
+ php_targets_php7-3? ( || ( dev-lang/php:7.3[apache2(-),fileinfo(-)] dev-lang/php:7.3[fileinfo(-),fpm(-)] ) )
+ php_targets_php7-4? ( || ( dev-lang/php:7.4[apache2(-),fileinfo(-)] dev-lang/php:7.4[fileinfo(-),fpm(-)] ) )
+ php_targets_php8-0? ( || ( dev-lang/php:8.0[apache2(-),fileinfo(-)] dev-lang/php:8.0[fileinfo(-),fpm(-)] ) )
+"
diff --git a/dev-php/pecl-uploadprogress/pecl-uploadprogress-2.0.2.ebuild b/dev-php/pecl-uploadprogress/pecl-uploadprogress-2.0.2.ebuild
new file mode 100644
index 000000000000..6bc6174856b0
--- /dev/null
+++ b/dev-php/pecl-uploadprogress/pecl-uploadprogress-2.0.2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_PHP="php7-3 php7-4 php8-0"
+PHP_EXT_SAPIS="apache2 fpm"
+
+inherit php-ext-pecl-r3
+
+DESCRIPTION="An extension to track progress of a file upload"
+LICENSE="PHP-3.01"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples"
+
+RDEPEND="
+ php_targets_php7-3? ( || ( dev-lang/php:7.3[apache2(-),fileinfo(-)] dev-lang/php:7.3[fileinfo(-),fpm(-)] ) )
+ php_targets_php7-4? ( || ( dev-lang/php:7.4[apache2(-),fileinfo(-)] dev-lang/php:7.4[fileinfo(-),fpm(-)] ) )
+ php_targets_php8-0? ( || ( dev-lang/php:8.0[apache2(-),fileinfo(-)] dev-lang/php:8.0[fileinfo(-),fpm(-)] ) )
+"
diff --git a/dev-php/pecl-uuid/metadata.xml b/dev-php/pecl-uuid/metadata.xml
index 04d9b1663bd1..dabe2462bc03 100644
--- a/dev-php/pecl-uuid/metadata.xml
+++ b/dev-php/pecl-uuid/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/pecl-xdiff/metadata.xml b/dev-php/pecl-xdiff/metadata.xml
index fa339cc6f309..ad75a109ffc3 100644
--- a/dev-php/pecl-xdiff/metadata.xml
+++ b/dev-php/pecl-xdiff/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/pecl-yaml/metadata.xml b/dev-php/pecl-yaml/metadata.xml
index 749b4249f16e..f93d19d4b0d7 100644
--- a/dev-php/pecl-yaml/metadata.xml
+++ b/dev-php/pecl-yaml/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/pecl-yaz/metadata.xml b/dev-php/pecl-yaz/metadata.xml
index b86acf66c756..222c77f3742a 100644
--- a/dev-php/pecl-yaz/metadata.xml
+++ b/dev-php/pecl-yaz/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
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..5d00f58ace92 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/pecl-yaz/pecl-yaz-1.2.3.ebuild b/dev-php/pecl-yaz/pecl-yaz-1.2.3.ebuild
deleted file mode 100644
index 3fcf919582e9..000000000000
--- a/dev-php/pecl-yaz/pecl-yaz-1.2.3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PHP_EXT_NAME="yaz"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-DOCS=( README )
-
-USE_PHP="php5-6 php7-0 php7-1 php7-2 php7-3 php7-4"
-
-inherit php-ext-pecl-r3
-
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86"
-
-DESCRIPTION="This extension implements a Z39.50 client for PHP using the YAZ toolkit"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-DEPEND=">=dev-libs/yaz-3.0.2:0="
-RDEPEND="${DEPEND}"
-
-# Needs network access
-RESTRICT="test"
-
-PHP_EXT_ECONF_ARGS="--with-yaz=/usr"
diff --git a/dev-php/pecl-zmq/metadata.xml b/dev-php/pecl-zmq/metadata.xml
index b86acf66c756..222c77f3742a 100644
--- a/dev-php/pecl-zmq/metadata.xml
+++ b/dev-php/pecl-zmq/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/phar-io-manifest/Manifest b/dev-php/phar-io-manifest/Manifest
index 3e0b56dae27b..7f3d77dc80ab 100644
--- a/dev-php/phar-io-manifest/Manifest
+++ b/dev-php/phar-io-manifest/Manifest
@@ -1,2 +1,3 @@
DIST phar-io-manifest-1.0.3.tar.gz 21903 BLAKE2B 48fb8858ea6c89415e78da399e2d3b6660e1857958094bf5e6c42465cfc32e34122ec1ab6e413f36f48e288ef40af7b85f93c80e6a2cfa547a166557de04ec97 SHA512 f8f9a6d4b761b739ec24a9f94ae5d4ac74f7276621675e3f3c7c3085aa7662c73cc703b1c86531d327199cf42074bb19446c14f78a3c8a888b1d236dc59bed94
DIST phar-io-manifest-2.0.1.tar.gz 10146 BLAKE2B dad3a04bf63c53c2cf4c715eb752ca57458f936a0872db481e81452b9efc8f10bb3903248cb834c8e25eb88987b68545903e1f68876e284597f54ceef755dfe8 SHA512 5c9772a5a48f17abab3806bbb8f9c07a2f26f3231385fb7dd7dcdc390f925f0f7de2d07d8b0bb4e966de86c3262bb4900cf81c1bf897fb38425aa8d644c74e95
+DIST phar-io-manifest-2.0.3.tar.gz 10249 BLAKE2B 3463a52fac2d0392b9c4a40089b536b0aebdbfe51154dbeab093da386085ead91eb95cdd133eb4464bde3a616b13c5a5772af2d97edfc585b0fa1128ef2a5166 SHA512 c0c646f0770e66909377f5f4b6b755ecfc070c44ac83d58c3ad07d79aa4481092e7c702e62d0ee65b036dd5de8ba45356d85717a733f141248e41f77d54bbe86
diff --git a/dev-php/phar-io-manifest/metadata.xml b/dev-php/phar-io-manifest/metadata.xml
index 98477e04d046..6f10ced3923d 100644
--- a/dev-php/phar-io-manifest/metadata.xml
+++ b/dev-php/phar-io-manifest/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/phar-io-manifest/phar-io-manifest-2.0.3.ebuild b/dev-php/phar-io-manifest/phar-io-manifest-2.0.3.ebuild
new file mode 100644
index 000000000000..25f65d07e8d4
--- /dev/null
+++ b/dev-php/phar-io-manifest/phar-io-manifest-2.0.3.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+DESCRIPTION="Reading phar.io manifest information from a PHP Archive (PHAR)"
+HOMEPAGE="https://github.com/phar-io/manifest"
+SRC_URI="https://github.com/phar-io/manifest/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="examples"
+
+CDEPEND="dev-php/fedora-autoloader
+ >=dev-php/phar-io-version-3.0.1
+ >=dev-lang/php-7.2:*[phar,xml(-),xmlwriter(-)]"
+
+BDEPEND="dev-php/theseer-Autoload"
+
+RDEPEND="${CDEPEND}"
+
+S="${WORKDIR}/manifest-${PV}"
+
+src_prepare() {
+ default
+
+ phpab \
+ --output src/autoload.php \
+ --template fedora2 \
+ --basedir src \
+ src \
+ || die
+
+ cat >> src/autoload.php <<EOF || die "failed to extend autoload.php"
+
+// Dependencies
+\Fedora\Autoloader\Dependencies::required([
+ '/usr/share/php/PharIo/Version/autoload.php'
+]);
+EOF
+}
+
+src_install() {
+ insinto /usr/share/php/PharIo/Manifest
+ doins -r src/*
+ dodoc README.md
+ use examples && dodoc -r examples
+}
diff --git a/dev-php/phar-io-version/metadata.xml b/dev-php/phar-io-version/metadata.xml
index cb69a2563f88..374d367f368e 100644
--- a/dev-php/phar-io-version/metadata.xml
+++ b/dev-php/phar-io-version/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/phar-utils/Manifest b/dev-php/phar-utils/Manifest
index 791852e8b0a7..43aa84b192f3 100644
--- a/dev-php/phar-utils/Manifest
+++ b/dev-php/phar-utils/Manifest
@@ -1 +1,2 @@
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
diff --git a/dev-php/phar-utils/metadata.xml b/dev-php/phar-utils/metadata.xml
index 3500cb35f8d6..7a2309f32992 100644
--- a/dev-php/phar-utils/metadata.xml
+++ b/dev-php/phar-utils/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person" proxied="yes">
<email>guillaumeseren@gmail.com</email>
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
+}
diff --git a/dev-php/phing/metadata.xml b/dev-php/phing/metadata.xml
index 104818de2b2f..f1663a24278b 100644
--- a/dev-php/phing/metadata.xml
+++ b/dev-php/phing/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/php-codebrowser/metadata.xml b/dev-php/php-codebrowser/metadata.xml
index 596e8a4211f4..2eb0457b9df7 100644
--- a/dev-php/php-codebrowser/metadata.xml
+++ b/dev-php/php-codebrowser/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/php-redmine-api/metadata.xml b/dev-php/php-redmine-api/metadata.xml
index cd1ae1186934..cff99fbaee63 100644
--- a/dev-php/php-redmine-api/metadata.xml
+++ b/dev-php/php-redmine-api/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>mjo@gentoo.org</email>
diff --git a/dev-php/phpDocumentor/metadata.xml b/dev-php/phpDocumentor/metadata.xml
index 5b3f6d868306..68e8c559876c 100644
--- a/dev-php/phpDocumentor/metadata.xml
+++ b/dev-php/phpDocumentor/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/phpcov/metadata.xml b/dev-php/phpcov/metadata.xml
index 68745855add1..555be065e834 100644
--- a/dev-php/phpcov/metadata.xml
+++ b/dev-php/phpcov/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/phpdepend/metadata.xml b/dev-php/phpdepend/metadata.xml
index db6a432a175b..a55636ecfa83 100644
--- a/dev-php/phpdepend/metadata.xml
+++ b/dev-php/phpdepend/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/phpdocumentor-reflection-common/metadata.xml b/dev-php/phpdocumentor-reflection-common/metadata.xml
index 349b1ff23b6e..3f577a570a0f 100644
--- a/dev-php/phpdocumentor-reflection-common/metadata.xml
+++ b/dev-php/phpdocumentor-reflection-common/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/phpdocumentor-reflection-docblock/metadata.xml b/dev-php/phpdocumentor-reflection-docblock/metadata.xml
index d6bbab08b840..2e604b1f972d 100644
--- a/dev-php/phpdocumentor-reflection-docblock/metadata.xml
+++ b/dev-php/phpdocumentor-reflection-docblock/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/phpdocumentor-type-resolver/metadata.xml b/dev-php/phpdocumentor-type-resolver/metadata.xml
index 92320d9ee877..a76adf1ae5fc 100644
--- a/dev-php/phpdocumentor-type-resolver/metadata.xml
+++ b/dev-php/phpdocumentor-type-resolver/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/phpmd/metadata.xml b/dev-php/phpmd/metadata.xml
index 133c28059f56..740f8008e0e1 100644
--- a/dev-php/phpmd/metadata.xml
+++ b/dev-php/phpmd/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/phpspec-prophecy/Manifest b/dev-php/phpspec-prophecy/Manifest
index 1a9cb4ef3fd9..9639fd38f3d1 100644
--- a/dev-php/phpspec-prophecy/Manifest
+++ b/dev-php/phpspec-prophecy/Manifest
@@ -2,6 +2,7 @@ DIST phpspec-prophecy-1.10.0.tar.gz 38663 BLAKE2B 44a292eb24cbef36217c108cc09497
DIST phpspec-prophecy-1.10.1.tar.gz 38707 BLAKE2B 1eaa3fe0043b0d03341778679683cd388d2cdcc3c386ee5801f22dce453fbc3c276023f1b9dc6f26ee332948f59081e09d0944948feff1a6332195523570e4c9 SHA512 f42d115969894b0c1f4887a2154fe310ddd3c7d5a49abbed3c3cb6ffa86d83b1458b9323203e68a7389f5df3c95b3a25037bed41cb8f3b5e824d45102579b9ca
DIST phpspec-prophecy-1.10.3.tar.gz 38838 BLAKE2B 05150e31bcb5896768878672a2523499470541409796b6f4f0de2b8b8686cfa097b6a745e467ed3c9693b0498712d04f6f0e1ba0d19e2fa3677ab9f6423608de SHA512 ada5ecf157bcc5979a86c76448f72c8a890f7db4496327ecf2b7b723bdfe901dd53b0225f8ee3ae7cbc38d08933c863224c9661466428fb47da9bfebdb86627c
DIST phpspec-prophecy-1.13.0.tar.gz 40362 BLAKE2B e99001cfe9fb20cea12b5e109ef36ba087f99ae1bcc922af853eff1bf2d0986017b9b7be03a280de05726480ad75c9d8ee34a27c54b78e22bade9534a75e5c34 SHA512 5d7befb615805243f9602fe78c230c0938186d01c62cc5b90aa279713ba3b653629e91d96acd4e8bb1dc25cded81526934d189ef3f4ef38f75cba04877ccdf70
+DIST phpspec-prophecy-1.14.0.tar.gz 40801 BLAKE2B 8968be07cbc02f76c515c8c6a27e69662e1aa697e5d502329a946a677903b59fc63347b2535b84ebf4e1d59cf6085fa10151ed9caea9f3b50c1897eaeb178636 SHA512 777137784a2235ae638d1b6b42bb67b2fa6eadb2c05e83097e90604aee5e0d7bc4100924fadf8f2e5ccbe09be6d4edf4fb63606f2be4a9c805dc4480d88747ef
DIST phpspec-prophecy-1.7.0.tar.gz 60338 BLAKE2B 8171120d8407f2e554150d5e3ea1972c54d4e2ce0e6698763f0b3c7e1645340ce22404da7844fed8412579c46f372852b4553c6d8a65c8094ef3065b0dbbd80c SHA512 e8efb3882d869f10fe39dff7c2185e1ec6f044c794fd6a5785e1c1c69c71b91dc3997f61bd2566d3243dde0becce568beba9a18fa0fd152e6ce74ca43a9a0fb0
DIST phpspec-prophecy-1.8.0.tar.gz 37907 BLAKE2B 4bdd55d7fc14604c9fade23c60bf51f4c03accc182d7c5ad445dc6212a1e41b1bf392fe8f4a29768ecfcb2af479c0db3e29d5787d12e1f3222b032ba7e64dbc8 SHA512 992673f7cd148cf0b8752bbad614bbe34175a761cd4bf8849625794b505342d1bd918212a0f1463d94513f9e805d3dd127ba129d6622bcda29ea2b5c57a5582f
DIST phpspec-prophecy-1.9.0.tar.gz 38262 BLAKE2B 1642d38afa368be504da73c0bcf34921fe167dff5665651af23142f33979a35d8d10112e3d1c5b1b38448b92b4741ebda2c183dca10473dce833090a603f95f6 SHA512 d0ba1840ca84cf4b0642083858326c593086f35ba3a6d83746956efbe5d538910efc01655eaa14b4e2b7e17e7bd19cd2494cdfad0dd5bdfb43cdee2402a55b05
diff --git a/dev-php/phpspec-prophecy/metadata.xml b/dev-php/phpspec-prophecy/metadata.xml
index 4e057ba93af9..9ff0adfe1748 100644
--- a/dev-php/phpspec-prophecy/metadata.xml
+++ b/dev-php/phpspec-prophecy/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/phpspec-prophecy/phpspec-prophecy-1.14.0.ebuild b/dev-php/phpspec-prophecy/phpspec-prophecy-1.14.0.ebuild
new file mode 100644
index 000000000000..92ee8e7fe54c
--- /dev/null
+++ b/dev-php/phpspec-prophecy/phpspec-prophecy-1.14.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+MY_PN="prophecy"
+MY_VENDOR="phpspec"
+
+DESCRIPTION="Highly opinionated mocking framework"
+HOMEPAGE="https://github.com/phpspec/prophecy"
+SRC_URI="https://github.com/${MY_VENDOR}/${MY_PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE=""
+
+S="${WORKDIR}/prophecy-${PV}"
+
+RDEPEND="dev-php/fedora-autoloader
+ <dev-php/doctrine-instantiator-2
+ <dev-php/phpdocumentor-reflection-docblock-6
+ <dev-php/sebastian-comparator-4
+ <dev-php/sebastian-recursion-context-4
+ >=dev-lang/php-5.6:*"
+
+src_install() {
+ insinto /usr/share/php/${MY_VENDOR}/Prophecy
+ doins -r src/Prophecy/*
+ newins "${FILESDIR}/autoload-1.10.0.php" autoload.php
+}
diff --git a/dev-php/phptal/metadata.xml b/dev-php/phptal/metadata.xml
index 04d9b1663bd1..dabe2462bc03 100644
--- a/dev-php/phptal/metadata.xml
+++ b/dev-php/phptal/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/phpunit-mock-objects/metadata.xml b/dev-php/phpunit-mock-objects/metadata.xml
index a377557cec14..0656ca4a007c 100644
--- a/dev-php/phpunit-mock-objects/metadata.xml
+++ b/dev-php/phpunit-mock-objects/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/phpunit/metadata.xml b/dev-php/phpunit/metadata.xml
index cecdb66c098d..18b58c21f5a5 100644
--- a/dev-php/phpunit/metadata.xml
+++ b/dev-php/phpunit/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/psr-log/metadata.xml b/dev-php/psr-log/metadata.xml
index 898d1f544b35..ada5d643498e 100644
--- a/dev-php/psr-log/metadata.xml
+++ b/dev-php/psr-log/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person" proxied="yes">
<email>guillaumeseren@gmail.com</email>
diff --git a/dev-php/reactphp-promise/metadata.xml b/dev-php/reactphp-promise/metadata.xml
index f58805830cdc..852584f51a68 100644
--- a/dev-php/reactphp-promise/metadata.xml
+++ b/dev-php/reactphp-promise/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/realpath_turbo/metadata.xml b/dev-php/realpath_turbo/metadata.xml
index 9c672a724777..cca5e7c9e34f 100644
--- a/dev-php/realpath_turbo/metadata.xml
+++ b/dev-php/realpath_turbo/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>whissi@gentoo.org</email>
diff --git a/dev-php/recaptcha/metadata.xml b/dev-php/recaptcha/metadata.xml
index 199668983735..e082944c00c9 100644
--- a/dev-php/recaptcha/metadata.xml
+++ b/dev-php/recaptcha/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>mjo@gentoo.org</email>
diff --git a/dev-php/scrypt/metadata.xml b/dev-php/scrypt/metadata.xml
index eecb8d72e99c..05cea54b5643 100644
--- a/dev-php/scrypt/metadata.xml
+++ b/dev-php/scrypt/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person" proxied="yes">
<email>spiderx@spiderx.dp.ua</email>
diff --git a/dev-php/sebastian-code-unit-reverse-lookup/metadata.xml b/dev-php/sebastian-code-unit-reverse-lookup/metadata.xml
index f502d06de0ed..aa1a6c5265be 100644
--- a/dev-php/sebastian-code-unit-reverse-lookup/metadata.xml
+++ b/dev-php/sebastian-code-unit-reverse-lookup/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/sebastian-comparator/metadata.xml b/dev-php/sebastian-comparator/metadata.xml
index c10982b0fbd1..66ce5497903c 100644
--- a/dev-php/sebastian-comparator/metadata.xml
+++ b/dev-php/sebastian-comparator/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/sebastian-diff/metadata.xml b/dev-php/sebastian-diff/metadata.xml
index 4dfd55b95825..0bf33cca6401 100644
--- a/dev-php/sebastian-diff/metadata.xml
+++ b/dev-php/sebastian-diff/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/sebastian-environment/metadata.xml b/dev-php/sebastian-environment/metadata.xml
index d44f1c505211..dde356223d79 100644
--- a/dev-php/sebastian-environment/metadata.xml
+++ b/dev-php/sebastian-environment/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/sebastian-exporter/metadata.xml b/dev-php/sebastian-exporter/metadata.xml
index 14106ec24ebb..ced75d6e7f76 100644
--- a/dev-php/sebastian-exporter/metadata.xml
+++ b/dev-php/sebastian-exporter/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/sebastian-global-state/metadata.xml b/dev-php/sebastian-global-state/metadata.xml
index 5963ae95ffc9..3a7b23c158e8 100644
--- a/dev-php/sebastian-global-state/metadata.xml
+++ b/dev-php/sebastian-global-state/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/sebastian-object-enumerator/metadata.xml b/dev-php/sebastian-object-enumerator/metadata.xml
index 492ff122fad7..cd07b250d72c 100644
--- a/dev-php/sebastian-object-enumerator/metadata.xml
+++ b/dev-php/sebastian-object-enumerator/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/sebastian-object-reflector/metadata.xml b/dev-php/sebastian-object-reflector/metadata.xml
index 0c15891ac5ab..ec74c535c743 100644
--- a/dev-php/sebastian-object-reflector/metadata.xml
+++ b/dev-php/sebastian-object-reflector/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/sebastian-recursion-context/metadata.xml b/dev-php/sebastian-recursion-context/metadata.xml
index 21c373eb5ef4..539eefc99110 100644
--- a/dev-php/sebastian-recursion-context/metadata.xml
+++ b/dev-php/sebastian-recursion-context/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/sebastian-resource-operations/metadata.xml b/dev-php/sebastian-resource-operations/metadata.xml
index f4be19dca0e2..15259de56742 100644
--- a/dev-php/sebastian-resource-operations/metadata.xml
+++ b/dev-php/sebastian-resource-operations/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/sebastian-type/metadata.xml b/dev-php/sebastian-type/metadata.xml
index 9745bd5bc7f5..0976677111a9 100644
--- a/dev-php/sebastian-type/metadata.xml
+++ b/dev-php/sebastian-type/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/sebastian-version/metadata.xml b/dev-php/sebastian-version/metadata.xml
index 9738b305aae0..c011bd4225b5 100644
--- a/dev-php/sebastian-version/metadata.xml
+++ b/dev-php/sebastian-version/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/securimage/metadata.xml b/dev-php/securimage/metadata.xml
index 7a38bb900964..115e9d64a669 100644
--- a/dev-php/securimage/metadata.xml
+++ b/dev-php/securimage/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
</pkgmetadata>
diff --git a/dev-php/semver/metadata.xml b/dev-php/semver/metadata.xml
index 6ec5f5908294..df116260c3e5 100644
--- a/dev-php/semver/metadata.xml
+++ b/dev-php/semver/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person" proxied="yes">
<email>guillaumeseren@gmail.com</email>
diff --git a/dev-php/simpletest/metadata.xml b/dev-php/simpletest/metadata.xml
index 26c2f4a62f95..6eef45d6cc49 100644
--- a/dev-php/simpletest/metadata.xml
+++ b/dev-php/simpletest/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/smarty/metadata.xml b/dev-php/smarty/metadata.xml
index 0a961b37b77e..36b08b7f5c7d 100644
--- a/dev-php/smarty/metadata.xml
+++ b/dev-php/smarty/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/spdx-licenses/metadata.xml b/dev-php/spdx-licenses/metadata.xml
index 0218de4810be..74d05ceb674e 100644
--- a/dev-php/spdx-licenses/metadata.xml
+++ b/dev-php/spdx-licenses/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person" proxied="yes">
<email>guillaumeseren@gmail.com</email>
diff --git a/dev-php/stringparser_bbcode/metadata.xml b/dev-php/stringparser_bbcode/metadata.xml
index b86acf66c756..222c77f3742a 100644
--- a/dev-php/stringparser_bbcode/metadata.xml
+++ b/dev-php/stringparser_bbcode/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/swoole-async/metadata.xml b/dev-php/swoole-async/metadata.xml
index d355171f926f..fc23648923fd 100644
--- a/dev-php/swoole-async/metadata.xml
+++ b/dev-php/swoole-async/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/swoole-async/swoole-async-4.4.12.ebuild b/dev-php/swoole-async/swoole-async-4.4.12-r1.ebuild
index 845bfc568cc0..aa4fbdf97a3a 100644
--- a/dev-php/swoole-async/swoole-async-4.4.12.ebuild
+++ b/dev-php/swoole-async/swoole-async-4.4.12-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
@@ -26,7 +26,8 @@ SLOT="0"
# Tests will require pre-configured endpoint
RESTRICT="test"
-DEPEND=">=dev-php/swoole-4.3"
+# This will only compile with the same version of dev-php/swoole
+DEPEND="~dev-php/swoole-${PV}[php_targets_php7-1(-)?,php_targets_php7-2(-)?,php_targets_php7-3(-)?,php_targets_php7-4(-)?]"
RDEPEND="${DEPEND}"
diff --git a/dev-php/swoole-async/swoole-async-4.4.16.ebuild b/dev-php/swoole-async/swoole-async-4.4.16-r1.ebuild
index 09b9d48a22e1..aa4fbdf97a3a 100644
--- a/dev-php/swoole-async/swoole-async-4.4.16.ebuild
+++ b/dev-php/swoole-async/swoole-async-4.4.16-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
@@ -26,7 +26,8 @@ SLOT="0"
# Tests will require pre-configured endpoint
RESTRICT="test"
-DEPEND=">=dev-php/swoole-4.3"
+# This will only compile with the same version of dev-php/swoole
+DEPEND="~dev-php/swoole-${PV}[php_targets_php7-1(-)?,php_targets_php7-2(-)?,php_targets_php7-3(-)?,php_targets_php7-4(-)?]"
RDEPEND="${DEPEND}"
diff --git a/dev-php/swoole/metadata.xml b/dev-php/swoole/metadata.xml
index 6384a235e856..a64ace0fb389 100644
--- a/dev-php/swoole/metadata.xml
+++ b/dev-php/swoole/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/symfony-config/metadata.xml b/dev-php/symfony-config/metadata.xml
index be6f5818811c..c664fe8c1c68 100644
--- a/dev-php/symfony-config/metadata.xml
+++ b/dev-php/symfony-config/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person" proxied="yes">
<email>guillaumeseren@gmail.com</email>
diff --git a/dev-php/symfony-console/metadata.xml b/dev-php/symfony-console/metadata.xml
index 9db86af2e1bb..0a5a50eef4ed 100644
--- a/dev-php/symfony-console/metadata.xml
+++ b/dev-php/symfony-console/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person" proxied="yes">
<email>guillaumeseren@gmail.com</email>
diff --git a/dev-php/symfony-dependency-injection/metadata.xml b/dev-php/symfony-dependency-injection/metadata.xml
index b37e97d4dc2c..25c9bf67dceb 100644
--- a/dev-php/symfony-dependency-injection/metadata.xml
+++ b/dev-php/symfony-dependency-injection/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person" proxied="yes">
<email>guillaumeseren@gmail.com</email>
diff --git a/dev-php/symfony-event-dispatcher/metadata.xml b/dev-php/symfony-event-dispatcher/metadata.xml
index 00c47e10e312..8955ceda226c 100644
--- a/dev-php/symfony-event-dispatcher/metadata.xml
+++ b/dev-php/symfony-event-dispatcher/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person" proxied="yes">
<email>guillaumeseren@gmail.com</email>
diff --git a/dev-php/symfony-filesystem/metadata.xml b/dev-php/symfony-filesystem/metadata.xml
index b2cb0eba12ad..3e63d7040745 100644
--- a/dev-php/symfony-filesystem/metadata.xml
+++ b/dev-php/symfony-filesystem/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person" proxied="yes">
<email>guillaumeseren@gmail.com</email>
diff --git a/dev-php/symfony-finder/metadata.xml b/dev-php/symfony-finder/metadata.xml
index 990080d5dde3..be400dd57a4e 100644
--- a/dev-php/symfony-finder/metadata.xml
+++ b/dev-php/symfony-finder/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person" proxied="yes">
<email>guillaumeseren@gmail.com</email>
diff --git a/dev-php/symfony-process/metadata.xml b/dev-php/symfony-process/metadata.xml
index fbfab081f2a4..c67e25864a18 100644
--- a/dev-php/symfony-process/metadata.xml
+++ b/dev-php/symfony-process/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person" proxied="yes">
<email>guillaumeseren@gmail.com</email>
diff --git a/dev-php/symfony-yaml/metadata.xml b/dev-php/symfony-yaml/metadata.xml
index fa154916059b..091344a6b287 100644
--- a/dev-php/symfony-yaml/metadata.xml
+++ b/dev-php/symfony-yaml/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person" proxied="yes">
<email>guillaumeseren@gmail.com</email>
diff --git a/dev-php/tcpdf/metadata.xml b/dev-php/tcpdf/metadata.xml
index 40391479723e..ca6f47dad088 100644
--- a/dev-php/tcpdf/metadata.xml
+++ b/dev-php/tcpdf/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/theseer-Autoload/Manifest b/dev-php/theseer-Autoload/Manifest
index 8317998a9905..7b4b9e48b084 100644
--- a/dev-php/theseer-Autoload/Manifest
+++ b/dev-php/theseer-Autoload/Manifest
@@ -1 +1,2 @@
DIST theseer-Autoload-1.26.0.tar.gz 43119 BLAKE2B 7b2413bc2fb281472cee03010c175aae1c8304ab0629c31f09e11497bd6f46d58bae8625da610f5a513b19fc8aafc45c35be7271ba13188466f576e7b4a7392f SHA512 c8fcb3ad39c140517d695c44e6dea3797ea0135ff64246478e55cbf167e4b9fbb3e5027732c201f66b404039a313952c7125f13fdeb1cd96633dbccfdda6f143
+DIST theseer-Autoload-1.26.3.tar.gz 43810 BLAKE2B b2d7fe33b9663a3c324656abe63e4ae89533b773007362b546cb9401de0a8fd8f0c00f8f385c4a45c39be675d062cf5dd5a739972fc12611331065f244515d63 SHA512 00a6fbf86cc0f5958c5d0d049af0370ef510fe21a05d7dcbeb1b0771f979ea6638f5db74d913c56b10d9212a68b5d918cdfefec241b1383faf0e97b4305895bd
diff --git a/dev-php/theseer-Autoload/metadata.xml b/dev-php/theseer-Autoload/metadata.xml
index 667fdfa8de4a..82b131853a75 100644
--- a/dev-php/theseer-Autoload/metadata.xml
+++ b/dev-php/theseer-Autoload/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/theseer-Autoload/theseer-Autoload-1.26.3.ebuild b/dev-php/theseer-Autoload/theseer-Autoload-1.26.3.ebuild
new file mode 100644
index 000000000000..f8aad573f6e7
--- /dev/null
+++ b/dev-php/theseer-Autoload/theseer-Autoload-1.26.3.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN="Autoload"
+
+DESCRIPTION="PHP Autoload Builder"
+HOMEPAGE="https://github.com/theseer/Autoload"
+SRC_URI="https://github.com/theseer/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+CDEPEND="dev-lang/php:*[cli]
+ >=dev-php/theseer-DirectoryScanner-1.3
+ <dev-php/theseer-DirectoryScanner-2
+ >=dev-php/zetacomponents-Base-1.8
+ <dev-php/zetacomponents-Base-2
+ >=dev-php/zetacomponents-ConsoleTools-1.7.1
+ <dev-php/zetacomponents-ConsoleTools-2"
+
+BDEPEND="${CDEPEND}
+ test? (
+ >=dev-php/phpunit-8
+ <dev-php/phpunit-9
+ )"
+
+RDEPEND="${CDEPEND}"
+
+PATCHES=( "${FILESDIR}"/${PN}-1.26.0-autoload.php.patch )
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_prepare() {
+ default
+
+ # Set version
+ sed -i \
+ -e "s/%development%/${PV}/" \
+ phpab.php \
+ composer/bin/phpab \
+ || die
+
+ cp --target-directory src/templates/ci \
+ "${FILESDIR}"/fedora.php.tpl \
+ "${FILESDIR}"/fedora2.php.tpl \
+ || die
+
+ # Mimick layout to bootstrap phpab
+ mkdir --parents \
+ vendor/theseer/directoryscanner \
+ vendor/zetacomponents/base \
+ vendor/zetacomponents/console-tools \
+ || die
+
+ ln -s /usr/share/php/TheSeer/DirectoryScanner vendor/theseer/directoryscanner/src || die
+ ln -s /usr/share/php/ezc/Base vendor/zetacomponents/base/src || die
+ ln -s /usr/share/php/ezc/ConsoleTools vendor/zetacomponents/console-tools/src || die
+
+ ./phpab.php \
+ --output src/autoload.php \
+ --template "${FILESDIR}"/autoload.php.tpl \
+ --basedir src \
+ src || die
+}
+
+src_test() {
+ phpunit --no-coverage --verbose || die "Unit testing failed!"
+}
+
+src_install() {
+ insinto /usr/share/php/TheSeer/${MY_PN}
+ doins -r src/*
+
+ dobin "${S}"/composer/bin/phpab
+
+ einstalldocs
+}
diff --git a/dev-php/theseer-DirectoryScanner/Manifest b/dev-php/theseer-DirectoryScanner/Manifest
index 8ff466068a08..64f919a3f0a7 100644
--- a/dev-php/theseer-DirectoryScanner/Manifest
+++ b/dev-php/theseer-DirectoryScanner/Manifest
@@ -1 +1,2 @@
DIST theseer-DirectoryScanner-1.3.2.tar.gz 9262 BLAKE2B 5b16781d9ccd030ea779b286b9d22c528468db52e39c6761e91e0f9f83d4a50e1775382eca4eea0f027cc508f7dd35e416664451f83bdfae8607cf074e5ed9cb SHA512 720db8baa40983918e5c0d7cfac194e26d877becf6e55868ca21c1ab0a4366b86a8aad2c700e38a6360e280d372db0f1be6c80dbb81d279c277bf9f56a6cbadf
+DIST theseer-DirectoryScanner-1.3.3.tar.gz 9281 BLAKE2B a58cecc35ac96752cc09ef6cd0c6a607014e6b8317559803810089fab1d1d19f33369580bd90fbd328b3f106e3664e65da6750c7ad52c62f446497738a8e60b7 SHA512 260820a468f163641d2a249dab2b812ef3589cb251f4995681a9fc344b38a8aa1dfb7bf52bef702adc627ea39fd8a2bb4f2b18117edba83fe6a1db5e8f69efdd
diff --git a/dev-php/theseer-DirectoryScanner/metadata.xml b/dev-php/theseer-DirectoryScanner/metadata.xml
index d26b2c68d2d4..cf4c63f4b67f 100644
--- a/dev-php/theseer-DirectoryScanner/metadata.xml
+++ b/dev-php/theseer-DirectoryScanner/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/theseer-DirectoryScanner/theseer-DirectoryScanner-1.3.3.ebuild b/dev-php/theseer-DirectoryScanner/theseer-DirectoryScanner-1.3.3.ebuild
new file mode 100644
index 000000000000..57a47c3aee00
--- /dev/null
+++ b/dev-php/theseer-DirectoryScanner/theseer-DirectoryScanner-1.3.3.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN="DirectoryScanner"
+
+DESCRIPTION="A recursive directory scanner and filter"
+HOMEPAGE="https://github.com/theseer/DirectoryScanner"
+SRC_URI="https://github.com/theseer/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+RDEPEND="dev-lang/php:*"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_install() {
+ insinto /usr/share/php/TheSeer/${MY_PN}
+ doins -r src/*
+
+ einstalldocs
+}
diff --git a/dev-php/theseer-tokenizer/Manifest b/dev-php/theseer-tokenizer/Manifest
index eb773bbb1aaa..82ec38ee8d33 100644
--- a/dev-php/theseer-tokenizer/Manifest
+++ b/dev-php/theseer-tokenizer/Manifest
@@ -1,3 +1,4 @@
DIST theseer-tokenizer-1.1.0.tar.gz 10163 BLAKE2B b2360f901d60f784db2045912707a8e293a55967d60d4e72168a1c4b0c9a2d5bdb739fbed9bfec02075476e7bf6762eb1cc7e36870b84fcc341b609527579ca2 SHA512 8b500565dc0d6c8513db3aa72a7ee1fa04510a712ce9b0977feccddc6b2dae53825e39182d43508e196f326776115789e81697116418f6f9f63d08f0c05d0543
DIST theseer-tokenizer-1.1.3.tar.gz 10553 BLAKE2B 4bed1623abe110cec432a97fbd28752618420a188b450c935c77b5771d6986be9a51c8f100fd81a89d892b0c1e2b46b0124e3c35e3cbe2138eee2d520c74933a SHA512 e29fd41b311bac8021f4c0593d79a9c1bde4b6ccf4774e94d27a0e8a97bac3844109f9312c4aab6e239365630394b602b56a084c291dc13fb439dc8ac22944e3
DIST theseer-tokenizer-1.2.0.tar.gz 7156 BLAKE2B 61474e3ebed5262b4d250f0057fbe68df6b2b2d6026cba28efbfc35c865bc9491e3b3f7871591a7aa52383c3bb748cf5dfb95f36d680bdbb9755b585b5b8f4f8 SHA512 e0deeffc151a1831cc7226037c75b534aa0d28d9639de45a1f0a6f5865d3df3cfbd7225e075b094603d512b0beb449e91205f40366ef1c7c865c8994e0710ff7
+DIST theseer-tokenizer-1.2.1.tar.gz 7537 BLAKE2B 204b39ca71cb6e99696c8bda19e5319e83302cd9fd4689343d3864ec81996d433ea8cfa2578abec2bef440271a1abe3169c3c871fd931c1ab73705cb7c36e4eb SHA512 7c7382f8f2e96984862d187fffb08b020cac8c0a0d93b58f9b1a244a46f8fcbfbe1c18d005acce8f8e1ef9aec2b9be99b7f2312e28f54a66f5a97ee263ed5239
diff --git a/dev-php/theseer-tokenizer/metadata.xml b/dev-php/theseer-tokenizer/metadata.xml
index 97cdb9aa384c..e819be73ce10 100644
--- a/dev-php/theseer-tokenizer/metadata.xml
+++ b/dev-php/theseer-tokenizer/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/theseer-tokenizer/theseer-tokenizer-1.2.1.ebuild b/dev-php/theseer-tokenizer/theseer-tokenizer-1.2.1.ebuild
new file mode 100644
index 000000000000..2da5b5180736
--- /dev/null
+++ b/dev-php/theseer-tokenizer/theseer-tokenizer-1.2.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Convert tokenized PHP source code into XML and other formats"
+HOMEPAGE="https://github.com/theseer/tokenizer"
+SRC_URI="https://github.com/theseer/tokenizer/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+CDEPEND="dev-lang/php:*
+ dev-php/fedora-autoloader"
+
+BDEPEND="dev-php/theseer-Autoload"
+
+RDEPEND="${CDEPEND}"
+
+S="${WORKDIR}/tokenizer-${PV}"
+
+src_prepare() {
+ default
+
+ phpab \
+ --output src/autoload.php \
+ --template fedora2 \
+ --basedir src \
+ src || die
+}
+
+src_install() {
+ insinto /usr/share/php/TheSeer/Tokenizer
+ doins -r src/*
+
+ einstalldocs
+}
diff --git a/dev-php/twig/metadata.xml b/dev-php/twig/metadata.xml
index 3a1ebe231eea..6619337fad39 100644
--- a/dev-php/twig/metadata.xml
+++ b/dev-php/twig/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>djc@gentoo.org</email>
diff --git a/dev-php/webmozart-assert/metadata.xml b/dev-php/webmozart-assert/metadata.xml
index 0988eee357e7..bec3cfb3d221 100644
--- a/dev-php/webmozart-assert/metadata.xml
+++ b/dev-php/webmozart-assert/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/xdebug-client/metadata.xml b/dev-php/xdebug-client/metadata.xml
index b86acf66c756..222c77f3742a 100644
--- a/dev-php/xdebug-client/metadata.xml
+++ b/dev-php/xdebug-client/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/xdebug-handler/metadata.xml b/dev-php/xdebug-handler/metadata.xml
index 3572103e75fb..9fe7978bdffe 100644
--- a/dev-php/xdebug-handler/metadata.xml
+++ b/dev-php/xdebug-handler/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person" proxied="yes">
<email>guillaumeseren@gmail.com</email>
diff --git a/dev-php/xdebug/Manifest b/dev-php/xdebug/Manifest
index 5f70b3b24e97..d8630504841f 100644
--- a/dev-php/xdebug/Manifest
+++ b/dev-php/xdebug/Manifest
@@ -3,3 +3,4 @@ DIST xdebug-2.9.8.tar.gz 438295 BLAKE2B 8645052faceb354817ddb448f46af5b849507d31
DIST xdebug-3.0.2.tar.gz 435761 BLAKE2B 0476d29b3a960d83fd0818098a3d076f48f4d67057a2b6ec79571b011a9f364b18d3319771ad18e7145aa0f0f45fab7ed13d814b863731abe1721aafa8b59408 SHA512 723e00885a49a5626870cc4cb0f7fd49a3173c8d4e9b4022009430fdeaa1b152828de18e6e7fa709be8bb11989c89dc2d9940de9cc3d592174b5dafbc3d2c52d
DIST xdebug-3.0.3.tar.gz 437261 BLAKE2B 7ccfa8acbbe8b40eb086c9d4f47d363ec52850f5b0b91480bebfa416d7b88edf20deb6ee5fb5514dd1885f7a5b77c4b18caecf958d7dcf463c44c259d0fe2b89 SHA512 2ea5c6e2d6481aeeb5b2d8e39f5c5686d9b7480aea0c159f3da6e830700594b24129c1c4242ff8413b52aa2ed0ea872bf72a17fe23facb69c1cae75a917bde5d
DIST xdebug-3.0.4.tar.gz 438559 BLAKE2B 0b4dc4a014f2459691bf43bb76d70a4080a6191b5f6cf4998751e73cdfcbecb7a6274e6f398476a2c68d014ddb25662e08e45b68fbc73c9b38c79c94b0682124 SHA512 f7f935903adb18f0920c919c3e5c923b70667dd82772bef7ae73fe40441ad1cb73f030aa206046720d4bfcf8b33f56d454cbb5f65dbdc275b7c1fd1907ff4ddb
+DIST xdebug-3.1.1.tar.gz 468120 BLAKE2B 038774612158c2c9b406e29dd70e2a3e182ce121bc92036eeb3362be0ba513a223cb2da41bdfe914d6861ae9d94ff33c5301cc23725ee771f47876c8095ae0b8 SHA512 b91bca3bac184723b3f6dc0c5db012f2ec0895ed55cd4ff83f73d35462b9cea654476c848f7d61559a4bd8661ce335fc71a45a7cab1165f4197d265e31eccc71
diff --git a/dev-php/xdebug/metadata.xml b/dev-php/xdebug/metadata.xml
index b86acf66c756..222c77f3742a 100644
--- a/dev-php/xdebug/metadata.xml
+++ b/dev-php/xdebug/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/xdebug/xdebug-3.1.1.ebuild b/dev-php/xdebug/xdebug-3.1.1.ebuild
new file mode 100644
index 000000000000..00bf4b8a058b
--- /dev/null
+++ b/dev-php/xdebug/xdebug-3.1.1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PHP_EXT_NAME="xdebug"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="yes"
+PHP_EXT_INIFILE="3.0-xdebug.ini"
+
+USE_PHP="php7-3 php7-4 php8-0 php8-1"
+PHP_EXT_NEEDED_USE="-threads(-)"
+
+MY_PV="${PV/_/}"
+MY_PV="${MY_PV/rc/RC}"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+inherit php-ext-source-r3
+
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+
+DESCRIPTION="A PHP debugging and profiling extension"
+HOMEPAGE="https://xdebug.org/"
+# Using tarball from GitHub for tests
+#SRC_URI="https://pecl.php.net/get/${PN}-${MY_PV}.tgz"
+SRC_URI="https://github.com/xdebug/xdebug/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="Xdebug"
+SLOT="0"
+IUSE=""
+
+# Tests are known to fail
+RESTRICT="test"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+DOCS=( README.rst CREDITS )
+PHP_EXT_ECONF_ARGS=()
+
+src_test() {
+ local slot
+ for slot in $(php_get_slots); do
+ php_init_slot_env "${slot}"
+ TEST_PHP_EXECUTABLE="${PHPCLI}" \
+ TEST_PHP_CGI_EXECUTABLE="${PHPCGI}" \
+ TEST_PHPDBG_EXECUTABLE="${PHPCLI}dbg" \
+ "${PHPCLI}" run-xdebug-tests.php
+ done
+}
+
+pkg_postinst() {
+ ewarn "We have set xdebug.mode to off, as xdebug can be"
+ ewarn "installed as a dependency, and not all users will want xdebug to be"
+ ewarn "enabled by default. If you want to enable it, you should edit the"
+ ewarn "ini file and set xdebug.mode to one or more modes e.g. develop,debug,trace"
+ elog ""
+ elog "The 3.0 major release changes many options."
+ elog "Review https://xdebug.org/docs/upgrade_guide for differences from 2.x"
+}
diff --git a/dev-php/xhprof/Manifest b/dev-php/xhprof/Manifest
index 9b12b022e21b..4c1e44ac3123 100644
--- a/dev-php/xhprof/Manifest
+++ b/dev-php/xhprof/Manifest
@@ -1,2 +1,3 @@
DIST xhprof-2.1.4.tgz 841444 BLAKE2B 33be85d55f2636af5664aeb017ccaab6ad03962d44b3143c0eb9d9f9cc0fa74048fbca6beae89d02ed47db8ffe1ea77df1f6a41aa62fbc90fea2c52c467a422d SHA512 8777d29c16bce9e7698cf37c7dd631e951a018fa63ab5a4ab0df8e7621643e7fb905cd9bc189b238d76e32408a43f522bbab455caab6b89f7b6c26590b2733a3
DIST xhprof-2.2.3.tgz 842543 BLAKE2B 5940a5ed8edc334ae2dc09d4621ed7fb4b8b56de6f07dc49e4a84ced33689f242f11ac89dced670f7b54d35fe8c9840fea09e55340174c399fae263760ca35ac SHA512 000468a7fa2a0af25004f0ffd59a8ab111a5cfa4cff275291fcbc54d3283fbf4a904b4aaeb38c2a8c7c81924bc31d9328ccf9fb7de24e20c224e014ed942efaf
+DIST xhprof-2.3.5.tgz 842658 BLAKE2B 4392b521e8b4c10dc745bbd670c351231680e753251b1d1e3c7048e17fa5a88a6c79da39f3c50b8642ca0c1a5b9658e4dafe6ed4af3dc97c71265f021438fda9 SHA512 50ae6fb8d63ac8354b7887daecd1882f33e616cd1ef165b54d51f26fa93d2827f621e89d0d583979c453af5d66a83ddcbf0eb2d462df74ebb422294e601268f4
diff --git a/dev-php/xhprof/metadata.xml b/dev-php/xhprof/metadata.xml
index b5ff04d51c7a..c38027a68715 100644
--- a/dev-php/xhprof/metadata.xml
+++ b/dev-php/xhprof/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/xhprof/xhprof-2.3.5.ebuild b/dev-php/xhprof/xhprof-2.3.5.ebuild
new file mode 100644
index 000000000000..e7f6bda6ad82
--- /dev/null
+++ b/dev-php/xhprof/xhprof-2.3.5.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PHP_EXT_S="${S}/extension"
+PHP_EXT_ECONF_ARGS=""
+USE_PHP="php7-2 php7-3 php7-4 php8-0 php8-1"
+
+inherit php-ext-pecl-r3
+
+KEYWORDS="~amd64 ~x86"
+
+HOMEPAGE="https://pecl.php.net/package/xhprof"
+DESCRIPTION="A Hierarchical Profiler for PHP"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
diff --git a/dev-php/zetacomponents-Base/Manifest b/dev-php/zetacomponents-Base/Manifest
index d2b1d99d3293..71f868353468 100644
--- a/dev-php/zetacomponents-Base/Manifest
+++ b/dev-php/zetacomponents-Base/Manifest
@@ -1 +1,2 @@
DIST zetacomponents-Base-1.9.1.tar.gz 252350 BLAKE2B cc0d82a107fc1190b57b03ce3a594d9ffa5b3a2627cf30d7d31a1018005a8400917cf7bbd1dfeb23f46d118ae56083e147d148b3bbdba5dfea8fde0a8bcf0c46 SHA512 dd56f123c8ed3b8c0116b878120ba7763e402b8364ba404305a9ab483b1c5a341df994517f160c8a959005ab9b75a5a7af74d08b367daa3fd8f852ba4ede5e05
+DIST zetacomponents-Base-1.9.3.tar.gz 253144 BLAKE2B 5e8e5188e67d06da2a4ed0d9cd1df86d15740390109f98028a71cf0aa0cbfaab1a47007095faf7ba8c7fd9b6bb3daae7b3d6fae76cae8b82751b3d67b3680614 SHA512 5718095cbfe657c08b9adf71e4cada49e2edf8518601e235070ac8fb8fc5793bc4ba8a0cb1a4202210fc23884960d06f502288a94cd624c96a53e2fcf395d492
diff --git a/dev-php/zetacomponents-Base/metadata.xml b/dev-php/zetacomponents-Base/metadata.xml
index 0edc8ccac85a..c9f7113195ae 100644
--- a/dev-php/zetacomponents-Base/metadata.xml
+++ b/dev-php/zetacomponents-Base/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>
diff --git a/dev-php/zetacomponents-Base/zetacomponents-Base-1.9.3.ebuild b/dev-php/zetacomponents-Base/zetacomponents-Base-1.9.3.ebuild
new file mode 100644
index 000000000000..03ece24351ac
--- /dev/null
+++ b/dev-php/zetacomponents-Base/zetacomponents-Base-1.9.3.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN="Base"
+
+DESCRIPTION="Base package for any Zeta component"
+HOMEPAGE="https://github.com/zetacomponents/Base"
+SRC_URI="https://github.com/zetacomponents/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+RDEPEND="dev-lang/php:*"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_install() {
+ insinto /usr/share/php/ezc/${MY_PN}
+ doins -r src/*
+ doins "${FILESDIR}"/autoload.php
+
+ einstalldocs
+}
diff --git a/dev-php/zetacomponents-ConsoleTools/metadata.xml b/dev-php/zetacomponents-ConsoleTools/metadata.xml
index e795f5a99f52..e32cf71d82cb 100644
--- a/dev-php/zetacomponents-ConsoleTools/metadata.xml
+++ b/dev-php/zetacomponents-ConsoleTools/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>php-bugs@gentoo.org</email>