summaryrefslogtreecommitdiff
path: root/dev-php
diff options
context:
space:
mode:
Diffstat (limited to 'dev-php')
-rw-r--r--dev-php/File_Iterator-1.3.411
-rw-r--r--dev-php/File_Iterator-1.4.210
-rw-r--r--dev-php/File_Iterator-1.4.310
-rw-r--r--dev-php/File_Iterator/File_Iterator-1.3.4.ebuild19
-rw-r--r--dev-php/File_Iterator/File_Iterator-1.4.2.ebuild32
-rw-r--r--dev-php/File_Iterator/File_Iterator-1.4.3.ebuild32
-rw-r--r--dev-php/File_Iterator/Manifest9
-rw-r--r--dev-php/File_Iterator/files/autoload.php15
-rw-r--r--dev-php/File_Iterator/files/channel.xml16
-rw-r--r--dev-php/File_Iterator/metadata.xml11
-rw-r--r--dev-php/Manifest.gzbin55945 -> 40401 bytes
-rw-r--r--dev-php/PEAR-Archive_Tar-1.4.2-r211
-rw-r--r--dev-php/PEAR-Archive_Tar/Manifest3
-rw-r--r--dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.4.2-r2.ebuild31
-rw-r--r--dev-php/PEAR-Archive_Tar/metadata.xml11
-rw-r--r--dev-php/PEAR-Auth_SASL-1.1.011
-rw-r--r--dev-php/PEAR-Auth_SASL/Manifest3
-rw-r--r--dev-php/PEAR-Auth_SASL/PEAR-Auth_SASL-1.1.0.ebuild14
-rw-r--r--dev-php/PEAR-Auth_SASL/metadata.xml11
-rw-r--r--dev-php/PEAR-Cache-1.5.6-r211
-rw-r--r--dev-php/PEAR-Cache/Manifest3
-rw-r--r--dev-php/PEAR-Cache/PEAR-Cache-1.5.6-r2.ebuild23
-rw-r--r--dev-php/PEAR-Cache/metadata.xml8
-rw-r--r--dev-php/PEAR-Cache_Lite-1.8.213
-rw-r--r--dev-php/PEAR-Cache_Lite/Manifest3
-rw-r--r--dev-php/PEAR-Cache_Lite/PEAR-Cache_Lite-1.8.2.ebuild20
-rw-r--r--dev-php/PEAR-Cache_Lite/metadata.xml8
-rw-r--r--dev-php/PEAR-Config-2.0.0_pre20140323-r113
-rw-r--r--dev-php/PEAR-Config/Manifest3
-rw-r--r--dev-php/PEAR-Config/PEAR-Config-2.0.0_pre20140323-r1.ebuild29
-rw-r--r--dev-php/PEAR-Config/metadata.xml8
-rw-r--r--dev-php/PEAR-Console_CommandLine-1.2.212
-rw-r--r--dev-php/PEAR-Console_CommandLine/Manifest3
-rw-r--r--dev-php/PEAR-Console_CommandLine/PEAR-Console_CommandLine-1.2.2.ebuild52
-rw-r--r--dev-php/PEAR-Console_CommandLine/metadata.xml12
-rw-r--r--dev-php/PEAR-Console_Getargs-1.4.013
-rw-r--r--dev-php/PEAR-Console_Getargs/Manifest3
-rw-r--r--dev-php/PEAR-Console_Getargs/PEAR-Console_Getargs-1.4.0.ebuild19
-rw-r--r--dev-php/PEAR-Console_Getargs/metadata.xml8
-rw-r--r--dev-php/PEAR-Console_Getopt-1.4.1-r111
-rw-r--r--dev-php/PEAR-Console_Getopt/Manifest3
-rw-r--r--dev-php/PEAR-Console_Getopt/PEAR-Console_Getopt-1.4.1-r1.ebuild26
-rw-r--r--dev-php/PEAR-Console_Getopt/metadata.xml11
-rw-r--r--dev-php/PEAR-Console_Table-1.3.0-r111
-rw-r--r--dev-php/PEAR-Console_Table/Manifest3
-rw-r--r--dev-php/PEAR-Console_Table/PEAR-Console_Table-1.3.0-r1.ebuild18
-rw-r--r--dev-php/PEAR-Console_Table/metadata.xml11
-rw-r--r--dev-php/PEAR-Crypt_CHAP-1.5.0-r213
-rw-r--r--dev-php/PEAR-Crypt_CHAP/Manifest4
-rw-r--r--dev-php/PEAR-Crypt_CHAP/PEAR-Crypt_CHAP-1.5.0-r2.ebuild27
-rw-r--r--dev-php/PEAR-Crypt_CHAP/files/CHAP-1.5.0-constructor.patch65
-rw-r--r--dev-php/PEAR-Crypt_CHAP/metadata.xml8
-rw-r--r--dev-php/PEAR-Crypt_GPG-1.6.212
-rw-r--r--dev-php/PEAR-Crypt_GPG-1.6.312
-rw-r--r--dev-php/PEAR-Crypt_GPG/Manifest6
-rw-r--r--dev-php/PEAR-Crypt_GPG/PEAR-Crypt_GPG-1.6.2.ebuild48
-rw-r--r--dev-php/PEAR-Crypt_GPG/PEAR-Crypt_GPG-1.6.3.ebuild46
-rw-r--r--dev-php/PEAR-Crypt_GPG/files/fix-unit-tests-with-new-gpg.patch55
-rw-r--r--dev-php/PEAR-Crypt_GPG/metadata.xml12
-rw-r--r--dev-php/PEAR-Crypt_HMAC-1.0.1-r213
-rw-r--r--dev-php/PEAR-Crypt_HMAC/Manifest4
-rw-r--r--dev-php/PEAR-Crypt_HMAC/PEAR-Crypt_HMAC-1.0.1-r2.ebuild25
-rw-r--r--dev-php/PEAR-Crypt_HMAC/files/HMAC-1.0.1.patch57
-rw-r--r--dev-php/PEAR-Crypt_HMAC/metadata.xml8
-rw-r--r--dev-php/PEAR-Crypt_HMAC2-1.0.0-r113
-rw-r--r--dev-php/PEAR-Crypt_HMAC2/Manifest3
-rw-r--r--dev-php/PEAR-Crypt_HMAC2/PEAR-Crypt_HMAC2-1.0.0-r1.ebuild26
-rw-r--r--dev-php/PEAR-Crypt_HMAC2/metadata.xml8
-rw-r--r--dev-php/PEAR-DB-1.9.2-r113
-rw-r--r--dev-php/PEAR-DB/Manifest3
-rw-r--r--dev-php/PEAR-DB/PEAR-DB-1.9.2-r1.ebuild26
-rw-r--r--dev-php/PEAR-DB/metadata.xml8
-rw-r--r--dev-php/PEAR-DB_DataObject-1.11.5-r112
-rw-r--r--dev-php/PEAR-DB_DataObject/Manifest3
-rw-r--r--dev-php/PEAR-DB_DataObject/PEAR-DB_DataObject-1.11.5-r1.ebuild31
-rw-r--r--dev-php/PEAR-DB_DataObject/metadata.xml8
-rw-r--r--dev-php/PEAR-Date-1.5.0_alpha4-r111
-rw-r--r--dev-php/PEAR-Date/Manifest3
-rw-r--r--dev-php/PEAR-Date/PEAR-Date-1.5.0_alpha4-r1.ebuild16
-rw-r--r--dev-php/PEAR-Date/metadata.xml8
-rw-r--r--dev-php/PEAR-Exception-1.0.012
-rw-r--r--dev-php/PEAR-Exception/Manifest3
-rw-r--r--dev-php/PEAR-Exception/PEAR-Exception-1.0.0.ebuild28
-rw-r--r--dev-php/PEAR-Exception/metadata.xml12
-rw-r--r--dev-php/PEAR-File-1.4.1-r113
-rw-r--r--dev-php/PEAR-File/Manifest3
-rw-r--r--dev-php/PEAR-File/PEAR-File-1.4.1-r1.ebuild18
-rw-r--r--dev-php/PEAR-File/metadata.xml8
-rw-r--r--dev-php/PEAR-File_Archive-1.5.5-r111
-rw-r--r--dev-php/PEAR-File_Archive/Manifest3
-rw-r--r--dev-php/PEAR-File_Archive/PEAR-File_Archive-1.5.5-r1.ebuild33
-rw-r--r--dev-php/PEAR-File_Archive/metadata.xml11
-rw-r--r--dev-php/PEAR-File_Find-1.3.312
-rw-r--r--dev-php/PEAR-File_Find/Manifest3
-rw-r--r--dev-php/PEAR-File_Find/PEAR-File_Find-1.3.3.ebuild45
-rw-r--r--dev-php/PEAR-File_Find/metadata.xml12
-rw-r--r--dev-php/PEAR-File_Fortune-1.0.0-r113
-rw-r--r--dev-php/PEAR-File_Fortune/Manifest3
-rw-r--r--dev-php/PEAR-File_Fortune/PEAR-File_Fortune-1.0.0-r1.ebuild20
-rw-r--r--dev-php/PEAR-File_Fortune/metadata.xml8
-rw-r--r--dev-php/PEAR-File_Gettext-0.4.2-r111
-rw-r--r--dev-php/PEAR-File_Gettext/Manifest4
-rw-r--r--dev-php/PEAR-File_Gettext/PEAR-File_Gettext-0.4.2-r1.ebuild14
-rw-r--r--dev-php/PEAR-File_Gettext/files/File_Gettext-0.4.2-construct.patch67
-rw-r--r--dev-php/PEAR-File_Gettext/metadata.xml8
-rw-r--r--dev-php/PEAR-File_SMBPasswd-1.0.3-r111
-rw-r--r--dev-php/PEAR-File_SMBPasswd/Manifest3
-rw-r--r--dev-php/PEAR-File_SMBPasswd/PEAR-File_SMBPasswd-1.0.3-r1.ebuild20
-rw-r--r--dev-php/PEAR-File_SMBPasswd/metadata.xml8
-rw-r--r--dev-php/PEAR-HTML_AJAX-0.5.89
-rw-r--r--dev-php/PEAR-HTML_AJAX/Manifest3
-rw-r--r--dev-php/PEAR-HTML_AJAX/PEAR-HTML_AJAX-0.5.8.ebuild21
-rw-r--r--dev-php/PEAR-HTML_AJAX/metadata.xml11
-rw-r--r--dev-php/PEAR-HTML_CSS-1.5.4-r213
-rw-r--r--dev-php/PEAR-HTML_CSS/Manifest4
-rw-r--r--dev-php/PEAR-HTML_CSS/PEAR-HTML_CSS-1.5.4-r2.ebuild27
-rw-r--r--dev-php/PEAR-HTML_CSS/files/HTML_CSS-1.5.4-fix-tests.patch112
-rw-r--r--dev-php/PEAR-HTML_CSS/metadata.xml8
-rw-r--r--dev-php/PEAR-HTML_Common-1.2.5-r111
-rw-r--r--dev-php/PEAR-HTML_Common/Manifest3
-rw-r--r--dev-php/PEAR-HTML_Common/PEAR-HTML_Common-1.2.5-r1.ebuild18
-rw-r--r--dev-php/PEAR-HTML_Common/metadata.xml8
-rw-r--r--dev-php/PEAR-HTML_Common2-2.1.113
-rw-r--r--dev-php/PEAR-HTML_Common2/Manifest3
-rw-r--r--dev-php/PEAR-HTML_Common2/PEAR-HTML_Common2-2.1.1.ebuild17
-rw-r--r--dev-php/PEAR-HTML_Common2/metadata.xml8
-rw-r--r--dev-php/PEAR-HTML_Javascript-1.1.2-r111
-rw-r--r--dev-php/PEAR-HTML_Javascript/Manifest3
-rw-r--r--dev-php/PEAR-HTML_Javascript/PEAR-HTML_Javascript-1.1.2-r1.ebuild19
-rw-r--r--dev-php/PEAR-HTML_Javascript/metadata.xml11
-rw-r--r--dev-php/PEAR-HTML_QuickForm2-2.0.2-r113
-rw-r--r--dev-php/PEAR-HTML_QuickForm2/Manifest3
-rw-r--r--dev-php/PEAR-HTML_QuickForm2/PEAR-HTML_QuickForm2-2.0.2-r1.ebuild22
-rw-r--r--dev-php/PEAR-HTML_QuickForm2/metadata.xml8
-rw-r--r--dev-php/PEAR-HTML_Table-1.8.4-r113
-rw-r--r--dev-php/PEAR-HTML_Table/Manifest3
-rw-r--r--dev-php/PEAR-HTML_Table/PEAR-HTML_Table-1.8.4-r1.ebuild22
-rw-r--r--dev-php/PEAR-HTML_Table/metadata.xml8
-rw-r--r--dev-php/PEAR-HTML_Table_Matrix-1.0.10-r111
-rw-r--r--dev-php/PEAR-HTML_Table_Matrix/Manifest3
-rw-r--r--dev-php/PEAR-HTML_Table_Matrix/PEAR-HTML_Table_Matrix-1.0.10-r1.ebuild17
-rw-r--r--dev-php/PEAR-HTML_Table_Matrix/metadata.xml8
-rw-r--r--dev-php/PEAR-HTML_Template_Flexy-1.3.1312
-rw-r--r--dev-php/PEAR-HTML_Template_Flexy/Manifest4
-rw-r--r--dev-php/PEAR-HTML_Template_Flexy/PEAR-HTML_Template_Flexy-1.3.13.ebuild19
-rw-r--r--dev-php/PEAR-HTML_Template_Flexy/files/1.3.13-postrelease-fixes.patch55
-rw-r--r--dev-php/PEAR-HTML_Template_Flexy/metadata.xml11
-rw-r--r--dev-php/PEAR-HTML_Template_Sigma-1.3.0-r113
-rw-r--r--dev-php/PEAR-HTML_Template_Sigma/Manifest4
-rw-r--r--dev-php/PEAR-HTML_Template_Sigma/PEAR-HTML_Template_Sigma-1.3.0-r1.ebuild20
-rw-r--r--dev-php/PEAR-HTML_Template_Sigma/files/HTML_Template_Sigma-1.3.0-php7.patch42
-rw-r--r--dev-php/PEAR-HTML_Template_Sigma/metadata.xml8
-rw-r--r--dev-php/PEAR-HTTP-1.4.1-r313
-rw-r--r--dev-php/PEAR-HTTP/Manifest3
-rw-r--r--dev-php/PEAR-HTTP/PEAR-HTTP-1.4.1-r3.ebuild23
-rw-r--r--dev-php/PEAR-HTTP/metadata.xml8
-rw-r--r--dev-php/PEAR-HTTP_Header-1.2.1-r210
-rw-r--r--dev-php/PEAR-HTTP_Header/Manifest3
-rw-r--r--dev-php/PEAR-HTTP_Header/PEAR-HTTP_Header-1.2.1-r2.ebuild23
-rw-r--r--dev-php/PEAR-HTTP_Header/metadata.xml11
-rw-r--r--dev-php/PEAR-HTTP_Request2-2.3.0-r113
-rw-r--r--dev-php/PEAR-HTTP_Request2/Manifest3
-rw-r--r--dev-php/PEAR-HTTP_Request2/PEAR-HTTP_Request2-2.3.0-r1.ebuild32
-rw-r--r--dev-php/PEAR-HTTP_Request2/metadata.xml17
-rw-r--r--dev-php/PEAR-HTTP_Session2-0.7.3-r213
-rw-r--r--dev-php/PEAR-HTTP_Session2/Manifest3
-rw-r--r--dev-php/PEAR-HTTP_Session2/PEAR-HTTP_Session2-0.7.3-r2.ebuild21
-rw-r--r--dev-php/PEAR-HTTP_Session2/metadata.xml8
-rw-r--r--dev-php/PEAR-Image_Color2-0.1.5-r113
-rw-r--r--dev-php/PEAR-Image_Color2/Manifest3
-rw-r--r--dev-php/PEAR-Image_Color2/PEAR-Image_Color2-0.1.5-r1.ebuild28
-rw-r--r--dev-php/PEAR-Image_Color2/metadata.xml8
-rw-r--r--dev-php/PEAR-Image_GraphViz-1.3.0_p2015110413
-rw-r--r--dev-php/PEAR-Image_GraphViz/Manifest4
-rw-r--r--dev-php/PEAR-Image_GraphViz/PEAR-Image_GraphViz-1.3.0_p20151104.ebuild26
-rw-r--r--dev-php/PEAR-Image_GraphViz/files/Image_GraphViz-1.3.0-constructor.patch55
-rw-r--r--dev-php/PEAR-Image_GraphViz/metadata.xml8
-rw-r--r--dev-php/PEAR-Image_IPTC-1.0.2-r211
-rw-r--r--dev-php/PEAR-Image_IPTC/Manifest3
-rw-r--r--dev-php/PEAR-Image_IPTC/PEAR-Image_IPTC-1.0.2-r2.ebuild18
-rw-r--r--dev-php/PEAR-Image_IPTC/metadata.xml8
-rw-r--r--dev-php/PEAR-Image_Text-0.7.0-r113
-rw-r--r--dev-php/PEAR-Image_Text/Manifest3
-rw-r--r--dev-php/PEAR-Image_Text/PEAR-Image_Text-0.7.0-r1.ebuild20
-rw-r--r--dev-php/PEAR-Image_Text/metadata.xml8
-rw-r--r--dev-php/PEAR-Log-1.13.112
-rw-r--r--dev-php/PEAR-Log/Manifest3
-rw-r--r--dev-php/PEAR-Log/PEAR-Log-1.13.1.ebuild47
-rw-r--r--dev-php/PEAR-Log/metadata.xml11
-rw-r--r--dev-php/PEAR-MDB-1.3.0-r211
-rw-r--r--dev-php/PEAR-MDB/Manifest3
-rw-r--r--dev-php/PEAR-MDB/PEAR-MDB-1.3.0-r2.ebuild14
-rw-r--r--dev-php/PEAR-MDB/metadata.xml8
-rw-r--r--dev-php/PEAR-MDB2-2.5.0_beta5-r113
-rw-r--r--dev-php/PEAR-MDB2/Manifest3
-rw-r--r--dev-php/PEAR-MDB2/PEAR-MDB2-2.5.0_beta5-r1.ebuild26
-rw-r--r--dev-php/PEAR-MDB2/metadata.xml11
-rw-r--r--dev-php/PEAR-MDB2_Driver_mssql-1.5.0_beta4-r111
-rw-r--r--dev-php/PEAR-MDB2_Driver_mssql/Manifest3
-rw-r--r--dev-php/PEAR-MDB2_Driver_mssql/PEAR-MDB2_Driver_mssql-1.5.0_beta4-r1.ebuild17
-rw-r--r--dev-php/PEAR-MDB2_Driver_mssql/metadata.xml11
-rw-r--r--dev-php/PEAR-MDB2_Driver_mysql-1.5.0_beta4-r111
-rw-r--r--dev-php/PEAR-MDB2_Driver_mysql/Manifest3
-rw-r--r--dev-php/PEAR-MDB2_Driver_mysql/PEAR-MDB2_Driver_mysql-1.5.0_beta4-r1.ebuild17
-rw-r--r--dev-php/PEAR-MDB2_Driver_mysql/metadata.xml11
-rw-r--r--dev-php/PEAR-MDB2_Driver_mysqli-1.5.0_beta4-r111
-rw-r--r--dev-php/PEAR-MDB2_Driver_mysqli/Manifest3
-rw-r--r--dev-php/PEAR-MDB2_Driver_mysqli/PEAR-MDB2_Driver_mysqli-1.5.0_beta4-r1.ebuild17
-rw-r--r--dev-php/PEAR-MDB2_Driver_mysqli/metadata.xml11
-rw-r--r--dev-php/PEAR-MDB2_Driver_oci8-1.5.0_beta4-r111
-rw-r--r--dev-php/PEAR-MDB2_Driver_oci8/Manifest3
-rw-r--r--dev-php/PEAR-MDB2_Driver_oci8/PEAR-MDB2_Driver_oci8-1.5.0_beta4-r1.ebuild17
-rw-r--r--dev-php/PEAR-MDB2_Driver_oci8/metadata.xml11
-rw-r--r--dev-php/PEAR-MDB2_Driver_pgsql-1.5.0_beta4-r111
-rw-r--r--dev-php/PEAR-MDB2_Driver_pgsql/Manifest3
-rw-r--r--dev-php/PEAR-MDB2_Driver_pgsql/PEAR-MDB2_Driver_pgsql-1.5.0_beta4-r1.ebuild17
-rw-r--r--dev-php/PEAR-MDB2_Driver_pgsql/metadata.xml11
-rw-r--r--dev-php/PEAR-MIME_Type-1.4.110
-rw-r--r--dev-php/PEAR-MIME_Type/Manifest3
-rw-r--r--dev-php/PEAR-MIME_Type/PEAR-MIME_Type-1.4.1.ebuild21
-rw-r--r--dev-php/PEAR-MIME_Type/metadata.xml11
-rw-r--r--dev-php/PEAR-Mail-1.4.1-r113
-rw-r--r--dev-php/PEAR-Mail/Manifest3
-rw-r--r--dev-php/PEAR-Mail/PEAR-Mail-1.4.1-r1.ebuild20
-rw-r--r--dev-php/PEAR-Mail/metadata.xml11
-rw-r--r--dev-php/PEAR-Mail_Mime-1.10.2-r113
-rw-r--r--dev-php/PEAR-Mail_Mime/Manifest3
-rw-r--r--dev-php/PEAR-Mail_Mime/PEAR-Mail_Mime-1.10.2-r1.ebuild23
-rw-r--r--dev-php/PEAR-Mail_Mime/metadata.xml8
-rw-r--r--dev-php/PEAR-Mail_mimeDecode-1.5.6-r213
-rw-r--r--dev-php/PEAR-Mail_mimeDecode/Manifest3
-rw-r--r--dev-php/PEAR-Mail_mimeDecode/PEAR-Mail_mimeDecode-1.5.6-r2.ebuild19
-rw-r--r--dev-php/PEAR-Mail_mimeDecode/metadata.xml11
-rw-r--r--dev-php/PEAR-Math_BigInteger-1.0.3-r110
-rw-r--r--dev-php/PEAR-Math_BigInteger/Manifest3
-rw-r--r--dev-php/PEAR-Math_BigInteger/PEAR-Math_BigInteger-1.0.3-r1.ebuild27
-rw-r--r--dev-php/PEAR-Math_BigInteger/metadata.xml12
-rw-r--r--dev-php/PEAR-Net_DNS-1.0.7-r111
-rw-r--r--dev-php/PEAR-Net_DNS/Manifest3
-rw-r--r--dev-php/PEAR-Net_DNS/PEAR-Net_DNS-1.0.7-r1.ebuild12
-rw-r--r--dev-php/PEAR-Net_DNS/metadata.xml8
-rw-r--r--dev-php/PEAR-Net_DNS2-1.4.411
-rw-r--r--dev-php/PEAR-Net_DNS2/Manifest3
-rw-r--r--dev-php/PEAR-Net_DNS2/PEAR-Net_DNS2-1.4.4.ebuild16
-rw-r--r--dev-php/PEAR-Net_DNS2/metadata.xml11
-rw-r--r--dev-php/PEAR-Net_DNSBL-1.3.7-r111
-rw-r--r--dev-php/PEAR-Net_DNSBL/Manifest3
-rw-r--r--dev-php/PEAR-Net_DNSBL/PEAR-Net_DNSBL-1.3.7-r1.ebuild30
-rw-r--r--dev-php/PEAR-Net_DNSBL/metadata.xml12
-rw-r--r--dev-php/PEAR-Net_IDNA2-0.2.011
-rw-r--r--dev-php/PEAR-Net_IDNA2/Manifest3
-rw-r--r--dev-php/PEAR-Net_IDNA2/PEAR-Net_IDNA2-0.2.0.ebuild14
-rw-r--r--dev-php/PEAR-Net_IDNA2/metadata.xml11
-rw-r--r--dev-php/PEAR-Net_IPv4-1.3.4-r111
-rw-r--r--dev-php/PEAR-Net_IPv4/Manifest4
-rw-r--r--dev-php/PEAR-Net_IPv4/PEAR-Net_IPv4-1.3.4-r1.ebuild15
-rw-r--r--dev-php/PEAR-Net_IPv4/files/remove_globals.patch96
-rw-r--r--dev-php/PEAR-Net_IPv4/metadata.xml8
-rw-r--r--dev-php/PEAR-Net_IPv6-1.3.0_beta313
-rw-r--r--dev-php/PEAR-Net_IPv6/Manifest3
-rw-r--r--dev-php/PEAR-Net_IPv6/PEAR-Net_IPv6-1.3.0_beta3.ebuild21
-rw-r--r--dev-php/PEAR-Net_IPv6/metadata.xml11
-rw-r--r--dev-php/PEAR-Net_LDAP2-2.2.0-r112
-rw-r--r--dev-php/PEAR-Net_LDAP2/Manifest3
-rw-r--r--dev-php/PEAR-Net_LDAP2/PEAR-Net_LDAP2-2.2.0-r1.ebuild30
-rw-r--r--dev-php/PEAR-Net_LDAP2/metadata.xml11
-rw-r--r--dev-php/PEAR-Net_LDAP3-1.0.5_pre2016040510
-rw-r--r--dev-php/PEAR-Net_LDAP3/Manifest3
-rw-r--r--dev-php/PEAR-Net_LDAP3/PEAR-Net_LDAP3-1.0.5_pre20160405.ebuild24
-rw-r--r--dev-php/PEAR-Net_LDAP3/metadata.xml8
-rw-r--r--dev-php/PEAR-Net_POP3-1.3.8-r112
-rw-r--r--dev-php/PEAR-Net_POP3/Manifest3
-rw-r--r--dev-php/PEAR-Net_POP3/PEAR-Net_POP3-1.3.8-r1.ebuild16
-rw-r--r--dev-php/PEAR-Net_POP3/metadata.xml8
-rw-r--r--dev-php/PEAR-Net_Ping-2.4.5-r211
-rw-r--r--dev-php/PEAR-Net_Ping/Manifest3
-rw-r--r--dev-php/PEAR-Net_Ping/PEAR-Net_Ping-2.4.5-r2.ebuild27
-rw-r--r--dev-php/PEAR-Net_Ping/metadata.xml12
-rw-r--r--dev-php/PEAR-Net_SMTP-1.7.2-r311
-rw-r--r--dev-php/PEAR-Net_SMTP-1.7.311
-rw-r--r--dev-php/PEAR-Net_SMTP/Manifest5
-rw-r--r--dev-php/PEAR-Net_SMTP/PEAR-Net_SMTP-1.7.2-r3.ebuild30
-rw-r--r--dev-php/PEAR-Net_SMTP/PEAR-Net_SMTP-1.7.3.ebuild30
-rw-r--r--dev-php/PEAR-Net_SMTP/metadata.xml12
-rw-r--r--dev-php/PEAR-Net_Sieve-1.5.2-r111
-rw-r--r--dev-php/PEAR-Net_Sieve-1.5.411
-rw-r--r--dev-php/PEAR-Net_Sieve/Manifest5
-rw-r--r--dev-php/PEAR-Net_Sieve/PEAR-Net_Sieve-1.5.2-r1.ebuild28
-rw-r--r--dev-php/PEAR-Net_Sieve/PEAR-Net_Sieve-1.5.4.ebuild28
-rw-r--r--dev-php/PEAR-Net_Sieve/metadata.xml11
-rw-r--r--dev-php/PEAR-Net_SmartIRC-1.1.10-r111
-rw-r--r--dev-php/PEAR-Net_SmartIRC-1.1.1212
-rw-r--r--dev-php/PEAR-Net_SmartIRC/Manifest5
-rw-r--r--dev-php/PEAR-Net_SmartIRC/PEAR-Net_SmartIRC-1.1.10-r1.ebuild34
-rw-r--r--dev-php/PEAR-Net_SmartIRC/PEAR-Net_SmartIRC-1.1.12.ebuild24
-rw-r--r--dev-php/PEAR-Net_SmartIRC/metadata.xml12
-rw-r--r--dev-php/PEAR-Net_Socket-1.2.211
-rw-r--r--dev-php/PEAR-Net_Socket/Manifest3
-rw-r--r--dev-php/PEAR-Net_Socket/PEAR-Net_Socket-1.2.2.ebuild14
-rw-r--r--dev-php/PEAR-Net_Socket/metadata.xml12
-rw-r--r--dev-php/PEAR-Net_Traceroute-0.21.3-r111
-rw-r--r--dev-php/PEAR-Net_Traceroute/Manifest3
-rw-r--r--dev-php/PEAR-Net_Traceroute/PEAR-Net_Traceroute-0.21.3-r1.ebuild25
-rw-r--r--dev-php/PEAR-Net_Traceroute/metadata.xml8
-rw-r--r--dev-php/PEAR-Net_URL-1.0.15-r111
-rw-r--r--dev-php/PEAR-Net_URL/Manifest3
-rw-r--r--dev-php/PEAR-Net_URL/PEAR-Net_URL-1.0.15-r1.ebuild21
-rw-r--r--dev-php/PEAR-Net_URL/metadata.xml8
-rw-r--r--dev-php/PEAR-Net_URL2-2.2.1-r211
-rw-r--r--dev-php/PEAR-Net_URL2/Manifest3
-rw-r--r--dev-php/PEAR-Net_URL2/PEAR-Net_URL2-2.2.1-r2.ebuild14
-rw-r--r--dev-php/PEAR-Net_URL2/metadata.xml11
-rw-r--r--dev-php/PEAR-Net_UserAgent_Detect-2.5.2-r111
-rw-r--r--dev-php/PEAR-Net_UserAgent_Detect/Manifest3
-rw-r--r--dev-php/PEAR-Net_UserAgent_Detect/PEAR-Net_UserAgent_Detect-2.5.2-r1.ebuild21
-rw-r--r--dev-php/PEAR-Net_UserAgent_Detect/metadata.xml8
-rw-r--r--dev-php/PEAR-Numbers_Words-0.18.1-r112
-rw-r--r--dev-php/PEAR-Numbers_Words-0.18.213
-rw-r--r--dev-php/PEAR-Numbers_Words/Manifest5
-rw-r--r--dev-php/PEAR-Numbers_Words/PEAR-Numbers_Words-0.18.1-r1.ebuild32
-rw-r--r--dev-php/PEAR-Numbers_Words/PEAR-Numbers_Words-0.18.2.ebuild22
-rw-r--r--dev-php/PEAR-Numbers_Words/metadata.xml12
-rw-r--r--dev-php/PEAR-OLE-1.0.0_rc311
-rw-r--r--dev-php/PEAR-OLE/Manifest3
-rw-r--r--dev-php/PEAR-OLE/PEAR-OLE-1.0.0_rc3.ebuild15
-rw-r--r--dev-php/PEAR-OLE/metadata.xml12
-rw-r--r--dev-php/PEAR-PEAR-1.10.510
-rw-r--r--dev-php/PEAR-PEAR/Manifest5
-rw-r--r--dev-php/PEAR-PEAR/PEAR-PEAR-1.10.5.ebuild177
-rw-r--r--dev-php/PEAR-PEAR/files/gentoo-libtool-mismatch-fix-v2.patch15
-rw-r--r--dev-php/PEAR-PEAR/files/pear.conf-r22
-rw-r--r--dev-php/PEAR-PEAR/metadata.xml11
-rw-r--r--dev-php/PEAR-PEAR_PackageFileManager-1.7.2-r211
-rw-r--r--dev-php/PEAR-PEAR_PackageFileManager/Manifest3
-rw-r--r--dev-php/PEAR-PEAR_PackageFileManager/PEAR-PEAR_PackageFileManager-1.7.2-r2.ebuild17
-rw-r--r--dev-php/PEAR-PEAR_PackageFileManager/metadata.xml11
-rw-r--r--dev-php/PEAR-PEAR_PackageFileManager2-1.0.4-r211
-rw-r--r--dev-php/PEAR-PEAR_PackageFileManager2/Manifest3
-rw-r--r--dev-php/PEAR-PEAR_PackageFileManager2/PEAR-PEAR_PackageFileManager2-1.0.4-r2.ebuild16
-rw-r--r--dev-php/PEAR-PEAR_PackageFileManager2/metadata.xml11
-rw-r--r--dev-php/PEAR-PEAR_PackageFileManager_Plugins-1.0.4-r111
-rw-r--r--dev-php/PEAR-PEAR_PackageFileManager_Plugins/Manifest3
-rw-r--r--dev-php/PEAR-PEAR_PackageFileManager_Plugins/PEAR-PEAR_PackageFileManager_Plugins-1.0.4-r1.ebuild16
-rw-r--r--dev-php/PEAR-PEAR_PackageFileManager_Plugins/metadata.xml11
-rw-r--r--dev-php/PEAR-PHP_Beautifier-0.1.15-r211
-rw-r--r--dev-php/PEAR-PHP_Beautifier/Manifest4
-rw-r--r--dev-php/PEAR-PHP_Beautifier/PEAR-PHP_Beautifier-0.1.15-r2.ebuild44
-rw-r--r--dev-php/PEAR-PHP_Beautifier/files/use_default_error_reporting.patch44
-rw-r--r--dev-php/PEAR-PHP_Beautifier/metadata.xml18
-rw-r--r--dev-php/PEAR-PHP_Debug-1.0.3-r312
-rw-r--r--dev-php/PEAR-PHP_Debug/Manifest3
-rw-r--r--dev-php/PEAR-PHP_Debug/PEAR-PHP_Debug-1.0.3-r3.ebuild21
-rw-r--r--dev-php/PEAR-PHP_Debug/metadata.xml8
-rw-r--r--dev-php/PEAR-Pager-2.5.111
-rw-r--r--dev-php/PEAR-Pager/Manifest3
-rw-r--r--dev-php/PEAR-Pager/PEAR-Pager-2.5.1.ebuild15
-rw-r--r--dev-php/PEAR-Pager/metadata.xml12
-rw-r--r--dev-php/PEAR-Services_JSON-1.0.3-r111
-rw-r--r--dev-php/PEAR-Services_JSON/Manifest5
-rw-r--r--dev-php/PEAR-Services_JSON/PEAR-Services_JSON-1.0.3-r1.ebuild19
-rw-r--r--dev-php/PEAR-Services_JSON/files/JSON-1.0.3-constructor.patch42
-rw-r--r--dev-php/PEAR-Services_JSON/files/JSON-1.0.3-upstream-typo.patch20
-rw-r--r--dev-php/PEAR-Services_JSON/metadata.xml8
-rw-r--r--dev-php/PEAR-Services_TinyURL-0.1.2-r111
-rw-r--r--dev-php/PEAR-Services_TinyURL/Manifest3
-rw-r--r--dev-php/PEAR-Services_TinyURL/PEAR-Services_TinyURL-0.1.2-r1.ebuild15
-rw-r--r--dev-php/PEAR-Services_TinyURL/metadata.xml8
-rw-r--r--dev-php/PEAR-Services_W3C_CSSValidator-0.2.311
-rw-r--r--dev-php/PEAR-Services_W3C_CSSValidator/Manifest3
-rw-r--r--dev-php/PEAR-Services_W3C_CSSValidator/PEAR-Services_W3C_CSSValidator-0.2.3.ebuild27
-rw-r--r--dev-php/PEAR-Services_W3C_CSSValidator/metadata.xml12
-rw-r--r--dev-php/PEAR-Spreadsheet_Excel_Writer-0.9.411
-rw-r--r--dev-php/PEAR-Spreadsheet_Excel_Writer/Manifest3
-rw-r--r--dev-php/PEAR-Spreadsheet_Excel_Writer/PEAR-Spreadsheet_Excel_Writer-0.9.4.ebuild14
-rw-r--r--dev-php/PEAR-Spreadsheet_Excel_Writer/metadata.xml8
-rw-r--r--dev-php/PEAR-Structures_Graph-1.1.1-r111
-rw-r--r--dev-php/PEAR-Structures_Graph/Manifest3
-rw-r--r--dev-php/PEAR-Structures_Graph/PEAR-Structures_Graph-1.1.1-r1.ebuild26
-rw-r--r--dev-php/PEAR-Structures_Graph/metadata.xml11
-rw-r--r--dev-php/PEAR-System_Command-1.0.8-r111
-rw-r--r--dev-php/PEAR-System_Command/Manifest3
-rw-r--r--dev-php/PEAR-System_Command/PEAR-System_Command-1.0.8-r1.ebuild27
-rw-r--r--dev-php/PEAR-System_Command/metadata.xml12
-rw-r--r--dev-php/PEAR-Text_CAPTCHA-1.0.2-r112
-rw-r--r--dev-php/PEAR-Text_CAPTCHA/Manifest3
-rw-r--r--dev-php/PEAR-Text_CAPTCHA/PEAR-Text_CAPTCHA-1.0.2-r1.ebuild27
-rw-r--r--dev-php/PEAR-Text_CAPTCHA/metadata.xml11
-rw-r--r--dev-php/PEAR-Text_CAPTCHA_Numeral-1.3.2-r113
-rw-r--r--dev-php/PEAR-Text_CAPTCHA_Numeral/Manifest3
-rw-r--r--dev-php/PEAR-Text_CAPTCHA_Numeral/PEAR-Text_CAPTCHA_Numeral-1.3.2-r1.ebuild20
-rw-r--r--dev-php/PEAR-Text_CAPTCHA_Numeral/metadata.xml8
-rw-r--r--dev-php/PEAR-Text_Figlet-1.0.2-r111
-rw-r--r--dev-php/PEAR-Text_Figlet/Manifest3
-rw-r--r--dev-php/PEAR-Text_Figlet/PEAR-Text_Figlet-1.0.2-r1.ebuild44
-rw-r--r--dev-php/PEAR-Text_Figlet/metadata.xml12
-rw-r--r--dev-php/PEAR-Text_Highlighter-0.7.3-r110
-rw-r--r--dev-php/PEAR-Text_Highlighter-0.8.011
-rw-r--r--dev-php/PEAR-Text_Highlighter/Manifest5
-rw-r--r--dev-php/PEAR-Text_Highlighter/PEAR-Text_Highlighter-0.7.3-r1.ebuild33
-rw-r--r--dev-php/PEAR-Text_Highlighter/PEAR-Text_Highlighter-0.8.0.ebuild20
-rw-r--r--dev-php/PEAR-Text_Highlighter/metadata.xml11
-rw-r--r--dev-php/PEAR-Text_Password-1.2.112
-rw-r--r--dev-php/PEAR-Text_Password/Manifest3
-rw-r--r--dev-php/PEAR-Text_Password/PEAR-Text_Password-1.2.1.ebuild29
-rw-r--r--dev-php/PEAR-Text_Password/metadata.xml12
-rw-r--r--dev-php/PEAR-Text_Wiki-1.2.2_p2017090413
-rw-r--r--dev-php/PEAR-Text_Wiki/Manifest3
-rw-r--r--dev-php/PEAR-Text_Wiki/PEAR-Text_Wiki-1.2.2_p20170904.ebuild27
-rw-r--r--dev-php/PEAR-Text_Wiki/metadata.xml11
-rw-r--r--dev-php/PEAR-Text_Wiki_BBCode-0.0.4-r311
-rw-r--r--dev-php/PEAR-Text_Wiki_BBCode/Manifest3
-rw-r--r--dev-php/PEAR-Text_Wiki_BBCode/PEAR-Text_Wiki_BBCode-0.0.4-r3.ebuild21
-rw-r--r--dev-php/PEAR-Text_Wiki_BBCode/metadata.xml8
-rw-r--r--dev-php/PEAR-Text_Wiki_Mediawiki-0.2.0_p2014060413
-rw-r--r--dev-php/PEAR-Text_Wiki_Mediawiki/Manifest4
-rw-r--r--dev-php/PEAR-Text_Wiki_Mediawiki/PEAR-Text_Wiki_Mediawiki-0.2.0_p20140604.ebuild26
-rw-r--r--dev-php/PEAR-Text_Wiki_Mediawiki/files/0.2.0-constructor.patch36
-rw-r--r--dev-php/PEAR-Text_Wiki_Mediawiki/metadata.xml8
-rw-r--r--dev-php/PEAR-Validate-0.8.5-r113
-rw-r--r--dev-php/PEAR-Validate/Manifest4
-rw-r--r--dev-php/PEAR-Validate/PEAR-Validate-0.8.5-r1.ebuild22
-rw-r--r--dev-php/PEAR-Validate/files/0.8.5-fix-test-php7.patch19
-rw-r--r--dev-php/PEAR-Validate/metadata.xml8
-rw-r--r--dev-php/PEAR-Var_Dump-1.0.4-r314
-rw-r--r--dev-php/PEAR-Var_Dump/Manifest3
-rw-r--r--dev-php/PEAR-Var_Dump/PEAR-Var_Dump-1.0.4-r3.ebuild33
-rw-r--r--dev-php/PEAR-Var_Dump/metadata.xml11
-rw-r--r--dev-php/PEAR-VersionControl_SVN-0.5.2-r111
-rw-r--r--dev-php/PEAR-VersionControl_SVN-0.5.2_p2018031413
-rw-r--r--dev-php/PEAR-VersionControl_SVN/Manifest5
-rw-r--r--dev-php/PEAR-VersionControl_SVN/PEAR-VersionControl_SVN-0.5.2-r1.ebuild20
-rw-r--r--dev-php/PEAR-VersionControl_SVN/PEAR-VersionControl_SVN-0.5.2_p20180314.ebuild28
-rw-r--r--dev-php/PEAR-VersionControl_SVN/metadata.xml8
-rw-r--r--dev-php/PEAR-XML_Parser-1.3.7-r111
-rw-r--r--dev-php/PEAR-XML_Parser/Manifest3
-rw-r--r--dev-php/PEAR-XML_Parser/PEAR-XML_Parser-1.3.7-r1.ebuild17
-rw-r--r--dev-php/PEAR-XML_Parser/metadata.xml8
-rw-r--r--dev-php/PEAR-XML_RSS-1.1.011
-rw-r--r--dev-php/PEAR-XML_RSS-1.1.0_alpha110
-rw-r--r--dev-php/PEAR-XML_RSS/Manifest5
-rw-r--r--dev-php/PEAR-XML_RSS/PEAR-XML_RSS-1.1.0.ebuild17
-rw-r--r--dev-php/PEAR-XML_RSS/PEAR-XML_RSS-1.1.0_alpha1.ebuild30
-rw-r--r--dev-php/PEAR-XML_RSS/metadata.xml12
-rw-r--r--dev-php/PEAR-XML_Serializer-0.21.0-r113
-rw-r--r--dev-php/PEAR-XML_Serializer/Manifest3
-rw-r--r--dev-php/PEAR-XML_Serializer/PEAR-XML_Serializer-0.21.0-r1.ebuild30
-rw-r--r--dev-php/PEAR-XML_Serializer/metadata.xml11
-rw-r--r--dev-php/PEAR-XML_Util-1.4.212
-rw-r--r--dev-php/PEAR-XML_Util/Manifest3
-rw-r--r--dev-php/PEAR-XML_Util/PEAR-XML_Util-1.4.2.ebuild29
-rw-r--r--dev-php/PEAR-XML_Util/metadata.xml11
-rw-r--r--dev-php/PHPMailer-5.2.26-r212
-rw-r--r--dev-php/PHPMailer/Manifest3
-rw-r--r--dev-php/PHPMailer/PHPMailer-5.2.26-r2.ebuild64
-rw-r--r--dev-php/PHPMailer/metadata.xml15
-rw-r--r--dev-php/PHP_CodeCoverage-1.2.1312
-rw-r--r--dev-php/PHP_CodeCoverage-4.0.710
-rw-r--r--dev-php/PHP_CodeCoverage/Manifest7
-rw-r--r--dev-php/PHP_CodeCoverage/PHP_CodeCoverage-1.2.13.ebuild24
-rw-r--r--dev-php/PHP_CodeCoverage/PHP_CodeCoverage-4.0.7.ebuild47
-rw-r--r--dev-php/PHP_CodeCoverage/files/autoload.php59
-rw-r--r--dev-php/PHP_CodeCoverage/files/channel.xml16
-rw-r--r--dev-php/PHP_CodeCoverage/metadata.xml11
-rw-r--r--dev-php/PHP_CodeSniffer-3.2.112
-rw-r--r--dev-php/PHP_CodeSniffer/Manifest3
-rw-r--r--dev-php/PHP_CodeSniffer/PHP_CodeSniffer-3.2.1.ebuild51
-rw-r--r--dev-php/PHP_CodeSniffer/metadata.xml11
-rw-r--r--dev-php/PHP_Timer-1.0.511
-rw-r--r--dev-php/PHP_Timer-1.0.910
-rw-r--r--dev-php/PHP_Timer/Manifest7
-rw-r--r--dev-php/PHP_Timer/PHP_Timer-1.0.5.ebuild18
-rw-r--r--dev-php/PHP_Timer/PHP_Timer-1.0.9.ebuild31
-rw-r--r--dev-php/PHP_Timer/files/autoload.php13
-rw-r--r--dev-php/PHP_Timer/files/channel.xml16
-rw-r--r--dev-php/PHP_Timer/metadata.xml11
-rw-r--r--dev-php/PHP_TokenStream-1.1.312
-rw-r--r--dev-php/PHP_TokenStream-1.4.1110
-rw-r--r--dev-php/PHP_TokenStream/Manifest7
-rw-r--r--dev-php/PHP_TokenStream/PHP_TokenStream-1.1.3.ebuild24
-rw-r--r--dev-php/PHP_TokenStream/PHP_TokenStream-1.4.11.ebuild35
-rw-r--r--dev-php/PHP_TokenStream/files/autoload.php15
-rw-r--r--dev-php/PHP_TokenStream/files/channel.xml16
-rw-r--r--dev-php/PHP_TokenStream/metadata.xml11
-rw-r--r--dev-php/SabreAMF-1.3.234_p011
-rw-r--r--dev-php/SabreAMF/Manifest3
-rw-r--r--dev-php/SabreAMF/SabreAMF-1.3.234_p0.ebuild29
-rw-r--r--dev-php/SabreAMF/metadata.xml11
-rw-r--r--dev-php/Text_Template-1.1.112
-rw-r--r--dev-php/Text_Template-1.2.110
-rw-r--r--dev-php/Text_Template/Manifest7
-rw-r--r--dev-php/Text_Template/Text_Template-1.1.1.ebuild21
-rw-r--r--dev-php/Text_Template/Text_Template-1.2.1.ebuild31
-rw-r--r--dev-php/Text_Template/files/autoload.php13
-rw-r--r--dev-php/Text_Template/files/channel.xml16
-rw-r--r--dev-php/Text_Template/metadata.xml11
-rw-r--r--dev-php/YAML-1.0.6-r311
-rw-r--r--dev-php/YAML/Manifest4
-rw-r--r--dev-php/YAML/YAML-1.0.6-r3.ebuild26
-rw-r--r--dev-php/YAML/files/channel.xml16
-rw-r--r--dev-php/YAML/metadata.xml11
-rw-r--r--dev-php/adodb-5.20.1210
-rw-r--r--dev-php/adodb-5.20.910
-rw-r--r--dev-php/adodb/Manifest5
-rw-r--r--dev-php/adodb/adodb-5.20.12.ebuild40
-rw-r--r--dev-php/adodb/adodb-5.20.9.ebuild40
-rw-r--r--dev-php/adodb/metadata.xml12
-rw-r--r--dev-php/agavi-1.0.811
-rw-r--r--dev-php/agavi/Manifest4
-rw-r--r--dev-php/agavi/agavi-1.0.8.ebuild39
-rw-r--r--dev-php/agavi/files/agavi-executable14
-rw-r--r--dev-php/agavi/metadata.xml18
-rw-r--r--dev-php/awl-0.5912
-rw-r--r--dev-php/awl/Manifest3
-rw-r--r--dev-php/awl/awl-0.59.ebuild32
-rw-r--r--dev-php/awl/metadata.xml16
-rw-r--r--dev-php/ca-bundle-1.0.310
-rw-r--r--dev-php/ca-bundle/Manifest4
-rw-r--r--dev-php/ca-bundle/ca-bundle-1.0.3.ebuild22
-rw-r--r--dev-php/ca-bundle/files/autoload.php8
-rw-r--r--dev-php/ca-bundle/metadata.xml24
-rw-r--r--dev-php/cli-prompt-1.0.010
-rw-r--r--dev-php/cli-prompt/Manifest4
-rw-r--r--dev-php/cli-prompt/cli-prompt-1.0.0.ebuild22
-rw-r--r--dev-php/cli-prompt/files/autoload.php8
-rw-r--r--dev-php/cli-prompt/metadata.xml22
-rw-r--r--dev-php/composer-1.6.310
-rw-r--r--dev-php/composer-1.6.510
-rw-r--r--dev-php/composer/Manifest6
-rw-r--r--dev-php/composer/composer-1.6.3.ebuild46
-rw-r--r--dev-php/composer/composer-1.6.5.ebuild46
-rw-r--r--dev-php/composer/files/autoload.php28
-rw-r--r--dev-php/composer/metadata.xml23
-rw-r--r--dev-php/cphplib-0.51-r112
-rw-r--r--dev-php/cphplib/Manifest4
-rw-r--r--dev-php/cphplib/cphplib-0.51-r1.ebuild29
-rw-r--r--dev-php/cphplib/files/constructor.patch42
-rw-r--r--dev-php/cphplib/metadata.xml11
-rw-r--r--dev-php/doctrine-1.2.511
-rw-r--r--dev-php/doctrine-2.4.611
-rw-r--r--dev-php/doctrine-2.6.110
-rw-r--r--dev-php/doctrine-instantiator-1.0.510
-rw-r--r--dev-php/doctrine-instantiator/Manifest4
-rw-r--r--dev-php/doctrine-instantiator/doctrine-instantiator-1.0.5.ebuild27
-rw-r--r--dev-php/doctrine-instantiator/files/autoload.php8
-rw-r--r--dev-php/doctrine-instantiator/metadata.xml11
-rw-r--r--dev-php/doctrine/Manifest7
-rw-r--r--dev-php/doctrine/doctrine-1.2.5.ebuild25
-rw-r--r--dev-php/doctrine/doctrine-2.4.6.ebuild24
-rw-r--r--dev-php/doctrine/doctrine-2.6.1.ebuild29
-rw-r--r--dev-php/doctrine/metadata.xml11
-rw-r--r--dev-php/fedora-autoloader-0.2.112
-rw-r--r--dev-php/fedora-autoloader-1.0.013
-rw-r--r--dev-php/fedora-autoloader/Manifest5
-rw-r--r--dev-php/fedora-autoloader/fedora-autoloader-0.2.1.ebuild31
-rw-r--r--dev-php/fedora-autoloader/fedora-autoloader-1.0.0.ebuild34
-rw-r--r--dev-php/fedora-autoloader/metadata.xml22
-rw-r--r--dev-php/geos-php-1.0.014
-rw-r--r--dev-php/geos-php/Manifest3
-rw-r--r--dev-php/geos-php/geos-php-1.0.0.ebuild30
-rw-r--r--dev-php/geos-php/metadata.xml8
-rw-r--r--dev-php/igbinary-2.0.514
-rw-r--r--dev-php/igbinary-2.0.614
-rw-r--r--dev-php/igbinary/Manifest5
-rw-r--r--dev-php/igbinary/igbinary-2.0.5.ebuild26
-rw-r--r--dev-php/igbinary/igbinary-2.0.6.ebuild26
-rw-r--r--dev-php/igbinary/metadata.xml11
-rw-r--r--dev-php/jpgraph-4.0.211
-rw-r--r--dev-php/jpgraph-4.2.011
-rw-r--r--dev-php/jpgraph/Manifest6
-rw-r--r--dev-php/jpgraph/files/gentoo_ttf_dir.patch31
-rw-r--r--dev-php/jpgraph/jpgraph-4.0.2.ebuild63
-rw-r--r--dev-php/jpgraph/jpgraph-4.2.0.ebuild63
-rw-r--r--dev-php/jpgraph/metadata.xml8
-rw-r--r--dev-php/json-schema-4.1.013
-rw-r--r--dev-php/json-schema/Manifest4
-rw-r--r--dev-php/json-schema/files/autoload.php10
-rw-r--r--dev-php/json-schema/json-schema-4.1.0.ebuild40
-rw-r--r--dev-php/json-schema/metadata.xml22
-rw-r--r--dev-php/jsonlint-1.6.013
-rw-r--r--dev-php/jsonlint/Manifest4
-rw-r--r--dev-php/jsonlint/files/autoload.php8
-rw-r--r--dev-php/jsonlint/jsonlint-1.6.0.ebuild40
-rw-r--r--dev-php/jsonlint/metadata.xml21
-rw-r--r--dev-php/libchart-1.311
-rw-r--r--dev-php/libchart/Manifest3
-rw-r--r--dev-php/libchart/libchart-1.3.ebuild31
-rw-r--r--dev-php/libchart/metadata.xml11
-rw-r--r--dev-php/libvirt-php-0.5.315
-rw-r--r--dev-php/libvirt-php-0.5.415
-rw-r--r--dev-php/libvirt-php-999913
-rw-r--r--dev-php/libvirt-php/Manifest7
-rw-r--r--dev-php/libvirt-php/files/remove-imagick-check.patch12
-rw-r--r--dev-php/libvirt-php/libvirt-php-0.5.3.ebuild65
-rw-r--r--dev-php/libvirt-php/libvirt-php-0.5.4.ebuild66
-rw-r--r--dev-php/libvirt-php/libvirt-php-9999.ebuild65
-rw-r--r--dev-php/libvirt-php/metadata.xml16
-rw-r--r--dev-php/magickwand-1.0.9-r314
-rw-r--r--dev-php/magickwand/Manifest3
-rw-r--r--dev-php/magickwand/magickwand-1.0.9-r3.ebuild30
-rw-r--r--dev-php/magickwand/metadata.xml12
-rw-r--r--dev-php/maxmind-db-reader-1.2.014
-rw-r--r--dev-php/maxmind-db-reader-1.3.014
-rw-r--r--dev-php/maxmind-db-reader/Manifest6
-rw-r--r--dev-php/maxmind-db-reader/files/autoload.php6
-rw-r--r--dev-php/maxmind-db-reader/maxmind-db-reader-1.2.0.ebuild76
-rw-r--r--dev-php/maxmind-db-reader/maxmind-db-reader-1.3.0.ebuild77
-rw-r--r--dev-php/maxmind-db-reader/metadata.xml16
-rw-r--r--dev-php/metadata.xml40
-rw-r--r--dev-php/ming-php-0.4.714
-rw-r--r--dev-php/ming-php-0.4.814
-rw-r--r--dev-php/ming-php/Manifest7
-rw-r--r--dev-php/ming-php/files/ming-php-54.patch479
-rw-r--r--dev-php/ming-php/files/php_ext-config.m4112
-rw-r--r--dev-php/ming-php/metadata.xml16
-rw-r--r--dev-php/ming-php/ming-php-0.4.7.ebuild46
-rw-r--r--dev-php/ming-php/ming-php-0.4.8.ebuild47
-rw-r--r--dev-php/mmslib-0.9711
-rw-r--r--dev-php/mmslib/Manifest3
-rw-r--r--dev-php/mmslib/metadata.xml8
-rw-r--r--dev-php/mmslib/mmslib-0.97.ebuild24
-rw-r--r--dev-php/mockery-0.9.0-r111
-rw-r--r--dev-php/mockery/Manifest4
-rw-r--r--dev-php/mockery/files/channel.xml16
-rw-r--r--dev-php/mockery/metadata.xml11
-rw-r--r--dev-php/mockery/mockery-0.9.0-r1.ebuild20
-rw-r--r--dev-php/myclabs-deepcopy-1.6.010
-rw-r--r--dev-php/myclabs-deepcopy-1.6.110
-rw-r--r--dev-php/myclabs-deepcopy/Manifest6
-rw-r--r--dev-php/myclabs-deepcopy/files/autoload.php8
-rw-r--r--dev-php/myclabs-deepcopy/metadata.xml11
-rw-r--r--dev-php/myclabs-deepcopy/myclabs-deepcopy-1.6.0.ebuild27
-rw-r--r--dev-php/myclabs-deepcopy/myclabs-deepcopy-1.6.1.ebuild27
-rw-r--r--dev-php/onphp-1.0.11_pre2014112412
-rw-r--r--dev-php/onphp/Manifest4
-rw-r--r--dev-php/onphp/metadata.xml8
-rw-r--r--dev-php/onphp/onphp-1.0.11_pre20141124.ebuild32
-rw-r--r--dev-php/pear-1.10.1-r19
-rw-r--r--dev-php/pear-1.10.39
-rw-r--r--dev-php/pear/Manifest3
-rw-r--r--dev-php/pear/metadata.xml8
-rw-r--r--dev-php/pear/pear-1.10.1-r1.ebuild16
-rw-r--r--dev-php/pear/pear-1.10.3.ebuild16
-rw-r--r--dev-php/pecl-amqp-1.8.014
-rw-r--r--dev-php/pecl-amqp-1.9.014
-rw-r--r--dev-php/pecl-amqp-1.9.314
-rw-r--r--dev-php/pecl-amqp/Manifest7
-rw-r--r--dev-php/pecl-amqp/metadata.xml8
-rw-r--r--dev-php/pecl-amqp/pecl-amqp-1.8.0.ebuild18
-rw-r--r--dev-php/pecl-amqp/pecl-amqp-1.9.0.ebuild19
-rw-r--r--dev-php/pecl-amqp/pecl-amqp-1.9.3.ebuild19
-rw-r--r--dev-php/pecl-apcu-4.0.1115
-rw-r--r--dev-php/pecl-apcu-5.1.1014
-rw-r--r--dev-php/pecl-apcu-5.1.1114
-rw-r--r--dev-php/pecl-apcu-5.1.814
-rw-r--r--dev-php/pecl-apcu-5.1.914
-rw-r--r--dev-php/pecl-apcu/Manifest11
-rw-r--r--dev-php/pecl-apcu/metadata.xml14
-rw-r--r--dev-php/pecl-apcu/pecl-apcu-4.0.11.ebuild76
-rw-r--r--dev-php/pecl-apcu/pecl-apcu-5.1.10.ebuild80
-rw-r--r--dev-php/pecl-apcu/pecl-apcu-5.1.11.ebuild80
-rw-r--r--dev-php/pecl-apcu/pecl-apcu-5.1.8.ebuild80
-rw-r--r--dev-php/pecl-apcu/pecl-apcu-5.1.9.ebuild80
-rw-r--r--dev-php/pecl-apcu_bc-1.0.3-r114
-rw-r--r--dev-php/pecl-apcu_bc-1.0.414
-rw-r--r--dev-php/pecl-apcu_bc/Manifest5
-rw-r--r--dev-php/pecl-apcu_bc/metadata.xml8
-rw-r--r--dev-php/pecl-apcu_bc/pecl-apcu_bc-1.0.3-r1.ebuild34
-rw-r--r--dev-php/pecl-apcu_bc/pecl-apcu_bc-1.0.4.ebuild25
-rw-r--r--dev-php/pecl-bbcode-1.0.3_beta1-r214
-rw-r--r--dev-php/pecl-bbcode/Manifest3
-rw-r--r--dev-php/pecl-bbcode/metadata.xml14
-rw-r--r--dev-php/pecl-bbcode/pecl-bbcode-1.0.3_beta1-r2.ebuild32
-rw-r--r--dev-php/pecl-cairo-0.3.2-r114
-rw-r--r--dev-php/pecl-cairo/Manifest3
-rw-r--r--dev-php/pecl-cairo/metadata.xml12
-rw-r--r--dev-php/pecl-cairo/pecl-cairo-0.3.2-r1.ebuild25
-rw-r--r--dev-php/pecl-cassandra-1.3.214
-rw-r--r--dev-php/pecl-cassandra/Manifest3
-rw-r--r--dev-php/pecl-cassandra/metadata.xml18
-rw-r--r--dev-php/pecl-cassandra/pecl-cassandra-1.3.2.ebuild19
-rw-r--r--dev-php/pecl-crack-0.4-r614
-rw-r--r--dev-php/pecl-crack-0.4-r714
-rw-r--r--dev-php/pecl-crack/Manifest7
-rw-r--r--dev-php/pecl-crack/files/0.4-php7.patch356
-rw-r--r--dev-php/pecl-crack/files/fix-pecl-bug-5765.patch11
-rw-r--r--dev-php/pecl-crack/files/fix-php-5-4-support.patch30
-rw-r--r--dev-php/pecl-crack/metadata.xml8
-rw-r--r--dev-php/pecl-crack/pecl-crack-0.4-r6.ebuild26
-rw-r--r--dev-php/pecl-crack/pecl-crack-0.4-r7.ebuild26
-rw-r--r--dev-php/pecl-dbase-5.1.115
-rw-r--r--dev-php/pecl-dbase-7.0.0_beta1-r114
-rw-r--r--dev-php/pecl-dbase/Manifest5
-rw-r--r--dev-php/pecl-dbase/metadata.xml8
-rw-r--r--dev-php/pecl-dbase/pecl-dbase-5.1.1.ebuild44
-rw-r--r--dev-php/pecl-dbase/pecl-dbase-7.0.0_beta1-r1.ebuild44
-rw-r--r--dev-php/pecl-dbx-1.1.2-r214
-rw-r--r--dev-php/pecl-dbx/Manifest3
-rw-r--r--dev-php/pecl-dbx/metadata.xml8
-rw-r--r--dev-php/pecl-dbx/pecl-dbx-1.1.2-r2.ebuild19
-rw-r--r--dev-php/pecl-dio-0.1.0-r114
-rw-r--r--dev-php/pecl-dio/Manifest3
-rw-r--r--dev-php/pecl-dio/metadata.xml8
-rw-r--r--dev-php/pecl-dio/pecl-dio-0.1.0-r1.ebuild24
-rw-r--r--dev-php/pecl-eio-2.0.2-r114
-rw-r--r--dev-php/pecl-eio/Manifest3
-rw-r--r--dev-php/pecl-eio/metadata.xml12
-rw-r--r--dev-php/pecl-eio/pecl-eio-2.0.2-r1.ebuild24
-rw-r--r--dev-php/pecl-event-2.2.114
-rw-r--r--dev-php/pecl-event-2.3.0-r114
-rw-r--r--dev-php/pecl-event/Manifest5
-rw-r--r--dev-php/pecl-event/metadata.xml15
-rw-r--r--dev-php/pecl-event/pecl-event-2.2.1.ebuild42
-rw-r--r--dev-php/pecl-event/pecl-event-2.3.0-r1.ebuild52
-rw-r--r--dev-php/pecl-geoip-1.1.1-r314
-rw-r--r--dev-php/pecl-geoip-1.1.1-r414
-rw-r--r--dev-php/pecl-geoip/Manifest5
-rw-r--r--dev-php/pecl-geoip/files/fix-failing-tests-1.1.1.patch46
-rw-r--r--dev-php/pecl-geoip/metadata.xml8
-rw-r--r--dev-php/pecl-geoip/pecl-geoip-1.1.1-r3.ebuild22
-rw-r--r--dev-php/pecl-geoip/pecl-geoip-1.1.1-r4.ebuild22
-rw-r--r--dev-php/pecl-gnupg-1.4.0-r114
-rw-r--r--dev-php/pecl-gnupg/Manifest4
-rw-r--r--dev-php/pecl-gnupg/files/1.3.2/01-large_file_system.patch9
-rw-r--r--dev-php/pecl-gnupg/metadata.xml8
-rw-r--r--dev-php/pecl-gnupg/pecl-gnupg-1.4.0-r1.ebuild28
-rw-r--r--dev-php/pecl-haru-1.0.4-r214
-rw-r--r--dev-php/pecl-haru/Manifest3
-rw-r--r--dev-php/pecl-haru/metadata.xml11
-rw-r--r--dev-php/pecl-haru/pecl-haru-1.0.4-r2.ebuild28
-rw-r--r--dev-php/pecl-htscanner-1.0.1-r314
-rw-r--r--dev-php/pecl-htscanner/Manifest3
-rw-r--r--dev-php/pecl-htscanner/metadata.xml8
-rw-r--r--dev-php/pecl-htscanner/pecl-htscanner-1.0.1-r3.ebuild40
-rw-r--r--dev-php/pecl-http-2.6.015
-rw-r--r--dev-php/pecl-http-2.6.0-r115
-rw-r--r--dev-php/pecl-http-2.6.0-r215
-rw-r--r--dev-php/pecl-http-3.1.014
-rw-r--r--dev-php/pecl-http-3.1.0-r114
-rw-r--r--dev-php/pecl-http-3.1.0-r214
-rw-r--r--dev-php/pecl-http/Manifest10
-rw-r--r--dev-php/pecl-http/files/pecl-http-gnutls.patch24
-rw-r--r--dev-php/pecl-http/metadata.xml8
-rw-r--r--dev-php/pecl-http/pecl-http-2.6.0-r1.ebuild69
-rw-r--r--dev-php/pecl-http/pecl-http-2.6.0-r2.ebuild72
-rw-r--r--dev-php/pecl-http/pecl-http-2.6.0.ebuild57
-rw-r--r--dev-php/pecl-http/pecl-http-3.1.0-r1.ebuild69
-rw-r--r--dev-php/pecl-http/pecl-http-3.1.0-r2.ebuild76
-rw-r--r--dev-php/pecl-http/pecl-http-3.1.0.ebuild57
-rw-r--r--dev-php/pecl-imagick-3.4.314
-rw-r--r--dev-php/pecl-imagick/Manifest3
-rw-r--r--dev-php/pecl-imagick/metadata.xml8
-rw-r--r--dev-php/pecl-imagick/pecl-imagick-3.4.3.ebuild25
-rw-r--r--dev-php/pecl-libevent-0.1.0-r214
-rw-r--r--dev-php/pecl-libevent/Manifest3
-rw-r--r--dev-php/pecl-libevent/metadata.xml8
-rw-r--r--dev-php/pecl-libevent/pecl-libevent-0.1.0-r2.ebuild20
-rw-r--r--dev-php/pecl-lzf-1.6.614
-rw-r--r--dev-php/pecl-lzf/Manifest3
-rw-r--r--dev-php/pecl-lzf/metadata.xml8
-rw-r--r--dev-php/pecl-lzf/pecl-lzf-1.6.6.ebuild19
-rw-r--r--dev-php/pecl-mailparse-2.1.6-r415
-rw-r--r--dev-php/pecl-mailparse-3.0.214
-rw-r--r--dev-php/pecl-mailparse-3.0.2-r114
-rw-r--r--dev-php/pecl-mailparse/Manifest6
-rw-r--r--dev-php/pecl-mailparse/metadata.xml8
-rw-r--r--dev-php/pecl-mailparse/pecl-mailparse-2.1.6-r4.ebuild42
-rw-r--r--dev-php/pecl-mailparse/pecl-mailparse-3.0.2-r1.ebuild47
-rw-r--r--dev-php/pecl-mailparse/pecl-mailparse-3.0.2.ebuild50
-rw-r--r--dev-php/pecl-memcache-3.0.8-r215
-rw-r--r--dev-php/pecl-memcache-3.0.8-r315
-rw-r--r--dev-php/pecl-memcache/Manifest5
-rw-r--r--dev-php/pecl-memcache/files/3.0.8-c99-inline.patch85
-rw-r--r--dev-php/pecl-memcache/metadata.xml8
-rw-r--r--dev-php/pecl-memcache/pecl-memcache-3.0.8-r2.ebuild47
-rw-r--r--dev-php/pecl-memcache/pecl-memcache-3.0.8-r3.ebuild46
-rw-r--r--dev-php/pecl-memcached-2.2.0-r215
-rw-r--r--dev-php/pecl-memcached-3.0.014
-rw-r--r--dev-php/pecl-memcached-3.0.314
-rw-r--r--dev-php/pecl-memcached-3.0.414
-rw-r--r--dev-php/pecl-memcached/Manifest9
-rw-r--r--dev-php/pecl-memcached/metadata.xml18
-rw-r--r--dev-php/pecl-memcached/pecl-memcached-2.2.0-r2.ebuild58
-rw-r--r--dev-php/pecl-memcached/pecl-memcached-3.0.0.ebuild61
-rw-r--r--dev-php/pecl-memcached/pecl-memcached-3.0.3.ebuild58
-rw-r--r--dev-php/pecl-memcached/pecl-memcached-3.0.4.ebuild62
-rw-r--r--dev-php/pecl-mongo-1.6.14-r114
-rw-r--r--dev-php/pecl-mongo-1.6.1614
-rw-r--r--dev-php/pecl-mongo/Manifest5
-rw-r--r--dev-php/pecl-mongo/metadata.xml8
-rw-r--r--dev-php/pecl-mongo/pecl-mongo-1.6.14-r1.ebuild20
-rw-r--r--dev-php/pecl-mongo/pecl-mongo-1.6.16.ebuild20
-rw-r--r--dev-php/pecl-mongodb-1.1.1014
-rw-r--r--dev-php/pecl-mongodb-1.1.814
-rw-r--r--dev-php/pecl-mongodb-1.2.1114
-rw-r--r--dev-php/pecl-mongodb-1.2.914
-rw-r--r--dev-php/pecl-mongodb-1.3.314
-rw-r--r--dev-php/pecl-mongodb-1.4.114
-rw-r--r--dev-php/pecl-mongodb-1.4.414
-rw-r--r--dev-php/pecl-mongodb/Manifest15
-rw-r--r--dev-php/pecl-mongodb/metadata.xml8
-rw-r--r--dev-php/pecl-mongodb/pecl-mongodb-1.1.10.ebuild42
-rw-r--r--dev-php/pecl-mongodb/pecl-mongodb-1.1.8.ebuild41
-rw-r--r--dev-php/pecl-mongodb/pecl-mongodb-1.2.11.ebuild40
-rw-r--r--dev-php/pecl-mongodb/pecl-mongodb-1.2.9.ebuild40
-rw-r--r--dev-php/pecl-mongodb/pecl-mongodb-1.3.3.ebuild39
-rw-r--r--dev-php/pecl-mongodb/pecl-mongodb-1.4.1.ebuild40
-rw-r--r--dev-php/pecl-mongodb/pecl-mongodb-1.4.4.ebuild40
-rw-r--r--dev-php/pecl-mysqlnd_ms-1.6.0_pre2014112714
-rw-r--r--dev-php/pecl-mysqlnd_ms/Manifest3
-rw-r--r--dev-php/pecl-mysqlnd_ms/metadata.xml8
-rw-r--r--dev-php/pecl-mysqlnd_ms/pecl-mysqlnd_ms-1.6.0_pre20141127.ebuild39
-rw-r--r--dev-php/pecl-mysqlnd_qc-1.2.0-r214
-rw-r--r--dev-php/pecl-mysqlnd_qc/Manifest4
-rw-r--r--dev-php/pecl-mysqlnd_qc/files/pecl-mysqlnd_qc-1.2.0-php56.patch48
-rw-r--r--dev-php/pecl-mysqlnd_qc/metadata.xml12
-rw-r--r--dev-php/pecl-mysqlnd_qc/pecl-mysqlnd_qc-1.2.0-r2.ebuild49
-rw-r--r--dev-php/pecl-ncurses-1.0.2-r414
-rw-r--r--dev-php/pecl-ncurses/Manifest4
-rw-r--r--dev-php/pecl-ncurses/metadata.xml8
-rw-r--r--dev-php/pecl-ncurses/pecl-ncurses-1.0.2-r4.ebuild23
-rw-r--r--dev-php/pecl-oauth-1.2.3-r514
-rw-r--r--dev-php/pecl-oauth-2.0.2-r214
-rw-r--r--dev-php/pecl-oauth/Manifest8
-rw-r--r--dev-php/pecl-oauth/files/1.2.3-prce.h-check.patch26
-rw-r--r--dev-php/pecl-oauth/files/1.2.3-withcurl.patch71
-rw-r--r--dev-php/pecl-oauth/files/2.0.2-compare_segfault.patch48
-rw-r--r--dev-php/pecl-oauth/metadata.xml8
-rw-r--r--dev-php/pecl-oauth/pecl-oauth-1.2.3-r5.ebuild56
-rw-r--r--dev-php/pecl-oauth/pecl-oauth-2.0.2-r2.ebuild56
-rw-r--r--dev-php/pecl-pam-1.0.3-r314
-rw-r--r--dev-php/pecl-pam/Manifest4
-rw-r--r--dev-php/pecl-pam/files/1.0.3-php7.patch118
-rw-r--r--dev-php/pecl-pam/metadata.xml8
-rw-r--r--dev-php/pecl-pam/pecl-pam-1.0.3-r3.ebuild41
-rw-r--r--dev-php/pecl-propro-1.0.2-r115
-rw-r--r--dev-php/pecl-propro-1.0.2-r215
-rw-r--r--dev-php/pecl-propro-2.0.1-r114
-rw-r--r--dev-php/pecl-propro-2.1.014
-rw-r--r--dev-php/pecl-propro/Manifest8
-rw-r--r--dev-php/pecl-propro/metadata.xml8
-rw-r--r--dev-php/pecl-propro/pecl-propro-1.0.2-r1.ebuild40
-rw-r--r--dev-php/pecl-propro/pecl-propro-1.0.2-r2.ebuild42
-rw-r--r--dev-php/pecl-propro/pecl-propro-2.0.1-r1.ebuild39
-rw-r--r--dev-php/pecl-propro/pecl-propro-2.1.0.ebuild40
-rw-r--r--dev-php/pecl-ps-1.3.7-r114
-rw-r--r--dev-php/pecl-ps-1.3.7-r215
-rw-r--r--dev-php/pecl-ps-1.4.014
-rw-r--r--dev-php/pecl-ps-1.4.114
-rw-r--r--dev-php/pecl-ps/Manifest8
-rw-r--r--dev-php/pecl-ps/metadata.xml8
-rw-r--r--dev-php/pecl-ps/pecl-ps-1.3.7-r1.ebuild19
-rw-r--r--dev-php/pecl-ps/pecl-ps-1.3.7-r2.ebuild42
-rw-r--r--dev-php/pecl-ps/pecl-ps-1.4.0.ebuild31
-rw-r--r--dev-php/pecl-ps/pecl-ps-1.4.1.ebuild41
-rw-r--r--dev-php/pecl-radius-1.3.0-r114
-rw-r--r--dev-php/pecl-radius-1.4.0_beta1-r214
-rw-r--r--dev-php/pecl-radius/Manifest5
-rw-r--r--dev-php/pecl-radius/metadata.xml8
-rw-r--r--dev-php/pecl-radius/pecl-radius-1.3.0-r1.ebuild21
-rw-r--r--dev-php/pecl-radius/pecl-radius-1.4.0_beta1-r2.ebuild30
-rw-r--r--dev-php/pecl-raphf-1.1.2-r115
-rw-r--r--dev-php/pecl-raphf-1.1.2-r215
-rw-r--r--dev-php/pecl-raphf-2.0.0-r114
-rw-r--r--dev-php/pecl-raphf-2.0.0-r214
-rw-r--r--dev-php/pecl-raphf/Manifest7
-rw-r--r--dev-php/pecl-raphf/metadata.xml8
-rw-r--r--dev-php/pecl-raphf/pecl-raphf-1.1.2-r1.ebuild40
-rw-r--r--dev-php/pecl-raphf/pecl-raphf-1.1.2-r2.ebuild42
-rw-r--r--dev-php/pecl-raphf/pecl-raphf-2.0.0-r1.ebuild39
-rw-r--r--dev-php/pecl-raphf/pecl-raphf-2.0.0-r2.ebuild40
-rw-r--r--dev-php/pecl-redis-3.1.6-r115
-rw-r--r--dev-php/pecl-redis-4.0.0-r115
-rw-r--r--dev-php/pecl-redis-4.0.215
-rw-r--r--dev-php/pecl-redis/Manifest7
-rw-r--r--dev-php/pecl-redis/metadata.xml11
-rw-r--r--dev-php/pecl-redis/pecl-redis-3.1.6-r1.ebuild53
-rw-r--r--dev-php/pecl-redis/pecl-redis-4.0.0-r1.ebuild58
-rw-r--r--dev-php/pecl-redis/pecl-redis-4.0.2.ebuild58
-rw-r--r--dev-php/pecl-rrd-1.1.3-r215
-rw-r--r--dev-php/pecl-rrd-2.0.1-r314
-rw-r--r--dev-php/pecl-rrd/Manifest5
-rw-r--r--dev-php/pecl-rrd/metadata.xml8
-rw-r--r--dev-php/pecl-rrd/pecl-rrd-1.1.3-r2.ebuild42
-rw-r--r--dev-php/pecl-rrd/pecl-rrd-2.0.1-r3.ebuild57
-rw-r--r--dev-php/pecl-sphinx-1.3.3-r114
-rw-r--r--dev-php/pecl-sphinx/Manifest3
-rw-r--r--dev-php/pecl-sphinx/metadata.xml8
-rw-r--r--dev-php/pecl-sphinx/pecl-sphinx-1.3.3-r1.ebuild23
-rw-r--r--dev-php/pecl-spl_types-0.4.0-r214
-rw-r--r--dev-php/pecl-spl_types/Manifest3
-rw-r--r--dev-php/pecl-spl_types/metadata.xml8
-rw-r--r--dev-php/pecl-spl_types/pecl-spl_types-0.4.0-r2.ebuild23
-rw-r--r--dev-php/pecl-ssh2-0.13-r315
-rw-r--r--dev-php/pecl-ssh2-1.1.114
-rw-r--r--dev-php/pecl-ssh2-1.1.214
-rw-r--r--dev-php/pecl-ssh2-999912
-rw-r--r--dev-php/pecl-ssh2/Manifest9
-rw-r--r--dev-php/pecl-ssh2/files/0.13-parse_url-fix.patch49
-rw-r--r--dev-php/pecl-ssh2/metadata.xml8
-rw-r--r--dev-php/pecl-ssh2/pecl-ssh2-0.13-r3.ebuild32
-rw-r--r--dev-php/pecl-ssh2/pecl-ssh2-1.1.1.ebuild30
-rw-r--r--dev-php/pecl-ssh2/pecl-ssh2-1.1.2.ebuild30
-rw-r--r--dev-php/pecl-ssh2/pecl-ssh2-9999.ebuild31
-rw-r--r--dev-php/pecl-stomp-1.0.9-r115
-rw-r--r--dev-php/pecl-stomp-2.0.1-r114
-rw-r--r--dev-php/pecl-stomp/Manifest5
-rw-r--r--dev-php/pecl-stomp/metadata.xml8
-rw-r--r--dev-php/pecl-stomp/pecl-stomp-1.0.9-r1.ebuild48
-rw-r--r--dev-php/pecl-stomp/pecl-stomp-2.0.1-r1.ebuild52
-rw-r--r--dev-php/pecl-svn-1.0.3-r114
-rw-r--r--dev-php/pecl-svn/Manifest4
-rw-r--r--dev-php/pecl-svn/files/1.0.3-c99-fixes.patch68
-rw-r--r--dev-php/pecl-svn/metadata.xml8
-rw-r--r--dev-php/pecl-svn/pecl-svn-1.0.3-r1.ebuild22
-rw-r--r--dev-php/pecl-taint-2.0.214
-rw-r--r--dev-php/pecl-taint-2.0.414
-rw-r--r--dev-php/pecl-taint/Manifest5
-rw-r--r--dev-php/pecl-taint/metadata.xml11
-rw-r--r--dev-php/pecl-taint/pecl-taint-2.0.2.ebuild19
-rw-r--r--dev-php/pecl-taint/pecl-taint-2.0.4.ebuild19
-rw-r--r--dev-php/pecl-timezonedb-2016.1014
-rw-r--r--dev-php/pecl-timezonedb-2017.314
-rw-r--r--dev-php/pecl-timezonedb/Manifest5
-rw-r--r--dev-php/pecl-timezonedb/metadata.xml16
-rw-r--r--dev-php/pecl-timezonedb/pecl-timezonedb-2016.10.ebuild19
-rw-r--r--dev-php/pecl-timezonedb/pecl-timezonedb-2017.3.ebuild19
-rw-r--r--dev-php/pecl-translit-0.6.2-r214
-rw-r--r--dev-php/pecl-translit/Manifest3
-rw-r--r--dev-php/pecl-translit/metadata.xml11
-rw-r--r--dev-php/pecl-translit/pecl-translit-0.6.2-r2.ebuild33
-rw-r--r--dev-php/pecl-uploadprogress-1.0.3.1-r414
-rw-r--r--dev-php/pecl-uploadprogress/Manifest4
-rw-r--r--dev-php/pecl-uploadprogress/files/1.0.3.1-php7.patch148
-rw-r--r--dev-php/pecl-uploadprogress/metadata.xml11
-rw-r--r--dev-php/pecl-uploadprogress/pecl-uploadprogress-1.0.3.1-r4.ebuild22
-rw-r--r--dev-php/pecl-uuid-1.0.4-r214
-rw-r--r--dev-php/pecl-uuid/Manifest3
-rw-r--r--dev-php/pecl-uuid/metadata.xml12
-rw-r--r--dev-php/pecl-uuid/pecl-uuid-1.0.4-r2.ebuild23
-rw-r--r--dev-php/pecl-xdiff-1.5.2-r515
-rw-r--r--dev-php/pecl-xdiff-2.0.1-r214
-rw-r--r--dev-php/pecl-xdiff/Manifest5
-rw-r--r--dev-php/pecl-xdiff/metadata.xml11
-rw-r--r--dev-php/pecl-xdiff/pecl-xdiff-1.5.2-r5.ebuild48
-rw-r--r--dev-php/pecl-xdiff/pecl-xdiff-2.0.1-r2.ebuild48
-rw-r--r--dev-php/pecl-xrange-1.3.2-r214
-rw-r--r--dev-php/pecl-xrange/Manifest4
-rw-r--r--dev-php/pecl-xrange/files/1.3.2-fixes.patch133
-rw-r--r--dev-php/pecl-xrange/metadata.xml8
-rw-r--r--dev-php/pecl-xrange/pecl-xrange-1.3.2-r2.ebuild24
-rw-r--r--dev-php/pecl-yaml-1.3.015
-rw-r--r--dev-php/pecl-yaml-1.3.115
-rw-r--r--dev-php/pecl-yaml-2.0.014
-rw-r--r--dev-php/pecl-yaml-2.0.214
-rw-r--r--dev-php/pecl-yaml/Manifest9
-rw-r--r--dev-php/pecl-yaml/metadata.xml8
-rw-r--r--dev-php/pecl-yaml/pecl-yaml-1.3.0.ebuild46
-rw-r--r--dev-php/pecl-yaml/pecl-yaml-1.3.1.ebuild50
-rw-r--r--dev-php/pecl-yaml/pecl-yaml-2.0.0.ebuild44
-rw-r--r--dev-php/pecl-yaml/pecl-yaml-2.0.2.ebuild44
-rw-r--r--dev-php/pecl-yaz-1.2.114
-rw-r--r--dev-php/pecl-yaz-1.2.2-r114
-rw-r--r--dev-php/pecl-yaz/Manifest5
-rw-r--r--dev-php/pecl-yaz/metadata.xml8
-rw-r--r--dev-php/pecl-yaz/pecl-yaz-1.2.1.ebuild25
-rw-r--r--dev-php/pecl-yaz/pecl-yaz-1.2.2-r1.ebuild25
-rw-r--r--dev-php/pecl-zmq-1.1.3-r114
-rw-r--r--dev-php/pecl-zmq-999912
-rw-r--r--dev-php/pecl-zmq/Manifest4
-rw-r--r--dev-php/pecl-zmq/metadata.xml11
-rw-r--r--dev-php/pecl-zmq/pecl-zmq-1.1.3-r1.ebuild23
-rw-r--r--dev-php/pecl-zmq/pecl-zmq-9999.ebuild26
-rw-r--r--dev-php/phar-io-manifest-1.0.111
-rw-r--r--dev-php/phar-io-manifest/Manifest4
-rw-r--r--dev-php/phar-io-manifest/files/autoload.php62
-rw-r--r--dev-php/phar-io-manifest/metadata.xml11
-rw-r--r--dev-php/phar-io-manifest/phar-io-manifest-1.0.1.ebuild27
-rw-r--r--dev-php/phar-io-version-1.0.110
-rw-r--r--dev-php/phar-io-version/Manifest4
-rw-r--r--dev-php/phar-io-version/files/autoload.php6
-rw-r--r--dev-php/phar-io-version/metadata.xml11
-rw-r--r--dev-php/phar-io-version/phar-io-version-1.0.1.ebuild25
-rw-r--r--dev-php/phar-utils-1.0.010
-rw-r--r--dev-php/phar-utils/Manifest4
-rw-r--r--dev-php/phar-utils/files/autoload.php8
-rw-r--r--dev-php/phar-utils/metadata.xml21
-rw-r--r--dev-php/phar-utils/phar-utils-1.0.0.ebuild22
-rw-r--r--dev-php/phing-2.16.111
-rw-r--r--dev-php/phing/Manifest4
-rw-r--r--dev-php/phing/files/autoload.php14
-rw-r--r--dev-php/phing/metadata.xml17
-rw-r--r--dev-php/phing/phing-2.16.1.ebuild57
-rw-r--r--dev-php/php-codebrowser-1.0.2-r111
-rw-r--r--dev-php/php-codebrowser/Manifest4
-rw-r--r--dev-php/php-codebrowser/files/channel.xml16
-rw-r--r--dev-php/php-codebrowser/metadata.xml11
-rw-r--r--dev-php/php-codebrowser/php-codebrowser-1.0.2-r1.ebuild44
-rw-r--r--dev-php/php-openid-2.3.1_pre2018021911
-rw-r--r--dev-php/php-openid/Manifest3
-rw-r--r--dev-php/php-openid/metadata.xml11
-rw-r--r--dev-php/php-openid/php-openid-2.3.1_pre20180219.ebuild35
-rw-r--r--dev-php/php-redmine-api-1.5.912
-rw-r--r--dev-php/php-redmine-api/Manifest3
-rw-r--r--dev-php/php-redmine-api/metadata.xml15
-rw-r--r--dev-php/php-redmine-api/php-redmine-api-1.5.9.ebuild34
-rw-r--r--dev-php/phpDocumentor-2.9.010
-rw-r--r--dev-php/phpDocumentor/Manifest3
-rw-r--r--dev-php/phpDocumentor/metadata.xml11
-rw-r--r--dev-php/phpDocumentor/phpDocumentor-2.9.0.ebuild28
-rw-r--r--dev-php/phpcov-5.0.010
-rw-r--r--dev-php/phpcov/Manifest3
-rw-r--r--dev-php/phpcov/metadata.xml11
-rw-r--r--dev-php/phpcov/phpcov-5.0.0.ebuild29
-rw-r--r--dev-php/phpdepend-2.5.0-r110
-rw-r--r--dev-php/phpdepend/Manifest4
-rw-r--r--dev-php/phpdepend/files/autoload.php19
-rw-r--r--dev-php/phpdepend/metadata.xml14
-rw-r--r--dev-php/phpdepend/phpdepend-2.5.0-r1.ebuild46
-rw-r--r--dev-php/phpdocumentor-reflection-common-1.010
-rw-r--r--dev-php/phpdocumentor-reflection-common/Manifest4
-rw-r--r--dev-php/phpdocumentor-reflection-common/files/autoload.php8
-rw-r--r--dev-php/phpdocumentor-reflection-common/metadata.xml11
-rw-r--r--dev-php/phpdocumentor-reflection-common/phpdocumentor-reflection-common-1.0.ebuild27
-rw-r--r--dev-php/phpdocumentor-reflection-docblock-3.1.110
-rw-r--r--dev-php/phpdocumentor-reflection-docblock/Manifest4
-rw-r--r--dev-php/phpdocumentor-reflection-docblock/files/autoload.php14
-rw-r--r--dev-php/phpdocumentor-reflection-docblock/metadata.xml11
-rw-r--r--dev-php/phpdocumentor-reflection-docblock/phpdocumentor-reflection-docblock-3.1.1.ebuild30
-rw-r--r--dev-php/phpdocumentor-type-resolver-0.2.110
-rw-r--r--dev-php/phpdocumentor-type-resolver/Manifest4
-rw-r--r--dev-php/phpdocumentor-type-resolver/files/autoload.php8
-rw-r--r--dev-php/phpdocumentor-type-resolver/metadata.xml11
-rw-r--r--dev-php/phpdocumentor-type-resolver/phpdocumentor-type-resolver-0.2.1.ebuild28
-rw-r--r--dev-php/phpmd-2.6.010
-rw-r--r--dev-php/phpmd/Manifest4
-rw-r--r--dev-php/phpmd/files/autoload.php14
-rw-r--r--dev-php/phpmd/metadata.xml11
-rw-r--r--dev-php/phpmd/phpmd-2.6.0.ebuild38
-rw-r--r--dev-php/phpspec-prophecy-1.7.010
-rw-r--r--dev-php/phpspec-prophecy/Manifest4
-rw-r--r--dev-php/phpspec-prophecy/files/autoload.php15
-rw-r--r--dev-php/phpspec-prophecy/metadata.xml11
-rw-r--r--dev-php/phpspec-prophecy/phpspec-prophecy-1.7.0.ebuild31
-rw-r--r--dev-php/phptal-1.3.112
-rw-r--r--dev-php/phptal/Manifest3
-rw-r--r--dev-php/phptal/metadata.xml8
-rw-r--r--dev-php/phptal/phptal-1.3.1.ebuild35
-rw-r--r--dev-php/phpunit-5.7.15-r110
-rw-r--r--dev-php/phpunit-mock-objects-3.4.310
-rw-r--r--dev-php/phpunit-mock-objects/Manifest4
-rw-r--r--dev-php/phpunit-mock-objects/files/autoload.php61
-rw-r--r--dev-php/phpunit-mock-objects/metadata.xml11
-rw-r--r--dev-php/phpunit-mock-objects/phpunit-mock-objects-3.4.3.ebuild28
-rw-r--r--dev-php/phpunit/Manifest4
-rw-r--r--dev-php/phpunit/files/autoload.php170
-rw-r--r--dev-php/phpunit/metadata.xml11
-rw-r--r--dev-php/phpunit/phpunit-5.7.15-r1.ebuild55
-rw-r--r--dev-php/psr-log-1.0.210
-rw-r--r--dev-php/psr-log/Manifest4
-rw-r--r--dev-php/psr-log/files/autoload.php8
-rw-r--r--dev-php/psr-log/metadata.xml24
-rw-r--r--dev-php/psr-log/psr-log-1.0.2.ebuild24
-rw-r--r--dev-php/recaptcha-1.1.312
-rw-r--r--dev-php/recaptcha/Manifest3
-rw-r--r--dev-php/recaptcha/metadata.xml11
-rw-r--r--dev-php/recaptcha/recaptcha-1.1.3.ebuild34
-rw-r--r--dev-php/sebastian-code-unit-reverse-lookup-1.0.110
-rw-r--r--dev-php/sebastian-code-unit-reverse-lookup/Manifest4
-rw-r--r--dev-php/sebastian-code-unit-reverse-lookup/files/autoload.php13
-rw-r--r--dev-php/sebastian-code-unit-reverse-lookup/metadata.xml11
-rw-r--r--dev-php/sebastian-code-unit-reverse-lookup/sebastian-code-unit-reverse-lookup-1.0.1.ebuild26
-rw-r--r--dev-php/sebastian-comparator-1.2.410
-rw-r--r--dev-php/sebastian-comparator/Manifest4
-rw-r--r--dev-php/sebastian-comparator/files/autoload.php32
-rw-r--r--dev-php/sebastian-comparator/metadata.xml11
-rw-r--r--dev-php/sebastian-comparator/sebastian-comparator-1.2.4.ebuild28
-rw-r--r--dev-php/sebastian-diff-1.4.1-r110
-rw-r--r--dev-php/sebastian-diff/Manifest4
-rw-r--r--dev-php/sebastian-diff/files/autoload.php20
-rw-r--r--dev-php/sebastian-diff/metadata.xml11
-rw-r--r--dev-php/sebastian-diff/sebastian-diff-1.4.1-r1.ebuild26
-rw-r--r--dev-php/sebastian-environment-2.0.010
-rw-r--r--dev-php/sebastian-environment/Manifest4
-rw-r--r--dev-php/sebastian-environment/files/autoload.php14
-rw-r--r--dev-php/sebastian-environment/metadata.xml11
-rw-r--r--dev-php/sebastian-environment/sebastian-environment-2.0.0.ebuild26
-rw-r--r--dev-php/sebastian-exporter-2.0.010
-rw-r--r--dev-php/sebastian-exporter/Manifest4
-rw-r--r--dev-php/sebastian-exporter/files/autoload.php17
-rw-r--r--dev-php/sebastian-exporter/metadata.xml11
-rw-r--r--dev-php/sebastian-exporter/sebastian-exporter-2.0.0.ebuild27
-rw-r--r--dev-php/sebastian-global-state-1.1.110
-rw-r--r--dev-php/sebastian-global-state/Manifest4
-rw-r--r--dev-php/sebastian-global-state/files/autoload.php18
-rw-r--r--dev-php/sebastian-global-state/metadata.xml11
-rw-r--r--dev-php/sebastian-global-state/sebastian-global-state-1.1.1.ebuild26
-rw-r--r--dev-php/sebastian-object-enumerator-2.0.110
-rw-r--r--dev-php/sebastian-object-enumerator/Manifest4
-rw-r--r--dev-php/sebastian-object-enumerator/files/autoload.php19
-rw-r--r--dev-php/sebastian-object-enumerator/metadata.xml11
-rw-r--r--dev-php/sebastian-object-enumerator/sebastian-object-enumerator-2.0.1.ebuild27
-rw-r--r--dev-php/sebastian-recursion-context-2.0.010
-rw-r--r--dev-php/sebastian-recursion-context/Manifest4
-rw-r--r--dev-php/sebastian-recursion-context/files/autoload.php15
-rw-r--r--dev-php/sebastian-recursion-context/metadata.xml11
-rw-r--r--dev-php/sebastian-recursion-context/sebastian-recursion-context-2.0.0.ebuild26
-rw-r--r--dev-php/sebastian-resource-operations-1.0.010
-rw-r--r--dev-php/sebastian-resource-operations/Manifest4
-rw-r--r--dev-php/sebastian-resource-operations/files/autoload.php13
-rw-r--r--dev-php/sebastian-resource-operations/metadata.xml11
-rw-r--r--dev-php/sebastian-resource-operations/sebastian-resource-operations-1.0.0.ebuild27
-rw-r--r--dev-php/sebastian-version-2.0.110
-rw-r--r--dev-php/sebastian-version/Manifest4
-rw-r--r--dev-php/sebastian-version/files/autoload.php13
-rw-r--r--dev-php/sebastian-version/metadata.xml11
-rw-r--r--dev-php/sebastian-version/sebastian-version-2.0.1.ebuild27
-rw-r--r--dev-php/securimage-3.6.510
-rw-r--r--dev-php/securimage/Manifest3
-rw-r--r--dev-php/securimage/metadata.xml4
-rw-r--r--dev-php/securimage/securimage-3.6.5.ebuild28
-rw-r--r--dev-php/semver-1.4.210
-rw-r--r--dev-php/semver/Manifest4
-rw-r--r--dev-php/semver/files/autoload.php8
-rw-r--r--dev-php/semver/metadata.xml21
-rw-r--r--dev-php/semver/semver-1.4.2.ebuild24
-rw-r--r--dev-php/simpletest-1.1.710
-rw-r--r--dev-php/simpletest/Manifest3
-rw-r--r--dev-php/simpletest/metadata.xml11
-rw-r--r--dev-php/simpletest/simpletest-1.1.7.ebuild24
-rw-r--r--dev-php/smarty-3.1.3012
-rw-r--r--dev-php/smarty-3.1.3112
-rw-r--r--dev-php/smarty-3.1.3212
-rw-r--r--dev-php/smarty/Manifest8
-rw-r--r--dev-php/smarty/metadata.xml16
-rw-r--r--dev-php/smarty/smarty-3.1.30.ebuild46
-rw-r--r--dev-php/smarty/smarty-3.1.31.ebuild46
-rw-r--r--dev-php/smarty/smarty-3.1.32.ebuild46
-rw-r--r--dev-php/spdx-licenses-1.2.010
-rw-r--r--dev-php/spdx-licenses/Manifest4
-rw-r--r--dev-php/spdx-licenses/files/autoload.php8
-rw-r--r--dev-php/spdx-licenses/metadata.xml21
-rw-r--r--dev-php/spdx-licenses/spdx-licenses-1.2.0.ebuild22
-rw-r--r--dev-php/stringparser_bbcode-0.3.3-r111
-rw-r--r--dev-php/stringparser_bbcode/Manifest3
-rw-r--r--dev-php/stringparser_bbcode/metadata.xml8
-rw-r--r--dev-php/stringparser_bbcode/stringparser_bbcode-0.3.3-r1.ebuild23
-rw-r--r--dev-php/suhosin-0.9.38-r114
-rw-r--r--dev-php/suhosin/Manifest4
-rw-r--r--dev-php/suhosin/files/suhosin-0.9.38-libcrypt.patch12
-rw-r--r--dev-php/suhosin/metadata.xml8
-rw-r--r--dev-php/suhosin/suhosin-0.9.38-r1.ebuild56
-rw-r--r--dev-php/swoole-4.0.114
-rw-r--r--dev-php/swoole/Manifest3
-rw-r--r--dev-php/swoole/metadata.xml12
-rw-r--r--dev-php/swoole/swoole-4.0.1.ebuild68
-rw-r--r--dev-php/symfony-config-2.8.2012
-rw-r--r--dev-php/symfony-config/Manifest4
-rw-r--r--dev-php/symfony-config/files/autoload.php20
-rw-r--r--dev-php/symfony-config/metadata.xml24
-rw-r--r--dev-php/symfony-config/symfony-config-2.8.20.ebuild39
-rw-r--r--dev-php/symfony-console-2.7.9-r110
-rw-r--r--dev-php/symfony-console/Manifest4
-rw-r--r--dev-php/symfony-console/files/autoload.php16
-rw-r--r--dev-php/symfony-console/metadata.xml22
-rw-r--r--dev-php/symfony-console/symfony-console-2.7.9-r1.ebuild28
-rw-r--r--dev-php/symfony-dependency-injection-2.8.2013
-rw-r--r--dev-php/symfony-dependency-injection/Manifest4
-rw-r--r--dev-php/symfony-dependency-injection/files/autoload.php15
-rw-r--r--dev-php/symfony-dependency-injection/metadata.xml22
-rw-r--r--dev-php/symfony-dependency-injection/symfony-dependency-injection-2.8.20.ebuild45
-rw-r--r--dev-php/symfony-event-dispatcher-2.1.0-r112
-rw-r--r--dev-php/symfony-event-dispatcher/Manifest4
-rw-r--r--dev-php/symfony-event-dispatcher/files/autoload.php14
-rw-r--r--dev-php/symfony-event-dispatcher/metadata.xml23
-rw-r--r--dev-php/symfony-event-dispatcher/symfony-event-dispatcher-2.1.0-r1.ebuild41
-rw-r--r--dev-php/symfony-filesystem-3.2.812
-rw-r--r--dev-php/symfony-filesystem/Manifest5
-rw-r--r--dev-php/symfony-filesystem/files/annotate-network-tests.patch27
-rw-r--r--dev-php/symfony-filesystem/files/autoload.php8
-rw-r--r--dev-php/symfony-filesystem/metadata.xml21
-rw-r--r--dev-php/symfony-filesystem/symfony-filesystem-3.2.8.ebuild41
-rw-r--r--dev-php/symfony-finder-3.2.812
-rw-r--r--dev-php/symfony-finder/Manifest5
-rw-r--r--dev-php/symfony-finder/files/autoload.php8
-rw-r--r--dev-php/symfony-finder/files/skip-file-time-sort-tests.patch24
-rw-r--r--dev-php/symfony-finder/metadata.xml22
-rw-r--r--dev-php/symfony-finder/symfony-finder-3.2.8.ebuild39
-rw-r--r--dev-php/symfony-process-3.2.613
-rw-r--r--dev-php/symfony-process/Manifest4
-rw-r--r--dev-php/symfony-process/files/autoload.php9
-rw-r--r--dev-php/symfony-process/metadata.xml21
-rw-r--r--dev-php/symfony-process/symfony-process-3.2.6.ebuild43
-rw-r--r--dev-php/symfony-yaml-2.1.013
-rw-r--r--dev-php/symfony-yaml/Manifest4
-rw-r--r--dev-php/symfony-yaml/files/autoload.php8
-rw-r--r--dev-php/symfony-yaml/metadata.xml21
-rw-r--r--dev-php/symfony-yaml/symfony-yaml-2.1.0.ebuild41
-rw-r--r--dev-php/tcpdf-6.2.1611
-rw-r--r--dev-php/tcpdf/Manifest3
-rw-r--r--dev-php/tcpdf/metadata.xml11
-rw-r--r--dev-php/tcpdf/tcpdf-6.2.16.ebuild36
-rw-r--r--dev-php/theseer-tokenizer-1.1.012
-rw-r--r--dev-php/theseer-tokenizer/Manifest4
-rw-r--r--dev-php/theseer-tokenizer/files/autoload.php20
-rw-r--r--dev-php/theseer-tokenizer/metadata.xml11
-rw-r--r--dev-php/theseer-tokenizer/theseer-tokenizer-1.1.0.ebuild35
-rw-r--r--dev-php/twig-1.31.014
-rw-r--r--dev-php/twig-1.35.314
-rw-r--r--dev-php/twig/Manifest5
-rw-r--r--dev-php/twig/metadata.xml20
-rw-r--r--dev-php/twig/twig-1.31.0.ebuild82
-rw-r--r--dev-php/twig/twig-1.35.3.ebuild82
-rw-r--r--dev-php/webmozart-assert-1.2.010
-rw-r--r--dev-php/webmozart-assert/Manifest4
-rw-r--r--dev-php/webmozart-assert/files/autoload.php8
-rw-r--r--dev-php/webmozart-assert/metadata.xml11
-rw-r--r--dev-php/webmozart-assert/webmozart-assert-1.2.0.ebuild26
-rw-r--r--dev-php/xcache-3.2.0-r215
-rw-r--r--dev-php/xcache/Manifest3
-rw-r--r--dev-php/xcache/metadata.xml15
-rw-r--r--dev-php/xcache/xcache-3.2.0-r2.ebuild62
-rw-r--r--dev-php/xdebug-2.4.114
-rw-r--r--dev-php/xdebug-2.5.014
-rw-r--r--dev-php/xdebug-2.5.314
-rw-r--r--dev-php/xdebug-2.5.514
-rw-r--r--dev-php/xdebug-2.6.014
-rw-r--r--dev-php/xdebug-client-2.4.112
-rw-r--r--dev-php/xdebug-client-2.5.012
-rw-r--r--dev-php/xdebug-client-2.5.312
-rw-r--r--dev-php/xdebug-client-2.5.5-r112
-rw-r--r--dev-php/xdebug-client-2.6.012
-rw-r--r--dev-php/xdebug-client/Manifest11
-rw-r--r--dev-php/xdebug-client/metadata.xml8
-rw-r--r--dev-php/xdebug-client/xdebug-client-2.4.1.ebuild29
-rw-r--r--dev-php/xdebug-client/xdebug-client-2.5.0.ebuild29
-rw-r--r--dev-php/xdebug-client/xdebug-client-2.5.3.ebuild29
-rw-r--r--dev-php/xdebug-client/xdebug-client-2.5.5-r1.ebuild29
-rw-r--r--dev-php/xdebug-client/xdebug-client-2.6.0.ebuild29
-rw-r--r--dev-php/xdebug/Manifest13
-rw-r--r--dev-php/xdebug/files/2.4.1-xdebug.ini46
-rw-r--r--dev-php/xdebug/files/2.6.0-xdebug.ini54
-rw-r--r--dev-php/xdebug/metadata.xml8
-rw-r--r--dev-php/xdebug/xdebug-2.4.1.ebuild39
-rw-r--r--dev-php/xdebug/xdebug-2.5.0.ebuild40
-rw-r--r--dev-php/xdebug/xdebug-2.5.3.ebuild40
-rw-r--r--dev-php/xdebug/xdebug-2.5.5.ebuild40
-rw-r--r--dev-php/xdebug/xdebug-2.6.0.ebuild40
-rw-r--r--dev-php/xhprof-0.9.4_p20150226-r114
-rw-r--r--dev-php/xhprof/Manifest3
-rw-r--r--dev-php/xhprof/metadata.xml14
-rw-r--r--dev-php/xhprof/xhprof-0.9.4_p20150226-r1.ebuild23
1251 files changed, 18901 insertions, 4141 deletions
diff --git a/dev-php/File_Iterator-1.3.4 b/dev-php/File_Iterator-1.3.4
deleted file mode 100644
index 30eb96cb0318..000000000000
--- a/dev-php/File_Iterator-1.3.4
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DESCRIPTION=FilterIterator implementation that filters files based on a list of suffixes
-EAPI=6
-HOMEPAGE=https://github.com/sebastianbergmann/php-file-iterator https://phpunit.de
-KEYWORDS=amd64 hppa x86
-LICENSE=BSD
-RDEPEND=>=dev-php/pear-1.8.1
-SLOT=0
-SRC_URI=http:///get/File_Iterator-1.3.4.tgz
-_eclasses_=php-pear-r2 eb6928c33771db74564e814c5ca6c1b3
-_md5_=8a2a9c6ed418ed8a65f5ab3ddf10ab6e
diff --git a/dev-php/File_Iterator-1.4.2 b/dev-php/File_Iterator-1.4.2
deleted file mode 100644
index 6100d4833d31..000000000000
--- a/dev-php/File_Iterator-1.4.2
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install postinst
-DESCRIPTION=FilterIterator implementation that filters files based on criteria
-EAPI=6
-HOMEPAGE=https://github.com/sebastianbergmann/php-file-iterator https://phpunit.de
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86
-LICENSE=BSD
-RDEPEND=dev-php/fedora-autoloader >=dev-lang/php-5.6:*
-SLOT=0
-SRC_URI=https://github.com/sebastianbergmann/php-file-iterator/archive/1.4.2.tar.gz -> File_Iterator-1.4.2.tar.gz
-_md5_=a4088244e7f94648dad061061968bc2f
diff --git a/dev-php/File_Iterator-1.4.3 b/dev-php/File_Iterator-1.4.3
deleted file mode 100644
index c79a5315f0c8..000000000000
--- a/dev-php/File_Iterator-1.4.3
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install postinst
-DESCRIPTION=FilterIterator implementation that filters files based on criteria
-EAPI=6
-HOMEPAGE=https://github.com/sebastianbergmann/php-file-iterator https://phpunit.de
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=BSD
-RDEPEND=dev-php/fedora-autoloader >=dev-lang/php-5.6:*
-SLOT=0
-SRC_URI=https://github.com/sebastianbergmann/php-file-iterator/archive/1.4.3.tar.gz -> File_Iterator-1.4.3.tar.gz
-_md5_=052d3edc8b89d6ab0de6c100061db739
diff --git a/dev-php/File_Iterator/File_Iterator-1.3.4.ebuild b/dev-php/File_Iterator/File_Iterator-1.3.4.ebuild
new file mode 100644
index 000000000000..78a56a955c63
--- /dev/null
+++ b/dev-php/File_Iterator/File_Iterator-1.3.4.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PHP_PEAR_DOMAIN="pear.phpunit.de"
+PHP_PEAR_CHANNEL="${FILESDIR}/channel.xml"
+PHP_PEAR_PKG_NAME="File_Iterator"
+inherit php-pear-r2
+
+DESCRIPTION="FilterIterator implementation that filters files based on a list of suffixes"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 hppa x86"
+IUSE=""
+HOMEPAGE="https://github.com/sebastianbergmann/php-file-iterator
+ https://phpunit.de"
+SRC_URI="http://${PHP_PEAR_URI}/get/${PEAR_P}.tgz"
+DOCS=( ChangeLog.markdown README.markdown )
diff --git a/dev-php/File_Iterator/File_Iterator-1.4.2.ebuild b/dev-php/File_Iterator/File_Iterator-1.4.2.ebuild
new file mode 100644
index 000000000000..359295e3bba5
--- /dev/null
+++ b/dev-php/File_Iterator/File_Iterator-1.4.2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PN="php-file-iterator"
+
+DESCRIPTION="FilterIterator implementation that filters files based on criteria"
+HOMEPAGE="https://github.com/sebastianbergmann/php-file-iterator
+ https://phpunit.de"
+SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+IUSE=""
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+RDEPEND="dev-php/fedora-autoloader
+ >=dev-lang/php-5.6:*"
+
+src_install() {
+ insinto /usr/share/php/File/Iterator
+ doins -r src/*
+ doins "${FILESDIR}/autoload.php"
+}
+
+pkg_postinst() {
+ ewarn "This library now loads via /usr/share/php/File/Iterator/autoload.php"
+ ewarn "Please update any scripts to require the autoloader"
+}
diff --git a/dev-php/File_Iterator/File_Iterator-1.4.3.ebuild b/dev-php/File_Iterator/File_Iterator-1.4.3.ebuild
new file mode 100644
index 000000000000..ccd2b390476d
--- /dev/null
+++ b/dev-php/File_Iterator/File_Iterator-1.4.3.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PN="php-file-iterator"
+
+DESCRIPTION="FilterIterator implementation that filters files based on criteria"
+HOMEPAGE="https://github.com/sebastianbergmann/php-file-iterator
+ https://phpunit.de"
+SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE=""
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+RDEPEND="dev-php/fedora-autoloader
+ >=dev-lang/php-5.6:*"
+
+src_install() {
+ insinto /usr/share/php/File/Iterator
+ doins -r src/*
+ doins "${FILESDIR}/autoload.php"
+}
+
+pkg_postinst() {
+ ewarn "This library now loads via /usr/share/php/File/Iterator/autoload.php"
+ ewarn "Please update any scripts to require the autoloader"
+}
diff --git a/dev-php/File_Iterator/Manifest b/dev-php/File_Iterator/Manifest
new file mode 100644
index 000000000000..fdd9d1a595b4
--- /dev/null
+++ b/dev-php/File_Iterator/Manifest
@@ -0,0 +1,9 @@
+AUX autoload.php 380 BLAKE2B c033c6550c454dcfffd86c122284a2bdbfc4c5e54087aa443f3f27857650eb42cc766e85c49792e0c8c33d6f60d7b1aa52881481ebf7c8b37751aeb037efc82b SHA512 0e36085e8e2bc4f6d0900392a35cba6a91940d31604bb7f6ce0275162d28b3e2d54084c0b6dc0d270f0d8812fbc9feff6bd43851701ff7419aa6b02be75cb466
+AUX channel.xml 804 BLAKE2B d6a965a41a220f07e3a0d206bc3359e2649b55d186e7975726c1b0ad344e063ca1fa98cde446078346384e946f6b31f9caaf49cf7c82b4568f697a1ba0d2e633 SHA512 44f5d66b967cff45b87795609e6dd14443a4ce5ae8f3430a281429ba21e834bc3feb7f539fb6cd8349017eb301054a33dfcd7062d58f9fd0c1c7cd1892580092
+DIST File_Iterator-1.3.4.tgz 5199 BLAKE2B 75da70ad638230dd231947e3af26c2570eff367328d2e541fb1228ba531c0f249c931a9185f977dce9e17846e1e9b8b1f9f8d21219291e637b2eaf7805dcf360 SHA512 7117e0e56a9bc533d9f93556366a8026d1e5a9a3894c05551adef6c1e6cd556c1ebf6b96bd98279cb92077b3d8f8d7b7e42f446b39895850e573d0ec511392be
+DIST File_Iterator-1.4.2.tar.gz 4141 BLAKE2B 4c8d9847fa198d444571acdf777020b76e87e09506038c7d7ce732b97c149149bcf22dc25d0af36f041b7930673b05f940df8211c29829e0fed2b3dcfae0ba05 SHA512 295943681853c858e3e1c336c030338c61a74169bd2a619da6fca8c43611e587c6f626fa92799d614bcb0a1f86bbb39895b20f2a389107cedb9660a7e792a243
+DIST File_Iterator-1.4.3.tar.gz 4140 BLAKE2B 89274c6f9b561dbc732d0b81f06b7c34d267ea31d1deb5977eaa16852d87442183221ed6789fd5e09b80ef96811df2ff8ef5da5c764703f5e7a2d5289f582527 SHA512 cea906d6028d9c2dbbb5486198adbecbca87f8b4dcbe12f72b9732ac29cf8eb868a23af7a5bcf2de55e0040a077ab55b016e773d5145f987f7e3f9671ad3ea28
+EBUILD File_Iterator-1.3.4.ebuild 577 BLAKE2B 0c98424026c342511d6f73c2fe4d2ccad1e14dd97f97cf1d36bec6e469093bbef5fcdf0ca89c79d3410c1957083150d121587a509ac45689273aa1b34132d848 SHA512 5b389c4cb5c4a939a330347db4281fdc2c0c3ef993cb3f5606fa1a54f7968616c2ae275fb49c810256b84774cca5aa4776bd3a139078e9e4651cb3a47d5b5b57
+EBUILD File_Iterator-1.4.2.ebuild 857 BLAKE2B 35f38333c62934f9db26e34d5c12aaa43175d6bd39907d0d519f68a5620491ad0983969e7256386578f99b9e46b7b98d156b5a71f3f97831ba47b1141085114d SHA512 9e9108633f405935b025aa4cdd957387ae152bbe943435f896fd97fb063dcd2a2cb089e7c1e1e4cfd16fd180ad754565c7709f01faf8a5fb3d1ee930ab469c24
+EBUILD File_Iterator-1.4.3.ebuild 866 BLAKE2B e5e1e0dc5ebe224bbddeab59ee7f2e0be3b06a400af818f7d0045869fdfdddbf60efc405a9aa1e30bad8a9c3310e4a71db866821fea6b4e5486d35001f92a306 SHA512 f45b221200b40f5c10c1d7240b3eb1e459c8784741cd5a0ec594ce7ba382e5383a9f8086aa9e58fbd1d739795b52a11e02ed35a9f18f6a9c4e970f7268cfb6bc
+MISC metadata.xml 349 BLAKE2B ab948322ce2cfa4e40d9b0ac17d435db9e4613000fa05c810860e281615d5b1297f826ec51ed460ba87080508578e2353729843cdd2bf1f4226890413137a911 SHA512 85e7e819b346185575934f4f356d1346534fce0fe1ddcf5e88e855ce40f64c48bf73c1f14085cf0526ee681014943f7524ea79b7d951b66c12e67e6f04c099e8
diff --git a/dev-php/File_Iterator/files/autoload.php b/dev-php/File_Iterator/files/autoload.php
new file mode 100644
index 000000000000..71372f0a8bbe
--- /dev/null
+++ b/dev-php/File_Iterator/files/autoload.php
@@ -0,0 +1,15 @@
+<?php
+/* Autoloader for dev-php/File_Iterator */
+
+if (!class_exists('Fedora\\Autoloader\\Autoload', false)) {
+ require_once '/usr/share/php/Fedora/Autoloader/autoload.php';
+}
+
+\Fedora\Autoloader\Autoload::addClassMap(
+ array(
+ 'file_iterator' => '/Iterator.php',
+ 'file_iterator_facade' => '/Facade.php',
+ 'file_iterator_factory' => '/Factory.php',
+ ),
+ __DIR__
+);
diff --git a/dev-php/File_Iterator/files/channel.xml b/dev-php/File_Iterator/files/channel.xml
new file mode 100644
index 000000000000..91bb6786f543
--- /dev/null
+++ b/dev-php/File_Iterator/files/channel.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<channel version="1.0" xmlns="http://pear.php.net/channel-1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://pear.php.net/channel-1.0 http://pear.php.net/dtd/channel-1.0.xsd">
+ <name>pear.phpunit.de</name>
+ <summary>PHPUnit PEAR Channel</summary>
+ <suggestedalias>phpunit</suggestedalias>
+ <servers>
+ <primary>
+ <rest>
+ <baseurl type="REST1.0">http://pear.phpunit.de/rest/</baseurl>
+ <baseurl type="REST1.1">http://pear.phpunit.de/rest/</baseurl>
+ <baseurl type="REST1.2">http://pear.phpunit.de/rest/</baseurl>
+ <baseurl type="REST1.3">http://pear.phpunit.de/rest/</baseurl>
+ </rest>
+ </primary>
+ </servers>
+</channel> \ No newline at end of file
diff --git a/dev-php/File_Iterator/metadata.xml b/dev-php/File_Iterator/metadata.xml
new file mode 100644
index 000000000000..06b6c1671840
--- /dev/null
+++ b/dev-php/File_Iterator/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://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">sebastianbergmann/php-file-iterator</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-php/Manifest.gz b/dev-php/Manifest.gz
index 1f4e1e1c8183..dfd95ac449df 100644
--- a/dev-php/Manifest.gz
+++ b/dev-php/Manifest.gz
Binary files differ
diff --git a/dev-php/PEAR-Archive_Tar-1.4.2-r2 b/dev-php/PEAR-Archive_Tar-1.4.2-r2
deleted file mode 100644
index a3d8aea5ae16..000000000000
--- a/dev-php/PEAR-Archive_Tar-1.4.2-r2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Tar file management class
-EAPI=6
-HOMEPAGE=http://pear.php.net/package/Archive_Tar
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86
-LICENSE=BSD
-PDEPEND=dev-php/PEAR-PEAR
-RDEPEND=dev-lang/php:*[bzip2,pcre(+),zlib]
-SLOT=0
-SRC_URI=http://pear.php.net/get/Archive_Tar-1.4.2.tgz
-_md5_=4d35d41bc5527a574ec3c038b89ccdf7
diff --git a/dev-php/PEAR-Archive_Tar/Manifest b/dev-php/PEAR-Archive_Tar/Manifest
new file mode 100644
index 000000000000..be5ab866303e
--- /dev/null
+++ b/dev-php/PEAR-Archive_Tar/Manifest
@@ -0,0 +1,3 @@
+DIST Archive_Tar-1.4.2.tgz 20624 BLAKE2B 2276b19a6e5f18947d6f976db28a5869601b9b1d271e5788c74ef4704fce949c39b20811b82bb1e9c7575dd6b5ce6b0561751a560a1aaca6547415badd5188f6 SHA512 dad5872c82fb9fd961dc06d173610f60d0e05b4c05428e3410beb5a6cdf05de27704edf805e7db80c4031409af5d7d59e7abe43cef7aa11fd9d086b1c6e8e761
+EBUILD PEAR-Archive_Tar-1.4.2-r2.ebuild 747 BLAKE2B d4d8066881d748bd99a83a4b1b1e15206715733b4d5f16bb34fdff75d407fe4cc75dbc0b58e2d4f6b989b776958c5ca5be0737771e626956589445689929d9c2 SHA512 ecc554928df28adb2ba0b79d9684f74c86a5881f3e41c3291d21dc1b7994dc1cd133296dd0ff64a633609c2517616da9fc43a53d557d274bf14b29b7dc6703f8
+MISC metadata.xml 313 BLAKE2B 96717f88c6747b4b6dc814ffee022a1bfe7965ca71f0d1dff4acae773d37ba43d21b92343993b19c753360651ae63c7e0cea16d51c12d4fee03d6852a50be7ff SHA512 189683deca6b9b76a4ca070938afa484580b57a8c799f49f26e9b123165d545ab6aec31bc2b96400cfc5390f3837477a8d58b461e317ab14bf1152292880ece1
diff --git a/dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.4.2-r2.ebuild b/dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.4.2-r2.ebuild
new file mode 100644
index 000000000000..bb3d5304fa99
--- /dev/null
+++ b/dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.4.2-r2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PN="${PN/PEAR-/}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Tar file management class"
+HOMEPAGE="http://pear.php.net/package/${MY_PN}"
+SRC_URI="http://pear.php.net/get/${MY_P}.tgz"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+IUSE=""
+
+# bzip2 and zlib are needed for compressed tarballs, and there's one
+# call to preg_match to test paths against a pattern of files and
+# directories that will be ignored.
+RDEPEND="dev-lang/php:*[bzip2,pcre(+),zlib]"
+PDEPEND="dev-php/PEAR-PEAR"
+DEPEND=""
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+ insinto /usr/share/php
+ doins -r Archive
+
+ dodoc docs/*
+}
diff --git a/dev-php/PEAR-Archive_Tar/metadata.xml b/dev-php/PEAR-Archive_Tar/metadata.xml
new file mode 100644
index 000000000000..75a6ba446036
--- /dev/null
+++ b/dev-php/PEAR-Archive_Tar/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ <name>PHP</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="pear">Archive_Tar</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-php/PEAR-Auth_SASL-1.1.0 b/dev-php/PEAR-Auth_SASL-1.1.0
deleted file mode 100644
index 82018d48e98d..000000000000
--- a/dev-php/PEAR-Auth_SASL-1.1.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DESCRIPTION=Abstraction of various SASL mechanism responses
-EAPI=6
-HOMEPAGE=https://pear.php.net/package/Auth_SASL
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86
-LICENSE=BSD
-RDEPEND=>=dev-php/PEAR-PEAR-1.10.1 >=dev-php/pear-1.8.1
-SLOT=0
-SRC_URI=https://pear.php.net/get/Auth_SASL-1.1.0.tgz
-_eclasses_=php-pear-r2 eb6928c33771db74564e814c5ca6c1b3
-_md5_=7206e9641a24e5548707a17ca5cb9073
diff --git a/dev-php/PEAR-Auth_SASL/Manifest b/dev-php/PEAR-Auth_SASL/Manifest
new file mode 100644
index 000000000000..d2048fafcfc7
--- /dev/null
+++ b/dev-php/PEAR-Auth_SASL/Manifest
@@ -0,0 +1,3 @@
+DIST Auth_SASL-1.1.0.tgz 9380 BLAKE2B ab04812883b5b1a88fe1440f23e206e39676807c69bc029e81e539eb5588a4fa15bcb6f867f109a5eb86d0758bf9fb4f30664a8fdac7aee59a0426f5da6e6dbf SHA512 446ffa37fe7669d3993613167b07fb173c2e17664dcfb56d96a889b4a0cb2c83cc73d307aee15fc8fa7e666502835c15d09c32d8a491060bdd23c9093346bc40
+EBUILD PEAR-Auth_SASL-1.1.0.ebuild 335 BLAKE2B 09a4a15b096c3e89f80ad103a4f427caf821c63338be312daf082a8e30001deb48b3ceaccfa23ef500a6e3414fde2ddec71b9cec8b8011edbf67bd519071e343 SHA512 4cf0c5f0e417f063c46bc5f7fb7fc372fbc6669f92b390e93feb4ccb4fa04d73b1f661e3c7756967858a00ceaf127b8028dddcebba1aad6e18e07b4c72893f6c
+MISC metadata.xml 311 BLAKE2B 32a29fd08f7c52c73d282412b70345efdb2c759e81dce883b039c6a4180e5c0177fc6e8f997d7d51741bbe1e5969a578f900901c15a1b893d9458bd0341ed4ec SHA512 a7f236f4833cece9f46d1073f6ed444150b0a7fb7983bc94b0f465f77a4b7c8ef6c7b6b3f212d43b30579293247b04a1790b6218e89c3578370a842e50c6467a
diff --git a/dev-php/PEAR-Auth_SASL/PEAR-Auth_SASL-1.1.0.ebuild b/dev-php/PEAR-Auth_SASL/PEAR-Auth_SASL-1.1.0.ebuild
new file mode 100644
index 000000000000..a47d615c8031
--- /dev/null
+++ b/dev-php/PEAR-Auth_SASL/PEAR-Auth_SASL-1.1.0.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit php-pear-r2
+
+DESCRIPTION="Abstraction of various SASL mechanism responses"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+IUSE=""
+RDEPEND=">=dev-php/PEAR-PEAR-1.10.1"
diff --git a/dev-php/PEAR-Auth_SASL/metadata.xml b/dev-php/PEAR-Auth_SASL/metadata.xml
new file mode 100644
index 000000000000..9946b319b747
--- /dev/null
+++ b/dev-php/PEAR-Auth_SASL/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ <name>PHP</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="pear">Auth_SASL</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-php/PEAR-Cache-1.5.6-r2 b/dev-php/PEAR-Cache-1.5.6-r2
deleted file mode 100644
index aaff538ddf81..000000000000
--- a/dev-php/PEAR-Cache-1.5.6-r2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DESCRIPTION=Framework for caching of arbitrary data
-EAPI=6
-HOMEPAGE=https://pear.php.net/package/Cache
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86
-LICENSE=PHP-2.02
-RDEPEND=>=dev-php/pear-1.8.1
-SLOT=0
-SRC_URI=https://pear.php.net/get/Cache-1.5.6.tgz
-_eclasses_=php-pear-r2 eb6928c33771db74564e814c5ca6c1b3
-_md5_=3638fde2877424bf9a1c6fd0b147c378
diff --git a/dev-php/PEAR-Cache/Manifest b/dev-php/PEAR-Cache/Manifest
new file mode 100644
index 000000000000..cad2b7447f77
--- /dev/null
+++ b/dev-php/PEAR-Cache/Manifest
@@ -0,0 +1,3 @@
+DIST Cache-1.5.6.tgz 31384 BLAKE2B 08a9a1bdb913d434bc979d9a21c45c36cad03763554226291924cffba462c2b52cf4266972e616ac7f3cf09c605ee1a56337070058f494187d6bbf14812fc235 SHA512 6c42901d9a462c803ff349650519fdb705bc56bebf1d106bd0796e35bf3ee6b4e1f783a3af022f024d9473a7e75eb14ff1954decc0a4c133817a8ed65e42f29a
+EBUILD PEAR-Cache-1.5.6-r2.ebuild 616 BLAKE2B 254195e11548a22b4b981aaeb76e56ea468315a6885e16eb70001f94b8a46d5ddc60230bcf41a29358e604f3cc3b28c06e7c9e8fe46177750bac622d5c929df2 SHA512 c4f85abae1723f0153f36b42adadabcc7f09585638369295e02e0ea3115ce29a59c91f10609306ed594087f8382218c3c34f1e45d3feb8e913940365a3c45af8
+MISC metadata.xml 235 BLAKE2B 5b10304feea18aae1822be7d29bcce06c8715193b14a3dd2c4d79eb75e2767670352e2ca11e06b9a10ec04b63020a18254cd167e6d6be9072f4a200ca5d11ec4 SHA512 0b3e95bbf68eddf74289dad50f8828cffce2d904ff6f9bd5468177de979677cac11da84d1e0302c52b72085915b9d1b3496107172e5726520d51dad1981daf64
diff --git a/dev-php/PEAR-Cache/PEAR-Cache-1.5.6-r2.ebuild b/dev-php/PEAR-Cache/PEAR-Cache-1.5.6-r2.ebuild
new file mode 100644
index 000000000000..0f89540efb0a
--- /dev/null
+++ b/dev-php/PEAR-Cache/PEAR-Cache-1.5.6-r2.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit php-pear-r2
+
+DESCRIPTION="Framework for caching of arbitrary data"
+
+LICENSE="PHP-2.02"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+IUSE=""
+
+src_install() {
+ insinto /usr/share/php
+ doins Cache.php
+ # HTTP_Request is deprecated and superceeded upstream, bypassing
+ insinto /usr/share/php/Cache
+ doins -r Application.php Container Container.php Error.php Function.php Graphics.php OutputCompression.php Output.php
+ php-pear-r2_install_packagexml
+ einstalldocs
+}
diff --git a/dev-php/PEAR-Cache/metadata.xml b/dev-php/PEAR-Cache/metadata.xml
new file mode 100644
index 000000000000..aca42932b833
--- /dev/null
+++ b/dev-php/PEAR-Cache/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ <name>PHP</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-php/PEAR-Cache_Lite-1.8.2 b/dev-php/PEAR-Cache_Lite-1.8.2
deleted file mode 100644
index 1fe1acea8f32..000000000000
--- a/dev-php/PEAR-Cache_Lite-1.8.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm test
-DEPEND=test? ( >=dev-php/PEAR-PEAR-1.10.1 )
-DESCRIPTION=Fast and safe little cache system
-EAPI=6
-HOMEPAGE=https://pear.php.net/package/Cache_Lite
-IUSE=test
-KEYWORDS=alpha amd64 hppa ia64 ppc ppc64 sparc x86
-LICENSE=LGPL-2.1
-RDEPEND=>=dev-php/PEAR-PEAR-1.10.1 >=dev-php/pear-1.8.1
-SLOT=0
-SRC_URI=https://pear.php.net/get/Cache_Lite-1.8.2.tgz
-_eclasses_=php-pear-r2 eb6928c33771db74564e814c5ca6c1b3
-_md5_=4dd6504ade3b3ac0129bbaf8ef3549cd
diff --git a/dev-php/PEAR-Cache_Lite/Manifest b/dev-php/PEAR-Cache_Lite/Manifest
new file mode 100644
index 000000000000..dd6e52554f2c
--- /dev/null
+++ b/dev-php/PEAR-Cache_Lite/Manifest
@@ -0,0 +1,3 @@
+DIST Cache_Lite-1.8.2.tgz 33873 BLAKE2B 0b5a21550fe6eb33242e97b135a7e2532fb0a3a047dfb3e858bf6a6bdc21e991007e4787764561baa9a165fdebd159caa33c14c822a29374be4081d07a63c858 SHA512 dfb3c2dadd0ca60cc62ad71fd6fc51c0665901b4370207dfeb1f0f56e9db4fb24724d22f2939f67d8aa044e1b465483c40ec34fb3bcc5e12031d4dd1e05953b4
+EBUILD PEAR-Cache_Lite-1.8.2.ebuild 446 BLAKE2B 3b40eeac7f0e14cecb9b0e1bcd72a85d9f3074eba2196661f985bde606f5816ce8e7a27aaf3338c329a7d25db3bb18e9ba349e22b289893d71b3e2edd079ce6f SHA512 dccdbdee24bd6d4502e30848e1f8a8fc8dac08c6ff5a617d578c4e99393b755861a98e7c4c29a476ecbf1b956fb1cafdc3e7895d5fe02053ac45559e6ea1a93d
+MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/PEAR-Cache_Lite/PEAR-Cache_Lite-1.8.2.ebuild b/dev-php/PEAR-Cache_Lite/PEAR-Cache_Lite-1.8.2.ebuild
new file mode 100644
index 000000000000..460d3047f136
--- /dev/null
+++ b/dev-php/PEAR-Cache_Lite/PEAR-Cache_Lite-1.8.2.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit php-pear-r2
+
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
+DESCRIPTION="Fast and safe little cache system"
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="test"
+
+RDEPEND=">=dev-php/PEAR-PEAR-1.10.1"
+DEPEND="test? ( ${RDEPEND} )"
+DOCS=( README.md TODO docs/technical docs/examples )
+
+src_test() {
+ peardev run-tests -r || die
+}
diff --git a/dev-php/PEAR-Cache_Lite/metadata.xml b/dev-php/PEAR-Cache_Lite/metadata.xml
new file mode 100644
index 000000000000..b86acf66c756
--- /dev/null
+++ b/dev-php/PEAR-Cache_Lite/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ <name>PHP</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/dev-php/PEAR-Config-2.0.0_pre20140323-r1 b/dev-php/PEAR-Config-2.0.0_pre20140323-r1
deleted file mode 100644
index 778ad8f25245..000000000000
--- a/dev-php/PEAR-Config-2.0.0_pre20140323-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare test unpack
-DEPEND=test? ( xml? ( dev-php/PEAR-XML_Parser dev-php/PEAR-XML_Util ) )
-DESCRIPTION=Provides multiple methods for configuration manipulation
-EAPI=6
-HOMEPAGE=https://pear.php.net/package/Config
-IUSE=test xml
-KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
-LICENSE=PHP-2.02
-RDEPEND=xml? ( dev-php/PEAR-XML_Parser dev-php/PEAR-XML_Util ) >=dev-php/pear-1.8.1
-SLOT=0
-SRC_URI=https://github.com/pear/Config/archive/606a24034ad80f9d6ccb5a8b698b702b392e4674.tar.gz -> Config-2.0.0_pre20140323.tar.gz
-_eclasses_=php-pear-r2 eb6928c33771db74564e814c5ca6c1b3 vcs-snapshot 3be1ab44131e8c0bbdaa75823008444b
-_md5_=7f1a4d7b439d08115f04f71012cc2c99
diff --git a/dev-php/PEAR-Config/Manifest b/dev-php/PEAR-Config/Manifest
new file mode 100644
index 000000000000..8cdd95a0e39a
--- /dev/null
+++ b/dev-php/PEAR-Config/Manifest
@@ -0,0 +1,3 @@
+DIST Config-2.0.0_pre20140323.tar.gz 34309 BLAKE2B 4c9af6b488f874f58a54a6051a41dbbfd04d2ca042089ce1433b5a11ec2e3e7d35c0b4a08bae7cb5081a7da0d5d08c5f14e982178e1cc409194f80cc46cd4e32 SHA512 7056724cde7d39f5a2ac69c8e2dffd0ff57cb8caba6f014b5cb2a3b047946ca160fb4c30c01cf1986286d885893c9e0f504cee8920b46324987f707b5408be24
+EBUILD PEAR-Config-2.0.0_pre20140323-r1.ebuild 921 BLAKE2B f34e1a351860a1965aff01998724d3cf42f07b3502eeebb84c689cf740d84c6a00d17015138d59abc8db57f18fff826d5a5eb65fd2b29fe698204415a0eef3ae SHA512 6154d657b0ff663c4b3f33f517bb26199491cf7380ea1ae0931892b3188de622b833d17c0422d58f496453b695f93e3374873784ec068959b3ecc8c0e4504a45
+MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/PEAR-Config/PEAR-Config-2.0.0_pre20140323-r1.ebuild b/dev-php/PEAR-Config/PEAR-Config-2.0.0_pre20140323-r1.ebuild
new file mode 100644
index 000000000000..fd949ea89cfc
--- /dev/null
+++ b/dev-php/PEAR-Config/PEAR-Config-2.0.0_pre20140323-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit php-pear-r2 vcs-snapshot
+
+DESCRIPTION="Provides multiple methods for configuration manipulation"
+LICENSE="PHP-2.02"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test xml"
+RDEPEND="xml? ( dev-php/PEAR-XML_Parser dev-php/PEAR-XML_Util )"
+DEPEND="test? ( ${RDEPEND} )"
+SRC_URI="https://github.com/pear/Config/archive/606a24034ad80f9d6ccb5a8b698b702b392e4674.tar.gz -> ${PEAR_P}.tar.gz"
+DOCS=( docs/TODO )
+HTML_DOCS=( docs/Apache.php docs/IniCommented.php docs/IniFromScratch.php )
+
+src_prepare() {
+ # Move snapshot location to where the eclass expects
+ mv "${S}/package.xml" "${WORKDIR}/package.xml" || die
+ sed -i 's/&new/new/' test/phpt_test.php.inc || die
+ sed -i 's/& new/ new/' test/bug6441.phpt || die
+ eapply_user
+}
+
+src_test() {
+ pear run-tests test || die "Tests failed"
+}
diff --git a/dev-php/PEAR-Config/metadata.xml b/dev-php/PEAR-Config/metadata.xml
new file mode 100644
index 000000000000..b86acf66c756
--- /dev/null
+++ b/dev-php/PEAR-Config/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ <name>PHP</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/dev-php/PEAR-Console_CommandLine-1.2.2 b/dev-php/PEAR-Console_CommandLine-1.2.2
deleted file mode 100644
index 1538b87156ce..000000000000
--- a/dev-php/PEAR-Console_CommandLine-1.2.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare test
-DEPEND=test? ( dev-lang/php:* dev-php/PEAR-PEAR )
-DESCRIPTION=A full-featured command-line options and arguments parser
-EAPI=6
-HOMEPAGE=http://pear.php.net/package/Console_CommandLine
-IUSE=examples test
-KEYWORDS=amd64 arm hppa ia64 ppc ppc64 sparc x86
-LICENSE=MIT
-RDEPEND=dev-lang/php:* dev-php/PEAR-PEAR
-SLOT=0
-SRC_URI=http://download.pear.php.net/package/Console_CommandLine-1.2.2.tgz
-_md5_=1ba4dac36796cd8605aca4e492271892
diff --git a/dev-php/PEAR-Console_CommandLine/Manifest b/dev-php/PEAR-Console_CommandLine/Manifest
new file mode 100644
index 000000000000..ad8dcde4ae73
--- /dev/null
+++ b/dev-php/PEAR-Console_CommandLine/Manifest
@@ -0,0 +1,3 @@
+DIST Console_CommandLine-1.2.2.tgz 40705 BLAKE2B 1cf2fd7ffdafe1b6e683d40e24c07bc12c9e41469e42595f40778f0bfef30457b32f80b966835a690724e29216348be0fb3f98a83947459d48f728896a5a056a SHA512 05dbde123d0d4fdbba2a959f4bea3b115e3629060a268d25a3007c2ee5a3530b8ebbd8c7d124a6c9d012cafa19f41690a888943a6c1e2e5ec1b9d83fa821d603
+EBUILD PEAR-Console_CommandLine-1.2.2.ebuild 1377 BLAKE2B 3b37595e9f4b156f847ab9a77dda8dba2bdc6eebe3fc32053ebbf326f1541d73493924d68a3e0cd82c340ff1cd389a8e4742c6ba232322cd10fd317cb1616745 SHA512 08f78d69220c6b0d5d930e4fea81f0196b8d675034c550de59333440282a66be5171637d6bc744872933bcd2c6361a95e8782e43114fba302510d4a7e0948986
+MISC metadata.xml 397 BLAKE2B ed50944409b7944c1da567241dab1e2e287b15e7a03c662c0642540b4fa1c50b6d048f6c7033b7fd1c598e5e2edc07bed8a758ec8f71e56e0c4a459f7efd9175 SHA512 ffb1a260b10acfd50fd5b3ee01d80b082f56e31c18c99232a28947a7b29d1ef1e529052b109573aebac05138982322f3a46cf6652f0e519222fb87ef730f5e84
diff --git a/dev-php/PEAR-Console_CommandLine/PEAR-Console_CommandLine-1.2.2.ebuild b/dev-php/PEAR-Console_CommandLine/PEAR-Console_CommandLine-1.2.2.ebuild
new file mode 100644
index 000000000000..aec17d081cd2
--- /dev/null
+++ b/dev-php/PEAR-Console_CommandLine/PEAR-Console_CommandLine-1.2.2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PN="${PN/PEAR-/}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A full-featured command-line options and arguments parser"
+HOMEPAGE="http://pear.php.net/package/${MY_PN}"
+SRC_URI="http://download.pear.php.net/package/${MY_P}.tgz"
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 arm hppa ia64 ppc ppc64 sparc x86"
+IUSE="examples test"
+
+# Only needs PEAR_Exception (not yet packaged) -- not all of PEAR-PEAR.
+RDEPEND="dev-lang/php:*
+ dev-php/PEAR-PEAR"
+
+# Beware, the test suite really needs PEAR-PEAR.
+DEPEND="test? ( ${RDEPEND} )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+ # There's one occurrence of @data_dir@ that needs to be replaced
+ # This location just has to agree with where we put the "data"
+ # directory during src_install().
+ default
+ sed -i "s|@data_dir@|${EPREFIX}/usr/share|" \
+ Console/CommandLine/XmlParser.php || die
+}
+
+src_install() {
+ use examples && dodoc -r docs/examples
+
+ insinto "/usr/share/${MY_PN}"
+ doins -r data
+
+ insinto /usr/share/php
+ doins -r Console
+}
+
+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-Console_CommandLine/metadata.xml b/dev-php/PEAR-Console_CommandLine/metadata.xml
new file mode 100644
index 000000000000..9362a60ada6c
--- /dev/null
+++ b/dev-php/PEAR-Console_CommandLine/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://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/Console_CommandLine</remote-id>
+ <remote-id type="pear">Console_CommandLine</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-php/PEAR-Console_Getargs-1.4.0 b/dev-php/PEAR-Console_Getargs-1.4.0
deleted file mode 100644
index 357fd673b55c..000000000000
--- a/dev-php/PEAR-Console_Getargs-1.4.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm test
-DEPEND=test? ( dev-php/phpunit )
-DESCRIPTION=A command-line arguments parser
-EAPI=6
-HOMEPAGE=https://pear.php.net/package/Console_Getargs
-IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=PHP-3
-RDEPEND=>=dev-php/pear-1.8.1
-SLOT=0
-SRC_URI=https://pear.php.net/get/Console_Getargs-1.4.0.tgz
-_eclasses_=php-pear-r2 eb6928c33771db74564e814c5ca6c1b3
-_md5_=0c38c6296df43fe68bcfe814726ab4b9
diff --git a/dev-php/PEAR-Console_Getargs/Manifest b/dev-php/PEAR-Console_Getargs/Manifest
new file mode 100644
index 000000000000..bbbfb523f35d
--- /dev/null
+++ b/dev-php/PEAR-Console_Getargs/Manifest
@@ -0,0 +1,3 @@
+DIST Console_Getargs-1.4.0.tgz 18267 BLAKE2B c0aab73414a0b6dec9818faa2eae4a4f54d70168d089bb64497599e88f4b8ff86e4195e3705a75bece25f6c7d1054759b846be75f7fc749f1d50b4447ad9ec50 SHA512 927777f48599f64e2cdb05b80a473741718493e9efc20988f2993e6b092852f1432e2e9732c1470f7d580fc7e4000d563b7915a94305fe572b7f6dc27da0858e
+EBUILD PEAR-Console_Getargs-1.4.0.ebuild 364 BLAKE2B dc45652e41be48b28ac977a7e4229c1b32287fd927e9408cc28c2709e7f18fe244363b081eb30e3db31f79778304fbb5b6cec097b4caa81ede8b8d4142a21158 SHA512 e7a30f133d1eb61f9ec5e77aec78bf0aa6765be0906e4b98ee79fd5c173b298f370152df67059af9e6dec137ec73451b6b01e66a621756da8a9c5c7440f0985b
+MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/PEAR-Console_Getargs/PEAR-Console_Getargs-1.4.0.ebuild b/dev-php/PEAR-Console_Getargs/PEAR-Console_Getargs-1.4.0.ebuild
new file mode 100644
index 000000000000..58692f2f12eb
--- /dev/null
+++ b/dev-php/PEAR-Console_Getargs/PEAR-Console_Getargs-1.4.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit php-pear-r2
+
+DESCRIPTION="A command-line arguments parser"
+
+LICENSE="PHP-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+
+DEPEND="test? ( dev-php/phpunit )"
+
+src_test() {
+ phpunit tests/ || die
+}
diff --git a/dev-php/PEAR-Console_Getargs/metadata.xml b/dev-php/PEAR-Console_Getargs/metadata.xml
new file mode 100644
index 000000000000..b86acf66c756
--- /dev/null
+++ b/dev-php/PEAR-Console_Getargs/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ <name>PHP</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/dev-php/PEAR-Console_Getopt-1.4.1-r1 b/dev-php/PEAR-Console_Getopt-1.4.1-r1
deleted file mode 100644
index 86f867cd7a87..000000000000
--- a/dev-php/PEAR-Console_Getopt-1.4.1-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Command-line option parser
-EAPI=6
-HOMEPAGE=http://pear.php.net/package/Console_Getopt
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86
-LICENSE=BSD-2
-PDEPEND=dev-php/PEAR-PEAR
-RDEPEND=dev-lang/php:*
-SLOT=0
-SRC_URI=http://pear.php.net/get/Console_Getopt-1.4.1.tgz
-_md5_=0ad48a582706f1ce7b24223b69407468
diff --git a/dev-php/PEAR-Console_Getopt/Manifest b/dev-php/PEAR-Console_Getopt/Manifest
new file mode 100644
index 000000000000..49fc4d549afc
--- /dev/null
+++ b/dev-php/PEAR-Console_Getopt/Manifest
@@ -0,0 +1,3 @@
+DIST Console_Getopt-1.4.1.tgz 5580 BLAKE2B 514d44cfd2bb7c8bcda49df2b6ba4dafc77184557f58f52c02c6a136e335639e65b7c10f5659dad9d7a87e946d60947121cb5f35a72b6d29fbb3efa3e535283b SHA512 cbf12a72b33424935f019b17ae8fa55289eae77d3845dcfcbbc1c47b71111992d2c0eb837b0f262ce644809c3cc06ad0c2bb04aa1b6ec89a1e3122f327114dbd
+EBUILD PEAR-Console_Getopt-1.4.1-r1.ebuild 544 BLAKE2B e0cd02800d0a59cb5eb4a63725a4f8d7795b89b22cb5f695f0053c1d88c826a3280809ca7ed12abd959b62feae9a105a7a8f13c86d44342f0e8b7a094fd834d1 SHA512 7b7ed16bff52ff571a493a57cd520fe3376d5c34609d573e19bf9252759eeecb0e8ba3537dc180c779e6930afed92b9ee93c0a451ec035583068ec3354056187
+MISC metadata.xml 316 BLAKE2B 680f79e848a7196c2ab95b0be749c99b71dffeb3cfe501c57d8e6d84f0108e09e8e4e3d307e2db82ab7f65aeb4b3824bc801c29d7d0d8be14bb899c3557ccd65 SHA512 8103a2aac5f04ccca0accc1b5dcfc11ee2c59992ea7364e87cf1208fda18f58ac48c833413db682993464912087df6bae19419b153fdf335ea56a1ae406c5994
diff --git a/dev-php/PEAR-Console_Getopt/PEAR-Console_Getopt-1.4.1-r1.ebuild b/dev-php/PEAR-Console_Getopt/PEAR-Console_Getopt-1.4.1-r1.ebuild
new file mode 100644
index 000000000000..1d230653c536
--- /dev/null
+++ b/dev-php/PEAR-Console_Getopt/PEAR-Console_Getopt-1.4.1-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PN="${PN/PEAR-/}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Command-line option parser"
+HOMEPAGE="http://pear.php.net/package/${MY_PN}"
+SRC_URI="http://pear.php.net/get/${MY_P}.tgz"
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="dev-lang/php:*"
+PDEPEND="dev-php/PEAR-PEAR"
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+ insinto /usr/share/php
+ doins -r Console
+}
diff --git a/dev-php/PEAR-Console_Getopt/metadata.xml b/dev-php/PEAR-Console_Getopt/metadata.xml
new file mode 100644
index 000000000000..c8c9c843b99e
--- /dev/null
+++ b/dev-php/PEAR-Console_Getopt/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ <name>PHP</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="pear">Console_Getopt</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-php/PEAR-Console_Table-1.3.0-r1 b/dev-php/PEAR-Console_Table-1.3.0-r1
deleted file mode 100644
index 366015bc12ba..000000000000
--- a/dev-php/PEAR-Console_Table-1.3.0-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DESCRIPTION=Class that makes it easy to build console style tables
-EAPI=6
-HOMEPAGE=https://pear.php.net/package/Console_Table
-KEYWORDS=alpha amd64 hppa ia64 ppc ppc64 sparc x86
-LICENSE=BSD
-RDEPEND=>=dev-php/pear-1.8.1
-SLOT=0
-SRC_URI=https://pear.php.net/get/Console_Table-1.3.0.tgz
-_eclasses_=php-pear-r2 eb6928c33771db74564e814c5ca6c1b3
-_md5_=3624c607cde5cdc27d72b669ab720e31
diff --git a/dev-php/PEAR-Console_Table/Manifest b/dev-php/PEAR-Console_Table/Manifest
new file mode 100644
index 000000000000..8082f561e2c0
--- /dev/null
+++ b/dev-php/PEAR-Console_Table/Manifest
@@ -0,0 +1,3 @@
+DIST Console_Table-1.3.0.tgz 11391 BLAKE2B 25cbb72f2fa23026320840eb3e3b85f08dfc6a90ae9a613ec3e7251b407fc971c0a8aad3ac6bccbb9cd99066aca30249373539b8758fed58b0d1fc53898fc71b SHA512 83227ce8e55ae38cdf91b7097879a3406898064d1c047c5a94c6cadc46cbeeea51c43d135e6aadfbdb38fa080a1b27a1d4cea1c36ff9eb3e14dc4b04de334c11
+EBUILD PEAR-Console_Table-1.3.0-r1.ebuild 390 BLAKE2B 1e6b4a96a56fd39abc2fa6c4f5c4019febb0eb66e0f9682b8d17185a1984b1708000954a3b6cea049fa667c261790ffc18bfeeba4ba03595386572ed8581c4f5 SHA512 b98c6d04e5ade6bcb5622c78b9909d7703c754eee25b945d58cb172efa713efe0c380b7daca3cf35ff105dc5a521cba2f00342e1aab13e7b942b391a3e298605
+MISC metadata.xml 315 BLAKE2B 82168e43ddcd8fbbff59b6a83fab3b4abbf540c4c486819da9ccf39b282f4b45c2bab6bedc97bcbcaae1656fd2fd1ebcee0d43b7ae0f5021eaa9767460a75dfc SHA512 8fdf28a135ca48c1d377bd355924214fbad506e853a6e9c85ba1956ea587e84bdcecb21aee700cff77031b37945a0143bbe98ea55e226934d6a7119ba367265b
diff --git a/dev-php/PEAR-Console_Table/PEAR-Console_Table-1.3.0-r1.ebuild b/dev-php/PEAR-Console_Table/PEAR-Console_Table-1.3.0-r1.ebuild
new file mode 100644
index 000000000000..3d67e12ea658
--- /dev/null
+++ b/dev-php/PEAR-Console_Table/PEAR-Console_Table-1.3.0-r1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit php-pear-r2
+
+DESCRIPTION="Class that makes it easy to build console style tables"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
+IUSE=""
+
+src_install() {
+ insinto /usr/share/php/Console
+ doins Table.php
+ php-pear-r2_install_packagexml
+}
diff --git a/dev-php/PEAR-Console_Table/metadata.xml b/dev-php/PEAR-Console_Table/metadata.xml
new file mode 100644
index 000000000000..14e7e697cfce
--- /dev/null
+++ b/dev-php/PEAR-Console_Table/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ <name>PHP</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="pear">Console_Table</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-php/PEAR-Crypt_CHAP-1.5.0-r2 b/dev-php/PEAR-Crypt_CHAP-1.5.0-r2
deleted file mode 100644
index a355a50e7e76..000000000000
--- a/dev-php/PEAR-Crypt_CHAP-1.5.0-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm test
-DEPEND=test? ( dev-lang/php:*[crypt,hash] dev-php/PEAR-PEAR )
-DESCRIPTION=Generating CHAP packets
-EAPI=6
-HOMEPAGE=https://pear.php.net/package/Crypt_CHAP
-IUSE=test
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86
-LICENSE=BSD
-RDEPEND=dev-lang/php:*[crypt,hash] >=dev-php/pear-1.8.1
-SLOT=0
-SRC_URI=https://pear.php.net/get/Crypt_CHAP-1.5.0.tgz
-_eclasses_=php-pear-r2 eb6928c33771db74564e814c5ca6c1b3
-_md5_=dcc89d76174eec940e67fc76c1979874
diff --git a/dev-php/PEAR-Crypt_CHAP/Manifest b/dev-php/PEAR-Crypt_CHAP/Manifest
new file mode 100644
index 000000000000..d33cdaf9c654
--- /dev/null
+++ b/dev-php/PEAR-Crypt_CHAP/Manifest
@@ -0,0 +1,4 @@
+AUX CHAP-1.5.0-constructor.patch 1273 BLAKE2B 84e35031521587383a843c78f49df567cdaf3fd81360454797993881e272a4d5e7816073cc774e7d7c47e6c30cebaa70521c5b391f28cbc081c96d5d90a207df SHA512 2053c12f4416654b614176ff06565032df25e3db970eaeb02e327ceb986c53adfd6b9c4285d5b81525ad8f93e548794fc81ee3da31ad4ebe1ea0e707f9e47369
+DIST Crypt_CHAP-1.5.0.tgz 5549 BLAKE2B 7b79e311d36a7c59b4838f5d0bfda1a39792519f53e036fb2f500130cd9265280fb2e2fb31683d95dee283875fe738746b19c78fc80fa0fd965e19f431d032ac SHA512 44cdfdf0bc857b3992c2635945374033112d972cdefeac8a45810f5b79a6a532de67fc5e9a06f2ec4b3ce4df62e300451d0f4078b4f8ecc9805dca5c08f6aa95
+EBUILD PEAR-Crypt_CHAP-1.5.0-r2.ebuild 622 BLAKE2B ed1ea88d7b0c5ef28e69e91a324d4530b85ccf0c4027b8288671bbebc01b88b1e1199ad46f8a3a57f9fd85f55964dcdac27a31685022121e3a56ed7f6ccc42ce SHA512 d838be7e6f52bdfd184e5db76716b1cbf805fdd050eeaa35fedb6d0111eeeca6af71b3e08725ba328210483fb308d06f48d04a3f5a79ebf84ef20e7b289a9394
+MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/PEAR-Crypt_CHAP/PEAR-Crypt_CHAP-1.5.0-r2.ebuild b/dev-php/PEAR-Crypt_CHAP/PEAR-Crypt_CHAP-1.5.0-r2.ebuild
new file mode 100644
index 000000000000..c89c76b8b15d
--- /dev/null
+++ b/dev-php/PEAR-Crypt_CHAP/PEAR-Crypt_CHAP-1.5.0-r2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit php-pear-r2
+
+DESCRIPTION="Generating CHAP packets"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+IUSE="test"
+# Crypt_CHAP_MSv1 needs mcrypt which is gone in 7.2+
+RDEPEND="dev-lang/php:*[crypt,hash]"
+DEPEND="test? ( ${RDEPEND} dev-php/PEAR-PEAR )"
+PATCHES=( "${FILESDIR}/CHAP-1.5.0-constructor.patch" )
+
+src_install() {
+ php-pear-r2_src_install
+ insinto /usr/share/php/Crypt
+ doins CHAP.php
+}
+
+src_test() {
+ pear run-tests tests/Crypt_CHAP.phpt || die
+}
diff --git a/dev-php/PEAR-Crypt_CHAP/files/CHAP-1.5.0-constructor.patch b/dev-php/PEAR-Crypt_CHAP/files/CHAP-1.5.0-constructor.patch
new file mode 100644
index 000000000000..6fa92898e106
--- /dev/null
+++ b/dev-php/PEAR-Crypt_CHAP/files/CHAP-1.5.0-constructor.patch
@@ -0,0 +1,65 @@
+diff -aurN a/CHAP.php b/CHAP.php
+--- a/CHAP.php 1970-01-01 04:13:08.000000000 -0500
++++ b/CHAP.php 2018-02-13 13:04:49.812389739 -0500
+@@ -78,7 +78,19 @@
+ * @var integer
+ */
+ var $chapid = 1;
+-
++
++ /**
++ * Constructor
++ *
++ * Generates a random challenge
++ * @return void
++ */
++ function __construct()
++ {
++ parent::__construct();
++ $this->generateChallenge();
++ }
++
+ /**
+ * Constructor
+ *
+@@ -160,7 +172,19 @@
+ * @var bool
+ */
+ var $flags = 1;
+-
++
++ /**
++ * Constructor
++ *
++ * Loads the hash extension
++ * @return void
++ */
++ function __construct()
++ {
++ parent::__construct();
++ $this->loadExtension('hash');
++ }
++
+ /**
+ * Constructor
+ *
+@@ -412,6 +436,19 @@
+ /**
+ * Constructor
+ *
++ * Generates the 16 Bytes peer and authentication challenge
++ * @return void
++ */
++ function __construct()
++ {
++ parent::__construct();
++ $this->generateChallenge('peerChallenge', 16);
++ $this->generateChallenge('authChallenge', 16);
++ }
++
++ /**
++ * Constructor
++ *
+ * Generates the 16 Bytes peer and authentication challenge
+ * @return void
+ */
diff --git a/dev-php/PEAR-Crypt_CHAP/metadata.xml b/dev-php/PEAR-Crypt_CHAP/metadata.xml
new file mode 100644
index 000000000000..b86acf66c756
--- /dev/null
+++ b/dev-php/PEAR-Crypt_CHAP/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ <name>PHP</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/dev-php/PEAR-Crypt_GPG-1.6.2 b/dev-php/PEAR-Crypt_GPG-1.6.2
deleted file mode 100644
index 1d7125d305b0..000000000000
--- a/dev-php/PEAR-Crypt_GPG-1.6.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare test
-DEPEND=test? ( app-crypt/gnupg dev-lang/php:*[posix,unicode] dev-php/PEAR-Console_CommandLine dev-php/PEAR-Exception dev-php/phpunit )
-DESCRIPTION=PHP interface to the GNU Privacy Guard (GnuPG)
-EAPI=6
-HOMEPAGE=http://pear.php.net/package/Crypt_GPG
-IUSE=test
-KEYWORDS=amd64 arm hppa ia64 ppc ppc64 sparc x86
-LICENSE=LGPL-2.1
-RDEPEND=app-crypt/gnupg dev-lang/php:*[posix,unicode] dev-php/PEAR-Console_CommandLine dev-php/PEAR-Exception
-SLOT=0
-SRC_URI=http://download.pear.php.net/package/Crypt_GPG-1.6.2.tgz
-_md5_=642d7bf46397c3ce6ff682d3b793a4ea
diff --git a/dev-php/PEAR-Crypt_GPG-1.6.3 b/dev-php/PEAR-Crypt_GPG-1.6.3
deleted file mode 100644
index 4a65a091e7ab..000000000000
--- a/dev-php/PEAR-Crypt_GPG-1.6.3
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=test? ( app-crypt/gnupg dev-lang/php:*[posix,unicode] dev-php/PEAR-Console_CommandLine dev-php/PEAR-Exception dev-php/phpunit )
-DEFINED_PHASES=install prepare test
-DESCRIPTION=PHP interface to the GNU Privacy Guard (GnuPG)
-EAPI=7
-HOMEPAGE=http://pear.php.net/package/Crypt_GPG
-IUSE=test
-KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=LGPL-2.1
-RDEPEND=app-crypt/gnupg dev-lang/php:*[posix,unicode] dev-php/PEAR-Console_CommandLine dev-php/PEAR-Exception
-SLOT=0
-SRC_URI=http://download.pear.php.net/package/Crypt_GPG-1.6.3.tgz
-_md5_=135aec0fd89a3955896064f51e1b9e45
diff --git a/dev-php/PEAR-Crypt_GPG/Manifest b/dev-php/PEAR-Crypt_GPG/Manifest
new file mode 100644
index 000000000000..5d5dc71c0f43
--- /dev/null
+++ b/dev-php/PEAR-Crypt_GPG/Manifest
@@ -0,0 +1,6 @@
+AUX fix-unit-tests-with-new-gpg.patch 2090 BLAKE2B 7cc3b79bfd29244eec6e0152130d33d64ff99ddb4da9508affa9a06274d8b888d4e7ea38c2a8e090953b40533b19a5224f803d71199ece8dde70444959fba9eb SHA512 3b6b301d19cde1eebd411caf409dd11add712717a638f2b4d8567114cc065efdc899cb8244412da7b3438850a9bedfafe95e370705fd7439b312f4cb318f4124
+DIST Crypt_GPG-1.6.2.tgz 346709 BLAKE2B abced2fe8c909f06690c38884506ce03df4c5ef3ef460aafce65ea9405c6974f8af320fd5a07a7967b45421a9a67aa27026c28ef7eb1402ffefba527007a33ae SHA512 9d954d96b4e461c75f79ce9bc701d062e3f19671690228e6e0ce5265733ac1de9c06520f9f750348f3c37f01ccb79720574b2d2f371e69c8a25ae6e1bc18aabd
+DIST Crypt_GPG-1.6.3.tgz 346999 BLAKE2B 8402ef382a6393972a3fda7370fbd37dec19d0ebabb6b316d35783538dbc01746476977d7dc3da487876201cd678964d9572dc67a43911319b1b614004a3c909 SHA512 f1ad2560a43a1e8f5a33269bc4ae4067e19e5325fdbd8d2fc55f6cb8aad89258df45fbecedd93a21749f33024c819f07399580b1a4760f5740f26043109dc396
+EBUILD PEAR-Crypt_GPG-1.6.2.ebuild 1143 BLAKE2B 9c3d6abc1c26edce890974074f198ad25c2cdc0994f15f6c1ed87535838a59c3591f1cb07b9bbbc01d52d53bb7831578e3ebeef918df949da6b3f45925994bad SHA512 39411280c81f82f849145f85f3db8752b230f3ecb44b39a1f661bfd946f6ba61b78ad55ebb42d98d15e63864a5d4f70454ff1857ae4fef3052f9e0d1e81663af
+EBUILD PEAR-Crypt_GPG-1.6.3.ebuild 1091 BLAKE2B 0df4468cfb9c0c28ae822ae30595e31c8807d7fec881e3b7faf3d6eaee0aafc55966cf6eabd6ac20c60d8999d48b00d4d3b3ab965acf78d942cdc51edf9bf789 SHA512 edc5ed49b7849fb622c11001a3b774ecbee62127aae73bde8b54b67aa3d89599ce000fe2d7a6f2732eed056c9ce29116969e523a3ff88b573c4eed3404d3ad36
+MISC metadata.xml 377 BLAKE2B d87bdb689ac2ef20b8d02bc7f9db6a3f23fa5bcaae752c4f5b1b0e5bbc67251779c0204b2943d044a1ca287bb07ddac9ef0ae960eb7f543e162ef6cabcbed65e SHA512 df55d57721b34bddab42639c469517c86139d60d4a4536b26b61cb35eb688c9d713cf90f92b2272e189e360042a2322e8f87480f4554a7c3cf9ffa314d053186
diff --git a/dev-php/PEAR-Crypt_GPG/PEAR-Crypt_GPG-1.6.2.ebuild b/dev-php/PEAR-Crypt_GPG/PEAR-Crypt_GPG-1.6.2.ebuild
new file mode 100644
index 000000000000..f07396ab6c05
--- /dev/null
+++ b/dev-php/PEAR-Crypt_GPG/PEAR-Crypt_GPG-1.6.2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PN="${PN/PEAR-/}"
+MY_PV="${PV/_/}"
+MY_P="${MY_PN}-${MY_PV}"
+
+DESCRIPTION="PHP interface to the GNU Privacy Guard (GnuPG)"
+HOMEPAGE="http://pear.php.net/package/${MY_PN}"
+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"
+
+RDEPEND="app-crypt/gnupg
+ dev-lang/php:*[posix,unicode]
+ dev-php/PEAR-Console_CommandLine
+ dev-php/PEAR-Exception"
+DEPEND="test? ( ${RDEPEND} dev-php/phpunit )"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=( "${FILESDIR}/fix-unit-tests-with-new-gpg.patch" )
+
+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_install() {
+ dodoc README.md
+ dobin scripts/crypt-gpg-pinentry
+
+ insinto "/usr/share/${MY_PN}"
+ doins -r data
+
+ insinto /usr/share/php
+ doins -r Crypt
+}
+
+src_test() {
+ phpunit tests/ || die "test suite failed"
+}
diff --git a/dev-php/PEAR-Crypt_GPG/PEAR-Crypt_GPG-1.6.3.ebuild b/dev-php/PEAR-Crypt_GPG/PEAR-Crypt_GPG-1.6.3.ebuild
new file mode 100644
index 000000000000..f40428e9b276
--- /dev/null
+++ b/dev-php/PEAR-Crypt_GPG/PEAR-Crypt_GPG-1.6.3.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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="http://pear.php.net/package/${MY_PN}"
+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"
+
+RDEPEND="app-crypt/gnupg
+ dev-lang/php:*[posix,unicode]
+ dev-php/PEAR-Console_CommandLine
+ dev-php/PEAR-Exception"
+BDEPEND="test? ( ${RDEPEND} dev-php/phpunit )"
+
+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_install() {
+ dodoc README.md
+ dobin scripts/crypt-gpg-pinentry
+
+ insinto "/usr/share/${MY_PN}"
+ doins -r data
+
+ insinto /usr/share/php
+ doins -r Crypt
+}
+
+src_test() {
+ phpunit tests/ || die "test suite failed"
+}
diff --git a/dev-php/PEAR-Crypt_GPG/files/fix-unit-tests-with-new-gpg.patch b/dev-php/PEAR-Crypt_GPG/files/fix-unit-tests-with-new-gpg.patch
new file mode 100644
index 000000000000..8e49a2f263fb
--- /dev/null
+++ b/dev-php/PEAR-Crypt_GPG/files/fix-unit-tests-with-new-gpg.patch
@@ -0,0 +1,55 @@
+From 14a884dd5127141929ef7a58185c298e92602c40 Mon Sep 17 00:00:00 2001
+From: Aleksander Machniak <machniak@kolabsys.com>
+Date: Sat, 16 Sep 2017 13:05:37 +0200
+Subject: [PATCH] Fix Bug #21242: PHPUnit tests fail sometimes while deleting
+ S.gpg-agent.extra
+
+---
+ tests/TestCase.php | 20 ++++++++++++++------
+ 1 file changed, 14 insertions(+), 6 deletions(-)
+
+diff --git a/tests/TestCase.php b/tests/TestCase.php
+index b91ea7d..1ad8028 100644
+--- a/tests/TestCase.php
++++ b/tests/TestCase.php
+@@ -583,7 +583,10 @@ private function _tearDownKeyring()
+ $iterator = new DirectoryIterator($dirname);
+ foreach ($iterator as $file) {
+ if (!$file->isDot()) {
+- unlink($dirname . '/' . $file->getFilename());
++ $filename = $dirname . '/' . $file->getFilename();
++ if (file_exists($filename)) {
++ unlink($filename);
++ }
+ }
+ }
+ rmdir($dirname);
+@@ -595,7 +598,10 @@ private function _tearDownKeyring()
+
+ foreach ($iterator as $file) {
+ if (!$file->isDot()) {
+- unlink($homedir . '/' . $file->getFilename());
++ $filename = $homedir . '/' . $file->getFilename();
++ if (file_exists($filename)) {
++ unlink($filename);
++ }
+ }
+ }
+
+@@ -614,10 +620,12 @@ private function _tearDownTempdir()
+ foreach ($iterator as $file) {
+ if (!$file->isDot()) {
+ $filename = $this->getTempFilename($file->getFilename());
+- if (is_dir($filename)) {
+- rmdir($filename);
+- } else {
+- unlink($filename);
++ if (file_exists($filename)) {
++ if (is_dir($filename)) {
++ rmdir($filename);
++ } else {
++ unlink($filename);
++ }
+ }
+ }
+ }
diff --git a/dev-php/PEAR-Crypt_GPG/metadata.xml b/dev-php/PEAR-Crypt_GPG/metadata.xml
new file mode 100644
index 000000000000..bceba1d91cde
--- /dev/null
+++ b/dev-php/PEAR-Crypt_GPG/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://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/Crypt_GPG</remote-id>
+ <remote-id type="pear">Crypt_GPG</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-php/PEAR-Crypt_HMAC-1.0.1-r2 b/dev-php/PEAR-Crypt_HMAC-1.0.1-r2
deleted file mode 100644
index 9013eab783df..000000000000
--- a/dev-php/PEAR-Crypt_HMAC-1.0.1-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm test
-DEPEND=test? ( dev-php/PEAR-PEAR )
-DESCRIPTION=Calculates RFC 2104 compliant hashes
-EAPI=6
-HOMEPAGE=https://pear.php.net/package/Crypt_HMAC
-IUSE=test
-KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=PHP-3
-RDEPEND=>=dev-php/pear-1.8.1
-SLOT=0
-SRC_URI=https://pear.php.net/get/Crypt_HMAC-1.0.1.tgz
-_eclasses_=php-pear-r2 eb6928c33771db74564e814c5ca6c1b3
-_md5_=2514f19059ee9698bd2f1c8ae480c7d4
diff --git a/dev-php/PEAR-Crypt_HMAC/Manifest b/dev-php/PEAR-Crypt_HMAC/Manifest
new file mode 100644
index 000000000000..71a0cedc7460
--- /dev/null
+++ b/dev-php/PEAR-Crypt_HMAC/Manifest
@@ -0,0 +1,4 @@
+AUX HMAC-1.0.1.patch 1501 BLAKE2B 2ee57e59c9d4ec6807c3daecc488a39102280c71da62baf9c3cf90a0af8e08c29e6d6be2593f148f4c4808b5d68fd0b681b511eeefd53bd91123959114651474 SHA512 19c968acbe449436f0bde2bbf9b379d9f04e76adf3283504b2fd396c94f19f5767a89a8fa23e23622b6fc3178be9c995b826d5540d994ca31e30f22a835f8c83
+DIST Crypt_HMAC-1.0.1.tgz 2149 BLAKE2B a95f145101cbd9f089948ac62d47b9a449a8cac328636987b49903c07c714c007309b294dd3a16fb5f5cf5bacf00c6e502fd8e29584803c99bff2bf61c5dec0a SHA512 5fb873d9d2e14f18f729e102b0295aaafef53bb150322f4a75d87f6d5ffd3e8829d424ee7285950d92c3408756b40b9ac7fe5123a73cefb341e4224f049bcb18
+EBUILD PEAR-Crypt_HMAC-1.0.1-r2.ebuild 531 BLAKE2B f17c22933aa6828a389d490839d7301749accaaf04731eed61839ad0528ef5495013ffa26a37f5507a6c0cc61974aecbd79970555c24bff4f46a5123ff2f5bf0 SHA512 363518b34f69265cc3a9723751d9204188b021a609cfc07fa36ed1fe6ad668049f0f36c96939eae2076778224a9c2d18193151480b9a7ce83b31391ea05f7d8e
+MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/PEAR-Crypt_HMAC/PEAR-Crypt_HMAC-1.0.1-r2.ebuild b/dev-php/PEAR-Crypt_HMAC/PEAR-Crypt_HMAC-1.0.1-r2.ebuild
new file mode 100644
index 000000000000..5fba6c704025
--- /dev/null
+++ b/dev-php/PEAR-Crypt_HMAC/PEAR-Crypt_HMAC-1.0.1-r2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit php-pear-r2
+
+DESCRIPTION="Calculates RFC 2104 compliant hashes"
+LICENSE="PHP-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+DEPEND="test? ( dev-php/PEAR-PEAR )"
+PATCHES=( "${FILESDIR}/HMAC-1.0.1.patch" )
+
+src_test(){
+ ln -s . Crypt || die
+ peardev run-tests tests || die
+}
+
+src_install(){
+ insinto /usr/share/php/Crypt
+ doins HMAC.php
+ php-pear-r2_install_packagexml
+}
diff --git a/dev-php/PEAR-Crypt_HMAC/files/HMAC-1.0.1.patch b/dev-php/PEAR-Crypt_HMAC/files/HMAC-1.0.1.patch
new file mode 100644
index 000000000000..efa9d96bdedf
--- /dev/null
+++ b/dev-php/PEAR-Crypt_HMAC/files/HMAC-1.0.1.patch
@@ -0,0 +1,57 @@
+diff -aurN a/HMAC.php b/HMAC.php
+--- a/HMAC.php 2005-02-20 14:24:14.000000000 -0500
++++ b/HMAC.php 2018-02-13 14:03:59.421976960 -0500
+@@ -68,8 +68,21 @@
+ * @access private
+ */
+ var $_pack;
+-
+-
++
++ /**
++ * Constructor
++ * Pass method as first parameter
++ *
++ * @param string $key Key to use for hash
++ * @param string $func Hash function used for the calculation
++ * @return void
++ * @access public
++ */
++ function __construct($key, $func = 'md5')
++ {
++ $this->Crypt_HMAC($key, $func);
++ }
++
+ /**
+ * Constructor
+ * Pass method as first parameter
+diff -aurN a/tests/HMAC_001.phpt b/tests/HMAC_001.phpt
+--- a/tests/HMAC_001.phpt 1969-12-31 19:00:00.000000000 -0500
++++ b/tests/HMAC_001.phpt 2018-02-13 14:00:47.899812172 -0500
+@@ -0,0 +1,26 @@
++--TEST--
++RFC 2104 Test Vectors
++--DESCRIPTION--
++This test file implements the three test vectors as described in
++RFC 2104 (https://www.ietf.org/rfc/rfc2104.txt)
++--FILE--
++<?php
++ require_once 'Crypt/HMAC.php';
++
++ $key = str_repeat(chr(0x0b), 16);
++ $crypt = new Crypt_HMAC($key, 'md5');
++ echo $crypt->hash('Hi There')."\n";
++
++ $key = 'Jefe';
++ $crypt->setKey($key);
++ echo $crypt->hash('what do ya want for nothing?')."\n";
++
++ $key = str_repeat(chr(0xaa), 16);
++ $data = str_repeat(chr(0xdd), 50);
++ $crypt->setKey($key);
++ echo $crypt->hash($data)."\n";
++?>
++--EXPECT--
++9294727a3638bb1c13f48ef8158bfc9d
++750c783e6ab0b503eaa86e310a5db738
++56be34521d144c88dbb8c733f0e8b3f6
diff --git a/dev-php/PEAR-Crypt_HMAC/metadata.xml b/dev-php/PEAR-Crypt_HMAC/metadata.xml
new file mode 100644
index 000000000000..b86acf66c756
--- /dev/null
+++ b/dev-php/PEAR-Crypt_HMAC/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ <name>PHP</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/dev-php/PEAR-Crypt_HMAC2-1.0.0-r1 b/dev-php/PEAR-Crypt_HMAC2-1.0.0-r1
deleted file mode 100644
index 0e3d47f84535..000000000000
--- a/dev-php/PEAR-Crypt_HMAC2-1.0.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm test
-DEPEND=test? ( dev-php/PEAR-PEAR dev-php/phpunit )
-DESCRIPTION=Implementation of Hashed Message Authentication Code for PHP5
-EAPI=6
-HOMEPAGE=https://pear.php.net/package/Crypt_HMAC2
-IUSE=test
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-php/pear-1.8.1
-SLOT=0
-SRC_URI=https://pear.php.net/get/Crypt_HMAC2-1.0.0.tgz
-_eclasses_=php-pear-r2 eb6928c33771db74564e814c5ca6c1b3
-_md5_=55f186496b38544a65d963b26304b138
diff --git a/dev-php/PEAR-Crypt_HMAC2/Manifest b/dev-php/PEAR-Crypt_HMAC2/Manifest
new file mode 100644
index 000000000000..5cd20323f7c7
--- /dev/null
+++ b/dev-php/PEAR-Crypt_HMAC2/Manifest
@@ -0,0 +1,3 @@
+DIST Crypt_HMAC2-1.0.0.tgz 8129 BLAKE2B 5e0754b683c1e930af42591a066b137e8ec4633eac10897361d923c84a3d70d327d224909c982b08d3d38ad5c810eb2a94c7d9bcdc41fddc44555e83587e2fca SHA512 0c3bd71ba8c2bf086ca703732fb3ee2471797ea486dbc863acbb5d07426395a65b8c794473ac4b1c1b85e954e27b79361116bee0a36f4b78edd780ea6c06bfca
+EBUILD PEAR-Crypt_HMAC2-1.0.0-r1.ebuild 701 BLAKE2B 89ceed915cf75c0af45f9448168166a64ac588426ea99d38ba6bab1deaa2e5db297fa2cf1c47453395328ecf63154683cc8187fc93ea16c110a4bb9bd1c850e4 SHA512 06bec85713241c64e516230763518c64c426808276af4d3344a2dd0e91ffb4c0a1ccc93c733e04186b058324841c169cf0360853c29acddf3b4d3220934cf9e0
+MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/PEAR-Crypt_HMAC2/PEAR-Crypt_HMAC2-1.0.0-r1.ebuild b/dev-php/PEAR-Crypt_HMAC2/PEAR-Crypt_HMAC2-1.0.0-r1.ebuild
new file mode 100644
index 000000000000..2647980b40b1
--- /dev/null
+++ b/dev-php/PEAR-Crypt_HMAC2/PEAR-Crypt_HMAC2-1.0.0-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit php-pear-r2
+
+DESCRIPTION="Implementation of Hashed Message Authentication Code for PHP5"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+DEPEND="test? ( dev-php/PEAR-PEAR dev-php/phpunit )"
+HTML_DOCS=( docs/intro.xml )
+
+src_test() {
+ phpunit tests || die
+}
+
+pkg_postinst() {
+ if ! has_version "dev-lang/php[hash]" ; then
+ elog "${PN} can use the hash extension when enabled to extend the range"
+ elog "of cryptographic hash functions beyond the natively implemented MD5 and SHA1."
+ elog "Recompile dev-lang/php with USE=\"hash\" if you want these features."
+ fi
+}
diff --git a/dev-php/PEAR-Crypt_HMAC2/metadata.xml b/dev-php/PEAR-Crypt_HMAC2/metadata.xml
new file mode 100644
index 000000000000..b86acf66c756
--- /dev/null
+++ b/dev-php/PEAR-Crypt_HMAC2/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ <name>PHP</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/dev-php/PEAR-DB-1.9.2-r1 b/dev-php/PEAR-DB-1.9.2-r1
deleted file mode 100644
index 4b334f1542bd..000000000000
--- a/dev-php/PEAR-DB-1.9.2-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm test
-DEPEND=test? ( dev-php/PEAR-PEAR )
-DESCRIPTION=Database abstraction layer for PHP
-EAPI=6
-HOMEPAGE=https://pear.php.net/package/DB
-IUSE=test
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86
-LICENSE=PHP-3
-RDEPEND=>=dev-php/pear-1.8.1
-SLOT=0
-SRC_URI=https://pear.php.net/get/DB-1.9.2.tgz
-_eclasses_=php-pear-r2 eb6928c33771db74564e814c5ca6c1b3
-_md5_=489c09533e94c76830617ee4c7e53d24
diff --git a/dev-php/PEAR-DB/Manifest b/dev-php/PEAR-DB/Manifest
new file mode 100644
index 000000000000..d3e67e48e658
--- /dev/null
+++ b/dev-php/PEAR-DB/Manifest
@@ -0,0 +1,3 @@
+DIST DB-1.9.2.tgz 133795 BLAKE2B 8b37b010145efd10a2b551392988a810c35b9a8c794eb0e162056fcded104276b19e97afb91149f1814f9f838a0db579a76578fb80d96d0574e5b7714d77aa91 SHA512 126bbbb847a24c20731f1e5f4a549e9d7e0651a760f10c49cfc7550f80dd8b05f3560bc80110bcaab9e79dcbb714c6113948f14a727f7f4087a23178b3db0afa
+EBUILD PEAR-DB-1.9.2-r1.ebuild 734 BLAKE2B 55553e5f5029189f6ab184bd99b339a06bf0e40b1639ffe12eabdcf50b6a54dbf1783156daf55d80b9467cca5e50b11f1a32e5c439e3b083c9fc026dc5c7c204 SHA512 149ebb0686cccb7be2de824b8cf170e2c08fc45c0fd0f0ddd7b53cf5c50138fd9a53ad6a00c2e0be6dca1a9faa38ec32857d8239f014c34718f2909002097f4a
+MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/PEAR-DB/PEAR-DB-1.9.2-r1.ebuild b/dev-php/PEAR-DB/PEAR-DB-1.9.2-r1.ebuild
new file mode 100644
index 000000000000..662cd70f7987
--- /dev/null
+++ b/dev-php/PEAR-DB/PEAR-DB-1.9.2-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit php-pear-r2
+
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+
+DESCRIPTION="Database abstraction layer for PHP"
+LICENSE="PHP-3"
+SLOT="0"
+IUSE="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, 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
+ # 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-DB/metadata.xml b/dev-php/PEAR-DB/metadata.xml
new file mode 100644
index 000000000000..b86acf66c756
--- /dev/null
+++ b/dev-php/PEAR-DB/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ <name>PHP</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/dev-php/PEAR-DB_DataObject-1.11.5-r1 b/dev-php/PEAR-DB_DataObject-1.11.5-r1
deleted file mode 100644
index 81b89e061d3a..000000000000
--- a/dev-php/PEAR-DB_DataObject-1.11.5-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare
-DESCRIPTION=SQL builder and data modeling layer
-EAPI=6
-HOMEPAGE=https://pear.php.net/package/DB_DataObject
-IUSE=minimal
-KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=PHP-3.01
-RDEPEND=|| ( dev-php/PEAR-MDB2 dev-php/PEAR-DB ) dev-php/PEAR-Date !minimal? ( dev-php/PEAR-Validate ) >=dev-php/pear-1.8.1
-SLOT=0
-SRC_URI=https://pear.php.net/get/DB_DataObject-1.11.5.tgz
-_eclasses_=php-pear-r2 eb6928c33771db74564e814c5ca6c1b3
-_md5_=0f3e045142f15d9da1aa58c70c961c23
diff --git a/dev-php/PEAR-DB_DataObject/Manifest b/dev-php/PEAR-DB_DataObject/Manifest
new file mode 100644
index 000000000000..55c7404afb34
--- /dev/null
+++ b/dev-php/PEAR-DB_DataObject/Manifest
@@ -0,0 +1,3 @@
+DIST DB_DataObject-1.11.5.tgz 83878 BLAKE2B 0d73cde628a61e208c665546d15b4e7f4203c04dd4c5e7cc86c36ca46b60d8fcd28643b2ff720b940d1fb4fc86fdee650fec784cbda7885a31c9c120d90edbeb SHA512 bc8c5d0994fba78c6f8137682da87018e7660ceb39f5583aabf424509bf0ab263b8f32f6676821acaf69ed991778ad85f5f3fc156799c0811b2ec39546688bc6
+EBUILD PEAR-DB_DataObject-1.11.5-r1.ebuild 867 BLAKE2B 880ce15c067451e81ffdf0f858cdffe4d1e40904500d2010e1ec53660073dc5b0cd5db4694fb05c6f6b6e178b3d92fddc97bf9a79a42076834065a099bf988a1 SHA512 a372ea8869a78ea427e70092798f62d6bdcc31f48e08d231978071306000c0b6c1f9ab89bbb3e8cad20674f9ade1c4a4f2717649686aa4e9404cd927cdbee40d
+MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/PEAR-DB_DataObject/PEAR-DB_DataObject-1.11.5-r1.ebuild b/dev-php/PEAR-DB_DataObject/PEAR-DB_DataObject-1.11.5-r1.ebuild
new file mode 100644
index 000000000000..aa8425ee51f0
--- /dev/null
+++ b/dev-php/PEAR-DB_DataObject/PEAR-DB_DataObject-1.11.5-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit php-pear-r2
+
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+DESCRIPTION="SQL builder and data modeling layer"
+LICENSE="PHP-3.01"
+SLOT="0"
+IUSE="minimal"
+
+# The MDB2/DB dependencies are listed as "optional," but really, you
+# need one or the other. Prefer the newer MDB2 to the deprecated DB.
+DEPEND=""
+RDEPEND="|| ( dev-php/PEAR-MDB2 dev-php/PEAR-DB )
+ dev-php/PEAR-Date
+ !minimal? ( dev-php/PEAR-Validate )"
+DOCS=( docs/example.ini )
+
+src_prepare() {
+ # Don't install this batch file -- it winds up in ${EPREFIX}/usr/bin.
+ # Delete the line that mentions it from package.xml.
+ sed -e '/DB_DataObject_createTables\.bat/d' \
+ -i "${WORKDIR}/package.xml" \
+ || die "failed to remove batch file from package.xml"
+
+ eapply_user
+}
diff --git a/dev-php/PEAR-DB_DataObject/metadata.xml b/dev-php/PEAR-DB_DataObject/metadata.xml
new file mode 100644
index 000000000000..b86acf66c756
--- /dev/null
+++ b/dev-php/PEAR-DB_DataObject/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ <name>PHP</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/dev-php/PEAR-Date-1.5.0_alpha4-r1 b/dev-php/PEAR-Date-1.5.0_alpha4-r1
deleted file mode 100644
index 9f14de8d13c2..000000000000
--- a/dev-php/PEAR-Date-1.5.0_alpha4-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DESCRIPTION=Date and Time Zone classes
-EAPI=6
-HOMEPAGE=https://pear.php.net/package/Date
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86
-LICENSE=BSD
-RDEPEND=>=dev-php/pear-1.8.1
-SLOT=0
-SRC_URI=https://pear.php.net/get/Date-1.5.0a4.tgz
-_eclasses_=php-pear-r2 eb6928c33771db74564e814c5ca6c1b3
-_md5_=7fa2a30de7b1d2a69757e5abbe4a94d3
diff --git a/dev-php/PEAR-Date/Manifest b/dev-php/PEAR-Date/Manifest
new file mode 100644
index 000000000000..f5fcc3980eeb
--- /dev/null
+++ b/dev-php/PEAR-Date/Manifest
@@ -0,0 +1,3 @@
+DIST Date-1.5.0a4.tgz 222378 BLAKE2B aeca1d84c0cdbb55ed5ac9f6ce7819f7666085a1dbf610990e4afb07be78fed1cabbadd770ffceea97c37eb4ffccf44d18fd84646b6918cd5f5fa12f97d2c951 SHA512 91f80cbb78b8cf24fdc2e4423e7e018da736507136bcf68a61dc8a0f130d44f5937e1ddf39b45189cb08e0d17a4c0295d407920a2b25ba8029517e96a071b65b
+EBUILD PEAR-Date-1.5.0_alpha4-r1.ebuild 366 BLAKE2B 1b84b3e2ffd838d8c9f06720673c1281a50067e5a3ba6d78319f9575bb136e745f8a6fc733a51e63785d1f1817e429d31adfa48492704f05271f681d33c1d0bd SHA512 3057c4adf2d2c7494428b2b507f752ae53ceccc1e1389ac5e9c7024c641c3d717ffd685247f7095206cd8abb1742f727b5e93c6ed54e487aba4654ab00423bda
+MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/PEAR-Date/PEAR-Date-1.5.0_alpha4-r1.ebuild b/dev-php/PEAR-Date/PEAR-Date-1.5.0_alpha4-r1.ebuild
new file mode 100644
index 000000000000..ccb8be0dbb46
--- /dev/null
+++ b/dev-php/PEAR-Date/PEAR-Date-1.5.0_alpha4-r1.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PEAR_PV=${PV/_alpha/a}
+inherit php-pear-r2
+
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+
+DESCRIPTION="Date and Time Zone classes"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+DOCS=( README docs/TODO )
+HTML_DOCS=( docs/examples/example.php )
diff --git a/dev-php/PEAR-Date/metadata.xml b/dev-php/PEAR-Date/metadata.xml
new file mode 100644
index 000000000000..b86acf66c756
--- /dev/null
+++ b/dev-php/PEAR-Date/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ <name>PHP</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/dev-php/PEAR-Exception-1.0.0 b/dev-php/PEAR-Exception-1.0.0
deleted file mode 100644
index 6dfe15346611..000000000000
--- a/dev-php/PEAR-Exception-1.0.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install test
-DEPEND=test? ( dev-lang/php:* !<=dev-php/PEAR-PEAR-1.10.3-r1 dev-php/phpunit )
-DESCRIPTION=The PEAR Exception base class
-EAPI=6
-HOMEPAGE=http://pear.php.net/package/PEAR_Exception
-IUSE=test
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86
-LICENSE=BSD-2
-RDEPEND=dev-lang/php:* !<=dev-php/PEAR-PEAR-1.10.3-r1
-SLOT=0
-SRC_URI=http://download.pear.php.net/package/PEAR_Exception-1.0.0.tgz
-_md5_=8e7c34de0d35ecbf3394ee2e351d2a25
diff --git a/dev-php/PEAR-Exception/Manifest b/dev-php/PEAR-Exception/Manifest
new file mode 100644
index 000000000000..3f3a33e01246
--- /dev/null
+++ b/dev-php/PEAR-Exception/Manifest
@@ -0,0 +1,3 @@
+DIST PEAR_Exception-1.0.0.tgz 5270 BLAKE2B f6f6874083fcef2453e1d07e1ee3e900e4f7d18eca8e9a9eda9891492dd3fc1e31eb13944031e82044f976f1070463a3b099a8223d2dabb2da109bb123997f5a SHA512 f2078186fdad6c6ca59ac462a24f7f9689bea08d30f786acb7779d52cd433e490c752ba0a263067d869151b0c051cded327cb3477a039c5de68c854bff002b58
+EBUILD PEAR-Exception-1.0.0.ebuild 654 BLAKE2B b037951a5d5fbfd25883481b9832b89b6502886287c5b014e95af1f73f5946f4d0a38168e2b9d5e45399a3f16eb975e65bf2574b9e03772ae24a9cb22fd85326 SHA512 4471169353b1dc3ac45b513a5e268c4525d9ec5ebecda2d21e1a9434faef9368f705edbe41c1ee73e74b22f375f09574995f4a390f8422fa2b50b71fd56ef514
+MISC metadata.xml 387 BLAKE2B 889a6e870f53bbaf7ea5d86dbddd30c85bbab181886d5eed8b8d05d4b744ed5b1152773a158f7ace3b3bf037d0dc6d5631d5e951a12f4c7a16d05a66156513ba SHA512 c3c5a2c8f8f1696240e9631e2e29d5f0780c856ad92067b24bafdf2325170b24177dd2b0ef6dba4582ec517e64f98019e9c4b823a045c9f65dd5606f0bc29e62
diff --git a/dev-php/PEAR-Exception/PEAR-Exception-1.0.0.ebuild b/dev-php/PEAR-Exception/PEAR-Exception-1.0.0.ebuild
new file mode 100644
index 000000000000..1a4d317b5dde
--- /dev/null
+++ b/dev-php/PEAR-Exception/PEAR-Exception-1.0.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PN="${PN/-/_}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="The PEAR Exception base class"
+HOMEPAGE="http://pear.php.net/package/${MY_PN}"
+SRC_URI="http://download.pear.php.net/package/${MY_P}.tgz"
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+IUSE="test"
+RDEPEND="dev-lang/php:*
+ !<=dev-php/PEAR-PEAR-1.10.3-r1"
+DEPEND="test? ( ${RDEPEND} dev-php/phpunit )"
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+ insinto /usr/share/php
+ doins -r PEAR
+}
+
+src_test() {
+ phpunit tests || die "test suite failed"
+}
diff --git a/dev-php/PEAR-Exception/metadata.xml b/dev-php/PEAR-Exception/metadata.xml
new file mode 100644
index 000000000000..37885d3bad10
--- /dev/null
+++ b/dev-php/PEAR-Exception/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://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/pear_exception</remote-id>
+ <remote-id type="pear">PEAR_Exception</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-php/PEAR-File-1.4.1-r1 b/dev-php/PEAR-File-1.4.1-r1
deleted file mode 100644
index 2d687be21680..000000000000
--- a/dev-php/PEAR-File-1.4.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm test
-DEPEND=test? ( dev-php/PEAR-PEAR )
-DESCRIPTION=Common file and directory routines
-EAPI=6
-HOMEPAGE=https://pear.php.net/package/File
-IUSE=test
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86
-LICENSE=PHP-3
-RDEPEND=>=dev-php/pear-1.8.1
-SLOT=0
-SRC_URI=https://pear.php.net/get/File-1.4.1.tgz
-_eclasses_=php-pear-r2 eb6928c33771db74564e814c5ca6c1b3
-_md5_=244171c33c664429daf8b6056c1b9451
diff --git a/dev-php/PEAR-File/Manifest b/dev-php/PEAR-File/Manifest
new file mode 100644
index 000000000000..950f9f09944b
--- /dev/null
+++ b/dev-php/PEAR-File/Manifest
@@ -0,0 +1,3 @@
+DIST File-1.4.1.tgz 8164 BLAKE2B f57a70b6cdd469c152f7beb2dffe0b278ae0eb71c412729a15b8d2a9dfef1b2bb303d96930bba64bfc1d4f2972a4f64087f972fc0367fef67e6b88c29e56a78a SHA512 78dbe4f80296f3c16df89de2f0d332b442d4787be4f7a3bb78259b0e0a0eb719bbadecba6571609ea6b6a488124ff36b6de08061e88268d5f2805fb8a3be05b0
+EBUILD PEAR-File-1.4.1-r1.ebuild 379 BLAKE2B 97361481a212750ee3050e77d836fb68a77ef1f6488ebb32ab1a2c79ecf267afef3a6db836f059cc19ce1d188055cc04a870320d149272d53e21a98c449a49db SHA512 91261bbc68ee7c932c2027692c6038f0937ecfd9ec425f74cba9b2a29638217e1e76e8fe9ca30f8026de42d461dcd2fa8ea1094bb36b8765d8feabed18dca975
+MISC metadata.xml 235 BLAKE2B 5b10304feea18aae1822be7d29bcce06c8715193b14a3dd2c4d79eb75e2767670352e2ca11e06b9a10ec04b63020a18254cd167e6d6be9072f4a200ca5d11ec4 SHA512 0b3e95bbf68eddf74289dad50f8828cffce2d904ff6f9bd5468177de979677cac11da84d1e0302c52b72085915b9d1b3496107172e5726520d51dad1981daf64
diff --git a/dev-php/PEAR-File/PEAR-File-1.4.1-r1.ebuild b/dev-php/PEAR-File/PEAR-File-1.4.1-r1.ebuild
new file mode 100644
index 000000000000..8550040aaa74
--- /dev/null
+++ b/dev-php/PEAR-File/PEAR-File-1.4.1-r1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit php-pear-r2
+
+DESCRIPTION="Common file and directory routines"
+
+LICENSE="PHP-3"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+IUSE="test"
+DEPEND="test? ( dev-php/PEAR-PEAR )"
+
+src_test() {
+ peardev run-tests -r tests || die
+}
diff --git a/dev-php/PEAR-File/metadata.xml b/dev-php/PEAR-File/metadata.xml
new file mode 100644
index 000000000000..aca42932b833
--- /dev/null
+++ b/dev-php/PEAR-File/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ <name>PHP</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-php/PEAR-File_Archive-1.5.5-r1 b/dev-php/PEAR-File_Archive-1.5.5-r1
deleted file mode 100644
index 7552590c5ce3..000000000000
--- a/dev-php/PEAR-File_Archive-1.5.5-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Easily manipulate archives in PHP
-EAPI=6
-HOMEPAGE=http://pear.php.net/package/File_Archive
-IUSE=minimal
-KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=LGPL-2.1
-RDEPEND=dev-lang/php[bzip2,zlib] dev-php/PEAR-MIME_Type dev-php/PEAR-PEAR !minimal? ( dev-php/PEAR-Mail_Mime dev-php/PEAR-Mail dev-php/PEAR-Cache_Lite )
-SLOT=0
-SRC_URI=http://download.pear.php.net/package/File_Archive-1.5.5.tgz
-_md5_=c17b1abf422b1d0d0d93eb67deea2bd2
diff --git a/dev-php/PEAR-File_Archive/Manifest b/dev-php/PEAR-File_Archive/Manifest
new file mode 100644
index 000000000000..37e6d727eb3f
--- /dev/null
+++ b/dev-php/PEAR-File_Archive/Manifest
@@ -0,0 +1,3 @@
+DIST File_Archive-1.5.5.tgz 62598 BLAKE2B 8aa82e244f01c2ae6b5761fd4db9eca0ef32dbdfcbf3ab107936eac5ff4d48f875312c691232ca2bf259f6701863c16c3b137488bf0f33960ae9fde80ce0b3b8 SHA512 528449e59e0853bbd73e2d7cb14cd11748e68abe889781f0476c6206e0d15e1c4b0b457172d88e73f7bb31cde3b6612ab3e86d8862322e0921e00db331f1d1e1
+EBUILD PEAR-File_Archive-1.5.5-r1.ebuild 682 BLAKE2B 7699a040e6bc30ac4c7d2ca78d6da1ab7b595a97ebdcfaa1682f644f8d7dd79a41a1bc47e2168026db2ec3ad50004f7c06fbd1d4ef59eb4d9bedf396b4ef52f4 SHA512 e6238fcdef09cce11c5cc0327b9790c72977bff09d86e45c6e58602522d61ed95ff139fbfc78a587c83e8c4968c513e71348b35ad5eb11ea480a13c6f15b802a
+MISC metadata.xml 314 BLAKE2B f15134512e7946608f8fd7cad48ea26d03e1096163da6cf211b93cfb50b31f8ba83e2dbe3ff4e02a745466c808ad0cb74f6bc476843e6e549884cf2a7d6be00d SHA512 bf5f29569f76006e3ee0a8a0dd2fdd7ba95fc9152d74206dcc22af239a177066bcee480e2529b63ab1e7caf3cb755a2c0d33a7e8790127baad4597e55eec077f
diff --git a/dev-php/PEAR-File_Archive/PEAR-File_Archive-1.5.5-r1.ebuild b/dev-php/PEAR-File_Archive/PEAR-File_Archive-1.5.5-r1.ebuild
new file mode 100644
index 000000000000..ae8e9667a517
--- /dev/null
+++ b/dev-php/PEAR-File_Archive/PEAR-File_Archive-1.5.5-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PN="${PN/PEAR-/}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Easily manipulate archives in PHP"
+HOMEPAGE="http://pear.php.net/package/${MY_PN}"
+SRC_URI="http://download.pear.php.net/package/${MY_P}.tgz"
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="minimal"
+
+RDEPEND="dev-lang/php[bzip2,zlib]
+ dev-php/PEAR-MIME_Type
+ dev-php/PEAR-PEAR
+ !minimal? (
+ dev-php/PEAR-Mail_Mime
+ dev-php/PEAR-Mail
+ dev-php/PEAR-Cache_Lite
+ )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+ dodoc README
+
+ insinto /usr/share/php
+ doins -r File
+}
diff --git a/dev-php/PEAR-File_Archive/metadata.xml b/dev-php/PEAR-File_Archive/metadata.xml
new file mode 100644
index 000000000000..5d4c59b9bcb3
--- /dev/null
+++ b/dev-php/PEAR-File_Archive/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ <name>PHP</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="pear">File_Archive</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-php/PEAR-File_Find-1.3.3 b/dev-php/PEAR-File_Find-1.3.3
deleted file mode 100644
index ad5be6637927..000000000000
--- a/dev-php/PEAR-File_Find-1.3.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare test
-DEPEND=test? ( dev-php/PEAR-PEAR )
-DESCRIPTION=A class that facillitates the search of filesystems
-EAPI=6
-HOMEPAGE=http://pear.php.net/package/File_Find
-IUSE=test
-KEYWORDS=alpha amd64 hppa ia64 ppc ppc64 sparc x86
-LICENSE=PHP-3.01
-RDEPEND=dev-lang/php:* dev-php/PEAR-PEAR
-SLOT=0
-SRC_URI=http://download.pear.php.net/package/File_Find-1.3.3.tgz
-_md5_=8c3fcc5104d642fb90bf55997364bcef
diff --git a/dev-php/PEAR-File_Find/Manifest b/dev-php/PEAR-File_Find/Manifest
new file mode 100644
index 000000000000..f27f3382e6e8
--- /dev/null
+++ b/dev-php/PEAR-File_Find/Manifest
@@ -0,0 +1,3 @@
+DIST File_Find-1.3.3.tgz 8212 BLAKE2B be45210efcf1aad52df123dd141f1a8ea62321a25cb460da4384456baeff13b51f8850f44e08cb75baa350e7b2a1419b27d89dd5a81f58a7302ab93c95c274a3 SHA512 f912e1f680c5869380791979bd33dabce0e95e40a84ee188052b2be8280de806fd117c11d66b98b7072724ecd9d57203ee5a32fe35705c337e73393fec075bb0
+EBUILD PEAR-File_Find-1.3.3.ebuild 1152 BLAKE2B dba22289766e087460684434bd73faf521c6d57fdbd6a52c9eeabdbfecf9614ddde4cbb6e5c64d168c3452c5e40d4f46d1391570c1c041d3e08d8dc8279bf509 SHA512 c1764666485e5064f9ce92c0b4667c5abc6d06b57b1a5e732a85172c3a67e33aa2f756ef6d7b86f7d43701eeab86dfe2caa90998051283d6c0cafb8c9bf5a4f3
+MISC metadata.xml 377 BLAKE2B d299154cdb99a5ff1562f245e5a24face117c08cb2bd9f457ee83d40bde667ed659c84e94465c1cbaeb6b2220c48738d261ed690aca9bc43fc83d127adcff872 SHA512 1d640be46e06957c8f3c127a9acac3f4f6b197efdcb96b13a5fff00aa638b3cb7febb5cba261ce45bb68c2356894006e3e57343fdf8bfbdb5d60e6a89f173a73
diff --git a/dev-php/PEAR-File_Find/PEAR-File_Find-1.3.3.ebuild b/dev-php/PEAR-File_Find/PEAR-File_Find-1.3.3.ebuild
new file mode 100644
index 000000000000..a4addfe6d4e7
--- /dev/null
+++ b/dev-php/PEAR-File_Find/PEAR-File_Find-1.3.3.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PN="${PN/PEAR-/}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A class that facillitates the search of filesystems"
+HOMEPAGE="http://pear.php.net/package/${MY_PN}"
+SRC_URI="http://download.pear.php.net/package/${MY_P}.tgz"
+LICENSE="PHP-3.01"
+SLOT="0"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
+IUSE="test"
+
+# Really only needs PEAR-Exception at runtime.
+RDEPEND="dev-lang/php:*
+ dev-php/PEAR-PEAR"
+DEPEND="test? ( dev-php/PEAR-PEAR )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+ eapply_user
+
+ # Without this sed, the test suite will try (and fail) to mess
+ # around in /tmp.
+ sed -i "s~'/tmp'~'${T}'~" tests/setup.php \
+ || die 'failed to fix temporary directory in tests/setup.php'
+}
+
+src_install() {
+ insinto /usr/share/php
+ doins -r File
+}
+
+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-File_Find/metadata.xml b/dev-php/PEAR-File_Find/metadata.xml
new file mode 100644
index 000000000000..a200773ff92e
--- /dev/null
+++ b/dev-php/PEAR-File_Find/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://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/File_Find</remote-id>
+ <remote-id type="pear">File_Find</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-php/PEAR-File_Fortune-1.0.0-r1 b/dev-php/PEAR-File_Fortune-1.0.0-r1
deleted file mode 100644
index 75224712da1d..000000000000
--- a/dev-php/PEAR-File_Fortune-1.0.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm test
-DEPEND=test? ( >=dev-lang/php-5.1.4:* dev-php/phpunit )
-DESCRIPTION=Interface for reading from and writing to fortune files
-EAPI=6
-HOMEPAGE=https://pear.php.net/package/File_Fortune
-IUSE=test
-KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=BSD
-RDEPEND=>=dev-lang/php-5.1.4:* >=dev-php/pear-1.8.1
-SLOT=0
-SRC_URI=https://pear.php.net/get/File_Fortune-1.0.0.tgz
-_eclasses_=php-pear-r2 eb6928c33771db74564e814c5ca6c1b3
-_md5_=0e3439b6b707d2efacd44f60800c1be7
diff --git a/dev-php/PEAR-File_Fortune/Manifest b/dev-php/PEAR-File_Fortune/Manifest
new file mode 100644
index 000000000000..827805dc5ffc
--- /dev/null
+++ b/dev-php/PEAR-File_Fortune/Manifest
@@ -0,0 +1,3 @@
+DIST File_Fortune-1.0.0.tgz 14508 BLAKE2B df783a063df6d48692518955f8f1a6306b0e67021c0d3cf6a336ce643a907a5f89578c759f44c9ea36debac28d3819065c2763d5ff8f6c6f63ecd0ea13a68e29 SHA512 4f996e7c6efb339944cdd1cea75400a7539708661b2783fc1126697a12692b3db7a104550da8007fae4e0ac374c2c047a4c90dfa0d2c3424b84f4e1b61ae43ac
+EBUILD PEAR-File_Fortune-1.0.0-r1.ebuild 421 BLAKE2B cc4be0b791cc431250ee7f3aa264e5fa7447361f4d3603c3e80fb4bc8270d57da3bdd0f09b48f04c7a5794d44738e87d3503d9d5a4c6a51f0dcb3577ab26ebe8 SHA512 c1fff21d960c87718579d2274b28262c079b530d2cb74ececd13a4b795159752d5fbaec5d56cb7d91f564429fd75f0f7f95bf0225862a7d7c4ab67db906fb9dc
+MISC metadata.xml 235 BLAKE2B 5b10304feea18aae1822be7d29bcce06c8715193b14a3dd2c4d79eb75e2767670352e2ca11e06b9a10ec04b63020a18254cd167e6d6be9072f4a200ca5d11ec4 SHA512 0b3e95bbf68eddf74289dad50f8828cffce2d904ff6f9bd5468177de979677cac11da84d1e0302c52b72085915b9d1b3496107172e5726520d51dad1981daf64
diff --git a/dev-php/PEAR-File_Fortune/PEAR-File_Fortune-1.0.0-r1.ebuild b/dev-php/PEAR-File_Fortune/PEAR-File_Fortune-1.0.0-r1.ebuild
new file mode 100644
index 000000000000..ec5a405cb607
--- /dev/null
+++ b/dev-php/PEAR-File_Fortune/PEAR-File_Fortune-1.0.0-r1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit php-pear-r2
+
+DESCRIPTION="Interface for reading from and writing to fortune files"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+
+RDEPEND=">=dev-lang/php-5.1.4:*"
+DEPEND="test? ( ${RDEPEND} dev-php/phpunit )"
+
+src_test(){
+ phpunit tests || die
+}
diff --git a/dev-php/PEAR-File_Fortune/metadata.xml b/dev-php/PEAR-File_Fortune/metadata.xml
new file mode 100644
index 000000000000..aca42932b833
--- /dev/null
+++ b/dev-php/PEAR-File_Fortune/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ <name>PHP</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-php/PEAR-File_Gettext-0.4.2-r1 b/dev-php/PEAR-File_Gettext-0.4.2-r1
deleted file mode 100644
index 0ee4052e746d..000000000000
--- a/dev-php/PEAR-File_Gettext-0.4.2-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DESCRIPTION=GNU Gettext file parser
-EAPI=6
-HOMEPAGE=https://pear.php.net/package/File_Gettext
-KEYWORDS=alpha amd64 ~arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86
-LICENSE=PHP-3
-RDEPEND=>=dev-php/pear-1.8.1
-SLOT=0
-SRC_URI=https://pear.php.net/get/File_Gettext-0.4.2.tgz
-_eclasses_=php-pear-r2 eb6928c33771db74564e814c5ca6c1b3
-_md5_=702346fc7140e9efdb03b9f4eb64b3d4
diff --git a/dev-php/PEAR-File_Gettext/Manifest b/dev-php/PEAR-File_Gettext/Manifest
new file mode 100644
index 000000000000..76d7d72d0710
--- /dev/null
+++ b/dev-php/PEAR-File_Gettext/Manifest
@@ -0,0 +1,4 @@
+AUX File_Gettext-0.4.2-construct.patch 1999 BLAKE2B 5feac1b3c48fef5401158a06db1410878b50d28841807ea5d2f99c7c59cc51472927f9ee85f9b29deadfbe0c964f761d2fbdcfd912ceeda6a722f463370373ff SHA512 a1ca97160f3c521ba340a89c19933daba20b0c11716349b34b330fe10f5a9e924cc28fa7248efb64648ef1ffac832a16c6051723d6f76c63a03454a523a9fe6e
+DIST File_Gettext-0.4.2.tgz 7307 BLAKE2B f1eae4724c62a44515107a0e4cb89aa7abff8f856c5f11a90f6b78dc4e5601cc024e64e8ae0344c3433ffc5355e2dbb9d7e3cc745001ad2098a073bbca0a97da SHA512 cc56430076485d90afca548c78650a2ada4eb8df7e0a58458eded2dca222466aba91d982fb0103e6b63fc4c8140c3ac4c2a4a7c3c77fbc7740922a8b4e33c6a9
+EBUILD PEAR-File_Gettext-0.4.2-r1.ebuild 338 BLAKE2B 2c1019e66b1d882a149c27c7ca77d2e3850ff2da4cde9544162310e68e7cff3f24733c03fea3a35651edf1441593dc76b3d8c71792d4fe8e36fc463e38e0f9c4 SHA512 638688b767d165d864a512f846a1823f55c6cb18b8dd6153135d391232c453b8f32d94551dfcfb6a6edc10220cfdf0d67ce9d50f9621ab88257eb1e94af9299a
+MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/PEAR-File_Gettext/PEAR-File_Gettext-0.4.2-r1.ebuild b/dev-php/PEAR-File_Gettext/PEAR-File_Gettext-0.4.2-r1.ebuild
new file mode 100644
index 000000000000..633c8c657fc4
--- /dev/null
+++ b/dev-php/PEAR-File_Gettext/PEAR-File_Gettext-0.4.2-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit php-pear-r2
+
+DESCRIPTION="GNU Gettext file parser"
+
+LICENSE="PHP-3"
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+IUSE=""
+PATCHES=( "${FILESDIR/File_Gettext-0.4.2-construct.patch}" )
diff --git a/dev-php/PEAR-File_Gettext/files/File_Gettext-0.4.2-construct.patch b/dev-php/PEAR-File_Gettext/files/File_Gettext-0.4.2-construct.patch
new file mode 100644
index 000000000000..3527814485ab
--- /dev/null
+++ b/dev-php/PEAR-File_Gettext/files/File_Gettext-0.4.2-construct.patch
@@ -0,0 +1,67 @@
+diff -aurN a/File/Gettext/MO.php b/File/Gettext/MO.php
+--- a/File/Gettext/MO.php 2012-03-03 22:00:49.000000000 -0500
++++ b/File/Gettext/MO.php 2018-02-16 15:15:17.725027132 -0500
+@@ -60,6 +60,10 @@
+ * @access public
+ * @return object File_Gettext_MO
+ */
++ function __construct($file = '')
++ {
++ $this->file = $file;
++ }
+ function File_Gettext_MO($file = '')
+ {
+ $this->file = $file;
+diff -aurN a/File/Gettext/PO.php b/File/Gettext/PO.php
+--- a/File/Gettext/PO.php 2012-03-03 22:00:49.000000000 -0500
++++ b/File/Gettext/PO.php 2018-02-16 15:14:57.997419162 -0500
+@@ -42,6 +42,10 @@
+ * @access public
+ * @return object File_Gettext_PO
+ */
++ function __construct($file = '')
++ {
++ $this->file = $file;
++ }
+ function File_Gettext_PO($file = '')
+ {
+ $this->file = $file;
+diff -aurN a/File/Gettext.php b/File/Gettext.php
+--- a/File/Gettext.php 2012-03-03 22:00:49.000000000 -0500
++++ b/File/Gettext.php 2018-02-16 15:14:27.629022634 -0500
+@@ -85,7 +85,7 @@
+ return File_Gettext::raiseError($php_errormsg);
+ }
+ $class = 'File_Gettext_' . $format;
+- $obref = &new $class($file);
++ $obref = new $class($file);
+ return $obref;
+ }
+
+@@ -110,7 +110,7 @@
+
+ include_once 'File/Gettext/PO.php';
+
+- $PO = &new File_Gettext_PO($pofile);
++ $PO = new File_Gettext_PO($pofile);
+ if (true !== ($e = $PO->load())) {
+ return $e;
+ }
+@@ -247,7 +247,7 @@
+ function &toMO()
+ {
+ include_once 'File/Gettext/MO.php';
+- $MO = &new File_Gettext_MO;
++ $MO = new File_Gettext_MO;
+ $MO->fromArray($this->toArray());
+ return $MO;
+ }
+@@ -261,7 +261,7 @@
+ function &toPO()
+ {
+ include_once 'File/Gettext/PO.php';
+- $PO = &new File_Gettext_PO;
++ $PO = new File_Gettext_PO;
+ $PO->fromArray($this->toArray());
+ return $PO;
+ }
diff --git a/dev-php/PEAR-File_Gettext/metadata.xml b/dev-php/PEAR-File_Gettext/metadata.xml
new file mode 100644
index 000000000000..b86acf66c756
--- /dev/null
+++ b/dev-php/PEAR-File_Gettext/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ <name>PHP</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/dev-php/PEAR-File_SMBPasswd-1.0.3-r1 b/dev-php/PEAR-File_SMBPasswd-1.0.3-r1
deleted file mode 100644
index 7ef8d9077c13..000000000000
--- a/dev-php/PEAR-File_SMBPasswd-1.0.3-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DESCRIPTION=Class for managing SAMBA style password files
-EAPI=6
-HOMEPAGE=https://pear.php.net/package/File_SMBPasswd
-KEYWORDS=alpha amd64 hppa ia64 ppc ppc64 sparc x86
-LICENSE=BSD
-RDEPEND=>=dev-lang/php-5.3:* >=dev-php/PEAR-Crypt_CHAP-1.0.0 >=dev-php/pear-1.8.1
-SLOT=0
-SRC_URI=https://pear.php.net/get/File_SMBPasswd-1.0.3.tgz
-_eclasses_=php-pear-r2 eb6928c33771db74564e814c5ca6c1b3
-_md5_=a093b8bbad5ecc784e269e5842a35325
diff --git a/dev-php/PEAR-File_SMBPasswd/Manifest b/dev-php/PEAR-File_SMBPasswd/Manifest
new file mode 100644
index 000000000000..d2b1f9ac76b8
--- /dev/null
+++ b/dev-php/PEAR-File_SMBPasswd/Manifest
@@ -0,0 +1,3 @@
+DIST File_SMBPasswd-1.0.3.tgz 5251 BLAKE2B e102bee8628dfe521ad3a4b212694a306c2bcedd869e1a4203fc1280f73cf6b42a95ce0940f36e583db1d1b18260f0eb9e73cd86be2f2cb51fbf9c47a0334b8d SHA512 49c8293ec4de0b20a9a9d80cc1175693cf9846979eeb2e77b08b48da57d214f02ebcd8ed51738222640c94eccadd5bbf0d5c8a3904c9aefb42308632ffb07a0b
+EBUILD PEAR-File_SMBPasswd-1.0.3-r1.ebuild 459 BLAKE2B 3099d2f7f14eb6dacd565e1fea629a3c20fa40a7f6c231f9e026995904475a0fd28946ab62b9cd97b6cda743f742a38dcb90c4b9b0fd900a4393b71e6c4d0a11 SHA512 9c3e94ea601f1dc5ce250f9c4f2d59a71556f31be5c11f0e9986139adbed4827bddff372abb373d2a4e2b1f5586deafca3d6b67cf4e72b2b12b909c5a17f9d49
+MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/PEAR-File_SMBPasswd/PEAR-File_SMBPasswd-1.0.3-r1.ebuild b/dev-php/PEAR-File_SMBPasswd/PEAR-File_SMBPasswd-1.0.3-r1.ebuild
new file mode 100644
index 000000000000..fd868bd4a98b
--- /dev/null
+++ b/dev-php/PEAR-File_SMBPasswd/PEAR-File_SMBPasswd-1.0.3-r1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit php-pear-r2
+
+DESCRIPTION="Class for managing SAMBA style password files"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
+IUSE=""
+RDEPEND=">=dev-lang/php-5.3:*
+ >=dev-php/PEAR-Crypt_CHAP-1.0.0"
+
+src_install() {
+ insinto /usr/share/php/File
+ doins SMBPasswd.php
+ php-pear-r2_install_packagexml
+ einstalldocs
+}
diff --git a/dev-php/PEAR-File_SMBPasswd/metadata.xml b/dev-php/PEAR-File_SMBPasswd/metadata.xml
new file mode 100644
index 000000000000..b86acf66c756
--- /dev/null
+++ b/dev-php/PEAR-File_SMBPasswd/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ <name>PHP</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/dev-php/PEAR-HTML_AJAX-0.5.8 b/dev-php/PEAR-HTML_AJAX-0.5.8
deleted file mode 100644
index 869a2c458a7a..000000000000
--- a/dev-php/PEAR-HTML_AJAX-0.5.8
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=PHP and JavaScript AJAX library
-EAPI=6
-HOMEPAGE=https://pear.php.net/package/HTML_AJAX/
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-SLOT=0
-SRC_URI=http://download.pear.php.net/package/HTML_AJAX-0.5.8.tgz
-_md5_=857bb01f1358d1a8b651e234bd86b7e4
diff --git a/dev-php/PEAR-HTML_AJAX/Manifest b/dev-php/PEAR-HTML_AJAX/Manifest
new file mode 100644
index 000000000000..a88d7e8a2498
--- /dev/null
+++ b/dev-php/PEAR-HTML_AJAX/Manifest
@@ -0,0 +1,3 @@
+DIST HTML_AJAX-0.5.8.tgz 140357 BLAKE2B f1cab1cd49ff711267c76437eca6cb7f482118de186722003bb66354cae5b7df9a5ceae8e335ac3a018fd626c74637503d7f9f32a91dde58639b51cd7da6d869 SHA512 3a10f516c6fe16d98d31290bd29a80a10fa830429a529b0cf6d03009f56d56d906e786b3f304b1c94b98e96290057cc74f3373acdd352fcf74f9616962ff9ce8
+EBUILD PEAR-HTML_AJAX-0.5.8.ebuild 498 BLAKE2B e680c7b4890472301abe6f741201ac0c78ea9a5462166f7dcdaacb573a8486db02873b33bfaa76a00d2d664fe5e36d12e552a07759ac31191e593d2cf359cdbf SHA512 7c3e5bd7d1ed0c86c0292dfafe49712895efb80f27b53abd0fdb051ef9ca66588c2b942038458e494819678f88127a6a2b39288d6beeb049dacd674272faedf0
+MISC metadata.xml 311 BLAKE2B 17bfddef528b52802263c6e296322fb75c1ac2cd12b78c39f7282e5f51f19a97f81c926ef63f610f0b61cfbce14b9d8abbcc7bb80645a2ffbb8a5d9eaf08fa31 SHA512 a69d94c266770a2c34f27c1be4e91d67e61f0889923989b0364204004cb612b27e74fb5d4dec938052a451f11e9daafeb2a2f1c734dc527746fb36e3011158e8
diff --git a/dev-php/PEAR-HTML_AJAX/PEAR-HTML_AJAX-0.5.8.ebuild b/dev-php/PEAR-HTML_AJAX/PEAR-HTML_AJAX-0.5.8.ebuild
new file mode 100644
index 000000000000..73706122eb1e
--- /dev/null
+++ b/dev-php/PEAR-HTML_AJAX/PEAR-HTML_AJAX-0.5.8.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PN="${PN#PEAR-}"
+DESCRIPTION="PHP and JavaScript AJAX library"
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+HOMEPAGE="https://pear.php.net/package/${MY_PN}/"
+SRC_URI="http://download.pear.php.net/package/${MY_PN}-${PV}.tgz"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_install() {
+ insinto /usr/share/php
+ doins -r HTML
+ insinto "/usr/share/php/data/${MY_PN}"
+ doins -r js
+}
diff --git a/dev-php/PEAR-HTML_AJAX/metadata.xml b/dev-php/PEAR-HTML_AJAX/metadata.xml
new file mode 100644
index 000000000000..819c64a6c2c8
--- /dev/null
+++ b/dev-php/PEAR-HTML_AJAX/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ <name>PHP</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="pear">HTML_AJAX</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-php/PEAR-HTML_CSS-1.5.4-r2 b/dev-php/PEAR-HTML_CSS-1.5.4-r2
deleted file mode 100644
index bc249a1180e5..000000000000
--- a/dev-php/PEAR-HTML_CSS-1.5.4-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare test
-DEPEND=test? ( >=dev-php/PEAR-HTML_Common-1.2.4 !minimal? ( >=dev-php/PEAR-Services_W3C_CSSValidator-0.1.0 ) >=dev-php/phpunit-3.7 )
-DESCRIPTION=Provides a simple interface for generating a stylesheet declaration
-EAPI=6
-HOMEPAGE=https://pear.php.net/package/HTML_CSS
-IUSE=minimal test
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-php/PEAR-HTML_Common-1.2.4 !minimal? ( >=dev-php/PEAR-Services_W3C_CSSValidator-0.1.0 ) >=dev-php/pear-1.8.1
-SLOT=0
-SRC_URI=https://pear.php.net/get/HTML_CSS-1.5.4.tgz
-_eclasses_=php-pear-r2 eb6928c33771db74564e814c5ca6c1b3
-_md5_=32d44e23a7b41290d6a8071d1cbaf602
diff --git a/dev-php/PEAR-HTML_CSS/Manifest b/dev-php/PEAR-HTML_CSS/Manifest
new file mode 100644
index 000000000000..a3bb436cb898
--- /dev/null
+++ b/dev-php/PEAR-HTML_CSS/Manifest
@@ -0,0 +1,4 @@
+AUX HTML_CSS-1.5.4-fix-tests.patch 4009 BLAKE2B 6285a30de1d1fae3cb2a1326e451927a8297b77184c6f6371d391358fb8c52852befedbefc4dd65140787cb69e31772a1c1a1ec3c054ba1a4a306cc217f953db SHA512 39bc6ad58740cd7d84cc79285e7cbff3070dd4c5460484cb285d29e1a179a326cb18905288cb581d720327611baf0c33b4b7bfe736fb77f9c52faeb9e0f23490
+DIST HTML_CSS-1.5.4.tgz 45553 BLAKE2B 8fef3897bb577a1c12c7dd96ea4d15de5c1b46b40546b23b7262eaaf99db83c988631639a4f4e9b7a344ec02642e49c01c3afc9858f01ccd8c8e77cb39a75008 SHA512 d9418f5fe62dff27f39a0be80378444db6f9636323dd4a85fc1173cb799aa4e74656a55a1179bfc40a926d6ac3c3d67dde378ac49c2c19468e4541e2302c3afa
+EBUILD PEAR-HTML_CSS-1.5.4-r2.ebuild 658 BLAKE2B 75f540083de1bc6d789fa06b425ca70fd90d938fdbd494b27535e91313bee50869ce58974acaf09f9f752760b0ba369ca940f2ddad8c56d5368f298a86748d10 SHA512 adca37a844f597d37f51a7108c8b03296aeaba2de63010a6146d17c9e3d0c87163fd1caad6d8f7ab571e7c5e1a059d9e4cdb8d5987023441d7794c933a2c26b8
+MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/PEAR-HTML_CSS/PEAR-HTML_CSS-1.5.4-r2.ebuild b/dev-php/PEAR-HTML_CSS/PEAR-HTML_CSS-1.5.4-r2.ebuild
new file mode 100644
index 000000000000..c9b8063f636f
--- /dev/null
+++ b/dev-php/PEAR-HTML_CSS/PEAR-HTML_CSS-1.5.4-r2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit php-pear-r2
+
+DESCRIPTION="Provides a simple interface for generating a stylesheet declaration"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="minimal test"
+RDEPEND=">=dev-php/PEAR-HTML_Common-1.2.4
+ !minimal? ( >=dev-php/PEAR-Services_W3C_CSSValidator-0.1.0 )"
+DEPEND="test? ( ${RDEPEND} >=dev-php/phpunit-3.7 )"
+PATCHES=( "${FILESDIR}/HTML_CSS-1.5.4-fix-tests.patch" )
+
+src_prepare() {
+ mkdir HTML || die
+ mv CSS CSS.php HTML || die
+ default
+}
+
+src_test() {
+ ln -s ../HTML tests/HTML || die
+ phpunit tests/AllTests.php || die
+}
diff --git a/dev-php/PEAR-HTML_CSS/files/HTML_CSS-1.5.4-fix-tests.patch b/dev-php/PEAR-HTML_CSS/files/HTML_CSS-1.5.4-fix-tests.patch
new file mode 100644
index 000000000000..410ad7593ec3
--- /dev/null
+++ b/dev-php/PEAR-HTML_CSS/files/HTML_CSS-1.5.4-fix-tests.patch
@@ -0,0 +1,112 @@
+diff -aurN a/tests/AllTests.php b/tests/AllTests.php
+--- a/tests/AllTests.php 1970-01-01 04:13:26.000000000 -0500
++++ b/tests/AllTests.php 2018-02-16 16:28:52.565010362 -0500
+@@ -24,7 +24,6 @@
+
+ require_once 'HTML_CSS_TestSuite_Standard.php';
+ require_once 'HTML_CSS_TestSuite_Output.php';
+-require_once 'HTML_CSS_TestSuite_Bugs.php';
+
+ /**
+ * Class for running all test suites for HTML_CSS package.
+@@ -79,7 +78,6 @@
+ $suite = new PHPUnit_Framework_TestSuite('HTML_CSS Test Suite');
+ $suite->addTestSuite('HTML_CSS_TestSuite_Standard');
+ $suite->addTestSuite('HTML_CSS_TestSuite_Output');
+- $suite->addTestSuite('HTML_CSS_TestSuite_Bugs');
+ return $suite;
+ }
+
+@@ -126,4 +124,4 @@
+ if (PHPUnit_MAIN_METHOD == 'HTML_CSS_AllTests::main') {
+ HTML_CSS_AllTests::main();
+ }
+-?>
+\ No newline at end of file
++?>
+diff -aurN a/tests/HTML_CSS_TestSuite_Output.php b/tests/HTML_CSS_TestSuite_Output.php
+--- a/tests/HTML_CSS_TestSuite_Output.php 1970-01-01 04:13:26.000000000 -0500
++++ b/tests/HTML_CSS_TestSuite_Output.php 2018-02-16 16:36:35.283820690 -0500
+@@ -18,7 +18,6 @@
+
+ require_once "PHPUnit/Framework/TestCase.php";
+ require_once "PHPUnit/Framework/TestSuite.php";
+-require_once "PHPUnit/Extensions/OutputTestCase.php";
+
+ require_once 'HTML/CSS.php';
+ require_once 'PEAR.php';
+@@ -34,7 +33,7 @@
+ * @link http://pear.php.net/package/HTML_CSS
+ * @since File available since Release 1.5.2
+ */
+-class HTML_CSS_TestSuite_Output extends PHPUnit_Extensions_OutputTestCase
++class HTML_CSS_TestSuite_Output extends PHPUnit_Framework_TestCase
+ {
+ /**
+ * A CSS object
+@@ -70,7 +69,12 @@
+
+ $this->css = new HTML_CSS($attrs, $prefs);
+
+- $this->setOutputCallback(array(&$this, 'normalizeOutput'));
++ $this->setOutputCallback(array($this, 'normalizeOutput'));
++ }
++
++ protected function normalizeOutput($buffer)
++ {
++ return str_replace("\r", '', $buffer);
+ }
+
+ /**
+@@ -153,4 +157,4 @@
+ if (PHPUnit_MAIN_METHOD == "HTML_CSS_TestSuite_Output::main") {
+ HTML_CSS_TestSuite_Output::main();
+ }
+-?>
+\ No newline at end of file
++?>
+diff -aurN a/tests/HTML_CSS_TestSuite_Standard.php b/tests/HTML_CSS_TestSuite_Standard.php
+--- a/tests/HTML_CSS_TestSuite_Standard.php 1970-01-01 04:13:26.000000000 -0500
++++ b/tests/HTML_CSS_TestSuite_Standard.php 2018-02-16 16:47:01.837374212 -0500
+@@ -117,12 +117,10 @@
+ */
+ public function catchError($error, $code, $level)
+ {
+- $this->assertType(PHPUnit_Framework_Constraint_IsType::TYPE_OBJECT, $error);
+- if ($error instanceof PEAR_Error) {
+- $this->assertEquals($error->getCode(), $code);
+- $user_info = $error->getUserInfo();
+- $this->assertEquals($user_info['level'], $level);
+- }
++ $this->assertInstanceOf(PEAR_Error::class, $error);
++ $this->assertEquals($error->getCode(), $code);
++ $user_info = $error->getUserInfo();
++ $this->assertEquals($user_info['level'], $level);
+ }
+
+ /**
+@@ -724,7 +722,7 @@
+ $css_data = array($fn, $strcss);
+ $messages = array();
+
+- $stub = $this->getMock('HTML_CSS', array('validate'));
++ $stub = $this->createMock(HTML_CSS::class);
+ $stub->expects($this->any())
+ ->method('validate')
+ ->will($this->returnValue(true));
+@@ -1578,7 +1576,7 @@
+ $this->catchError($r, HTML_CSS_ERROR_INVALID_INPUT, 'exception');
+
+ // validate
+- $stub = $this->getMock('HTML_CSS', array('validate'));
++ $stub = $this->createMock(HTML_CSS::class);
+ $stub->expects($this->any())
+ ->method('validate')
+ ->will($this->returnCallback(array(&$this, 'cbMockValidator')));
+@@ -1680,4 +1678,4 @@
+ if (PHPUnit_MAIN_METHOD == "HTML_CSS_TestSuite_Standard::main") {
+ HTML_CSS_TestSuite_Standard::main();
+ }
+-?>
+\ No newline at end of file
++?>
diff --git a/dev-php/PEAR-HTML_CSS/metadata.xml b/dev-php/PEAR-HTML_CSS/metadata.xml
new file mode 100644
index 000000000000..b86acf66c756
--- /dev/null
+++ b/dev-php/PEAR-HTML_CSS/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ <name>PHP</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/dev-php/PEAR-HTML_Common-1.2.5-r1 b/dev-php/PEAR-HTML_Common-1.2.5-r1
deleted file mode 100644
index 39edb4e83bc3..000000000000
--- a/dev-php/PEAR-HTML_Common-1.2.5-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DESCRIPTION=Base class for other HTML classes
-EAPI=6
-HOMEPAGE=https://pear.php.net/package/HTML_Common
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86
-LICENSE=PHP-3.01
-RDEPEND=>=dev-php/pear-1.8.1
-SLOT=0
-SRC_URI=https://pear.php.net/get/HTML_Common-1.2.5.tgz
-_eclasses_=php-pear-r2 eb6928c33771db74564e814c5ca6c1b3
-_md5_=47ca07ded5897370fb70d8aa368fa5b9
diff --git a/dev-php/PEAR-HTML_Common/Manifest b/dev-php/PEAR-HTML_Common/Manifest
new file mode 100644
index 000000000000..bf0239174ec0
--- /dev/null
+++ b/dev-php/PEAR-HTML_Common/Manifest
@@ -0,0 +1,3 @@
+DIST HTML_Common-1.2.5.tgz 4585 BLAKE2B c09e9a98333ca98c2f69a483ebc037b9a8c6c8925d5afd10febd0345462553d4493003565dd1185182c611d2bd77980d4712c0d959c03ba7e98d0715ff6ee2d5 SHA512 f30f60f6a5071c264c9892b78236ecd89330f35196f0d16a75f44b0366b378737fb722a27ff2b4c410b4d8c4aaeca75a7e754dbc99c2bfa63b3a2d67bf70db93
+EBUILD PEAR-HTML_Common-1.2.5-r1.ebuild 386 BLAKE2B 6645369400bd9c79a31580fc29c6668dca1304615ed3a463bd928630edde00b5b2c0d7dcbdc44dcd778acc233d1c0ab6a264416418b02b61892552caacbe0fd7 SHA512 3d0ed64e9eadb81de3d276896e8983d20784a7835816a98406e09f6eaa6d4a5816c12c9726a7b00d3dacd67356e9977e0cb444426fdde45cfec83e078576c63e
+MISC metadata.xml 235 BLAKE2B 5b10304feea18aae1822be7d29bcce06c8715193b14a3dd2c4d79eb75e2767670352e2ca11e06b9a10ec04b63020a18254cd167e6d6be9072f4a200ca5d11ec4 SHA512 0b3e95bbf68eddf74289dad50f8828cffce2d904ff6f9bd5468177de979677cac11da84d1e0302c52b72085915b9d1b3496107172e5726520d51dad1981daf64
diff --git a/dev-php/PEAR-HTML_Common/PEAR-HTML_Common-1.2.5-r1.ebuild b/dev-php/PEAR-HTML_Common/PEAR-HTML_Common-1.2.5-r1.ebuild
new file mode 100644
index 000000000000..1ec6c43736bf
--- /dev/null
+++ b/dev-php/PEAR-HTML_Common/PEAR-HTML_Common-1.2.5-r1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit php-pear-r2
+
+DESCRIPTION="Base class for other HTML classes"
+LICENSE="PHP-3.01"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+IUSE=""
+
+src_install() {
+ insinto /usr/share/php/HTML
+ doins Common.php
+ php-pear-r2_install_packagexml
+}
diff --git a/dev-php/PEAR-HTML_Common/metadata.xml b/dev-php/PEAR-HTML_Common/metadata.xml
new file mode 100644
index 000000000000..aca42932b833
--- /dev/null
+++ b/dev-php/PEAR-HTML_Common/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ <name>PHP</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-php/PEAR-HTML_Common2-2.1.1 b/dev-php/PEAR-HTML_Common2-2.1.1
deleted file mode 100644
index 72e5f7ad6c06..000000000000
--- a/dev-php/PEAR-HTML_Common2-2.1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm test
-DEPEND=test? ( dev-php/phpunit )
-DESCRIPTION=Abstract base class for HTML classes (PHP5 port of PEAR-HTML_Common package)
-EAPI=6
-HOMEPAGE=https://pear.php.net/package/HTML_Common2
-IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=BSD
-RDEPEND=>=dev-php/pear-1.8.1
-SLOT=0
-SRC_URI=https://pear.php.net/get/HTML_Common2-2.1.1.tgz
-_eclasses_=php-pear-r2 eb6928c33771db74564e814c5ca6c1b3
-_md5_=95c92938618775086ffc7dd00416057e
diff --git a/dev-php/PEAR-HTML_Common2/Manifest b/dev-php/PEAR-HTML_Common2/Manifest
new file mode 100644
index 000000000000..cdc2d71a5522
--- /dev/null
+++ b/dev-php/PEAR-HTML_Common2/Manifest
@@ -0,0 +1,3 @@
+DIST HTML_Common2-2.1.1.tgz 8664 BLAKE2B 2422d0d32f1ff55bf0e40cda5460d3e891cb9bc27001b8d72b7f52d43a2ed6ed2507593a780819550aa11b9aaff75b286995d013cf3e74051abb8700b9f96ac1 SHA512 3fc868c0c5d69a542d205cf853f8993fe6849eec58b35b080db44a7a788b19dfdc9cd669d269ddab70f37edcde763d1beff4c60f2befc2cf2548f63197634124
+EBUILD PEAR-HTML_Common2-2.1.1.ebuild 425 BLAKE2B f7e96cde580f4fdfcaadd1f09b29d8e58b52cc2ba3b5ff2fa0c0883ac48ae90edfa1294aac32c283b369c192e50bf0bc6b119f612c131c4bc7b7e6fd2027cc7a SHA512 e8f6af67161d427842140359a5002ad059dad35857fdf905af35daa37ed37512c911656a519e6888b706ca468f8bfe3464efff19ab52c2e2b8ca7d250b3564cd
+MISC metadata.xml 235 BLAKE2B 5b10304feea18aae1822be7d29bcce06c8715193b14a3dd2c4d79eb75e2767670352e2ca11e06b9a10ec04b63020a18254cd167e6d6be9072f4a200ca5d11ec4 SHA512 0b3e95bbf68eddf74289dad50f8828cffce2d904ff6f9bd5468177de979677cac11da84d1e0302c52b72085915b9d1b3496107172e5726520d51dad1981daf64
diff --git a/dev-php/PEAR-HTML_Common2/PEAR-HTML_Common2-2.1.1.ebuild b/dev-php/PEAR-HTML_Common2/PEAR-HTML_Common2-2.1.1.ebuild
new file mode 100644
index 000000000000..ca39a6f72e9f
--- /dev/null
+++ b/dev-php/PEAR-HTML_Common2/PEAR-HTML_Common2-2.1.1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit php-pear-r2
+
+DESCRIPTION="Abstract base class for HTML classes (PHP5 port of PEAR-HTML_Common package)"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="test"
+DEPEND="test? ( dev-php/phpunit )"
+
+src_test() {
+ phpunit tests/AllTests.php || die
+}
diff --git a/dev-php/PEAR-HTML_Common2/metadata.xml b/dev-php/PEAR-HTML_Common2/metadata.xml
new file mode 100644
index 000000000000..aca42932b833
--- /dev/null
+++ b/dev-php/PEAR-HTML_Common2/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ <name>PHP</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-php/PEAR-HTML_Javascript-1.1.2-r1 b/dev-php/PEAR-HTML_Javascript-1.1.2-r1
deleted file mode 100644
index 048656fba1f8..000000000000
--- a/dev-php/PEAR-HTML_Javascript-1.1.2-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DESCRIPTION=Provides an interface for creating simple JS scripts within PHP
-EAPI=6
-HOMEPAGE=https://pear.php.net/package/HTML_Javascript
-KEYWORDS=alpha amd64 hppa ia64 ppc ppc64 sparc x86
-LICENSE=PHP-3
-RDEPEND=>=dev-php/pear-1.8.1
-SLOT=0
-SRC_URI=https://pear.php.net/get/HTML_Javascript-1.1.2.tgz
-_eclasses_=php-pear-r2 eb6928c33771db74564e814c5ca6c1b3
-_md5_=74032fd2157f5d59cf1520b946707ccd
diff --git a/dev-php/PEAR-HTML_Javascript/Manifest b/dev-php/PEAR-HTML_Javascript/Manifest
new file mode 100644
index 000000000000..992398a694bb
--- /dev/null
+++ b/dev-php/PEAR-HTML_Javascript/Manifest
@@ -0,0 +1,3 @@
+DIST HTML_Javascript-1.1.2.tgz 8620 BLAKE2B ea7eb4296b97ec6f2c0f3d32d3cce367bd8472d13dcf1c6d04dbaec2a649f9bcd85b3f913a4c384ba43c983d33fb7ac10aa8b28983c488f7662efb4708bcf4f8 SHA512 2ac6732f9156af318be8d17d1aa9c0040e5367faf29d6e968740d2fc9ab5806b3a08ee1b33f1c1fd618768a1c50ec67b8ffae6975dda7aa77234ef22e0ff8545
+EBUILD PEAR-HTML_Javascript-1.1.2-r1.ebuild 431 BLAKE2B a7d0ca79b3ff733a68306e654c52db17f6d09ee0ec10970bda39d17ccc77d85c5f94780c9d56a54402293a066e86ef57ea5617528e252a3d705241ea42e92065 SHA512 f8947761b3ae8d605834669076445680e23087002a9da63514115a7532ac9c44e7e2bffebd278975e3b228e2c81c4837f58debf5d5c2ad79d6434c5a5fc1aa67
+MISC metadata.xml 317 BLAKE2B bf3c184211f7eeca242194a13bab4054fe23ed3bebb0077075de372192b0c70972caae805cbe91f428639624231135a033c5812c1060207f4bb941ada72351f8 SHA512 016d945969562fa523bab4c76645d4a78629e30af6fc300b5462f5147fe31bfa883ad949112d76df0d243985a3bfdcc74364e3b9c42b12de034c978dc898e839
diff --git a/dev-php/PEAR-HTML_Javascript/PEAR-HTML_Javascript-1.1.2-r1.ebuild b/dev-php/PEAR-HTML_Javascript/PEAR-HTML_Javascript-1.1.2-r1.ebuild
new file mode 100644
index 000000000000..275ae99b32d4
--- /dev/null
+++ b/dev-php/PEAR-HTML_Javascript/PEAR-HTML_Javascript-1.1.2-r1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit php-pear-r2
+
+IUSE=""
+DESCRIPTION="Provides an interface for creating simple JS scripts within PHP"
+LICENSE="PHP-3"
+SLOT="0"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
+
+src_install() {
+ insinto /usr/share/php/HTML
+ doins -r Javascript Javascript.php
+ php-pear-r2_install_packagexml
+ einstalldocs
+}
diff --git a/dev-php/PEAR-HTML_Javascript/metadata.xml b/dev-php/PEAR-HTML_Javascript/metadata.xml
new file mode 100644
index 000000000000..9a8bdc350546
--- /dev/null
+++ b/dev-php/PEAR-HTML_Javascript/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ <name>PHP</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="pear">HTML_Javascript</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-php/PEAR-HTML_QuickForm2-2.0.2-r1 b/dev-php/PEAR-HTML_QuickForm2-2.0.2-r1
deleted file mode 100644
index 84efa1716419..000000000000
--- a/dev-php/PEAR-HTML_QuickForm2-2.0.2-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=>=dev-lang/php-5.2.0:*
-DESCRIPTION=Creating, validating, processing HTML forms methods (PHP5 optimize)
-EAPI=6
-HOMEPAGE=https://pear.php.net/package/HTML_QuickForm2
-IUSE=examples
-KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=BSD
-RDEPEND=>=dev-lang/php-5.2.0:* >=dev-php/PEAR-HTML_Common2-2.0.0 >=dev-php/pear-1.8.1
-SLOT=0
-SRC_URI=https://pear.php.net/get/HTML_QuickForm2-2.0.2.tgz
-_eclasses_=php-pear-r2 eb6928c33771db74564e814c5ca6c1b3
-_md5_=38a4602b049c7fbb44342c8ed80c2252
diff --git a/dev-php/PEAR-HTML_QuickForm2/Manifest b/dev-php/PEAR-HTML_QuickForm2/Manifest
new file mode 100644
index 000000000000..8485138ebbf8
--- /dev/null
+++ b/dev-php/PEAR-HTML_QuickForm2/Manifest
@@ -0,0 +1,3 @@
+DIST HTML_QuickForm2-2.0.2.tgz 179063 BLAKE2B f1309099d481417cb906a0dbae39264e7e5b90c1a91b959fd33afea2ef35fb84f767301f225bd939bf36ced397b0ef81f615195b2426d8b3428cb64bc6d007dd SHA512 37988f09837286343069be5d249476e7fcb08d937f391bc2f6868a5fdaa31ddb1cced60b909ad690283ae65f48148f7928bebefa483f553d1a6bb3a51fbb0d03
+EBUILD PEAR-HTML_QuickForm2-2.0.2-r1.ebuild 539 BLAKE2B 3dd6ac186f18740b58cce8ad464d11608e7142af5b2012e5fa7547a219e5b21ddd1dc800a8e354557b058241929fa98ea8440f9da2794aca9081242fbe52aa59 SHA512 3100b6cce621667e841a3211650fcb4920d4c3eaa608ace2b939a1028bb634c30e0c253054a5d43d2fad67d5ae5068aea9d678df22172774af0350dc8d029262
+MISC metadata.xml 235 BLAKE2B 5b10304feea18aae1822be7d29bcce06c8715193b14a3dd2c4d79eb75e2767670352e2ca11e06b9a10ec04b63020a18254cd167e6d6be9072f4a200ca5d11ec4 SHA512 0b3e95bbf68eddf74289dad50f8828cffce2d904ff6f9bd5468177de979677cac11da84d1e0302c52b72085915b9d1b3496107172e5726520d51dad1981daf64
diff --git a/dev-php/PEAR-HTML_QuickForm2/PEAR-HTML_QuickForm2-2.0.2-r1.ebuild b/dev-php/PEAR-HTML_QuickForm2/PEAR-HTML_QuickForm2-2.0.2-r1.ebuild
new file mode 100644
index 000000000000..1fbe4adaf476
--- /dev/null
+++ b/dev-php/PEAR-HTML_QuickForm2/PEAR-HTML_QuickForm2-2.0.2-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit php-pear-r2
+
+DESCRIPTION="Creating, validating, processing HTML forms methods (PHP5 optimize)"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="examples"
+
+DEPEND=">=dev-lang/php-5.2.0:*"
+RDEPEND="${DEPEND}
+ >=dev-php/PEAR-HTML_Common2-2.0.0"
+
+src_install() {
+ HTML_DOCS=( data/quickform.css data/js )
+ use examples && HTML_DOCS+=( docs/examples )
+ php-pear-r2_src_install
+}
diff --git a/dev-php/PEAR-HTML_QuickForm2/metadata.xml b/dev-php/PEAR-HTML_QuickForm2/metadata.xml
new file mode 100644
index 000000000000..aca42932b833
--- /dev/null
+++ b/dev-php/PEAR-HTML_QuickForm2/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ <name>PHP</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-php/PEAR-HTML_Table-1.8.4-r1 b/dev-php/PEAR-HTML_Table-1.8.4-r1
deleted file mode 100644
index 24427a1b7384..000000000000
--- a/dev-php/PEAR-HTML_Table-1.8.4-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm test
-DEPEND=test? ( >=dev-php/PEAR-PEAR-1.5.0 >=dev-php/PEAR-HTML_Common-1.2.3 )
-DESCRIPTION=Makes the design of HTML tables easy, flexible, reusable and efficient
-EAPI=6
-HOMEPAGE=https://pear.php.net/package/HTML_Table
-IUSE=test
-KEYWORDS=alpha amd64 hppa ia64 ppc ppc64 sparc x86
-LICENSE=BSD
-RDEPEND=>=dev-php/PEAR-HTML_Common-1.2.3 >=dev-php/pear-1.8.1
-SLOT=0
-SRC_URI=https://pear.php.net/get/HTML_Table-1.8.4.tgz
-_eclasses_=php-pear-r2 eb6928c33771db74564e814c5ca6c1b3
-_md5_=5b7648e1df0eac7c9dbe8c62c91df464
diff --git a/dev-php/PEAR-HTML_Table/Manifest b/dev-php/PEAR-HTML_Table/Manifest
new file mode 100644
index 000000000000..3020df6ec0a1
--- /dev/null
+++ b/dev-php/PEAR-HTML_Table/Manifest
@@ -0,0 +1,3 @@
+DIST HTML_Table-1.8.4.tgz 16440 BLAKE2B 0dd3a9e7a184fbbab157e1372f753ed7b3b54e90753f7eb4564f0aaa61bc42183b82b2807d84c1214463e74dcf0c9c14a5f905f0c3eef1f772d70cb179416b9f SHA512 98091827a1cb29c5c13ad05081c2deb39d1c3caa84182837e36dd96371f518f1897b271e3c4682e085b2905df78ae202bbb4d7e9528d440ae6c37e801c326068
+EBUILD PEAR-HTML_Table-1.8.4-r1.ebuild 540 BLAKE2B 5ba45f7bceeddcfd5351984bab5330060e53fd24fe0fb3d4f121078b240e9558bc0aba6ed8a75e91f45e10ab1fa0478aad504a735541246ec37a87ba7c886fcd SHA512 94be464c03a41035d29a07dce2fb3c8c2856167a9effe275aeeca79476e28198273b8cde90b498f1f0328e62d5832004ec9276bbf8087ccff4849716c4d55933
+MISC metadata.xml 235 BLAKE2B 5b10304feea18aae1822be7d29bcce06c8715193b14a3dd2c4d79eb75e2767670352e2ca11e06b9a10ec04b63020a18254cd167e6d6be9072f4a200ca5d11ec4 SHA512 0b3e95bbf68eddf74289dad50f8828cffce2d904ff6f9bd5468177de979677cac11da84d1e0302c52b72085915b9d1b3496107172e5726520d51dad1981daf64
diff --git a/dev-php/PEAR-HTML_Table/PEAR-HTML_Table-1.8.4-r1.ebuild b/dev-php/PEAR-HTML_Table/PEAR-HTML_Table-1.8.4-r1.ebuild
new file mode 100644
index 000000000000..a17075f656b9
--- /dev/null
+++ b/dev-php/PEAR-HTML_Table/PEAR-HTML_Table-1.8.4-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit php-pear-r2
+
+DESCRIPTION="Makes the design of HTML tables easy, flexible, reusable and efficient"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
+IUSE="test"
+
+DEPEND="test? ( >=dev-php/PEAR-PEAR-1.5.0
+ >=dev-php/PEAR-HTML_Common-1.2.3 )"
+RDEPEND=">=dev-php/PEAR-HTML_Common-1.2.3"
+HTML_DOCS=( docs/Table_example1.php docs/Table_example2.php )
+
+src_test(){
+ peardev run-tests -r || die
+}
diff --git a/dev-php/PEAR-HTML_Table/metadata.xml b/dev-php/PEAR-HTML_Table/metadata.xml
new file mode 100644
index 000000000000..aca42932b833
--- /dev/null
+++ b/dev-php/PEAR-HTML_Table/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ <name>PHP</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-php/PEAR-HTML_Table_Matrix-1.0.10-r1 b/dev-php/PEAR-HTML_Table_Matrix-1.0.10-r1
deleted file mode 100644
index 306100ae888c..000000000000
--- a/dev-php/PEAR-HTML_Table_Matrix-1.0.10-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DESCRIPTION=Autofill a table with data
-EAPI=6
-HOMEPAGE=https://pear.php.net/package/HTML_Table_Matrix
-KEYWORDS=alpha amd64 hppa ia64 ppc ppc64 ~sparc x86
-LICENSE=PHP-3
-RDEPEND=>=dev-php/PEAR-HTML_Table-1.5-r1 >=dev-php/PEAR-Numbers_Words-0.13.1-r1 >=dev-php/pear-1.8.1
-SLOT=0
-SRC_URI=https://pear.php.net/get/HTML_Table_Matrix-1.0.10.tgz
-_eclasses_=php-pear-r2 eb6928c33771db74564e814c5ca6c1b3
-_md5_=0c9d914154ce4344f8a069e734fe6015
diff --git a/dev-php/PEAR-HTML_Table_Matrix/Manifest b/dev-php/PEAR-HTML_Table_Matrix/Manifest
new file mode 100644
index 000000000000..ac1753abd239
--- /dev/null
+++ b/dev-php/PEAR-HTML_Table_Matrix/Manifest
@@ -0,0 +1,3 @@
+DIST HTML_Table_Matrix-1.0.10.tgz 7837 BLAKE2B 6540d2cbf8aa7e50a21181c48f58466d4173488c3c6ff730b37ba4b43f01b59905ae2881f2dc3bbf7b5789e758c6a175b8750e091e8f6b56e1f3be31dfffe8a4 SHA512 61abbdaa1fba65e9c7073932d25e24337d6fda31360cdb58345e01fbb625707295ab39ecddc74e122584c7862bdbcd86114f576a11d015a123964984a4433416
+EBUILD PEAR-HTML_Table_Matrix-1.0.10-r1.ebuild 403 BLAKE2B 09cf1d914b3c5b962b42c8a25058ec29ef9028640c40797280705594528207c2176119be92c270ecb934e4170969a0e02282a4420f3168e13158a856874f372d SHA512 ec81cf7f2f2f7c115dd89aee60c457072ec38c48054197ab57f485ff56aa6b1e336bbd1d0913cd969bcb471a8668cdf957f43fd1f2ba982578ac18987497f556
+MISC metadata.xml 235 BLAKE2B 5b10304feea18aae1822be7d29bcce06c8715193b14a3dd2c4d79eb75e2767670352e2ca11e06b9a10ec04b63020a18254cd167e6d6be9072f4a200ca5d11ec4 SHA512 0b3e95bbf68eddf74289dad50f8828cffce2d904ff6f9bd5468177de979677cac11da84d1e0302c52b72085915b9d1b3496107172e5726520d51dad1981daf64
diff --git a/dev-php/PEAR-HTML_Table_Matrix/PEAR-HTML_Table_Matrix-1.0.10-r1.ebuild b/dev-php/PEAR-HTML_Table_Matrix/PEAR-HTML_Table_Matrix-1.0.10-r1.ebuild
new file mode 100644
index 000000000000..59646818b615
--- /dev/null
+++ b/dev-php/PEAR-HTML_Table_Matrix/PEAR-HTML_Table_Matrix-1.0.10-r1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit php-pear-r2
+
+DESCRIPTION="Autofill a table with data"
+
+LICENSE="PHP-3"
+SLOT="0"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 ~sparc x86"
+IUSE=""
+RDEPEND=">=dev-php/PEAR-HTML_Table-1.5-r1
+ >=dev-php/PEAR-Numbers_Words-0.13.1-r1"
+
+HTML_DOCS=( examples/HTML_Table_Matrix_example.php )
diff --git a/dev-php/PEAR-HTML_Table_Matrix/metadata.xml b/dev-php/PEAR-HTML_Table_Matrix/metadata.xml
new file mode 100644
index 000000000000..aca42932b833
--- /dev/null
+++ b/dev-php/PEAR-HTML_Table_Matrix/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ <name>PHP</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-php/PEAR-HTML_Template_Flexy-1.3.13 b/dev-php/PEAR-HTML_Template_Flexy-1.3.13
deleted file mode 100644
index 2f622d180497..000000000000
--- a/dev-php/PEAR-HTML_Template_Flexy-1.3.13
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare
-DESCRIPTION=An extremely powerful Tokenizer driven Template engine
-EAPI=6
-HOMEPAGE=https://pear.php.net/package/HTML_Template_Flexy
-IUSE=minimal
-KEYWORDS=alpha amd64 hppa ia64 ppc ppc64 sparc x86
-LICENSE=PHP-2.02
-RDEPEND=!minimal? ( >=dev-php/PEAR-HTML_Javascript-1.1.0-r1 dev-php/PEAR-File_Gettext ) >=dev-php/pear-1.8.1
-SLOT=0
-SRC_URI=https://pear.php.net/get/HTML_Template_Flexy-1.3.13.tgz
-_eclasses_=php-pear-r2 eb6928c33771db74564e814c5ca6c1b3
-_md5_=340fe24baa7262d91250e7d237cb9573
diff --git a/dev-php/PEAR-HTML_Template_Flexy/Manifest b/dev-php/PEAR-HTML_Template_Flexy/Manifest
new file mode 100644
index 000000000000..a56ba12bc88e
--- /dev/null
+++ b/dev-php/PEAR-HTML_Template_Flexy/Manifest
@@ -0,0 +1,4 @@
+AUX 1.3.13-postrelease-fixes.patch 1937 BLAKE2B 5ef09498aa13ade77390b7aa5a7d1bb5170cba6fd990e27ad2f95e2af11be7cba542077fb6983e4057d7ee7f834bdaceafb2530caa104cf0dea8ec79453e814c SHA512 8e525617d5ea6958628acb583cd6eb5dbc5ed6eafee36cef82b543d77f32dfc741d65f2acf62cadd9441fc609bee25d7bc5dbb0a66e6a02a0e19c81ec815b676
+DIST HTML_Template_Flexy-1.3.13.tgz 213779 BLAKE2B 3e5cf6657095d86bc8910c4e57c33bc943cf135b2d655b29f65aee997f946b2f1b3eaad445d1f529ae2a80c0c6420c76bf5c560a57e3ff5791964f92ce0fd85b SHA512 c99257c6f5451dbd2176251295f425950e359b2c0e76c1627718b4306ac12417eee697882250b4b5571397d8e47d6b3110770d66ebc91d021cb66064b86b5ad2
+EBUILD PEAR-HTML_Template_Flexy-1.3.13.ebuild 484 BLAKE2B 129937abd78e32d68129d6b7931b618ff04bd5e0c40906a4091ca613a99867319396108a53434f45fe9ddaed1d4b8d81e64d50a1b9b8fd274171da23ba69c5c9 SHA512 0679b20c62e33d7c8f8f5e00efdbaf2a15dde6fc1804df5d6b1e2be36b02d4213afb41d3a14bebe4096d44f915fa5c5c66ac02aa2f1e4e65759a102cf7b32570
+MISC metadata.xml 321 BLAKE2B 1f66fa934126f0a2173994a87f47a13747fb2ac1fafde475a91718aa52aede36c9b07b6ba8b4647088dbdafbfbb4272981ab0053fda527e73ef3add906d7ab52 SHA512 1ddf85f84e478fc10a7aa1431fe3eb933e9b09b49c5dcca1340b95cd7e880ea2af158b12bcf24fa9b0c523258cadbfb49bb14065484b8797c713ee4f0494152a
diff --git a/dev-php/PEAR-HTML_Template_Flexy/PEAR-HTML_Template_Flexy-1.3.13.ebuild b/dev-php/PEAR-HTML_Template_Flexy/PEAR-HTML_Template_Flexy-1.3.13.ebuild
new file mode 100644
index 000000000000..ab9d7872645d
--- /dev/null
+++ b/dev-php/PEAR-HTML_Template_Flexy/PEAR-HTML_Template_Flexy-1.3.13.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit php-pear-r2
+
+DESCRIPTION="An extremely powerful Tokenizer driven Template engine"
+LICENSE="PHP-2.02"
+SLOT="0"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
+IUSE="minimal"
+RDEPEND="!minimal? ( >=dev-php/PEAR-HTML_Javascript-1.1.0-r1
+ dev-php/PEAR-File_Gettext )"
+
+src_prepare() {
+ local PATCHES=( "${FILESDIR}/${PV}-postrelease-fixes.patch" )
+ default
+}
diff --git a/dev-php/PEAR-HTML_Template_Flexy/files/1.3.13-postrelease-fixes.patch b/dev-php/PEAR-HTML_Template_Flexy/files/1.3.13-postrelease-fixes.patch
new file mode 100644
index 000000000000..d5079c1526bc
--- /dev/null
+++ b/dev-php/PEAR-HTML_Template_Flexy/files/1.3.13-postrelease-fixes.patch
@@ -0,0 +1,55 @@
+--- a/HTML/Template/Flexy.php 2016/05/26 03:59:27 339237
++++ a/HTML/Template/Flexy.php 2016/05/26 04:01:15 339238
+@@ -241,7 +241,7 @@
+ * @param array $options (Optional)
+ */
+
+- function HTML_Template_Flexy( $options=array() )
++ function __construct( $options=array() )
+ {
+
+ $baseoptions = array();
+@@ -288,6 +288,7 @@
+ $ret = false;
+ foreach ($dirs as $tmplDir) {
+ if (@!file_exists($tmplDir . DIRECTORY_SEPARATOR .$file)) {
++ $this->debug("skip no file: $tmplDir/$file");
+ continue;
+ }
+
+@@ -296,10 +297,12 @@
+ "<BR>{$this->currentTemplate }<BR>{$tmplDir}" . DIRECTORY_SEPARATOR . $file,
+ HTML_TEMPLATE_FLEXY_ERROR_INVALIDARGS , HTML_TEMPLATE_FLEXY_ERROR_DIE);
+ }
+-
++ $this->debug("found file: $tmplDir/$file");
+ $ret = $tmplDir;
+
+ }
++ $this->debug("using file: $ret/$file");
++
+ return $ret;
+
+ }
+--- a/HTML/Template/Flexy/Compiler.php 2015/03/02 22:50:57 336027
++++ a/HTML/Template/Flexy/Compiler.php 2016/05/26 04:01:15 339238
+@@ -90,7 +90,7 @@
+ * @return string to compile (if not using a file as the source)
+ * @access public
+ */
+- function compile(&$flexy,$string = false)
++ function compile($flexy,$string = false)
+ {
+ echo "No compiler implemented!";
+ }
+--- a/HTML/Template/Flexy/Element.php 2016/05/26 03:59:27 339237
++++ a/HTML/Template/Flexy/Element.php 2016/05/26 04:01:15 339238
+@@ -127,7 +127,7 @@
+ * or HTML attributes name="value" pairs
+ * @access public
+ */
+- function HTML_Template_Flexy_Element($tag='', $attributes=null)
++ function __construct($tag='', $attributes=null)
+ {
+
+ $this->tag = strtolower($tag);
diff --git a/dev-php/PEAR-HTML_Template_Flexy/metadata.xml b/dev-php/PEAR-HTML_Template_Flexy/metadata.xml
new file mode 100644
index 000000000000..86cd30a85001
--- /dev/null
+++ b/dev-php/PEAR-HTML_Template_Flexy/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ <name>PHP</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="pear">HTML_Template_Flexy</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-php/PEAR-HTML_Template_Sigma-1.3.0-r1 b/dev-php/PEAR-HTML_Template_Sigma-1.3.0-r1
deleted file mode 100644
index 0e7ad38db84d..000000000000
--- a/dev-php/PEAR-HTML_Template_Sigma-1.3.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm test
-DEPEND=test? ( dev-lang/php:*[ctype] dev-php/phpunit )
-DESCRIPTION=An implementation of Integrated Templates API with template 'compilation' added
-EAPI=6
-HOMEPAGE=https://pear.php.net/package/HTML_Template_Sigma
-IUSE=test
-KEYWORDS=alpha amd64 hppa ia64 ppc ppc64 sparc x86
-LICENSE=PHP-3.01
-RDEPEND=dev-lang/php:*[ctype] >=dev-php/pear-1.8.1
-SLOT=0
-SRC_URI=https://pear.php.net/get/HTML_Template_Sigma-1.3.0.tgz
-_eclasses_=php-pear-r2 eb6928c33771db74564e814c5ca6c1b3
-_md5_=19a2f818ab861673ec95358ae8646270
diff --git a/dev-php/PEAR-HTML_Template_Sigma/Manifest b/dev-php/PEAR-HTML_Template_Sigma/Manifest
new file mode 100644
index 000000000000..8a5b3f2cfd4a
--- /dev/null
+++ b/dev-php/PEAR-HTML_Template_Sigma/Manifest
@@ -0,0 +1,4 @@
+AUX HTML_Template_Sigma-1.3.0-php7.patch 2155 BLAKE2B 1e46e49bf5bf54719635736f8c5f50c6c123c5777fbcf59c1fb5129f068d4947c0e0669b6df76de80b2cd54ec8674a85174f1acfa3a2601abd82eab6bb30d416 SHA512 ea9399d7b7de2361a11b2cc2e89d534b4289ecd656c9b5d99618d4faef9ad7b39e87884d5c720b62a8d55c58ce66b35ee014d010bef5a8ec5cc4b2884b894eda
+DIST HTML_Template_Sigma-1.3.0.tgz 30185 BLAKE2B 62d91d803a088c45c662191cc4fe544d2ef694577a3250a5bc19bc7b41640fc695be95c075c8c3f53e3ebc03fa7d9d38135d607c408ff3d6cb0f1ad11855b740 SHA512 586068325a3320e2778131c1da98d6179d2385d2d73308b0ea1e8df3e0de23f869e03d74454752631998ef3411d8e8b37feab93c6c7b9f51ae4bedb48155e3ed
+EBUILD PEAR-HTML_Template_Sigma-1.3.0-r1.ebuild 517 BLAKE2B 484399a6d26955aecd852d9f9c06094402f2a7f74d811f990491c5ed5afb68152b50500ff063fe3381017dcd9147d93a395ee9b429c32e8660d6e639d6ab0182 SHA512 eebf5229e8aedb4282f163617ae3f59e7a54006a512d678b219ca81fbeabb2b17748d20ce4b3f764b5529f6cd533828efc228d82ac5f4b7b8162e881f636b8cb
+MISC metadata.xml 235 BLAKE2B 5b10304feea18aae1822be7d29bcce06c8715193b14a3dd2c4d79eb75e2767670352e2ca11e06b9a10ec04b63020a18254cd167e6d6be9072f4a200ca5d11ec4 SHA512 0b3e95bbf68eddf74289dad50f8828cffce2d904ff6f9bd5468177de979677cac11da84d1e0302c52b72085915b9d1b3496107172e5726520d51dad1981daf64
diff --git a/dev-php/PEAR-HTML_Template_Sigma/PEAR-HTML_Template_Sigma-1.3.0-r1.ebuild b/dev-php/PEAR-HTML_Template_Sigma/PEAR-HTML_Template_Sigma-1.3.0-r1.ebuild
new file mode 100644
index 000000000000..828f16ce507e
--- /dev/null
+++ b/dev-php/PEAR-HTML_Template_Sigma/PEAR-HTML_Template_Sigma-1.3.0-r1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit php-pear-r2
+
+DESCRIPTION="An implementation of Integrated Templates API with template 'compilation' added"
+LICENSE="PHP-3.01"
+SLOT="0"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
+IUSE="test"
+
+RDEPEND="dev-lang/php:*[ctype]"
+DEPEND="test? ( ${RDEPEND} dev-php/phpunit )"
+PATCHES=( "${FILESDIR}/HTML_Template_Sigma-1.3.0-php7.patch" )
+
+src_test() {
+ phpunit tests/AllTests.php || die
+}
diff --git a/dev-php/PEAR-HTML_Template_Sigma/files/HTML_Template_Sigma-1.3.0-php7.patch b/dev-php/PEAR-HTML_Template_Sigma/files/HTML_Template_Sigma-1.3.0-php7.patch
new file mode 100644
index 000000000000..ffb95e208467
--- /dev/null
+++ b/dev-php/PEAR-HTML_Template_Sigma/files/HTML_Template_Sigma-1.3.0-php7.patch
@@ -0,0 +1,42 @@
+diff -aurN a/HTML/Template/Sigma.php b/HTML/Template/Sigma.php
+--- a/HTML/Template/Sigma.php 2014-01-13 04:33:52.000000000 -0500
++++ b/HTML/Template/Sigma.php 2018-02-19 09:29:52.995013991 -0500
+@@ -384,6 +384,26 @@
+ *
+ * @see setRoot(), setCacheRoot()
+ */
++ function __construct($root = '', $cacheRoot = '')
++ {
++ // the class is inherited from PEAR to be able to use $this->setErrorHandling()
++ parent::__construct();
++ $this->variablesRegExp = '@' . $this->openingDelimiter . '(' . $this->variablenameRegExp . ')' .
++ '(:(' . $this->functionnameRegExp . '))?' . $this->closingDelimiter . '@sm';
++ $this->removeVariablesRegExp = '@' . $this->openingDelimiter . '\s*(' . $this->variablenameRegExp . ')\s*'
++ . $this->closingDelimiter . '@sm';
++ $this->blockRegExp = '@<!--\s+BEGIN\s+(' . $this->blocknameRegExp
++ . ')\s+-->(.*)<!--\s+END\s+\1\s+-->@sm';
++ $this->functionRegExp = '@' . $this->functionPrefix . '(' . $this->functionnameRegExp . ')\s*\(@sm';
++ $this->setRoot($root);
++ $this->setCacheRoot($cacheRoot);
++
++ $this->setCallbackFunction('h', array(&$this, '_htmlspecialchars'));
++ $this->setCallbackFunction('e', array(&$this, '_htmlentities'));
++ $this->setCallbackFunction('u', 'urlencode');
++ $this->setCallbackFunction('r', 'rawurlencode');
++ $this->setCallbackFunction('j', array(&$this, '_jsEscape'));
++ }
+ function HTML_Template_Sigma($root = '', $cacheRoot = '')
+ {
+ // the class is inherited from PEAR to be able to use $this->setErrorHandling()
+diff -aurN a/tests/AllTests.php b/tests/AllTests.php
+--- a/tests/AllTests.php 2014-01-13 04:33:52.000000000 -0500
++++ b/tests/AllTests.php 2018-02-19 09:37:14.071972780 -0500
+@@ -24,8 +24,6 @@
+ define('PHPUnit_MAIN_METHOD', 'HTML_Template_Sigma_AllTests::main');
+ }
+
+-require_once 'PHPUnit/Autoload.php';
+-
+ /**
+ * Class for file / directory manipulation from PEAR package
+ */
diff --git a/dev-php/PEAR-HTML_Template_Sigma/metadata.xml b/dev-php/PEAR-HTML_Template_Sigma/metadata.xml
new file mode 100644
index 000000000000..aca42932b833
--- /dev/null
+++ b/dev-php/PEAR-HTML_Template_Sigma/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ <name>PHP</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-php/PEAR-HTTP-1.4.1-r3 b/dev-php/PEAR-HTTP-1.4.1-r3
deleted file mode 100644
index 3252c4606114..000000000000
--- a/dev-php/PEAR-HTTP-1.4.1-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare test
-DEPEND=test? ( dev-php/PEAR-PEAR )
-DESCRIPTION=Miscellaneous HTTP utilities
-EAPI=6
-HOMEPAGE=https://pear.php.net/package/HTTP
-IUSE=test
-KEYWORDS=alpha amd64 hppa ia64 ppc ppc64 sparc x86
-LICENSE=BSD
-RDEPEND=>=dev-php/pear-1.8.1
-SLOT=0
-SRC_URI=https://pear.php.net/get/HTTP-1.4.1.tgz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e php-pear-r2 eb6928c33771db74564e814c5ca6c1b3 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3bb98f96f19ef601ba4d1551fa4568c2
diff --git a/dev-php/PEAR-HTTP/Manifest b/dev-php/PEAR-HTTP/Manifest
new file mode 100644
index 000000000000..101aac17ff16
--- /dev/null
+++ b/dev-php/PEAR-HTTP/Manifest
@@ -0,0 +1,3 @@
+DIST HTTP-1.4.1.tgz 8635 BLAKE2B 2d834adcd5f5f2123f0d477bcb1b8189312d7fd8e2ff8e23f23a12ce762dbcda359ac61b192b58f60749c527c0545c3ef321a9610f3fbb0eacd3545e42f86e6b SHA512 60f9ef88eea358e83942213c9643ed7a635822c0963b79221eabb1000e126e5a79e4c6b3901c83c53ad1734ac6b774d355328a8d94087faee544af9bdc20f71c
+EBUILD PEAR-HTTP-1.4.1-r3.ebuild 448 BLAKE2B 98c5fbd3219712339ac07f33d32d0da1447cc549d420f67acd13e7a16f13c7a4f30412674b297d3fb1e680b633ea50f61edc8a4898cfb6ff87fbcfe27a1619d0 SHA512 aa4299d80aaa657ceb422291d8e7a254d92238d7d946bb92f02669b6cf0631366c9cc90cfa4a34c5e07339884701c7943b3aa48366645cdec53d8f27db340d44
+MISC metadata.xml 235 BLAKE2B 5b10304feea18aae1822be7d29bcce06c8715193b14a3dd2c4d79eb75e2767670352e2ca11e06b9a10ec04b63020a18254cd167e6d6be9072f4a200ca5d11ec4 SHA512 0b3e95bbf68eddf74289dad50f8828cffce2d904ff6f9bd5468177de979677cac11da84d1e0302c52b72085915b9d1b3496107172e5726520d51dad1981daf64
diff --git a/dev-php/PEAR-HTTP/PEAR-HTTP-1.4.1-r3.ebuild b/dev-php/PEAR-HTTP/PEAR-HTTP-1.4.1-r3.ebuild
new file mode 100644
index 000000000000..504e8f98f275
--- /dev/null
+++ b/dev-php/PEAR-HTTP/PEAR-HTTP-1.4.1-r3.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit php-pear-r2 eutils
+
+DESCRIPTION="Miscellaneous HTTP utilities"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
+IUSE="test"
+DEPEND="test? ( dev-php/PEAR-PEAR )"
+
+src_prepare() {
+ # fix nasty DOS linebreaks
+ edos2unix HTTP.php
+ default
+}
+
+src_test() {
+ pear run-tests tests || die "Tests failed"
+}
diff --git a/dev-php/PEAR-HTTP/metadata.xml b/dev-php/PEAR-HTTP/metadata.xml
new file mode 100644
index 000000000000..aca42932b833
--- /dev/null
+++ b/dev-php/PEAR-HTTP/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ <name>PHP</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-php/PEAR-HTTP_Header-1.2.1-r2 b/dev-php/PEAR-HTTP_Header-1.2.1-r2
deleted file mode 100644
index 9fd6ea40c5f2..000000000000
--- a/dev-php/PEAR-HTTP_Header-1.2.1-r2
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Handle and modify HTTP headers and status codes in PHP
-EAPI=6
-HOMEPAGE=http://pear.php.net/package/HTTP_Header
-KEYWORDS=amd64 x86
-LICENSE=BSD-2
-RDEPEND=dev-lang/php:* dev-php/PEAR-HTTP
-SLOT=0
-SRC_URI=http://download.pear.php.net/package/HTTP_Header-1.2.1.tgz
-_md5_=63f3a31b7ca6bae0f4a1cece3a1ca2b9
diff --git a/dev-php/PEAR-HTTP_Header/Manifest b/dev-php/PEAR-HTTP_Header/Manifest
new file mode 100644
index 000000000000..c167dd7f0e1d
--- /dev/null
+++ b/dev-php/PEAR-HTTP_Header/Manifest
@@ -0,0 +1,3 @@
+DIST HTTP_Header-1.2.1.tgz 10682 BLAKE2B ae8545326899f30c528e45e16735fb6da4ad2da3f066cd62df74fc0561085869d8d4b9ea82fe763095d87a5da1844682bd0f89676c89bebd1cb3f489a5d29ba9 SHA512 3d4245c99445042c6fb8ac8133be742f5009de8fa10e7104f0558ef091ba449c201fe0727d9714470e0d2d0cf8d8639c3d9b08801cb0cfff2d3d6e457364e137
+EBUILD PEAR-HTTP_Header-1.2.1-r2.ebuild 495 BLAKE2B 9528184713a0c0645540de166d7fa06279d40b09e10887ed49788468b8f29245182bcc763cad7a67695e38a53f696153aaa9c57a7945607c249b87fdc145c3bb SHA512 c7813dabc03430d18e6ca3db321c1e3955c4cc2b1e894c9a5fde1f43042771613475db6c881676a6df945f821165f3bf8c33974ff768128a5467eb2ba882dad8
+MISC metadata.xml 313 BLAKE2B e4bd6856cb0bf9f1f6605209ce129b69ff8d37e953a089cc870aa62bf4cdec53491009fadcd5a17c8368fe90ace5d285b851309ce8a17b871f992fed995d4927 SHA512 d2570b235a08acc81bfc6d77dc3ae0d57238f1129e28a7f6304e67e7fae830ad6cf6ec39ac3701c270db7a0f59c82adcbbd0d979a9fd4bf1fbddb68f2f59f82e
diff --git a/dev-php/PEAR-HTTP_Header/PEAR-HTTP_Header-1.2.1-r2.ebuild b/dev-php/PEAR-HTTP_Header/PEAR-HTTP_Header-1.2.1-r2.ebuild
new file mode 100644
index 000000000000..31b2210fb08c
--- /dev/null
+++ b/dev-php/PEAR-HTTP_Header/PEAR-HTTP_Header-1.2.1-r2.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_P="${P/PEAR-/}"
+
+DESCRIPTION="Handle and modify HTTP headers and status codes in PHP"
+HOMEPAGE="http://pear.php.net/package/HTTP_Header"
+SRC_URI="http://download.pear.php.net/package/${MY_P}.tgz"
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+RDEPEND="dev-lang/php:*
+ dev-php/PEAR-HTTP"
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+ insinto /usr/share/php
+ doins -r HTTP
+}
diff --git a/dev-php/PEAR-HTTP_Header/metadata.xml b/dev-php/PEAR-HTTP_Header/metadata.xml
new file mode 100644
index 000000000000..76fbdc5bd27c
--- /dev/null
+++ b/dev-php/PEAR-HTTP_Header/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ <name>PHP</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="pear">HTTP_Header</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-php/PEAR-HTTP_Request2-2.3.0-r1 b/dev-php/PEAR-HTTP_Request2-2.3.0-r1
deleted file mode 100644
index a093ccbd6a3e..000000000000
--- a/dev-php/PEAR-HTTP_Request2-2.3.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare test
-DEPEND=test? ( dev-lang/php:*[curl?,fileinfo?,ssl?,zlib?] >=dev-php/PEAR-Net_URL2-2.2.0 dev-php/phpunit )
-DESCRIPTION=Provides an easy way to perform HTTP requests
-EAPI=6
-HOMEPAGE=https://pear.php.net/package/HTTP_Request2
-IUSE=+curl +fileinfo +ssl test +zlib
-KEYWORDS=alpha amd64 ~arm hppa ia64 ~ppc ~ppc64 ~s390 ~sh sparc x86
-LICENSE=BSD
-RDEPEND=dev-lang/php:*[curl?,fileinfo?,ssl?,zlib?] >=dev-php/PEAR-Net_URL2-2.2.0 >=dev-php/pear-1.8.1
-SLOT=0
-SRC_URI=https://pear.php.net/get/HTTP_Request2-2.3.0.tgz
-_eclasses_=php-pear-r2 eb6928c33771db74564e814c5ca6c1b3
-_md5_=95858d34b676329d8caa816b2e348e80
diff --git a/dev-php/PEAR-HTTP_Request2/Manifest b/dev-php/PEAR-HTTP_Request2/Manifest
new file mode 100644
index 000000000000..f28674ec6937
--- /dev/null
+++ b/dev-php/PEAR-HTTP_Request2/Manifest
@@ -0,0 +1,3 @@
+DIST HTTP_Request2-2.3.0.tgz 119717 BLAKE2B f12972b2423258016f4f4ef8888b5aa1d56bb47146cc6e21f74edfd2e3cd8ae69a1830b4a203990e1346554f2a6e9538e8d5feae27cceadc8465b018dd34ff37 SHA512 52fc2768f3c5afe6fd4505d427255e467b5b7cac8a4116cbabc3f1c0ffe6f1bd061a9c9b31de2ebbd4a7844ae73085ab0d52adf905dce28eb31197117657d77b
+EBUILD PEAR-HTTP_Request2-2.3.0-r1.ebuild 725 BLAKE2B a5533442eb441637032dfdad3db8cafb609d3b83556067c2d8f93bbff6c251b84e51cab28be839cbb6f1d19a5de1ef34de85e97a2b6f4614a0ebae4fe0871e1a SHA512 811125065ccdd15b4e9b989bdece6d6429a495e968b97aa385f5883d3e2b22108556405e5f7878eb90f593752ffb07eaff68d4dd37e4ca67895aae43b5174dfb
+MISC metadata.xml 719 BLAKE2B 82195b1905bf7b954b7a62502ef524628a05a509e551bdeae9dec1d157579ca6520a8173dd5cfe2eb677f8d26b5fce9195d9312027f6a50d063f0a77acc6152f SHA512 38a38b6d73d885e7222812f54cc4bb67fae6d05c5647b123c00c7676a3feb8fc2cf33a2d308058431e00865a1dc198fd978614c652e614a1058e0319abe72704
diff --git a/dev-php/PEAR-HTTP_Request2/PEAR-HTTP_Request2-2.3.0-r1.ebuild b/dev-php/PEAR-HTTP_Request2/PEAR-HTTP_Request2-2.3.0-r1.ebuild
new file mode 100644
index 000000000000..6242b76006eb
--- /dev/null
+++ b/dev-php/PEAR-HTTP_Request2/PEAR-HTTP_Request2-2.3.0-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit php-pear-r2
+
+DESCRIPTION="Provides an easy way to perform HTTP requests"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ~ppc ~ppc64 ~s390 ~sh sparc x86"
+IUSE="+curl +fileinfo +ssl test +zlib"
+
+RDEPEND="dev-lang/php:*[curl?,fileinfo?,ssl?,zlib?]
+>=dev-php/PEAR-Net_URL2-2.2.0"
+DEPEND="test? ( ${RDEPEND} dev-php/phpunit )"
+
+src_prepare() {
+ sed -i "s~@data_dir@~${EPREFIX}/usr/share/php/data~" HTTP/Request2/CookieJar.php || die
+ default
+}
+
+src_test() {
+ phpunit tests || die
+}
+
+src_install() {
+ php-pear-r2_src_install
+ insinto "/usr/share/php/data/${PHP_PEAR_PKG_NAME}"
+ doins data/*
+}
diff --git a/dev-php/PEAR-HTTP_Request2/metadata.xml b/dev-php/PEAR-HTTP_Request2/metadata.xml
new file mode 100644
index 000000000000..82fea84c17db
--- /dev/null
+++ b/dev-php/PEAR-HTTP_Request2/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ <name>PHP</name>
+ </maintainer>
+ <longdescription lang="en">PHP5 rewrite of HTTP_Request package.
+ Provides an easy way to perform HTTP requests.
+ </longdescription>
+ <use>
+ <flag name="curl">Force dev-lang/php to be compiled with curl extension</flag>
+ <flag name="fileinfo">Force dev-lang/php to be compiled with fileinfo extension</flag>
+ <flag name="ssl">Force dev-lang/php to be compiled with ssl extension</flag>
+ <flag name="zlib">Force dev-lang/php to be compiled with zlib extension</flag>
+ </use>
+</pkgmetadata>
diff --git a/dev-php/PEAR-HTTP_Session2-0.7.3-r2 b/dev-php/PEAR-HTTP_Session2-0.7.3-r2
deleted file mode 100644
index 82466c88a656..000000000000
--- a/dev-php/PEAR-HTTP_Session2-0.7.3-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm test
-DEPEND=test? ( dev-php/PEAR-PEAR )
-DESCRIPTION=Wraps PHP's session functions providing extras like db storage for session data
-EAPI=6
-HOMEPAGE=https://pear.php.net/package/HTTP_Session2
-IUSE=minimal test
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=!minimal? ( >=dev-php/PEAR-MDB2-2.4.1 >=dev-php/PEAR-DB-1.7.11 ) >=dev-php/pear-1.8.1
-SLOT=0
-SRC_URI=https://pear.php.net/get/HTTP_Session2-0.7.3.tgz
-_eclasses_=php-pear-r2 eb6928c33771db74564e814c5ca6c1b3
-_md5_=f059ba0357347270fb83ce4e62353895
diff --git a/dev-php/PEAR-HTTP_Session2/Manifest b/dev-php/PEAR-HTTP_Session2/Manifest
new file mode 100644
index 000000000000..59d9bb526a53
--- /dev/null
+++ b/dev-php/PEAR-HTTP_Session2/Manifest
@@ -0,0 +1,3 @@
+DIST HTTP_Session2-0.7.3.tgz 16362 BLAKE2B a4f2329adcc8df3434518245010487d8e0e4346359b4576f2c68b8a3533e20ee9a9013ea0d2c632d62b1eda2472665f3080c3deb8f73e9f9a66b087a1aac7adb SHA512 ad598f1b4ca84310c339afe31f45aafc4b8245716be39e220cd9a62ea64f1a0aef0872b0a9b076ecc7f0d9fad4a4fa7dada7b4c46c2eddf4f26a9f5ef2c759c2
+EBUILD PEAR-HTTP_Session2-0.7.3-r2.ebuild 474 BLAKE2B 855200131aef276320e48018a2a214c1789228d590ba673403b5e1527aa36fbc1ce647f9828c315c9bd4fa297170f4158fb26625e4a76da3cda9e105ac3d5c81 SHA512 8d5d2dfd70b1924040042cdab62f8bba6ed7ac5b506bd15524d564b8a550cd7af2f78b3fe6efe1cb89c398893c9d73c3299f0ee76073bf9f70b28a969484633b
+MISC metadata.xml 235 BLAKE2B 5b10304feea18aae1822be7d29bcce06c8715193b14a3dd2c4d79eb75e2767670352e2ca11e06b9a10ec04b63020a18254cd167e6d6be9072f4a200ca5d11ec4 SHA512 0b3e95bbf68eddf74289dad50f8828cffce2d904ff6f9bd5468177de979677cac11da84d1e0302c52b72085915b9d1b3496107172e5726520d51dad1981daf64
diff --git a/dev-php/PEAR-HTTP_Session2/PEAR-HTTP_Session2-0.7.3-r2.ebuild b/dev-php/PEAR-HTTP_Session2/PEAR-HTTP_Session2-0.7.3-r2.ebuild
new file mode 100644
index 000000000000..2a2f0882b48d
--- /dev/null
+++ b/dev-php/PEAR-HTTP_Session2/PEAR-HTTP_Session2-0.7.3-r2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit php-pear-r2
+
+DESCRIPTION="Wraps PHP's session functions providing extras like db storage for session data"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="minimal test"
+
+RDEPEND="!minimal? ( >=dev-php/PEAR-MDB2-2.4.1
+ >=dev-php/PEAR-DB-1.7.11 )"
+DEPEND="test? ( dev-php/PEAR-PEAR )"
+
+src_test() {
+ pear run-tests tests || die "Tests failed"
+}
diff --git a/dev-php/PEAR-HTTP_Session2/metadata.xml b/dev-php/PEAR-HTTP_Session2/metadata.xml
new file mode 100644
index 000000000000..aca42932b833
--- /dev/null
+++ b/dev-php/PEAR-HTTP_Session2/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ <name>PHP</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-php/PEAR-Image_Color2-0.1.5-r1 b/dev-php/PEAR-Image_Color2-0.1.5-r1
deleted file mode 100644
index e91fe6ff1b85..000000000000
--- a/dev-php/PEAR-Image_Color2-0.1.5-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare test
-DEPEND=test? ( >=dev-php/phpunit-5 )
-DESCRIPTION=Color conversion and mixing for PHP5
-EAPI=6
-HOMEPAGE=https://pear.php.net/package/Image_Color2
-IUSE=test
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=>=dev-php/pear-1.8.1
-SLOT=0
-SRC_URI=https://pear.php.net/get/Image_Color2-0.1.5.tgz
-_eclasses_=php-pear-r2 eb6928c33771db74564e814c5ca6c1b3
-_md5_=12d5942e6ab4c8ba743c55d8aa69e56b
diff --git a/dev-php/PEAR-Image_Color2/Manifest b/dev-php/PEAR-Image_Color2/Manifest
new file mode 100644
index 000000000000..5c7c1b261c20
--- /dev/null
+++ b/dev-php/PEAR-Image_Color2/Manifest
@@ -0,0 +1,3 @@
+DIST Image_Color2-0.1.5.tgz 18954 BLAKE2B 836b7a8d9eebb3208ec0a1bb81f50dd0c3e00489c407b85f92a38fd72090e20b0fb61dd8407fc03e94c6dc71a4f84757d4477dd74cb89455baad59994b1f6665 SHA512 b6b5b3252b577828702153b9d2b192b7bf372201d0a41e470c76ace6747294be3f57a24baa109877af2c3333398792e7361e2faf51b50b0e706530ee4ae0394f
+EBUILD PEAR-Image_Color2-0.1.5-r1.ebuild 683 BLAKE2B 6fbe1b535a6d01c1cc4d59e5072509edc1cc1c76389c8fb3734542cedb4e6d852b4793e92104af3a20e345d2d0a5de19c7d0375d6186831e6ee28b1be591167f SHA512 84bf4a64246317bd7c2c50a5de5f2ba5a8ee64e0d3ea35e1b75191872347938906507e4e800a94f08e99a74482b3ee9654cb071b6e96b91b50ed99bc479ab86c
+MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/PEAR-Image_Color2/PEAR-Image_Color2-0.1.5-r1.ebuild b/dev-php/PEAR-Image_Color2/PEAR-Image_Color2-0.1.5-r1.ebuild
new file mode 100644
index 000000000000..657a45b11c2a
--- /dev/null
+++ b/dev-php/PEAR-Image_Color2/PEAR-Image_Color2-0.1.5-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit php-pear-r2
+
+DESCRIPTION="Color conversion and mixing for PHP5"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+DEPEND="test? ( >=dev-php/phpunit-5 )"
+
+src_prepare() {
+ # Modernize tests
+ sed -i -e "/require_once 'PHPUnit\/Framework.php';/d" \
+ -e "s/assertType('\(Image_[a-zA-Z2_]*\)',/assertInstanceOf(\1::class,/" \
+ -e "s/assertType('array',/assertInternalType('array',/" \
+ -e "s/assertType('string',/assertInternalType('string',/" \
+ tests/*.php tests/Model/*.php || die
+ default
+}
+
+src_test() {
+ phpunit tests/AllTests.php || die
+}
diff --git a/dev-php/PEAR-Image_Color2/metadata.xml b/dev-php/PEAR-Image_Color2/metadata.xml
new file mode 100644
index 000000000000..b86acf66c756
--- /dev/null
+++ b/dev-php/PEAR-Image_Color2/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ <name>PHP</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/dev-php/PEAR-Image_GraphViz-1.3.0_p20151104 b/dev-php/PEAR-Image_GraphViz-1.3.0_p20151104
deleted file mode 100644
index 9ee044b05ff2..000000000000
--- a/dev-php/PEAR-Image_GraphViz-1.3.0_p20151104
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare test unpack
-DEPEND=test? ( media-gfx/graphviz dev-php/PEAR-PEAR )
-DESCRIPTION=PHP interface to AT&T's GraphViz tools
-EAPI=6
-HOMEPAGE=https://pear.php.net/package/Image_GraphViz
-IUSE=test
-KEYWORDS=~alpha amd64 hppa ~ia64 ~sparc x86
-LICENSE=PHP-3
-RDEPEND=media-gfx/graphviz >=dev-php/pear-1.8.1
-SLOT=0
-SRC_URI=https://github.com/pear/Image_GraphViz/archive/3f8a01ae0597ca9d1d08a6e442cb0b153358fc0d.tar.gz -> Image_GraphViz-1.3.0_p20151104.tar.gz
-_eclasses_=php-pear-r2 eb6928c33771db74564e814c5ca6c1b3 vcs-snapshot 3be1ab44131e8c0bbdaa75823008444b
-_md5_=7c968d81da48495346002681f783c19b
diff --git a/dev-php/PEAR-Image_GraphViz/Manifest b/dev-php/PEAR-Image_GraphViz/Manifest
new file mode 100644
index 000000000000..42d5b8264588
--- /dev/null
+++ b/dev-php/PEAR-Image_GraphViz/Manifest
@@ -0,0 +1,4 @@
+AUX Image_GraphViz-1.3.0-constructor.patch 2237 BLAKE2B 5ba878e67e502d74876bcb8af4743035bd8288ef33d4a6e9aafddf7defdce520e85364503055e6442b230227db04fd044484037ea3c501ebb1fc48021476d0c6 SHA512 93f99e3e5c86e2b920a3c66511fd0b44f01747b947e04a69b0bec7256a958ec0a4e15ce81885b5117a941fd3d2a98ce4165d5a9b8e8b0650a9791807f0278964
+DIST Image_GraphViz-1.3.0_p20151104.tar.gz 18109 BLAKE2B 9a8c269a7f4eff787a67c84770c296d3e032a038cae04b888ea5ae26525b24a764ad01d6300d7e7a4c3cf78acb4e077b1f9091cced4ef57031f6ce3aaef2a8e3 SHA512 69e9117cff950a45d8f3cfd5759be8194f477b55c09ceb990707f3ad2de2500a570fa124b73b2c81cdd6ce20b6c11fc0532a0087a515cf3c7c9a5a8ed7b1c58f
+EBUILD PEAR-Image_GraphViz-1.3.0_p20151104.ebuild 697 BLAKE2B 210afe2e444b4e7c5a927b2245b67b7539f21efb918039b74aa921aba06cf6b11a1ecaebde3edfa8c3f9aef2d00d1f2b384aafcd288e42a905fa67b86b341459 SHA512 fd2883e4eb02cdd3b376b1d9babfbcbcb719c17fa1a54234c8fa46ba6e26a6715fe4a34c2dce09600a427ebc876cfd60bbaf600adb73a49ebf1976f1f6b80f1d
+MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/PEAR-Image_GraphViz/PEAR-Image_GraphViz-1.3.0_p20151104.ebuild b/dev-php/PEAR-Image_GraphViz/PEAR-Image_GraphViz-1.3.0_p20151104.ebuild
new file mode 100644
index 000000000000..6f780607fbde
--- /dev/null
+++ b/dev-php/PEAR-Image_GraphViz/PEAR-Image_GraphViz-1.3.0_p20151104.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit php-pear-r2 vcs-snapshot
+
+DESCRIPTION="PHP interface to AT&T's GraphViz tools"
+SRC_URI="https://github.com/pear/Image_GraphViz/archive/3f8a01ae0597ca9d1d08a6e442cb0b153358fc0d.tar.gz -> ${PEAR_P}.tar.gz"
+LICENSE="PHP-3"
+SLOT="0"
+KEYWORDS="~alpha amd64 hppa ~ia64 ~sparc x86"
+IUSE="test"
+RDEPEND="media-gfx/graphviz"
+DEPEND="test? ( ${RDEPEND} dev-php/PEAR-PEAR )"
+PATCHES=( "${FILESDIR}/Image_GraphViz-1.3.0-constructor.patch" )
+S="${WORKDIR}/${PEAR_P}"
+
+src_prepare() {
+ mv "${S}/package.xml" "${WORKDIR}" || die
+ default
+}
+
+src_test() {
+ peardev run-tests tests || die
+}
diff --git a/dev-php/PEAR-Image_GraphViz/files/Image_GraphViz-1.3.0-constructor.patch b/dev-php/PEAR-Image_GraphViz/files/Image_GraphViz-1.3.0-constructor.patch
new file mode 100644
index 000000000000..da7dfd4724ca
--- /dev/null
+++ b/dev-php/PEAR-Image_GraphViz/files/Image_GraphViz-1.3.0-constructor.patch
@@ -0,0 +1,55 @@
+From 794fdf40ad944225854845a0ff32a5c56fb249d9 Mon Sep 17 00:00:00 2001
+From: Seb35 <seb35@seb35.fr>
+Date: Sun, 6 Nov 2016 22:42:46 +0100
+Subject: [PATCH] Added __construct constructor
+
+This removes deprecation warnings due to old constructor
+(method with the class name). Keep the old-style constructor
+for compatibility (like in the PEAR main class).
+---
+ Image/GraphViz.php | 25 ++++++++++++++++++++++++-
+ 1 file changed, 24 insertions(+), 1 deletion(-)
+
+diff --git a/Image/GraphViz.php b/Image/GraphViz.php
+index ee84ff2..92842da 100644
+--- a/Image/GraphViz.php
++++ b/Image/GraphViz.php
+@@ -181,7 +181,7 @@ class Image_GraphViz
+ *
+ * @access public
+ */
+- function Image_GraphViz($directed = true, $attributes = array(),
++ function __construct($directed = true, $attributes = array(),
+ $name = 'G', $strict = true, $returnError = false)
+ {
+ $this->setDirected($directed);
+@@ -192,6 +192,29 @@ function Image_GraphViz($directed = true, $attributes = array(),
+ $this->_returnFalseOnError = !$returnError;
+ }
+
++ /**
++ * Compatibility constructor.
++ *
++ * @param boolean $directed Directed (TRUE) or undirected (FALSE) graph.
++ * Note: You MUST pass a boolean, and not just
++ * an expression that evaluates to TRUE or
++ * FALSE (i.e. NULL, empty string, 0 will NOT
++ * work)
++ * @param array $attributes Attributes of the graph
++ * @param string $name Name of the Graph
++ * @param boolean $strict Whether to collapse multiple edges between
++ * same nodes
++ * @param boolean $returnError Set to TRUE to return PEAR_Error instances
++ * on failures instead of FALSE
++ *
++ * @access public
++ */
++ function Image_GraphViz($directed = true, $attributes = array(),
++ $name = 'G', $strict = true, $returnError = false)
++ {
++ self::__construct($directed, $attributes, $name, $strinct, $returnError);
++ }
++
+ /**
+ * Outputs image of the graph in a given format
+ *
diff --git a/dev-php/PEAR-Image_GraphViz/metadata.xml b/dev-php/PEAR-Image_GraphViz/metadata.xml
new file mode 100644
index 000000000000..b86acf66c756
--- /dev/null
+++ b/dev-php/PEAR-Image_GraphViz/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ <name>PHP</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/dev-php/PEAR-Image_IPTC-1.0.2-r2 b/dev-php/PEAR-Image_IPTC-1.0.2-r2
deleted file mode 100644
index 85144e43a748..000000000000
--- a/dev-php/PEAR-Image_IPTC-1.0.2-r2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DESCRIPTION=This package provides a mechanism for modifying IPTC header information
-EAPI=6
-HOMEPAGE=https://pear.php.net/package/Image_IPTC
-KEYWORDS=alpha amd64 hppa ia64 ppc ppc64 sparc x86
-LICENSE=PHP-2.02
-RDEPEND=>=dev-php/pear-1.8.1
-SLOT=0
-SRC_URI=https://pear.php.net/get/Image_IPTC-1.0.2.tgz
-_eclasses_=php-pear-r2 eb6928c33771db74564e814c5ca6c1b3
-_md5_=f5f810c1ccdaed1e2e0868ba5e7d2544
diff --git a/dev-php/PEAR-Image_IPTC/Manifest b/dev-php/PEAR-Image_IPTC/Manifest
new file mode 100644
index 000000000000..c2d5ba8a43da
--- /dev/null
+++ b/dev-php/PEAR-Image_IPTC/Manifest
@@ -0,0 +1,3 @@
+DIST Image_IPTC-1.0.2.tgz 3530 BLAKE2B 359425d308dabf82729993113e8e21ae5f48f470b7a49a0adde2728f6b6ffb42c12908f10fa7cd8756e6fb5f5a30cd59371f567a9509ea844bc66e94af5cf53f SHA512 6481d2e9597a6fa5e6e7a782d18a9d7275d766a38f49d52d2ebddcd918c12c3632eceb2b5b1547f631be630779deab2f41894bf241a3e650d5f046e02201af1f
+EBUILD PEAR-Image_IPTC-1.0.2-r2.ebuild 409 BLAKE2B b6306d8d95e5607773638d8b23a319d3a48bc9a4c0d77df7dd8ed963ce5496ff0620149382b7bb489d7f253c717d26d0ef399c69fa57388a9a4a54ec1126c189 SHA512 3b7465584253a8a0540b165daf40a078e2d687f3cc51ce24017b02190e2206ff4a8254bca8eb0abe5d5df0b784ca09715c940c82eaaa4b567c70c54a4a365fa8
+MISC metadata.xml 235 BLAKE2B 5b10304feea18aae1822be7d29bcce06c8715193b14a3dd2c4d79eb75e2767670352e2ca11e06b9a10ec04b63020a18254cd167e6d6be9072f4a200ca5d11ec4 SHA512 0b3e95bbf68eddf74289dad50f8828cffce2d904ff6f9bd5468177de979677cac11da84d1e0302c52b72085915b9d1b3496107172e5726520d51dad1981daf64
diff --git a/dev-php/PEAR-Image_IPTC/PEAR-Image_IPTC-1.0.2-r2.ebuild b/dev-php/PEAR-Image_IPTC/PEAR-Image_IPTC-1.0.2-r2.ebuild
new file mode 100644
index 000000000000..d21d0f9e3e31
--- /dev/null
+++ b/dev-php/PEAR-Image_IPTC/PEAR-Image_IPTC-1.0.2-r2.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit php-pear-r2
+
+DESCRIPTION="This package provides a mechanism for modifying IPTC header information"
+LICENSE="PHP-2.02"
+SLOT="0"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
+IUSE=""
+
+src_install() {
+ insinto /usr/share/php/Image
+ doins IPTC.php
+ php-pear-r2_install_packagexml
+}
diff --git a/dev-php/PEAR-Image_IPTC/metadata.xml b/dev-php/PEAR-Image_IPTC/metadata.xml
new file mode 100644
index 000000000000..aca42932b833
--- /dev/null
+++ b/dev-php/PEAR-Image_IPTC/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ <name>PHP</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-php/PEAR-Image_Text-0.7.0-r1 b/dev-php/PEAR-Image_Text-0.7.0-r1
deleted file mode 100644
index e17fb480855c..000000000000
--- a/dev-php/PEAR-Image_Text-0.7.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm test
-DEPEND=test? ( dev-lang/php:*[gd,truetype] dev-php/phpunit )
-DESCRIPTION=Advanced text manipulations in images
-EAPI=6
-HOMEPAGE=https://pear.php.net/package/Image_Text
-IUSE=test
-KEYWORDS=amd64 x86
-LICENSE=PHP-3
-RDEPEND=dev-lang/php:*[gd,truetype] >=dev-php/pear-1.8.1
-SLOT=0
-SRC_URI=https://pear.php.net/get/Image_Text-0.7.0.tgz
-_eclasses_=php-pear-r2 eb6928c33771db74564e814c5ca6c1b3
-_md5_=671446b20eafd7036653b5c56bd5c654
diff --git a/dev-php/PEAR-Image_Text/Manifest b/dev-php/PEAR-Image_Text/Manifest
new file mode 100644
index 000000000000..3a6e2622c135
--- /dev/null
+++ b/dev-php/PEAR-Image_Text/Manifest
@@ -0,0 +1,3 @@
+DIST Image_Text-0.7.0.tgz 102049 BLAKE2B e4c9cfd1b775891adaede8fc6619c4d32a1078d37939214eb7b21ab0ed8133f6c25e1f79823988103393ce2ba90a0e23109b1f0e9e4e393b460ac2b8bcf1f2c6 SHA512 6644cda649ecf2861af1999a7a1b8c59e2c39f178eaf818c2f3afa532b6eb1fee16eff1f3cb1ef471d5480c023452ab9226edd7ee2232353120ec2976d67b1c5
+EBUILD PEAR-Image_Text-0.7.0-r1.ebuild 371 BLAKE2B 118b76b28caab94c98ddf555cd0a863791b98de83246ab57fba20f6ba971e7ea84259708138b234de378d2b67030b17e57c7ac7c73ecafa93db0ce0ff28f7c4e SHA512 6d84183fa4c8a9bc1da14c855d0ea9ec6d22a31405361d0d83753cbbc66b47cb237491604f61f2864e4f9ee98aeaf894b7e009075f38752738870a600234c9b6
+MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/PEAR-Image_Text/PEAR-Image_Text-0.7.0-r1.ebuild b/dev-php/PEAR-Image_Text/PEAR-Image_Text-0.7.0-r1.ebuild
new file mode 100644
index 000000000000..5e2acb0c8d48
--- /dev/null
+++ b/dev-php/PEAR-Image_Text/PEAR-Image_Text-0.7.0-r1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit php-pear-r2
+
+DESCRIPTION="Advanced text manipulations in images"
+LICENSE="PHP-3"
+SLOT="0"
+
+KEYWORDS="amd64 x86"
+IUSE="test"
+
+RDEPEND="dev-lang/php:*[gd,truetype]"
+DEPEND="test? ( ${RDEPEND} dev-php/phpunit )"
+
+src_test() {
+ phpunit tests || die
+}
diff --git a/dev-php/PEAR-Image_Text/metadata.xml b/dev-php/PEAR-Image_Text/metadata.xml
new file mode 100644
index 000000000000..b86acf66c756
--- /dev/null
+++ b/dev-php/PEAR-Image_Text/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ <name>PHP</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/dev-php/PEAR-Log-1.13.1 b/dev-php/PEAR-Log-1.13.1
deleted file mode 100644
index 0b2903236d40..000000000000
--- a/dev-php/PEAR-Log-1.13.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install test
-DEPEND=test? ( dev-lang/php:* dev-php/PEAR-PEAR dev-php/PEAR-DB dev-php/PEAR-Mail dev-php/PEAR-MDB2 )
-DESCRIPTION=The Log framework provides an abstracted logging system
-EAPI=6
-HOMEPAGE=http://pear.php.net/package/Log
-IUSE=examples test
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86
-LICENSE=MIT
-RDEPEND=dev-lang/php:* dev-php/PEAR-PEAR dev-php/PEAR-DB dev-php/PEAR-Mail dev-php/PEAR-MDB2
-SLOT=0
-SRC_URI=http://download.pear.php.net/package/Log-1.13.1.tgz
-_md5_=84aac014b883db94397dfb95178e1667
diff --git a/dev-php/PEAR-Log/Manifest b/dev-php/PEAR-Log/Manifest
new file mode 100644
index 000000000000..5d1f7211a78c
--- /dev/null
+++ b/dev-php/PEAR-Log/Manifest
@@ -0,0 +1,3 @@
+DIST Log-1.13.1.tgz 46764 BLAKE2B dc0f4605ed801818ddf070ec3beb6818af1630d99bec721cd3f487e709f87bd4a1628a05854c48fe9775aab546bdce4618061ef37674aa9921f536deccc6a080 SHA512 246510b7dbff4dc9f9cdd951d76baf2dd377e30ffde6d38cadac10091dcb92f8095406edb6d8a87ebe2330d514ce99f355f84ebfe57cd8a3f3babc316995148a
+EBUILD PEAR-Log-1.13.1.ebuild 1330 BLAKE2B 7b1012d9ab49971d9aed4c9655781556c0c4617d12d2e9d18b5960287c9a4eec3dcff11334eeefb7f91d53a25f13620c78df7d53cc81b29ae05b4b7398c5dfab SHA512 c4af6ba4459f80e033fc6f3c85409b5ef65dc1a5de28ec9df29bf67d5b69625067f6255838bfccee524f1af2d8ea7cd20bae36bfa6e25f85091a1549b30d0787
+MISC metadata.xml 305 BLAKE2B 9ae588d4fa3e555b0362d0f9ba19dd3bfd459f1788fb047852f22cde3d2688e3807d4ad87247b9dd8759450af1c1ce55192b2e551a8337abd08fbc771f32cd36 SHA512 8540d045359dc2f4ed04bde79616f2ebe923a0d3a6e401788a37e3bfd973a9db33662f5c01326e0fe0198246dad290d8d3ec3d841394071c215f70a8ad4abf71
diff --git a/dev-php/PEAR-Log/PEAR-Log-1.13.1.ebuild b/dev-php/PEAR-Log/PEAR-Log-1.13.1.ebuild
new file mode 100644
index 000000000000..d6a41ea76d21
--- /dev/null
+++ b/dev-php/PEAR-Log/PEAR-Log-1.13.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PN="${PN/PEAR-/}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="The Log framework provides an abstracted logging system"
+HOMEPAGE="http://pear.php.net/package/${MY_PN}"
+SRC_URI="http://download.pear.php.net/package/${MY_P}.tgz"
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+IUSE="examples test"
+
+# The DB, Mail, and MDB2 dependencies are technically optional, but
+# automagic. To avoid surprises, we require them unconditionally.
+RDEPEND="dev-lang/php:*
+ dev-php/PEAR-PEAR
+ dev-php/PEAR-DB
+ dev-php/PEAR-Mail
+ dev-php/PEAR-MDB2"
+DEPEND="test? ( ${RDEPEND} )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+ dodoc docs/guide.txt misc/log.sql
+ use examples && dodoc -r examples
+
+ # I don't like installing "Log.php" right at the top-level, but any
+ # packages depending on us will expect to find it there and not as
+ # e.g. Log/Log.php.
+ insinto "/usr/share/php/"
+ doins Log.php
+ doins -r Log
+}
+
+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-Log/metadata.xml b/dev-php/PEAR-Log/metadata.xml
new file mode 100644
index 000000000000..509eaf73bd24
--- /dev/null
+++ b/dev-php/PEAR-Log/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ <name>PHP</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="pear">Log</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-php/PEAR-MDB-1.3.0-r2 b/dev-php/PEAR-MDB-1.3.0-r2
deleted file mode 100644
index 8b658126c434..000000000000
--- a/dev-php/PEAR-MDB-1.3.0-r2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DESCRIPTION=PEAR MDB combines the PEAR DB and Metabase php database abstraction layers
-EAPI=6
-HOMEPAGE=https://pear.php.net/package/MDB
-KEYWORDS=alpha amd64 hppa ia64 ppc ppc64 sparc x86
-LICENSE=BSD
-RDEPEND=dev-php/PEAR-XML_Parser >=dev-php/pear-1.8.1
-SLOT=0
-SRC_URI=https://pear.php.net/get/MDB-1.3.0.tgz
-_eclasses_=php-pear-r2 eb6928c33771db74564e814c5ca6c1b3
-_md5_=d5f1bff8207ca903906edce089ee7709
diff --git a/dev-php/PEAR-MDB/Manifest b/dev-php/PEAR-MDB/Manifest
new file mode 100644
index 000000000000..c50f69991344
--- /dev/null
+++ b/dev-php/PEAR-MDB/Manifest
@@ -0,0 +1,3 @@
+DIST MDB-1.3.0.tgz 218957 BLAKE2B 17dbcea6487180a19386177cf5ab88abd744d8d52c16bcf156447dfa30c6489329fb6350ef6c33f4923bac6cd5465335010f6d3a7123fd1a21ab4cb845130517 SHA512 48a3319b66cc0ba60a9b96278b6f40015c4cf13d43d4b176b7682b4ad0b071b74830446c71347fcb47c5548ccfc35b98f61f2638a8fb2521534603a39843d37a
+EBUILD PEAR-MDB-1.3.0-r2.ebuild 498 BLAKE2B 53cb5aeac8d1c1913dc1e4939f7465d80c375925a46bd06b119e14adbfda96ceb563a12a73b2b3e2dd17e558405bafec96e207ee20ec825810f500016ab07415 SHA512 eae2032bac354a73cdc9147ecf0f4572e1999c145ddec38232e4e34e06e0e5ab501efff1d5630ab078eae1a35867947ada1aa411086eb94d8553ca2919008cbc
+MISC metadata.xml 235 BLAKE2B 5b10304feea18aae1822be7d29bcce06c8715193b14a3dd2c4d79eb75e2767670352e2ca11e06b9a10ec04b63020a18254cd167e6d6be9072f4a200ca5d11ec4 SHA512 0b3e95bbf68eddf74289dad50f8828cffce2d904ff6f9bd5468177de979677cac11da84d1e0302c52b72085915b9d1b3496107172e5726520d51dad1981daf64
diff --git a/dev-php/PEAR-MDB/PEAR-MDB-1.3.0-r2.ebuild b/dev-php/PEAR-MDB/PEAR-MDB-1.3.0-r2.ebuild
new file mode 100644
index 000000000000..16b25251b3b1
--- /dev/null
+++ b/dev-php/PEAR-MDB/PEAR-MDB-1.3.0-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit php-pear-r2
+
+DESCRIPTION="PEAR MDB combines the PEAR DB and Metabase php database abstraction layers"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
+IUSE=""
+RDEPEND="dev-php/PEAR-XML_Parser"
+HTML_DOCS=( doc/xml_schema.xsl doc/skeleton.php doc/xml_schema_documentation.html doc/tutorial.html doc/datatypes.html doc/Modules_Manager_skeleton.php )
diff --git a/dev-php/PEAR-MDB/metadata.xml b/dev-php/PEAR-MDB/metadata.xml
new file mode 100644
index 000000000000..aca42932b833
--- /dev/null
+++ b/dev-php/PEAR-MDB/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ <name>PHP</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-php/PEAR-MDB2-2.5.0_beta5-r1 b/dev-php/PEAR-MDB2-2.5.0_beta5-r1
deleted file mode 100644
index 65dd45543a8a..000000000000
--- a/dev-php/PEAR-MDB2-2.5.0_beta5-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DESCRIPTION=Database Abstraction Layer
-EAPI=6
-HOMEPAGE=https://pear.php.net/package/MDB2
-IUSE=mssql mysql mysqli oci8 oci8-instant-client postgres sqlite
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86
-LICENSE=BSD
-PDEPEND=mssql? ( >=dev-php/PEAR-MDB2_Driver_mssql-1.3.0_beta4 ) mysql? ( >=dev-php/PEAR-MDB2_Driver_mysql-1.5.0_beta4 ) mysqli? ( >=dev-php/PEAR-MDB2_Driver_mysqli-1.5.0_beta4 ) oci8? ( >=dev-php/PEAR-MDB2_Driver_oci8-1.5.0_beta4 ) oci8-instant-client? ( >=dev-php/PEAR-MDB2_Driver_oci8-1.5.0_beta4 ) postgres? ( >=dev-php/PEAR-MDB2_Driver_pgsql-1.5.0_beta4 )
-RDEPEND=>=dev-php/PEAR-PEAR-1.9.1 >=dev-php/pear-1.8.1
-SLOT=0
-SRC_URI=https://pear.php.net/get/MDB2-2.5.0b5.tgz
-_eclasses_=php-pear-r2 eb6928c33771db74564e814c5ca6c1b3
-_md5_=884de604a074b1f6cd639a3f7675c850
diff --git a/dev-php/PEAR-MDB2/Manifest b/dev-php/PEAR-MDB2/Manifest
new file mode 100644
index 000000000000..cbbb74b4866d
--- /dev/null
+++ b/dev-php/PEAR-MDB2/Manifest
@@ -0,0 +1,3 @@
+DIST MDB2-2.5.0b5.tgz 136834 BLAKE2B 4736cd205f186b56af4ad7b0c6a83aee5c042d06202464b4226d76e0e37608472f4650f6849de1912f6e47f35ff41ef6fe55f6449835f86ef7eb7ae8bb6e02e2 SHA512 76381594070d250f4428eebeaa4867e72b2be0723ec592ff4f0fba089823e97de057f93e630a5cb226ca2f67028bee57072a0af30677728d614d7a7242c6c6fc
+EBUILD PEAR-MDB2-2.5.0_beta5-r1.ebuild 875 BLAKE2B b9bbdb22670d60fa7221fe510cfa41bc346200951d0f3ce617e6465c68e9c238c53db41072ed10e695a8fe171bb36566b4c0d03d2ba2dd458cbd92749211a30e SHA512 a86f3135543576367ea8cd3e5932f7846591fdb3d3f213a811c14ebf9f9bed57550a97ddfd0769f0a270976a402d8c02c037a1410baa4ac268f560e3f59cdcce
+MISC metadata.xml 306 BLAKE2B c73f196a4a888c22bcde1298962ef829f5993b71d8ac5ded01f41b5fe2e91f599f8c9ed64e134ec26db62d9cc3c610397bf33159f3efde999ccc9cd40ab7bd4e SHA512 2edc3e48edb9d3788f5af8aea2797a72ff699c3fe28ed7664ebc1b1abe5d25616a54d3b9ace88ffef2399113d1678add85153b469d113f6e9e82808390d0373a
diff --git a/dev-php/PEAR-MDB2/PEAR-MDB2-2.5.0_beta5-r1.ebuild b/dev-php/PEAR-MDB2/PEAR-MDB2-2.5.0_beta5-r1.ebuild
new file mode 100644
index 000000000000..2e31770318bd
--- /dev/null
+++ b/dev-php/PEAR-MDB2/PEAR-MDB2-2.5.0_beta5-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PEAR_PV=${PV/_beta/b}
+
+inherit php-pear-r2
+
+DESCRIPTION="Database Abstraction Layer"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+IUSE="mssql mysql mysqli oci8 oci8-instant-client postgres sqlite"
+
+RDEPEND=">=dev-php/PEAR-PEAR-1.9.1"
+
+PDEPEND="mssql? ( >=dev-php/PEAR-MDB2_Driver_mssql-1.3.0_beta4 )
+ mysql? ( >=dev-php/PEAR-MDB2_Driver_mysql-1.5.0_beta4 )
+ mysqli? ( >=dev-php/PEAR-MDB2_Driver_mysqli-1.5.0_beta4 )
+ oci8? ( >=dev-php/PEAR-MDB2_Driver_oci8-1.5.0_beta4 )
+ oci8-instant-client? ( >=dev-php/PEAR-MDB2_Driver_oci8-1.5.0_beta4 )
+ postgres? ( >=dev-php/PEAR-MDB2_Driver_pgsql-1.5.0_beta4 )"
+
+DOCS=( docs/CONTRIBUTORS docs/MAINTAINERS docs/README docs/STATUS docs/TODO )
+HTML_DOCS=( docs/datatypes.html)
diff --git a/dev-php/PEAR-MDB2/metadata.xml b/dev-php/PEAR-MDB2/metadata.xml
new file mode 100644
index 000000000000..d6d5e4dc957f
--- /dev/null
+++ b/dev-php/PEAR-MDB2/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ <name>PHP</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="pear">MDB2</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-php/PEAR-MDB2_Driver_mssql-1.5.0_beta4-r1 b/dev-php/PEAR-MDB2_Driver_mssql-1.5.0_beta4-r1
deleted file mode 100644
index d14b8d62a9ec..000000000000
--- a/dev-php/PEAR-MDB2_Driver_mssql-1.5.0_beta4-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DESCRIPTION=Database Abstraction Layer, mssql driver
-EAPI=6
-HOMEPAGE=https://pear.php.net/package/MDB2_Driver_mssql
-KEYWORDS=alpha amd64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86
-LICENSE=BSD
-RDEPEND=>=dev-php/PEAR-MDB2-2.5.0_beta3 dev-lang/php:*[mssql] >=dev-php/pear-1.8.1
-SLOT=0
-SRC_URI=https://pear.php.net/get/MDB2_Driver_mssql-1.5.0b4.tgz
-_eclasses_=php-pear-r2 eb6928c33771db74564e814c5ca6c1b3
-_md5_=f1390fb683741b1fb1987ed65661f5a1
diff --git a/dev-php/PEAR-MDB2_Driver_mssql/Manifest b/dev-php/PEAR-MDB2_Driver_mssql/Manifest
new file mode 100644
index 000000000000..7376caa7a339
--- /dev/null
+++ b/dev-php/PEAR-MDB2_Driver_mssql/Manifest
@@ -0,0 +1,3 @@
+DIST MDB2_Driver_mssql-1.5.0b4.tgz 37246 BLAKE2B d53ad20004cb96d4c927ff897ae37a28b907c08e8ec9298e18e9c237bb58eff6d5d5e60b466608db6a143a71fec6d519a60d6da502cddf7018a777f65d278560 SHA512 9d8634508eaaed7ed35c4a2e61dcd31a20049f519dafeb6ac07541c4121ebe6efebf1db42d0352aea90971f3fd272085278fef0aabce4a527cf61bb7205321cd
+EBUILD PEAR-MDB2_Driver_mssql-1.5.0_beta4-r1.ebuild 375 BLAKE2B d06aae94ad1be008e5a88a05ffd6833ce4bd92a416e18a4b48bd0591de1e7c10bbede962eff3aac1948a8d02dc162718fe5ecccf25387466c72426a5688826bd SHA512 62066a8584663b46b76469ebb4d52b8cd6523b91dcf0ed7431b98803614078c913a11dfba3d712db0fe8c2eccf39076281e986284ecae303c86a1e7680568791
+MISC metadata.xml 319 BLAKE2B 4038d7d1c024f4120bc52e536a246ceea95c8433cf951b285593b4f2da914ad625497ec3fbbfdfe36cfaafa0b5abe53a3f5d14a21a4828b43124863e046dbbdf SHA512 2c7cff072e4fc3e17e551f9b464ae273ed28fd38b267653befac2762c344b4cd34f3d98798f0c91ce5bead59b41c3fa2f5fbac0b989f9660a585ca9fde4184fe
diff --git a/dev-php/PEAR-MDB2_Driver_mssql/PEAR-MDB2_Driver_mssql-1.5.0_beta4-r1.ebuild b/dev-php/PEAR-MDB2_Driver_mssql/PEAR-MDB2_Driver_mssql-1.5.0_beta4-r1.ebuild
new file mode 100644
index 000000000000..6cb179844f15
--- /dev/null
+++ b/dev-php/PEAR-MDB2_Driver_mssql/PEAR-MDB2_Driver_mssql-1.5.0_beta4-r1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PEAR_PV=${PV/_beta/b}
+
+inherit php-pear-r2
+
+DESCRIPTION="Database Abstraction Layer, mssql driver"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+IUSE=""
+
+RDEPEND=">=dev-php/PEAR-MDB2-2.5.0_beta3
+ dev-lang/php:*[mssql]"
diff --git a/dev-php/PEAR-MDB2_Driver_mssql/metadata.xml b/dev-php/PEAR-MDB2_Driver_mssql/metadata.xml
new file mode 100644
index 000000000000..e525c9a36124
--- /dev/null
+++ b/dev-php/PEAR-MDB2_Driver_mssql/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ <name>PHP</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="pear">MDB2_Driver_mssql</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-php/PEAR-MDB2_Driver_mysql-1.5.0_beta4-r1 b/dev-php/PEAR-MDB2_Driver_mysql-1.5.0_beta4-r1
deleted file mode 100644
index 2b621ba32922..000000000000
--- a/dev-php/PEAR-MDB2_Driver_mysql-1.5.0_beta4-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DESCRIPTION=Database Abstraction Layer, mysql driver
-EAPI=6
-HOMEPAGE=https://pear.php.net/package/MDB2_Driver_mysql
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86
-LICENSE=BSD
-RDEPEND=>=dev-php/PEAR-MDB2-2.5.0_beta3 <dev-lang/php-7:*[mysql] >=dev-php/pear-1.8.1
-SLOT=0
-SRC_URI=https://pear.php.net/get/MDB2_Driver_mysql-1.5.0b4.tgz
-_eclasses_=php-pear-r2 eb6928c33771db74564e814c5ca6c1b3
-_md5_=93b1719ecb03b2e9e50f0c0eb09f8434
diff --git a/dev-php/PEAR-MDB2_Driver_mysql/Manifest b/dev-php/PEAR-MDB2_Driver_mysql/Manifest
new file mode 100644
index 000000000000..94631a135b16
--- /dev/null
+++ b/dev-php/PEAR-MDB2_Driver_mysql/Manifest
@@ -0,0 +1,3 @@
+DIST MDB2_Driver_mysql-1.5.0b4.tgz 47418 BLAKE2B 6c8bde48b6fcae648f04b5c155c438b4c1095761d32fe592b02ecb088a8fa78e9fbe3ba37071906913de4984663a71be4f32e9de8d1388a23af9a940a89ae7a4 SHA512 a90cb358980b348747f33ac8047eddb151246ab55aae12d2af186c7e228397b12f7b90a881dc03e6a84e398147fb4501fc6d10175eca70cef5b962ef2665bdba
+EBUILD PEAR-MDB2_Driver_mysql-1.5.0_beta4-r1.ebuild 382 BLAKE2B 5303a6c14f205819d472dd842925cbc7fd4153325eb5667cd74064516a472c141fbf39e76be757ba4659d47639c6ea33e91ece787ba7255493948037dac32623 SHA512 c2bb2ba10b86ca0c681e82c25e8ec7791f896541b58a400751d15ced24cb5c45b00a0b7e2e9cc5faeb9549880d795bb4454c012dc63a86f072ba06ca539511ed
+MISC metadata.xml 319 BLAKE2B 8b7ca88fecb9682a9a47da13f5725668bfd0c33e51890d519276201cadcc27af5b36322c2fd31476709a250e6523bf435d32e5690baf421b59e442bcf62d8bfc SHA512 5de99874f992e6a0b8a95afab8250908ad72f6be38901349fd3f3b735e8cb7090485e5015f7df0e6da87a209e225f9d1dc1411ebbb71ae8c7b85a8b4de3ddddd
diff --git a/dev-php/PEAR-MDB2_Driver_mysql/PEAR-MDB2_Driver_mysql-1.5.0_beta4-r1.ebuild b/dev-php/PEAR-MDB2_Driver_mysql/PEAR-MDB2_Driver_mysql-1.5.0_beta4-r1.ebuild
new file mode 100644
index 000000000000..528ea374c231
--- /dev/null
+++ b/dev-php/PEAR-MDB2_Driver_mysql/PEAR-MDB2_Driver_mysql-1.5.0_beta4-r1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PEAR_PV=${PV/_beta/b}
+
+inherit php-pear-r2
+
+DESCRIPTION="Database Abstraction Layer, mysql driver"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+IUSE=""
+
+RDEPEND=">=dev-php/PEAR-MDB2-2.5.0_beta3
+ <dev-lang/php-7:*[mysql]"
diff --git a/dev-php/PEAR-MDB2_Driver_mysql/metadata.xml b/dev-php/PEAR-MDB2_Driver_mysql/metadata.xml
new file mode 100644
index 000000000000..301cc089d8d2
--- /dev/null
+++ b/dev-php/PEAR-MDB2_Driver_mysql/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ <name>PHP</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="pear">MDB2_Driver_mysql</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-php/PEAR-MDB2_Driver_mysqli-1.5.0_beta4-r1 b/dev-php/PEAR-MDB2_Driver_mysqli-1.5.0_beta4-r1
deleted file mode 100644
index 9d4109659b79..000000000000
--- a/dev-php/PEAR-MDB2_Driver_mysqli-1.5.0_beta4-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DESCRIPTION=Database Abstraction Layer, mysqli driver
-EAPI=6
-HOMEPAGE=https://pear.php.net/package/MDB2_Driver_mysqli
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86
-LICENSE=BSD
-RDEPEND=>=dev-php/PEAR-MDB2-2.5.0_beta3 dev-lang/php:*[mysqli(-)] >=dev-php/pear-1.8.1
-SLOT=0
-SRC_URI=https://pear.php.net/get/MDB2_Driver_mysqli-1.5.0b4.tgz
-_eclasses_=php-pear-r2 eb6928c33771db74564e814c5ca6c1b3
-_md5_=5b5e9f8954809de5cdda91a3b3af8357
diff --git a/dev-php/PEAR-MDB2_Driver_mysqli/Manifest b/dev-php/PEAR-MDB2_Driver_mysqli/Manifest
new file mode 100644
index 000000000000..d75f3efe98ae
--- /dev/null
+++ b/dev-php/PEAR-MDB2_Driver_mysqli/Manifest
@@ -0,0 +1,3 @@
+DIST MDB2_Driver_mysqli-1.5.0b4.tgz 49450 BLAKE2B db8341c8d9fb6f121daf0bf8d5004b57afc59a0dbe5fa662591d2026424acc015cc4b23848284f639c8d614ae01b4f43a5d185ef6b8528df79079356f3f0cbeb SHA512 cb4ba5b34b241f1eb6da72e63f47a99c939ac895530b20d077cf94fa96a9b36826aa128386ffa10e51488f8f3e93da9015805f6f28ddb8729e2812ff240ea894
+EBUILD PEAR-MDB2_Driver_mysqli-1.5.0_beta4-r1.ebuild 384 BLAKE2B 53d27f1c45ae588d66497941920c289ec50fd67df539ce9926d5680a000bee7528b710fb479ab0b608a07f132901259a78e8e76352c015ea8a9bf646c928aa17 SHA512 55778008c63ff92a442a2af7497aad4f9041789352ac3e2bf3c86006bda943717621646a9cf0d626c114cc91c8461ec49b77dcb89fce51e471b15098b1105eee
+MISC metadata.xml 320 BLAKE2B 42ba23a1fd9dbaf48892260221e3f4eaa6943c59a275b7c02191d9b35d9eeb2a23e991ce48a500ee3c99b6b6638d8102e254a14b377d13b139a195d17e6899bf SHA512 27fb6b627b6937e4d0f8e294e0a193baba97cc52f463484770ba81ddbd08fdf5652b7d0b3ea39f270efca14fef0fc235c4549743cf47a192271f9c73d9c81498
diff --git a/dev-php/PEAR-MDB2_Driver_mysqli/PEAR-MDB2_Driver_mysqli-1.5.0_beta4-r1.ebuild b/dev-php/PEAR-MDB2_Driver_mysqli/PEAR-MDB2_Driver_mysqli-1.5.0_beta4-r1.ebuild
new file mode 100644
index 000000000000..d0d63da9870f
--- /dev/null
+++ b/dev-php/PEAR-MDB2_Driver_mysqli/PEAR-MDB2_Driver_mysqli-1.5.0_beta4-r1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PEAR_PV=${PV/_beta/b}
+
+inherit php-pear-r2
+
+DESCRIPTION="Database Abstraction Layer, mysqli driver"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+IUSE=""
+
+RDEPEND=">=dev-php/PEAR-MDB2-2.5.0_beta3
+ dev-lang/php:*[mysqli(-)]"
diff --git a/dev-php/PEAR-MDB2_Driver_mysqli/metadata.xml b/dev-php/PEAR-MDB2_Driver_mysqli/metadata.xml
new file mode 100644
index 000000000000..d81856f5053e
--- /dev/null
+++ b/dev-php/PEAR-MDB2_Driver_mysqli/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ <name>PHP</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="pear">MDB2_Driver_mysqli</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-php/PEAR-MDB2_Driver_oci8-1.5.0_beta4-r1 b/dev-php/PEAR-MDB2_Driver_oci8-1.5.0_beta4-r1
deleted file mode 100644
index 904782ceb8aa..000000000000
--- a/dev-php/PEAR-MDB2_Driver_oci8-1.5.0_beta4-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DESCRIPTION=Database Abstraction Layer, oci8 driver
-EAPI=6
-HOMEPAGE=https://pear.php.net/package/MDB2_Driver_oci8
-KEYWORDS=-* amd64 x86
-LICENSE=BSD
-RDEPEND=>=dev-php/PEAR-MDB2-2.5.0_beta3 dev-lang/php:*[oci8-instant-client(-)] >=dev-php/pear-1.8.1
-SLOT=0
-SRC_URI=https://pear.php.net/get/MDB2_Driver_oci8-1.5.0b4.tgz
-_eclasses_=php-pear-r2 eb6928c33771db74564e814c5ca6c1b3
-_md5_=2ba88e34c073981a3bd029a4378a68c9
diff --git a/dev-php/PEAR-MDB2_Driver_oci8/Manifest b/dev-php/PEAR-MDB2_Driver_oci8/Manifest
new file mode 100644
index 000000000000..1621630f3581
--- /dev/null
+++ b/dev-php/PEAR-MDB2_Driver_oci8/Manifest
@@ -0,0 +1,3 @@
+DIST MDB2_Driver_oci8-1.5.0b4.tgz 44672 BLAKE2B b680fe38ee212cf6ecdfab1b361b710060ad239fd9312783da7e61d52ee84da81f8eda3afc5b4a4fd5bcb4d2dd82922c4dd0f601a13b1d89fd20d79e3fcdcfa3 SHA512 2b4327a06c43cb28a16ead10855377a6501bddfe30397b5af9c7037ce67394e9a9815578b24bfafcf0c8c20ab87fff89f7803b5b99afa5e5d2a278c78588c3d2
+EBUILD PEAR-MDB2_Driver_oci8-1.5.0_beta4-r1.ebuild 352 BLAKE2B f1d0f8c6ea6f70b2edc3feede7d7bad5517c854c1ede19d2d16a608daf9e126886fb6b31352c71b6d15910a15bb4ae522c0da7c9228c43e456068791ddc95652 SHA512 870c6582063acdc55320189e9c02223484028395ff34511253f6296f5330a2726089563046d009f0935d37459b56285cf3e31257a96494c09b30355f4a67f190
+MISC metadata.xml 318 BLAKE2B 2945fa5fae124aaebdc13d070a63b452b5cb68d16cfff3d35a300804432fa193a3b50c95d1fc45bab25317d7ea974b5de6eb3dc5e5047e7e9043072b9d48a814 SHA512 dfe4a599ae014abb2451d8e2d1558b7e1fbbbf150755e660cb94fb15bb27f77e9ce6b6d1ff8b51155eafc8a51ed420b84bfccd041074a446b008e8e493ad22b3
diff --git a/dev-php/PEAR-MDB2_Driver_oci8/PEAR-MDB2_Driver_oci8-1.5.0_beta4-r1.ebuild b/dev-php/PEAR-MDB2_Driver_oci8/PEAR-MDB2_Driver_oci8-1.5.0_beta4-r1.ebuild
new file mode 100644
index 000000000000..6ecd3a046e90
--- /dev/null
+++ b/dev-php/PEAR-MDB2_Driver_oci8/PEAR-MDB2_Driver_oci8-1.5.0_beta4-r1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PEAR_PV=${PV/_beta/b}
+
+inherit php-pear-r2
+
+DESCRIPTION="Database Abstraction Layer, oci8 driver"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="-* amd64 x86"
+IUSE=""
+
+RDEPEND=">=dev-php/PEAR-MDB2-2.5.0_beta3
+ dev-lang/php:*[oci8-instant-client(-)]"
diff --git a/dev-php/PEAR-MDB2_Driver_oci8/metadata.xml b/dev-php/PEAR-MDB2_Driver_oci8/metadata.xml
new file mode 100644
index 000000000000..cbf802ed4eb7
--- /dev/null
+++ b/dev-php/PEAR-MDB2_Driver_oci8/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ <name>PHP</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="pear">MDB2_Driver_oci8</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-php/PEAR-MDB2_Driver_pgsql-1.5.0_beta4-r1 b/dev-php/PEAR-MDB2_Driver_pgsql-1.5.0_beta4-r1
deleted file mode 100644
index ca5da3ff0e8b..000000000000
--- a/dev-php/PEAR-MDB2_Driver_pgsql-1.5.0_beta4-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DESCRIPTION=Database Abstraction Layer, pgsql driver
-EAPI=6
-HOMEPAGE=https://pear.php.net/package/MDB2_Driver_pgsql
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86
-LICENSE=BSD
-RDEPEND=>=dev-php/PEAR-MDB2-2.5.0_beta3 dev-lang/php:*[postgres(-)] >=dev-php/pear-1.8.1
-SLOT=0
-SRC_URI=https://pear.php.net/get/MDB2_Driver_pgsql-1.5.0b4.tgz
-_eclasses_=php-pear-r2 eb6928c33771db74564e814c5ca6c1b3
-_md5_=1809a415346cb51cae758fcc20d4d980
diff --git a/dev-php/PEAR-MDB2_Driver_pgsql/Manifest b/dev-php/PEAR-MDB2_Driver_pgsql/Manifest
new file mode 100644
index 000000000000..5778b619c7c9
--- /dev/null
+++ b/dev-php/PEAR-MDB2_Driver_pgsql/Manifest
@@ -0,0 +1,3 @@
+DIST MDB2_Driver_pgsql-1.5.0b4.tgz 42404 BLAKE2B 344d952cd745f66e3636c90c2262ce643a5af79a9fe919ddea63a76a7e4c9b97295b06e083f2b8866702b131bf5458380fee66b9cc6aeb5bb2190fdd189a4b03 SHA512 3beda16ee937f3f3af9217f778ae21bb67abe21bf338efa7fc7df0d512bad41cea5b10d4be26bc8055a0107cb14a814ae5da3db2d4346d479082d31cd1cec091
+EBUILD PEAR-MDB2_Driver_pgsql-1.5.0_beta4-r1.ebuild 385 BLAKE2B bf2c6d408bf930a68ceac3f7cdc60ec172d8868d9e5e825177b0568592a170af48ee8e2fe33bd5eddd386a01fad7c27688d2b71e708bbf7945126dbb052f2c9b SHA512 3fd91bca37c3342f83b1e7c839a828892427e5c23e95d0788e8ab9f43531e46f3943e0f6f628ccafda3d010ce6875203224598e1374cd18f873d1a56df23363a
+MISC metadata.xml 319 BLAKE2B 4be4d41cfcd4c23a3b5bff9c77d4f1d374974039f86d8263b04cdaed33da08bf15e8215c9626cae2df54c104bd93efe6bb2f4d0cd17191de1fa73c86344c210c SHA512 9081f4495127df0d74683a605330aa2c9cd615eab65d41e8b5636b6614ac38e6e679e49eaf3d7dd9e23e774e9b389963cb3ec2eb8d6f673532fa4d22ba12f357
diff --git a/dev-php/PEAR-MDB2_Driver_pgsql/PEAR-MDB2_Driver_pgsql-1.5.0_beta4-r1.ebuild b/dev-php/PEAR-MDB2_Driver_pgsql/PEAR-MDB2_Driver_pgsql-1.5.0_beta4-r1.ebuild
new file mode 100644
index 000000000000..62d48e74bcde
--- /dev/null
+++ b/dev-php/PEAR-MDB2_Driver_pgsql/PEAR-MDB2_Driver_pgsql-1.5.0_beta4-r1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PEAR_PV=${PV/_beta/b}
+
+inherit php-pear-r2
+
+DESCRIPTION="Database Abstraction Layer, pgsql driver"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+IUSE=""
+
+RDEPEND=">=dev-php/PEAR-MDB2-2.5.0_beta3
+ dev-lang/php:*[postgres(-)]"
diff --git a/dev-php/PEAR-MDB2_Driver_pgsql/metadata.xml b/dev-php/PEAR-MDB2_Driver_pgsql/metadata.xml
new file mode 100644
index 000000000000..18ab0c34e2cb
--- /dev/null
+++ b/dev-php/PEAR-MDB2_Driver_pgsql/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ <name>PHP</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="pear">MDB2_Driver_pgsql</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-php/PEAR-MIME_Type-1.4.1 b/dev-php/PEAR-MIME_Type-1.4.1
deleted file mode 100644
index 15a4288bc546..000000000000
--- a/dev-php/PEAR-MIME_Type-1.4.1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Utility class for dealing with MIME types
-EAPI=6
-HOMEPAGE=https://pear.php.net/package/MIME_Type
-KEYWORDS=~alpha amd64 ~hppa ~ia64 ppc ppc64 ~sparc x86
-LICENSE=LGPL-3
-RDEPEND=>=dev-lang/php-5.4:* >=dev-php/pear-1.9 dev-php/PEAR-System_Command
-SLOT=0
-SRC_URI=https://pear.php.net/get/MIME_Type-1.4.1.tgz
-_md5_=df4611e6628fc36a347493bb804605b1
diff --git a/dev-php/PEAR-MIME_Type/Manifest b/dev-php/PEAR-MIME_Type/Manifest
new file mode 100644
index 000000000000..4535e0e869d6
--- /dev/null
+++ b/dev-php/PEAR-MIME_Type/Manifest
@@ -0,0 +1,3 @@
+DIST MIME_Type-1.4.1.tgz 21807 BLAKE2B 9f90e1dd4505ded94ee47b913814b21a7c9ab9bffabb330005ef5f04bcd9a7c89ecc5bbedbc65c60c63e4769fd0a50bbe0528b1622a25a86a4b7e1873f840f9d SHA512 f70507a44c0f81381baa0532a0f1337932cd69d054b96367b6ee98873fd85a51721f876b9aab679a18aff10b151ad1b447ff1c3f92288827e74e32b2627cdd01
+EBUILD PEAR-MIME_Type-1.4.1.ebuild 526 BLAKE2B 1fc9014adf77822d899f1332e5c80dcc4923d696af8234ea0d7016bb6c87a835454588f56a183088a9d83ebcd65916f13f96982b19e0f8ff7bdd5d16eef7ae53 SHA512 14b34d39ff146862aeb6dcf5cfe41b4b1650b0a8abe2b5abc4da4cc80879378f12529dd90f911fc1e2221a15c0640a3aed27d8d43cd9917d069950d23aa3ef50
+MISC metadata.xml 311 BLAKE2B ca0816a4957f3b5ddcb64ad8f5c9c00078a8a36c0f51b7ba40dfd2086c3de48a0fed47b7d35a0b12458a9c80d4c20db80e1c7d91c8b6a3a4e68d6d12ab8cd50e SHA512 a2528b21a2d20151b73bedba498db404cf49fad1dffd51bb74478e8ca97b3d5c07bb6a2e988c75a662bcd28af6c5a5e6b5184cf3e835787262b430b61d20049f
diff --git a/dev-php/PEAR-MIME_Type/PEAR-MIME_Type-1.4.1.ebuild b/dev-php/PEAR-MIME_Type/PEAR-MIME_Type-1.4.1.ebuild
new file mode 100644
index 000000000000..2a73abfa1534
--- /dev/null
+++ b/dev-php/PEAR-MIME_Type/PEAR-MIME_Type-1.4.1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+HOMEPAGE="https://pear.php.net/package/MIME_Type"
+SRC_URI="https://pear.php.net/get/${P#PEAR-}.tgz"
+DESCRIPTION="Utility class for dealing with MIME types"
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 ~sparc x86"
+IUSE=""
+RDEPEND=">=dev-lang/php-5.4:*
+ >=dev-php/pear-1.9
+ dev-php/PEAR-System_Command"
+S="${WORKDIR}/${P#PEAR-}"
+
+src_install(){
+ insinto /usr/share/php
+ doins -r MIME
+}
diff --git a/dev-php/PEAR-MIME_Type/metadata.xml b/dev-php/PEAR-MIME_Type/metadata.xml
new file mode 100644
index 000000000000..0ee12f20bc59
--- /dev/null
+++ b/dev-php/PEAR-MIME_Type/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ <name>PHP</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="pear">MIME_Type</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-php/PEAR-Mail-1.4.1-r1 b/dev-php/PEAR-Mail-1.4.1-r1
deleted file mode 100644
index afdf4216bd17..000000000000
--- a/dev-php/PEAR-Mail-1.4.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm test
-DEPEND=test? ( >=dev-php/PEAR-Net_SMTP-1.4.1 dev-php/PEAR-PEAR )
-DESCRIPTION=Class that provides multiple interfaces for sending emails
-EAPI=6
-HOMEPAGE=https://pear.php.net/package/Mail
-IUSE=test
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86
-LICENSE=BSD
-RDEPEND=>=dev-php/PEAR-Net_SMTP-1.4.1 >=dev-php/pear-1.8.1
-SLOT=0
-SRC_URI=https://pear.php.net/get/Mail-1.4.1.tgz
-_eclasses_=php-pear-r2 eb6928c33771db74564e814c5ca6c1b3
-_md5_=33205078d6b0c01824b106b64bd3e846
diff --git a/dev-php/PEAR-Mail/Manifest b/dev-php/PEAR-Mail/Manifest
new file mode 100644
index 000000000000..d3ce1543c807
--- /dev/null
+++ b/dev-php/PEAR-Mail/Manifest
@@ -0,0 +1,3 @@
+DIST Mail-1.4.1.tgz 21756 BLAKE2B 247df343a7b09760501918681cadc3a649ff9f2bd9974aa714a3661e64af6f1503edeb8ef0030f0ce113c43467cada3e7d62c6a60e751b5c8e6980c14f97fdbb SHA512 851fa64bcf042fba58a70833c12ec5d7af6382e14e6157eeeb5be51b22cdfa5677c5d1eeba8c1f9eef6d55c2d732a4d5d6ea28c726aef232b233c170f7b82307
+EBUILD PEAR-Mail-1.4.1-r1.ebuild 450 BLAKE2B 6255b55e1fe4ddc11a151a708f0cb64d81b85daf84d95c189841653a50699777c7879874fbf4454300e2fcba0fe3664f185a6ab8d2518e8932809aa117cff4e3 SHA512 f279cb4727e49cf78db10327f93f86052b8ea3d0bd49534581427f7c12d99cf09f6f9bed818ac84de2393179162946ff765926a050751bd1162ad8f8406d1a79
+MISC metadata.xml 306 BLAKE2B 82277e19d97f3d3d90c3a7785f58bc83fde319d3713254686f3607c1f5a8750b806080ed4a9db754b5cb5693af5bee73137b14ec368519a4a61b4f15341de91a SHA512 cc21c255e8437d641d2eb2950b641c543bdc8725bd8b7f27382f6355f053c781d36778fdb7fa630270b60ee4580c06cda52dfb3d757c1bf9735915c398df99fa
diff --git a/dev-php/PEAR-Mail/PEAR-Mail-1.4.1-r1.ebuild b/dev-php/PEAR-Mail/PEAR-Mail-1.4.1-r1.ebuild
new file mode 100644
index 000000000000..f2acd6ca96e2
--- /dev/null
+++ b/dev-php/PEAR-Mail/PEAR-Mail-1.4.1-r1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit php-pear-r2
+
+DESCRIPTION="Class that provides multiple interfaces for sending emails"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+IUSE="test"
+
+RDEPEND=">=dev-php/PEAR-Net_SMTP-1.4.1"
+DEPEND="test? ( ${RDEPEND} dev-php/PEAR-PEAR )"
+
+src_test() {
+ peardev run-tests tests || die
+}
diff --git a/dev-php/PEAR-Mail/metadata.xml b/dev-php/PEAR-Mail/metadata.xml
new file mode 100644
index 000000000000..95e37f18a0c5
--- /dev/null
+++ b/dev-php/PEAR-Mail/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ <name>PHP</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="pear">Mail</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-php/PEAR-Mail_Mime-1.10.2-r1 b/dev-php/PEAR-Mail_Mime-1.10.2-r1
deleted file mode 100644
index 5dc4cd4026ef..000000000000
--- a/dev-php/PEAR-Mail_Mime-1.10.2-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm test
-DEPEND=test? ( dev-php/PEAR-PEAR )
-DESCRIPTION=Create and manipulate mime messages with PHP
-EAPI=6
-HOMEPAGE=https://pear.php.net/package/Mail_Mime
-IUSE=test
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86
-LICENSE=BSD
-RDEPEND=>=dev-php/pear-1.8.1
-SLOT=0
-SRC_URI=https://pear.php.net/get/Mail_Mime-1.10.2.tgz
-_eclasses_=php-pear-r2 eb6928c33771db74564e814c5ca6c1b3
-_md5_=60ed8d9af435f636f1b169ecced83203
diff --git a/dev-php/PEAR-Mail_Mime/Manifest b/dev-php/PEAR-Mail_Mime/Manifest
new file mode 100644
index 000000000000..9cf01defbc8f
--- /dev/null
+++ b/dev-php/PEAR-Mail_Mime/Manifest
@@ -0,0 +1,3 @@
+DIST Mail_Mime-1.10.2.tgz 36501 BLAKE2B 59e900b99061e84d307eb46d295f843404ae06b01936cec4ed610c298b6f7e8fcee15098fa6d935696122311eae2dbf733611410b2249f2535673a3031011fa3 SHA512 4e3b2a2adc58d8b4f16f56509c9f22638dc37aedf1bec60871706390198198be6ed6dccae8c250eb33de3a441aeb122097ffaddbc49191745f0f09693ec6612b
+EBUILD PEAR-Mail_Mime-1.10.2-r1.ebuild 626 BLAKE2B 62004ae4cbff447620ca35c2cea251b6441fcd1415f2fbde011787bbd64f0d0e7e6ea21c73629f81bb17055e5f6d1c8c467b4597a6fe768bd08443f8ad8e27f7 SHA512 bef124576c9f109ed44f83f8f33d78a76c5850b90cc7e71a556607585a71a171554e2469cc59108b9924e88be9ad207231fcf65c7aab3a381f35145b6962149d
+MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/PEAR-Mail_Mime/PEAR-Mail_Mime-1.10.2-r1.ebuild b/dev-php/PEAR-Mail_Mime/PEAR-Mail_Mime-1.10.2-r1.ebuild
new file mode 100644
index 000000000000..e3f9693a17f6
--- /dev/null
+++ b/dev-php/PEAR-Mail_Mime/PEAR-Mail_Mime-1.10.2-r1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+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 ~sh sparc x86"
+IUSE="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
new file mode 100644
index 000000000000..b86acf66c756
--- /dev/null
+++ b/dev-php/PEAR-Mail_Mime/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ <name>PHP</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/dev-php/PEAR-Mail_mimeDecode-1.5.6-r2 b/dev-php/PEAR-Mail_mimeDecode-1.5.6-r2
deleted file mode 100644
index 26cb8a8b484d..000000000000
--- a/dev-php/PEAR-Mail_mimeDecode-1.5.6-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm test
-DEPEND=test? ( >=dev-php/PEAR-Mail_Mime-1.5.2 dev-php/PEAR-PEAR )
-DESCRIPTION=Provides a class to decode mime messages (split from PEAR-Mail_Mime)
-EAPI=6
-HOMEPAGE=https://pear.php.net/package/Mail_mimeDecode
-IUSE=test
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86
-LICENSE=BSD
-RDEPEND=>=dev-php/PEAR-Mail_Mime-1.5.2 >=dev-php/pear-1.8.1
-SLOT=0
-SRC_URI=https://pear.php.net/get/Mail_mimeDecode-1.5.6.tgz
-_eclasses_=php-pear-r2 eb6928c33771db74564e814c5ca6c1b3
-_md5_=a51ec630093ae1d10cf4c66250f1abfc
diff --git a/dev-php/PEAR-Mail_mimeDecode/Manifest b/dev-php/PEAR-Mail_mimeDecode/Manifest
new file mode 100644
index 000000000000..e850ee18df28
--- /dev/null
+++ b/dev-php/PEAR-Mail_mimeDecode/Manifest
@@ -0,0 +1,3 @@
+DIST Mail_mimeDecode-1.5.6.tgz 13258 BLAKE2B 7e027cf9bf2a450bde639f8c530f216cc8dfd9eab719829dedad029d98fc5c4806279d13ec3ffb5191ba23edf64ae658ca0ec8d83f116da3fafbd23d758a9f00 SHA512 fe46ff2542acd3b180981c7dae41a1979b2edb3bfa5ad716a1ff39a255c2c04d92a7d770ae6531e38f3b869173f576fba44410c8e03269510d71dce5fa345bd1
+EBUILD PEAR-Mail_mimeDecode-1.5.6-r2.ebuild 457 BLAKE2B aa05548ab64f76f06df201ba4543d929dd844faca2cbd68a4b127a00ef00a67071ccd69d9ac59fc9991183abc4fb0ea95f4bbb05d10dc026b2100e003a809962 SHA512 b0ce42e8c08ddd620469530ab04f0462d98fec1c8e947dd3701c6674054aef954aba46c10ad5700c658c58bab1742f6e9818a49370a48f6c029adf04263be002
+MISC metadata.xml 317 BLAKE2B 00a849c6fe77dbad0b85efe11bf5826ee7d1527a66615400579b33ad6da1bfbb9e86c70bacec14fe304d20e5672cfd394643b4df5caac1af6fe9991deab8ab59 SHA512 00a0f91819696baf2e347036e70f5c32925ed6694144dfbd68e3aca5a62e3c6a157eabc8b4b74d3392008468eb23ee9c4639031e31334733e33be85bc19e2237
diff --git a/dev-php/PEAR-Mail_mimeDecode/PEAR-Mail_mimeDecode-1.5.6-r2.ebuild b/dev-php/PEAR-Mail_mimeDecode/PEAR-Mail_mimeDecode-1.5.6-r2.ebuild
new file mode 100644
index 000000000000..c964c6908cfa
--- /dev/null
+++ b/dev-php/PEAR-Mail_mimeDecode/PEAR-Mail_mimeDecode-1.5.6-r2.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit php-pear-r2
+
+DESCRIPTION="Provides a class to decode mime messages (split from PEAR-Mail_Mime)"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+IUSE="test"
+
+RDEPEND=">=dev-php/PEAR-Mail_Mime-1.5.2"
+DEPEND="test? ( ${RDEPEND} dev-php/PEAR-PEAR )"
+
+src_test() {
+ pear run-tests tests || die
+}
diff --git a/dev-php/PEAR-Mail_mimeDecode/metadata.xml b/dev-php/PEAR-Mail_mimeDecode/metadata.xml
new file mode 100644
index 000000000000..05eb5d939819
--- /dev/null
+++ b/dev-php/PEAR-Mail_mimeDecode/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ <name>PHP</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="pear">Mail_mimeDecode</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-php/PEAR-Math_BigInteger-1.0.3-r1 b/dev-php/PEAR-Math_BigInteger-1.0.3-r1
deleted file mode 100644
index 0c6b33e67f3f..000000000000
--- a/dev-php/PEAR-Math_BigInteger-1.0.3-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Pure-PHP arbitrary precision integer arithmetic library
-EAPI=6
-HOMEPAGE=http://pear.php.net/package/Math_BigInteger http://phpseclib.sourceforge.net/documentation/math.html
-KEYWORDS=alpha amd64 hppa ia64 ppc ppc64 sparc x86
-LICENSE=MIT
-RDEPEND=dev-lang/php:*
-SLOT=0
-SRC_URI=http://download.pear.php.net/package/Math_BigInteger-1.0.3.tgz
-_md5_=a40cb9d59561fc6ac5760d749ec60727
diff --git a/dev-php/PEAR-Math_BigInteger/Manifest b/dev-php/PEAR-Math_BigInteger/Manifest
new file mode 100644
index 000000000000..801949516906
--- /dev/null
+++ b/dev-php/PEAR-Math_BigInteger/Manifest
@@ -0,0 +1,3 @@
+DIST Math_BigInteger-1.0.3.tgz 28009 BLAKE2B 21bce67edff73b791322e364d15a1da2c57e9559aa4684b435fe6a8f17a14ce30b81d8ade0fc46d995a1c8f61843ec239ba1c09394adfa9cf77ccf448ecf3d72 SHA512 c8d6d638a6093b39e0f95e55d4d7488ddda1ad512504a97ce62a78ffae969b0d90925d6252b26230e5664f84b0a6b70fb456a678fbb291ca1a068cc7c539f415
+EBUILD PEAR-Math_BigInteger-1.0.3-r1.ebuild 630 BLAKE2B f3fd228601f6fb3aff5f66a38b67ba24508cb88a195038f43f8ffeae115f4dcafd5113753ee08a1dbb6f3c5b411908df597d1ba66f3530c1ebeea7d42aa323aa SHA512 7089699cec70aa1ed93350bd3997086c230973510967181b6a8404df4b16224f405981517a82308931e8617a08faff0d8551bc97de7c17676f269c69c700b286
+MISC metadata.xml 383 BLAKE2B fe5d5ba08fd329fb70f87a71af8c7e496a439c956de7222679c06a910c9bcf853cf454d65f5b560f378b7236e2e9e4365006e03256fcd7af69e39040e9155ee4 SHA512 b6c4d19556a70c765b60a6c9c8ef2389fab9ae7a07f9d6d4ad032e1c87b87396de7428a6e4b4f4980c8423ec12db9febfc487a32b5239a3ac948569e2aca451d
diff --git a/dev-php/PEAR-Math_BigInteger/PEAR-Math_BigInteger-1.0.3-r1.ebuild b/dev-php/PEAR-Math_BigInteger/PEAR-Math_BigInteger-1.0.3-r1.ebuild
new file mode 100644
index 000000000000..bf5089085a38
--- /dev/null
+++ b/dev-php/PEAR-Math_BigInteger/PEAR-Math_BigInteger-1.0.3-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PN="${PN/PEAR-/}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Pure-PHP arbitrary precision integer arithmetic library"
+HOMEPAGE="http://pear.php.net/package/${MY_PN}
+ http://phpseclib.sourceforge.net/documentation/math.html"
+SRC_URI="http://download.pear.php.net/package/${MY_P}.tgz"
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
+IUSE=""
+DEPEND=""
+RDEPEND="dev-lang/php:*"
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+ insinto /usr/share/php
+ doins -r Math
+
+ dodoc demo/{benchmark,demo}.php
+}
diff --git a/dev-php/PEAR-Math_BigInteger/metadata.xml b/dev-php/PEAR-Math_BigInteger/metadata.xml
new file mode 100644
index 000000000000..b84d917340c4
--- /dev/null
+++ b/dev-php/PEAR-Math_BigInteger/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ <name>PHP</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="pear">Math_BigInteger</remote-id>
+ <remote-id type="sourceforge">phpseclib</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-php/PEAR-Net_DNS-1.0.7-r1 b/dev-php/PEAR-Net_DNS-1.0.7-r1
deleted file mode 100644
index a2c54828fd28..000000000000
--- a/dev-php/PEAR-Net_DNS-1.0.7-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DESCRIPTION=Resolver library used to communicate with a DNS server
-EAPI=6
-HOMEPAGE=https://pear.php.net/package/Net_DNS
-KEYWORDS=alpha amd64 hppa ia64 ppc ppc64 sparc x86
-LICENSE=PHP-3.01 || ( LGPL-2.1 LGPL-3 )
-RDEPEND=>=dev-php/pear-1.8.1
-SLOT=0
-SRC_URI=https://pear.php.net/get/Net_DNS-1.0.7.tgz
-_eclasses_=php-pear-r2 eb6928c33771db74564e814c5ca6c1b3
-_md5_=65791555d2555218f74a9531ea29bfda
diff --git a/dev-php/PEAR-Net_DNS/Manifest b/dev-php/PEAR-Net_DNS/Manifest
new file mode 100644
index 000000000000..88fd588b8b66
--- /dev/null
+++ b/dev-php/PEAR-Net_DNS/Manifest
@@ -0,0 +1,3 @@
+DIST Net_DNS-1.0.7.tgz 32647 BLAKE2B 2e48b289a51ab5a2c551e1d3ac5a546289e9cc0af51cb4b6494e3bd28d1edc5c313b52b9061b86a8978bd879d3d6ddc00deebfdcdba3d41e48d3457e1b8d320a SHA512 4f3b9c416f0b41f5bf2870b4a7bfad1756c87bec6d0b9d24c36f99792bb3fae61e80d7c366d3a632016964a6bd14f07f52cf16976018c3bba8beb64b22987a5c
+EBUILD PEAR-Net_DNS-1.0.7-r1.ebuild 318 BLAKE2B 1f6bee9625563eeb19e9e7fe8b49a7b643cf8d8db8ac9579097d3ac86c585b5e8965a67d9355958293072dfc8c199206ba47bb73860dfb597d918e44313f6dcb SHA512 fc58e51f5dffcd2376230295433689a538cf5578a02a33f6466d03f959708831427629fc6bf1f63abbcd05163b73743c71a06d71322e7339a0eb587d4f3767df
+MISC metadata.xml 235 BLAKE2B 5b10304feea18aae1822be7d29bcce06c8715193b14a3dd2c4d79eb75e2767670352e2ca11e06b9a10ec04b63020a18254cd167e6d6be9072f4a200ca5d11ec4 SHA512 0b3e95bbf68eddf74289dad50f8828cffce2d904ff6f9bd5468177de979677cac11da84d1e0302c52b72085915b9d1b3496107172e5726520d51dad1981daf64
diff --git a/dev-php/PEAR-Net_DNS/PEAR-Net_DNS-1.0.7-r1.ebuild b/dev-php/PEAR-Net_DNS/PEAR-Net_DNS-1.0.7-r1.ebuild
new file mode 100644
index 000000000000..c720421c3143
--- /dev/null
+++ b/dev-php/PEAR-Net_DNS/PEAR-Net_DNS-1.0.7-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit php-pear-r2
+
+DESCRIPTION="Resolver library used to communicate with a DNS server"
+LICENSE="PHP-3.01 || ( LGPL-2.1 LGPL-3 )"
+SLOT="0"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
+IUSE=""
diff --git a/dev-php/PEAR-Net_DNS/metadata.xml b/dev-php/PEAR-Net_DNS/metadata.xml
new file mode 100644
index 000000000000..aca42932b833
--- /dev/null
+++ b/dev-php/PEAR-Net_DNS/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ <name>PHP</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-php/PEAR-Net_DNS2-1.4.4 b/dev-php/PEAR-Net_DNS2-1.4.4
deleted file mode 100644
index a5ecc3b131f0..000000000000
--- a/dev-php/PEAR-Net_DNS2-1.4.4
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DESCRIPTION=Object-oriented PHP5 resolver library used to communicate with a DNS server
-EAPI=6
-HOMEPAGE=https://pear.php.net/package/Net_DNS2
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-php/PEAR-PEAR >=dev-lang/php-5.3:*[sockets] >=dev-php/pear-1.8.1
-SLOT=0
-SRC_URI=https://pear.php.net/get/Net_DNS2-1.4.4.tgz
-_eclasses_=php-pear-r2 eb6928c33771db74564e814c5ca6c1b3
-_md5_=a64e39679efda95f9517507c1d207773
diff --git a/dev-php/PEAR-Net_DNS2/Manifest b/dev-php/PEAR-Net_DNS2/Manifest
new file mode 100644
index 000000000000..128d620fab61
--- /dev/null
+++ b/dev-php/PEAR-Net_DNS2/Manifest
@@ -0,0 +1,3 @@
+DIST Net_DNS2-1.4.4.tgz 83242 BLAKE2B 107e57406fcc308e3f83c71df0425081ba3d6638f457877e5ed42bfea8abed65ee520e228a379b71cc1462960e995d9c6592ad03afad78b36191f03d1f1513d6 SHA512 fa9df14585b3e41b13f4b52521b8fc05b239c39bccd4baf776dc632913777962dc527b9ff5de2337c9c0d78c6908d555d14167991dfe368426aee57a415f7e78
+EBUILD PEAR-Net_DNS2-1.4.4.ebuild 362 BLAKE2B 0b208e032ffb7a9b9deb45839b1e840f43df0961066bc3d9111894652d7168dbe260b2537b5df05bb96acd8e30b8b6d8c755e63278faf2fa652cb35c5c478436 SHA512 bec210587978a1523cbe6f9c4cb24e14dc870ac9d22921177524d7c4c333bbf4add241b5de24c2e5bef9ae0f61d827615c6bfbda0554a5da2b222811426420fe
+MISC metadata.xml 310 BLAKE2B c5dac87062361446d899a645418ae14a5fdb979f958087c4c2ef4cbe3afca4a37586a58bbeeede802af76f7f2d1c654eebb64eb17be4393359fffd1335faf2ef SHA512 897094fc61846e1417e87ea8c9d76f824babb9ffa1fab3ffb5a63f2ab1c24842ebcf360a33c971a172fde70017a179e23c2677d5eef5939c01bb132fb1aa1e4a
diff --git a/dev-php/PEAR-Net_DNS2/PEAR-Net_DNS2-1.4.4.ebuild b/dev-php/PEAR-Net_DNS2/PEAR-Net_DNS2-1.4.4.ebuild
new file mode 100644
index 000000000000..a4f4682ca495
--- /dev/null
+++ b/dev-php/PEAR-Net_DNS2/PEAR-Net_DNS2-1.4.4.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit php-pear-r2
+
+DESCRIPTION="Object-oriented PHP5 resolver library used to communicate with a DNS server"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-php/PEAR-PEAR >=dev-lang/php-5.3:*[sockets]"
+
+DOCS=( README.md )
diff --git a/dev-php/PEAR-Net_DNS2/metadata.xml b/dev-php/PEAR-Net_DNS2/metadata.xml
new file mode 100644
index 000000000000..d2a18e6d1465
--- /dev/null
+++ b/dev-php/PEAR-Net_DNS2/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ <name>PHP</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="pear">Net_DNS2</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-php/PEAR-Net_DNSBL-1.3.7-r1 b/dev-php/PEAR-Net_DNSBL-1.3.7-r1
deleted file mode 100644
index 2760090610ed..000000000000
--- a/dev-php/PEAR-Net_DNSBL-1.3.7-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=PHP library to query DNS blacklists
-EAPI=6
-HOMEPAGE=http://pear.php.net/package/Net_DNSBL
-IUSE=examples
-KEYWORDS=alpha amd64 hppa ia64 sparc x86
-LICENSE=PHP-3.01
-RDEPEND=dev-lang/php:* dev-php/PEAR-Cache_Lite dev-php/PEAR-HTTP_Request2 dev-php/PEAR-Net_DNS dev-php/PEAR-PEAR examples? ( dev-lang/php:*[cli] dev-php/PEAR-Console_Getopt )
-SLOT=0
-SRC_URI=http://download.pear.php.net/package/Net_DNSBL-1.3.7.tgz
-_md5_=fa91c73eb613929bc6e48b3de52db7eb
diff --git a/dev-php/PEAR-Net_DNSBL/Manifest b/dev-php/PEAR-Net_DNSBL/Manifest
new file mode 100644
index 000000000000..8aaa56b83078
--- /dev/null
+++ b/dev-php/PEAR-Net_DNSBL/Manifest
@@ -0,0 +1,3 @@
+DIST Net_DNSBL-1.3.7.tgz 8125 BLAKE2B 635258a5062ff0a7346b289f9cf429103690d71485417c948d7007e4b344dbadb25097d9f0c8731cb7eb5e72b3d7be561c7d872490d859a2328bb97f9a75350d SHA512 6591b81e5e4b98092daea3e27993099028581052a7907b79b4231d549b4d9aaa6fddbd53fd8bfe9734ae41fc85c46f2fc17e5ce50e8303fa5c166dd4b3062ea0
+EBUILD PEAR-Net_DNSBL-1.3.7-r1.ebuild 703 BLAKE2B 4823e290220831fa8cce86f4c70ad6072ec20a9af4cda8b96ade4fb905f3f142ccc629a9ecc1998f2f54ca55ad3e14c955df2f5b99ac006b78249bb3b3a6ca11 SHA512 35d4ed6b8d757d9ed3b1f8344ee8d4ea7fa122866d396a3a8fc311d8d364a51bcc67b4ad2ca3cccbfc1c8f9728652ccb32a1743853c4cd9e75005d631e1513a0
+MISC metadata.xml 377 BLAKE2B 27b6b2942faca1e2e82de44f5ad600bc3adf30660a0426187bcb9f5b626b19d4695cf847004f20f064461e59ac0e8272020c6c7a9a965a0873cb53c3a5976ec2 SHA512 6aa25d965c699af2196695de28f817426190fa58e7f19285e5130b538e1f650f526179c75f9a6b9b478a2099e400d42fcbe04e90ac987e9fa9bf5670dac0dafe
diff --git a/dev-php/PEAR-Net_DNSBL/PEAR-Net_DNSBL-1.3.7-r1.ebuild b/dev-php/PEAR-Net_DNSBL/PEAR-Net_DNSBL-1.3.7-r1.ebuild
new file mode 100644
index 000000000000..65ff5f9eda82
--- /dev/null
+++ b/dev-php/PEAR-Net_DNSBL/PEAR-Net_DNSBL-1.3.7-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PN="${PN/PEAR-/}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="PHP library to query DNS blacklists"
+HOMEPAGE="http://pear.php.net/package/${MY_PN}"
+SRC_URI="http://download.pear.php.net/package/${MY_P}.tgz"
+LICENSE="PHP-3.01"
+SLOT="0"
+KEYWORDS="alpha amd64 hppa ia64 sparc x86"
+IUSE="examples"
+RDEPEND="dev-lang/php:*
+ dev-php/PEAR-Cache_Lite
+ dev-php/PEAR-HTTP_Request2
+ dev-php/PEAR-Net_DNS
+ dev-php/PEAR-PEAR
+ examples? ( dev-lang/php:*[cli] dev-php/PEAR-Console_Getopt )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+ use examples && dodoc -r examples
+
+ insinto /usr/share/php
+ doins -r Net
+}
diff --git a/dev-php/PEAR-Net_DNSBL/metadata.xml b/dev-php/PEAR-Net_DNSBL/metadata.xml
new file mode 100644
index 000000000000..285f8e4bc995
--- /dev/null
+++ b/dev-php/PEAR-Net_DNSBL/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://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/Net_DNSBL</remote-id>
+ <remote-id type="pear">Net_DNSBL</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-php/PEAR-Net_IDNA2-0.2.0 b/dev-php/PEAR-Net_IDNA2-0.2.0
deleted file mode 100644
index 7cb57c0d87a9..000000000000
--- a/dev-php/PEAR-Net_IDNA2-0.2.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DESCRIPTION=Punycode encoding and decoding
-EAPI=6
-HOMEPAGE=https://pear.php.net/package/Net_IDNA2
-KEYWORDS=amd64 arm ~hppa ppc ppc64 ~sparc x86
-LICENSE=LGPL-2.1
-RDEPEND=>=dev-php/PEAR-PEAR-1.10.1 >=dev-php/pear-1.8.1
-SLOT=0
-SRC_URI=https://pear.php.net/get/Net_IDNA2-0.2.0.tgz
-_eclasses_=php-pear-r2 eb6928c33771db74564e814c5ca6c1b3
-_md5_=6bc6f5bbdc6762810c0933a8a0349596
diff --git a/dev-php/PEAR-Net_IDNA2/Manifest b/dev-php/PEAR-Net_IDNA2/Manifest
new file mode 100644
index 000000000000..fd43d56cde4d
--- /dev/null
+++ b/dev-php/PEAR-Net_IDNA2/Manifest
@@ -0,0 +1,3 @@
+DIST Net_IDNA2-0.2.0.tgz 24624 BLAKE2B c091a8f9c3c13105308f97c0e44c6abd80fed015617ba433d83d294efe69e5431ae5b92cb019e17a603a056ee644ae096359f6638bcee3aea8a53a86ea98f6a8 SHA512 728c79bd893d7202376cf9db7a285b69b6821db89621a454081f7c7b01123141950395106f11699c991733314a05f4810f3257dbab0b29592856b35dbb471e54
+EBUILD PEAR-Net_IDNA2-0.2.0.ebuild 304 BLAKE2B c5a8b0d50736b93e92b02e7a97fc3f23d05121c4905858969f9abf3ca27170f3a2a2429bb6e67ed91f19f93daa406c79362de644273b207da572f444c0bb4f6b SHA512 cbd3b91dc68381c2553f3aa5ff33e84a48aa5023076337caa477e2ddf599e6acdc987e86d7319a99fab729fc218d6aad003b76569613493808b9320d5284e192
+MISC metadata.xml 311 BLAKE2B 7d0d1642573ab0098a946a22188c08bc7c8cedc62850f3b55eba30f4cdfff8855e6c11319bf2b75933a6c2a4c087d68f90d8e1ed34011d159d50921137d86890 SHA512 5d05aa67ce365f0962cdd21e084d45e42753c346b79e6b757a2984115664507f1a63997a20cacfec9ab4fb4ff430b20c9f6b2e453b75314f033f5d93d1f28160
diff --git a/dev-php/PEAR-Net_IDNA2/PEAR-Net_IDNA2-0.2.0.ebuild b/dev-php/PEAR-Net_IDNA2/PEAR-Net_IDNA2-0.2.0.ebuild
new file mode 100644
index 000000000000..bcafc624a460
--- /dev/null
+++ b/dev-php/PEAR-Net_IDNA2/PEAR-Net_IDNA2-0.2.0.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit php-pear-r2
+
+DESCRIPTION="Punycode encoding and decoding"
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 arm ~hppa ppc ppc64 ~sparc x86"
+IUSE=""
+
+RDEPEND=">=dev-php/PEAR-PEAR-1.10.1"
diff --git a/dev-php/PEAR-Net_IDNA2/metadata.xml b/dev-php/PEAR-Net_IDNA2/metadata.xml
new file mode 100644
index 000000000000..9724e735d5c0
--- /dev/null
+++ b/dev-php/PEAR-Net_IDNA2/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ <name>PHP</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="pear">Net_IDNA2</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-php/PEAR-Net_IPv4-1.3.4-r1 b/dev-php/PEAR-Net_IPv4-1.3.4-r1
deleted file mode 100644
index 371b2013903b..000000000000
--- a/dev-php/PEAR-Net_IPv4-1.3.4-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DESCRIPTION=PEAR class for IP v4 calculations
-EAPI=6
-HOMEPAGE=https://pear.php.net/package/Net_IPv4
-KEYWORDS=amd64 x86
-LICENSE=PHP-3.01
-RDEPEND=>=dev-php/pear-1.8.1
-SLOT=0
-SRC_URI=https://pear.php.net/get/Net_IPv4-1.3.4.tgz
-_eclasses_=php-pear-r2 eb6928c33771db74564e814c5ca6c1b3
-_md5_=68819fd995d9e978e3748a4b526a7689
diff --git a/dev-php/PEAR-Net_IPv4/Manifest b/dev-php/PEAR-Net_IPv4/Manifest
new file mode 100644
index 000000000000..23b641ad03fb
--- /dev/null
+++ b/dev-php/PEAR-Net_IPv4/Manifest
@@ -0,0 +1,4 @@
+AUX remove_globals.patch 2824 BLAKE2B 188e43865818fb4df38daea1ff2f6f955c34340b439c0150a53d5ae313012cd6302d24082370cbad35716f7e030a3654548c926c4b0cfb57e0ad0d7e672887fc SHA512 93cd8a95d320a2c80822185fa7ca9be494decf65000b747e20bb75b887efa3d6e5e2b81ba1afdaccbcc9e6c1ea48f4c401ea96a0865dd1143a32fc92e8890c3b
+DIST Net_IPv4-1.3.4.tgz 5981 BLAKE2B 5002a06d30443cf809346351a6c57c1faf1be0e6531fc0c7609ad6a9575122c53fa1c3f2e6614b77401adcfcdc604ee6b8ce5538d92aa8f42e8bf709899a0cba SHA512 6b172e3d998232d53e56c2760282346e98307aefd47d5801a3803c3f55d5df3de26fe466d2594081a46f55bc59e1d040d8727b47cd9bcab1b132a31b4982bba1
+EBUILD PEAR-Net_IPv4-1.3.4-r1.ebuild 291 BLAKE2B 43dfbc68553873748d0940728229fb582bab9eeb59584c3ba6c63be49be3086189aee99dc8e3b76f867aafceab1ac4f5549d72f77444ff6a6918ffc387d4f7de SHA512 1b8f24d2f9f891ccf98bf2e85d3f7524eae7ab76ea8ee79b26871c487dd2577c4951bfa97e7cb55c0a347cdb8f75218207238bb336d2a0ebd35fce32afdfeb57
+MISC metadata.xml 235 BLAKE2B 5b10304feea18aae1822be7d29bcce06c8715193b14a3dd2c4d79eb75e2767670352e2ca11e06b9a10ec04b63020a18254cd167e6d6be9072f4a200ca5d11ec4 SHA512 0b3e95bbf68eddf74289dad50f8828cffce2d904ff6f9bd5468177de979677cac11da84d1e0302c52b72085915b9d1b3496107172e5726520d51dad1981daf64
diff --git a/dev-php/PEAR-Net_IPv4/PEAR-Net_IPv4-1.3.4-r1.ebuild b/dev-php/PEAR-Net_IPv4/PEAR-Net_IPv4-1.3.4-r1.ebuild
new file mode 100644
index 000000000000..1552ee3c9303
--- /dev/null
+++ b/dev-php/PEAR-Net_IPv4/PEAR-Net_IPv4-1.3.4-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit php-pear-r2
+
+DESCRIPTION="PEAR class for IP v4 calculations"
+
+LICENSE="PHP-3.01"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+PATCHES=( "${FILESDIR}/remove_globals.patch" )
diff --git a/dev-php/PEAR-Net_IPv4/files/remove_globals.patch b/dev-php/PEAR-Net_IPv4/files/remove_globals.patch
new file mode 100644
index 000000000000..2403deb0b4af
--- /dev/null
+++ b/dev-php/PEAR-Net_IPv4/files/remove_globals.patch
@@ -0,0 +1,96 @@
+diff -aurN a/Net/IPv4.php b/Net/IPv4.php
+--- a/Net/IPv4.php 2010-09-08 06:31:50.000000000 -0400
++++ b/Net/IPv4.php 2017-08-04 14:57:52.872878217 -0400
+@@ -32,7 +32,37 @@
+ *
+ * @global array $GLOBALS['Net_IPv4_Netmask_Map']
+ */
+-$GLOBALS['Net_IPv4_Netmask_Map'] = array(
++$GLOBALS['Net_IPv4_Netmask_Map'] = Net_IPv4::$Net_IPv4_Netmask_Map;
++// }}}
++// {{{ Net_IPv4
++
++/**
++* Class to provide IPv4 calculations
++*
++* Provides methods for validating IP addresses, calculating netmasks,
++* broadcast addresses, network addresses, conversion routines, etc.
++*
++* @category Net
++* @package Net_IPv4
++* @author Eric Kilfoil <edk@ypass.net>
++* @author Marco Kaiser <bate@php.net>
++* @author Florian Anderiasch <fa@php.net>
++* @copyright 1997-2005 The PHP Group
++* @license http://www.php.net/license/3_01.txt PHP License 3.01
++* @version CVS: @package_version@
++* @link http://pear.php.net/package/Net_IPv4
++* @access public
++*/
++class Net_IPv4
++{
++ // {{{ properties
++ var $ip = "";
++ var $bitmask = false;
++ var $netmask = "";
++ var $network = "";
++ var $broadcast = "";
++ var $long = 0;
++public static $Net_IPv4_Netmask_Map = array(
+ 0 => "0.0.0.0",
+ 1 => "128.0.0.0",
+ 2 => "192.0.0.0",
+@@ -67,35 +97,6 @@
+ 31 => "255.255.255.254",
+ 32 => "255.255.255.255"
+ );
+-// }}}
+-// {{{ Net_IPv4
+-
+-/**
+-* Class to provide IPv4 calculations
+-*
+-* Provides methods for validating IP addresses, calculating netmasks,
+-* broadcast addresses, network addresses, conversion routines, etc.
+-*
+-* @category Net
+-* @package Net_IPv4
+-* @author Eric Kilfoil <edk@ypass.net>
+-* @author Marco Kaiser <bate@php.net>
+-* @author Florian Anderiasch <fa@php.net>
+-* @copyright 1997-2005 The PHP Group
+-* @license http://www.php.net/license/3_01.txt PHP License 3.01
+-* @version CVS: @package_version@
+-* @link http://pear.php.net/package/Net_IPv4
+-* @access public
+-*/
+-class Net_IPv4
+-{
+- // {{{ properties
+- var $ip = "";
+- var $bitmask = false;
+- var $netmask = "";
+- var $network = "";
+- var $broadcast = "";
+- var $long = 0;
+
+ // }}}
+ // {{{ validateIP()
+@@ -154,7 +155,7 @@
+ */
+ function validateNetmask($netmask)
+ {
+- if (! in_array($netmask, $GLOBALS['Net_IPv4_Netmask_Map'])) {
++ if (! in_array($netmask, self::$Net_IPv4_Netmask_Map)) {
+ return false;
+ }
+ return true;
+@@ -264,7 +265,7 @@
+ */
+ function calculate()
+ {
+- $validNM = $GLOBALS['Net_IPv4_Netmask_Map'];
++ $validNM = self::$Net_IPv4_Netmask_Map;
+
+ if (! is_a($this, "net_ipv4")) {
+ $myself = new Net_IPv4;
diff --git a/dev-php/PEAR-Net_IPv4/metadata.xml b/dev-php/PEAR-Net_IPv4/metadata.xml
new file mode 100644
index 000000000000..aca42932b833
--- /dev/null
+++ b/dev-php/PEAR-Net_IPv4/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ <name>PHP</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-php/PEAR-Net_IPv6-1.3.0_beta3 b/dev-php/PEAR-Net_IPv6-1.3.0_beta3
deleted file mode 100644
index f4e521598a01..000000000000
--- a/dev-php/PEAR-Net_IPv6-1.3.0_beta3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm test
-DEPEND=test? ( dev-php/phpunit )
-DESCRIPTION=PEAR class for IP v6 calculations
-EAPI=6
-HOMEPAGE=https://pear.php.net/package/Net_IPv6
-IUSE=test
-KEYWORDS=~amd64 ~x86
-LICENSE=PHP-3.01
-RDEPEND=>=dev-php/pear-1.8.1
-SLOT=0
-SRC_URI=https://pear.php.net/get/Net_IPv6-1.3.0b3.tgz
-_eclasses_=php-pear-r2 eb6928c33771db74564e814c5ca6c1b3
-_md5_=6f7c92ac8d5787cfb8c4dc38ba894080
diff --git a/dev-php/PEAR-Net_IPv6/Manifest b/dev-php/PEAR-Net_IPv6/Manifest
new file mode 100644
index 000000000000..72a9fa4ac1d5
--- /dev/null
+++ b/dev-php/PEAR-Net_IPv6/Manifest
@@ -0,0 +1,3 @@
+DIST Net_IPv6-1.3.0b3.tgz 11030 BLAKE2B aefeac440451ea3a37c84dcbae52d9d068bed57d0e2e113683b48414b31d9d77bb28ab2fe89d482e377fbe987411ba836e65ffb00c91eb5060bd5d4945c899dc SHA512 77d30c18c00aa03207b58dc7e54553e4cb3f424dcc831c67ab1081cfbc0dee121998866e995bf0e0029e9de1a6e28acb57aed63c837e894beb6cf4a5d3f39231
+EBUILD PEAR-Net_IPv6-1.3.0_beta3.ebuild 390 BLAKE2B 3073333acebe97df33d864d7677e76653466733fd7dc5f2d54ab7298b9d8bf8c9bd28d8787b1bc381578777150b67eb1cc57710c82aff34e56bcfed1c1e762b7 SHA512 8c904528531141c83c72b4a84c25e15158fd71947d8bf4c2811e0fd5236d3f17cd1edbf88a3e37002d6aaa14096a29687bc4e931b8cc5f9c083bc1d15e7e4ac3
+MISC metadata.xml 310 BLAKE2B 1c437565e34cf4adbe817fee0039663e05c7e81dd2da8f133650503320040b0878e769bdf6c2ca010384c67fd6af547a9a7665cc15a6ee98caf0dc066ee0f920 SHA512 910fafc59d42416e896901f965523d543520e1967b24d90a54e84b7c9f7d5b8a46e02fe571c67d96a606361dbeb1952f82804ab90e9311de3fa7b7313776bfc6
diff --git a/dev-php/PEAR-Net_IPv6/PEAR-Net_IPv6-1.3.0_beta3.ebuild b/dev-php/PEAR-Net_IPv6/PEAR-Net_IPv6-1.3.0_beta3.ebuild
new file mode 100644
index 000000000000..8c14b64e0406
--- /dev/null
+++ b/dev-php/PEAR-Net_IPv6/PEAR-Net_IPv6-1.3.0_beta3.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PEAR_PV="${PV/_beta/b}"
+
+inherit php-pear-r2
+
+DESCRIPTION="PEAR class for IP v6 calculations"
+
+LICENSE="PHP-3.01"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND="test? ( dev-php/phpunit )"
+
+src_test() {
+ phpunit "--include-path=${S}" "${S}/tests/AllTests.php" || die
+}
diff --git a/dev-php/PEAR-Net_IPv6/metadata.xml b/dev-php/PEAR-Net_IPv6/metadata.xml
new file mode 100644
index 000000000000..40bf307f7a83
--- /dev/null
+++ b/dev-php/PEAR-Net_IPv6/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ <name>PHP</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="pear">Net_IPv6</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-php/PEAR-Net_LDAP2-2.2.0-r1 b/dev-php/PEAR-Net_LDAP2-2.2.0-r1
deleted file mode 100644
index 5b91b1939d36..000000000000
--- a/dev-php/PEAR-Net_LDAP2-2.2.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install test
-DEPEND=test? ( dev-lang/php:*[ldap] dev-php/PEAR-PEAR dev-php/phpunit )
-DESCRIPTION=OO interface for searching and manipulating LDAP-entries
-EAPI=6
-HOMEPAGE=https://pear.php.net/package/Net_LDAP2
-IUSE=examples test
-KEYWORDS=alpha amd64 arm hppa ppc ppc64 sparc x86
-LICENSE=LGPL-2.1
-RDEPEND=dev-lang/php:*[ldap] dev-php/PEAR-PEAR
-SLOT=0
-SRC_URI=http://download.pear.php.net/package/Net_LDAP2-2.2.0.tgz
-_md5_=d05d71869ee3c1f272e54d56aff9bc38
diff --git a/dev-php/PEAR-Net_LDAP2/Manifest b/dev-php/PEAR-Net_LDAP2/Manifest
new file mode 100644
index 000000000000..49f7e3f83646
--- /dev/null
+++ b/dev-php/PEAR-Net_LDAP2/Manifest
@@ -0,0 +1,3 @@
+DIST Net_LDAP2-2.2.0.tgz 97180 BLAKE2B d2af13f0723f0fe998ef6a1fdd83e664ff5dd16c04d793c4a0b9f233449f82cd16c3156b0f2fb47f26d693d423c9bf0f6fead695b898e89a9e16cae932cd5718 SHA512 9f2f80c31f8b05c032c3bf088e66de942a01eb8ad94037ac5a65d6c526e22ffd4efac053e07f85dcd2b729727cd0755339f8ed76aa5e77997488f27ce59637ca
+EBUILD PEAR-Net_LDAP2-2.2.0-r1.ebuild 722 BLAKE2B 81394809eb7d0942488f1cf16406005675a14a04ffe49c3c9d9ecfd6aa11574aac60e547e6d8515b6717c4ff112d0b83bfa148a3c9ff317a2208b1d7b7c14174 SHA512 07313de5871f9cef33be159b97112435296cf6d9fec22eac178030c2813e42292b82f095cd9506c43766fa23dd325c67408974f50dc9775ecb3eae582a0a7317
+MISC metadata.xml 311 BLAKE2B 62823d5e3195d3f703c214d2250a37832c982904772148388dc89751b3b7d6776e2253819738eeec24a550aaa00092ff91d78e6e1f5ee1475104aabf8028a4c2 SHA512 a885b79978595cef0b7f647b110fa2f5687b72202cf87abd3bf1068b38be8a8cc5e2866c54809a0cee7dc1058f7e9990d102e4b4312a9de96a9f961fdffe831b
diff --git a/dev-php/PEAR-Net_LDAP2/PEAR-Net_LDAP2-2.2.0-r1.ebuild b/dev-php/PEAR-Net_LDAP2/PEAR-Net_LDAP2-2.2.0-r1.ebuild
new file mode 100644
index 000000000000..006221f50898
--- /dev/null
+++ b/dev-php/PEAR-Net_LDAP2/PEAR-Net_LDAP2-2.2.0-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PN="${PN/PEAR-/}"
+KEYWORDS="alpha amd64 arm hppa ppc ppc64 sparc x86"
+DESCRIPTION="OO interface for searching and manipulating LDAP-entries"
+HOMEPAGE="https://pear.php.net/package/${MY_PN}"
+SRC_URI="http://download.pear.php.net/package/${MY_PN}-${PV}.tgz"
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="examples test"
+
+RDEPEND="dev-lang/php:*[ldap]
+ dev-php/PEAR-PEAR"
+DEPEND="test? ( ${RDEPEND} dev-php/phpunit )"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_install() {
+ use examples && dodoc -r doc/examples
+ dodoc doc/*.*
+ insinto /usr/share/php
+ doins -r Net
+}
+
+src_test() {
+ phpunit tests/ || die "test suite failed"
+}
diff --git a/dev-php/PEAR-Net_LDAP2/metadata.xml b/dev-php/PEAR-Net_LDAP2/metadata.xml
new file mode 100644
index 000000000000..0afa568d58b5
--- /dev/null
+++ b/dev-php/PEAR-Net_LDAP2/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ <name>PHP</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="pear">Net_LDAP2</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-php/PEAR-Net_LDAP3-1.0.5_pre20160405 b/dev-php/PEAR-Net_LDAP3-1.0.5_pre20160405
deleted file mode 100644
index 2e6c9cb5b5e8..000000000000
--- a/dev-php/PEAR-Net_LDAP3-1.0.5_pre20160405
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=PEAR:Net_LDAP2 successor, provides functionality for accessing LDAP
-EAPI=6
-HOMEPAGE=https://gitlab.com/roundcube/net_ldap3
-KEYWORDS=amd64 arm ~hppa ppc ppc64 ~sparc x86
-LICENSE=GPL-3
-RDEPEND=dev-lang/php:*[ldap] dev-php/PEAR-Net_LDAP2
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~pinkbyte/distfiles/snapshots/PEAR-Net_LDAP3-1.0.5_pre20160405.tar.gz
-_md5_=1d8cb6fa31aff0ad592d31aa9e3259d3
diff --git a/dev-php/PEAR-Net_LDAP3/Manifest b/dev-php/PEAR-Net_LDAP3/Manifest
new file mode 100644
index 000000000000..12e8c5bf7f7a
--- /dev/null
+++ b/dev-php/PEAR-Net_LDAP3/Manifest
@@ -0,0 +1,3 @@
+DIST PEAR-Net_LDAP3-1.0.5_pre20160405.tar.gz 37059 BLAKE2B bf73ff426b7260e65fe467643b238c4e7cfdb4409728b74e09820ade8b79d5ca75187952f2f945f941956bb372871015f9cddfd0ce2cfb892191f81615bc7ea8 SHA512 c24e3af5b8ae03ff598f05e64419ff23b6efe51f4e56a15492cd0f41b9fae815199057f63b12212f2d3707bd14cdbda75b03e6155d755bd6408739f987ccf75d
+EBUILD PEAR-Net_LDAP3-1.0.5_pre20160405.ebuild 533 BLAKE2B 254f366124434765ef33407d8a06492a1143d9775a97ba82096ea7cbc6f83b92284c0860cac03114685bcb2f01e95ff297f9bb08a00ad998058afb533ea29ceb SHA512 6430fcf83157e0550c2fdf8b9a87972c88ebada1be18b5b8bd9c75dbd0234bc5a1f69845130dbc0ae1ad8a0a071b662b2724ec14b7c076dddd387585dfd24027
+MISC metadata.xml 247 BLAKE2B 61049845c1ffb66aea9959f984983735ad8d7d9d37aab6da3a19951bbf8d67af657cacde1701da8a3dd93b0704c10430d511bea11d56bf98702950f0707436ec SHA512 96c55c2979dd6a4c4761fce9b5a0be387b11fcf197ef903d8680ae82f01a2caea93b1238bed1ac96d3eb250744e2149a507e0424ac017b4324f0806a54e72c4a
diff --git a/dev-php/PEAR-Net_LDAP3/PEAR-Net_LDAP3-1.0.5_pre20160405.ebuild b/dev-php/PEAR-Net_LDAP3/PEAR-Net_LDAP3-1.0.5_pre20160405.ebuild
new file mode 100644
index 000000000000..764c3f3f78b8
--- /dev/null
+++ b/dev-php/PEAR-Net_LDAP3/PEAR-Net_LDAP3-1.0.5_pre20160405.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="PEAR:Net_LDAP2 successor, provides functionality for accessing LDAP"
+HOMEPAGE="https://gitlab.com/roundcube/net_ldap3"
+SRC_URI="https://dev.gentoo.org/~pinkbyte/distfiles/snapshots/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 arm ~hppa ppc ppc64 ~sparc x86"
+
+RDEPEND="
+ dev-lang/php:*[ldap]
+ dev-php/PEAR-Net_LDAP2
+"
+
+S="${WORKDIR}"
+
+src_install() {
+ insinto "/usr/share/php"
+ doins -r lib/*
+}
diff --git a/dev-php/PEAR-Net_LDAP3/metadata.xml b/dev-php/PEAR-Net_LDAP3/metadata.xml
new file mode 100644
index 000000000000..5b159fbcadd1
--- /dev/null
+++ b/dev-php/PEAR-Net_LDAP3/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>pinkbyte@gentoo.org</email>
+ <name>Sergey Popov</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/dev-php/PEAR-Net_POP3-1.3.8-r1 b/dev-php/PEAR-Net_POP3-1.3.8-r1
deleted file mode 100644
index 65a70291b23c..000000000000
--- a/dev-php/PEAR-Net_POP3-1.3.8-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DESCRIPTION=Provides a POP3 class to access POP3 server
-EAPI=6
-HOMEPAGE=https://pear.php.net/package/Net_POP3
-IUSE=+sasl
-KEYWORDS=alpha amd64 hppa ia64 ppc ppc64 ~sparc x86
-LICENSE=BSD
-RDEPEND=>=dev-php/PEAR-Net_Socket-1.0.6-r1 sasl? ( >=dev-php/PEAR-Auth_SASL-1.0.2 ) >=dev-php/pear-1.8.1
-SLOT=0
-SRC_URI=https://pear.php.net/get/Net_POP3-1.3.8.tgz
-_eclasses_=php-pear-r2 eb6928c33771db74564e814c5ca6c1b3
-_md5_=50d1c04c4fad12d31cdcf7b547919aa6
diff --git a/dev-php/PEAR-Net_POP3/Manifest b/dev-php/PEAR-Net_POP3/Manifest
new file mode 100644
index 000000000000..49eb07d2b019
--- /dev/null
+++ b/dev-php/PEAR-Net_POP3/Manifest
@@ -0,0 +1,3 @@
+DIST Net_POP3-1.3.8.tgz 9657 BLAKE2B 83697be081976eb9b241bb2cee62edd509492d91a7343897bf427735dd5fb08ce5d22fcfa4aa1337a3dd90da3b72782e0837068727bf0aae3a33dee852b92799 SHA512 2f77b2e9c8df8974b19c66777b7664c9503c81856629e2aedc00536afa62baaa7579370119603559d74c1f3f6d57195851e9956020cf92c202af606933c48b13
+EBUILD PEAR-Net_POP3-1.3.8-r1.ebuild 422 BLAKE2B e4d44516a2e1e166145575d791b326e323c46ba97d14acc34103fbd9b878c42bf0fc2d7200c8b6ce130f63afc03d8c3104f0e622091f668f4a7f2a8be9798ef5 SHA512 d6453b5a437b92c69dec356c3127573e5ce226f919ead7e3d6bc449285e9c52e743e3658d1ac1fa46cebce1d9a31533408c252a9259972de24667e5a8a116619
+MISC metadata.xml 235 BLAKE2B 5b10304feea18aae1822be7d29bcce06c8715193b14a3dd2c4d79eb75e2767670352e2ca11e06b9a10ec04b63020a18254cd167e6d6be9072f4a200ca5d11ec4 SHA512 0b3e95bbf68eddf74289dad50f8828cffce2d904ff6f9bd5468177de979677cac11da84d1e0302c52b72085915b9d1b3496107172e5726520d51dad1981daf64
diff --git a/dev-php/PEAR-Net_POP3/PEAR-Net_POP3-1.3.8-r1.ebuild b/dev-php/PEAR-Net_POP3/PEAR-Net_POP3-1.3.8-r1.ebuild
new file mode 100644
index 000000000000..21fd10b08d2a
--- /dev/null
+++ b/dev-php/PEAR-Net_POP3/PEAR-Net_POP3-1.3.8-r1.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit php-pear-r2
+
+DESCRIPTION="Provides a POP3 class to access POP3 server"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 ~sparc x86"
+IUSE="+sasl"
+RDEPEND=">=dev-php/PEAR-Net_Socket-1.0.6-r1
+ sasl? ( >=dev-php/PEAR-Auth_SASL-1.0.2 )"
+HTML_DOCS=( docs/examples/Net_POP3_example.php )
diff --git a/dev-php/PEAR-Net_POP3/metadata.xml b/dev-php/PEAR-Net_POP3/metadata.xml
new file mode 100644
index 000000000000..aca42932b833
--- /dev/null
+++ b/dev-php/PEAR-Net_POP3/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ <name>PHP</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-php/PEAR-Net_Ping-2.4.5-r2 b/dev-php/PEAR-Net_Ping-2.4.5-r2
deleted file mode 100644
index 86cbae532ac5..000000000000
--- a/dev-php/PEAR-Net_Ping-2.4.5-r2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=OS independent wrapper class for executing ping calls
-EAPI=6
-HOMEPAGE=http://pear.php.net/package/Net_Ping
-IUSE=examples
-KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=PHP-3.01
-RDEPEND=dev-lang/php:* dev-php/PEAR-PEAR
-SLOT=0
-SRC_URI=http://download.pear.php.net/package/Net_Ping-2.4.5.tgz
-_md5_=8ce9be1d3eb54e8a50f876345061143e
diff --git a/dev-php/PEAR-Net_Ping/Manifest b/dev-php/PEAR-Net_Ping/Manifest
new file mode 100644
index 000000000000..e8cc9e25cbfa
--- /dev/null
+++ b/dev-php/PEAR-Net_Ping/Manifest
@@ -0,0 +1,3 @@
+DIST Net_Ping-2.4.5.tgz 9600 BLAKE2B 5fcfe6cf9e96406734e5d728f5e714932bc7c9622a944e3aba81a11cd0da2d8ff5e7026f59fa1224baee70ca295b1d9236503d423c25f1570b28b7332405a03a SHA512 92faf073cae8b98f3dad52602f1030948549df313cf0e317928183ccd9127add521c35b657586e13d7826138b0358cd7ef99419fadfaa5cc34160df379c246d2
+EBUILD PEAR-Net_Ping-2.4.5-r2.ebuild 616 BLAKE2B c0d8304e14c5917f2c97b9d6df2bd401526fd69fd2db60a547b635a8e274edda5ee2d77ed9d58912284b3d5af6ff67d7def94feaefeec5febdb1e8e529cf9d0d SHA512 885ebeb2dc6241587bb3ec2149e376e6d263976d2ec5fbb22921dd835b910f5bfeb70a4018049f5888cfea890973d3071aa0b6bff53929359345d566f7ea187a
+MISC metadata.xml 375 BLAKE2B ea74bb046763cf2db484a0c9ae02682614543552081af3b63a414730fb1dab47f0bf1e4215a9cc1bbdc74c562ecac66c92c9ec64b50317d6ebeffd4bd7cbcff6 SHA512 89f2a2093394ee1aaea0b6f2cae286624cd76606a6c9fe77936e0e776ff13b40b2c8f0b9b54488db9c3a5f2e201f9ebecc32632d942846580ba4ab54dd438026
diff --git a/dev-php/PEAR-Net_Ping/PEAR-Net_Ping-2.4.5-r2.ebuild b/dev-php/PEAR-Net_Ping/PEAR-Net_Ping-2.4.5-r2.ebuild
new file mode 100644
index 000000000000..4a750862439f
--- /dev/null
+++ b/dev-php/PEAR-Net_Ping/PEAR-Net_Ping-2.4.5-r2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PN="${PN/PEAR-/}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="OS independent wrapper class for executing ping calls"
+HOMEPAGE="http://pear.php.net/package/${MY_PN}"
+SRC_URI="http://download.pear.php.net/package/${MY_P}.tgz"
+LICENSE="PHP-3.01"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="examples"
+
+RDEPEND="dev-lang/php:*
+ dev-php/PEAR-PEAR"
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+ use examples && dodoc -r docs/examples
+
+ insinto /usr/share/php/Net
+ doins -r Ping.php
+}
diff --git a/dev-php/PEAR-Net_Ping/metadata.xml b/dev-php/PEAR-Net_Ping/metadata.xml
new file mode 100644
index 000000000000..89d951a346e0
--- /dev/null
+++ b/dev-php/PEAR-Net_Ping/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://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/Net_Ping</remote-id>
+ <remote-id type="pear">Net_Ping</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-php/PEAR-Net_SMTP-1.7.2-r3 b/dev-php/PEAR-Net_SMTP-1.7.2-r3
deleted file mode 100644
index a9a28aef9630..000000000000
--- a/dev-php/PEAR-Net_SMTP-1.7.2-r3
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=A PHP implementation of the SMTP protocol
-EAPI=6
-HOMEPAGE=http://pear.php.net/package/Net_SMTP
-IUSE=examples sasl
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86
-LICENSE=PHP-3.01
-RDEPEND=dev-lang/php:* dev-php/PEAR-Net_Socket dev-php/PEAR-PEAR sasl? ( dev-php/PEAR-Auth_SASL )
-SLOT=0
-SRC_URI=http://download.pear.php.net/package/Net_SMTP-1.7.2.tgz
-_md5_=818424b60fcaf20c927c78db1f93f6af
diff --git a/dev-php/PEAR-Net_SMTP-1.7.3 b/dev-php/PEAR-Net_SMTP-1.7.3
deleted file mode 100644
index 173937ac70cc..000000000000
--- a/dev-php/PEAR-Net_SMTP-1.7.3
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=A PHP implementation of the SMTP protocol
-EAPI=6
-HOMEPAGE=http://pear.php.net/package/Net_SMTP
-IUSE=examples sasl
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=PHP-3.01
-RDEPEND=dev-lang/php:* dev-php/PEAR-Net_Socket dev-php/PEAR-PEAR sasl? ( dev-php/PEAR-Auth_SASL )
-SLOT=0
-SRC_URI=http://download.pear.php.net/package/Net_SMTP-1.7.3.tgz
-_md5_=bbfcdf9feb11024e7e0cea489196ea74
diff --git a/dev-php/PEAR-Net_SMTP/Manifest b/dev-php/PEAR-Net_SMTP/Manifest
new file mode 100644
index 000000000000..85d9360075e7
--- /dev/null
+++ b/dev-php/PEAR-Net_SMTP/Manifest
@@ -0,0 +1,5 @@
+DIST Net_SMTP-1.7.2.tgz 14795 BLAKE2B e7be5c595e5eb9cd98c0cb82899545b02399ce3aedd35e419a451ad1aa3f4c3c36a10c212508795bc39a044c99206db5ad700f6e7c110eec3b68cb623af4e457 SHA512 06ab00a033709c5f4adc01fabe100ee0033b07e1c5633f995a672bf463484622a5bd976ada9932ee741ff593d739bd1172566f0a8446060bbccde71ea5b0160d
+DIST Net_SMTP-1.7.3.tgz 14855 BLAKE2B b6891196a6871adc3936c89507e3aef1f7d9af045acab09aba5f145a9d1e1da5cee2608873f7a42ebc1d00f99ec733823afe94e15c283245ed1bc035858d94a7 SHA512 b1c2be95c50151e91c2dcc7b9d98233504cc2389c01e4e42e752cba606355da616e570ca86042b68498aad63aaad14ea048b0a0e4e2baa802dc58c440eb60f15
+EBUILD PEAR-Net_SMTP-1.7.2-r3.ebuild 691 BLAKE2B d703b969fae98d38de638b56474188d211497c5c8b150c45650ac91e41d9fc83e3096f7b9650f464b2f415bbf6a2aaef3abad8cabdd51c7bb44a1de595206c77 SHA512 9db4278e3ba613e790653c561658db1159ababac4cd98ef4cdf05b643e77cd3bce515647ddd9ccd7540870c52fb18c7733e4e985c8552a9cb100eb398194fe94
+EBUILD PEAR-Net_SMTP-1.7.3.ebuild 700 BLAKE2B f5a783bf29c32267a09abd564b08a2c69592b4de6f3662b13db212a2d76b11052a24e806ca362417bf699bde87a213e78fdba9af361838de5e9cb504d707fd6b SHA512 cb2c1d5c34fc29083a4d443a027d327a1e77a3e2931d2ad869168d7c23c1478936e0ea3f57de7fc4a953debeae4686672b37f5387ba8c4644b683ea94f1f72f5
+MISC metadata.xml 375 BLAKE2B 278d413ce672aa49e6f7fa3af6743d10e859cc37d4d38907fd96fe6011b68db3f5065694f6d3dd2bf179481cb729088e7e2e55c6a326d992c85463b703561749 SHA512 458638cbc2f1289c26d7c67a7d8d99fd33f7b139513470bb48f5371c9a3842f8ff9db41460e3e38eee7049f7a3c2ce54a66f919ece83d9323dbed37b8ef5f7a4
diff --git a/dev-php/PEAR-Net_SMTP/PEAR-Net_SMTP-1.7.2-r3.ebuild b/dev-php/PEAR-Net_SMTP/PEAR-Net_SMTP-1.7.2-r3.ebuild
new file mode 100644
index 000000000000..fb0ffac40c6d
--- /dev/null
+++ b/dev-php/PEAR-Net_SMTP/PEAR-Net_SMTP-1.7.2-r3.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PN="${PN/PEAR-/}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A PHP implementation of the SMTP protocol"
+HOMEPAGE="http://pear.php.net/package/${MY_PN}"
+SRC_URI="http://download.pear.php.net/package/${MY_P}.tgz"
+LICENSE="PHP-3.01"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+IUSE="examples sasl"
+DEPEND=""
+RDEPEND="dev-lang/php:*
+ dev-php/PEAR-Net_Socket
+ dev-php/PEAR-PEAR
+ sasl? ( dev-php/PEAR-Auth_SASL )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+ dodoc docs/guide.txt
+ use examples && dodoc -r examples
+
+ insinto /usr/share/php
+ doins -r Net
+}
diff --git a/dev-php/PEAR-Net_SMTP/PEAR-Net_SMTP-1.7.3.ebuild b/dev-php/PEAR-Net_SMTP/PEAR-Net_SMTP-1.7.3.ebuild
new file mode 100644
index 000000000000..cf8c9391e1a8
--- /dev/null
+++ b/dev-php/PEAR-Net_SMTP/PEAR-Net_SMTP-1.7.3.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PN="${PN/PEAR-/}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A PHP implementation of the SMTP protocol"
+HOMEPAGE="http://pear.php.net/package/${MY_PN}"
+SRC_URI="http://download.pear.php.net/package/${MY_P}.tgz"
+LICENSE="PHP-3.01"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="examples sasl"
+DEPEND=""
+RDEPEND="dev-lang/php:*
+ dev-php/PEAR-Net_Socket
+ dev-php/PEAR-PEAR
+ sasl? ( dev-php/PEAR-Auth_SASL )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+ dodoc docs/guide.txt
+ use examples && dodoc -r examples
+
+ insinto /usr/share/php
+ doins -r Net
+}
diff --git a/dev-php/PEAR-Net_SMTP/metadata.xml b/dev-php/PEAR-Net_SMTP/metadata.xml
new file mode 100644
index 000000000000..698c67cb7239
--- /dev/null
+++ b/dev-php/PEAR-Net_SMTP/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://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/Net_SMTP</remote-id>
+ <remote-id type="pear">Net_SMTP</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-php/PEAR-Net_Sieve-1.5.2-r1 b/dev-php/PEAR-Net_Sieve-1.5.2-r1
deleted file mode 100644
index b0f6befc9c8e..000000000000
--- a/dev-php/PEAR-Net_Sieve-1.5.2-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=An API for talking to sieve (RFC 3028) servers
-EAPI=6
-HOMEPAGE=https://github.com/roundcube/Net_Sieve
-IUSE=sasl
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86
-LICENSE=BSD
-RDEPEND=dev-lang/php:* dev-php/PEAR-PEAR dev-php/PEAR-Net_Socket sasl? ( dev-php/PEAR-Auth_SASL )
-SLOT=0
-SRC_URI=https://github.com/roundcube/Net_Sieve/archive/1.5.2.tar.gz -> PEAR-Net_Sieve-1.5.2.tar.gz
-_md5_=42ee7c51b2ad73ed142e36f56b781a9a
diff --git a/dev-php/PEAR-Net_Sieve-1.5.4 b/dev-php/PEAR-Net_Sieve-1.5.4
deleted file mode 100644
index 5e67cfad223d..000000000000
--- a/dev-php/PEAR-Net_Sieve-1.5.4
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=An API for talking to sieve (RFC 3028) servers
-EAPI=6
-HOMEPAGE=https://github.com/roundcube/Net_Sieve
-IUSE=sasl
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=BSD
-RDEPEND=dev-lang/php:* dev-php/PEAR-PEAR dev-php/PEAR-Net_Socket sasl? ( dev-php/PEAR-Auth_SASL )
-SLOT=0
-SRC_URI=https://github.com/roundcube/Net_Sieve/archive/1.5.4.tar.gz -> PEAR-Net_Sieve-1.5.4.tar.gz
-_md5_=713a516e597bd06490afde2b2c4d8bf5
diff --git a/dev-php/PEAR-Net_Sieve/Manifest b/dev-php/PEAR-Net_Sieve/Manifest
new file mode 100644
index 000000000000..48b7bf2cc165
--- /dev/null
+++ b/dev-php/PEAR-Net_Sieve/Manifest
@@ -0,0 +1,5 @@
+DIST PEAR-Net_Sieve-1.5.2.tar.gz 16332 BLAKE2B 24d385225fbf3c4bf5612927826ced468ccb5addeac9cd49c6fb617304fa77f4a44a11e3adf09173f65315d8a0755e44e93d0a7ae1c60f1a954849bee2380053 SHA512 672d2f6f4c3241f748fbdebd804f2186dd2a5f8b7be6a75cb9187ed16e61502e4a338bfaa1815190b74ab534cb7277b534b0542309098797fcb63582dc81bdbe
+DIST PEAR-Net_Sieve-1.5.4.tar.gz 16306 BLAKE2B 6ecd4ef669211b01089f29c48735b7259c392510f09df9aa0f1126fef8e3ebbf83803ab47bdd37c9b798a2add4c3d19e1a04960290a202070e17ee1f8041d02d SHA512 c981ba421946cc1eb1f2101cf25cbfbbcf56b74f92a8a257b19a8b43fb04ad2d8c9d93a2f44903589bb6014c53cc6ae96c44b1c31c389510439f1f2da57b3353
+EBUILD PEAR-Net_Sieve-1.5.2-r1.ebuild 700 BLAKE2B 474ade8b8a9aa4445e6e41370edf2955a568f7d2fd740c9e0525973b98bffb05b6f7c5a78411efdee8219f125fecead7ae533bb3851386cde6c9ac10382b9df4 SHA512 79ea1973eb60388651cf6d5befd9204e8f3c023df85f19741aa13dbdb2c5778c2a7f10c4e720f29ca370361a70cbeb5a708c38ed3e9c0998149592f4fcdd2a81
+EBUILD PEAR-Net_Sieve-1.5.4.ebuild 709 BLAKE2B 204f4ed13839895c0745b4a75059fddba387ecf4b5e893b6adfe9cc8df0a2d19f36f6641e221771e9a60b0597de00600ecfd41a000a4f8b7f68fc67c363dd7e6 SHA512 4d124b7a7a68173d62cbeb40347f579b93a2134a067c4851e7857c764af7d1cbef2b3d757de2bfb3e9516f253ca2485b993cab6dd6b113835cbabe06850c0919
+MISC metadata.xml 333 BLAKE2B 5370e25ed57579f125ff29e312b12b52c76e121b83c6940bcc984e2084698ac5db9e6b9d07769f32464365171d7e06021b5674f71cbb2d465687409d4bab2679 SHA512 e8eead1b207a468cbde1939d92c40408ab9aecec4646e1fbba116fa2846340f7d9a14b4a10014021b85242f766b44ce2fc68c8111272943fbb3539885566e1a8
diff --git a/dev-php/PEAR-Net_Sieve/PEAR-Net_Sieve-1.5.2-r1.ebuild b/dev-php/PEAR-Net_Sieve/PEAR-Net_Sieve-1.5.2-r1.ebuild
new file mode 100644
index 000000000000..2d6a716f5d8c
--- /dev/null
+++ b/dev-php/PEAR-Net_Sieve/PEAR-Net_Sieve-1.5.2-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PN="${PN/PEAR-/}"
+
+DESCRIPTION="An API for talking to sieve (RFC 3028) servers"
+HOMEPAGE="https://github.com/roundcube/${MY_PN}"
+SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+IUSE="sasl"
+
+RDEPEND="dev-lang/php:*
+ dev-php/PEAR-PEAR
+ dev-php/PEAR-Net_Socket
+ sasl? ( dev-php/PEAR-Auth_SASL )"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_install() {
+ # Install into "Net" for backwards compatibility (that's where PEAR
+ # used to put things).
+ insinto /usr/share/php/Net
+ doins Sieve.php
+}
diff --git a/dev-php/PEAR-Net_Sieve/PEAR-Net_Sieve-1.5.4.ebuild b/dev-php/PEAR-Net_Sieve/PEAR-Net_Sieve-1.5.4.ebuild
new file mode 100644
index 000000000000..44df11c59f7c
--- /dev/null
+++ b/dev-php/PEAR-Net_Sieve/PEAR-Net_Sieve-1.5.4.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PN="${PN/PEAR-/}"
+
+DESCRIPTION="An API for talking to sieve (RFC 3028) servers"
+HOMEPAGE="https://github.com/roundcube/${MY_PN}"
+SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="sasl"
+
+RDEPEND="dev-lang/php:*
+ dev-php/PEAR-PEAR
+ dev-php/PEAR-Net_Socket
+ sasl? ( dev-php/PEAR-Auth_SASL )"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_install() {
+ # Install into "Net" for backwards compatibility (that's where PEAR
+ # used to put things).
+ insinto /usr/share/php/Net
+ doins Sieve.php
+}
diff --git a/dev-php/PEAR-Net_Sieve/metadata.xml b/dev-php/PEAR-Net_Sieve/metadata.xml
new file mode 100644
index 000000000000..db20b91b7df7
--- /dev/null
+++ b/dev-php/PEAR-Net_Sieve/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://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">roundcube/Net_Sieve</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-php/PEAR-Net_SmartIRC-1.1.10-r1 b/dev-php/PEAR-Net_SmartIRC-1.1.10-r1
deleted file mode 100644
index 8ac7bc8c4410..000000000000
--- a/dev-php/PEAR-Net_SmartIRC-1.1.10-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=PHP class to communicate with IRC networks
-EAPI=6
-HOMEPAGE=http://pear.php.net/package/Net_SmartIRC
-IUSE=doc examples
-KEYWORDS=alpha amd64 hppa ia64 ppc ppc64 sparc x86
-LICENSE=LGPL-2.1
-RDEPEND=dev-lang/php:*
-SLOT=0
-SRC_URI=https://github.com/pear/Net_SmartIRC/archive/v1.1.10.tar.gz -> Net_SmartIRC-1.1.10.tar.gz
-_md5_=04e449696d78bebdcfeb3ec43e50e98d
diff --git a/dev-php/PEAR-Net_SmartIRC-1.1.12 b/dev-php/PEAR-Net_SmartIRC-1.1.12
deleted file mode 100644
index d3c95ceba317..000000000000
--- a/dev-php/PEAR-Net_SmartIRC-1.1.12
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DESCRIPTION=PHP class to communicate with IRC networks
-EAPI=6
-HOMEPAGE=https://pear.php.net/package/Net_SmartIRC
-IUSE=doc examples
-KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=LGPL-2.1
-RDEPEND=>=dev-php/pear-1.8.1
-SLOT=0
-SRC_URI=https://pear.php.net/get/Net_SmartIRC-1.1.12.tgz
-_eclasses_=php-pear-r2 eb6928c33771db74564e814c5ca6c1b3
-_md5_=61687342b758415517841896efb688a7
diff --git a/dev-php/PEAR-Net_SmartIRC/Manifest b/dev-php/PEAR-Net_SmartIRC/Manifest
new file mode 100644
index 000000000000..c35962225df7
--- /dev/null
+++ b/dev-php/PEAR-Net_SmartIRC/Manifest
@@ -0,0 +1,5 @@
+DIST Net_SmartIRC-1.1.10.tar.gz 927009 BLAKE2B b410a0b4a02e60e27860f9c6b0ab8fecf4874273601694ad61dcf88a2e916aee20d1858cf951fffb229f4eac0c0ddda55530bb6840da3c7b741cf9ee3971f7b2 SHA512 16ad30d358af99f40c53a75cf5f1c944a3e68f4c1cffd586acd61ceed280d5d1fcd4f4d5e88db55f1f66c37c5b7f37aec2f45a26dc6b98860eacb42c9f3fbea5
+DIST Net_SmartIRC-1.1.12.tgz 166039 BLAKE2B 43aec437de08d6e0dd651b810b21b5fed5587e2e7e154fe4f078cc618ee501c3d962b824931558458895541ddc9dc46ec3b1f0356aac5b052dd63b498018bb47 SHA512 2da5f0f9ea9167dfd1490fb6ba1e97416c78389924f390030ba71ea28dc5b667451223daa7e3878cbae607159054d656534ff646636f8f5294eb0bda1b17074c
+EBUILD PEAR-Net_SmartIRC-1.1.10-r1.ebuild 774 BLAKE2B 640ed23e9f99b57056d92b502b0b9bf6816834a34d11329048dd0a6f95fd4e191b99db9f805bb701b97e43b38ec77ab2c8e71138ffeee0405f4df5e97edbb480 SHA512 8ee23e5be03c0e64b69d4d5b0405e66cbceea14cfd508ee619c7731e1ac12257816f48171ca31b1969210ca74920bb11d68c6d690b4f2ed6ac75533fdf460bba
+EBUILD PEAR-Net_SmartIRC-1.1.12.ebuild 545 BLAKE2B 80991f66ddd016eacdbf1c1d1b9232bf15a507e04e4ca530f0a78d135187c1a944cb7cf57e88a4266e45a0c20c76b74b720ee733daf6562e5fc303c978e75c64 SHA512 aea02f3d6ac0e4fd6b8fa92730162e6fe07e1e6299d084f8260cead0b2e8b6d982644ed4d37cb8c8ceeb296bf118b88f8913005d81b8e972e060885aeb56d4fe
+MISC metadata.xml 383 BLAKE2B ab5de001d8fe2ec2f6beaf3b457f5296123b286b335b3910ea58eadefe3369ab4fba6ad34fd1262ae465e2e521251b8034c046d1cbaf35afe819717d709917a7 SHA512 083df49fdd76cb7e00bb81b6501d0f475788cef1da463919fc35abc6d0725cda8b47fa027a1a3f6af4872897567b8ba8104463be276a1524182138bdc15d04c0
diff --git a/dev-php/PEAR-Net_SmartIRC/PEAR-Net_SmartIRC-1.1.10-r1.ebuild b/dev-php/PEAR-Net_SmartIRC/PEAR-Net_SmartIRC-1.1.10-r1.ebuild
new file mode 100644
index 000000000000..3801bdab55a3
--- /dev/null
+++ b/dev-php/PEAR-Net_SmartIRC/PEAR-Net_SmartIRC-1.1.10-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PN="${PN/PEAR-/}"
+MY_P="${MY_PN}-${PV}"
+
+HOMEPAGE="http://pear.php.net/package/${MY_PN}"
+# The PEAR tarball is missing some docs as of v1.10.0.
+SRC_URI="https://github.com/pear/${MY_PN}/archive/v${PV}.tar.gz
+ -> ${MY_P}.tar.gz"
+DESCRIPTION="PHP class to communicate with IRC networks"
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
+IUSE="doc examples"
+
+RDEPEND="dev-lang/php:*"
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+ dodoc CREDITS FEATURES docs/HOWTO README.md TODO
+ use examples && dodoc -r docs/examples
+
+ if use doc; then
+ dodoc docs/DOCUMENTATION
+ dodoc -r docs/HTML
+ fi
+
+ insinto /usr/share/php
+ doins -r Net
+}
diff --git a/dev-php/PEAR-Net_SmartIRC/PEAR-Net_SmartIRC-1.1.12.ebuild b/dev-php/PEAR-Net_SmartIRC/PEAR-Net_SmartIRC-1.1.12.ebuild
new file mode 100644
index 000000000000..41aa7dab2408
--- /dev/null
+++ b/dev-php/PEAR-Net_SmartIRC/PEAR-Net_SmartIRC-1.1.12.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit php-pear-r2
+
+DESCRIPTION="PHP class to communicate with IRC networks"
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc examples"
+DOCS=( CREDITS FEATURES docs/HOWTO README.md )
+
+src_install() {
+ local HTML_DOCS=( )
+ use examples && HTML_DOCS+=( docs/examples/ )
+
+ if use doc; then
+ DOCS+=( docs/DOCUMENTATION )
+ HTML_DOCS+=( docs/HTML/* )
+ fi
+ php-pear-r2_src_install
+}
diff --git a/dev-php/PEAR-Net_SmartIRC/metadata.xml b/dev-php/PEAR-Net_SmartIRC/metadata.xml
new file mode 100644
index 000000000000..67ea094e12f2
--- /dev/null
+++ b/dev-php/PEAR-Net_SmartIRC/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://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/Net_SmartIRC</remote-id>
+ <remote-id type="pear">Net_SmartIRC</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-php/PEAR-Net_Socket-1.2.2 b/dev-php/PEAR-Net_Socket-1.2.2
deleted file mode 100644
index 4cd1704aef40..000000000000
--- a/dev-php/PEAR-Net_Socket-1.2.2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DESCRIPTION=PHP class interface to TCP sockets
-EAPI=6
-HOMEPAGE=https://pear.php.net/package/Net_Socket
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86
-LICENSE=BSD-2
-RDEPEND=>=dev-php/PEAR-PEAR-1.10.1 >=dev-php/pear-1.8.1
-SLOT=0
-SRC_URI=https://pear.php.net/get/Net_Socket-1.2.2.tgz
-_eclasses_=php-pear-r2 eb6928c33771db74564e814c5ca6c1b3
-_md5_=e30a08dd917854e92fd4766e2c983ed7
diff --git a/dev-php/PEAR-Net_Socket/Manifest b/dev-php/PEAR-Net_Socket/Manifest
new file mode 100644
index 000000000000..5a667b7cf6ec
--- /dev/null
+++ b/dev-php/PEAR-Net_Socket/Manifest
@@ -0,0 +1,3 @@
+DIST Net_Socket-1.2.2.tgz 6903 BLAKE2B a0ee530ebb2962de8560d5cb2147ee831d62c5deac056a7f4944b451853b3ab65f1f46332700d4e18a1ff6e1cce138bf46f5053586bc7f8073143c6aa101e9c6 SHA512 fd415fbd4a6801b63cda3168ff275fdeae233a3cc4c62f9bfe561f83f24f89795a7e7ad862641a73bb6d6e3c0da8b56cd00e7e7a1db616de040ea7883d84caa5
+EBUILD PEAR-Net_Socket-1.2.2.ebuild 333 BLAKE2B 8d603b96f43de495426a1c15dbc8545bc2e62681fd6214a0d7232ee7602e0fbb0991273c97520f176ddd1690f18a204181709481e3d8a2f2bd55acc249a5f382 SHA512 5c5771b9fbacaaa7cd99707982fb11fd0027a71c93512fc03ffb293ee82034e7012025ce6b080e40833f5d1087ff409ef537518375d2958e7c59708357e12dbb
+MISC metadata.xml 379 BLAKE2B 233538cb7305e5b6f2cad2b743cbae9116c3307b72ae0645e34fdaf76f72b1fcbe9618f4ba35ab5b3942bbc2a5fd7491e4cfcd7d63f1074fd50e27552a0003d6 SHA512 bde8388227ab4467df4613b0ab02b20286f3700c3c48649dd445085c98f9885f7e46603b2977ff539e5b2577c6f703c7d397a5b0a14538f093698aaa0662deb0
diff --git a/dev-php/PEAR-Net_Socket/PEAR-Net_Socket-1.2.2.ebuild b/dev-php/PEAR-Net_Socket/PEAR-Net_Socket-1.2.2.ebuild
new file mode 100644
index 000000000000..da84124a22fb
--- /dev/null
+++ b/dev-php/PEAR-Net_Socket/PEAR-Net_Socket-1.2.2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit php-pear-r2
+
+DESCRIPTION="PHP class interface to TCP sockets"
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+IUSE=""
+DEPEND=""
+RDEPEND=">=dev-php/PEAR-PEAR-1.10.1"
diff --git a/dev-php/PEAR-Net_Socket/metadata.xml b/dev-php/PEAR-Net_Socket/metadata.xml
new file mode 100644
index 000000000000..c548abcd6a8c
--- /dev/null
+++ b/dev-php/PEAR-Net_Socket/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://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/Net_Socket</remote-id>
+ <remote-id type="pear">Net_Socket</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-php/PEAR-Net_Traceroute-0.21.3-r1 b/dev-php/PEAR-Net_Traceroute-0.21.3-r1
deleted file mode 100644
index ba5ef2c830bd..000000000000
--- a/dev-php/PEAR-Net_Traceroute-0.21.3-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DESCRIPTION=OS independet wrapper class for executing traceroute calls
-EAPI=6
-HOMEPAGE=https://pear.php.net/package/Net_Traceroute
-KEYWORDS=amd64 x86
-LICENSE=PHP-3.01
-RDEPEND=>=dev-php/pear-1.8.1
-SLOT=0
-SRC_URI=https://pear.php.net/get/Net_Traceroute-0.21.3.tgz
-_eclasses_=php-pear-r2 eb6928c33771db74564e814c5ca6c1b3
-_md5_=5d0ed792541d0c435a190aa5aa04432a
diff --git a/dev-php/PEAR-Net_Traceroute/Manifest b/dev-php/PEAR-Net_Traceroute/Manifest
new file mode 100644
index 000000000000..f6729fcca7c5
--- /dev/null
+++ b/dev-php/PEAR-Net_Traceroute/Manifest
@@ -0,0 +1,3 @@
+DIST Net_Traceroute-0.21.3.tgz 6754 BLAKE2B e74c46888425e8d28cba25065a465a07f0c8ef7fb1776ac5164e26f99b1b62b9b7bf540a6d0d1b255b76bb5f64fa5f9edd6dff7fd280e2d037310d7a622b770b SHA512 feceaaf188bff947253ec77804f7a4314a855864c09fc75e6c733fd852671994fb1c71d8ee2ba92ba7eff395b0b27fae71c361a69f2df4cfa20ef68f68074e4f
+EBUILD PEAR-Net_Traceroute-0.21.3-r1.ebuild 491 BLAKE2B 4c3c2fc9573731ff1c76f6deb905ce199388063a7bbb1e9fe500034016f5b2fb86499868bbc0fe66518e2406eff71675999ab3227b1b6ee0d747e34841444570 SHA512 b5f43b9afcf4f38a24d37f64ee0b5012d57e18457ce71e1c82112c9bb8388ff13aec04d604462d0c154ea47eddfca4c330685bd39ccc647b36e15c4a94d0efaf
+MISC metadata.xml 235 BLAKE2B 5b10304feea18aae1822be7d29bcce06c8715193b14a3dd2c4d79eb75e2767670352e2ca11e06b9a10ec04b63020a18254cd167e6d6be9072f4a200ca5d11ec4 SHA512 0b3e95bbf68eddf74289dad50f8828cffce2d904ff6f9bd5468177de979677cac11da84d1e0302c52b72085915b9d1b3496107172e5726520d51dad1981daf64
diff --git a/dev-php/PEAR-Net_Traceroute/PEAR-Net_Traceroute-0.21.3-r1.ebuild b/dev-php/PEAR-Net_Traceroute/PEAR-Net_Traceroute-0.21.3-r1.ebuild
new file mode 100644
index 000000000000..6a3175afbf7f
--- /dev/null
+++ b/dev-php/PEAR-Net_Traceroute/PEAR-Net_Traceroute-0.21.3-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit php-pear-r2
+
+KEYWORDS="amd64 x86"
+
+DESCRIPTION="OS independet wrapper class for executing traceroute calls"
+LICENSE="PHP-3.01"
+SLOT="0"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+src_install() {
+ local DOCS=( docs/README docs/TODO )
+ local HTML_DOCS=( docs/examples/example1.php )
+ insinto /usr/share/php/Net
+ doins Traceroute.php
+ php-pear-r2_install_packagexml
+ einstalldocs
+}
diff --git a/dev-php/PEAR-Net_Traceroute/metadata.xml b/dev-php/PEAR-Net_Traceroute/metadata.xml
new file mode 100644
index 000000000000..aca42932b833
--- /dev/null
+++ b/dev-php/PEAR-Net_Traceroute/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ <name>PHP</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-php/PEAR-Net_URL-1.0.15-r1 b/dev-php/PEAR-Net_URL-1.0.15-r1
deleted file mode 100644
index e99f8bce3f1d..000000000000
--- a/dev-php/PEAR-Net_URL-1.0.15-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DESCRIPTION=Easy parsing of URLs
-EAPI=6
-HOMEPAGE=https://pear.php.net/package/Net_URL
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86
-LICENSE=BSD
-RDEPEND=>=dev-php/pear-1.8.1
-SLOT=0
-SRC_URI=https://pear.php.net/get/Net_URL-1.0.15.tgz
-_eclasses_=php-pear-r2 eb6928c33771db74564e814c5ca6c1b3
-_md5_=f4d9d5030253ba41adb13ae80fddc60e
diff --git a/dev-php/PEAR-Net_URL/Manifest b/dev-php/PEAR-Net_URL/Manifest
new file mode 100644
index 000000000000..1770353269a8
--- /dev/null
+++ b/dev-php/PEAR-Net_URL/Manifest
@@ -0,0 +1,3 @@
+DIST Net_URL-1.0.15.tgz 6303 BLAKE2B d4b89e6d5932d1494471a3d373c069bc02f6c70f59908b6db2087c88dc90b999206901c8c42a521221ff868d2e21cad3473bb33262e816c14a0ef90c6b5bc4c9 SHA512 ea61e0dc603a4dc38fd6f4d2fa3d897d3b449a6ed19fa21ed1758b1945765405855058b70a4f9d46bb9abeb238c5e4fe9d2625774e6d5af6ba7ebc1c8f14154c
+EBUILD PEAR-Net_URL-1.0.15-r1.ebuild 417 BLAKE2B b9691d77fb0ccc9454bb0a742625bc48e1aa70e028b50ca6bbca66c7e1539d0d5abd4fa7dc164f5a24133775f8ea7b0b0c6265b031a71e0dc30aa2d6072da6c2 SHA512 5496562f1f2f4814db8c215ddec69c3c929a92a97776f3ecf0bca06bd2ff8cc48a88bd1c1307abc5cd8777ec0adae85245c4e1953d9181b3a99ecab31c004afa
+MISC metadata.xml 235 BLAKE2B 5b10304feea18aae1822be7d29bcce06c8715193b14a3dd2c4d79eb75e2767670352e2ca11e06b9a10ec04b63020a18254cd167e6d6be9072f4a200ca5d11ec4 SHA512 0b3e95bbf68eddf74289dad50f8828cffce2d904ff6f9bd5468177de979677cac11da84d1e0302c52b72085915b9d1b3496107172e5726520d51dad1981daf64
diff --git a/dev-php/PEAR-Net_URL/PEAR-Net_URL-1.0.15-r1.ebuild b/dev-php/PEAR-Net_URL/PEAR-Net_URL-1.0.15-r1.ebuild
new file mode 100644
index 000000000000..01735e4a0e2b
--- /dev/null
+++ b/dev-php/PEAR-Net_URL/PEAR-Net_URL-1.0.15-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit php-pear-r2
+
+DESCRIPTION="Easy parsing of URLs"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+IUSE=""
+
+src_install() {
+ local HTML_DOCS=( docs/example.php )
+ insinto /usr/share/php/Net
+ doins URL.php
+ php-pear-r2_install_packagexml
+ einstalldocs
+}
diff --git a/dev-php/PEAR-Net_URL/metadata.xml b/dev-php/PEAR-Net_URL/metadata.xml
new file mode 100644
index 000000000000..aca42932b833
--- /dev/null
+++ b/dev-php/PEAR-Net_URL/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ <name>PHP</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-php/PEAR-Net_URL2-2.2.1-r2 b/dev-php/PEAR-Net_URL2-2.2.1-r2
deleted file mode 100644
index a36b6d8282a9..000000000000
--- a/dev-php/PEAR-Net_URL2-2.2.1-r2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DESCRIPTION=Easy parsing of URLs (PHP5 port of PEAR-Net_URL package)
-EAPI=6
-HOMEPAGE=https://pear.php.net/package/Net_URL2
-KEYWORDS=alpha amd64 ~arm hppa ia64 ~ppc ~ppc64 ~s390 ~sh sparc x86
-LICENSE=BSD
-RDEPEND=>=dev-php/pear-1.8.1
-SLOT=0
-SRC_URI=https://pear.php.net/get/Net_URL2-2.2.1.tgz
-_eclasses_=php-pear-r2 eb6928c33771db74564e814c5ca6c1b3
-_md5_=38c878f9373b6d8f31941461b7ea2ef3
diff --git a/dev-php/PEAR-Net_URL2/Manifest b/dev-php/PEAR-Net_URL2/Manifest
new file mode 100644
index 000000000000..f22e2718364a
--- /dev/null
+++ b/dev-php/PEAR-Net_URL2/Manifest
@@ -0,0 +1,3 @@
+DIST Net_URL2-2.2.1.tgz 20010 BLAKE2B 5c8e5db577ad01dd247b72f82b9014e7cc4ef94955566b65b4210c7371702de8b1b67aa2d8bee27c5d88cabec069e3a334630429547dce2e611ce0da40210b08 SHA512 356eebcb7b077e8a57d19f7a0549c973fe4923fbd83836ac000c1068d7f19c42ebebef5e07a2a5880737d0f8b2398bb32be9fa97ef931a1009d6229dfd71b495
+EBUILD PEAR-Net_URL2-2.2.1-r2.ebuild 350 BLAKE2B bb66d797346fbefce7ca25cd52f5e1abf553d11a3a56d8bd80916f1c8f103c6ab14c2f45cd3fb20d2b2d92f4bcc57bf743dd8693177edb37a3c66a7b33491490 SHA512 ac2b57aab639cead7b1e11ef66adc7e3421bf1fcbcdbaf93fcb247450f83d8bbfe6c880db8152f30e5949624a47a2642738cce43645807174607ed3aa5ae43ca
+MISC metadata.xml 310 BLAKE2B ceeffe3f581bffc5354ffa5ae85c80bf3395578d2300566cab9ae2405485c06bb02d6a55eed89d33eb2af4be3e668073d6fed96614b4a40390ec5339f243f8be SHA512 ee52f22f04cecdd1a9cb93ad11d75a8e9889f988e189995707c28a3923bdac05c330c8f9e658717e3d0713b5f1dcdc772f4ec31fa216ee15006bc67340fcd84a
diff --git a/dev-php/PEAR-Net_URL2/PEAR-Net_URL2-2.2.1-r2.ebuild b/dev-php/PEAR-Net_URL2/PEAR-Net_URL2-2.2.1-r2.ebuild
new file mode 100644
index 000000000000..d890e9908e84
--- /dev/null
+++ b/dev-php/PEAR-Net_URL2/PEAR-Net_URL2-2.2.1-r2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit php-pear-r2
+
+DESCRIPTION="Easy parsing of URLs (PHP5 port of PEAR-Net_URL package)"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ~ppc ~ppc64 ~s390 ~sh sparc x86"
+IUSE=""
+
+DOCS=( docs/6470.php docs/example.php )
diff --git a/dev-php/PEAR-Net_URL2/metadata.xml b/dev-php/PEAR-Net_URL2/metadata.xml
new file mode 100644
index 000000000000..5a48f3cfcb85
--- /dev/null
+++ b/dev-php/PEAR-Net_URL2/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ <name>PHP</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="pear">Net_URL2</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-php/PEAR-Net_UserAgent_Detect-2.5.2-r1 b/dev-php/PEAR-Net_UserAgent_Detect-2.5.2-r1
deleted file mode 100644
index 349975f56824..000000000000
--- a/dev-php/PEAR-Net_UserAgent_Detect-2.5.2-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DESCRIPTION=Determines Web browser, version, and platform from an HTTP user agent string
-EAPI=6
-HOMEPAGE=https://pear.php.net/package/Net_UserAgent_Detect
-KEYWORDS=alpha amd64 hppa ia64 ppc ppc64 sparc x86
-LICENSE=PHP-2.02
-RDEPEND=>=dev-php/pear-1.8.1
-SLOT=0
-SRC_URI=https://pear.php.net/get/Net_UserAgent_Detect-2.5.2.tgz
-_eclasses_=php-pear-r2 eb6928c33771db74564e814c5ca6c1b3
-_md5_=66a5506585d3c5d0d806862e46de7d16
diff --git a/dev-php/PEAR-Net_UserAgent_Detect/Manifest b/dev-php/PEAR-Net_UserAgent_Detect/Manifest
new file mode 100644
index 000000000000..ed0e5140fb0a
--- /dev/null
+++ b/dev-php/PEAR-Net_UserAgent_Detect/Manifest
@@ -0,0 +1,3 @@
+DIST Net_UserAgent_Detect-2.5.2.tgz 11986 BLAKE2B 5a0d6dbcb07765d3f2f646500b2d5dada4b0e030c8173f988bc0a0ccea13d50cf69071c8a385fb6a7b821304dd072751b7ed22649899b371605fa289c7788ff5 SHA512 c97069ff6d99f78d580426751849cff865a50e63f55fc4596894b49604977fccc14d0eb269a66ebf56dfe89c67cb733b0ab8827766d3511a9bc6a05be2baa060
+EBUILD PEAR-Net_UserAgent_Detect-2.5.2-r1.ebuild 488 BLAKE2B 2f569e4ad141d829d0f207f083fb13deb03e11d87cef7ca0570b001d7d3d60b08f51521b5bd5db23edef43884b6aac0d78302672e92f45a05630321ce66c3573 SHA512 67a458088efc94c42d7ab43a03ee2cf765ad89af766cf5bdaf3e3d8ce68d245f4bccefd98f0f2079f79c04d920b5cc458fbb50b29923cd8223566cbfe3525f38
+MISC metadata.xml 235 BLAKE2B 5b10304feea18aae1822be7d29bcce06c8715193b14a3dd2c4d79eb75e2767670352e2ca11e06b9a10ec04b63020a18254cd167e6d6be9072f4a200ca5d11ec4 SHA512 0b3e95bbf68eddf74289dad50f8828cffce2d904ff6f9bd5468177de979677cac11da84d1e0302c52b72085915b9d1b3496107172e5726520d51dad1981daf64
diff --git a/dev-php/PEAR-Net_UserAgent_Detect/PEAR-Net_UserAgent_Detect-2.5.2-r1.ebuild b/dev-php/PEAR-Net_UserAgent_Detect/PEAR-Net_UserAgent_Detect-2.5.2-r1.ebuild
new file mode 100644
index 000000000000..547bbb1e0ad4
--- /dev/null
+++ b/dev-php/PEAR-Net_UserAgent_Detect/PEAR-Net_UserAgent_Detect-2.5.2-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit php-pear-r2
+
+DESCRIPTION="Determines Web browser, version, and platform from an HTTP user agent string"
+
+LICENSE="PHP-2.02"
+SLOT="0"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
+IUSE=""
+
+src_install() {
+ local HTML_DOCS=( tests/example.php )
+ insinto /usr/share/php/Net/UserAgent
+ doins -r Detect Detect.php
+ php-pear-r2_install_packagexml
+ einstalldocs
+}
diff --git a/dev-php/PEAR-Net_UserAgent_Detect/metadata.xml b/dev-php/PEAR-Net_UserAgent_Detect/metadata.xml
new file mode 100644
index 000000000000..aca42932b833
--- /dev/null
+++ b/dev-php/PEAR-Net_UserAgent_Detect/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ <name>PHP</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-php/PEAR-Numbers_Words-0.18.1-r1 b/dev-php/PEAR-Numbers_Words-0.18.1-r1
deleted file mode 100644
index 0d57a4b0d0b5..000000000000
--- a/dev-php/PEAR-Numbers_Words-0.18.1-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install test
-DEPEND=test? ( dev-lang/php:* dev-php/PEAR-Math_BigInteger dev-php/phpunit )
-DESCRIPTION=Provides methods for spelling numerals in words
-EAPI=6
-HOMEPAGE=http://pear.php.net/package/Numbers_Words
-IUSE=test
-KEYWORDS=alpha amd64 hppa ia64 ppc ppc64 sparc x86
-LICENSE=PHP-3.01
-RDEPEND=dev-lang/php:* dev-php/PEAR-Math_BigInteger
-SLOT=0
-SRC_URI=http://download.pear.php.net/package/Numbers_Words-0.18.1.tgz
-_md5_=11027944426635bf6bcf10cc191ba218
diff --git a/dev-php/PEAR-Numbers_Words-0.18.2 b/dev-php/PEAR-Numbers_Words-0.18.2
deleted file mode 100644
index d19c78a33a5c..000000000000
--- a/dev-php/PEAR-Numbers_Words-0.18.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm test
-DEPEND=test? ( dev-php/PEAR-Math_BigInteger dev-php/phpunit )
-DESCRIPTION=Provides methods for spelling numerals in words
-EAPI=6
-HOMEPAGE=http://pear.php.net/package/Numbers_Words
-IUSE=test
-KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=PHP-3.01
-RDEPEND=dev-php/PEAR-Math_BigInteger >=dev-php/pear-1.8.1
-SLOT=0
-SRC_URI=https://pear.php.net/get/Numbers_Words-0.18.2.tgz
-_eclasses_=php-pear-r2 eb6928c33771db74564e814c5ca6c1b3
-_md5_=067caeaf3d714cfc9e37e487484f3b7f
diff --git a/dev-php/PEAR-Numbers_Words/Manifest b/dev-php/PEAR-Numbers_Words/Manifest
new file mode 100644
index 000000000000..726714dcbd07
--- /dev/null
+++ b/dev-php/PEAR-Numbers_Words/Manifest
@@ -0,0 +1,5 @@
+DIST Numbers_Words-0.18.1.tgz 72925 BLAKE2B 2dd624fe4ede72c00f68f259c0271ca405e76bab6b43d85024cfa70b74e50e9ac5fbccd7e770c90ac4bcc5eabbdc33ccc9bc6b691e0da2b9a05ee5a141a0d8ac SHA512 b6063db873d65bc872ea64e6ae4282da9b36aa15ac336a5b443e4bc3cc7ad49538327bb56d0b70a482c82dfa1d732426f9cc45453d4d13a25a840871e1f6fb2c
+DIST Numbers_Words-0.18.2.tgz 73113 BLAKE2B e64fd1fcd8017b1768bc0e8918a79a91b83711433d0a29d36b145fdc07cee8cc3149a31d8e3739bd59ee57a821aafd8532fd8a54684da7e2395463662b733335 SHA512 cc719ea47e7da365959a02106d80aabe2ed079064128af1a61c0c53ed44726e7169de5c9d8dd28cbf917e025841e9aa07b4b8c9313a788b0a92eab32a4edb37c
+EBUILD PEAR-Numbers_Words-0.18.1-r1.ebuild 693 BLAKE2B da455a771cb21432817ec07278bb70d4a0b28a2a6e5504fe72bb7798c8e44d32d649328212a2142c0c72b27b3664ca8c72e467f9ca66ed92efca9b491ae59b56 SHA512 6e5aa3dd6b57dc5bdc7496653c7fb67b021b44f4edc5abc0b7117131f02276c35b1bb5c86834aaed9c2acef88ff1f115ad8ea2ec1ab296bc5922f1299677ab5c
+EBUILD PEAR-Numbers_Words-0.18.2.ebuild 524 BLAKE2B 4893944d79623821e224e776465ecf3fb4b7ffad8f8daa2f83bda944db5f73b92ab37be4c99c79688d5373292ffdb04ec35e9f370f250eaa6fb06838f25002b0 SHA512 bf1a293ff03272cf384c39272c54b6a7b69a8bdaff111b74dd584fa49f88617af1fd902a7125d63367ba6eed1a346e3a2f2f37c4d29c8ab9dafe9966b3331f45
+MISC metadata.xml 385 BLAKE2B 96fd8d4dffa8bcda044ca563466bd32986e2ddfc984494a13eabcd71377c0a850ad4458f2c0c96870105e215d38295ddd32d640c0f8cba8a6566e78a2bfcc197 SHA512 05fafb5b7437fcffa392b1898b60bc7811dbc0ac3b8da7f0b7205c16a9292cbaad3e62ca59e999ebf9cba1e3d0fe0076203dceb68dcf1a2dc2af496403cf812e
diff --git a/dev-php/PEAR-Numbers_Words/PEAR-Numbers_Words-0.18.1-r1.ebuild b/dev-php/PEAR-Numbers_Words/PEAR-Numbers_Words-0.18.1-r1.ebuild
new file mode 100644
index 000000000000..64d5353b4d13
--- /dev/null
+++ b/dev-php/PEAR-Numbers_Words/PEAR-Numbers_Words-0.18.1-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PN="${PN/PEAR-/}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Provides methods for spelling numerals in words"
+HOMEPAGE="http://pear.php.net/package/${MY_PN}"
+SRC_URI="http://download.pear.php.net/package/${MY_P}.tgz"
+LICENSE="PHP-3.01"
+SLOT="0"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
+IUSE="test"
+
+RDEPEND="dev-lang/php:*
+ dev-php/PEAR-Math_BigInteger"
+DEPEND="test? ( ${RDEPEND} dev-php/phpunit )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+ insinto /usr/share/php/
+ doins -r Numbers
+
+ dodoc ChangeLog README
+}
+
+src_test() {
+ phpunit tests || die 'test suite failed'
+}
diff --git a/dev-php/PEAR-Numbers_Words/PEAR-Numbers_Words-0.18.2.ebuild b/dev-php/PEAR-Numbers_Words/PEAR-Numbers_Words-0.18.2.ebuild
new file mode 100644
index 000000000000..0b83ebeaf12f
--- /dev/null
+++ b/dev-php/PEAR-Numbers_Words/PEAR-Numbers_Words-0.18.2.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit php-pear-r2
+
+DESCRIPTION="Provides methods for spelling numerals in words"
+HOMEPAGE="http://pear.php.net/package/Numbers_Words"
+LICENSE="PHP-3.01"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+
+RDEPEND="dev-php/PEAR-Math_BigInteger"
+DEPEND="test? ( ${RDEPEND} dev-php/phpunit )"
+
+DOCS=( ChangeLog README )
+
+src_test() {
+ phpunit tests || die 'test suite failed'
+}
diff --git a/dev-php/PEAR-Numbers_Words/metadata.xml b/dev-php/PEAR-Numbers_Words/metadata.xml
new file mode 100644
index 000000000000..a956dfe209c0
--- /dev/null
+++ b/dev-php/PEAR-Numbers_Words/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://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/Numbers_Words</remote-id>
+ <remote-id type="pear">Numbers_Words</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-php/PEAR-OLE-1.0.0_rc3 b/dev-php/PEAR-OLE-1.0.0_rc3
deleted file mode 100644
index df41ec7b9369..000000000000
--- a/dev-php/PEAR-OLE-1.0.0_rc3
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DESCRIPTION=Package for reading and writing OLE containers
-EAPI=6
-HOMEPAGE=https://pear.php.net/package/OLE
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86
-LICENSE=PHP-3.01
-RDEPEND=>=dev-php/pear-1.8.1
-SLOT=0
-SRC_URI=https://pear.php.net/get/OLE-1.0.0RC3.tgz
-_eclasses_=php-pear-r2 eb6928c33771db74564e814c5ca6c1b3
-_md5_=a8b932fcfc2951e79331e8f557edbabc
diff --git a/dev-php/PEAR-OLE/Manifest b/dev-php/PEAR-OLE/Manifest
new file mode 100644
index 000000000000..e32fbaee0b4b
--- /dev/null
+++ b/dev-php/PEAR-OLE/Manifest
@@ -0,0 +1,3 @@
+DIST OLE-1.0.0RC3.tgz 14233 BLAKE2B ca8ae3959b618a0cd9344a3b07c8587f4f1d10063ff6101e8f27d0c4c8b0d08a0a258ae40ac9b7ce30622d57cc6bfbb2a5b4f5b393ef69e25c276813ee70461e SHA512 36a9bbe243d0f172bcd3fc5dd0926a0e42389b4e222cca90678f41bb968c70e4d04c959f3fe3bad1704543ecbcda871a248aa445a1dc6c2f0b73925198f5b07e
+EBUILD PEAR-OLE-1.0.0_rc3.ebuild 367 BLAKE2B 57738add3d3d7eba94b19b622fb94dc3bdfda51897cc16b478da83cc4de284a2b66d264a6a05ca63e898daaf3a5940ed83793b4e86c918eb3889c0791339c5e8 SHA512 c8d0f02785f25a7491631a5a3b200af7906b612318607175437d6182bf1ec978144b2695ecaa1303e91cb2f72254f500e4888ea5bf88e73b64d5988a0f1a8f77
+MISC metadata.xml 365 BLAKE2B d3239ca6d5ef2cac6033276506a09ac2dc02805de0cc194f700be394828c56d754d364fa1b12895f3a78d2fc7145c57b8a097fbbc02bcebd006da21759a42793 SHA512 3871e3db946f3c1d55f06eb228b38e4b3d596b40781c0062c5aa5dad7b785312db6ddf41e16f372f3541c1eaf30264b78bd84db2a4c2843376af4111a50479ae
diff --git a/dev-php/PEAR-OLE/PEAR-OLE-1.0.0_rc3.ebuild b/dev-php/PEAR-OLE/PEAR-OLE-1.0.0_rc3.ebuild
new file mode 100644
index 000000000000..bd8e6951959f
--- /dev/null
+++ b/dev-php/PEAR-OLE/PEAR-OLE-1.0.0_rc3.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PEAR_PV=${PV/_rc/RC}
+
+inherit php-pear-r2
+
+DESCRIPTION="Package for reading and writing OLE containers"
+HOMEPAGE="https://pear.php.net/package/OLE"
+LICENSE="PHP-3.01"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+IUSE=""
diff --git a/dev-php/PEAR-OLE/metadata.xml b/dev-php/PEAR-OLE/metadata.xml
new file mode 100644
index 000000000000..bf98d49f17fb
--- /dev/null
+++ b/dev-php/PEAR-OLE/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://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/OLE</remote-id>
+ <remote-id type="pear">OLE</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-php/PEAR-PEAR-1.10.5 b/dev-php/PEAR-PEAR-1.10.5
deleted file mode 100644
index 0670a7bca47c..000000000000
--- a/dev-php/PEAR-PEAR-1.10.5
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=config install postinst prepare prerm setup
-DESCRIPTION=PEAR Base System
-EAPI=6
-HOMEPAGE=http://pear.php.net/package/PEAR
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86
-LICENSE=MIT
-RDEPEND=dev-lang/php:*[cli,xml,zlib] >=dev-php/PEAR-Archive_Tar-1.4.0 >=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.3.0
-SLOT=0
-SRC_URI=http://pear.php.net/get/PEAR-1.10.5.tgz
-_md5_=6f2db8e05e4d603164d51dbfeec73166
diff --git a/dev-php/PEAR-PEAR/Manifest b/dev-php/PEAR-PEAR/Manifest
new file mode 100644
index 000000000000..e83c5ee539c8
--- /dev/null
+++ b/dev-php/PEAR-PEAR/Manifest
@@ -0,0 +1,5 @@
+AUX gentoo-libtool-mismatch-fix-v2.patch 510 BLAKE2B 59571998b848501efcdd4c304dc48e4950560f2f4d08add530d078787519b1c33dd511e92914208342011bd727e0fca12974b92a46b6a6bc9a66cbca061c9495 SHA512 03848aa6447c2969715e872481e17f7a6dbe7df9e42a13305fdbcfaf09505de40ed6d91c9c93f11a944adc94389472f04eac2b656f08dbdd9d1c3a1d07946ff4
+AUX pear.conf-r2 379 BLAKE2B fe57574f4e4ce095f7ddd9bc26606181a86e67f6c8e6dad57a713e187175b711d50d90c346759d430c32da0a740e7f79cffc7ccedc3b719d04dcd1792a9309f6 SHA512 81e4c95ccfd1a50d30d6e9db90fa099f3dd098bf4fa2c023f5369d0e96a197da91d2572ff3785bcfc83dba82abeca3932431083b5aa2aed155336697764666be
+DIST PEAR-1.10.5.tgz 291151 BLAKE2B b9095e6e488348917846693769f075c898271f2b65fbc69781247e8f46bf41afa4dfeb98d66c1aabce884e24c91bda50af3766745c3b8b5101aa54595e53c796 SHA512 c310fa8ec72ba201313dc03953ec1eba82daa137b27eac880fd5388dce72d38e6aa40737da43c3ad41db4df0d6717c7d77cf477d64b29245854ae95d2a94c364
+EBUILD PEAR-PEAR-1.10.5.ebuild 5890 BLAKE2B 4e34fc9a6e0069e9589c32fe17b7bafc334dbd1db76f02fdb085511c4542e7fe7f5dd4cb10dd826401c9ae9de059e534f25693f1168cd969f5d14ff736c6bf0d SHA512 75f0d4d550c573b1fc184128f401357837f120eb7cab088b78aa40c46e89035ea84ac85a0b39b8518e6f000fa93de4508fd3e82aa061a6f54d47ddf19fe01dea
+MISC metadata.xml 306 BLAKE2B fdddffeab9925e2296436f14f6224e0cbdbe2d386e863de68a555cf8b1e5434409af998a4b73c9380d2118db0a021401b23034895038e31559e0de0919a8c597 SHA512 2e46d7a6fcadfed2ff7be17a5f0a82b5cbf6184b50384f868a6ad8821746badfe126279ef9c114ef9d9a42374931193dba4b84483d437797636b95e6e97247fa
diff --git a/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.5.ebuild b/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.5.ebuild
new file mode 100644
index 000000000000..d22b143ae103
--- /dev/null
+++ b/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.5.ebuild
@@ -0,0 +1,177 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PN="${PN/PEAR-/}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="PEAR Base System"
+HOMEPAGE="http://pear.php.net/package/${MY_PN}"
+SRC_URI="http://pear.php.net/get/${MY_P}.tgz"
+LICENSE="MIT"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+SLOT="0"
+IUSE=""
+
+DEPEND=""
+RDEPEND="dev-lang/php:*[cli,xml,zlib]
+ >=dev-php/PEAR-Archive_Tar-1.4.0
+ >=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.3.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/files/gentoo-libtool-mismatch-fix-v2.patch b/dev-php/PEAR-PEAR/files/gentoo-libtool-mismatch-fix-v2.patch
new file mode 100644
index 000000000000..f9a894100c8b
--- /dev/null
+++ b/dev-php/PEAR-PEAR/files/gentoo-libtool-mismatch-fix-v2.patch
@@ -0,0 +1,15 @@
+diff -aruN PEAR.orig/Builder.php PEAR/Builder.php
+--- a/PEAR/Builder.php 2014-07-12 08:25:32.000000000 -0400
++++ b/PEAR/Builder.php 2015-01-16 13:43:14.927894013 -0500
+@@ -340,6 +340,11 @@
+ }
+ // }}} end of interactive part
+
++ if (file_exists('aclocal.m4')) {
++ $this->_runCommand('rm aclocal.m4');
++ $this->_runCommand('autoreconf');
++ }
++
+ // FIXME make configurable
+ if (!$user=getenv('USER')) {
+ $user='defaultuser';
diff --git a/dev-php/PEAR-PEAR/files/pear.conf-r2 b/dev-php/PEAR-PEAR/files/pear.conf-r2
new file mode 100644
index 000000000000..277227b4a47b
--- /dev/null
+++ b/dev-php/PEAR-PEAR/files/pear.conf-r2
@@ -0,0 +1,2 @@
+#PEAR_Config 0.9
+a:9:{s:7:"doc_dir";s:19:"/usr/share/php/docs";s:8:"data_dir";s:19:"/usr/share/php/data";s:8:"test_dir";s:20:"/usr/share/php/tests";s:7:"php_dir";s:14:"/usr/share/php";s:7:"bin_dir";s:8:"/usr/bin";s:7:"php_bin";s:12:"/usr/bin/php";s:9:"cache_dir";s:CACHEDIRLEN:"CACHEDIR";s:12:"download_dir";s:DOWNLOADDIRLEN:"DOWNLOADDIR";s:8:"temp_dir";s:TEMPDIRLEN:"TEMPDIR";}
diff --git a/dev-php/PEAR-PEAR/metadata.xml b/dev-php/PEAR-PEAR/metadata.xml
new file mode 100644
index 000000000000..6470e34fb93a
--- /dev/null
+++ b/dev-php/PEAR-PEAR/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ <name>PHP</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="pear">PEAR</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-php/PEAR-PEAR_PackageFileManager-1.7.2-r2 b/dev-php/PEAR-PEAR_PackageFileManager-1.7.2-r2
deleted file mode 100644
index 60057111bec6..000000000000
--- a/dev-php/PEAR-PEAR_PackageFileManager-1.7.2-r2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DESCRIPTION=Updates an existing package.xml file with a new filelist and changelog
-EAPI=6
-HOMEPAGE=https://pear.php.net/package/PEAR_PackageFileManager
-KEYWORDS=~amd64 ~x86
-LICENSE=PHP-3.01
-RDEPEND=>=dev-lang/php-5.3:* >=dev-php/PEAR-PEAR-1.10.1 dev-php/PEAR-PEAR_PackageFileManager2 dev-php/PEAR-PEAR_PackageFileManager_Plugins >=dev-php/pear-1.8.1
-SLOT=0
-SRC_URI=https://pear.php.net/get/PEAR_PackageFileManager-1.7.2.tgz
-_eclasses_=php-pear-r2 eb6928c33771db74564e814c5ca6c1b3
-_md5_=4783443f90a280114bafe9e01b295b07
diff --git a/dev-php/PEAR-PEAR_PackageFileManager/Manifest b/dev-php/PEAR-PEAR_PackageFileManager/Manifest
new file mode 100644
index 000000000000..5695f5faa5a7
--- /dev/null
+++ b/dev-php/PEAR-PEAR_PackageFileManager/Manifest
@@ -0,0 +1,3 @@
+DIST PEAR_PackageFileManager-1.7.2.tgz 38104 BLAKE2B 126578a570db3e92b8c3b3d04588a77e81b14ed6b6c40e9a6c90739d2ae86bfaad8cac2b5ece4deaea9ea1e356d2645997402200236e394f68c0dc5fa9eaafe5 SHA512 4a0a201fea221a8e2d21199f99d4f145e39f42344a0057f32bfefd96aa2635e12ea75ee6b6ac64c52a8d35be5e2a65fa5399b3195592dea9ba10191c45fc0056
+EBUILD PEAR-PEAR_PackageFileManager-1.7.2-r2.ebuild 426 BLAKE2B ea7ad04a92fdc84aa9d7ff2cddfd2cede42c93772efce964406213060cd3982515ce047ba3da25466062d2c5f19d21e7c405d830e54e76cbdc77a89690643a37 SHA512 5eac9a418d350650a680bde42b0da7c800ef10cfa7f05e1ccc6db7d2baa11639b8ab98fcf8c669ee755319b39af3427fdbd42f9618ee2f23367d77d2c61bce7c
+MISC metadata.xml 325 BLAKE2B 626bdcf012d0b1bf419e317ae321a2de1f7e902f67ab5bad48d52992ded8537fd496e9e11c5e2bcb8bca10c5b79820bf34722f9192e6cad8df5bb24c97e83f60 SHA512 81cbf761721cbd85615855d2bd77c3d7354c891c62ef2daaf711a2e32ebda7b968366d5d8c3c8322f2a8e122c48933b796439340d1fd1693e3db2dc36c2c324f
diff --git a/dev-php/PEAR-PEAR_PackageFileManager/PEAR-PEAR_PackageFileManager-1.7.2-r2.ebuild b/dev-php/PEAR-PEAR_PackageFileManager/PEAR-PEAR_PackageFileManager-1.7.2-r2.ebuild
new file mode 100644
index 000000000000..b0973dc62119
--- /dev/null
+++ b/dev-php/PEAR-PEAR_PackageFileManager/PEAR-PEAR_PackageFileManager-1.7.2-r2.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit php-pear-r2
+
+DESCRIPTION="Updates an existing package.xml file with a new filelist and changelog"
+LICENSE="PHP-3.01"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/php-5.3:*
+ >=dev-php/PEAR-PEAR-1.10.1
+ dev-php/PEAR-PEAR_PackageFileManager2
+ dev-php/PEAR-PEAR_PackageFileManager_Plugins"
diff --git a/dev-php/PEAR-PEAR_PackageFileManager/metadata.xml b/dev-php/PEAR-PEAR_PackageFileManager/metadata.xml
new file mode 100644
index 000000000000..863e4234d892
--- /dev/null
+++ b/dev-php/PEAR-PEAR_PackageFileManager/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ <name>PHP</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="pear">PEAR_PackageFileManager</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-php/PEAR-PEAR_PackageFileManager2-1.0.4-r2 b/dev-php/PEAR-PEAR_PackageFileManager2-1.0.4-r2
deleted file mode 100644
index 62f278ead0e2..000000000000
--- a/dev-php/PEAR-PEAR_PackageFileManager2-1.0.4-r2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DESCRIPTION=Updates an existing package.xml file with a new filelist and changelog
-EAPI=6
-HOMEPAGE=https://pear.php.net/package/PEAR_PackageFileManager2
-KEYWORDS=~amd64 ~x86
-LICENSE=PHP-3.01
-RDEPEND=>=dev-lang/php-5.3:* >=dev-php/PEAR-PEAR-1.10.1 dev-php/PEAR-PEAR_PackageFileManager_Plugins >=dev-php/pear-1.8.1
-SLOT=0
-SRC_URI=https://pear.php.net/get/PEAR_PackageFileManager2-1.0.4.tgz
-_eclasses_=php-pear-r2 eb6928c33771db74564e814c5ca6c1b3
-_md5_=3fa3b2acb3435f9be7be08da18982651
diff --git a/dev-php/PEAR-PEAR_PackageFileManager2/Manifest b/dev-php/PEAR-PEAR_PackageFileManager2/Manifest
new file mode 100644
index 000000000000..6901ffa659ed
--- /dev/null
+++ b/dev-php/PEAR-PEAR_PackageFileManager2/Manifest
@@ -0,0 +1,3 @@
+DIST PEAR_PackageFileManager2-1.0.4.tgz 43365 BLAKE2B 5eae7eb6f2ae91487ab83dc048ff2fa4c63a4f8208e88e0897340ef63aded28b355f22aec8e12e4da918ed1f24434c6269b53f4755ec80cf4edf7a240e03e545 SHA512 2748ebb21158521a74246ea410f9a30ae6d4b41e88aba543888238c5fc53060e6cf5c537cb95f595147690a2cbdfaaa34a6b3280924ee153cd3d47f2deb3a636
+EBUILD PEAR-PEAR_PackageFileManager2-1.0.4-r2.ebuild 387 BLAKE2B e41776339c8d2ebf530126add435d4364d6f51fd3eb996c4e3d9420fe3434db1bbd2fa9811e5b8a27c8854fb6898cfdb0f5112fa731e5932abfb826758b45605 SHA512 b67af6ee028bc546e29922385f7b3e023a2b83dfb0f438939b9345473962567729a3752dc2b287077f7f16328e534d34a8357c8763f6ce43d798d62f8d284cdf
+MISC metadata.xml 326 BLAKE2B 12d60b4e028e6262c9954ed790f50a24d93b9fd0b3bfa2b94f50c0576b9cdacb7e61dfb1e394a581e700de4163df92d979a2873ed4b13e20dd12fd8811174954 SHA512 11103fa47012eb0dee5fb6c58c151873ec563fe56ed6a9ea1787a4a229f56ba6848eac9498936ef559f80c18985202a28205f8019bbc1c9956e7e0e941c2add4
diff --git a/dev-php/PEAR-PEAR_PackageFileManager2/PEAR-PEAR_PackageFileManager2-1.0.4-r2.ebuild b/dev-php/PEAR-PEAR_PackageFileManager2/PEAR-PEAR_PackageFileManager2-1.0.4-r2.ebuild
new file mode 100644
index 000000000000..e896e2b1d697
--- /dev/null
+++ b/dev-php/PEAR-PEAR_PackageFileManager2/PEAR-PEAR_PackageFileManager2-1.0.4-r2.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit php-pear-r2
+
+DESCRIPTION="Updates an existing package.xml file with a new filelist and changelog"
+LICENSE="PHP-3.01"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/php-5.3:*
+ >=dev-php/PEAR-PEAR-1.10.1
+ dev-php/PEAR-PEAR_PackageFileManager_Plugins"
diff --git a/dev-php/PEAR-PEAR_PackageFileManager2/metadata.xml b/dev-php/PEAR-PEAR_PackageFileManager2/metadata.xml
new file mode 100644
index 000000000000..984194e45118
--- /dev/null
+++ b/dev-php/PEAR-PEAR_PackageFileManager2/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ <name>PHP</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="pear">PEAR_PackageFileManager2</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-php/PEAR-PEAR_PackageFileManager_Plugins-1.0.4-r1 b/dev-php/PEAR-PEAR_PackageFileManager_Plugins-1.0.4-r1
deleted file mode 100644
index 094c57c92809..000000000000
--- a/dev-php/PEAR-PEAR_PackageFileManager_Plugins-1.0.4-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DESCRIPTION=Various methods to check files to update an existing package.xml file
-EAPI=6
-HOMEPAGE=https://pear.php.net/package/PEAR_PackageFileManager_Plugins
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD-2
-RDEPEND=>=dev-php/PEAR-PEAR-1.10.1 >=dev-php/PEAR-XML_Serializer-0.19.0 >=dev-lang/php-5.3:*[xml,simplexml] >=dev-php/pear-1.8.1
-SLOT=0
-SRC_URI=https://pear.php.net/get/PEAR_PackageFileManager_Plugins-1.0.4.tgz
-_eclasses_=php-pear-r2 eb6928c33771db74564e814c5ca6c1b3
-_md5_=71317eba4096a569fd3ce878bd6351a1
diff --git a/dev-php/PEAR-PEAR_PackageFileManager_Plugins/Manifest b/dev-php/PEAR-PEAR_PackageFileManager_Plugins/Manifest
new file mode 100644
index 000000000000..de3472b03167
--- /dev/null
+++ b/dev-php/PEAR-PEAR_PackageFileManager_Plugins/Manifest
@@ -0,0 +1,3 @@
+DIST PEAR_PackageFileManager_Plugins-1.0.4.tgz 20967 BLAKE2B 5f883e117af879c67badb5c9c8b11e1211b3f9ee3b0516d43ca489ea05d6d4678281062a1a75da15e2158583169e7c31ca900bdea83137d991ed7dd923abb2e6 SHA512 7461ba3dc6f51263383136041d217e2d0d7607c5ef9f8766e08466118f2c869a037622750dd7bdcbbf2a114efde096b3192bbf5229f62ea42adfe83d36451fa0
+EBUILD PEAR-PEAR_PackageFileManager_Plugins-1.0.4-r1.ebuild 390 BLAKE2B f2ab2088bdf0733d450e628027d2b70ea6fcda5697c5aeae3bb39e677a9092ada5423f98746ada52c9f74f777777968ef7dbac4227b0fa6154a60b355b608a20 SHA512 4ba0b3af245b548fd7bcd7479cca31a46148bea2300108a0b6642e7dc5cd6b6c60e0ed0da4d0f9ac9127c0580834eb00325152ec40d88b3136c8f86332a869dd
+MISC metadata.xml 333 BLAKE2B 1b5c3d38a23c4c4f0bbe1ab548123cf248b14fc2ab484e78b6ec7a27e6982b61ae460bef0f5694683a1ceecfc3450befa955097aa1f60d39704a3fc62993c2b5 SHA512 45c6ff507cef1c260ffe4651d51262b857f213b1e47dc2bb8a13443b87cb82a7cddd7d88565b0a59c10a66ebc62da94f54863151f45c3c79ffc217560c7037d9
diff --git a/dev-php/PEAR-PEAR_PackageFileManager_Plugins/PEAR-PEAR_PackageFileManager_Plugins-1.0.4-r1.ebuild b/dev-php/PEAR-PEAR_PackageFileManager_Plugins/PEAR-PEAR_PackageFileManager_Plugins-1.0.4-r1.ebuild
new file mode 100644
index 000000000000..021965393c4f
--- /dev/null
+++ b/dev-php/PEAR-PEAR_PackageFileManager_Plugins/PEAR-PEAR_PackageFileManager_Plugins-1.0.4-r1.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit php-pear-r2
+
+DESCRIPTION="Various methods to check files to update an existing package.xml file"
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-php/PEAR-PEAR-1.10.1
+ >=dev-php/PEAR-XML_Serializer-0.19.0
+ >=dev-lang/php-5.3:*[xml,simplexml]"
diff --git a/dev-php/PEAR-PEAR_PackageFileManager_Plugins/metadata.xml b/dev-php/PEAR-PEAR_PackageFileManager_Plugins/metadata.xml
new file mode 100644
index 000000000000..c41e99d84be5
--- /dev/null
+++ b/dev-php/PEAR-PEAR_PackageFileManager_Plugins/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ <name>PHP</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="pear">PEAR_PackageFileManager_Plugins</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-php/PEAR-PHP_Beautifier-0.1.15-r2 b/dev-php/PEAR-PHP_Beautifier-0.1.15-r2
deleted file mode 100644
index 00f590be3ec4..000000000000
--- a/dev-php/PEAR-PHP_Beautifier-0.1.15-r2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install prepare
-DESCRIPTION=Code Beautifier for PHP
-EAPI=6
-HOMEPAGE=http://pear.php.net/package/PHP_Beautifier
-IUSE=cli examples
-KEYWORDS=~amd64 ~x86
-LICENSE=PHP-3.01
-RDEPEND=dev-lang/php:*[bzip2,cli?,tokenizer] dev-php/PEAR-Archive_Tar dev-php/PEAR-Log dev-php/PEAR-PEAR cli? ( dev-php/PEAR-Console_Getopt )
-SLOT=0
-SRC_URI=http://download.pear.php.net/package/PHP_Beautifier-0.1.15.tgz
-_md5_=beb96d94d6adac5b0b486d131b92dfe9
diff --git a/dev-php/PEAR-PHP_Beautifier/Manifest b/dev-php/PEAR-PHP_Beautifier/Manifest
new file mode 100644
index 000000000000..eb744b8ca11f
--- /dev/null
+++ b/dev-php/PEAR-PHP_Beautifier/Manifest
@@ -0,0 +1,4 @@
+AUX use_default_error_reporting.patch 1576 BLAKE2B 0e1deba63910c3466cae3751bba060f58033772eb8a8ee9d09aee2c8a073a2b40f089ed6cd75ca82d1005d27fcc30f5b7c0585fa73bad28be5eb172be45444e2 SHA512 f1e6c53c9dda6d15ea5609e07986d3ed8206152b554cdb2ad20c702128d8b3a9e757f3fcc2ef2c6e9ef7501ca169786301261bd6fb4bc57d946322853d20c2c8
+DIST PHP_Beautifier-0.1.15.tgz 74408 BLAKE2B 9d9a59175b404592d43b2539f47bb33807c23268408e88d570974633f17c3bbd2a05909c80ec966df73e7571a23462a93ec789da14fad80d0361b4a2dea43bf6 SHA512 1e2c7060295c6a13424339e7d45a5dfa9b02749baeb96f8efe55b4951243a3285ddffc815ad0432aec7a710646bdae33bd40abe723faf4ff35a50dad2258efd6
+EBUILD PEAR-PHP_Beautifier-0.1.15-r2.ebuild 1087 BLAKE2B a5e216ab541c8fe31e9f93a373f76fdb7708960d3c3537404491c563f8262966c6515ca1d8c6e101a8e50bb2556f03c6e73628ddcf1c977660291bcb3bd5f3e5 SHA512 94a57982857cc96268104bd74b4198f9aa9478d798bfe3b8c21066c2522b8dfea6365b61be70dc27073d69aa98ae40d99bdd06d9a29839cbbc8ec079f9d69aac
+MISC metadata.xml 557 BLAKE2B 46eae5572188b52c50c0336f27a6ac551db7f603a68f7747fb82ad77808017a2faf19f8f55d3a52622f76a5563042b69db9af99b2378746aac945176b02a50bd SHA512 da17e6471c97a0ed98107a29a6569ecc69c54c1bf984eab09a3402858a18a69d7471ae55571bea4c9b84fae96ef8bde166c94a4b587327d7d20249cd06653e8f
diff --git a/dev-php/PEAR-PHP_Beautifier/PEAR-PHP_Beautifier-0.1.15-r2.ebuild b/dev-php/PEAR-PHP_Beautifier/PEAR-PHP_Beautifier-0.1.15-r2.ebuild
new file mode 100644
index 000000000000..933671ed3713
--- /dev/null
+++ b/dev-php/PEAR-PHP_Beautifier/PEAR-PHP_Beautifier-0.1.15-r2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PN="${PN/PEAR-/}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Code Beautifier for PHP"
+HOMEPAGE="http://pear.php.net/package/${MY_PN}"
+SRC_URI="http://download.pear.php.net/package/${MY_P}.tgz"
+LICENSE="PHP-3.01"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cli examples"
+
+# Require automagic dependencies unconditionally to avoid surprises.
+RDEPEND="dev-lang/php:*[bzip2,cli?,tokenizer]
+ dev-php/PEAR-Archive_Tar
+ dev-php/PEAR-Log
+ dev-php/PEAR-PEAR
+ cli? ( dev-php/PEAR-Console_Getopt )"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=( "${FILESDIR}/use_default_error_reporting.patch" )
+
+src_prepare() {
+ default
+ shopt -s globstar
+ for file in scripts/php_beautifier **/*.php; do
+ sed -i "s|@package_version@|${PV}|g" "${file}" || die
+ sed -i "s|@php_bin@|${EPREFIX}/usr/bin/php|g" "${file}" || die
+ done
+ shopt -u globstar
+}
+
+src_install() {
+ insinto /usr/share/php/PHP
+ doins Beautifier.php
+ doins -r Beautifier
+ use examples && dodoc -r examples
+ use cli && dobin scripts/php_beautifier
+}
diff --git a/dev-php/PEAR-PHP_Beautifier/files/use_default_error_reporting.patch b/dev-php/PEAR-PHP_Beautifier/files/use_default_error_reporting.patch
new file mode 100644
index 000000000000..cf1019b3399c
--- /dev/null
+++ b/dev-php/PEAR-PHP_Beautifier/files/use_default_error_reporting.patch
@@ -0,0 +1,44 @@
+From 39e6b5605bd15db6a1f2f223dede9c8d2265140c Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky <michael@orlitzky.com>
+Date: Mon, 9 Jan 2017 22:34:30 -0500
+Subject: [PATCH 1/1] Use the default PHP error_reporting value.
+
+The php_beautifier script triggers some strict/deprecation warnings
+with newer versions of PHP. With error_reporting = E_ALL, they are
+shown to the user. Instead, we can at least respect the default
+value of error_reporting from php.ini which (on Gentoo, anyway)
+hides strict/deprecation warnings.
+---
+ Beautifier.php | 2 +-
+ scripts/php_beautifier | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Beautifier.php b/Beautifier.php
+index 584ac4d..90d8d0b 100755
+--- a/Beautifier.php
++++ b/Beautifier.php
+@@ -19,7 +19,7 @@
+ * @license http://www.php.net/license/3_0.txt PHP License 3.0
+ * @version CVS: $Id:$
+ */
+-error_reporting(E_ALL);
++// error_reporting(E_ALL);
+ // Before all, test the tokenizer extension
+ if (!extension_loaded('tokenizer')) {
+ throw new Exception("Compile php with tokenizer extension. Use --enable-tokenizer or don't use --disable-all on configure.");
+diff --git a/scripts/php_beautifier b/scripts/php_beautifier
+index 255a264..6e87f4e 100755
+--- a/scripts/php_beautifier
++++ b/scripts/php_beautifier
+@@ -52,7 +52,7 @@
+ */
+ require_once 'PHP/Beautifier/Batch.php';
+ define('PHP_Beautifier_WINDOWS', substr(PHP_OS, 0, 3) == 'WIN');
+- error_reporting(E_ALL);
++ // error_reporting(E_ALL);
+ // get log object
+ $oLog = PHP_Beautifier_Common::getLog();
+
+--
+2.10.2
+
diff --git a/dev-php/PEAR-PHP_Beautifier/metadata.xml b/dev-php/PEAR-PHP_Beautifier/metadata.xml
new file mode 100644
index 000000000000..6ef7bb57383b
--- /dev/null
+++ b/dev-php/PEAR-PHP_Beautifier/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ <name>PHP</name>
+ </maintainer>
+ <use>
+ <flag name="cli">
+ Require <pkg>dev-lang/php</pkg> to be built with the "cli" SAPI
+ and install the php_beautifier script.
+ </flag>
+ </use>
+ <upstream>
+ <remote-id type="github">clbustos/PHP_Beautifier</remote-id>
+ <remote-id type="pear">PHP_Beautifier</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-php/PEAR-PHP_Debug-1.0.3-r3 b/dev-php/PEAR-PHP_Debug-1.0.3-r3
deleted file mode 100644
index 6a5a49a5499b..000000000000
--- a/dev-php/PEAR-PHP_Debug-1.0.3-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DESCRIPTION=Provides traces, timings, executed queries, watched variables etc.
-EAPI=6
-HOMEPAGE=https://pear.php.net/package/PHP_Debug
-IUSE=minimal
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=!minimal? ( dev-php/PEAR-Text_Highlighter ) >=dev-php/pear-1.8.1
-SLOT=0
-SRC_URI=https://pear.php.net/get/PHP_Debug-1.0.3.tgz
-_eclasses_=php-pear-r2 eb6928c33771db74564e814c5ca6c1b3
-_md5_=34eb23b1860e8f8021b827632db6c434
diff --git a/dev-php/PEAR-PHP_Debug/Manifest b/dev-php/PEAR-PHP_Debug/Manifest
new file mode 100644
index 000000000000..9191864f6b11
--- /dev/null
+++ b/dev-php/PEAR-PHP_Debug/Manifest
@@ -0,0 +1,3 @@
+DIST PHP_Debug-1.0.3.tgz 48967 BLAKE2B b98d02a05f1aa35749e058d33a28418f2f3f956356789394cc9d17a496663322cf2bfbb5b6ce044ec1f8da14977af85f3659df7b0c272dfd30232258df599157 SHA512 740991812218abe21babc9892a3a814c8ed9180a7d68acafee933c4cec3c86282134bb46b2058cae8ff97a134a3c04b72d8113126184f6aff27fea9f1203344c
+EBUILD PEAR-PHP_Debug-1.0.3-r3.ebuild 500 BLAKE2B 217db3c09cc788d60f9b281cae06998a3433a22ee5f1b2c8b2eb0c4a1714a11be4ee9fb5fb260c4ace385a4bfc893a44226c4bba021a2e65d0ec049cbc5d3688 SHA512 2dedd33c7808fb38b95418ca72f6a9b2fe67daa51855a983d0b558503a02999618ce2944016b1be045b8d175a719eb17dee317a1cb4e0764fd2a3c3b8ab00d54
+MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/PEAR-PHP_Debug/PEAR-PHP_Debug-1.0.3-r3.ebuild b/dev-php/PEAR-PHP_Debug/PEAR-PHP_Debug-1.0.3-r3.ebuild
new file mode 100644
index 000000000000..a09ecc06ad4f
--- /dev/null
+++ b/dev-php/PEAR-PHP_Debug/PEAR-PHP_Debug-1.0.3-r3.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit php-pear-r2
+
+DESCRIPTION="Provides traces, timings, executed queries, watched variables etc. "
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="minimal"
+
+RDEPEND="!minimal? ( dev-php/PEAR-Text_Highlighter )"
+DOCS=( docs/README docs/INSTALL docs/CHANGELOG docs/FAQ docs/TODO docs/CONTACT )
+src_install() {
+ php-pear-r2_src_install
+ docinto html
+ dodoc -r css images js
+}
diff --git a/dev-php/PEAR-PHP_Debug/metadata.xml b/dev-php/PEAR-PHP_Debug/metadata.xml
new file mode 100644
index 000000000000..b86acf66c756
--- /dev/null
+++ b/dev-php/PEAR-PHP_Debug/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ <name>PHP</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/dev-php/PEAR-Pager-2.5.1 b/dev-php/PEAR-Pager-2.5.1
deleted file mode 100644
index c2649531877e..000000000000
--- a/dev-php/PEAR-Pager-2.5.1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DESCRIPTION=Data paging class
-EAPI=6
-HOMEPAGE=https://pear.php.net/package/Pager
-KEYWORDS=alpha amd64 hppa ia64 ppc ppc64 sparc x86
-LICENSE=BSD
-RDEPEND=>=dev-lang/php-5.6.0:* >=dev-php/pear-1.8.1
-SLOT=0
-SRC_URI=https://pear.php.net/get/Pager-2.5.1.tgz
-_eclasses_=php-pear-r2 eb6928c33771db74564e814c5ca6c1b3
-_md5_=990d96bf231ecdf9bed42c6a9e66351b
diff --git a/dev-php/PEAR-Pager/Manifest b/dev-php/PEAR-Pager/Manifest
new file mode 100644
index 000000000000..04a101b02681
--- /dev/null
+++ b/dev-php/PEAR-Pager/Manifest
@@ -0,0 +1,3 @@
+DIST Pager-2.5.1.tgz 36596 BLAKE2B a41317844cd79852dd2df88dc1d3fe42f68c1dcb6308846dee119e29b5c2b1ecb16cb2669029be4b31f13d3e6a1ff315f92847554d0b18f5845425a714ea9593 SHA512 59c93117196876e87ced8549b94e31255d280bc6a47a3d2197677d118c6bba77a4a4f404266f03eb42da5da1682c13e19610fe37c244bc9aa379b14931779f71
+EBUILD PEAR-Pager-2.5.1.ebuild 288 BLAKE2B a9510d00419a2a82838404e378131dee9ae9d16dacbef834c28bff088de52bcd42dd47f95239e0369086691030a52baf974cf9e9ec580b9ddde2f63834295aa1 SHA512 80b200fe805e821947c207a84e3a821cecb343fb76f12bc360f1a95cab97f5a308c0f3191628667a4d6c63a43b57f67a565453c513513be5642cc7c9c52a1c10
+MISC metadata.xml 369 BLAKE2B 56492dbfe99972e9578a8c20602d5062261b5ce0f0348a76cec46c816d5e41b60fbf4ed9ee77548e6b545ed4024cd6e3e972b29ded9ad71446eb5e9a12b2c7f3 SHA512 5bb1d6cb8e32ac1072ee2f8224112a2758003ceaf9caa327ccc0c3c546ac4e4148e2681fb9d75376ad75c7a38a67d6a3bee4b238e6874f2729e67667cfd6ab65
diff --git a/dev-php/PEAR-Pager/PEAR-Pager-2.5.1.ebuild b/dev-php/PEAR-Pager/PEAR-Pager-2.5.1.ebuild
new file mode 100644
index 000000000000..0a47d04041cf
--- /dev/null
+++ b/dev-php/PEAR-Pager/PEAR-Pager-2.5.1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit php-pear-r2
+
+DESCRIPTION="Data paging class"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/php-5.6.0:*"
diff --git a/dev-php/PEAR-Pager/metadata.xml b/dev-php/PEAR-Pager/metadata.xml
new file mode 100644
index 000000000000..98b254948694
--- /dev/null
+++ b/dev-php/PEAR-Pager/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://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/Pager</remote-id>
+ <remote-id type="pear">Pager</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-php/PEAR-Services_JSON-1.0.3-r1 b/dev-php/PEAR-Services_JSON-1.0.3-r1
deleted file mode 100644
index b1556a326d63..000000000000
--- a/dev-php/PEAR-Services_JSON-1.0.3-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DESCRIPTION=PHP implementaion of json_encode/decode
-EAPI=6
-HOMEPAGE=https://pear.php.net/package/Services_JSON
-KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=BSD
-RDEPEND=>=dev-php/pear-1.8.1
-SLOT=0
-SRC_URI=https://pear.php.net/get/Services_JSON-1.0.3.tgz
-_eclasses_=php-pear-r2 eb6928c33771db74564e814c5ca6c1b3
-_md5_=d362b32fa8cc6660460d33c348409050
diff --git a/dev-php/PEAR-Services_JSON/Manifest b/dev-php/PEAR-Services_JSON/Manifest
new file mode 100644
index 000000000000..4a4443c817f3
--- /dev/null
+++ b/dev-php/PEAR-Services_JSON/Manifest
@@ -0,0 +1,5 @@
+AUX JSON-1.0.3-constructor.patch 1705 BLAKE2B fe8af8e0f1b3ff1632dc55501484e803d612b4a4c7b8dc5ede6ad57af95286574f213f87901e9491515582eab4dc0b48de2dc43995eb7d27e9bb69630ce0d74a SHA512 e61b88d35cb9a58622e0e7c58767306712cd9a39c908e64f0c2e2e51f277a43b2d0af177c1050d0bfc8c7fa387d868949644c62554f9a8d3f83157b3ec8577e5
+AUX JSON-1.0.3-upstream-typo.patch 758 BLAKE2B 9a443f2a4f9a52df75b11c46522d6894872dbfe97db165ce595b4237f773a6bf8143b4a1d1335282baf32487cd22403f444175ea62b40aed87dfec083a16d6d5 SHA512 455b44ac00f6efb8eae96f2a2cc83aa2c3d36f318e587f0412e45338625dd2566facdf9ff042f97d98780a25bd9d5ddd8a81faa422ba9afd211e3df4e7b30976
+DIST Services_JSON-1.0.3.tgz 9529 BLAKE2B 5a35899d53b66f3534afd64105c361e7aafa22641f540ef5ed38789ccc771f4e62577b1044af8d617579aed36e014e38e6bc30f39b476b09b47202d8822028d7 SHA512 2a94bebb662e250d56ae1f02f6debbff9e956820a603b8c4520f48ad0ed67a40c342d4eb000be9a9cf0e5b91c7bf9ebf98fae87f9ecca217b94b12441b746e5e
+EBUILD PEAR-Services_JSON-1.0.3-r1.ebuild 476 BLAKE2B ad30d170717d858beaf1b956759ea4374d0eb66f2b8ede32c929efe55c949cd199994053b412d8858e38db724b1ad81492b9ecf2c3e94d07a7a9491339d060ef SHA512 eb642f611fbdb5617d0cf19a6ac03d66f8514ff9f57bc567c07a3d2ae0070e744de8d0b84339f85e1edc53e6245e65a403551b02de70a7ed38b4d901ee3e7847
+MISC metadata.xml 235 BLAKE2B 5b10304feea18aae1822be7d29bcce06c8715193b14a3dd2c4d79eb75e2767670352e2ca11e06b9a10ec04b63020a18254cd167e6d6be9072f4a200ca5d11ec4 SHA512 0b3e95bbf68eddf74289dad50f8828cffce2d904ff6f9bd5468177de979677cac11da84d1e0302c52b72085915b9d1b3496107172e5726520d51dad1981daf64
diff --git a/dev-php/PEAR-Services_JSON/PEAR-Services_JSON-1.0.3-r1.ebuild b/dev-php/PEAR-Services_JSON/PEAR-Services_JSON-1.0.3-r1.ebuild
new file mode 100644
index 000000000000..9e52d443b4b0
--- /dev/null
+++ b/dev-php/PEAR-Services_JSON/PEAR-Services_JSON-1.0.3-r1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit php-pear-r2
+
+IUSE=""
+DESCRIPTION="PHP implementaion of json_encode/decode"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+PATCHES=( "${FILESDIR}/JSON-1.0.3-upstream-typo.patch" "${FILESDIR}/JSON-1.0.3-constructor.patch" )
+
+src_install() {
+ php-pear-r2_src_install
+ insinto /usr/share/php/Services
+ doins JSON.php
+}
diff --git a/dev-php/PEAR-Services_JSON/files/JSON-1.0.3-constructor.patch b/dev-php/PEAR-Services_JSON/files/JSON-1.0.3-constructor.patch
new file mode 100644
index 000000000000..d7348f0f858e
--- /dev/null
+++ b/dev-php/PEAR-Services_JSON/files/JSON-1.0.3-constructor.patch
@@ -0,0 +1,42 @@
+diff -aurN a/JSON.php b/JSON.php
+--- a/JSON.php 2011-01-13 21:40:48.000000000 -0500
++++ b/JSON.php 2018-02-15 11:42:06.551287857 -0500
+@@ -139,6 +139,14 @@
+ * strings or numbers, if you return an object, make sure it does
+ * not have a toJSON method, otherwise an error will occur.
+ */
++ function __construct($use = 0)
++ {
++ $this->use = $use;
++ $this->_mb_strlen = function_exists('mb_strlen');
++ $this->_mb_convert_encoding = function_exists('mb_convert_encoding');
++ $this->_mb_substr = function_exists('mb_substr');
++ }
++
+ function Services_JSON($use = 0)
+ {
+ $this->use = $use;
+@@ -909,6 +917,11 @@
+
+ class Services_JSON_Error extends PEAR_Error
+ {
++ function __construct($message = 'unknown error', $code = null,
++ $mode = null, $options = null, $userinfo = null)
++ {
++ parent::__construct($message, $code, $mode, $options, $userinfo);
++ }
+ function Services_JSON_Error($message = 'unknown error', $code = null,
+ $mode = null, $options = null, $userinfo = null)
+ {
+@@ -923,6 +936,11 @@
+ */
+ class Services_JSON_Error
+ {
++ function __construct($message = 'unknown error', $code = null,
++ $mode = null, $options = null, $userinfo = null)
++ {
++ return;
++ }
+ function Services_JSON_Error($message = 'unknown error', $code = null,
+ $mode = null, $options = null, $userinfo = null)
+ {
diff --git a/dev-php/PEAR-Services_JSON/files/JSON-1.0.3-upstream-typo.patch b/dev-php/PEAR-Services_JSON/files/JSON-1.0.3-upstream-typo.patch
new file mode 100644
index 000000000000..c7d8be3aa910
--- /dev/null
+++ b/dev-php/PEAR-Services_JSON/files/JSON-1.0.3-upstream-typo.patch
@@ -0,0 +1,20 @@
+--- a/JSON.php 2011/01/28 00:16:42 307804
++++ b/JSON.php 2013/04/30 02:37:26 330165
+@@ -554,7 +544,7 @@
+
+ return ($this->use & SERVICES_JSON_SUPPRESS_ERRORS)
+ ? 'null'
+- : new Services_JSON_Error(class_name($var).
++ : new Services_JSON_Error(get_class($var).
+ " toJSON returned an object with a toJSON method.");
+
+ }
+@@ -995,7 +985,7 @@
+ function Services_JSON_Error($message = 'unknown error', $code = null,
+ $mode = null, $options = null, $userinfo = null)
+ {
+-
++ return;
+ }
+ }
+
diff --git a/dev-php/PEAR-Services_JSON/metadata.xml b/dev-php/PEAR-Services_JSON/metadata.xml
new file mode 100644
index 000000000000..aca42932b833
--- /dev/null
+++ b/dev-php/PEAR-Services_JSON/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ <name>PHP</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-php/PEAR-Services_TinyURL-0.1.2-r1 b/dev-php/PEAR-Services_TinyURL-0.1.2-r1
deleted file mode 100644
index 6e6dbd08e9df..000000000000
--- a/dev-php/PEAR-Services_TinyURL-0.1.2-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DESCRIPTION=An interface for creating and retrieving TinyURLs with their API
-EAPI=6
-HOMEPAGE=https://pear.php.net/package/Services_TinyURL
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD-2
-RDEPEND=dev-lang/php:*[curl] >=dev-php/pear-1.8.1
-SLOT=0
-SRC_URI=https://pear.php.net/get/Services_TinyURL-0.1.2.tgz
-_eclasses_=php-pear-r2 eb6928c33771db74564e814c5ca6c1b3
-_md5_=b81d026dd3dcc2d670441218603b851b
diff --git a/dev-php/PEAR-Services_TinyURL/Manifest b/dev-php/PEAR-Services_TinyURL/Manifest
new file mode 100644
index 000000000000..77dc272cc241
--- /dev/null
+++ b/dev-php/PEAR-Services_TinyURL/Manifest
@@ -0,0 +1,3 @@
+DIST Services_TinyURL-0.1.2.tgz 3960 BLAKE2B 8aa34ad73b3c43cb2e1879db668a0e5f4e953ee96f1159dd7c8c8b6ca022166095b1fa3cee5f3c1cb5c5a17e5d62f5b451280aac6b03dcc9e08ec3f20b3f3ec2 SHA512 847fa9437804c07b1c2adacd9031dcb7955c8bf73c44f7eb90f461ce6f70e9827e024a01a8fdf218bbea87d744d7be7c7ceac461905c243b15c6d42a07d70101
+EBUILD PEAR-Services_TinyURL-0.1.2-r1.ebuild 305 BLAKE2B cf3221966a16b5456c446e801411691cec52d6b1a438a9752a4826222b7877b468880a74668b21769370d897eb2dea5bae9a5533c409003907a9922ed3084b96 SHA512 f62b1f527610ddd2e53524af134cd6d646048852df4d855356cbf76330fe24a0343f0678c963606a51cf62a7c253bc81676d73fd7bee41d65b5e6a71ff493ced
+MISC metadata.xml 235 BLAKE2B 5b10304feea18aae1822be7d29bcce06c8715193b14a3dd2c4d79eb75e2767670352e2ca11e06b9a10ec04b63020a18254cd167e6d6be9072f4a200ca5d11ec4 SHA512 0b3e95bbf68eddf74289dad50f8828cffce2d904ff6f9bd5468177de979677cac11da84d1e0302c52b72085915b9d1b3496107172e5726520d51dad1981daf64
diff --git a/dev-php/PEAR-Services_TinyURL/PEAR-Services_TinyURL-0.1.2-r1.ebuild b/dev-php/PEAR-Services_TinyURL/PEAR-Services_TinyURL-0.1.2-r1.ebuild
new file mode 100644
index 000000000000..09efca44082d
--- /dev/null
+++ b/dev-php/PEAR-Services_TinyURL/PEAR-Services_TinyURL-0.1.2-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit php-pear-r2
+
+DESCRIPTION="An interface for creating and retrieving TinyURLs with their API"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-lang/php:*[curl]"
diff --git a/dev-php/PEAR-Services_TinyURL/metadata.xml b/dev-php/PEAR-Services_TinyURL/metadata.xml
new file mode 100644
index 000000000000..aca42932b833
--- /dev/null
+++ b/dev-php/PEAR-Services_TinyURL/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ <name>PHP</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-php/PEAR-Services_W3C_CSSValidator-0.2.3 b/dev-php/PEAR-Services_W3C_CSSValidator-0.2.3
deleted file mode 100644
index a848d20cf920..000000000000
--- a/dev-php/PEAR-Services_W3C_CSSValidator-0.2.3
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Provides an object oriented interface for the W3 CSS Validator
-EAPI=6
-HOMEPAGE=http://pear.php.net/package/Services_W3C_CSSValidator
-IUSE=examples
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-lang/php:* dev-php/PEAR-HTTP_Request2
-SLOT=0
-SRC_URI=http://download.pear.php.net/package/Services_W3C_CSSValidator-0.2.3.tgz
-_md5_=a98751312c917ce5b6903e53db7fd93c
diff --git a/dev-php/PEAR-Services_W3C_CSSValidator/Manifest b/dev-php/PEAR-Services_W3C_CSSValidator/Manifest
new file mode 100644
index 000000000000..d422bc443aff
--- /dev/null
+++ b/dev-php/PEAR-Services_W3C_CSSValidator/Manifest
@@ -0,0 +1,3 @@
+DIST Services_W3C_CSSValidator-0.2.3.tgz 10721 BLAKE2B 87f1bbce3337d678d8292976f8877ac98fa83487a15ae27ff693ac544754ae144b2a00bddc852d03092456e1b37080a56e09fe47bb48830b79fb4328dbbaa01c SHA512 4f9fb73ec57e374018b389f50918eaf87a63885f75b0ae2ead067e949a451ddbe40da8020672834e891106b5d470fbe451b3117233678b5f6f6a85f01d2a8aef
+EBUILD PEAR-Services_W3C_CSSValidator-0.2.3.ebuild 587 BLAKE2B 2319187ca9e9357881bb6db231bce104f61c59de0619ad2729b52769fffbdf620d9c9cd0e4f70224c467c407df1e582098dbecc36b110ba951c6e218b1046257 SHA512 79259e6bc0f2e6c4f5f9c1effbc8f5b35d4839eba88853cf32b3c36df920917561b2866e7684631f681cb9c693b2788b928bbffec4d4e4dbb322cfabc4a34c80
+MISC metadata.xml 409 BLAKE2B 34baa9b9145f9fd1bfb5e09c92d72b3f59d4d5bfbd95207cb74a474e799f22504ff683ff95fde8aaa30253bffe6987b5cd744ef083a4caecef4abd67ca45759b SHA512 526ec73aa8b62aaa2bbccb161d4ab73915728fa482bf4bff05b0d31ec4c2c213527582e4e285a3511350d7a96fe8d7c229f425a6892d5340b4260fa239ff836a
diff --git a/dev-php/PEAR-Services_W3C_CSSValidator/PEAR-Services_W3C_CSSValidator-0.2.3.ebuild b/dev-php/PEAR-Services_W3C_CSSValidator/PEAR-Services_W3C_CSSValidator-0.2.3.ebuild
new file mode 100644
index 000000000000..126df3ec04c8
--- /dev/null
+++ b/dev-php/PEAR-Services_W3C_CSSValidator/PEAR-Services_W3C_CSSValidator-0.2.3.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PN="${PN/PEAR-/}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Provides an object oriented interface for the W3 CSS Validator"
+HOMEPAGE="http://pear.php.net/package/${MY_PN}"
+SRC_URI="http://download.pear.php.net/package/${MY_P}.tgz"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples"
+
+RDEPEND="dev-lang/php:*
+ dev-php/PEAR-HTTP_Request2"
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+ use examples && dodoc -r docs/examples
+
+ insinto /usr/share/php
+ doins -r Services
+}
diff --git a/dev-php/PEAR-Services_W3C_CSSValidator/metadata.xml b/dev-php/PEAR-Services_W3C_CSSValidator/metadata.xml
new file mode 100644
index 000000000000..ac2b40f98b48
--- /dev/null
+++ b/dev-php/PEAR-Services_W3C_CSSValidator/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://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/Services_W3C_CSSValidator</remote-id>
+ <remote-id type="pear">Services_W3C_CSSValidator</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-php/PEAR-Spreadsheet_Excel_Writer-0.9.4 b/dev-php/PEAR-Spreadsheet_Excel_Writer-0.9.4
deleted file mode 100644
index 7b156efd5bfe..000000000000
--- a/dev-php/PEAR-Spreadsheet_Excel_Writer-0.9.4
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DESCRIPTION=Package for generating Excel spreadsheets
-EAPI=6
-HOMEPAGE=https://pear.php.net/package/Spreadsheet_Excel_Writer
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86
-LICENSE=LGPL-2.1
-RDEPEND=>=dev-lang/php-5.4:*[iconv] >=dev-php/PEAR-OLE-0.5-r1 >=dev-php/pear-1.8.1
-SLOT=0
-SRC_URI=https://pear.php.net/get/Spreadsheet_Excel_Writer-0.9.4.tgz
-_eclasses_=php-pear-r2 eb6928c33771db74564e814c5ca6c1b3
-_md5_=109582595150180f046e8ef329062233
diff --git a/dev-php/PEAR-Spreadsheet_Excel_Writer/Manifest b/dev-php/PEAR-Spreadsheet_Excel_Writer/Manifest
new file mode 100644
index 000000000000..886070a5de1e
--- /dev/null
+++ b/dev-php/PEAR-Spreadsheet_Excel_Writer/Manifest
@@ -0,0 +1,3 @@
+DIST Spreadsheet_Excel_Writer-0.9.4.tgz 58480 BLAKE2B 3469f9ab5965f6c4ef84d05c8f8ad76e57d354c6d7890327ac83b04bfe03dd675a9a9c60fc3f35eef005bfc338f3d91ed3c37d76d781d053bde15f3195d56193 SHA512 e8254e6e15862147830fd4300d6fb88978d84ad350e2e969af1d02df282c54798a429717874f8d12dc031bbc6dbe752e6b740fcd2b7094dc9eda666145f50431
+EBUILD PEAR-Spreadsheet_Excel_Writer-0.9.4.ebuild 361 BLAKE2B d16d6239a949e138abe51c0e6e3406a1a329bc0b3c08693dbda2fbe36158d1acbe1b70ef1bbe542215a9fb9203ec8dce9caba75a5d39c3ce6bee6e4decf2126a SHA512 74fcc8d8292cbc663a6a6a92ede18583759f3e1610e9e29848a996eade6c434ffdfc983118bfae1b4e8927bf526788318445ff55e49637cfb66195a8391467fa
+MISC metadata.xml 235 BLAKE2B 5b10304feea18aae1822be7d29bcce06c8715193b14a3dd2c4d79eb75e2767670352e2ca11e06b9a10ec04b63020a18254cd167e6d6be9072f4a200ca5d11ec4 SHA512 0b3e95bbf68eddf74289dad50f8828cffce2d904ff6f9bd5468177de979677cac11da84d1e0302c52b72085915b9d1b3496107172e5726520d51dad1981daf64
diff --git a/dev-php/PEAR-Spreadsheet_Excel_Writer/PEAR-Spreadsheet_Excel_Writer-0.9.4.ebuild b/dev-php/PEAR-Spreadsheet_Excel_Writer/PEAR-Spreadsheet_Excel_Writer-0.9.4.ebuild
new file mode 100644
index 000000000000..c631017ae900
--- /dev/null
+++ b/dev-php/PEAR-Spreadsheet_Excel_Writer/PEAR-Spreadsheet_Excel_Writer-0.9.4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit php-pear-r2
+
+DESCRIPTION="Package for generating Excel spreadsheets"
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+RDEPEND=">=dev-lang/php-5.4:*[iconv]
+ >=dev-php/PEAR-OLE-0.5-r1"
+IUSE=""
diff --git a/dev-php/PEAR-Spreadsheet_Excel_Writer/metadata.xml b/dev-php/PEAR-Spreadsheet_Excel_Writer/metadata.xml
new file mode 100644
index 000000000000..aca42932b833
--- /dev/null
+++ b/dev-php/PEAR-Spreadsheet_Excel_Writer/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ <name>PHP</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-php/PEAR-Structures_Graph-1.1.1-r1 b/dev-php/PEAR-Structures_Graph-1.1.1-r1
deleted file mode 100644
index 81edad970cdf..000000000000
--- a/dev-php/PEAR-Structures_Graph-1.1.1-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Graph datastructure manipulation library
-EAPI=6
-HOMEPAGE=http://pear.php.net/package/Structures_Graph
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86
-LICENSE=LGPL-2.1
-PDEPEND=dev-php/PEAR-PEAR
-RDEPEND=dev-lang/php:*
-SLOT=0
-SRC_URI=http://pear.php.net/get/Structures_Graph-1.1.1.tgz
-_md5_=d3886fb58ba82d6f680d3c5b03d1033b
diff --git a/dev-php/PEAR-Structures_Graph/Manifest b/dev-php/PEAR-Structures_Graph/Manifest
new file mode 100644
index 000000000000..37dca772363d
--- /dev/null
+++ b/dev-php/PEAR-Structures_Graph/Manifest
@@ -0,0 +1,3 @@
+DIST Structures_Graph-1.1.1.tgz 12402 BLAKE2B 049fc9a15b1ea46a8cb63576174b4b1cc491dd31794b8a1f9526958f6d54902069d16a7158615fc9708ba88bf46e0b021baa01596e443f8c6d9a7f551dac8b23 SHA512 cd4feb265e1aa05de348645dfc0b8e336486cb02c553dd8fcacb0a1eab452bf54108e07864395d55e0c92f4ffd338a5ae846b2dc28804bb23f03c91864ef0284
+EBUILD PEAR-Structures_Graph-1.1.1-r1.ebuild 564 BLAKE2B ae0098214c7bf07703e649aaed2839894e434668a4cc4dd892041f14b89c8b2bd46885557add3c9f6b9339f2076c64c3a1d672efca85506ed10246a5e88d1fd0 SHA512 39253984b530cfdc8777a9d5d52ffe6d27e32f6f05c4222b322fd9a2414f6eb5ac6284245c19685114a26df3ffe0a7b053932939b6aff33cc99501181334498e
+MISC metadata.xml 318 BLAKE2B 66ea3ce84886e04f579c77ced4528ce6a57e433031b6bf1254d5e56e950172fee80e90f164b34c9efeb9c3b5245be70241a8da2ecf3a1860be68b8cac963de52 SHA512 4681aaf5d12c2bd322389f2948669706bbc7c9e1221f0a4a5f06bb53565782fc8408856e986f73a2b41067eb1d8f1903c0b74a6ccc863fdc7f638b563071e927
diff --git a/dev-php/PEAR-Structures_Graph/PEAR-Structures_Graph-1.1.1-r1.ebuild b/dev-php/PEAR-Structures_Graph/PEAR-Structures_Graph-1.1.1-r1.ebuild
new file mode 100644
index 000000000000..a825c7e455d0
--- /dev/null
+++ b/dev-php/PEAR-Structures_Graph/PEAR-Structures_Graph-1.1.1-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PN="${PN/PEAR-/}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Graph datastructure manipulation library"
+HOMEPAGE="http://pear.php.net/package/${MY_PN}"
+SRC_URI="http://pear.php.net/get/${MY_P}.tgz"
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="dev-lang/php:*"
+PDEPEND="dev-php/PEAR-PEAR"
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+ insinto /usr/share/php
+ doins -r Structures
+}
diff --git a/dev-php/PEAR-Structures_Graph/metadata.xml b/dev-php/PEAR-Structures_Graph/metadata.xml
new file mode 100644
index 000000000000..2b74bd726af2
--- /dev/null
+++ b/dev-php/PEAR-Structures_Graph/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ <name>PHP</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="pear">Structures_Graph</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-php/PEAR-System_Command-1.0.8-r1 b/dev-php/PEAR-System_Command-1.0.8-r1
deleted file mode 100644
index ff9d3bf684bf..000000000000
--- a/dev-php/PEAR-System_Command-1.0.8-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=PHP command-line execution interface
-EAPI=6
-HOMEPAGE=http://pear.php.net/package/System_Command
-IUSE=examples
-KEYWORDS=alpha amd64 hppa ia64 ppc ppc64 sparc x86
-LICENSE=PHP-3.01
-RDEPEND=dev-lang/php:* dev-php/PEAR-PEAR
-SLOT=0
-SRC_URI=http://download.pear.php.net/package/System_Command-1.0.8.tgz
-_md5_=6fdcf4e24f319c2b4249ff3214a8e6e4
diff --git a/dev-php/PEAR-System_Command/Manifest b/dev-php/PEAR-System_Command/Manifest
new file mode 100644
index 000000000000..0ea726ec398d
--- /dev/null
+++ b/dev-php/PEAR-System_Command/Manifest
@@ -0,0 +1,3 @@
+DIST System_Command-1.0.8.tgz 6528 BLAKE2B b1aaf2a55f65cd020d7d619dae7c758480241f2be77eea0777cab12ad904522b8e4d8021168e1455fa8c89fabfc87c7e89a581af267dbfbab174898b0d6b8e97 SHA512 37aa9624fe566cdd8613ffd021ba32c2a3f0818b8881933dc1c2e12e2e03773b98b4295b46ef54baca26fb07015c0db2b87e44136f46c09f820994905241acee
+EBUILD PEAR-System_Command-1.0.8-r1.ebuild 585 BLAKE2B 32b45d4c4d426337c82b7b4549aaf5c593bec06a028ff03362d6a297719c5ea3958d2a72a4d4a2772a8ae74e3df23ac2357cfa2b1a98d121f9d736b581c1a796 SHA512 124908bdb8388bd2a0097c9b57bcb90bed78e3b2e49b36714c372da584a09b51ffbe523fca1320c01a6e038e31d8fcc57be547e70e995da2dc405ab298f59439
+MISC metadata.xml 387 BLAKE2B fde6b0c7f1677ebc0e0e40377031d806dae236925943478e278552d9b54c6db74dc9096f975731293f0edb2493faf453d3c830e29c2678257ffa08b72c02e9f6 SHA512 c0b80ef4a3417735c450179e72e2aa67528225c307d64b4ee214e6c1c765529fe0d031c378c4f7570681843a7c5fa6eec9b224d903befc55b2e362cb10128dd0
diff --git a/dev-php/PEAR-System_Command/PEAR-System_Command-1.0.8-r1.ebuild b/dev-php/PEAR-System_Command/PEAR-System_Command-1.0.8-r1.ebuild
new file mode 100644
index 000000000000..a13d8e50ad5d
--- /dev/null
+++ b/dev-php/PEAR-System_Command/PEAR-System_Command-1.0.8-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PN="${PN/PEAR-/}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="PHP command-line execution interface"
+HOMEPAGE="http://pear.php.net/package/${MY_PN}"
+SRC_URI="http://download.pear.php.net/package/${MY_P}.tgz"
+LICENSE="PHP-3.01"
+SLOT="0"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
+IUSE="examples"
+
+RDEPEND="dev-lang/php:*
+ dev-php/PEAR-PEAR"
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+ use examples && dodoc -r docs/test.php
+
+ insinto /usr/share/php
+ doins -r System
+}
diff --git a/dev-php/PEAR-System_Command/metadata.xml b/dev-php/PEAR-System_Command/metadata.xml
new file mode 100644
index 000000000000..4cf233814b10
--- /dev/null
+++ b/dev-php/PEAR-System_Command/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://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/System_Command</remote-id>
+ <remote-id type="pear">System_Command</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-php/PEAR-Text_CAPTCHA-1.0.2-r1 b/dev-php/PEAR-Text_CAPTCHA-1.0.2-r1
deleted file mode 100644
index bc151621b8a3..000000000000
--- a/dev-php/PEAR-Text_CAPTCHA-1.0.2-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare
-DESCRIPTION=Generation of CAPTCHAs
-EAPI=6
-HOMEPAGE=https://pear.php.net/package/Text_CAPTCHA
-IUSE=minimal
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=dev-php/PEAR-PEAR >=dev-lang/php-5.3:*[gd,truetype] >=dev-php/PEAR-Text_Password-1.1.1 !minimal? ( dev-php/PEAR-Numbers_Words dev-php/PEAR-Text_Figlet >=dev-php/PEAR-Image_Text-0.7.0 ) >=dev-php/pear-1.8.1
-SLOT=0
-SRC_URI=https://pear.php.net/get/Text_CAPTCHA-1.0.2.tgz
-_eclasses_=php-pear-r2 eb6928c33771db74564e814c5ca6c1b3
-_md5_=87f02af334d9daec3f66524e7b266bcb
diff --git a/dev-php/PEAR-Text_CAPTCHA/Manifest b/dev-php/PEAR-Text_CAPTCHA/Manifest
new file mode 100644
index 000000000000..54d7729ec051
--- /dev/null
+++ b/dev-php/PEAR-Text_CAPTCHA/Manifest
@@ -0,0 +1,3 @@
+DIST Text_CAPTCHA-1.0.2.tgz 197084 BLAKE2B 69f8d14e190ac9ec4ed74631635c3531fc0d6e40e08484e5fc58595572100976cc6279396aa6fe0cc0f46bd564f21cbb7fa3474647e62076882ac6a5bc0f4866 SHA512 334cee581d9750f69e2fcf6fea948334926960dce6a374dc4e1edf1609d97393c4a08fff867e50e3fceff60b350ab6239bb44c14b78d6c63c8b11be097a8bc43
+EBUILD PEAR-Text_CAPTCHA-1.0.2-r1.ebuild 612 BLAKE2B e32381502d7ecf667a426bf754af6d03b55ae64139b40896c0d30c8159590fec7df85fad1ec50b186191122900a9393f65bfbee0eb86fd1fde0608977aecb3aa SHA512 0312160071aa1cd05bbee94b0719fa1a959b13f4fd10d77d169530461747f173a60abba6b0fd49f349fdb32da2aa37fe5eb2f472a752cecf7319bd2373e0be8f
+MISC metadata.xml 314 BLAKE2B 14022daf2a73a75f9e45e2684404e36320cec033f2e6315e7f76752e0061319c6e0c1f1abdb8f50478e051243c568e968e80ca23bcdd5fa3f7c3cd0ba572d767 SHA512 692d382c5f593666c7a15961ef529db383bfefcf0b192ef5596c754c3ff76ba8386b09043e1ac6da3446ca3edf8e7a7483b510844b68ab6bf234fce7976ab57a
diff --git a/dev-php/PEAR-Text_CAPTCHA/PEAR-Text_CAPTCHA-1.0.2-r1.ebuild b/dev-php/PEAR-Text_CAPTCHA/PEAR-Text_CAPTCHA-1.0.2-r1.ebuild
new file mode 100644
index 000000000000..6f9fa60436a5
--- /dev/null
+++ b/dev-php/PEAR-Text_CAPTCHA/PEAR-Text_CAPTCHA-1.0.2-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit php-pear-r2
+
+DESCRIPTION="Generation of CAPTCHAs"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="minimal"
+
+RDEPEND="dev-php/PEAR-PEAR >=dev-lang/php-5.3:*[gd,truetype] >=dev-php/PEAR-Text_Password-1.1.1
+ !minimal? ( dev-php/PEAR-Numbers_Words
+ dev-php/PEAR-Text_Figlet
+ >=dev-php/PEAR-Image_Text-0.7.0 )"
+
+src_prepare() {
+ sed -i -e '/role="doc"/d' -e '/role="test"/d' "${WORKDIR}/package.xml" || die
+ eapply_user
+}
+
+src_install() {
+ local DOCS=( README )
+ php-pear-r2_src_install
+}
diff --git a/dev-php/PEAR-Text_CAPTCHA/metadata.xml b/dev-php/PEAR-Text_CAPTCHA/metadata.xml
new file mode 100644
index 000000000000..ac0fac62939e
--- /dev/null
+++ b/dev-php/PEAR-Text_CAPTCHA/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ <name>PHP</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="pear">Text_CAPTCHA</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-php/PEAR-Text_CAPTCHA_Numeral-1.3.2-r1 b/dev-php/PEAR-Text_CAPTCHA_Numeral-1.3.2-r1
deleted file mode 100644
index 09d043f55f5b..000000000000
--- a/dev-php/PEAR-Text_CAPTCHA_Numeral-1.3.2-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm test
-DEPEND=test? ( dev-php/PEAR-PEAR )
-DESCRIPTION=Generates mathematical operations and answers to prove user is human
-EAPI=6
-HOMEPAGE=https://pear.php.net/package/Text_CAPTCHA_Numeral
-IUSE=test
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-php/pear-1.8.1
-SLOT=0
-SRC_URI=https://pear.php.net/get/Text_CAPTCHA_Numeral-1.3.2.tgz
-_eclasses_=php-pear-r2 eb6928c33771db74564e814c5ca6c1b3
-_md5_=d8a49c1ffd401301758cfe243d826a36
diff --git a/dev-php/PEAR-Text_CAPTCHA_Numeral/Manifest b/dev-php/PEAR-Text_CAPTCHA_Numeral/Manifest
new file mode 100644
index 000000000000..8cb757a2936b
--- /dev/null
+++ b/dev-php/PEAR-Text_CAPTCHA_Numeral/Manifest
@@ -0,0 +1,3 @@
+DIST Text_CAPTCHA_Numeral-1.3.2.tgz 7741 BLAKE2B 34ffcf435d4737d4d894fe43bf1ee8e88e2050323d5bd5186c270df25045b6938e0eb9072471c83ae5c2bfb7a7e1bf970b2e0dce05eb8d9b7f8a64c7f78c3116 SHA512 be3660b20b857092859d7bbb3cbb35c08dc79a2ea3ebcca035b1defae07dfcd36ce00a47f1708ce4f1bb412c23a7cc867d8b677032e7c0ce13e910fb038a5b5d
+EBUILD PEAR-Text_CAPTCHA_Numeral-1.3.2-r1.ebuild 426 BLAKE2B dc91d6a8972e06629a67fb787f823140e1db3ce082959c324b9b47152128477173a346f2b1549f037722ddb99652cbaaf1263c30f207c11c0a44e28a91ed680b SHA512 f930850b2eb6daa4dce0069eeddeea8278e5220cb19704b2eb6e471a95dd5b512ca675c098162a93367b597d72873800f184cc8be70d20382738287653019721
+MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/PEAR-Text_CAPTCHA_Numeral/PEAR-Text_CAPTCHA_Numeral-1.3.2-r1.ebuild b/dev-php/PEAR-Text_CAPTCHA_Numeral/PEAR-Text_CAPTCHA_Numeral-1.3.2-r1.ebuild
new file mode 100644
index 000000000000..b370be7a4616
--- /dev/null
+++ b/dev-php/PEAR-Text_CAPTCHA_Numeral/PEAR-Text_CAPTCHA_Numeral-1.3.2-r1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit php-pear-r2
+
+DESCRIPTION="Generates mathematical operations and answers to prove user is human"
+LICENSE="BSD"
+SLOT="0"
+
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+DEPEND="test? ( dev-php/PEAR-PEAR )"
+
+HTML_DOCS=( examples/liveNumeral.php examples/numeral1.php )
+
+src_test() {
+ peardev run-tests tests || die
+}
diff --git a/dev-php/PEAR-Text_CAPTCHA_Numeral/metadata.xml b/dev-php/PEAR-Text_CAPTCHA_Numeral/metadata.xml
new file mode 100644
index 000000000000..b86acf66c756
--- /dev/null
+++ b/dev-php/PEAR-Text_CAPTCHA_Numeral/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ <name>PHP</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/dev-php/PEAR-Text_Figlet-1.0.2-r1 b/dev-php/PEAR-Text_Figlet-1.0.2-r1
deleted file mode 100644
index 4ea9bda5c724..000000000000
--- a/dev-php/PEAR-Text_Figlet-1.0.2-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Render text using FIGlet fonts
-EAPI=6
-HOMEPAGE=http://pear.php.net/package/Text_Figlet
-IUSE=examples
-KEYWORDS=amd64 x86
-LICENSE=PHP-3.01 examples? ( GPL-2+ OFL-1.1 )
-RDEPEND=dev-lang/php:* dev-php/PEAR-PEAR
-SLOT=0
-SRC_URI=http://download.pear.php.net/package/Text_Figlet-1.0.2.tgz
-_md5_=77031f4642dd015a7dea53f4d9cbac46
diff --git a/dev-php/PEAR-Text_Figlet/Manifest b/dev-php/PEAR-Text_Figlet/Manifest
new file mode 100644
index 000000000000..d9791cb416c3
--- /dev/null
+++ b/dev-php/PEAR-Text_Figlet/Manifest
@@ -0,0 +1,3 @@
+DIST Text_Figlet-1.0.2.tgz 8775 BLAKE2B 7c397479c00e193409f47d5419aa35fdaf7440f6991882a9a517a319e3240523075f7fa9bdfbffdef9efd1b6ad98bb7e2679c3fdde6cf87365bfe93290571b02 SHA512 e17578a2f4ebd67adedc57cbeceb8191a7ddc712efe0a631cb696d79392bc025ecdd0b389078dc65f6e0fd676d3e435178ae280cae9b9c11d8c4964152d9db06
+EBUILD PEAR-Text_Figlet-1.0.2-r1.ebuild 1198 BLAKE2B e63175a9d432706c763bdccb641cbd45b6def5f093c0e2dea5ce31831581080dc928112cbf72e1ead6e618cd06f9ec2a1b485811e776a5192988f5cd9fb9cbca SHA512 5863a5f67eb6b05f1b1c9ce6888ba485d8a1102d29cc57b53791175f831e597823b51065f8aada1769fdc395bfac04ff2eef4df9789101ee9b2be1d329a1f434
+MISC metadata.xml 381 BLAKE2B dbf08ca44df263501b3fc88f396d919e1666a75ce7aca83ced579a655adc1177c9a703fe1535a1c6cb398b5599ff3dca6e42454a9e66ce8a9314baa473c62a1f SHA512 9a9014f230f3fc8d925d93b281404523b8d11cdca0b06d18420fd0483c18593ef9d00dc8bde90e463c8419ff0063cbc39e56d8de220866148f6a9a779e275d97
diff --git a/dev-php/PEAR-Text_Figlet/PEAR-Text_Figlet-1.0.2-r1.ebuild b/dev-php/PEAR-Text_Figlet/PEAR-Text_Figlet-1.0.2-r1.ebuild
new file mode 100644
index 000000000000..8ecfa49b334d
--- /dev/null
+++ b/dev-php/PEAR-Text_Figlet/PEAR-Text_Figlet-1.0.2-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PN="${PN/PEAR-/}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Render text using FIGlet fonts"
+HOMEPAGE="http://pear.php.net/package/${MY_PN}"
+SRC_URI="http://download.pear.php.net/package/${MY_P}.tgz"
+LICENSE="PHP-3.01
+ examples? ( GPL-2+ OFL-1.1 )"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="examples"
+
+RDEPEND="dev-lang/php:*
+ dev-php/PEAR-PEAR"
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+ dodoc docs/README.TXT
+
+ if use examples; then
+ dodoc -r docs/examples
+
+ # Earlier versions of this ebuild installed this font under
+ # /usr/share/php/data, which is obviously the wrong place for
+ # them, but is where we have configured PEAR's data_dir. The
+ # fonts can be referenced by absolute path, however, and not
+ # just by name. Since this font is used in the example -- and as
+ # long as no one expects this *particular* font to work out of
+ # the box -- installing it with the docs will suffice.
+ #
+ # The one consumer of this in the tree is PEAR-Text_CAPTCHA, and
+ # it loads its fonts using an absolute path.
+ dodoc fonts/makisupa.flf
+ fi
+
+ insinto /usr/share/php
+ doins -r Text
+}
diff --git a/dev-php/PEAR-Text_Figlet/metadata.xml b/dev-php/PEAR-Text_Figlet/metadata.xml
new file mode 100644
index 000000000000..57978d029999
--- /dev/null
+++ b/dev-php/PEAR-Text_Figlet/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://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/Text_Figlet</remote-id>
+ <remote-id type="pear">Text_Figlet</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-php/PEAR-Text_Highlighter-0.7.3-r1 b/dev-php/PEAR-Text_Highlighter-0.7.3-r1
deleted file mode 100644
index c53c9960f7dc..000000000000
--- a/dev-php/PEAR-Text_Highlighter-0.7.3-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=A package for syntax highlighting
-EAPI=6
-HOMEPAGE=http://pear.php.net/package/Text_Highlighter
-KEYWORDS=~amd64 ~x86
-LICENSE=PHP-3.01
-RDEPEND=dev-lang/php dev-php/PEAR-PEAR dev-php/PEAR-XML_Serializer
-SLOT=0
-SRC_URI=http://download.pear.php.net/package/Text_Highlighter-0.7.3.tgz
-_md5_=450f7edf323d5f38500f6ddf072ca66c
diff --git a/dev-php/PEAR-Text_Highlighter-0.8.0 b/dev-php/PEAR-Text_Highlighter-0.8.0
deleted file mode 100644
index db3b142ff1fb..000000000000
--- a/dev-php/PEAR-Text_Highlighter-0.8.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DESCRIPTION=A package for syntax highlighting
-EAPI=6
-HOMEPAGE=https://pear.php.net/package/Text_Highlighter
-KEYWORDS=~amd64 ~x86
-LICENSE=PHP-3.01
-RDEPEND=>=dev-php/PEAR-PEAR-1.10.1 dev-php/PEAR-XML_Serializer >=dev-php/pear-1.8.1
-SLOT=0
-SRC_URI=https://pear.php.net/get/Text_Highlighter-0.8.0.tgz
-_eclasses_=php-pear-r2 eb6928c33771db74564e814c5ca6c1b3
-_md5_=d0de43a38cda5f44f0e421f819b297cc
diff --git a/dev-php/PEAR-Text_Highlighter/Manifest b/dev-php/PEAR-Text_Highlighter/Manifest
new file mode 100644
index 000000000000..46f20a90476a
--- /dev/null
+++ b/dev-php/PEAR-Text_Highlighter/Manifest
@@ -0,0 +1,5 @@
+DIST Text_Highlighter-0.7.3.tgz 138384 BLAKE2B 9cffd6dbe3eadf0a6e0465a6845bdc63f3b4b30af3bb09a7ac90cbb42575d0a98a3d8adf9e4f6e2f9e67d978a035a27e83bccd799f88513af72c492ad6241037 SHA512 59924cffbec8e4b652525f718012aa9a4f17d348401e191e292643df1e75a2a1b8687b7df701363816fcead1c55efe281a68b126f87df14806acd69ae6f44209
+DIST Text_Highlighter-0.8.0.tgz 138657 BLAKE2B d2d1c9374f5b2ac88c1bca7e91723e0a67ee8205f92b3d840669eda2f37cae9601f31eaf7373e4b32f5d4c36569115ed6777cfa562a1cd465a289f8f5f626a66 SHA512 9774fa613f95064629b749f2514e173275a4a15f46b649b208ca668ffc85118b5f26197ce3c9311fe8c1b200a76d30ed2e745929b0d4f1b54056732f4a5cfe05
+EBUILD PEAR-Text_Highlighter-0.7.3-r1.ebuild 864 BLAKE2B 3f7377c0d0a4f205b546d967e69fceb71fb202a3058ebc55b5a9ee166ca43c987236d0ec4f7ab3e7c5dc5167557024798b7e40f4bf4d4ee8a497f90a2f399c34 SHA512 44ae55d35ecd2563b236093a9bc1fdbeee0849f731e14c208e474f763f7d51be0c64c9f8ebc765baab575069b419612279a38defd4a1473aab2804cb8d27700c
+EBUILD PEAR-Text_Highlighter-0.8.0.ebuild 627 BLAKE2B 9ddf12412dc6d14d0b479d0042f043c3567876070f4e46148ca65a0da9d22488fcd646e2d2daff899ec8d01c4ffe736aadd6a16770dc1af38ea28f9329b4c531 SHA512 eca9ce847a3aa5ccd2d40d12886e7e0762b0e272a5c21dc3610b731fdf09bae9ef75e9570e83898a6c2933fee5cc91d8f0a8ac3bfe20a258eb96c9f8b2c8e393
+MISC metadata.xml 318 BLAKE2B 5253e98310510ca989d8e961869367b1dc99ab14c71fe435439377991dc9a9e774319ae082bbceea306b51ba822867c17fe4483ae37df94e0dbf37b7a87c001a SHA512 685d80a2af63fb76899a86132a149a086a3d38b14b4ee98b10d30b591492cf503fffe75e4065d99d81843579dc836cc4401f8cb461a2e4a85f658ec35cb657c9
diff --git a/dev-php/PEAR-Text_Highlighter/PEAR-Text_Highlighter-0.7.3-r1.ebuild b/dev-php/PEAR-Text_Highlighter/PEAR-Text_Highlighter-0.7.3-r1.ebuild
new file mode 100644
index 000000000000..4ddca264aecd
--- /dev/null
+++ b/dev-php/PEAR-Text_Highlighter/PEAR-Text_Highlighter-0.7.3-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PN="${PN/PEAR-/}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A package for syntax highlighting"
+HOMEPAGE="http://pear.php.net/package/${MY_PN}"
+SRC_URI="http://download.pear.php.net/package/${MY_P}.tgz"
+LICENSE="PHP-3.01"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# There is a documented dependency on XML_Parser, but that's only needed
+# for development -- if you want to *generate* the PHP class files. The
+# ones in the release are already pre-generated. The dependency on the
+# XML_Serializer, on the other hand, is not documented but is requird
+# by the XML output renderer.
+RDEPEND="dev-lang/php
+ dev-php/PEAR-PEAR
+ dev-php/PEAR-XML_Serializer"
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+ dodoc README TODO
+
+ insinto /usr/share/php
+ doins -r Text
+}
diff --git a/dev-php/PEAR-Text_Highlighter/PEAR-Text_Highlighter-0.8.0.ebuild b/dev-php/PEAR-Text_Highlighter/PEAR-Text_Highlighter-0.8.0.ebuild
new file mode 100644
index 000000000000..c3c25710ef34
--- /dev/null
+++ b/dev-php/PEAR-Text_Highlighter/PEAR-Text_Highlighter-0.8.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit php-pear-r2
+
+DESCRIPTION="A package for syntax highlighting"
+LICENSE="PHP-3.01"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# There is a documented dependency on XML_Parser, but that's only needed
+# for development -- if you want to *generate* the PHP class files. The
+# ones in the release are already pre-generated. The dependency on the
+# XML_Serializer, on the other hand, is not documented but is requird
+# by the XML output renderer.
+RDEPEND=">=dev-php/PEAR-PEAR-1.10.1
+ dev-php/PEAR-XML_Serializer"
diff --git a/dev-php/PEAR-Text_Highlighter/metadata.xml b/dev-php/PEAR-Text_Highlighter/metadata.xml
new file mode 100644
index 000000000000..a9eda71d7435
--- /dev/null
+++ b/dev-php/PEAR-Text_Highlighter/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ <name>PHP</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="pear">Text_Highlighter</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-php/PEAR-Text_Password-1.2.1 b/dev-php/PEAR-Text_Password-1.2.1
deleted file mode 100644
index 5e5132d20ea7..000000000000
--- a/dev-php/PEAR-Text_Password-1.2.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install test
-DEPEND=test? ( dev-lang/php:* dev-php/phpunit )
-DESCRIPTION=Creating passwords with PHP
-EAPI=6
-HOMEPAGE=http://pear.php.net/package/Text_Password
-IUSE=test
-KEYWORDS=alpha amd64 hppa ia64 ppc ppc64 ~sparc x86
-LICENSE=MIT
-RDEPEND=dev-lang/php:*
-SLOT=0
-SRC_URI=http://download.pear.php.net/package/Text_Password-1.2.1.tgz
-_md5_=2635293167c816887f6e0cb9fac279c8
diff --git a/dev-php/PEAR-Text_Password/Manifest b/dev-php/PEAR-Text_Password/Manifest
new file mode 100644
index 000000000000..14d3b04fabf7
--- /dev/null
+++ b/dev-php/PEAR-Text_Password/Manifest
@@ -0,0 +1,3 @@
+DIST Text_Password-1.2.1.tgz 5631 BLAKE2B d765606e7082076f92d76d3a2e7a0721950b9fc81b267a51aa3ef56ed92706105486d3a62a6ec81e06dbdb41a15d0a7e9add8ef99c87b76af6445fb7bcbdbaaa SHA512 9f7a357b92b8013f41cd964245fd764c5f1347b41612aacb5fca66e4963e007d7470ea3a046e6186cfebed4960c5b6e6e23e4f2ab9e08c7aee10cba5ea347fc9
+EBUILD PEAR-Text_Password-1.2.1.ebuild 611 BLAKE2B 78f707dae9a6159c74f3e25a2f09d930ea64e997b9c0f9c440605dea6b61d115f38287e71a6a6bd111d18573525fdc69e38471cd7e5b3f7a83fcbfee251162e8 SHA512 8377974c3759162f01bce94c1d0fd0ef5ab3f96a9cf1834c08c177680830d5eb72ee3d6a8cb8505c7306e2c845fe1c682dfd29194976dc1960fa30b3aaffcfd0
+MISC metadata.xml 385 BLAKE2B ae61061345cae297a5e8b33dda7940d439f7e59b44cd6b7f298664737a821fdd4abd60cd52655261a999fd850620e4ffe51767931c7edcba6354582c6bdfebf3 SHA512 3898231004b87b780853676c8779ff5162d1111ea9a85ec795ed7dbe1563c6ed70e1dcfc3a8f9fb76b1893db606d9b84e83963537d53f0e3b302893c1b87a4e7
diff --git a/dev-php/PEAR-Text_Password/PEAR-Text_Password-1.2.1.ebuild b/dev-php/PEAR-Text_Password/PEAR-Text_Password-1.2.1.ebuild
new file mode 100644
index 000000000000..3ba8e34522fd
--- /dev/null
+++ b/dev-php/PEAR-Text_Password/PEAR-Text_Password-1.2.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PN="${PN/PEAR-/}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Creating passwords with PHP"
+HOMEPAGE="http://pear.php.net/package/${MY_PN}"
+SRC_URI="http://download.pear.php.net/package/${MY_P}.tgz"
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 ~sparc x86"
+IUSE="test"
+
+RDEPEND="dev-lang/php:*"
+DEPEND="test? ( ${RDEPEND} dev-php/phpunit )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+ insinto /usr/share/php
+ doins -r Text
+}
+
+src_test() {
+ phpunit tests/ || die 'test suite failed'
+}
diff --git a/dev-php/PEAR-Text_Password/metadata.xml b/dev-php/PEAR-Text_Password/metadata.xml
new file mode 100644
index 000000000000..cf70151de8f4
--- /dev/null
+++ b/dev-php/PEAR-Text_Password/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://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/Text_Password</remote-id>
+ <remote-id type="pear">Text_Password</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-php/PEAR-Text_Wiki-1.2.2_p20170904 b/dev-php/PEAR-Text_Wiki-1.2.2_p20170904
deleted file mode 100644
index c98056a6e2b4..000000000000
--- a/dev-php/PEAR-Text_Wiki-1.2.2_p20170904
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm test unpack
-DEPEND=test? ( dev-php/phpunit dev-php/PEAR-PEAR )
-DESCRIPTION=Abstracts parsing and rendering rules for Wiki markup in structured plain text
-EAPI=6
-HOMEPAGE=https://pear.php.net/package/Text_Wiki
-IUSE=test
-KEYWORDS=alpha amd64 hppa ia64 ppc ppc64 sparc x86
-LICENSE=LGPL-2.1
-RDEPEND=>=dev-php/pear-1.8.1
-SLOT=0
-SRC_URI=https://github.com/pear/Text_Wiki/archive/32fd5f483f34645f4efd96d385d8950ea26d4a2a.tar.gz -> Text_Wiki-1.2.2_p20170904.tar.gz
-_eclasses_=php-pear-r2 eb6928c33771db74564e814c5ca6c1b3 vcs-snapshot 3be1ab44131e8c0bbdaa75823008444b
-_md5_=adc191a0b325f7b85b6e5003e5ea76e9
diff --git a/dev-php/PEAR-Text_Wiki/Manifest b/dev-php/PEAR-Text_Wiki/Manifest
new file mode 100644
index 000000000000..e2e7f4c7a4fb
--- /dev/null
+++ b/dev-php/PEAR-Text_Wiki/Manifest
@@ -0,0 +1,3 @@
+DIST Text_Wiki-1.2.2_p20170904.tar.gz 86810 BLAKE2B 3277fbfae5683c147c1537a7f789b8b9500bfa39014832ed08d91028882813f60727f9ff503d38dde5f017fd5f1ec69d61775a14094b0d267a1b0019f10090c8 SHA512 8e731a6cc9ec0e964d86de5eb96f285155f61d21e229499132f5b06ef8ff520658a42c9c6fb60d73b9bc8828ec9b616bc11e4f04bdd6e74836d52fc53a92dd71
+EBUILD PEAR-Text_Wiki-1.2.2_p20170904.ebuild 763 BLAKE2B 73b4d3a410e24afdf0008fde5b7fce25c63075db2f33eba44f6581d161569ca0ae3b2d407ce5ad8e72899920e0b0b6717efc6b3751134ce9f3f18967969d7a5d SHA512 57592893c62bea481e5b58d82c41cd73f5bce078e353fdf28334941aea3c47a10d660455ae94e2eb6def445388a6ababa9c705f527c7b61f95e8ef6efa9304f6
+MISC metadata.xml 326 BLAKE2B a47b62c42ef2f751077622f4a770ffe42148d1d185948fd956e3b6caa57b37962af47733e129851e8931c449fd958d76f5261a1483d0dce20dbd73ff07d688ec SHA512 0d6ef943c1e68ec438ea1ef9627745be5abd72124e378313cb68895452db19873da7ca975f5865ca191b8b9b6855665064000a7d2071df334f486a5b172c7aeb
diff --git a/dev-php/PEAR-Text_Wiki/PEAR-Text_Wiki-1.2.2_p20170904.ebuild b/dev-php/PEAR-Text_Wiki/PEAR-Text_Wiki-1.2.2_p20170904.ebuild
new file mode 100644
index 000000000000..cf72e330dc7e
--- /dev/null
+++ b/dev-php/PEAR-Text_Wiki/PEAR-Text_Wiki-1.2.2_p20170904.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit php-pear-r2 vcs-snapshot
+
+DESCRIPTION="Abstracts parsing and rendering rules for Wiki markup in structured plain text"
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
+IUSE="test"
+# Pull from github as pear.php.net is not updated
+SRC_URI="https://github.com/pear/${PHP_PEAR_PKG_NAME}/archive/32fd5f483f34645f4efd96d385d8950ea26d4a2a.tar.gz -> ${PEAR_P}.tar.gz"
+
+DEPEND="test? ( dev-php/phpunit dev-php/PEAR-PEAR )"
+
+src_test() {
+ peardev run-tests tests || die
+ phpunit tests/*.php || die
+}
+
+src_install() {
+ php-pear-r2_src_install
+ insinto /usr/share/php/.packagexml
+ newins package.xml "${PEAR_P}.xml"
+}
diff --git a/dev-php/PEAR-Text_Wiki/metadata.xml b/dev-php/PEAR-Text_Wiki/metadata.xml
new file mode 100644
index 000000000000..96c2f7441792
--- /dev/null
+++ b/dev-php/PEAR-Text_Wiki/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://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/archive</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-php/PEAR-Text_Wiki_BBCode-0.0.4-r3 b/dev-php/PEAR-Text_Wiki_BBCode-0.0.4-r3
deleted file mode 100644
index 44c290ff3490..000000000000
--- a/dev-php/PEAR-Text_Wiki_BBCode-0.0.4-r3
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DESCRIPTION=BBCode parser for Text_Wiki
-EAPI=6
-HOMEPAGE=https://pear.php.net/package/Text_Wiki_BBCode
-KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=LGPL-2.1 PHP-3
-RDEPEND=>=dev-php/PEAR-Text_Wiki-1.0.3 >=dev-php/pear-1.8.1
-SLOT=0
-SRC_URI=https://pear.php.net/get/Text_Wiki_BBCode-0.0.4.tgz
-_eclasses_=php-pear-r2 eb6928c33771db74564e814c5ca6c1b3
-_md5_=70a1a552df74496d4570cfbb6beb9859
diff --git a/dev-php/PEAR-Text_Wiki_BBCode/Manifest b/dev-php/PEAR-Text_Wiki_BBCode/Manifest
new file mode 100644
index 000000000000..e2798873d3e7
--- /dev/null
+++ b/dev-php/PEAR-Text_Wiki_BBCode/Manifest
@@ -0,0 +1,3 @@
+DIST Text_Wiki_BBCode-0.0.4.tgz 16411 BLAKE2B e4957f615460b46327df12764a313cfec91921fd2e701a0781d675e62bc7aa81e8cf45fc09422eb53da71d4c7afce6d286e2e03b90bec60c32726fb701289df5 SHA512 00b456f9c100ad534f619f1584224ef36a54309d967442c1ac30aeee697eca0e13ab802d9ae9677aad8dc94bda61748451a0fac7a0bba6f63e1f02844e4c9dba
+EBUILD PEAR-Text_Wiki_BBCode-0.0.4-r3.ebuild 447 BLAKE2B 4e67f25a41cf24ce2e62153030c80a11505eda64fff167d0c253935808ffb730b35d82ce28ae872fcb84fe2943d5ebe757ec2416f3171dc8d000ae67e0c951a4 SHA512 5565c0e0e94e503a3ec50b912a17d333f5eb35a471daa35efae6b1a1e17202f517bb58e1a3f3eee556890cf31552119e08ee114c775b2bc850e8d1875e23c702
+MISC metadata.xml 235 BLAKE2B 5b10304feea18aae1822be7d29bcce06c8715193b14a3dd2c4d79eb75e2767670352e2ca11e06b9a10ec04b63020a18254cd167e6d6be9072f4a200ca5d11ec4 SHA512 0b3e95bbf68eddf74289dad50f8828cffce2d904ff6f9bd5468177de979677cac11da84d1e0302c52b72085915b9d1b3496107172e5726520d51dad1981daf64
diff --git a/dev-php/PEAR-Text_Wiki_BBCode/PEAR-Text_Wiki_BBCode-0.0.4-r3.ebuild b/dev-php/PEAR-Text_Wiki_BBCode/PEAR-Text_Wiki_BBCode-0.0.4-r3.ebuild
new file mode 100644
index 000000000000..25a06efaece6
--- /dev/null
+++ b/dev-php/PEAR-Text_Wiki_BBCode/PEAR-Text_Wiki_BBCode-0.0.4-r3.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit php-pear-r2
+
+DESCRIPTION="BBCode parser for Text_Wiki"
+
+LICENSE="LGPL-2.1 PHP-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+DEPEND=""
+RDEPEND=">=dev-php/PEAR-Text_Wiki-1.0.3"
+
+DOCS=( doc/BBCodeParser_V2.ini
+ doc/BBCodeParser.php
+ doc/README_BBCodeParser
+ doc/parser.php
+ doc/BBtest.txt )
diff --git a/dev-php/PEAR-Text_Wiki_BBCode/metadata.xml b/dev-php/PEAR-Text_Wiki_BBCode/metadata.xml
new file mode 100644
index 000000000000..aca42932b833
--- /dev/null
+++ b/dev-php/PEAR-Text_Wiki_BBCode/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ <name>PHP</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-php/PEAR-Text_Wiki_Mediawiki-0.2.0_p20140604 b/dev-php/PEAR-Text_Wiki_Mediawiki-0.2.0_p20140604
deleted file mode 100644
index 5b91f5cd013e..000000000000
--- a/dev-php/PEAR-Text_Wiki_Mediawiki-0.2.0_p20140604
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm test unpack
-DEPEND=test? ( >=dev-php/PEAR-Text_Wiki-1.2.2_p20170904 dev-php/phpunit )
-DESCRIPTION=Mediawiki parser for Text_Wiki
-EAPI=6
-HOMEPAGE=https://pear.php.net/package/Text_Wiki_Mediawiki
-IUSE=test
-KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=LGPL-2.1
-RDEPEND=>=dev-php/PEAR-Text_Wiki-1.2.2_p20170904 >=dev-php/pear-1.8.1
-SLOT=0
-SRC_URI=https://github.com/pear/Text_Wiki_Mediawiki/archive/11a902741d3f8cc6010fb97b825d66345143e4dc.tar.gz -> Text_Wiki_Mediawiki-0.2.0_p20140604.tar.gz
-_eclasses_=php-pear-r2 eb6928c33771db74564e814c5ca6c1b3 vcs-snapshot 3be1ab44131e8c0bbdaa75823008444b
-_md5_=325124f60446464f4fc3508066524d62
diff --git a/dev-php/PEAR-Text_Wiki_Mediawiki/Manifest b/dev-php/PEAR-Text_Wiki_Mediawiki/Manifest
new file mode 100644
index 000000000000..8117060a6f95
--- /dev/null
+++ b/dev-php/PEAR-Text_Wiki_Mediawiki/Manifest
@@ -0,0 +1,4 @@
+AUX 0.2.0-constructor.patch 1554 BLAKE2B 0c8686ac4e11faecc21ef17524e005b580aa887694653318558676f513bddaa3fc33b3efd6763f458ec10fa52559045c8c2d9a9362b2bf66a61d03e5cf855bdb SHA512 7202a7e15bda9dce52dc52c6807abf7f0fb1c5957d2c74c9442c92286aeaf044e2eab1cd062df66345a109a5f574e136bfc2b0d309bdc78f3d099a08b2d667f8
+DIST Text_Wiki_Mediawiki-0.2.0_p20140604.tar.gz 22941 BLAKE2B d208b4df7e01a2b28e44ada0226be0f183fe6ffefe742f9b6cb4f2b366f915ae46d950d574a8357cbec273f41792f17a639f5512613628ee60ed137d909be9dd SHA512 aef4d18a4a0b9f41dc4bad701a90a2e7d674851b63206db9dd87cf87d6705991c8221e41cdbb8d2572a950520ce87db96105a009e4189e48b8e7f5df0f460ee5
+EBUILD PEAR-Text_Wiki_Mediawiki-0.2.0_p20140604.ebuild 762 BLAKE2B f354a9a3bbd91418c06b70c16e8b0a86811a76cfdf7a59ceaf1fac48132da497ad3a71b00e82234ba9bc74dc3fa50faa419f2ec050a5fa23db5baf62a2a6f880 SHA512 521bd3cc516ed6ddd3c7163479504900c51e4ce4cf548bfb64fc84abb1dc1984bb067d425b6946c86cdfe19d897d481f694c8333120e273e5e670d9a57433050
+MISC metadata.xml 235 BLAKE2B 5b10304feea18aae1822be7d29bcce06c8715193b14a3dd2c4d79eb75e2767670352e2ca11e06b9a10ec04b63020a18254cd167e6d6be9072f4a200ca5d11ec4 SHA512 0b3e95bbf68eddf74289dad50f8828cffce2d904ff6f9bd5468177de979677cac11da84d1e0302c52b72085915b9d1b3496107172e5726520d51dad1981daf64
diff --git a/dev-php/PEAR-Text_Wiki_Mediawiki/PEAR-Text_Wiki_Mediawiki-0.2.0_p20140604.ebuild b/dev-php/PEAR-Text_Wiki_Mediawiki/PEAR-Text_Wiki_Mediawiki-0.2.0_p20140604.ebuild
new file mode 100644
index 000000000000..ad7c16118923
--- /dev/null
+++ b/dev-php/PEAR-Text_Wiki_Mediawiki/PEAR-Text_Wiki_Mediawiki-0.2.0_p20140604.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit php-pear-r2 vcs-snapshot
+
+SRC_URI="https://github.com/pear/Text_Wiki_Mediawiki/archive/11a902741d3f8cc6010fb97b825d66345143e4dc.tar.gz -> ${PEAR_P}.tar.gz"
+DESCRIPTION="Mediawiki parser for Text_Wiki"
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+RDEPEND=">=dev-php/PEAR-Text_Wiki-1.2.2_p20170904"
+DEPEND="test? ( ${RDEPEND} dev-php/phpunit )"
+PATCHES=( "${FILESDIR}/0.2.0-constructor.patch" )
+
+src_test() {
+ phpunit tests/Text_Wiki_Parse_Mediawiki_Test.php || die
+}
+
+src_install() {
+ php-pear-r2_src_install
+ insinto /usr/share/php/.packagexml
+ newins package.xml "${PEAR_P}.xml"
+}
diff --git a/dev-php/PEAR-Text_Wiki_Mediawiki/files/0.2.0-constructor.patch b/dev-php/PEAR-Text_Wiki_Mediawiki/files/0.2.0-constructor.patch
new file mode 100644
index 000000000000..edd8e3572de0
--- /dev/null
+++ b/dev-php/PEAR-Text_Wiki_Mediawiki/files/0.2.0-constructor.patch
@@ -0,0 +1,36 @@
+diff -aurN a/Text/Wiki/Mediawiki.php b/Text/Wiki/Mediawiki.php
+--- a/Text/Wiki/Mediawiki.php 2014-06-04 23:24:45.000000000 -0400
++++ b/Text/Wiki/Mediawiki.php 2018-02-14 13:36:18.777893414 -0500
+@@ -87,7 +87,7 @@
+ * @param array $rules The set of rules to load for this object.
+ */
+ function __construct($rules = null) {
+- parent::Text_Wiki($rules);
++ parent::__construct($rules);
+ $this->addPath('parse', $this->fixPath(dirname(__FILE__)).'Parse/Mediawiki');
+ }
+ }
+diff -aurN a/Text/Wiki/Parse/Mediawiki/Url.php b/Text/Wiki/Parse/Mediawiki/Url.php
+--- a/Text/Wiki/Parse/Mediawiki/Url.php 2014-06-04 23:24:45.000000000 -0400
++++ b/Text/Wiki/Parse/Mediawiki/Url.php 2018-02-14 13:40:21.974024459 -0500
+@@ -87,7 +87,7 @@
+ */
+ function __construct(&$obj)
+ {
+- parent::Text_Wiki_Parse($obj);
++ parent::__construct($obj);
+
+ // convert the list of recognized schemes to a regex-safe string,
+ // where the pattern delim is a slash
+diff -aurN a/Text/Wiki/Parse/Mediawiki/Wikilink.php b/Text/Wiki/Parse/Mediawiki/Wikilink.php
+--- a/Text/Wiki/Parse/Mediawiki/Wikilink.php 2014-06-04 23:24:45.000000000 -0400
++++ b/Text/Wiki/Parse/Mediawiki/Wikilink.php 2018-02-14 13:40:46.030542359 -0500
+@@ -99,7 +99,7 @@
+ function __construct(&$obj)
+ {
+ $default = $this->conf;
+- parent::Text_Wiki_Parse($obj);
++ parent::__construct($obj);
+
+ // override config options for image if specified
+ if (in_array('Image', $this->wiki->disable)) {
diff --git a/dev-php/PEAR-Text_Wiki_Mediawiki/metadata.xml b/dev-php/PEAR-Text_Wiki_Mediawiki/metadata.xml
new file mode 100644
index 000000000000..aca42932b833
--- /dev/null
+++ b/dev-php/PEAR-Text_Wiki_Mediawiki/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ <name>PHP</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-php/PEAR-Validate-0.8.5-r1 b/dev-php/PEAR-Validate-0.8.5-r1
deleted file mode 100644
index f43b7cfd4f89..000000000000
--- a/dev-php/PEAR-Validate-0.8.5-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm test
-DEPEND=test? ( dev-php/PEAR-PEAR dev-php/PEAR-Date )
-DESCRIPTION=Validation class
-EAPI=6
-HOMEPAGE=https://pear.php.net/package/Validate
-IUSE=minimal test
-KEYWORDS=alpha amd64 ~arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86
-LICENSE=BSD
-RDEPEND=!minimal? ( dev-php/PEAR-Date ) >=dev-php/pear-1.8.1
-SLOT=0
-SRC_URI=https://pear.php.net/get/Validate-0.8.5.tgz
-_eclasses_=php-pear-r2 eb6928c33771db74564e814c5ca6c1b3
-_md5_=c45ec490fb4cbba57e5f4c12c584bad0
diff --git a/dev-php/PEAR-Validate/Manifest b/dev-php/PEAR-Validate/Manifest
new file mode 100644
index 000000000000..896db2de72cf
--- /dev/null
+++ b/dev-php/PEAR-Validate/Manifest
@@ -0,0 +1,4 @@
+AUX 0.8.5-fix-test-php7.patch 905 BLAKE2B 5d000b990cd38d697af861ff828f2e9efd8fdef0e2a6fec87fbc60208c1a9f40686c5c0be63cdf862221311f235f87bccb975cf78bb4d5f2b03be6916d3899bb SHA512 44aa6cb09f19ad3246bc7e6d825de786139da433564b902bfff020be52b14f554f752f0ca7f790d378a74a3a62e15cf13383a9bff25db2f67e4496d5bcef5e7b
+DIST Validate-0.8.5.tgz 21668 BLAKE2B 5f1897f9a796bab047beb7bdcf79726f58f069874cb1d08a17078c8d974bed626b3e37dd792e8b941fd0115d9060986278d459037580adedf6088ef51d5f2c13 SHA512 4e2e330b0a74a24d18af262ef42d872ab9eb2386e11c5647d898c60e11a29d06c97c0295cdf0999c3a4805f3f1efae2949c54520da50cf6adfcc5a6c4f6e1b63
+EBUILD PEAR-Validate-0.8.5-r1.ebuild 541 BLAKE2B 9ca8ea0fd971fa165ac0e8cf9f5e83a5f7a30aecaa477c31f1aae3fb5cc02615d470ff2adc89d745f5aa9e3ba6f3e08eb7a66dd0509ac6ba8931adbaa9e056f2 SHA512 46c9b99ec0de1cfc902c9bc36a90125825c95437f4d78ed79ed71dde19a9a168c67ed4e47bda7e21ac4f2fe3a3a792f9287e38a114bdec8a92b0ecfbc23d4af2
+MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/PEAR-Validate/PEAR-Validate-0.8.5-r1.ebuild b/dev-php/PEAR-Validate/PEAR-Validate-0.8.5-r1.ebuild
new file mode 100644
index 000000000000..61561fcf8e93
--- /dev/null
+++ b/dev-php/PEAR-Validate/PEAR-Validate-0.8.5-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit php-pear-r2
+
+KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+
+DESCRIPTION="Validation class"
+LICENSE="BSD"
+SLOT="0"
+IUSE="minimal test"
+
+DEPEND="test? ( dev-php/PEAR-PEAR dev-php/PEAR-Date )"
+RDEPEND="!minimal? ( dev-php/PEAR-Date )"
+PATCHES=( "${FILESDIR}/0.8.5-fix-test-php7.patch" )
+HTML_DOCS=( docs/Example_Locale.php docs/sample_multiple.php )
+
+src_test() {
+ peardev run-tests tests || die
+}
diff --git a/dev-php/PEAR-Validate/files/0.8.5-fix-test-php7.patch b/dev-php/PEAR-Validate/files/0.8.5-fix-test-php7.patch
new file mode 100644
index 000000000000..069c5467d049
--- /dev/null
+++ b/dev-php/PEAR-Validate/files/0.8.5-fix-test-php7.patch
@@ -0,0 +1,19 @@
+From a22b5cf2c7e4b4cf366c311150721961d9b456ea Mon Sep 17 00:00:00 2001
+From: Christian Weiske <cweiske@cweiske.de>
+Date: Thu, 16 Jul 2015 00:38:55 +0200
+Subject: [PATCH] Make tests run on PHP 7
+
+diff --git a/Validate.php b/Validate.php
+index a8f621c..ea6cfa7 100644
+--- a/Validate.php
++++ b/Validate.php
+@@ -583,7 +583,8 @@ function email($email, $options = null)
+ if ($use_rfc822? Validate::__emailRFC822($email, $options) :
+ preg_match($regex, $email)) {
+ if ($check_domain && function_exists('checkdnsrr')) {
+- $domain = preg_replace('/[^-a-z.0-9]/i', '', array_pop(explode('@', $email)));
++ $parts = explode('@', $email);
++ $domain = preg_replace('/[^-a-z.0-9]/i', '', array_pop($parts));
+ if (checkdnsrr($domain, 'MX') || checkdnsrr($domain, 'A')) {
+ return true;
+ }
diff --git a/dev-php/PEAR-Validate/metadata.xml b/dev-php/PEAR-Validate/metadata.xml
new file mode 100644
index 000000000000..b86acf66c756
--- /dev/null
+++ b/dev-php/PEAR-Validate/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ <name>PHP</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/dev-php/PEAR-Var_Dump-1.0.4-r3 b/dev-php/PEAR-Var_Dump-1.0.4-r3
deleted file mode 100644
index 711643c261df..000000000000
--- a/dev-php/PEAR-Var_Dump-1.0.4-r3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm test
-DEPEND=test? ( dev-php/PEAR-PEAR )
-DESCRIPTION=Dump structured information about a variable
-EAPI=6
-HOMEPAGE=https://pear.php.net/package/Var_Dump
-IUSE=examples test
-KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=PHP-3.01
-RDEPEND=>=dev-php/pear-1.8.1
-RESTRICT=test
-SLOT=0
-SRC_URI=https://pear.php.net/get/Var_Dump-1.0.4.tgz
-_eclasses_=php-pear-r2 eb6928c33771db74564e814c5ca6c1b3
-_md5_=02b5fbb419ef21434c3df1528f43148a
diff --git a/dev-php/PEAR-Var_Dump/Manifest b/dev-php/PEAR-Var_Dump/Manifest
new file mode 100644
index 000000000000..ebc9f0cbcee0
--- /dev/null
+++ b/dev-php/PEAR-Var_Dump/Manifest
@@ -0,0 +1,3 @@
+DIST Var_Dump-1.0.4.tgz 17426 BLAKE2B 60161be980edeae902e64c387b30466511b5cc0e6395f02334346c82e0393577c041fbc272577caa48510303bff3c1bce8e0c3c6708fade04a13b22f28b84b79 SHA512 1d31fcc3519feeee2ec94fc6d8b919672cf4a1be80d6b63c0a52b30792b9c936a7b984033a4357a64cd937193a55daf67fb649444f8303f1332f7d7c793b2e89
+EBUILD PEAR-Var_Dump-1.0.4-r3.ebuild 907 BLAKE2B 41d6efc8a6dab0038726ddb9fce04e4fbe9233a28e6a197ba8fe000afeb79d1d4ee5dca048601946c76ea8d8441f6a0ddad4d7b167df60f794be4d286a38a019 SHA512 6b2dc80cf203c6f594397183c2d68aaa29a98de8b5f0d47dd74b6e92ab03356f80456c559d96d7d941e1a736f9d84bb49d5404e7c47fe1a333903df9619c48e6
+MISC metadata.xml 310 BLAKE2B 8f57f1c9b2897f821b7845e5f2a3661fbe758dc2792504fa8cbbae495d6339dcb56e86ffd36e2209826acef8c0756bc3b728f41db345c4491b98130a89b0321a SHA512 6fbd4f6ac4419473c097c4f09f448e0a2d81a7bb3d8d93fa79fa4ef0b2cff7ca463cd985b60bc5e7572230eb9296e37c446adb781c5d68e95510b999ec1dc66c
diff --git a/dev-php/PEAR-Var_Dump/PEAR-Var_Dump-1.0.4-r3.ebuild b/dev-php/PEAR-Var_Dump/PEAR-Var_Dump-1.0.4-r3.ebuild
new file mode 100644
index 000000000000..707cff167f52
--- /dev/null
+++ b/dev-php/PEAR-Var_Dump/PEAR-Var_Dump-1.0.4-r3.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit php-pear-r2
+
+DESCRIPTION="Dump structured information about a variable"
+LICENSE="PHP-3.01"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="examples test"
+
+DEPEND="test? ( dev-php/PEAR-PEAR )"
+
+# The test suite fails due to some deprecation warnings that are output.
+# The test cases themselves set error_reporting(E_ALL), so there's no
+# easy way to override it.
+RESTRICT=test
+
+src_install() {
+ use examples && dodoc -r docs/example*.php
+ php-pear-r2_src_install
+}
+
+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-Var_Dump/metadata.xml b/dev-php/PEAR-Var_Dump/metadata.xml
new file mode 100644
index 000000000000..08b46f8f0cb9
--- /dev/null
+++ b/dev-php/PEAR-Var_Dump/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ <name>PHP</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="pear">Var_Dump</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-php/PEAR-VersionControl_SVN-0.5.2-r1 b/dev-php/PEAR-VersionControl_SVN-0.5.2-r1
deleted file mode 100644
index 6bcc8f0271b9..000000000000
--- a/dev-php/PEAR-VersionControl_SVN-0.5.2-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare
-DESCRIPTION=Simple OO wrapper interface for the Subversion command-line client
-EAPI=6
-HOMEPAGE=https://pear.php.net/package/VersionControl_SVN
-KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=BSD
-RDEPEND=>=dev-php/pear-1.8.1
-SLOT=0
-SRC_URI=https://pear.php.net/get/VersionControl_SVN-0.5.2.tgz
-_eclasses_=php-pear-r2 eb6928c33771db74564e814c5ca6c1b3
-_md5_=21e64be16a43d80fce2383d335e333cc
diff --git a/dev-php/PEAR-VersionControl_SVN-0.5.2_p20180314 b/dev-php/PEAR-VersionControl_SVN-0.5.2_p20180314
deleted file mode 100644
index 5ac5123f4fb4..000000000000
--- a/dev-php/PEAR-VersionControl_SVN-0.5.2_p20180314
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare test unpack
-DEPEND=test? ( dev-vcs/subversion dev-php/phpunit )
-DESCRIPTION=Simple OO wrapper interface for the Subversion command-line client
-EAPI=6
-HOMEPAGE=https://pear.php.net/package/VersionControl_SVN
-IUSE=test
-KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=BSD
-RDEPEND=>=dev-php/pear-1.8.1
-SLOT=0
-SRC_URI=https://github.com/pear/VersionControl_SVN/archive/6c9580df92f0cc77a6eb6fcc216c56913bf308e7.tar.gz -> PEAR-VersionControl_SVN-0.5.2_p20180314.tar.gz
-_eclasses_=php-pear-r2 eb6928c33771db74564e814c5ca6c1b3 vcs-snapshot 3be1ab44131e8c0bbdaa75823008444b
-_md5_=7c89bc31a6cda70419c0e67a101727ae
diff --git a/dev-php/PEAR-VersionControl_SVN/Manifest b/dev-php/PEAR-VersionControl_SVN/Manifest
new file mode 100644
index 000000000000..db08d3916d08
--- /dev/null
+++ b/dev-php/PEAR-VersionControl_SVN/Manifest
@@ -0,0 +1,5 @@
+DIST PEAR-VersionControl_SVN-0.5.2_p20180314.tar.gz 36697 BLAKE2B 998e9c08d19284de2bd723fff07bc4c319ed65b12baad012f5f8e6b283060cd25cdefa5141e71f8368555d963e7ab1eec7b8e41d38cbd9a89dbd6977f72b5102 SHA512 aaba6fcd65d3906c9d98085b109d1357578be7557a9ac5b5997ae9a9896cb0970f3bf707246e5afc68dfbb8268a8fad36265b484220387b56e8de85e390db82a
+DIST VersionControl_SVN-0.5.2.tgz 31356 BLAKE2B d59971b0677d3e88b47f1fb249c6ba6971db7b868e390589705058fa0cc19a3b4e7a2da38db78b37a9fa7b8f9233297a4fb5376b1b225c8e93f41bbe65c99007 SHA512 09aaab0461a52fe87e5723472b9978c8f928a4741e11a69672ae1350ecdf90b287d951b8343b5fbfbc1d7cd449055cb249f229a1e943cdcd807e9b36e0a48b86
+EBUILD PEAR-VersionControl_SVN-0.5.2-r1.ebuild 586 BLAKE2B fe71070981e12a7151c32e16d4f4d08259dd4fbb79b4b70f43eb18a39763e4cd3de7c734cabf4759f6eda80de2f0711d62466607332b2a128c1077db84efd767 SHA512 12ce42b63818dc4bfd2960ee83c640767ca70fb782853aa1783e160699b793bec7d3d3f69a39e812d0a8dd0c3182b77fce0e9678b3c2061bcf896aea23eeb004
+EBUILD PEAR-VersionControl_SVN-0.5.2_p20180314.ebuild 938 BLAKE2B ff3f32f8a981a526a31251ee0d3a62c0d2d55fedfaa1ecf43a3963cee1fc0d64f3bddc554d8ebc5f9052b117997042d250c690c884eef3a2d16edf687177bc15 SHA512 5a2fd603d9f1e31d1e820575c870c55e98b5b6dc1bdb6119a20ced539c147e13b4ecb6ab669dd1585e9a33c71723fb8975b5926dffd50c671b212969206e7e2c
+MISC metadata.xml 235 BLAKE2B 5b10304feea18aae1822be7d29bcce06c8715193b14a3dd2c4d79eb75e2767670352e2ca11e06b9a10ec04b63020a18254cd167e6d6be9072f4a200ca5d11ec4 SHA512 0b3e95bbf68eddf74289dad50f8828cffce2d904ff6f9bd5468177de979677cac11da84d1e0302c52b72085915b9d1b3496107172e5726520d51dad1981daf64
diff --git a/dev-php/PEAR-VersionControl_SVN/PEAR-VersionControl_SVN-0.5.2-r1.ebuild b/dev-php/PEAR-VersionControl_SVN/PEAR-VersionControl_SVN-0.5.2-r1.ebuild
new file mode 100644
index 000000000000..7fea8919316e
--- /dev/null
+++ b/dev-php/PEAR-VersionControl_SVN/PEAR-VersionControl_SVN-0.5.2-r1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit php-pear-r2
+
+DESCRIPTION="Simple OO wrapper interface for the Subversion command-line client"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+RDEPEND=""
+
+src_prepare() {
+ einfo "Patching SVN.php and SVN/Command.php to use proper paths by default"
+ sed -i -e 's:/usr/local:/usr:g' VersionControl/SVN.php || die "sed failed"
+ sed -i -e 's:/usr/local:/usr:g' VersionControl/SVN/Command.php || die "sed failed"
+ default
+}
diff --git a/dev-php/PEAR-VersionControl_SVN/PEAR-VersionControl_SVN-0.5.2_p20180314.ebuild b/dev-php/PEAR-VersionControl_SVN/PEAR-VersionControl_SVN-0.5.2_p20180314.ebuild
new file mode 100644
index 000000000000..e228a7700964
--- /dev/null
+++ b/dev-php/PEAR-VersionControl_SVN/PEAR-VersionControl_SVN-0.5.2_p20180314.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit php-pear-r2 vcs-snapshot
+
+DESCRIPTION="Simple OO wrapper interface for the Subversion command-line client"
+SRC_URI="https://github.com/pear/VersionControl_SVN/archive/6c9580df92f0cc77a6eb6fcc216c56913bf308e7.tar.gz -> ${P}.tar.gz"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+RDEPEND=""
+DEPEND="test? ( dev-vcs/subversion dev-php/phpunit )"
+S="${WORKDIR}/PEAR-${PHP_PEAR_PKG_NAME}-${PV}"
+
+src_prepare() {
+ einfo "Patching SVN.php and SVN/Command.php to use proper paths by default"
+ sed -i -e 's:/usr/local:/usr:g' VersionControl/SVN.php || die "sed failed"
+ sed -i -e 's:/usr/local:/usr:g' VersionControl/SVN/Command.php || die "sed failed"
+ sed -i 's/ +%d / %i /' tests/resetxml_19910.phpt || die
+ default
+}
+
+src_test() {
+ phpunit tests || die "Tests failed"
+}
diff --git a/dev-php/PEAR-VersionControl_SVN/metadata.xml b/dev-php/PEAR-VersionControl_SVN/metadata.xml
new file mode 100644
index 000000000000..aca42932b833
--- /dev/null
+++ b/dev-php/PEAR-VersionControl_SVN/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ <name>PHP</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-php/PEAR-XML_Parser-1.3.7-r1 b/dev-php/PEAR-XML_Parser-1.3.7-r1
deleted file mode 100644
index b15186eb1ecc..000000000000
--- a/dev-php/PEAR-XML_Parser-1.3.7-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst postrm test
-DESCRIPTION=XML parsing class based on PHP's SAX parser
-EAPI=6
-HOMEPAGE=https://pear.php.net/package/XML_Parser
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86
-LICENSE=BSD
-RDEPEND=>=dev-php/pear-1.8.1
-SLOT=0
-SRC_URI=https://pear.php.net/get/XML_Parser-1.3.7.tgz
-_eclasses_=php-pear-r2 eb6928c33771db74564e814c5ca6c1b3
-_md5_=54266d258ae0a34466156653b2399c49
diff --git a/dev-php/PEAR-XML_Parser/Manifest b/dev-php/PEAR-XML_Parser/Manifest
new file mode 100644
index 000000000000..3bf9e260b82a
--- /dev/null
+++ b/dev-php/PEAR-XML_Parser/Manifest
@@ -0,0 +1,3 @@
+DIST XML_Parser-1.3.7.tgz 13339 BLAKE2B 10cc89dbf4f6c4b28fea73cc45757e71a897b01fd21a3d2711fef5eb0cd33e1fdeda143ce88dd425fdea9802a02f3d7e352ec17295b88d8cfae87af6a342f622 SHA512 b4e6c76962eb47f15096e7d77658cf41ca372a9389967e5204e865b253da4f4e248e7b893aa4c6624bb1178e3985667d018849df6d9a07aa6b9a707c743fe64b
+EBUILD PEAR-XML_Parser-1.3.7-r1.ebuild 339 BLAKE2B 48cc1f0e3d334b1711c28278aa03e2ee42c421d6d10ba1476ec59f3d4b7bc8d387d844cc27254f7df837802052261a7c3c7d7b5aae9b0615f459dc066cfd013c SHA512 7eeb72c6907f6e123ddf32f7d17ee231d5871ea5bfc86a9c1fcbbef79935530d8842cd4b9bd55f3882492e6e2a3cef80bb01bb0e1a178e791d48a083061c0cb3
+MISC metadata.xml 235 BLAKE2B 5b10304feea18aae1822be7d29bcce06c8715193b14a3dd2c4d79eb75e2767670352e2ca11e06b9a10ec04b63020a18254cd167e6d6be9072f4a200ca5d11ec4 SHA512 0b3e95bbf68eddf74289dad50f8828cffce2d904ff6f9bd5468177de979677cac11da84d1e0302c52b72085915b9d1b3496107172e5726520d51dad1981daf64
diff --git a/dev-php/PEAR-XML_Parser/PEAR-XML_Parser-1.3.7-r1.ebuild b/dev-php/PEAR-XML_Parser/PEAR-XML_Parser-1.3.7-r1.ebuild
new file mode 100644
index 000000000000..afda5278bac3
--- /dev/null
+++ b/dev-php/PEAR-XML_Parser/PEAR-XML_Parser-1.3.7-r1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit php-pear-r2
+
+DESCRIPTION="XML parsing class based on PHP's SAX parser"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+IUSE=""
+
+src_test() {
+ peardev run-tests -r || die
+}
diff --git a/dev-php/PEAR-XML_Parser/metadata.xml b/dev-php/PEAR-XML_Parser/metadata.xml
new file mode 100644
index 000000000000..aca42932b833
--- /dev/null
+++ b/dev-php/PEAR-XML_Parser/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ <name>PHP</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-php/PEAR-XML_RSS-1.1.0 b/dev-php/PEAR-XML_RSS-1.1.0
deleted file mode 100644
index 5b785fdbc11d..000000000000
--- a/dev-php/PEAR-XML_RSS-1.1.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DESCRIPTION=PHP parser for RDF and RSS documents
-EAPI=6
-HOMEPAGE=https://pear.php.net/package/XML_RSS
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=PHP-3.01
-RDEPEND=>=dev-php/PEAR-PEAR-1.10.1 dev-php/PEAR-XML_Parser >=dev-php/pear-1.8.1
-SLOT=0
-SRC_URI=https://pear.php.net/get/XML_RSS-1.1.0.tgz
-_eclasses_=php-pear-r2 eb6928c33771db74564e814c5ca6c1b3
-_md5_=44157a37ee88f500924e96a0de9e7daa
diff --git a/dev-php/PEAR-XML_RSS-1.1.0_alpha1 b/dev-php/PEAR-XML_RSS-1.1.0_alpha1
deleted file mode 100644
index 7ad728f936dc..000000000000
--- a/dev-php/PEAR-XML_RSS-1.1.0_alpha1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=PHP parser for RDF and RSS documents
-EAPI=6
-HOMEPAGE=http://pear.php.net/package/XML_RSS
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86
-LICENSE=PHP-3.01
-RDEPEND=dev-lang/php:* dev-php/PEAR-PEAR dev-php/PEAR-XML_Parser
-SLOT=0
-SRC_URI=http://download.pear.php.net/package/XML_RSS-1.1.0a1.tgz
-_md5_=c75ede56958ed520a613e0da39572b26
diff --git a/dev-php/PEAR-XML_RSS/Manifest b/dev-php/PEAR-XML_RSS/Manifest
new file mode 100644
index 000000000000..d928017d61df
--- /dev/null
+++ b/dev-php/PEAR-XML_RSS/Manifest
@@ -0,0 +1,5 @@
+DIST XML_RSS-1.1.0.tgz 8178 BLAKE2B da290ea2e656372478435451b5043f3254e1a06423495c62c753b636208ece31e5b9aebe59a9b84254aac70d2088b4c35f78b763b6045d29c467ff0989bbc6fa SHA512 947b040ec71728328bad0130da874132c12e8c14a37f57b0ebc4e9db26aed49d0f9702e20ae401bd92782e1895de71dbd5daf09adebec0eaf268c77dfe183c24
+DIST XML_RSS-1.1.0a1.tgz 6717 BLAKE2B f38aaa6981d94668031272cd48f5648ce9fec499fde4627b6291d1a9c0dea4db72779e3ce7a089be9ee5d23ad56d05c6bd3ffce031b9ef3f4fac5360c3da4420 SHA512 e88c7618cad60a775c07ac26aedf05b7ce7ab3c9f012f3e638031b3567227db237ee2e1238fa051f9f415388a5d7c131af02b8200e08c01a9078654ea5877ce8
+EBUILD PEAR-XML_RSS-1.1.0.ebuild 494 BLAKE2B 81e459768c0ab8d048f6765c65ce5427e9f32aa5a9a9a55df0f6b46796b68e194d7d2bbf20d81f2ef5ac746e3cdd311968b62fe7796a9f6c7648fe4e938848b0 SHA512 5c3d036faf76e1c9efe9bb61c0b8604f953d4b9db00d2cd169694fd26b7ef87a847abcf547c91db7939b494883216c29ca8beb2b8ff54cda771311fb7cecb9d3
+EBUILD PEAR-XML_RSS-1.1.0_alpha1.ebuild 748 BLAKE2B 13bb6be198b8b2e231073fd84b25124be63ac6388caa591f0adc603bdf88b514089abacb360a1731e1eea5657787a704a9ab563eba4c5367533a0226c23fde23 SHA512 1981adb9871b97c0e4a5da8938ab217504e6298c64e03b25aea6ddd3f01007b919528b5b3f854a1815d71d3077a8da986db97a52786d852bd8728d89d0f0a427
+MISC metadata.xml 373 BLAKE2B 23ac6ae6766ff928da3558d2c05d6ff025f56b76045044634d1706b046bfd1fe741dafc1ed10489113521f23e2ccd95f8d529d8be240948ee90f09ba236d9dae SHA512 e5be199ccfe81e85816b693f8b624ad2346e8948717dd26496e8e9f4b048c9189515fb11cabbe55a26f81e448937db5f1f16f37cb59bf3d24c3e3a68725e4e30
diff --git a/dev-php/PEAR-XML_RSS/PEAR-XML_RSS-1.1.0.ebuild b/dev-php/PEAR-XML_RSS/PEAR-XML_RSS-1.1.0.ebuild
new file mode 100644
index 000000000000..bd575d2b9911
--- /dev/null
+++ b/dev-php/PEAR-XML_RSS/PEAR-XML_RSS-1.1.0.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit php-pear-r2
+
+DESCRIPTION="PHP parser for RDF and RSS documents"
+LICENSE="PHP-3.01"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE=""
+
+# Only needs PEAR_Exception (not in the tree), not all of PEAR.
+# This can be made into an || dependency if we add PEAR_Exception.
+RDEPEND=">=dev-php/PEAR-PEAR-1.10.1
+ dev-php/PEAR-XML_Parser"
diff --git a/dev-php/PEAR-XML_RSS/PEAR-XML_RSS-1.1.0_alpha1.ebuild b/dev-php/PEAR-XML_RSS/PEAR-XML_RSS-1.1.0_alpha1.ebuild
new file mode 100644
index 000000000000..ee29e7f4a89e
--- /dev/null
+++ b/dev-php/PEAR-XML_RSS/PEAR-XML_RSS-1.1.0_alpha1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PN="${PN/PEAR-/}"
+MY_PV="${PV/_/}"
+MY_PV="${MY_PV/alpha/a}"
+MY_P="${MY_PN}-${MY_PV}"
+
+DESCRIPTION="PHP parser for RDF and RSS documents"
+HOMEPAGE="http://pear.php.net/package/${MY_PN}"
+SRC_URI="http://download.pear.php.net/package/${MY_P}.tgz"
+LICENSE="PHP-3.01"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+IUSE=""
+
+# Only needs PEAR_Exception (not in the tree), not all of PEAR.
+# This can be made into an || dependency if we add PEAR_Exception.
+RDEPEND="dev-lang/php:*
+ dev-php/PEAR-PEAR
+ dev-php/PEAR-XML_Parser"
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+ insinto /usr/share/php
+ doins -r XML
+}
diff --git a/dev-php/PEAR-XML_RSS/metadata.xml b/dev-php/PEAR-XML_RSS/metadata.xml
new file mode 100644
index 000000000000..5df328cb979e
--- /dev/null
+++ b/dev-php/PEAR-XML_RSS/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://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/XML_RSS</remote-id>
+ <remote-id type="pear">XML_RSS</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-php/PEAR-XML_Serializer-0.21.0-r1 b/dev-php/PEAR-XML_Serializer-0.21.0-r1
deleted file mode 100644
index 8dffbea205af..000000000000
--- a/dev-php/PEAR-XML_Serializer-0.21.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm test
-DEPEND=test? ( dev-lang/php:*[xml] >=dev-php/PEAR-XML_Parser-1.2.7 >=dev-php/PEAR-XML_Util-1.1.1-r1 )
-DESCRIPTION=Swiss-army knife for reading and writing XML files
-EAPI=6
-HOMEPAGE=https://pear.php.net/package/XML_Serializer
-IUSE=examples test
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86
-LICENSE=BSD
-RDEPEND=dev-lang/php:*[xml] >=dev-php/PEAR-XML_Parser-1.2.7 >=dev-php/PEAR-XML_Util-1.1.1-r1 >=dev-php/pear-1.8.1
-SLOT=0
-SRC_URI=https://pear.php.net/get/XML_Serializer-0.21.0.tgz
-_eclasses_=php-pear-r2 eb6928c33771db74564e814c5ca6c1b3
-_md5_=cd02b985731e118c0b366d38d35c39c0
diff --git a/dev-php/PEAR-XML_Serializer/Manifest b/dev-php/PEAR-XML_Serializer/Manifest
new file mode 100644
index 000000000000..f1259a07c7c9
--- /dev/null
+++ b/dev-php/PEAR-XML_Serializer/Manifest
@@ -0,0 +1,3 @@
+DIST XML_Serializer-0.21.0.tgz 33362 BLAKE2B dc7d9f5d40f538e4cdb6a9046bd5ba4d3970fe710dca5b809a808e057f782628aa124a6f541b800f55e15c5f5aaef335150c7342a2a96845ae60eb275bc897a3 SHA512 f547fc92d5b102681229c8c8830ca8201ba529c06a720ad761f2c3cedd757d858711c3d8b0dbd2f88b0815758561acc297cee002162bdee6002c1c7310c8f67a
+EBUILD PEAR-XML_Serializer-0.21.0-r1.ebuild 626 BLAKE2B 9aee18e694d25e23d99618d9af980e916ec155935192dc0593614f50629f45eaa4125e3e49370d5898bf265aa7a12dfda44af71f677331e508eb14596245710f SHA512 7ab6cdb85a121c2e62f349a5fae9c87fcc491da6e5a853c7a50be3debd0a3e2319383ef08959be49fc21c9ef1d1b7409214301ba266ba44581ec775916f032f8
+MISC metadata.xml 316 BLAKE2B 901abfe1e0ca8a6a60797d2376d048547811123601008200b10f48784af8d0e92eca6bc0ce38d8d2b2cf8c0c98d47666bf9215546cf53d7a1558dd8018c03c8c SHA512 c8b05d370fd3dad6cda63253224f1e5cb331efbbbcc1915d5ca90551b79754c6a18f590278595128a46c39d8721f913ec5dbe01b08874a64584d722853dafdef
diff --git a/dev-php/PEAR-XML_Serializer/PEAR-XML_Serializer-0.21.0-r1.ebuild b/dev-php/PEAR-XML_Serializer/PEAR-XML_Serializer-0.21.0-r1.ebuild
new file mode 100644
index 000000000000..14148c4840d9
--- /dev/null
+++ b/dev-php/PEAR-XML_Serializer/PEAR-XML_Serializer-0.21.0-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+inherit php-pear-r2
+
+DESCRIPTION="Swiss-army knife for reading and writing XML files"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+IUSE="examples test"
+
+RDEPEND="dev-lang/php:*[xml]
+ >=dev-php/PEAR-XML_Parser-1.2.7
+ >=dev-php/PEAR-XML_Util-1.1.1-r1
+ "
+DEPEND="test? ( ${RDEPEND} )"
+
+src_install() {
+ php-pear-r2_src_install
+ if use examples ; then
+ insinto /usr/share/php/docs/${PN/PEAR-//}
+ doins -r examples
+ fi
+}
+
+src_test() {
+ peardev run-tests -r || die
+}
diff --git a/dev-php/PEAR-XML_Serializer/metadata.xml b/dev-php/PEAR-XML_Serializer/metadata.xml
new file mode 100644
index 000000000000..0be2be4fa674
--- /dev/null
+++ b/dev-php/PEAR-XML_Serializer/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ <name>PHP</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="pear">XML_Serializer</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-php/PEAR-XML_Util-1.4.2 b/dev-php/PEAR-XML_Util-1.4.2
deleted file mode 100644
index f76876351d54..000000000000
--- a/dev-php/PEAR-XML_Util-1.4.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=XML utility class
-EAPI=6
-HOMEPAGE=http://pear.php.net/package/XML_Util
-IUSE=examples
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86
-LICENSE=BSD
-PDEPEND=dev-php/PEAR-PEAR
-RDEPEND=dev-lang/php:*[pcre(+)]
-SLOT=0
-SRC_URI=http://pear.php.net/get/XML_Util-1.4.2.tgz
-_md5_=2872da0e5b9109ea244173c6418cf985
diff --git a/dev-php/PEAR-XML_Util/Manifest b/dev-php/PEAR-XML_Util/Manifest
new file mode 100644
index 000000000000..81fe957b67aa
--- /dev/null
+++ b/dev-php/PEAR-XML_Util/Manifest
@@ -0,0 +1,3 @@
+DIST XML_Util-1.4.2.tgz 18993 BLAKE2B b2667aed3b3ec75dd8fca1625c6fa3d03a7662c24ce0fce69cb983f42fc3f45bc0bf27bdee7353c1d29fe0eabc181f2cbd415883575f5d6cf7163097c10f6d9c SHA512 e0a328f92cdcd09277238e14d68b73cba319ab9b4e9c50ab102b43f73c889599f5933415dc228bd1feb56a48c1527e0e9a86999ee2209b2d84131691aee74cbe
+EBUILD PEAR-XML_Util-1.4.2.ebuild 647 BLAKE2B e289c1b24c4d5b9b01f190044d51c6d02052f5746ae8bc9a45c92456360e49163db1c85b572ce5c779402e4533a7ccd05c522a66ddc1bffd317153de3c3695ca SHA512 b238c33990d04b1665904bb7c890dd9b0b2ee2e836ec8282e17bc543ac7207ed7dbef0822fb66f9f45da4c2df673034c07a1f906659cbf121b763c0b6224fb1f
+MISC metadata.xml 310 BLAKE2B d264a3ec20fb493c77b95f1225895c3a77d0abbe96f7c5240b804b785211d9aa0b2b26e1efd39e2592d96fd6f2ba42568e97428f944ee6952e101d577bb3e99b SHA512 a0726d245546336d0efa22151520fc51461ec1bdb31f2a4012ffcd5fd94858168f621aa903e489e44c43023c8d1a2b3f8aa05d995975b1abf7332e7cf3eed5e8
diff --git a/dev-php/PEAR-XML_Util/PEAR-XML_Util-1.4.2.ebuild b/dev-php/PEAR-XML_Util/PEAR-XML_Util-1.4.2.ebuild
new file mode 100644
index 000000000000..5b00e94cc84c
--- /dev/null
+++ b/dev-php/PEAR-XML_Util/PEAR-XML_Util-1.4.2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PN="${PN/PEAR-/}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="XML utility class"
+HOMEPAGE="http://pear.php.net/package/${MY_PN}"
+SRC_URI="http://pear.php.net/get/${MY_P}.tgz"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+IUSE="examples"
+
+# PCRE is needed for a few calls to preg_replace and preg_match.
+RDEPEND="dev-lang/php:*[pcre(+)]"
+PDEPEND="dev-php/PEAR-PEAR"
+DEPEND=""
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+ insinto /usr/share/php
+ doins -r XML
+
+ use examples && dodoc -r examples
+}
diff --git a/dev-php/PEAR-XML_Util/metadata.xml b/dev-php/PEAR-XML_Util/metadata.xml
new file mode 100644
index 000000000000..8e8d4acf2172
--- /dev/null
+++ b/dev-php/PEAR-XML_Util/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ <name>PHP</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="pear">XML_Util</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-php/PHPMailer-5.2.26-r2 b/dev-php/PHPMailer-5.2.26-r2
deleted file mode 100644
index 175eff057865..000000000000
--- a/dev-php/PHPMailer-5.2.26-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst
-DEPEND=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] ) ) doc? ( dev-php/phpDocumentor )
-DESCRIPTION=Full-featured email creation and transfer class for PHP
-EAPI=6
-HOMEPAGE=https://github.com/PHPMailer/PHPMailer
-IUSE=doc examples idn ssl
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-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] ) )
-SLOT=0
-SRC_URI=https://github.com/PHPMailer/PHPMailer/archive/v5.2.26.tar.gz -> PHPMailer-5.2.26.tar.gz
-_md5_=ddbf035dd28086d4754ef2da3f0ef177
diff --git a/dev-php/PHPMailer/Manifest b/dev-php/PHPMailer/Manifest
new file mode 100644
index 000000000000..2596bd565cd5
--- /dev/null
+++ b/dev-php/PHPMailer/Manifest
@@ -0,0 +1,3 @@
+DIST PHPMailer-5.2.26.tar.gz 159174 BLAKE2B 989ee85f6ca374bd7f4accf3d18fbd173bbbd3176e6846c9a2aec68f3bfca4ead4e0197f6287e2bc8ed4a125bf7fcb53240a1f8ce6a1813eaffb66067c2c4e9e SHA512 4c3e324ecd1dd23eb40f14ee785fb9b353b742ff4fb26fe0586622038157e60d64560f5ba4a625f16fad6568954d685ebbe436d88bc427d5bd260c056815b656
+EBUILD PHPMailer-5.2.26-r2.ebuild 1960 BLAKE2B 7bb0a7ea8e71c6bff9cc37972f0e62b5e71184707da7f7543d8fa5578ecb090ce8be4086ad2abb55675ec3647435e2559cd0acc84e4fd0cc5bbb12e1fd290668 SHA512 2c147dd3d6c8ecefd05716a8767fb45e373af2845adf7a2d18bc894374f78fedeff614addd829f0137d9dc6bfd40059548068cac8af82e9c25b1cec839fea746
+MISC metadata.xml 446 BLAKE2B 178ea98081e664641c7a8632a1c7dac9b5cac8992b0b945208f5ef654633340daced2473bbdc342b70d8b168ac2206ba132f7ab9601f61b5436f3eb3e0441ca1 SHA512 3dfce858cb0e00b526f04a5764a6173d4711db4f21f52b6d827b82f1cddea4e33f533e645dae95d0bb6a69699b00520a414f2e322c76b56aee1e4ea047bb4bb5
diff --git a/dev-php/PHPMailer/PHPMailer-5.2.26-r2.ebuild b/dev-php/PHPMailer/PHPMailer-5.2.26-r2.ebuild
new file mode 100644
index 000000000000..1cd077177b3f
--- /dev/null
+++ b/dev-php/PHPMailer/PHPMailer-5.2.26-r2.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Full-featured email creation and transfer class for PHP"
+HOMEPAGE="https://github.com/PHPMailer/PHPMailer"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples idn ssl"
+
+# The ctype and filter extensions get used unconditionally, with no
+# fallback and no "extension missing" exception. All of the other
+# extensions are technically optional, depending on how you use
+# PHPMailer and whether or not you're willing to settle for fallback
+# implementations.
+#
+# The insane dependency string is to prevent the ctype and filter
+# extensions from being provided by one version (i.e. slot) of PHP,
+# while intl and unicode are provided by another.
+RDEPEND="
+ ssl? (
+ idn? ( dev-lang/php:*[ctype,filter,intl,ssl,unicode] )
+ !idn? ( dev-lang/php:*[ctype,filter,ssl] )
+ )
+ !ssl? (
+ idn? ( dev-lang/php:*[ctype,filter,intl,unicode] )
+ !idn? ( dev-lang/php:*[ctype,filter] )
+ )"
+DEPEND="${RDEPEND}
+ doc? ( dev-php/phpDocumentor )"
+
+src_compile(){
+ if use doc; then
+ phpdoc --filename="class.*.php" \
+ --target="./html" \
+ --cache-folder="${T}" \
+ --title="${PN}" \
+ --sourcecode \
+ --force \
+ --progressbar \
+ || die "failed to generate API documentation"
+ fi
+}
+
+src_install(){
+ # To help out the Composer kids, most of the documentation and
+ # tests are missing from the release tarballs.
+ insinto "/usr/share/php/${PN}"
+ doins -r *.php language extras
+
+ use examples && dodoc -r examples
+ use doc && dodoc -r html/*
+}
+
+pkg_postinst(){
+ elog "${PN} has been installed in /usr/share/php/${PN}/."
+ elog "To use it in a script, require('${PN}/${PN}Autoload.php'),"
+ elog "and then use the ${PN} class normally. Most of the examples in"
+ elog "the documentation should work without further modification."
+}
diff --git a/dev-php/PHPMailer/metadata.xml b/dev-php/PHPMailer/metadata.xml
new file mode 100644
index 000000000000..a670ac4443f8
--- /dev/null
+++ b/dev-php/PHPMailer/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>mjo@gentoo.org</email>
+ <name>Michael Orlitzky</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ <name>PHP</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">PHPMailer/PHPMailer</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-php/PHP_CodeCoverage-1.2.13 b/dev-php/PHP_CodeCoverage-1.2.13
deleted file mode 100644
index ad7fc6b79c74..000000000000
--- a/dev-php/PHP_CodeCoverage-1.2.13
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=>=dev-php/pear-1.9.4
-DESCRIPTION=Collection, processing, and rendering for PHP code coverage
-EAPI=6
-HOMEPAGE=http://pear.phpunit.de
-KEYWORDS=amd64 hppa x86
-LICENSE=BSD
-RDEPEND=>=dev-php/pear-1.9.4 >=dev-php/File_Iterator-1.3.0 >=dev-php/PHP_TokenStream-1.1.3 >=dev-php/Text_Template-1.1.1 >=dev-php/pear-1.8.1
-SLOT=0
-SRC_URI=http:///get/PHP_CodeCoverage-1.2.13.tgz
-_eclasses_=php-pear-r2 eb6928c33771db74564e814c5ca6c1b3
-_md5_=d71408183084dbfc7bed97434d11be08
diff --git a/dev-php/PHP_CodeCoverage-4.0.7 b/dev-php/PHP_CodeCoverage-4.0.7
deleted file mode 100644
index 449867f6ede6..000000000000
--- a/dev-php/PHP_CodeCoverage-4.0.7
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install postinst
-DESCRIPTION=Collection, processing, and rendering for PHP code coverage
-EAPI=6
-HOMEPAGE=http://phpunit.de
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86
-LICENSE=BSD
-RDEPEND=dev-php/fedora-autoloader >=dev-php/File_Iterator-1.3 !>=dev-php/File_Iterator-2.0 >=dev-php/Text_Template-1.2 !>=dev-php/Text_Template-2.0 >=dev-php/PHP_TokenStream-1.4 !>=dev-php/PHP_TokenStream-3.0 >=dev-php/sebastian-environment-1.3.2 !>=dev-php/sebastian-environment-3.0 >=dev-php/sebastian-version-1.0 !>=dev-php/sebastian-version-3.0 dev-php/sebastian-code-unit-reverse-lookup !>=dev-php/sebastian-code-unit-reverse-lookup-2.0 || ( dev-lang/php:5.6[xml,xmlwriter] dev-lang/php:7.0[xml,xmlwriter] dev-lang/php:7.1[xml,xmlwriter] )
-SLOT=0
-SRC_URI=https://github.com/sebastianbergmann/php-code-coverage/archive/4.0.7.tar.gz -> PHP_CodeCoverage-4.0.7.tar.gz
-_md5_=8fde4c1257ab73c355b674971deeb8a4
diff --git a/dev-php/PHP_CodeCoverage/Manifest b/dev-php/PHP_CodeCoverage/Manifest
new file mode 100644
index 000000000000..e611ccffcc83
--- /dev/null
+++ b/dev-php/PHP_CodeCoverage/Manifest
@@ -0,0 +1,7 @@
+AUX autoload.php 3859 BLAKE2B 65cc25809352182d5c852743a25e2e297fe0819d2feac0fb47cd9f80e9ea36a16f7f2dbc2657bd73d1e484c1b851b5603eaec8c6d0f7fa5e6582876661587fbe SHA512 c33ce039a84f0f6d260bf46e8308df806968328c80dd89b778c76a0620d514c5e101ac3c741a3b68aba07cb59ccfae4a0dfb6157fb056e03ce65c1478300655a
+AUX channel.xml 804 BLAKE2B d6a965a41a220f07e3a0d206bc3359e2649b55d186e7975726c1b0ad344e063ca1fa98cde446078346384e946f6b31f9caaf49cf7c82b4568f697a1ba0d2e633 SHA512 44f5d66b967cff45b87795609e6dd14443a4ce5ae8f3430a281429ba21e834bc3feb7f539fb6cd8349017eb301054a33dfcd7062d58f9fd0c1c7cd1892580092
+DIST PHP_CodeCoverage-1.2.13.tgz 158772 BLAKE2B 7f9703cf724dece9535fce4e5dbc7a354302227b38daabf9f8c4417a43980f369807dfbcd65fde79215a14531971d0bf6cf096a6b01c2c6b99a5bc326c5d5b66 SHA512 6a3426c945ad6abf35be3068cf0f7e17215179a382e93b7be3a5e436611b327c9b7bc715f7acc900231856678f578c1f614648d2679baca9b6960dfafd897dc6
+DIST PHP_CodeCoverage-4.0.7.tar.gz 349906 BLAKE2B 2ba665efa2d20a5eb66c66375a095425057e883697dd1d3ba7214e56de29c96451516adb2843589e64732c994aac7289afa0e34a74d56ef9bc36f36e635eb944 SHA512 8418efa2585d05b3004ab50e7ba77513429d649f71fdb2479412424a0f40a698a962e1d87852db08fec8f92e569a9a5767dad66d5d64e072637dde33182e71e9
+EBUILD PHP_CodeCoverage-1.2.13.ebuild 578 BLAKE2B 29c9c830a5dce3332b4e2e072a78930dd2a5e9ce41ad4e582644e6e435ae5ec6ac60ff41d710fd53d23797c66929509fe0c631beb35966883f0f9ff497ecd539 SHA512 9a23f02d10f100de9d110830b5c0ff8a5e36b0dc940422ebd25f857eacb8610f3e9e774840b4c228ab1b4353396f0543f0bafc1f0c359f088e059516c2aa358f
+EBUILD PHP_CodeCoverage-4.0.7.ebuild 1308 BLAKE2B 126f6c37e89eedd936e223473c15f378885fddce46e2f7ac8dd1611d99d22c9ddeac27aa8cc850f17cff227b0f7de81ed87f328462b68097d46c65134cfa3e31 SHA512 e8019cc9ead2d067fa7916c896a22d15fe7b72fe02dde0f0251b93ce5354214ab3b10fa418645ed630188b3acebe9a5ec752ecdaeb08e15e45ba98446db52c22
+MISC metadata.xml 339 BLAKE2B a9f68f1bacb42eb4e4a6463dc03080c343501c0f6525ed08556f9d04606b42c2744f458ba35fff8cd4f5c8e68f81f226193dc79bf7808da8c4229588f34dc3dc SHA512 5057d1d80d43e4e8f8a6f2bbddabda7c7f639eb26a7be8f534ac2c470341834c7d99e78a20f18062ef1c7252b75428af122f2858dac78f88f8ab6d50a6f66f4a
diff --git a/dev-php/PHP_CodeCoverage/PHP_CodeCoverage-1.2.13.ebuild b/dev-php/PHP_CodeCoverage/PHP_CodeCoverage-1.2.13.ebuild
new file mode 100644
index 000000000000..501117d4dfdf
--- /dev/null
+++ b/dev-php/PHP_CodeCoverage/PHP_CodeCoverage-1.2.13.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PHP_PEAR_DOMAIN="pear.phpunit.de"
+PHP_PEAR_CHANNEL="${FILESDIR}/channel.xml"
+
+inherit php-pear-r2
+
+DESCRIPTION="Collection, processing, and rendering for PHP code coverage"
+HOMEPAGE="http://pear.phpunit.de"
+SRC_URI="http://${PHP_PEAR_URI}/get/${PEAR_P}.tgz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 hppa x86"
+IUSE=""
+
+DEPEND=">=dev-php/pear-1.9.4"
+RDEPEND="${DEPEND}
+ >=dev-php/File_Iterator-1.3.0
+ >=dev-php/PHP_TokenStream-1.1.3
+ >=dev-php/Text_Template-1.1.1"
diff --git a/dev-php/PHP_CodeCoverage/PHP_CodeCoverage-4.0.7.ebuild b/dev-php/PHP_CodeCoverage/PHP_CodeCoverage-4.0.7.ebuild
new file mode 100644
index 000000000000..559ad3f9fa2c
--- /dev/null
+++ b/dev-php/PHP_CodeCoverage/PHP_CodeCoverage-4.0.7.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PN="php-code-coverage"
+
+DESCRIPTION="Collection, processing, and rendering for PHP code coverage"
+HOMEPAGE="http://phpunit.de"
+SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+IUSE=""
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+RDEPEND="dev-php/fedora-autoloader
+ >=dev-php/File_Iterator-1.3
+ !>=dev-php/File_Iterator-2.0
+ >=dev-php/Text_Template-1.2
+ !>=dev-php/Text_Template-2.0
+ >=dev-php/PHP_TokenStream-1.4
+ !>=dev-php/PHP_TokenStream-3.0
+ >=dev-php/sebastian-environment-1.3.2
+ !>=dev-php/sebastian-environment-3.0
+ >=dev-php/sebastian-version-1.0
+ !>=dev-php/sebastian-version-3.0
+ dev-php/sebastian-code-unit-reverse-lookup
+ !>=dev-php/sebastian-code-unit-reverse-lookup-2.0
+ || (
+ dev-lang/php:5.6[xml,xmlwriter]
+ dev-lang/php:7.0[xml,xmlwriter]
+ dev-lang/php:7.1[xml,xmlwriter]
+ )"
+
+src_install() {
+ insinto /usr/share/php/PHP/CodeCoverage
+ doins -r src/*
+ doins "${FILESDIR}/autoload.php"
+}
+
+pkg_postinst() {
+ ewarn "This library now loads via /usr/share/php/PHP/CodeCoverage/autoload.php"
+ ewarn "Please update any scripts to require the autoloader"
+}
diff --git a/dev-php/PHP_CodeCoverage/files/autoload.php b/dev-php/PHP_CodeCoverage/files/autoload.php
new file mode 100644
index 000000000000..b35d6fa4bac0
--- /dev/null
+++ b/dev-php/PHP_CodeCoverage/files/autoload.php
@@ -0,0 +1,59 @@
+<?php
+/* Autoloader for dev-php/PHP_CodeCoverage */
+
+if (!class_exists('Fedora\\Autoloader\\Autoload', false)) {
+ require_once '/usr/share/php/Fedora/Autoloader/autoload.php';
+}
+
+\Fedora\Autoloader\Autoload::addClassMap(
+ array(
+ 'sebastianbergmann\codecoverage\codecoverage' => '/CodeCoverage.php',
+ 'sebastianbergmann\codecoverage\filter' => '/Filter.php',
+ 'sebastianbergmann\codecoverage\util' => '/Util.php',
+ 'sebastianbergmann\codecoverage\driver\driver' => '/Driver/Driver.php',
+ 'sebastianbergmann\codecoverage\driver\hhvm' => '/Driver/HHVM.php',
+ 'sebastianbergmann\codecoverage\driver\phpdbg' => '/Driver/PHPDBG.php',
+ 'sebastianbergmann\codecoverage\driver\xdebug' => '/Driver/Xdebug.php',
+ 'sebastianbergmann\codecoverage\exception\coveredcodenotexecutedexception' => '/Exception/CoveredCodeNotExecutedException.php',
+ 'sebastianbergmann\codecoverage\exception\exception' => '/Exception/Exception.php',
+ 'sebastianbergmann\codecoverage\exception\invalidargumentexception' => '/Exception/InvalidArgumentException.php',
+ 'sebastianbergmann\codecoverage\exception\missingcoversannotationexception' => '/Exception/MissingCoversAnnotationException.php',
+ 'sebastianbergmann\codecoverage\exception\runtimeexception' => '/Exception/RuntimeException.php',
+ 'sebastianbergmann\codecoverage\exception\unintentiallycoveredcodeexception' => '/Exception/UnintentionallyCoveredCodeException.php',
+ 'sebastianbergmann\codecoverage\node\abstractnode' => '/Node/AbstractNode.php',
+ 'sebastianbergmann\codecoverage\node\builder' => '/Node/Builder.php',
+ 'sebastianbergmann\codecoverage\node\directory' => '/Node/Directory.php',
+ 'sebastianbergmann\codecoverage\node\file' => '/Node/File.php',
+ 'sebastianbergmann\codecoverage\node\iterator' => '/Node/iterator.php',
+ 'sebastianbergmann\codecoverage\report\clover' => '/Report/Clover.php',
+ 'sebastianbergmann\codecoverage\report\crap4j' => '/Report/Crap4j.php',
+ 'sebastianbergmann\codecoverage\report\php' => '/Report/PHP.php',
+ 'sebastianbergmann\codecoverage\report\text' => '/Report/Text.php',
+ 'sebastianbergmann\codecoverage\report\html\facade' => '/Report/HTML/Facade.php',
+ 'sebastianbergmann\codecoverage\report\html\renderer' => '/Report/HTML/Renderer.php',
+ 'sebastianbergmann\codecoverage\report\html\renderer\dashboard' => '/Report/HTML/Renderer/Dashboard.php',
+ 'sebastianbergmann\codecoverage\report\html\renderer\directory' => '/Report/HTML/Renderer/Directory.php',
+ 'sebastianbergmann\codecoverage\report\html\renderer\file' => '/Report/HTML/Renderer/File.php',
+ 'sebastianbergmann\codecoverage\report\xml\coverage' => '/Report/XML/Coverage.php',
+ 'sebastianbergmann\codecoverage\report\xml\directory' => '/Report/XML/Directory.php',
+ 'sebastianbergmann\codecoverage\report\xml\facade' => '/Report/XML/Facade.php',
+ 'sebastianbergmann\codecoverage\report\xml\file' => '/Report/XML/File.php',
+ 'sebastianbergmann\codecoverage\report\xml\method' => '/Report/XML/Method.php',
+ 'sebastianbergmann\codecoverage\report\xml\node' => '/Report/XML/Node.php',
+ 'sebastianbergmann\codecoverage\report\xml\project' => '/Report/XML/Project.php',
+ 'sebastianbergmann\codecoverage\report\xml\report' => '/Report/XML/Report.php',
+ 'sebastianbergmann\codecoverage\report\xml\tests' => '/Report/XML/Tests.php',
+ 'sebastianbergmann\codecoverage\report\xml\totals' => '/Report/XML/Totals.php',
+ 'sebastianbergmann\codecoverage\report\xml\unit' => '/Report/XML/Unit.php',
+ ),
+ __DIR__
+);
+
+\Fedora\Autoloader\Dependencies::required(array(
+ '/usr/share/php/File/Iterator/autoload.php',
+ '/usr/share/php/PHP/Token/autoload.php',
+ '/usr/share/php/SebastianBergmann/Version/autoload.php',
+ '/usr/share/php/SebastianBergmann/Environment/autoload.php',
+ '/usr/share/php/SebastianBergmann/CodeUnitReverseLookup/autoload.php',
+ '/usr/share/php/Text/Template/autoload.php',
+));
diff --git a/dev-php/PHP_CodeCoverage/files/channel.xml b/dev-php/PHP_CodeCoverage/files/channel.xml
new file mode 100644
index 000000000000..91bb6786f543
--- /dev/null
+++ b/dev-php/PHP_CodeCoverage/files/channel.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<channel version="1.0" xmlns="http://pear.php.net/channel-1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://pear.php.net/channel-1.0 http://pear.php.net/dtd/channel-1.0.xsd">
+ <name>pear.phpunit.de</name>
+ <summary>PHPUnit PEAR Channel</summary>
+ <suggestedalias>phpunit</suggestedalias>
+ <servers>
+ <primary>
+ <rest>
+ <baseurl type="REST1.0">http://pear.phpunit.de/rest/</baseurl>
+ <baseurl type="REST1.1">http://pear.phpunit.de/rest/</baseurl>
+ <baseurl type="REST1.2">http://pear.phpunit.de/rest/</baseurl>
+ <baseurl type="REST1.3">http://pear.phpunit.de/rest/</baseurl>
+ </rest>
+ </primary>
+ </servers>
+</channel> \ No newline at end of file
diff --git a/dev-php/PHP_CodeCoverage/metadata.xml b/dev-php/PHP_CodeCoverage/metadata.xml
new file mode 100644
index 000000000000..32503e01851a
--- /dev/null
+++ b/dev-php/PHP_CodeCoverage/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://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">sebastianbergmann/php-code-coverage</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-php/PHP_CodeSniffer-3.2.1 b/dev-php/PHP_CodeSniffer-3.2.1
deleted file mode 100644
index 86e6c14f9b28..000000000000
--- a/dev-php/PHP_CodeSniffer-3.2.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare test
-DEPEND=test? ( >=dev-php/phpunit-4 )
-DESCRIPTION=Detect violations of PHP code standards
-EAPI=6
-HOMEPAGE=https://github.com/squizlabs/PHP_CodeSniffer
-IUSE=test
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-lang/php:*[cli,tokenizer,xmlwriter]
-SLOT=0
-SRC_URI=http://download.pear.php.net/package/PHP_CodeSniffer-3.2.1.tgz
-_md5_=8e09952a566ad544fbbc043ce0e4f562
diff --git a/dev-php/PHP_CodeSniffer/Manifest b/dev-php/PHP_CodeSniffer/Manifest
new file mode 100644
index 000000000000..71481c7fe625
--- /dev/null
+++ b/dev-php/PHP_CodeSniffer/Manifest
@@ -0,0 +1,3 @@
+DIST PHP_CodeSniffer-3.2.1.tgz 554343 BLAKE2B a43e253e7cdf6085ff1cfdec110878c99b61a69d80415a40cf670b7ce9ddce82f7254c34995c67084d5aa7aef8d775e6cfef5e9fcab90771f09244c1442e319d SHA512 69a4d70c6a567d262142f7f3d42507a7501ca3d5213f5b90d5893863e3d75e947a7b41e8bb08e85975677b606522b8f73df33dd35cde85c28016389f3c2ae63c
+EBUILD PHP_CodeSniffer-3.2.1.ebuild 1406 BLAKE2B d8d5e47a52cadf8855c982913344569bf39ec3f6d0c92bcac3da4a1c873bb9b539b5dda228c4cbe3d054bd6711f13025b6df8a315e9dc15b1d6b7a75b8050c7b SHA512 3f351f529e8f32824c1026447c6631b0f58e9f14b48463f6e9417a90728ad776f4e8077698b8fcbdf45cf169c1614af8c03631366de8e2902d3fa75f290aad13
+MISC metadata.xml 329 BLAKE2B 786efd240520e1b8b5ec8fde8fe4772defb0dbae2bf69358710c227454f5de1bc831600eb81d605053163d78e0129cd657b3229a74d30bcec7ffe6ce960d87d8 SHA512 5a983e0b393c626d49f7b3b8757cb68e73a7f292ebc861ca5e6f83c20b5c6f79918422aee7830ad3dccacda719c6d42d6bfcc5eb7ddca7ed29785ef1dd9e0f30
diff --git a/dev-php/PHP_CodeSniffer/PHP_CodeSniffer-3.2.1.ebuild b/dev-php/PHP_CodeSniffer/PHP_CodeSniffer-3.2.1.ebuild
new file mode 100644
index 000000000000..c460fcdcb741
--- /dev/null
+++ b/dev-php/PHP_CodeSniffer/PHP_CodeSniffer-3.2.1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+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"
+
+DEPEND="test? ( >=dev-php/phpunit-4 )"
+RDEPEND="dev-lang/php:*[cli,tokenizer,xmlwriter]"
+
+DOCS=( CONTRIBUTING.md README.md )
+
+src_prepare() {
+ sed -i "s~@data_dir@~${EPREFIX}/usr/share/php/data~" src/Config.php || die
+ eapply_user
+}
+
+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
+}
+
+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"
+}
diff --git a/dev-php/PHP_CodeSniffer/metadata.xml b/dev-php/PHP_CodeSniffer/metadata.xml
new file mode 100644
index 000000000000..ba2d843b67b6
--- /dev/null
+++ b/dev-php/PHP_CodeSniffer/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://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">squizlabs/PHP_CodeSniffer</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-php/PHP_Timer-1.0.5 b/dev-php/PHP_Timer-1.0.5
deleted file mode 100644
index 0e7c51182589..000000000000
--- a/dev-php/PHP_Timer-1.0.5
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DESCRIPTION=Utility class for timing
-EAPI=6
-HOMEPAGE=http://pear.phpunit.de/
-KEYWORDS=amd64 hppa x86
-LICENSE=BSD
-RDEPEND=>=dev-php/pear-1.8.1
-SLOT=0
-SRC_URI=http:///get/PHP_Timer-1.0.5.tgz
-_eclasses_=php-pear-r2 eb6928c33771db74564e814c5ca6c1b3
-_md5_=dd605e96e2bd3255ebeb63e945765b78
diff --git a/dev-php/PHP_Timer-1.0.9 b/dev-php/PHP_Timer-1.0.9
deleted file mode 100644
index 1da6359160c9..000000000000
--- a/dev-php/PHP_Timer-1.0.9
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install postinst
-DESCRIPTION=Utility class for timing
-EAPI=6
-HOMEPAGE=http://phpunit.de
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86
-LICENSE=BSD
-RDEPEND=dev-php/fedora-autoloader >=dev-lang/php-5.6:*
-SLOT=0
-SRC_URI=https://github.com/sebastianbergmann/php-timer/archive/1.0.9.tar.gz -> PHP_Timer-1.0.9.tar.gz
-_md5_=5e3bfd8e5f1e48f78f968f8a2f5000a7
diff --git a/dev-php/PHP_Timer/Manifest b/dev-php/PHP_Timer/Manifest
new file mode 100644
index 000000000000..57944c6ab16d
--- /dev/null
+++ b/dev-php/PHP_Timer/Manifest
@@ -0,0 +1,7 @@
+AUX autoload.php 281 BLAKE2B e1265714ef958a2490b2c039a0def4cd3e2a26ff035d4c689e10f0eb9c9f26878fb537fcf42ede6d26fed2ee36dd73e258fa116d7cc6cd57c80eb990e54cdc33 SHA512 e9e0e6d3bd52d7a524472d4d65aa21e0f1a767fbfc284e9d628eea1414e87ba5e692d3968005d3afcbd86a598538c2edf241a09d5d66cf9cfbb57efdc758db21
+AUX channel.xml 804 BLAKE2B d6a965a41a220f07e3a0d206bc3359e2649b55d186e7975726c1b0ad344e063ca1fa98cde446078346384e946f6b31f9caaf49cf7c82b4568f697a1ba0d2e633 SHA512 44f5d66b967cff45b87795609e6dd14443a4ce5ae8f3430a281429ba21e834bc3feb7f539fb6cd8349017eb301054a33dfcd7062d58f9fd0c1c7cd1892580092
+DIST PHP_Timer-1.0.5.tgz 3597 BLAKE2B cf82c3ff61a1f96a94a5d3743270be3262bc2ea28d7d71cd1c93a07c7bec950597c4da5d6dd23e4b58b8aad7c2e3bdb7aea07d761ef096e898088ca2296b43cf SHA512 da030dec608d1f8d447da6ce40e995ca818064e3a4b2f2eca1819a77a12875843a25bba1ffd253043ef3ac62a6dc1a16c5e7ba9b792b99b54d0713090478be84
+DIST PHP_Timer-1.0.9.tar.gz 3740 BLAKE2B d551fd676046e6bb653fb9a9bde7a976b9b2081d26caee23177b899fa01e11ae1fb2183234ab43745798c058222574b1523064cc07d25485315eef9090f892a5 SHA512 96db90cf2af18fabcf44bdd4dbb5d298402ed2c8e49f3033fd1b89b3aa8c880d9f8677897d4d542a0db6348bdd9c697042deb0b6e26242adebfde1bcdb4bc559
+EBUILD PHP_Timer-1.0.5.ebuild 427 BLAKE2B 7f8cd242ba49525527a20fad8dc4997e4dd451d4049962de71978afc5350e2beee40de331f414930bb2f50c8beed03727ec3e840cc13d5324f01b69efb5b6ba5 SHA512 802255716d8340c81bb2c0073064c511eaa4591f8061155cddd30cd53084100e55e71572b7378d7680dcb23cc4811d36cf527d6850ca9a4b6d1ce48ee1820525
+EBUILD PHP_Timer-1.0.9.ebuild 750 BLAKE2B 12f27ed935861e1dcb68ff4d2cf139854195fd596663933228badeac76923c7f05a9cb17aae394a97a49ce761f85923f781d1564d63a8aea2e23e6e60bb8cb25 SHA512 cb6d6dbd8106f2bbb666eab295807ae1873bcdf502c81f7c0e1dad1e35eb88235c3de4b2c4ef869bebb2f82d5e955c55b824a16d515a6a779f4018c4e3d0a32d
+MISC metadata.xml 331 BLAKE2B a4a67930fc96c32bc75804af627a97742700619e362bf59992ee8a8882b2cffcd4fa6de297abbcc42d6e33119fd10933e65a1291484acf4dd091c5ed55dcd81f SHA512 e3e0aaa2728b2f5f65592f56027ae9674e7e9abf4bdb2fef90854b6d8d270f4f6a103c4588401ef076d53fd3c4c2fceb2d9b5145dc3af43c8913ccd5f0e2ee53
diff --git a/dev-php/PHP_Timer/PHP_Timer-1.0.5.ebuild b/dev-php/PHP_Timer/PHP_Timer-1.0.5.ebuild
new file mode 100644
index 000000000000..e0d5a2764c10
--- /dev/null
+++ b/dev-php/PHP_Timer/PHP_Timer-1.0.5.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PHP_PEAR_CHANNEL="${FILESDIR}/channel.xml"
+PHP_PEAR_DOMAIN="pear.phpunit.de"
+PHP_PEAR_PKG_NAME="PHP_Timer"
+
+inherit php-pear-r2
+
+DESCRIPTION="Utility class for timing"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 hppa x86"
+IUSE=""
+HOMEPAGE="http://pear.phpunit.de/"
+SRC_URI="http://${PHP_PEAR_URI}/get/${PEAR_P}.tgz"
diff --git a/dev-php/PHP_Timer/PHP_Timer-1.0.9.ebuild b/dev-php/PHP_Timer/PHP_Timer-1.0.9.ebuild
new file mode 100644
index 000000000000..5c6c9dfe8195
--- /dev/null
+++ b/dev-php/PHP_Timer/PHP_Timer-1.0.9.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PN="php-timer"
+
+DESCRIPTION="Utility class for timing"
+HOMEPAGE="http://phpunit.de"
+SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+IUSE=""
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+RDEPEND="dev-php/fedora-autoloader
+ >=dev-lang/php-5.6:*"
+
+src_install() {
+ insinto /usr/share/php/PHP/Timer
+ doins -r src/Timer.php
+ doins "${FILESDIR}/autoload.php"
+}
+
+pkg_postinst() {
+ ewarn "This library now loads via /usr/share/php/PHP/Timer/autoload.php"
+ ewarn "Please update any scripts to require the autoloader"
+}
diff --git a/dev-php/PHP_Timer/files/autoload.php b/dev-php/PHP_Timer/files/autoload.php
new file mode 100644
index 000000000000..bb0974e087d6
--- /dev/null
+++ b/dev-php/PHP_Timer/files/autoload.php
@@ -0,0 +1,13 @@
+<?php
+/* Autoloader for dev-php/PHP_Timer */
+
+if (!class_exists('Fedora\\Autoloader\\Autoload', false)) {
+ require_once '/usr/share/php/Fedora/Autoloader/autoload.php';
+}
+
+\Fedora\Autoloader\Autoload::addClassMap(
+ array(
+ 'php_timer' => '/Timer.php',
+ ),
+ __DIR__
+);
diff --git a/dev-php/PHP_Timer/files/channel.xml b/dev-php/PHP_Timer/files/channel.xml
new file mode 100644
index 000000000000..91bb6786f543
--- /dev/null
+++ b/dev-php/PHP_Timer/files/channel.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<channel version="1.0" xmlns="http://pear.php.net/channel-1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://pear.php.net/channel-1.0 http://pear.php.net/dtd/channel-1.0.xsd">
+ <name>pear.phpunit.de</name>
+ <summary>PHPUnit PEAR Channel</summary>
+ <suggestedalias>phpunit</suggestedalias>
+ <servers>
+ <primary>
+ <rest>
+ <baseurl type="REST1.0">http://pear.phpunit.de/rest/</baseurl>
+ <baseurl type="REST1.1">http://pear.phpunit.de/rest/</baseurl>
+ <baseurl type="REST1.2">http://pear.phpunit.de/rest/</baseurl>
+ <baseurl type="REST1.3">http://pear.phpunit.de/rest/</baseurl>
+ </rest>
+ </primary>
+ </servers>
+</channel> \ No newline at end of file
diff --git a/dev-php/PHP_Timer/metadata.xml b/dev-php/PHP_Timer/metadata.xml
new file mode 100644
index 000000000000..2774b13055f6
--- /dev/null
+++ b/dev-php/PHP_Timer/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://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">sebastianbergmann/php-timer</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-php/PHP_TokenStream-1.1.3 b/dev-php/PHP_TokenStream-1.1.3
deleted file mode 100644
index a4f95883730e..000000000000
--- a/dev-php/PHP_TokenStream-1.1.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=dev-lang/php:*[tokenizer] >=dev-php/pear-1.9.4
-DESCRIPTION=Wrapper around PHP's tokenizer extension
-EAPI=6
-HOMEPAGE=http://pear.phpunit.de
-KEYWORDS=amd64 hppa x86
-LICENSE=BSD
-RDEPEND=dev-lang/php:*[tokenizer] >=dev-php/pear-1.9.4 >=dev-php/pear-1.8.1
-SLOT=0
-SRC_URI=http://pear.phpunit.de/get/PHP_TokenStream-1.1.3.tgz
-_eclasses_=php-pear-r2 eb6928c33771db74564e814c5ca6c1b3
-_md5_=6ac741a654922b358d145b37bd0f6559
diff --git a/dev-php/PHP_TokenStream-1.4.11 b/dev-php/PHP_TokenStream-1.4.11
deleted file mode 100644
index 1b1c9c4cd0cd..000000000000
--- a/dev-php/PHP_TokenStream-1.4.11
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install postinst
-DESCRIPTION=Wrapper around PHP's tokenizer extension
-EAPI=6
-HOMEPAGE=http://phpunit.de
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86
-LICENSE=BSD
-RDEPEND=dev-php/fedora-autoloader || ( dev-lang/php:5.6[tokenizer] dev-lang/php:7.0[tokenizer] dev-lang/php:7.1[tokenizer] )
-SLOT=0
-SRC_URI=https://github.com/sebastianbergmann/php-token-stream/archive/1.4.11.tar.gz -> PHP_TokenStream-1.4.11.tar.gz
-_md5_=b61872f02a335ca47bdc2e17416bebf3
diff --git a/dev-php/PHP_TokenStream/Manifest b/dev-php/PHP_TokenStream/Manifest
new file mode 100644
index 000000000000..2f7da0ce55dc
--- /dev/null
+++ b/dev-php/PHP_TokenStream/Manifest
@@ -0,0 +1,7 @@
+AUX autoload.php 407 BLAKE2B 8f8afa7524cd277d498acbbc468ad6a7a2b57223111fa459c63a545251430f18be06e7f8079a3ae4f959338530e211d6d7a770bc0739668b9b612b4fbabc1719 SHA512 f80a008f1f443c90814c034822211e94e76d8af31b7da6fb39bbb5aace6473bab8befcd177fd3c2b5b2891bdb62bac66fb03ae6e0fe9429335950b134fccdeab
+AUX channel.xml 804 BLAKE2B d6a965a41a220f07e3a0d206bc3359e2649b55d186e7975726c1b0ad344e063ca1fa98cde446078346384e946f6b31f9caaf49cf7c82b4568f697a1ba0d2e633 SHA512 44f5d66b967cff45b87795609e6dd14443a4ce5ae8f3430a281429ba21e834bc3feb7f539fb6cd8349017eb301054a33dfcd7062d58f9fd0c1c7cd1892580092
+DIST PHP_TokenStream-1.1.3.tgz 9860 BLAKE2B 7160e80b5dc73cabd6cae388add7285fb99891d4e33a7b1224bd3ee9769b88c4e7c4927f96caa91bad2bbad86826f6a73665f716ea3d79b9f89eaa02a5187bf9 SHA512 2751acabc340f05c59bb46f8fb9e47ff25a5f8a6503f1525ed4977d96f2044ad0f9714b40f573d0b845aaf47424a89c3d9e7cfdada67c58d650bb98ee7b47772
+DIST PHP_TokenStream-1.4.11.tar.gz 13388 BLAKE2B 20ef9907ce660e2958ffd50f588ead563efa04c9fc4adda4a823830000f73ee7a4c988adc79d14e549c4f02836b7128aa42b01b26996a090595d34a191282b67 SHA512 4e8d8d1eb16169d46b64a43d91f3066d49fe8e3f184d90c5c7cf4234ebfe4eac271a811744b201f05dc86976b3c5b8ad4ae9f2532165a3849980663f1ac5852e
+EBUILD PHP_TokenStream-1.1.3.ebuild 583 BLAKE2B 3a1710a72b29f85af856f4e04d05afbd4b91e8291961076a81fc19d3b78c2377dc605b642e53ca350b33060b7a8912581f4217905b85fbebbde021036f69570f SHA512 8fcb56e1c778c7364964cbfb18264eaf4a5ba06865f3a1a921c5413b11c2e5817c4f020fa92c4e09aee3b8f2e7392fe9022d1cf3c8efecc08307620261db6e1f
+EBUILD PHP_TokenStream-1.4.11.ebuild 842 BLAKE2B 0b936ac4d597fa7ff36be856f5eb747ce45760514206fce8808b7493b7e207a77878dce7ed779bde4f6fa1d18852a3439b2ab2674dfcd8730f8cf2511a0a56e3 SHA512 ea1a05763273fa30cb5402a4513382bfceaad6adbcb0a112cc9c6acfb334a6670ea4ad3fc050585641042bbee919e7f7de2d9b14b11a58ba83f3db0a5e7a3e31
+MISC metadata.xml 338 BLAKE2B d6fc1656deef3d826ef47d31a4c02b873a71c287f2d349f96dffa1fcc0b3006a3549a80872efd23b09288d144d18776aefe6e7e6c52045eedc53beeb1331c794 SHA512 1f758ba782eba886cefecaacc81c4c1e77c6e00f6a1e265f5fdf789f757b3c2e3ca742f9c3c1f6427920b6ab42388b34cf2c7d50b11247c4a94a3fee69993e47
diff --git a/dev-php/PHP_TokenStream/PHP_TokenStream-1.1.3.ebuild b/dev-php/PHP_TokenStream/PHP_TokenStream-1.1.3.ebuild
new file mode 100644
index 000000000000..16306964ba0f
--- /dev/null
+++ b/dev-php/PHP_TokenStream/PHP_TokenStream-1.1.3.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PHP_PEAR_PKG_NAME="PHP_TokenStream"
+PHP_PEAR_DOMAIN="pear.phpunit.de"
+PHP_PEAR_CHANNEL="${FILESDIR}/channel.xml"
+
+inherit php-pear-r2
+
+DESCRIPTION="Wrapper around PHP's tokenizer extension"
+HOMEPAGE="http://pear.phpunit.de"
+SRC_URI="http://pear.phpunit.de/get/PHP_TokenStream-1.1.3.tgz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 hppa x86"
+IUSE=""
+
+DEPEND="dev-lang/php:*[tokenizer]
+ >=dev-php/pear-1.9.4"
+RDEPEND="${DEPEND}"
+DOCS=( README.markdown ChangeLog.markdown )
diff --git a/dev-php/PHP_TokenStream/PHP_TokenStream-1.4.11.ebuild b/dev-php/PHP_TokenStream/PHP_TokenStream-1.4.11.ebuild
new file mode 100644
index 000000000000..05f0ee3d8ff7
--- /dev/null
+++ b/dev-php/PHP_TokenStream/PHP_TokenStream-1.4.11.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PN="php-token-stream"
+
+DESCRIPTION="Wrapper around PHP's tokenizer extension"
+HOMEPAGE="http://phpunit.de"
+SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+IUSE=""
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+RDEPEND="dev-php/fedora-autoloader
+ || (
+ dev-lang/php:5.6[tokenizer]
+ dev-lang/php:7.0[tokenizer]
+ dev-lang/php:7.1[tokenizer]
+ )"
+
+src_install() {
+ insinto /usr/share/php/PHP/Token
+ doins -r src/*
+ doins "${FILESDIR}/autoload.php"
+}
+
+pkg_postinst() {
+ ewarn "This library now loads via /usr/share/php/PHP/Token/autoload.php"
+ ewarn "Please update any scripts to require the autoloader"
+}
diff --git a/dev-php/PHP_TokenStream/files/autoload.php b/dev-php/PHP_TokenStream/files/autoload.php
new file mode 100644
index 000000000000..5b3aac57ec17
--- /dev/null
+++ b/dev-php/PHP_TokenStream/files/autoload.php
@@ -0,0 +1,15 @@
+<?php
+/* Autoloader for dev-php/PHP_TokenStream */
+
+if (!class_exists('Fedora\\Autoloader\\Autoload', false)) {
+ require_once '/usr/share/php/Fedora/Autoloader/autoload.php';
+}
+
+\Fedora\Autoloader\Autoload::addClassMap(
+ array(
+ 'php_token' => '/Token.php',
+ 'php_token_stream' => '/Token/Stream.php',
+ 'php_token_stream_cachingfactory' => '/Token/Stream/CachingFactory.php',
+ ),
+ __DIR__
+);
diff --git a/dev-php/PHP_TokenStream/files/channel.xml b/dev-php/PHP_TokenStream/files/channel.xml
new file mode 100644
index 000000000000..91bb6786f543
--- /dev/null
+++ b/dev-php/PHP_TokenStream/files/channel.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<channel version="1.0" xmlns="http://pear.php.net/channel-1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://pear.php.net/channel-1.0 http://pear.php.net/dtd/channel-1.0.xsd">
+ <name>pear.phpunit.de</name>
+ <summary>PHPUnit PEAR Channel</summary>
+ <suggestedalias>phpunit</suggestedalias>
+ <servers>
+ <primary>
+ <rest>
+ <baseurl type="REST1.0">http://pear.phpunit.de/rest/</baseurl>
+ <baseurl type="REST1.1">http://pear.phpunit.de/rest/</baseurl>
+ <baseurl type="REST1.2">http://pear.phpunit.de/rest/</baseurl>
+ <baseurl type="REST1.3">http://pear.phpunit.de/rest/</baseurl>
+ </rest>
+ </primary>
+ </servers>
+</channel> \ No newline at end of file
diff --git a/dev-php/PHP_TokenStream/metadata.xml b/dev-php/PHP_TokenStream/metadata.xml
new file mode 100644
index 000000000000..9c577274761e
--- /dev/null
+++ b/dev-php/PHP_TokenStream/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://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">sebastianbergmann/php-token-stream</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-php/SabreAMF-1.3.234_p0 b/dev-php/SabreAMF-1.3.234_p0
deleted file mode 100644
index 672bceac09dd..000000000000
--- a/dev-php/SabreAMF-1.3.234_p0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=SabreAMF is a Flash Remoting server and client for PHP
-EAPI=6
-HOMEPAGE=https://github.com/evert/SabreAMF
-IUSE=examples
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-SLOT=0
-SRC_URI=https://github.com/evert/SabreAMF/archive/e5521c27e9309404d7505e1e16db843fcb2202ec.tar.gz -> SabreAMF-1.3.234_p0.tar.gz
-_eclasses_=vcs-snapshot 3be1ab44131e8c0bbdaa75823008444b
-_md5_=dfd6eab9f168c115c878b5875068c2b1
diff --git a/dev-php/SabreAMF/Manifest b/dev-php/SabreAMF/Manifest
new file mode 100644
index 000000000000..3e94a08e6482
--- /dev/null
+++ b/dev-php/SabreAMF/Manifest
@@ -0,0 +1,3 @@
+DIST SabreAMF-1.3.234_p0.tar.gz 82526 BLAKE2B 9c6726db4d7920ed202014de803e755a481bb49addce8035533b8b9507f6cff40bd18d1a27e812084518748edf36d7d1b2ae5460e7414cec59e7bbf142428514 SHA512 4aef460300d6af925b228ec9fbde635851ec42ac3c9920165df4175b7e7de2d0bc9225bda869c095b8751d7e7f39ecb20866e8a9190df4c728c37f7de60ec4cc
+EBUILD SabreAMF-1.3.234_p0.ebuild 666 BLAKE2B 22393a2e2f8fc1f169d07bd60b5afb958b50ed14b9c19aa28e7b6f3dab28731f2139ff3f288827f687b5bec7fbbc5cc8dc8bf2e8d90ae556fd3156d978dcfd82 SHA512 c3cf97cbeb0c6eaa81783b4c57afa97712239cd157bcdb5fbdbf3fd7e9afac450bbb3664a9dbdc19bfd53fc40666ed93f45401147d52cfe3c84064ce8ca62037
+MISC metadata.xml 318 BLAKE2B d4d80e308bc8a9f06155aff1e51a13199d16e706ede69ffe8a1fd1e7b576b616a3ed4b416ecacc599e2d2c04eace343de0a766e37f1a152ee02e88ad4846d080 SHA512 0e738941b2ec5b9ab2c948dfbeaeb6f66391069058668e580701ac1302b39f8cd65463712ca861d7eb45ba3929e288cb73a1c032c3d77efe73f7dc6134305bc3
diff --git a/dev-php/SabreAMF/SabreAMF-1.3.234_p0.ebuild b/dev-php/SabreAMF/SabreAMF-1.3.234_p0.ebuild
new file mode 100644
index 000000000000..31b973862c36
--- /dev/null
+++ b/dev-php/SabreAMF/SabreAMF-1.3.234_p0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit vcs-snapshot
+
+KEYWORDS="~amd64 ~x86"
+
+DESCRIPTION="SabreAMF is a Flash Remoting server and client for PHP"
+HOMEPAGE="https://github.com/evert/${PN}"
+SRC_URI="https://github.com/evert/${PN}/archive/e5521c27e9309404d7505e1e16db843fcb2202ec.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="examples"
+
+DOCS=( README ChangeLog )
+
+src_install() {
+ insinto /usr/share/php/${PN}
+ doins -r ${PN}/*
+ einstalldocs
+ if use examples ; then
+ insinto /usr/share/doc/${P}/examples
+ docompress -x /usr/share/doc/${P}/examples
+ doins examples/*
+ fi
+}
diff --git a/dev-php/SabreAMF/metadata.xml b/dev-php/SabreAMF/metadata.xml
new file mode 100644
index 000000000000..77ac9767605d
--- /dev/null
+++ b/dev-php/SabreAMF/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://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">evert/SabreAMF</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-php/Text_Template-1.1.1 b/dev-php/Text_Template-1.1.1
deleted file mode 100644
index 2681f463f6ec..000000000000
--- a/dev-php/Text_Template-1.1.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=>=dev-php/pear-1.9.4
-DESCRIPTION=Simple template engine
-EAPI=6
-HOMEPAGE=http://pear.phpunit.de
-KEYWORDS=amd64 hppa x86
-LICENSE=BSD
-RDEPEND=>=dev-php/pear-1.8.1
-SLOT=0
-SRC_URI=http:///get/Text_Template-1.1.1.tgz
-_eclasses_=php-pear-r2 eb6928c33771db74564e814c5ca6c1b3
-_md5_=d85a605679182b93bb811a8b6c163282
diff --git a/dev-php/Text_Template-1.2.1 b/dev-php/Text_Template-1.2.1
deleted file mode 100644
index 8ce7d5a8c4cc..000000000000
--- a/dev-php/Text_Template-1.2.1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install postinst
-DESCRIPTION=A simple template engine
-EAPI=6
-HOMEPAGE=http://phpunit.de
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86
-LICENSE=BSD
-RDEPEND=dev-php/fedora-autoloader >=dev-lang/php-5.6:*
-SLOT=0
-SRC_URI=https://github.com/sebastianbergmann/php-text-template/archive/1.2.1.tar.gz -> Text_Template-1.2.1.tar.gz
-_md5_=597fcd9e7f2297799c61dc3265cd1827
diff --git a/dev-php/Text_Template/Manifest b/dev-php/Text_Template/Manifest
new file mode 100644
index 000000000000..b1e50e7e9c96
--- /dev/null
+++ b/dev-php/Text_Template/Manifest
@@ -0,0 +1,7 @@
+AUX autoload.php 292 BLAKE2B 988a962d5ec1d1be315f5540d72161736bc4a527632e0645f10f206a390f51d905617de61ebea969c2d92d712499521c63be95f2eb932e871710c18edc84aa61 SHA512 944b43c989beaadfa72195e5ea3a2b6c06a996d74055afc1efcb0dc69b39df723e4e9b8bac3754fe33e499e88620882c642b5d38ce2b1940e17adca2b8ae670b
+AUX channel.xml 804 BLAKE2B d6a965a41a220f07e3a0d206bc3359e2649b55d186e7975726c1b0ad344e063ca1fa98cde446078346384e946f6b31f9caaf49cf7c82b4568f697a1ba0d2e633 SHA512 44f5d66b967cff45b87795609e6dd14443a4ce5ae8f3430a281429ba21e834bc3feb7f539fb6cd8349017eb301054a33dfcd7062d58f9fd0c1c7cd1892580092
+DIST Text_Template-1.1.1.tgz 3444 BLAKE2B 7b063aefa5d1cd8b8faf4f68c12552a50eac8d2bb0007ccde632c88325974c32734cbd76d922e0132acdf9e6cb157eb229bf7edcf2697d7f1cfc789b3f33529e SHA512 0eaf43ab8c0810f63d81ddaf62a5e81b2e244161fe79fe09bec05ef732ee07012a1c6c3711885a118cf38334131c57ac1d326e0a711eb3e6d3099c5475f80e7f
+DIST Text_Template-1.2.1.tar.gz 2561 BLAKE2B 24871781f622fbd35cc0f524a092eaed2de0988137a52f05a559e89bcdc9248807a677b164f5ef9a246848709d3bd3ae0c4cd5e738fe6cd42ff0a2ea8aba577c SHA512 d8277f24782d0897b26d2e4922c2658047c484cb86f477916d6ad6dad3e5150bfa0a1ad38c79463a3fde97702bc65edb207a481b6f6cd8346c5fcc33b4cff8ca
+EBUILD Text_Template-1.1.1.ebuild 503 BLAKE2B 6abf128379c8f4e72e427bbee57501381abb0aa414de5bd5fcf1fa7b036bace681730475cc634a33d01f7f9731d1c7bd923656bf0f0e0bbc50088a39f777f769 SHA512 5c578722c7752f36b87f2557db82bc0b3a71c9e1c9cff729fb81b35b5eb592ecfc9be4581f0a81df7571a7c2ff519d50cdd065de81c12748957681a72b21e7c4
+EBUILD Text_Template-1.2.1.ebuild 758 BLAKE2B 438313bd8e9dc3441fa7a1385ef98d2e8be8275b6d6d5c9b7a4dfab7e78f43745dec5b13377c1795987bcab1a26ea05c7eefa246a71352b685edbc164cb4af03 SHA512 85cc3ef4a0a8833e5fb126e5affa0e43695ce15cce5f8a94b57f431f2d8adc72966530ee2b3c64b2c21777a54a8b88894bd5f5fff7910b14d865c56e29b85304
+MISC metadata.xml 339 BLAKE2B c5e702f4976f584f0e7e9818f8c1c12a3ac5cd693faa20afb9f60444306f8be4820efef2cb1786508efb51f80241998abeb1c5b7cfe530d4ab86f4e8617be9ea SHA512 5a723a5167a669b4fe417f81d895d9de2b3ab6767b54f68cd246e8f3e446c841ddba918cb83575cb3c21b1051a1973e4eecd8f5c9f7c708b5911fe4473fb4ce6
diff --git a/dev-php/Text_Template/Text_Template-1.1.1.ebuild b/dev-php/Text_Template/Text_Template-1.1.1.ebuild
new file mode 100644
index 000000000000..e12d9f8af66a
--- /dev/null
+++ b/dev-php/Text_Template/Text_Template-1.1.1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PHP_PEAR_CHANNEL="${FILESDIR}/channel.xml"
+PHP_PEAR_DOMAIN="pear.phpunit.de"
+PHP_PEAR_PKG_NAME="Text_Template"
+
+inherit php-pear-r2
+
+HOMEPAGE="http://pear.phpunit.de"
+SRC_URI="http://${PHP_PEAR_URI}/get/${PEAR_P}.tgz"
+DESCRIPTION="Simple template engine"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 hppa x86"
+IUSE=""
+
+DEPEND=">=dev-php/pear-1.9.4"
+DOCS=( README.markdown ChangeLog.markdown )
diff --git a/dev-php/Text_Template/Text_Template-1.2.1.ebuild b/dev-php/Text_Template/Text_Template-1.2.1.ebuild
new file mode 100644
index 000000000000..6a64d5a5b881
--- /dev/null
+++ b/dev-php/Text_Template/Text_Template-1.2.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PN="php-text-template"
+
+DESCRIPTION="A simple template engine"
+HOMEPAGE="http://phpunit.de"
+SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+IUSE=""
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+RDEPEND="dev-php/fedora-autoloader
+ >=dev-lang/php-5.6:*"
+
+src_install() {
+ insinto /usr/share/php/Text/Template
+ doins -r src/*
+ doins "${FILESDIR}/autoload.php"
+}
+
+pkg_postinst() {
+ ewarn "This library now loads via /usr/share/php/Text/Template/autoload.php"
+ ewarn "Please update any scripts to require the autoloader"
+}
diff --git a/dev-php/Text_Template/files/autoload.php b/dev-php/Text_Template/files/autoload.php
new file mode 100644
index 000000000000..d6658c6944d8
--- /dev/null
+++ b/dev-php/Text_Template/files/autoload.php
@@ -0,0 +1,13 @@
+<?php
+/* Autoloader for dev-php/Text_Template */
+
+if (!class_exists('Fedora\\Autoloader\\Autoload', false)) {
+ require_once '/usr/share/php/Fedora/Autoloader/autoload.php';
+}
+
+\Fedora\Autoloader\Autoload::addClassMap(
+ array(
+ 'text_template' => '/Template.php',
+ ),
+ __DIR__
+);
diff --git a/dev-php/Text_Template/files/channel.xml b/dev-php/Text_Template/files/channel.xml
new file mode 100644
index 000000000000..91bb6786f543
--- /dev/null
+++ b/dev-php/Text_Template/files/channel.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<channel version="1.0" xmlns="http://pear.php.net/channel-1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://pear.php.net/channel-1.0 http://pear.php.net/dtd/channel-1.0.xsd">
+ <name>pear.phpunit.de</name>
+ <summary>PHPUnit PEAR Channel</summary>
+ <suggestedalias>phpunit</suggestedalias>
+ <servers>
+ <primary>
+ <rest>
+ <baseurl type="REST1.0">http://pear.phpunit.de/rest/</baseurl>
+ <baseurl type="REST1.1">http://pear.phpunit.de/rest/</baseurl>
+ <baseurl type="REST1.2">http://pear.phpunit.de/rest/</baseurl>
+ <baseurl type="REST1.3">http://pear.phpunit.de/rest/</baseurl>
+ </rest>
+ </primary>
+ </servers>
+</channel> \ No newline at end of file
diff --git a/dev-php/Text_Template/metadata.xml b/dev-php/Text_Template/metadata.xml
new file mode 100644
index 000000000000..d3b52475bc18
--- /dev/null
+++ b/dev-php/Text_Template/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://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">sebastianbergmann/php-text-template</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-php/YAML-1.0.6-r3 b/dev-php/YAML-1.0.6-r3
deleted file mode 100644
index 7fe9f32180ef..000000000000
--- a/dev-php/YAML-1.0.6-r3
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DESCRIPTION=The Symfony YAML Component
-EAPI=6
-HOMEPAGE=http://pear.symfony-project.com/
-KEYWORDS=amd64 hppa x86
-LICENSE=MIT
-RDEPEND=>=dev-php/pear-1.8.1
-SLOT=0
-SRC_URI=http://pear.symfony-project.com/get/YAML-1.0.6.tgz
-_eclasses_=php-pear-r2 eb6928c33771db74564e814c5ca6c1b3
-_md5_=ccefb3986461ac59b6b3af3186283868
diff --git a/dev-php/YAML/Manifest b/dev-php/YAML/Manifest
new file mode 100644
index 000000000000..9a664e423feb
--- /dev/null
+++ b/dev-php/YAML/Manifest
@@ -0,0 +1,4 @@
+AUX channel.xml 803 BLAKE2B 49df94d0267fa5fb92c17c95100b71055b961d28b1dd7d4a3157f35a4027a10726571afb019123309aeeadc0e3dd40659a7ebe4c2f8304beb3080881639155d1 SHA512 1600e90d22c785cdc58ac60c4b652e0cfdb632cc8e2c381e6eb5e53e2178d2c28c2e8683b882179b8bd91cb0d9bb54c7d10b863c8bcee02b5cc6fcef2c6b56b6
+DIST YAML-1.0.6.tgz 10010 BLAKE2B 3978104631eeb5051966a5709366b8bbb98fc57edd113dbdff8d25c225c2992650309fa463627c2adc0dcc0f529ce42832fbfc08eef3e35223e77095c6246060 SHA512 c66a8c47d8bc356bfc700e9eef07fef19084f5687ed061a815ee56c29b94f8aeabbc81e8aef4de6d3bc9e645aae42ba09c05b0256144b8c191a8dbab7c009636
+EBUILD YAML-1.0.6-r3.ebuild 577 BLAKE2B 45d2147d9752b8db598ca6de1b922c1a285ad8729832614bfedec8f0786c7a6c48beb96ee41e129c557fe2e9a97838791db948d75c9a67a688c18890e1103847 SHA512 543de826f0627fb7d6b41cb6054299cb0d97ce8570f513e9b1958697708fc4c91ce0c30c267b4862485428bfdc1577491cb40b5cd4e554915a27ce8c917c69e4
+MISC metadata.xml 307 BLAKE2B fb84c80d0a7c51412275b8ac9db40f3b945a2dc12dd2c8a0559035408a85d9ebf2abdb8f4afb67634c48175be016670d5f092e3c20c6b268e213dce64b893493 SHA512 2b39c12062bf96bc8fb044b7bd9efa10325fe6a9473965d2c4241e92a93cb24e94a70ccfb8bd0c7a2d7681ed806ad887d432414a6a15947ead93eaf207b6968d
diff --git a/dev-php/YAML/YAML-1.0.6-r3.ebuild b/dev-php/YAML/YAML-1.0.6-r3.ebuild
new file mode 100644
index 000000000000..c52a33ba2493
--- /dev/null
+++ b/dev-php/YAML/YAML-1.0.6-r3.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PHP_PEAR_CHANNEL="${FILESDIR}/channel.xml"
+PHP_PEAR_DOMAIN="pear.symfony-project.com"
+PHP_PEAR_PKG_NAME="YAML"
+
+inherit php-pear-r2
+
+DESCRIPTION="The Symfony YAML Component"
+HOMEPAGE="http://pear.symfony-project.com/"
+SRC_URI="http://pear.symfony-project.com/get/${PEAR_P}.tgz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 hppa x86"
+IUSE=""
+
+src_install() {
+ insinto /usr/share/php/SymfonyComponents/YAML
+ doins lib/*
+ php-pear-r2_install_packagexml
+ einstalldocs
+}
diff --git a/dev-php/YAML/files/channel.xml b/dev-php/YAML/files/channel.xml
new file mode 100644
index 000000000000..e95604c7c2ab
--- /dev/null
+++ b/dev-php/YAML/files/channel.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<channel version="1.0" xmlns="http://pear.php.net/channel-1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://pear.php.net/channel-1.0 http://pear.php.net/dtd/channel-1.0.xsd">
+ <name>pear.symfony-project.com</name>
+ <summary>The symfony project PEAR channel</summary>
+ <suggestedalias>symfony</suggestedalias>
+ <servers>
+ <primary>
+ <rest>
+ <baseurl type="REST1.0">http://pear.symfony-project.com//rest/</baseurl>
+ <baseurl type="REST1.1">http://pear.symfony-project.com//rest/</baseurl>
+ <baseurl type="REST1.2">http://pear.symfony-project.com//rest/</baseurl>
+ <baseurl type="REST1.3">http://pear.symfony-project.com//rest/</baseurl>
+ </rest>
+ </primary>
+ </servers>
+</channel> \ No newline at end of file
diff --git a/dev-php/YAML/metadata.xml b/dev-php/YAML/metadata.xml
new file mode 100644
index 000000000000..2c70ec46ae69
--- /dev/null
+++ b/dev-php/YAML/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+<email>php-bugs@gentoo.org</email>
+<name>PHP</name>
+</maintainer>
+<longdescription lang="en">
+The Symfony YAML Component
+</longdescription>
+</pkgmetadata>
diff --git a/dev-php/adodb-5.20.12 b/dev-php/adodb-5.20.12
deleted file mode 100644
index ba7b95f31c40..000000000000
--- a/dev-php/adodb-5.20.12
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Database abstraction layer for PHP
-EAPI=6
-HOMEPAGE=https://github.com/ADOdb
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=BSD LGPL-2.1+
-RDEPEND=dev-lang/php:*
-SLOT=0
-SRC_URI=https://github.com/ADOdb/ADOdb/archive/v5.20.12.tar.gz -> adodb-5.20.12.tar.gz
-_md5_=cc98ab2cba67533ca7cc4765b9d010f5
diff --git a/dev-php/adodb-5.20.9 b/dev-php/adodb-5.20.9
deleted file mode 100644
index 835aaab961ad..000000000000
--- a/dev-php/adodb-5.20.9
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Database abstraction layer for PHP
-EAPI=6
-HOMEPAGE=http://www.adodb.org/
-KEYWORDS=alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86
-LICENSE=BSD LGPL-2.1
-RDEPEND=dev-lang/php:*
-SLOT=0
-SRC_URI=https://github.com/ADOdb/ADOdb/archive/v5.20.9.tar.gz -> adodb-5.20.9.tar.gz
-_md5_=8b153c7c8dcc5468bd742f0bc9219181
diff --git a/dev-php/adodb/Manifest b/dev-php/adodb/Manifest
new file mode 100644
index 000000000000..9cd281933b26
--- /dev/null
+++ b/dev-php/adodb/Manifest
@@ -0,0 +1,5 @@
+DIST adodb-5.20.12.tar.gz 464962 BLAKE2B 51b1bec4c9bda427988848cd0ff810058e159c75946ea4d14d1ab639545f0c95a8a1a2b8193c8c0403e37fc2e3b858f97b255b9b615b65786d1593269e9da731 SHA512 ac8f36dba459bac15f16ecfd1ece69edc922e67b6aec3641a0c8ffc50c6b1c437ecce2e5652c31f2e472f7abefb3ac5a8a2bef188959007442799784ab764c1e
+DIST adodb-5.20.9.tar.gz 464257 BLAKE2B 38a37e4a5b1ac86b37cbd164c79e2112c78fb22530a225d2cac4f916703d4c2bd300a47a214344d8ae9e5c94467ec34cab96ab36a10ad8dad581ec74c73ae111 SHA512 bc40113012c27b759ff35e7395404d1756720e9daef7df4d33147b9950e9ffd032274ccd8808fe303ba75feeaf727e2deb50fc6d79826db96ce568a70007f30f
+EBUILD adodb-5.20.12.ebuild 1455 BLAKE2B 9087e612637399203355a6213a9012c6b204818a67928abc2a6ef28bdae9f82c15d888690bbe8ebf6f65866029558c7740a38aac697531bc1f8709ad57e84511 SHA512 300defd6824492d2ca77da9528c07e3b0320220b6b7fb305dc586d56b4f60eabdf5614f25bb16f3cf9c2395d35008196f46e1f0fb4939149ff8359cad7e638d1
+EBUILD adodb-5.20.9.ebuild 1443 BLAKE2B 6c0e8504d8e99042a95fdf9af07eeeea4bf9f3a3bd2e6ba156cd147eeda622fb9a71880f2e1ea19d01e82b7f44dd43adcdfdfb4ffe0b65ecde9aed02a21000c8 SHA512 258c809d092bc37c9e87e3501f3f95ce4ea85b8b1ac3e252b659a5834c831908ed1c61eebf7806486e3e3fd50c7799a596b9d495e896784fd8fd0c8906618540
+MISC metadata.xml 377 BLAKE2B 29889d626a5c0b8d16ae7cf02f45a0e6ebee2d633110a534bcc37c9539c4fc4b8ce15ecfd8ae3768b0f79ab34f088416b1bdb4403c7769f3c6e45477d0a2bf8d SHA512 f83ababfd8add084a2dcf96d74eadae96b35b5d71ea30a98a41b5ee3d222fcabcfb63607e4517be261bfa246d461684fd95b3bb01cb58464ff8f986d123aa23b
diff --git a/dev-php/adodb/adodb-5.20.12.ebuild b/dev-php/adodb/adodb-5.20.12.ebuild
new file mode 100644
index 000000000000..f6b55b30633b
--- /dev/null
+++ b/dev-php/adodb/adodb-5.20.12.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PN="ADOdb"
+DESCRIPTION="Database abstraction layer for PHP"
+HOMEPAGE="https://github.com/ADOdb"
+SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+# If you want to be picky, we should require that PHP be built with at
+# least one database driver enabled; otherwise adodb isn't going to be
+# able to do anything. But, the database USE flags for dev-lang/php are
+# a mess. What we would *like* to do is have a set of USE flags for
+# adodb that then propagate to PHP itself... for example, adodb[mysql]
+# could require php[mysql]. To do that would require that we duplicate
+# the database USE flag mess for adodb -- not desirable. Instead we punt
+# and let the user install adodb unconditionally. If he doesn't have
+# database support in PHP, it just won't work.
+RDEPEND="dev-lang/php:*"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_install() {
+ DOCS="README.md docs/changelog*.md xmlschema*.dtd session/*.sql"
+ DOCS+=" session/*.txt session/*.xml pear/auth_adodb_example.php"
+ DOCS+=" pear/readme.Auth.txt"
+
+ dodoc $DOCS
+ rm -f $DOCS || die "failed to remove docs before installation"
+
+ insinto "/usr/share/php/${PN}"
+ doins *.php
+ doins -r contrib datadict drivers lang pear perf replicate session xsl
+}
diff --git a/dev-php/adodb/adodb-5.20.9.ebuild b/dev-php/adodb/adodb-5.20.9.ebuild
new file mode 100644
index 000000000000..b37e311bd855
--- /dev/null
+++ b/dev-php/adodb/adodb-5.20.9.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PN="ADOdb"
+DESCRIPTION="Database abstraction layer for PHP"
+HOMEPAGE="http://www.adodb.org/"
+SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD LGPL-2.1"
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86"
+IUSE=""
+
+# If you want to be picky, we should require that PHP be built with at
+# least one database driver enabled; otherwise adodb isn't going to be
+# able to do anything. But, the database USE flags for dev-lang/php are
+# a mess. What we would *like* to do is have a set of USE flags for
+# adodb that then propagate to PHP itself... for example, adodb[mysql]
+# could require php[mysql]. To do that would require that we duplicate
+# the database USE flag mess for adodb -- not desirable. Instead we punt
+# and let the user install adodb unconditionally. If he doesn't have
+# database support in PHP, it just won't work.
+RDEPEND="dev-lang/php:*"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_install() {
+ DOCS="README.md docs/changelog*.md xmlschema*.dtd session/*.sql"
+ DOCS+=" session/*.txt session/*.xml pear/auth_adodb_example.php"
+ DOCS+=" pear/readme.Auth.txt"
+
+ dodoc $DOCS
+ rm -f $DOCS || die "failed to remove docs before installation"
+
+ insinto "/usr/share/php/${PN}"
+ doins *.php
+ doins -r contrib datadict drivers lang pear perf replicate session xsl
+}
diff --git a/dev-php/adodb/metadata.xml b/dev-php/adodb/metadata.xml
new file mode 100644
index 000000000000..9212d6ef0b0f
--- /dev/null
+++ b/dev-php/adodb/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ <name>PHP</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="sourceforge">adodb</remote-id>
+ <remote-id type="github">ADOdb/ADOdb</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-php/agavi-1.0.8 b/dev-php/agavi-1.0.8
deleted file mode 100644
index 18cc7741e138..000000000000
--- a/dev-php/agavi-1.0.8
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=PHP MVC application framework
-EAPI=6
-HOMEPAGE=http://www.agavi.org/
-IUSE=examples +executable iconv session soap xmlrpc
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD LGPL-2.1+ icu unicode public-domain
-RDEPEND=dev-lang/php[iconv?,session?,soap?,xml,xmlrpc?] executable? ( dev-php/phing )
-SLOT=0
-SRC_URI=http://www.agavi.org/download/1.0.8.tgz -> agavi-1.0.8.tgz
-_md5_=9aafe6fec9a33fa39ec49721ff02b9d9
diff --git a/dev-php/agavi/Manifest b/dev-php/agavi/Manifest
new file mode 100644
index 000000000000..7ae2336d0c23
--- /dev/null
+++ b/dev-php/agavi/Manifest
@@ -0,0 +1,4 @@
+AUX agavi-executable 443 BLAKE2B 6fa22601439d966a6dc0c9db98f3004f362e6345fed70053d47529184b8c806d8342b0ffbd63c6e5019d0266a3ca64654126e4cb8369b141d48679a16a0d2b3a SHA512 5e9e6583a53bb3a8eb8e31e1dd2853c00bfdb95f3531e3d78bae9b401b67dd2e3011721113a219d86f1fe771238c34ad2cb6d2afd03c9227d17124a6a38e09ae
+DIST agavi-1.0.8.tgz 2074126 BLAKE2B b38ff9f15e877604376c6704f007044ed4907df9dcd303646e85d54e98ae65f8f2182841001414ee9326e92515cabb0839f150544e8121c1f87ebf79e6dd4a41 SHA512 9e75ef0be455e329db8b2389d7fd7a7acb25d04dda6c31dea15496dc4e24ab17cf0e44e199d0c2a9fb11987331d582cf0c700adee815cac7276c32643b9183ee
+EBUILD agavi-1.0.8.ebuild 858 BLAKE2B 1199cf929ca7ebdd9a323aa906d05308049057a64fe7240bc6ebc63368008e62d28abd76becf6415b1c06cd7b7629edcd68c524b0993750618c281d7dc5107fa SHA512 f8f2e0d2a98b23d458b87758af1e5436896f5d7cac936061f62027e05545e289aaaf4bf6a35c3b6dd7634c88b9930884528d5fc3db1b2dd9d3c9249f9ed6b32b
+MISC metadata.xml 592 BLAKE2B 02e7829f8c1fe398f0a52dc628f8c50848dbe0f7942a12fa3dcac173690f7b46352a8de148ad952e88121f7f2ef52c1f6710d13f38945c067d3239aad1c4df04 SHA512 6bd01d95a6f1f2b71cc2a8ad23e49e312e156b5e3d866d583e731ba9bd616867cb8698e40384ac0ca41edfe1aaa4f512e34e871ee86361cc70ad6d7ccca833c9
diff --git a/dev-php/agavi/agavi-1.0.8.ebuild b/dev-php/agavi/agavi-1.0.8.ebuild
new file mode 100644
index 000000000000..3edb056ec787
--- /dev/null
+++ b/dev-php/agavi/agavi-1.0.8.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="PHP MVC application framework"
+HOMEPAGE="http://www.agavi.org/"
+SRC_URI="http://www.agavi.org/download/${PV}.tgz -> ${P}.tgz"
+LICENSE="BSD LGPL-2.1+ icu unicode public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples +executable iconv session soap xmlrpc"
+
+RDEPEND="dev-lang/php[iconv?,session?,soap?,xml,xmlrpc?]
+ executable? ( dev-php/phing )"
+
+DOCS=(
+ API_CHANGELOG
+ CHANGELOG
+ CHANGELOG-0.9
+ CHANGELOG-0.10
+ CHANGELOG-0.11
+ CONTRIBUTING.md
+ README.md
+ RELEASE_NOTES
+ RELEASE_NOTES-0.9
+ RELEASE_NOTES-0.10
+ RELEASE_NOTES-0.11
+ UPGRADING
+)
+
+src_install() {
+ einstalldocs
+ use executable && newbin "${FILESDIR}/${PN}-executable" "${PN}"
+ use examples && dodoc -r samples
+
+ insinto "/usr/share/php/${PN}"
+ doins -r src/*
+}
diff --git a/dev-php/agavi/files/agavi-executable b/dev-php/agavi/files/agavi-executable
new file mode 100644
index 000000000000..06405d6ca2e7
--- /dev/null
+++ b/dev-php/agavi/files/agavi-executable
@@ -0,0 +1,14 @@
+#!/bin/sh
+#
+# A (heavily) modified version of the agavi-dist script shipped with
+# the Agavi package.
+#
+
+# Set this to the path to the Agavi installation's source directory. This is
+# the directory that contains the `agavi.php' file.
+AGAVI_SOURCE_DIRECTORY="/usr/share/php/agavi"
+
+php -d memory_limit=2G \
+ -f "${AGAVI_SOURCE_DIRECTORY}/build/agavi/script/agavi.php" \
+ -- \
+ --agavi-source-directory "${AGAVI_SOURCE_DIRECTORY}" "$@"
diff --git a/dev-php/agavi/metadata.xml b/dev-php/agavi/metadata.xml
new file mode 100644
index 000000000000..fb37a3a38209
--- /dev/null
+++ b/dev-php/agavi/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ <name>PHP</name>
+ </maintainer>
+ <use>
+ <flag name="executable">
+ Install the "agavi" executable used to manage projects. This
+ requires <pkg>dev-php/phing</pkg>, and may be omitted if you are
+ (for example) deploying an existing site to a production server.
+ </flag>
+ </use>
+ <upstream>
+ <remote-id type="github">agavi/agavi</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-php/awl-0.59 b/dev-php/awl-0.59
deleted file mode 100644
index c4f5e7afc7ba..000000000000
--- a/dev-php/awl-0.59
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install test
-DEPEND=test? ( dev-php/phpunit )
-DESCRIPTION=Andrew McMillan's Web Libraries
-EAPI=6
-HOMEPAGE=https://gitlab.com/davical-project/awl
-IUSE=test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/php:*[pdo,postgres,xml]
-SLOT=0
-SRC_URI=https://www.davical.org/downloads/awl_0.59.orig.tar.xz -> awl-0.59.tar.xz
-_md5_=8fe697c509cbd36dea2316132d20091d
diff --git a/dev-php/awl/Manifest b/dev-php/awl/Manifest
new file mode 100644
index 000000000000..0f6771e3d12c
--- /dev/null
+++ b/dev-php/awl/Manifest
@@ -0,0 +1,3 @@
+DIST awl-0.59.tar.xz 124652 BLAKE2B 45b6271c175c23597c56f3d2ecc906ffc7d32feb4d8d51529e8ff861791b901f7076a1ed2aaa2309101c7d0e8aa1a48327f2d2cc4fca2738fffc55fe7665c310 SHA512 98a7bf336d5677146e06d3d8f320b67ae2a034d2b7ad32d64998993ed29431fbcf8f7c8f972ccfa55d81af32f1b413e265850181a505022e9ad350a8a670e6b6
+EBUILD awl-0.59.ebuild 613 BLAKE2B fbb8d746e412553b9b605848eaa43e93df88ad4699c200a209cc110fdc6ae63f62a4912bda122fe6236294d17e4aceaf57e8508d1afb993f7cc145dd7c9ba5aa SHA512 31a39ddd2ebc4533c14fc4b7c164cc04404c1ff10ab5d2ed53817ca5e0ba161e2e6efb67c09439638a91308df17b14c5d0d43cee1efff61047bae6bdfbafe6d0
+MISC metadata.xml 476 BLAKE2B a082768fe63887996c15e2736d62a055692bc4fa0ad815f201bd9301b73dab3b084e10915e65d5443ffbab66d70ab9b42e12b2ccaf18e2f1a909879c3aa6bcc2 SHA512 e8607666ba3713a2484d18bbdd9387fe20705903f6688b0209a32f97d6c3cedb9d02ca8f205c7499aa431cad2b2ba2fb017e7cf2ff8b8970dbe10664d5c0eebb
diff --git a/dev-php/awl/awl-0.59.ebuild b/dev-php/awl/awl-0.59.ebuild
new file mode 100644
index 000000000000..3364d36a1b4d
--- /dev/null
+++ b/dev-php/awl/awl-0.59.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Andrew McMillan's Web Libraries"
+HOMEPAGE="https://gitlab.com/davical-project/awl"
+SRC_URI="https://www.davical.org/downloads/${PN}_${PV}.orig.tar.xz -> ${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND="test? ( dev-php/phpunit )"
+RDEPEND="dev-lang/php:*[pdo,postgres,xml]"
+
+S="${WORKDIR}"
+
+src_compile() {
+ :
+}
+
+src_test() {
+ phpunit tests/ || die "test suite failed"
+}
+
+src_install() {
+ einstalldocs
+ insinto /usr/share/php/${PN}
+ doins -r dba inc
+}
diff --git a/dev-php/awl/metadata.xml b/dev-php/awl/metadata.xml
new file mode 100644
index 000000000000..ce3237c0bb82
--- /dev/null
+++ b/dev-php/awl/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>till2.schaefer@uni-dortmund.de</email>
+ <name>Till Schäfer</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ <name>PHP</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/dev-php/ca-bundle-1.0.3 b/dev-php/ca-bundle-1.0.3
deleted file mode 100644
index 67e88cb475ee..000000000000
--- a/dev-php/ca-bundle-1.0.3
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Find the system CA bundle or fall back to the Mozilla one
-EAPI=6
-HOMEPAGE=https://github.com/composer/ca-bundle
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-lang/php:* dev-php/fedora-autoloader
-SLOT=0
-SRC_URI=https://github.com/composer/ca-bundle/archive/1.0.3.tar.gz -> ca-bundle-1.0.3.tar.gz
-_md5_=4faebefb533436b4a759b303fad7120d
diff --git a/dev-php/ca-bundle/Manifest b/dev-php/ca-bundle/Manifest
new file mode 100644
index 000000000000..733ccd9e939d
--- /dev/null
+++ b/dev-php/ca-bundle/Manifest
@@ -0,0 +1,4 @@
+AUX autoload.php 268 BLAKE2B 0b6618f45d1a4e03a317ea55b4af12c60c43f9eb98fe9b3cacc45e5cf505530cc4e332d5289365956abfb3eb882b3447d19919b5116d249d727b0c934f272eb3 SHA512 186ccfc3ae6669722d01948c266a9c0518e1da228095a880695b7de6502c9798203019622cc0c63e30fbf7abe94aa988b7c694bcc98522e04298aa90217b8ed8
+DIST ca-bundle-1.0.3.tar.gz 151659 BLAKE2B a8755af7041a1e093d06f6bf3bfdcd7461bd50ab5347f48285fb6e69d6e621c82c458c73625ed36d6745e91b0c7fabae37318da3674c47bb2813b78aa9483379 SHA512 e33629345d63121b7a6a46b0812afefad5adbc24fd5516eeb7471dd93b7e4126f144b6fc933b526796607fdc3fc9a99f5703188e15d905654d629591c555ad86
+EBUILD ca-bundle-1.0.3.ebuild 526 BLAKE2B d1f23cf223d8fafb9849c0884b8c1536db6e70a2600f91d25dc236fc5a79467fcd439933e71d7562855894ec2a6f60fcb3297e45c44df80d0dd78f10c8eadaa4 SHA512 0f2858fc082c4253f4b50f309a1f5f86538802302c8d97067210391d735f4a5274342ea234fe0a97d1f58f9fedd6d18bc996e2e08a5e43eab818295734e14315
+MISC metadata.xml 843 BLAKE2B d66b37ea7e1468303bbf544d3492a5f3108810a2a04bd5eec1562fa3b873e22cfc7922b46c96982900d8a0c7af7a22e4b33e9700057d32e238c35dd7fdaf5d06 SHA512 9cf3344f7122a81e5ce4b114a53af7c2cedc76e9607abffb906c70263b0c9dfab0209ee06be67ffc22d3da2e386fc376cc3aee007974e5338a259f853c5452fe
diff --git a/dev-php/ca-bundle/ca-bundle-1.0.3.ebuild b/dev-php/ca-bundle/ca-bundle-1.0.3.ebuild
new file mode 100644
index 000000000000..95b1abf40256
--- /dev/null
+++ b/dev-php/ca-bundle/ca-bundle-1.0.3.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Find the system CA bundle or fall back to the Mozilla one"
+HOMEPAGE="https://github.com/composer/ca-bundle"
+SRC_URI="${HOMEPAGE}/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/files/autoload.php b/dev-php/ca-bundle/files/autoload.php
new file mode 100644
index 000000000000..993360676f74
--- /dev/null
+++ b/dev-php/ca-bundle/files/autoload.php
@@ -0,0 +1,8 @@
+<?php
+/* Autoloader for composer/ca-bundle and its dependencies */
+
+if (!class_exists('Fedora\\Autoloader\\Autoload', false)) {
+ require_once '/usr/share/php/Fedora/Autoloader/autoload.php';
+}
+
+\Fedora\Autoloader\Autoload::addPsr4('Composer\\CaBundle\\', __DIR__);
diff --git a/dev-php/ca-bundle/metadata.xml b/dev-php/ca-bundle/metadata.xml
new file mode 100644
index 000000000000..1fad9628ff21
--- /dev/null
+++ b/dev-php/ca-bundle/metadata.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>guillaumeseren@gmail.com</email>
+ <name>Guillaume Seren</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ </maintainer>
+ <longdescription>
+ Small utility library that lets you find a path to the system CA
+ bundle, and includes a fallback to the Mozilla CA bundle.
+ Originally written as part of dev-php/composer, now extracted and
+ made available as a stand-alone library.
+ </longdescription>
+ <upstream>
+ <remote-id type="github">composer/ca-bundle</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-php/cli-prompt-1.0.0 b/dev-php/cli-prompt-1.0.0
deleted file mode 100644
index 2448431b529a..000000000000
--- a/dev-php/cli-prompt-1.0.0
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Allows you to prompt for user input on the command line
-EAPI=6
-HOMEPAGE=https://github.com/Seldaek/cli-prompt
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-lang/php:* dev-php/fedora-autoloader
-SLOT=0
-SRC_URI=https://github.com/Seldaek/cli-prompt/archive/1.0.0.tar.gz -> cli-prompt-1.0.0.tar.gz
-_md5_=5b64df8ad164552d4708d8255651439b
diff --git a/dev-php/cli-prompt/Manifest b/dev-php/cli-prompt/Manifest
new file mode 100644
index 000000000000..1fbc70d6099a
--- /dev/null
+++ b/dev-php/cli-prompt/Manifest
@@ -0,0 +1,4 @@
+AUX autoload.php 261 BLAKE2B 71987b4c16fe40a74fe8b84c22e855580ccd5901c1adef39d8a78ac2b48be6459e08dffadb979ec41f07d34ddfd88c8636e34a24f90941b4aedd0853b128b457 SHA512 e5eb2fe6feeacf29f0b2b6b5f8370ecb5e42d1d7f3464c0ba1f90565b6f0a15a6c3b79b6c8d1179f37c4fe8bee28c241b750af864b106c67dd7019c75aae38f9
+DIST cli-prompt-1.0.0.tar.gz 7538 BLAKE2B 650bb080c77471515d9baf31d1c5ea13fbfb4a9100e607e2f9c372c8c2ba0f6eac2d67ea0d2327bf30d1cbfaa65a8feb7e999b3a0b130f54e48c85ed8236cbe4 SHA512 5a1f6f999976f3b01d857890b5a06cfed377597397266b44d4aba324bedc2b9f73db5dc184ab40ee6632b43c80da99f5641366903bbc7bb7e18409cb367c8461
+EBUILD cli-prompt-1.0.0.ebuild 536 BLAKE2B c63bff6a789b815aeb911d8e7718cf056c79cd418d0be6a2330c81cb11a02ec59c3aca0f3898715e22c25e79b52f17096023cafd7f105df898421ae5362eac06 SHA512 de432496c42dfe1819c89d90b37404a2f236d83c8072969d36da16776ea3070a50023d333fda107cf454ccf9ceb878a5666bd7090e23f77cfaa0cb2b43ef2bd2
+MISC metadata.xml 708 BLAKE2B ff80a057a2ccf142b03191ef285e81ec250e145998eabed54849b6ad7cfe42f0b009b463268f6d792de97718310afdfab8c1f5c86e4853761958f1079284dcbe SHA512 87e434fed2ee3d6586a6e4cfdbc866a9aed25ad26c28ebca1cda29109031212430a97f0dc8d40668ef20fc355529f9141d03ab14ccc49e93a9ebf427294f6c78
diff --git a/dev-php/cli-prompt/cli-prompt-1.0.0.ebuild b/dev-php/cli-prompt/cli-prompt-1.0.0.ebuild
new file mode 100644
index 000000000000..4bf34feadb3c
--- /dev/null
+++ b/dev-php/cli-prompt/cli-prompt-1.0.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Allows you to prompt for user input on the command line"
+HOMEPAGE="https://github.com/Seldaek/cli-prompt"
+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:*
+ dev-php/fedora-autoloader"
+
+src_install() {
+ insinto "/usr/share/php/Seld/CliPrompt"
+ doins -r src/. "${FILESDIR}"/autoload.php
+ dodoc README.md
+}
diff --git a/dev-php/cli-prompt/files/autoload.php b/dev-php/cli-prompt/files/autoload.php
new file mode 100644
index 000000000000..7a1acbd38c9f
--- /dev/null
+++ b/dev-php/cli-prompt/files/autoload.php
@@ -0,0 +1,8 @@
+<?php
+/* Autoloader for symfony-finder and its dependencies */
+
+if (!class_exists('Fedora\\Autoloader\\Autoload', false)) {
+ require_once '/usr/share/php/Fedora/Autoloader/autoload.php';
+}
+
+\Fedora\Autoloader\Autoload::addPsr4('Seld\\CliPrompt\\', __DIR__);
diff --git a/dev-php/cli-prompt/metadata.xml b/dev-php/cli-prompt/metadata.xml
new file mode 100644
index 000000000000..4b3fb7237dc7
--- /dev/null
+++ b/dev-php/cli-prompt/metadata.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>guillaumeseren@gmail.com</email>
+ <name>Guillaume Seren</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ </maintainer>
+ <longdescription>
+ Allows you to prompt for user input on the command line,
+ and optionally hide the characters they type.
+ </longdescription>
+ <upstream>
+ <remote-id type="github">Seldaek/cli-prompt</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-php/composer-1.6.3 b/dev-php/composer-1.6.3
deleted file mode 100644
index 4ae6c2d70e47..000000000000
--- a/dev-php/composer-1.6.3
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Dependency Manager for PHP
-EAPI=6
-HOMEPAGE=https://github.com/composer/composer
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-lang/php:*[curl] >=dev-php/ca-bundle-1.0.0 >=dev-php/cli-prompt-1.0.0 >=dev-php/psr-log-1.0.2 dev-php/fedora-autoloader >=dev-php/json-schema-3.0.0 >=dev-php/jsonlint-1.4.0 >=dev-php/phar-utils-1.0.0 >=dev-php/semver-1.0.0 >=dev-php/spdx-licenses-1.2.0 >=dev-php/symfony-console-2.7.9 >=dev-php/symfony-filesystem-2.7.20 >=dev-php/symfony-finder-2.7.20 >=dev-php/symfony-process-2.8.12
-SLOT=0
-SRC_URI=https://github.com/composer/composer/archive/1.6.3.tar.gz -> composer-1.6.3.tar.gz
-_md5_=7fb80c05c83d795e5e25bb30982b322d
diff --git a/dev-php/composer-1.6.5 b/dev-php/composer-1.6.5
deleted file mode 100644
index 2049ed0e351b..000000000000
--- a/dev-php/composer-1.6.5
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Dependency Manager for PHP
-EAPI=6
-HOMEPAGE=https://github.com/composer/composer
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-lang/php:*[curl] >=dev-php/ca-bundle-1.0.0 >=dev-php/cli-prompt-1.0.0 >=dev-php/psr-log-1.0.2 dev-php/fedora-autoloader >=dev-php/json-schema-3.0.0 >=dev-php/jsonlint-1.4.0 >=dev-php/phar-utils-1.0.0 >=dev-php/semver-1.0.0 >=dev-php/spdx-licenses-1.2.0 >=dev-php/symfony-console-2.7.9 >=dev-php/symfony-filesystem-2.7.20 >=dev-php/symfony-finder-2.7.20 >=dev-php/symfony-process-2.8.12
-SLOT=0
-SRC_URI=https://github.com/composer/composer/archive/1.6.5.tar.gz -> composer-1.6.5.tar.gz
-_md5_=7fb80c05c83d795e5e25bb30982b322d
diff --git a/dev-php/composer/Manifest b/dev-php/composer/Manifest
new file mode 100644
index 000000000000..53423fe8dde3
--- /dev/null
+++ b/dev-php/composer/Manifest
@@ -0,0 +1,6 @@
+AUX autoload.php 965 BLAKE2B 5f9137a431f59e640b3d120ecafc1f7449890ff16c104899ae3d6d238756ac9c07dcfe49535cd59236cf92a9d242754a8a92a22ddc31609c3a72de8a8a258abd SHA512 c3ea41e0bc11b249b5b39e0fd3366e9f5a75e816ce7db0b11a223c4a4aeb6a3e031d2824e062ff26f5d1e75c01e023ebf9dfd3a1d5fc8b8e0f18168b79d3061c
+DIST composer-1.6.3.tar.gz 396955 BLAKE2B ee455c8ff7446fe2b51180c1c719a28a5efd30b24ba0f521ce07b02007bfaad15aea4d45b2a381d4a3abef123ce67077f8bf0bc3bee447752f3ab87bb6a5d46b SHA512 d373afe1bf8a5572f1d0bf3451d29ef1ea41f96a5fe54789e906601229d9366536ff0abdc7e0afa7cd14b22ccecf9ddf8b32fec14d4cd6fb308b878034af374c
+DIST composer-1.6.5.tar.gz 398169 BLAKE2B e89fb8805a58d031d4ba1e9694fb45eefa734d5ed79e1bd7c6aef02bf8a52ace19ed7fa109270d67af973f6892a45122017bc42bbd115245dc521e4720b5a549 SHA512 5f18a43af0b94006f4d553f03574347c7f279c409e3467ee65dfff12dad810d625a06452208e2024479faa0b1608ce122a293810e69b826667072171de7d905a
+EBUILD composer-1.6.3.ebuild 1155 BLAKE2B 18766c885a71fa4d17165f8244c9774dbad115ae6b66b000c5b27cf7b204da33b03b61f1b24dc274e9b6d571c1f1308690ec8ee9b1bdd57efca174e0cbb4fe2a SHA512 1e9e91f1b0f8fb37bf79983ac246b543d9bc958a90fb8136f393a2dd103671daa72e3134bcf403e612aeab810d368c8806b34908e1505e01ffe1c018930d465e
+EBUILD composer-1.6.5.ebuild 1155 BLAKE2B 18766c885a71fa4d17165f8244c9774dbad115ae6b66b000c5b27cf7b204da33b03b61f1b24dc274e9b6d571c1f1308690ec8ee9b1bdd57efca174e0cbb4fe2a SHA512 1e9e91f1b0f8fb37bf79983ac246b543d9bc958a90fb8136f393a2dd103671daa72e3134bcf403e612aeab810d368c8806b34908e1505e01ffe1c018930d465e
+MISC metadata.xml 774 BLAKE2B 8a1f75c0c7da6f0d193a981c6db3888d62e2223b6368c4a7dece62ae33cc9a2a8c0b34714170462f262569954e70cc9b976012ff864ccfa36a46da3c719169ae SHA512 1a17bfae65923a3bea593c57d7ecf4fb2aeef43d0537636105e52294de295cbfeaed4b3c36ffb8675a563f657f4f969e62096cee20b9ab178c962acf2f68ac3a
diff --git a/dev-php/composer/composer-1.6.3.ebuild b/dev-php/composer/composer-1.6.3.ebuild
new file mode 100644
index 000000000000..4edcaf353687
--- /dev/null
+++ b/dev-php/composer/composer-1.6.3.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Dependency Manager for PHP"
+HOMEPAGE="https://github.com/composer/composer"
+SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+ dev-lang/php:*[curl]
+ >=dev-php/ca-bundle-1.0.0
+ >=dev-php/cli-prompt-1.0.0
+ >=dev-php/psr-log-1.0.2
+ dev-php/fedora-autoloader
+ >=dev-php/json-schema-3.0.0
+ >=dev-php/jsonlint-1.4.0
+ >=dev-php/phar-utils-1.0.0
+ >=dev-php/semver-1.0.0
+ >=dev-php/spdx-licenses-1.2.0
+ >=dev-php/symfony-console-2.7.9
+ >=dev-php/symfony-filesystem-2.7.20
+ >=dev-php/symfony-finder-2.7.20
+ >=dev-php/symfony-process-2.8.12"
+
+src_install() {
+ insinto "/usr/share/${PN}"
+
+ # Composer expects the LICENSE file to be there, and the
+ # easiest thing to do is to give it what it wants.
+ doins -r src res LICENSE
+
+ insinto "/usr/share/${PN}/vendor"
+ doins "${FILESDIR}"/autoload.php
+
+ exeinto "/usr/share/${PN}/bin"
+ doexe "bin/${PN}"
+ dosym "../share/${PN}/bin/${PN}" "/usr/bin/${PN}"
+
+ dodoc CHANGELOG.md README.md doc/*.md
+ dodoc -r doc/articles doc/faqs
+}
diff --git a/dev-php/composer/composer-1.6.5.ebuild b/dev-php/composer/composer-1.6.5.ebuild
new file mode 100644
index 000000000000..4edcaf353687
--- /dev/null
+++ b/dev-php/composer/composer-1.6.5.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Dependency Manager for PHP"
+HOMEPAGE="https://github.com/composer/composer"
+SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+ dev-lang/php:*[curl]
+ >=dev-php/ca-bundle-1.0.0
+ >=dev-php/cli-prompt-1.0.0
+ >=dev-php/psr-log-1.0.2
+ dev-php/fedora-autoloader
+ >=dev-php/json-schema-3.0.0
+ >=dev-php/jsonlint-1.4.0
+ >=dev-php/phar-utils-1.0.0
+ >=dev-php/semver-1.0.0
+ >=dev-php/spdx-licenses-1.2.0
+ >=dev-php/symfony-console-2.7.9
+ >=dev-php/symfony-filesystem-2.7.20
+ >=dev-php/symfony-finder-2.7.20
+ >=dev-php/symfony-process-2.8.12"
+
+src_install() {
+ insinto "/usr/share/${PN}"
+
+ # Composer expects the LICENSE file to be there, and the
+ # easiest thing to do is to give it what it wants.
+ doins -r src res LICENSE
+
+ insinto "/usr/share/${PN}/vendor"
+ doins "${FILESDIR}"/autoload.php
+
+ exeinto "/usr/share/${PN}/bin"
+ doexe "bin/${PN}"
+ dosym "../share/${PN}/bin/${PN}" "/usr/bin/${PN}"
+
+ dodoc CHANGELOG.md README.md doc/*.md
+ dodoc -r doc/articles doc/faqs
+}
diff --git a/dev-php/composer/files/autoload.php b/dev-php/composer/files/autoload.php
new file mode 100644
index 000000000000..30d8495a4548
--- /dev/null
+++ b/dev-php/composer/files/autoload.php
@@ -0,0 +1,28 @@
+<?php
+/* Autoloader for composer and its dependencies */
+
+$vendorDir = '/usr/share/php';
+if (!class_exists('Fedora\\Autoloader\\Autoload', false)) {
+ require_once '/usr/share/php/Fedora/Autoloader/autoload.php';
+}
+
+\Fedora\Autoloader\Autoload::addPsr4(
+ 'Composer\\',
+ __DIR__ . '/../src/Composer'
+);
+
+// Dependencies
+\Fedora\Autoloader\Dependencies::required(array(
+ $vendorDir . '/JsonSchema/autoload.php',
+ $vendorDir . '/Composer/CaBundle/autoload.php',
+ $vendorDir . '/Composer/Semver/autoload.php',
+ $vendorDir . '/Composer/Spdx/autoload.php',
+ $vendorDir . '/Seld/JsonLint/autoload.php',
+ $vendorDir . '/Symfony/Component/Console/autoload.php',
+ $vendorDir . '/Symfony/Component/Finder/autoload.php',
+ $vendorDir . '/Symfony/Component/Process/autoload.php',
+ $vendorDir . '/Symfony/Component/Filesystem/autoload.php',
+ $vendorDir . '/Seld/PharUtils/autoload.php',
+ $vendorDir . '/Seld/CliPrompt/autoload.php',
+ $vendorDir . '/Psr/Log/autoload.php',
+));
diff --git a/dev-php/composer/metadata.xml b/dev-php/composer/metadata.xml
new file mode 100644
index 000000000000..cdbe7f339484
--- /dev/null
+++ b/dev-php/composer/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>guillaumeseren@gmail.com</email>
+ <name>Guillaume Seren</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ </maintainer>
+ <longdescription>
+ Composer is a tool for dependency management in PHP.
+ It allows you to declare the libraries your project depends on
+ and it will manage (install/update) them for you.
+ </longdescription>
+ <upstream>
+ <remote-id type="github">composer/composer</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-php/cphplib-0.51-r1 b/dev-php/cphplib-0.51-r1
deleted file mode 100644
index aafde351edfd..000000000000
--- a/dev-php/cphplib-0.51-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=>=dev-php/PEAR-DB-1.7.6-r1
-DESCRIPTION=Cute PHP Library (cphplib)
-EAPI=6
-HOMEPAGE=http://cphplib.sourceforge.net/
-IUSE=doc
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=>=dev-php/PEAR-DB-1.7.6-r1
-SLOT=0
-SRC_URI=mirror://sourceforge/cphplib/cphplib-0.51.tar.bz2
-_md5_=f63358e171a88a8ba1425aa5e585ca03
diff --git a/dev-php/cphplib/Manifest b/dev-php/cphplib/Manifest
new file mode 100644
index 000000000000..fe5c1a327f43
--- /dev/null
+++ b/dev-php/cphplib/Manifest
@@ -0,0 +1,4 @@
+AUX constructor.patch 877 BLAKE2B b2f1c1fbff365992961495729632075afaaa10e8383ebe04c8802ef6466a7b71565945adf8b3536e6bc58715a22ea1f6fad71d19d30afc33a4bbf06dde68a193 SHA512 0fb08f411829f0c041203cc14859c184036422af5aedb4829cfa1212153ff92e43c8e4889b3a7e1c943ebd1532e2aecab6e4b44147865726966ad804a2f0595d
+DIST cphplib-0.51.tar.bz2 117555 BLAKE2B e90371d11bb342bf63ef24616d03b1c1e5dc3d8d3eae8410cf2e44f84560cb6385afc9f2fb4690ec94244a6467aca6de71452093af8c61b98777561a15a10823 SHA512 b1db52bb241f4e996538fc6173a72a9ff8d6e19596808030ad1f7ed28b051d2e6f2ececf0cfcfd177a18cab049b5b1c4d3c8877cd93d4cb5705142d035d67818
+EBUILD cphplib-0.51-r1.ebuild 826 BLAKE2B 5c34e2e7c9a06f081244e56f666f99fb632564383018fa2d66cfedebe828d70c3bfaaf63e48eec78ec663c530b29aa7c6c42c8e681d6d9dd653dff44e7d789da SHA512 28ef36a3ff8dc6fffd76452f4286d4c36e56cfdeb6f3aa9cb423e82c4053ba52d233e153cad01dc69312c114c606c9965f91ac29bbb94110ecb8c1970c65f028
+MISC metadata.xml 316 BLAKE2B 5247b858ae90aa409456eed3ab250851ecc33f1514c7eb30cf810f1d1b2dd3bcb776b5a4e5e55d2884f4f36fe337da88798c0888c40ad5c37cc29531d27a7df7 SHA512 c07b2cc214a5a7f6f43c0ea18c7787ccc9caebc878bcf0e039c6155e00d6a444df3fa6429a1b6c808434398a342c5eed5473f26dbd6f7f165eeb4ff489c10b6e
diff --git a/dev-php/cphplib/cphplib-0.51-r1.ebuild b/dev-php/cphplib/cphplib-0.51-r1.ebuild
new file mode 100644
index 000000000000..c79a4a612094
--- /dev/null
+++ b/dev-php/cphplib/cphplib-0.51-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KEYWORDS="~amd64 ~x86"
+
+DESCRIPTION="Cute PHP Library (cphplib)"
+HOMEPAGE="http://cphplib.sourceforge.net/"
+SRC_URI="mirror://sourceforge/cphplib/${P}.tar.bz2"
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="doc"
+
+DEPEND=">=dev-php/PEAR-DB-1.7.6-r1"
+RDEPEND="${DEPEND}"
+PATCHES=( "${FILESDIR}/constructor.patch" )
+
+src_install() {
+ local DOCS=( ChangeLog README TODO )
+ local -a HTML_DOCS
+ insinto "/usr/share/php/${PN}"
+ doins -r i18n cphplib_formular.inc cphplib.inc
+ use doc && HTML_DOCS=( doc/packages.html doc/blank.html
+ doc/classtrees_cphplib.html doc/index.html doc/cphplib/
+ doc/errors.html doc/__filesource/ doc/elementindex.html
+ doc/li_cphplib.html doc/elementindex_cphplib.html doc/media/ )
+ einstalldocs
+}
diff --git a/dev-php/cphplib/files/constructor.patch b/dev-php/cphplib/files/constructor.patch
new file mode 100644
index 000000000000..1ab88d212c1f
--- /dev/null
+++ b/dev-php/cphplib/files/constructor.patch
@@ -0,0 +1,42 @@
+diff -uarN a/cphplib_formular.inc b/cphplib_formular.inc
+--- a/cphplib_formular.inc 2006-05-25 05:03:44.000000000 -0400
++++ b/cphplib_formular.inc 2017-07-27 10:49:10.928727081 -0400
+@@ -130,6 +130,11 @@
+
+ function cphplib_formular($locale="de_DE")
+ {
++ __construct($locale);
++ }
++
++ function __construct($locale="de_DE")
++ {
+ parent::cphplib($locale);
+
+ $this->os_type = $this->os_type();
+@@ -1390,4 +1395,3 @@
+ }
+ }
+
+-?>
+\ No newline at end of file
+diff -uarN a/cphplib.inc b/cphplib.inc
+--- a/cphplib.inc 2006-05-25 05:03:58.000000000 -0400
++++ b/cphplib.inc 2017-07-27 10:59:51.910098156 -0400
+@@ -215,6 +215,11 @@
+ */
+ function cphplib($locale="de_DE")
+ {
++ __construct($locale);
++ }
++
++ function __construct($locale="de_DE")
++ {
+ if (!empty($locale))
+ {
+ $this->locale = $locale;
+@@ -4539,4 +4544,3 @@
+ }
+ }
+
+-?>
+\ No newline at end of file
diff --git a/dev-php/cphplib/metadata.xml b/dev-php/cphplib/metadata.xml
new file mode 100644
index 000000000000..ed619841de95
--- /dev/null
+++ b/dev-php/cphplib/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ <name>PHP</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="sourceforge">cphplib</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-php/doctrine-1.2.5 b/dev-php/doctrine-1.2.5
deleted file mode 100644
index ab8af64a8552..000000000000
--- a/dev-php/doctrine-1.2.5
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=>=dev-lang/php-5.2.3:*[cli,pdo]
-DESCRIPTION=An object relational mapper for PHP5
-EAPI=5
-HOMEPAGE=https://www.doctrine-project.org/
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1 MIT BSD
-RDEPEND=>=dev-lang/php-5.2.3:*[cli,pdo]
-SLOT=0
-SRC_URI=https://github.com/doctrine/doctrine1/archive/v1.2.5.tar.gz -> doctrine-1.2.5.tar.gz
-_md5_=aaee163cac291cc4f91083d34984c585
diff --git a/dev-php/doctrine-2.4.6 b/dev-php/doctrine-2.4.6
deleted file mode 100644
index 6d4e7437bf1e..000000000000
--- a/dev-php/doctrine-2.4.6
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=>=dev-lang/php-5.3.2:*[cli,pdo]
-DESCRIPTION=An object relational mapper for PHP5
-EAPI=5
-HOMEPAGE=https://www.doctrine-project.org/
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1 MIT BSD
-RDEPEND=>=dev-lang/php-5.3.2:*[cli,pdo]
-SLOT=2
-SRC_URI=https://github.com/doctrine/doctrine2/archive/v2.4.6.tar.gz -> doctrine-2.4.6.tar.gz
-_md5_=4abb522e51f1e897e9c329e48629e992
diff --git a/dev-php/doctrine-2.6.1 b/dev-php/doctrine-2.6.1
deleted file mode 100644
index 46fee12dbdd0..000000000000
--- a/dev-php/doctrine-2.6.1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=An object relational mapper for PHP
-EAPI=6
-HOMEPAGE=https://www.doctrine-project.org/
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-lang/php-7.1:*[cli,pdo]
-SLOT=2
-SRC_URI=https://github.com/doctrine/doctrine2/archive/v2.6.1.tar.gz -> doctrine-2.6.1.tar.gz
-_md5_=bb6f2a2a7a131bb9b8cd632592e4e604
diff --git a/dev-php/doctrine-instantiator-1.0.5 b/dev-php/doctrine-instantiator-1.0.5
deleted file mode 100644
index d112307ac100..000000000000
--- a/dev-php/doctrine-instantiator-1.0.5
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Utility to instantiate objects in PHP without invoking their constructors
-EAPI=6
-HOMEPAGE=https://github.com/doctrine//instantiator
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86
-LICENSE=MIT
-RDEPEND=dev-php/fedora-autoloader >=dev-lang/php-5.6:*
-SLOT=0
-SRC_URI=https://github.com/doctrine//instantiator/archive/1.0.5.tar.gz -> doctrine-instantiator-1.0.5.tar.gz
-_md5_=098f59923a6c26e276c94ca201345088
diff --git a/dev-php/doctrine-instantiator/Manifest b/dev-php/doctrine-instantiator/Manifest
new file mode 100644
index 000000000000..0ad213ed6144
--- /dev/null
+++ b/dev-php/doctrine-instantiator/Manifest
@@ -0,0 +1,4 @@
+AUX autoload.php 258 BLAKE2B 3ed7c897b02b90914e7ba7fa06e79805586b0b5bf2b614e8b81b077ccd43557165af8c7ae61e4c30430ae838d8387cb536dd0ef3ed9464fc7343fdb842dbc2d1 SHA512 92a06f40f6ea012fbf0a0e521959b41b5aa23ed047c00cf7e52f974f650060969d4a602c569096da47fbd86393c854b2b16da91c7bfeb38e159eeb7254abc725
+DIST doctrine-instantiator-1.0.5.tar.gz 10202 BLAKE2B 77ab3fba96672f6aa2826002510c99c21beccdc09e92dbc2c09426f8fc47590554ef5d32b6bec92ea2dc2ab1c61a178c280ab01090b3aafc14a10a4b4fec3628 SHA512 78b00b2550b47772b5825fbde59729e0613a90c1d9dacf1b7b7d13ccb5bbd8534af7e732dcc1b5b6f9bbafa2f9c3e7418e184851ab0f3a37c0c945b5eed1e229
+EBUILD doctrine-instantiator-1.0.5.ebuild 691 BLAKE2B f9cd79662e24c0cb74721cb2360ef75b71fc5665c3bd8bfd67a620c4b26ec8ce247a7cecdb82e03b55ea826b22c579b394efcbea6ad17d75e1040ec4c7052db9 SHA512 d55cd58b746437919ff7e3be207e2013922634453d8ce4a130642b53b02a41941f6ee719115c7da555da63322f8e5aec314866fa691d66db7137a5a0af81f2fb
+MISC metadata.xml 313 BLAKE2B 76bc8cb4562afb0810ab8a4a79265bc44ba328370c3ab64d3599c6971ee1005f75cca364a00bfca316584c00c28d1c9ad5b0eb3c86889426852af9a6bca31986 SHA512 6a34d1c5966ec568eb1cdc499ef9ea9c799e104a4c47aa061b3197ecafce3a49a372e5f4d92b834b3b725c7697ed1e5e85be4654b3159a2427f5d649b11bf93d
diff --git a/dev-php/doctrine-instantiator/doctrine-instantiator-1.0.5.ebuild b/dev-php/doctrine-instantiator/doctrine-instantiator-1.0.5.ebuild
new file mode 100644
index 000000000000..2cf3f91e6a6b
--- /dev/null
+++ b/dev-php/doctrine-instantiator/doctrine-instantiator-1.0.5.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PN="${PN/doctrine-//}"
+
+DESCRIPTION="Utility to instantiate objects in PHP without invoking their constructors"
+HOMEPAGE="https://github.com/doctrine/${MY_PN}"
+SRC_URI="https://github.com/doctrine/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+IUSE=""
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+RDEPEND="dev-php/fedora-autoloader
+ >=dev-lang/php-5.6:*"
+
+src_install() {
+ insinto /usr/share/php/
+ doins -r src/*
+ insinto /usr/share/php/Doctrine/Instantiator
+ doins "${FILESDIR}/autoload.php"
+}
diff --git a/dev-php/doctrine-instantiator/files/autoload.php b/dev-php/doctrine-instantiator/files/autoload.php
new file mode 100644
index 000000000000..978f45e6a24a
--- /dev/null
+++ b/dev-php/doctrine-instantiator/files/autoload.php
@@ -0,0 +1,8 @@
+<?php
+/* Autoloader for dev-php/doctrine-instantiator */
+
+if (!class_exists('Fedora\\Autoloader\\Autoload', false)) {
+ require_once '/usr/share/php/Fedora/Autoloader/autoload.php';
+}
+
+Fedora\Autoloader\Autoload::addPsr4('Doctrine\\Instantiator\\', __DIR__);
diff --git a/dev-php/doctrine-instantiator/metadata.xml b/dev-php/doctrine-instantiator/metadata.xml
new file mode 100644
index 000000000000..7ddeb0b99ff9
--- /dev/null
+++ b/dev-php/doctrine-instantiator/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://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">doctrine/</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-php/doctrine/Manifest b/dev-php/doctrine/Manifest
new file mode 100644
index 000000000000..769dd9a6908e
--- /dev/null
+++ b/dev-php/doctrine/Manifest
@@ -0,0 +1,7 @@
+DIST doctrine-1.2.5.tar.gz 659173 BLAKE2B fd703eb52d209548dd44950cdb23c2e3298e044f9387acadb2edc67bba79dd9b0a60fdf9a98d46e8078415c1e0ff21976323a6df1ab9f798ee475690ce50d4d8 SHA512 c72f4e829a92b011af0bd96d2f8a780c3106afb57a9677a21aed683473ff00aebdf7143a276c7cc70f1b142196968b5e2e5e1f744dba5c8ae1267b867b4e0310
+DIST doctrine-2.4.6.tar.gz 456426 BLAKE2B 775c14750954ced8728c220dee6ca41cbfa66a7c34b00476f6941d5681302b1f10cc8dfa5e206780bb3b4b5d0e591b0e770de182340c6e7a881d3c4ca3f5795c SHA512 d7aeb58e8c76df384a472df08618a058b70f2b8499de6a3157c36bde125ab32c7bf4f80d1e6d880502ccfed2db704f3218a6f1f1ecbf603cc828e2a757c366b5
+DIST doctrine-2.6.1.tar.gz 554462 BLAKE2B 3481a1e7c8acfb0de5c4aa64aa32d583e8f01b2175b2957ec8aa0ae29c962e7482ae1d36217aa765fc38198dc851cbecb5e8ee24829f9e335ad4d18bec3bb1f5 SHA512 f2ca1df4a1da814a0047d2da76da0df64ef704e8f5b2464f2a546e61e615d40de9508c72543ae5574188882dd2a3917d8205ec194c63d7b264257443cdfd47c8
+EBUILD doctrine-1.2.5.ebuild 555 BLAKE2B 1f4aca307534c7d6d1154fc072e8a41ee7784b616454caac7f7d76002fc441a6e9214c9a51a95e6c0c4f6530b1a1fa5d8f3fdd9ec29877e4e612a2899b105c79 SHA512 2fe2c0712b7591360e004d952deea9fd9946d027cf10e00ae2f180772c505d055a7e7bc9c1e7010c6af87196ac58a7dbd1387141a9eff8fe33cd933791fabc9b
+EBUILD doctrine-2.4.6.ebuild 531 BLAKE2B 7a4b5fbe31fd84083473455ce554f4f60252b383e517428a6c268e84c2646434ea5f933e38e9c2da17edc2206331da72d933874ece96f47a6a8df98315f58a0c SHA512 7d4f306bd2978ae62ca4b0d1746ea33d3bc5f39f01e031b352fc723e2ae77180a3ad7ddf7682f546ce6e0f38d1352ecec171d4cb2c7bc451f9d297868f8cca8f
+EBUILD doctrine-2.6.1.ebuild 672 BLAKE2B 288f877b15cf75273ce1de0df0d64030ff17f5a68da6ec74808ded7b1f98e8b6c42326b0be0285e5f21413b72a6091ccfe6427ca0fbe4e92b55c131680924c0d SHA512 67ac1a18dc3e145497acb0ac6e7ad95c7806d22feac227d7111cfaa2923d761594eb57daa731e2cfdbc86195dad17d469fa9881e703d5a2d041194ffb12e14ad
+MISC metadata.xml 332 BLAKE2B 34b5c4879dbbabaf08883df45cc3fbed8c8c9e4af84defb70af64a25863914320e637f2fe0d388c21066b55921edf68cec06d0fb24de4464bb785a63d7cdcc72 SHA512 44f05e8196f20572f12f8ced92fdc76a78198ada035dd4eff11d37fea991aefd35364b07beb3abb213b63c900e7b9ed2b3e23f4d32fa0680928a342e0a5df8db
diff --git a/dev-php/doctrine/doctrine-1.2.5.ebuild b/dev-php/doctrine/doctrine-1.2.5.ebuild
new file mode 100644
index 000000000000..bf2faae0288f
--- /dev/null
+++ b/dev-php/doctrine/doctrine-1.2.5.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+MY_P="${PN}1-${PV}"
+DESCRIPTION="An object relational mapper for PHP5"
+HOMEPAGE="https://www.doctrine-project.org/"
+SRC_URI="https://github.com/${PN}/${PN}1/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1 MIT BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=">=dev-lang/php-5.2.3:*[cli,pdo]"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+ insinto /usr/share/php
+ doins -r lib/Doctrine
+ doins lib/Doctrine.php
+}
diff --git a/dev-php/doctrine/doctrine-2.4.6.ebuild b/dev-php/doctrine/doctrine-2.4.6.ebuild
new file mode 100644
index 000000000000..5184f5a1812f
--- /dev/null
+++ b/dev-php/doctrine/doctrine-2.4.6.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+MY_P="${PN}2-${PV}"
+DESCRIPTION="An object relational mapper for PHP5"
+HOMEPAGE="https://www.doctrine-project.org/"
+SRC_URI="https://github.com/${PN}/${PN}2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1 MIT BSD"
+SLOT="2"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=">=dev-lang/php-5.3.2:*[cli,pdo]"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+ insinto /usr/share/php
+ doins -r lib/Doctrine
+}
diff --git a/dev-php/doctrine/doctrine-2.6.1.ebuild b/dev-php/doctrine/doctrine-2.6.1.ebuild
new file mode 100644
index 000000000000..edd7e6575055
--- /dev/null
+++ b/dev-php/doctrine/doctrine-2.6.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_P="${PN}2-${PV}"
+DESCRIPTION="An object relational mapper for PHP"
+HOMEPAGE="https://www.doctrine-project.org/"
+SRC_URI="https://github.com/${PN}/${PN}2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="2"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/php-7.1:*[cli,pdo]"
+DEPEND=""
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+ insinto /usr/share/php
+ doins -r lib/Doctrine
+ insinto /usr/share/php/Doctrine
+ exeinto /usr/share/php/Doctrine
+ doins bin/doctrine.php
+ doexe bin/doctrine
+ dosym ../share/php/Doctrine/doctrine /usr/bin/doctrine
+}
diff --git a/dev-php/doctrine/metadata.xml b/dev-php/doctrine/metadata.xml
new file mode 100644
index 000000000000..938c67e8b180
--- /dev/null
+++ b/dev-php/doctrine/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://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">doctrine/doctrine2</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-php/fedora-autoloader-0.2.1 b/dev-php/fedora-autoloader-0.2.1
deleted file mode 100644
index c24e9c0785af..000000000000
--- a/dev-php/fedora-autoloader-0.2.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install test
-DEPEND=test? ( dev-lang/php:* dev-php/phpunit )
-DESCRIPTION=Fedora's Static PSR-4, PSR-0, and classmap autoloader
-EAPI=6
-HOMEPAGE=https://github.com/php-fedora/autoloader
-IUSE=test
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86
-LICENSE=MIT
-RDEPEND=dev-lang/php:*
-SLOT=0
-SRC_URI=https://github.com/php-fedora/autoloader/archive/0.2.1.tar.gz -> fedora-autoloader-0.2.1.tar.gz
-_md5_=a3bac694e2309ca3f42623cd24784d23
diff --git a/dev-php/fedora-autoloader-1.0.0 b/dev-php/fedora-autoloader-1.0.0
deleted file mode 100644
index 171d75ebdee9..000000000000
--- a/dev-php/fedora-autoloader-1.0.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install test
-DEPEND=test? ( dev-lang/php:* dev-php/phpunit )
-DESCRIPTION=Fedora's Static PSR-4, PSR-0, and classmap autoloader
-EAPI=6
-HOMEPAGE=https://github.com/php-fedora/autoloader
-IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=MIT
-RDEPEND=dev-lang/php:*
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/php-fedora/autoloader/archive/1.0.0.tar.gz -> fedora-autoloader-1.0.0.tar.gz
-_md5_=dc4be30bd9cf82964c9451aa34e47b5b
diff --git a/dev-php/fedora-autoloader/Manifest b/dev-php/fedora-autoloader/Manifest
new file mode 100644
index 000000000000..d9505933d4ab
--- /dev/null
+++ b/dev-php/fedora-autoloader/Manifest
@@ -0,0 +1,5 @@
+DIST fedora-autoloader-0.2.1.tar.gz 7634 BLAKE2B e2827ac332a7b50f94383a11b33f25625d67984491fc46dce6ad01d6e4b986c489062464d09ff5ed32f29c2d623ff9d59579fc007eceb1279f660695feea72a0 SHA512 81501dbc0668c1cc6d6fb030e0d9ee91d31db8fa32b3348a0215dbf20a3ef1d41bc398124e1d7f0c1d5ffa8fce8c33e60a3182eaba6ba740d78b4a7f6db2aea8
+DIST fedora-autoloader-1.0.0.tar.gz 8504 BLAKE2B ada69f3f3126b2c233b0ab933e52468d8303dbaacfc27364f490ce7b093043f92913ecc55180b460828573f0f204f5e7f4d10b3149ef6f5b3cee1d645fa6ac58 SHA512 a8e3330d961a9415a817d41ad9feb91018aa398607a2adce1f8386d491581773226f6819ac3d90827344898fbbdb32c0881af3f122efdad021f7ce70a07cc66e
+EBUILD fedora-autoloader-0.2.1.ebuild 698 BLAKE2B f1d6b9de6d5af4de150e2a08b31183bbee4c92628b5b9e612561c32d64cb51a4a81458799f0820ed6e0671cc939ed206841370a8b165b392d7e1ae1a9f123bbd SHA512 7732032bab321dfcd732600dae515f23dec33348a709a4fdc9cf3b6f503db5e91473758aef682c5d96f486dffca4751be86526b1fb53d39b223aa6fccc840eb9
+EBUILD fedora-autoloader-1.0.0.ebuild 725 BLAKE2B 1d62af67d44179653f28bcd252646afe844da36d4674c52de3d00bc73a3ede9b03c16e2c820bef3eb2d5b9212689ae31474490603c4b7945b4b828b973be0943 SHA512 badd2cd94a6c51e7723932736ac8d66f251b5bd68d3c2f88c1aa803583bccc9d0bb1aa852d6529c353f89834f2bfb41623de2ea35ef0a1d96108452152c44c4d
+MISC metadata.xml 710 BLAKE2B 8ce6437cfec2d52048b7107c177bc025ea7770ac3aea2c86782f9b61ad6ba05b9c3df2f377ef97291356f97822721bda247047577383374252170f5835ee7f10 SHA512 f12b4505ad34c9171cb4547793c17406e4bee91f6b97efc39825d981d426fd729304ee72ac51471e8b4fea8cf6d194bc32990bec2206d661e510847729fc3819
diff --git a/dev-php/fedora-autoloader/fedora-autoloader-0.2.1.ebuild b/dev-php/fedora-autoloader/fedora-autoloader-0.2.1.ebuild
new file mode 100644
index 000000000000..bff9b57a001e
--- /dev/null
+++ b/dev-php/fedora-autoloader/fedora-autoloader-0.2.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Fedora's Static PSR-4, PSR-0, and classmap autoloader"
+HOMEPAGE="https://github.com/php-fedora/autoloader"
+SRC_URI="https://github.com/php-fedora/autoloader/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+IUSE="test"
+
+RDEPEND="dev-lang/php:*"
+DEPEND="
+ test? (
+ ${RDEPEND}
+ dev-php/phpunit )"
+
+S="${WORKDIR}/autoloader-${PV}"
+
+src_install() {
+ insinto "/usr/share/php/Fedora/Autoloader"
+ doins -r src/.
+ dodoc CHANGELOG.md README.md
+}
+
+src_test() {
+ phpunit || die "test suite failed"
+}
diff --git a/dev-php/fedora-autoloader/fedora-autoloader-1.0.0.ebuild b/dev-php/fedora-autoloader/fedora-autoloader-1.0.0.ebuild
new file mode 100644
index 000000000000..0decde9fce07
--- /dev/null
+++ b/dev-php/fedora-autoloader/fedora-autoloader-1.0.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Fedora's Static PSR-4, PSR-0, and classmap autoloader"
+HOMEPAGE="https://github.com/php-fedora/autoloader"
+SRC_URI="https://github.com/php-fedora/autoloader/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+
+IUSE="test"
+
+RESTRICT="test"
+
+RDEPEND="dev-lang/php:*"
+DEPEND="
+ test? (
+ ${RDEPEND}
+ dev-php/phpunit )"
+
+S="${WORKDIR}/autoloader-${PV}"
+
+src_install() {
+ insinto "/usr/share/php/Fedora/Autoloader"
+ doins -r src/.
+ dodoc CHANGELOG.md README.md
+}
+
+src_test() {
+ phpunit || die "test suite failed"
+}
diff --git a/dev-php/fedora-autoloader/metadata.xml b/dev-php/fedora-autoloader/metadata.xml
new file mode 100644
index 000000000000..551bb2bc4e84
--- /dev/null
+++ b/dev-php/fedora-autoloader/metadata.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>guillaumeseren@gmail.com</email>
+ <name>Guillaume Seren</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ </maintainer>
+ <longdescription>
+ Static PSR-4, PSR-0, and classmap autoloader.
+ Includes loader for required and optional dependencies.
+ </longdescription>
+ <upstream>
+ <remote-id type="github">php-fedora/autoloader</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-php/geos-php-1.0.0 b/dev-php/geos-php-1.0.0
deleted file mode 100644
index 5066d1e278ab..000000000000
--- a/dev-php/geos-php-1.0.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sci-libs/geos[-php(-)] test? ( dev-php/phpunit ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 )
-DESCRIPTION=A PHP interface to GEOS - Geometry Engine, Open Source
-EAPI=6
-HOMEPAGE=https://trac.osgeo.org/geos
-IUSE=test php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=sci-libs/geos[-php(-)] php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 )
-REQUIRED_USE=|| ( php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2 )
-SLOT=0
-SRC_URI=https://git.osgeo.org/gitea/geos/php-geos/archive/1.0.0.tar.gz -> geos-php-1.0.0.tar.gz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e php-ext-source-r3 63b281041baa106ff1ef59b602ca7e2a toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=33dc6eaa82cbbd55db1be02db577acd3
diff --git a/dev-php/geos-php/Manifest b/dev-php/geos-php/Manifest
new file mode 100644
index 000000000000..c8f6b1a380f5
--- /dev/null
+++ b/dev-php/geos-php/Manifest
@@ -0,0 +1,3 @@
+DIST geos-php-1.0.0.tar.gz 40870 BLAKE2B c6d526470bdb7e4aecce6ce5f2132f90a6c40e5a2b3a8169bbb7ae101394340aad8a23309130c7f1421e19162b5559f9e87e58fb704e91b1fc03b612543551e8 SHA512 4ceb9e1152d0b534bc3a5e372be0b98770b1883ec4dda1177c9399d95d947b9feee412accf003d27b55b1a901c90259a9b38792b453dac11cb8af26af3cd91ec
+EBUILD geos-php-1.0.0.ebuild 720 BLAKE2B 8e989a4b1277dcf561c9dd855b99519bade40e5447e1d3910f1f6eeb15070d8ca21cec1473212802b4ea4fe840a1ba274cef5fededf1c0f15934308c6bd683cc SHA512 a5e0623566f780cfc2ab39d4e9abdb339733ca27e85847a47775cc19de47c38f5f28169c4ac0ff28f67d15dd245f861aee4d3236e160be05c491a9fa4b162b0b
+MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/geos-php/geos-php-1.0.0.ebuild b/dev-php/geos-php/geos-php-1.0.0.ebuild
new file mode 100644
index 000000000000..848afdf5d7f0
--- /dev/null
+++ b/dev-php/geos-php/geos-php-1.0.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PHP_EXT_NAME="geos"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+
+USE_PHP="php5-6 php7-0 php7-1 php7-2"
+
+MY_PV="${PV/_/}"
+MY_PV="${MY_PV/rc/RC}"
+
+S="${WORKDIR}/php-geos"
+
+inherit php-ext-source-r3
+
+KEYWORDS="~amd64 ~x86"
+
+DESCRIPTION="A PHP interface to GEOS - Geometry Engine, Open Source"
+HOMEPAGE="https://trac.osgeo.org/geos"
+SRC_URI="https://git.osgeo.org/gitea/geos/php-geos/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="test"
+
+RDEPEND="sci-libs/geos[-php(-)]"
+DEPEND="sci-libs/geos[-php(-)] test? ( dev-php/phpunit )"
+DOCS=( README.md CREDITS NEWS TODO )
+PHP_EXT_ECONF_ARGS=()
diff --git a/dev-php/geos-php/metadata.xml b/dev-php/geos-php/metadata.xml
new file mode 100644
index 000000000000..b86acf66c756
--- /dev/null
+++ b/dev-php/geos-php/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ <name>PHP</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/dev-php/igbinary-2.0.5 b/dev-php/igbinary-2.0.5
deleted file mode 100644
index ff56789e7e4a..000000000000
--- a/dev-php/igbinary-2.0.5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 )
-DESCRIPTION=A fast drop-in replacement for the standard PHP serialize
-EAPI=6
-HOMEPAGE=https://github.com/igbinary/igbinary
-IUSE=php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2
-KEYWORDS=amd64 ~arm x86
-LICENSE=BSD
-RDEPEND=php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 )
-REQUIRED_USE=|| ( php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2 )
-SLOT=0
-SRC_URI=https://github.com/igbinary/igbinary/archive/2.0.5.tar.gz -> igbinary-2.0.5.tar.gz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e php-ext-source-r3 63b281041baa106ff1ef59b602ca7e2a toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=cd1b13588156068b9c554ab0e1268460
diff --git a/dev-php/igbinary-2.0.6 b/dev-php/igbinary-2.0.6
deleted file mode 100644
index 161353aebd6e..000000000000
--- a/dev-php/igbinary-2.0.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 )
-DESCRIPTION=A fast drop-in replacement for the standard PHP serialize
-EAPI=6
-HOMEPAGE=https://github.com/igbinary/igbinary
-IUSE=php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=BSD
-RDEPEND=php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 )
-REQUIRED_USE=|| ( php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2 )
-SLOT=0
-SRC_URI=https://github.com/igbinary/igbinary/archive/2.0.6.tar.gz -> igbinary-2.0.6.tar.gz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e php-ext-source-r3 63b281041baa106ff1ef59b602ca7e2a toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=28724e7b8adcd770b7348916633b3df6
diff --git a/dev-php/igbinary/Manifest b/dev-php/igbinary/Manifest
new file mode 100644
index 000000000000..d088b7a9bd0b
--- /dev/null
+++ b/dev-php/igbinary/Manifest
@@ -0,0 +1,5 @@
+DIST igbinary-2.0.5.tar.gz 183869 BLAKE2B 8bb56ff0213c77dbc17cf65962e23579935b2330ca2107b8e6e00461a486e60df4209c375e9f74d17bb0a745136fa776233b41cfc51ffb5e1dc1c8fdb4a8bbf2 SHA512 e0abae97b5a0c9ab30ea00a490294f18f91b66b728a05186167e15c0a631d4de82b8a24d370a0d58cf5552adde68dd1b3fe56e877d382fbbdac02cfc18e49063
+DIST igbinary-2.0.6.tar.gz 184889 BLAKE2B 7c07dc7b766ea395137c2cfffab6329f6fe5fc7e8ffb712474ef9c945319364b20ba4f8735aa776bc15b94c2cd815bba5c1a8b7c25c9715d706a6773f80082d8 SHA512 c9f76aedcfb5aace6b8a3c064410b099bf4563d99115ebfeb9c53a3dd18a48e5c44b99a04a2a75f5d114aa5a6d9030b6f2242502c6b3c9d273a6936f9fa410e6
+EBUILD igbinary-2.0.5.ebuild 584 BLAKE2B 6c928e2f63bc4af2255092a71c39e916db15b1ece4f1aa171719ad31a744231aedc099e938a66eaca37c9b936d607e060fb1ac19e0519c186c6988ae11a8ed23 SHA512 ae02b0f4099d8f65f796d60ccb11c8aa05b7d7218b6b7eae137229f5269d6168a0caea1e5215795cb12a1379442b7e7ac3ffff3dcb391154951a5da643aa285a
+EBUILD igbinary-2.0.6.ebuild 586 BLAKE2B 06ab30e3024877c2be0acb740bdedb378b8ffe84f3c03888a1bf4363b27faa9ce2fb30143dd9c1d33ad6dd90d2bb7ed9a13257a6179dd5cddd0a0aa9a4ab2a93 SHA512 b79d6efcca26e1d0d9f55af8bbc1e7eed3309dfcb081878a70f54fcf610065ae41ccecf0da72e2ecb61b36bbfd25d97848c1b51df9eeb977a003d71bb9e78f25
+MISC metadata.xml 331 BLAKE2B 4187300236aa128879679c7cb4a8ddfa19dfd512a76466e835224c30323f2fafd55189228bdced507ababd5b90f561f6bb44c1554392eb0682b6ba5c7a20b681 SHA512 86f467f549b36915940e45a4e151742f2925293106dd3da2958e6153aaa8fed378b2eb563bf69da0d38101409858a4abe308f608bd94de6b4517daf9da092405
diff --git a/dev-php/igbinary/igbinary-2.0.5.ebuild b/dev-php/igbinary/igbinary-2.0.5.ebuild
new file mode 100644
index 000000000000..7bb040ccb2de
--- /dev/null
+++ b/dev-php/igbinary/igbinary-2.0.5.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+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="php5-6 php7-0 php7-1 php7-2"
+
+inherit php-ext-source-r3
+
+KEYWORDS="amd64 ~arm x86"
+
+DESCRIPTION="A fast drop-in replacement for the standard PHP serialize"
+HOMEPAGE="https://github.com/${PN}/${PN}"
+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-2.0.6.ebuild b/dev-php/igbinary/igbinary-2.0.6.ebuild
new file mode 100644
index 000000000000..7421e044d58d
--- /dev/null
+++ b/dev-php/igbinary/igbinary-2.0.6.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+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="php5-6 php7-0 php7-1 php7-2"
+
+inherit php-ext-source-r3
+
+KEYWORDS="~amd64 ~arm ~x86"
+
+DESCRIPTION="A fast drop-in replacement for the standard PHP serialize"
+HOMEPAGE="https://github.com/${PN}/${PN}"
+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/metadata.xml b/dev-php/igbinary/metadata.xml
new file mode 100644
index 000000000000..aa78522f3ec0
--- /dev/null
+++ b/dev-php/igbinary/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://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">igbinary/igbinary</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-php/jpgraph-4.0.2 b/dev-php/jpgraph-4.0.2
deleted file mode 100644
index 2d5db225f646..000000000000
--- a/dev-php/jpgraph-4.0.2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install prepare
-DESCRIPTION=Object-oriented graphing library for PHP
-EAPI=6
-HOMEPAGE=http://jpgraph.net/
-IUSE=truetype examples
-KEYWORDS=alpha amd64 hppa ppc sparc x86
-LICENSE=QPL-1.0
-RDEPEND=truetype? ( media-fonts/corefonts ) dev-lang/php[gd,truetype?]
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~mjo/distfiles/jpgraph-4.0.2.tar.gz
-_md5_=b9495d3407e1471eae617af1f8161025
diff --git a/dev-php/jpgraph-4.2.0 b/dev-php/jpgraph-4.2.0
deleted file mode 100644
index 4962f8a331f8..000000000000
--- a/dev-php/jpgraph-4.2.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install prepare
-DESCRIPTION=Object-oriented graphing library for PHP
-EAPI=6
-HOMEPAGE=http://jpgraph.net/
-IUSE=truetype examples
-KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~sparc ~x86
-LICENSE=QPL-1.0
-RDEPEND=truetype? ( media-fonts/corefonts ) dev-lang/php[gd,truetype?]
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~grknight/distfiles/jpgraph-4.2.0.tar.gz
-_md5_=17081e5fb3cf0cf84f3b4e5143a98a1f
diff --git a/dev-php/jpgraph/Manifest b/dev-php/jpgraph/Manifest
new file mode 100644
index 000000000000..59dee4c6a27e
--- /dev/null
+++ b/dev-php/jpgraph/Manifest
@@ -0,0 +1,6 @@
+AUX gentoo_ttf_dir.patch 1187 BLAKE2B 470de819fb2b81a6a3898963eab8a0af09d27384c4cbc3572862104a55563485fdc983bbe7275cb6a7cbe537107d56fa3bfdbbd2cd965cf7646f49d534d2edb9 SHA512 76cd126b80849b915d48d88af292c75b66c3212870e2b1daafe7cee9ab248719d7517a0bc8a3fed076a4aec960badeedde0d7874053b8ab448f6b9e839cb34e3
+DIST jpgraph-4.0.2.tar.gz 13298314 BLAKE2B 46506f5a3f331157329c92f61f4843faa7d0774fbdb0cafe58a5609d1c9e9c2f73d4634ffd09cad3c874a45b2ac8658271a343b5e0dfb673f810bf7af6083189 SHA512 db1877c09c13a26d24ef7df4aae50799f55c6d72ca0cdb0b8d8c05928c1bc860f8a86eb52a5fb05bdc1c07574931825baa2989f006e9a4cc57e60913e8b67a3e
+DIST jpgraph-4.2.0.tar.gz 13298982 BLAKE2B b5fab9754239f78fbdfebd84872b824400d27fce89a80d82028d2521f7d64ada79efe4eb9c5460f56d882e827f5930eb10a57c3b41a81865dd618b9baf628cf9 SHA512 f0f164663f2e0fca5b827d89c57aaa144765a987ca4ebb82f18102f8cb80057c7f7639b8faae5d6d6ce459257bdfa609d2df6ffe648a7334c58c87ddfe86c334
+EBUILD jpgraph-4.0.2.ebuild 2386 BLAKE2B 607b225ea5b175cf7825490d3814807f4cb4e94c95f66b8fc9d087946d75d1a34e6e607515abfb3073e4345047e05a14ae47c725adf7aa18fef0411376f0e3db SHA512 8362967858dbbec02d9dc7ba6279ee2339baba2bd474ff5f8750a9a90f462d8bb513206dda03b0b7f8051e1a71f62942fb882f536f7a89e98b290c844e32838d
+EBUILD jpgraph-4.2.0.ebuild 2397 BLAKE2B c47cca9d0b7579e4394dc75b51a5af79bc97590d95eb88358194f12c5e67bcb4b097dcf5805237b2d81254192cfa8c8caa38357facac8105ca78ccc810bad3c2 SHA512 6ad3880710d68fcce72026c9c1fdf33e72a3740f5d9f19713f3efc6bb2285fe2a9c1810ab475d0710c1613617c230f831ecb71c8adb8f7cb7ee234d598fd0b39
+MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/jpgraph/files/gentoo_ttf_dir.patch b/dev-php/jpgraph/files/gentoo_ttf_dir.patch
new file mode 100644
index 000000000000..a10479b3f673
--- /dev/null
+++ b/dev-php/jpgraph/files/gentoo_ttf_dir.patch
@@ -0,0 +1,31 @@
+From fd1fc5e3c72ac4511f86852b1704821c440bdb3d Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky <michael@orlitzky.com>
+Date: Tue, 3 Jan 2017 12:56:18 -0500
+Subject: [PATCH 1/1] Set TTF_DIR to the Gentoo corefonts location.
+
+The default value of TTF_DIR in jpg-config.inc.php points to
+/usr/share/fonts/truetype, a location that does not exist on
+Gentoo. Since JpGraph largely only supports the Microsoft
+corefonts, we point it to /usr/share/fonts/corefonts instead.
+If the user does not have the corefonts installed, this is no
+great loss: neither location exists.
+---
+ src/jpg-config.inc.php | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/jpg-config.inc.php b/src/jpg-config.inc.php
+index ea16c1e..98cbdc7 100755
+--- a/src/jpg-config.inc.php
++++ b/src/jpg-config.inc.php
+@@ -36,7 +36,7 @@
+ //
+ //------------------------------------------------------------------------
+ // define('CACHE_DIR','/tmp/jpgraph_cache/');
+-// define('TTF_DIR','/usr/share/fonts/TrueType/');
++define('TTF_DIR','/usr/share/fonts/corefonts/');
+ // define('MBTTF_DIR','/usr/share/fonts/TrueType/');
+
+ //-------------------------------------------------------------------------
+--
+2.10.2
+
diff --git a/dev-php/jpgraph/jpgraph-4.0.2.ebuild b/dev-php/jpgraph/jpgraph-4.0.2.ebuild
new file mode 100644
index 000000000000..c89e72cdc0ee
--- /dev/null
+++ b/dev-php/jpgraph/jpgraph-4.0.2.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Object-oriented graphing library for PHP"
+HOMEPAGE="http://jpgraph.net/"
+# Upstream didn't have a stable download URL when this was packaged.
+SRC_URI="https://dev.gentoo.org/~mjo/distfiles/${P}.tar.gz"
+LICENSE="QPL-1.0"
+SLOT="0"
+KEYWORDS="alpha amd64 hppa ppc sparc x86"
+IUSE="truetype examples"
+
+DEPEND=""
+RDEPEND="truetype? ( media-fonts/corefonts )
+ dev-lang/php[gd,truetype?]"
+
+src_prepare() {
+ default
+
+ # The DejaVu fonts are now bundled with the library and don't need
+ # to be found in TTF_DIR. Since most of the fonts supported by
+ # JpGraph are corefonts, we point the sole TTF_DIR towards them for
+ # maximum impact. Why not apply the patch unconditionally? We want
+ # to avoid a situation where TTF fonts appear to work, but then
+ # break without warning when the user e.g. removes corefonts. By
+ # applying the patch conditionally, we ensure a dependency on
+ # media-fonts/corefonts before anything will work.
+ use truetype && eapply "${FILESDIR}/gentoo_ttf_dir.patch"
+
+ # Some of the documentation and examples are shipped in the "src"
+ # directory. We want them outside of that tree so that we can simply
+ # call doins recursively on "src". First, rename the existing "docs"
+ # directory which contains the HTML manual and class reference.
+ mv docs html || die 'failed to rename "docs" directory'
+ mv src/README ./ || die 'failed to relocate the README'
+ mv src/Examples ./examples || die 'failed to relocate the examples'
+
+ # These are present (duplicated) in the other Examples directory,
+ # and don't work anyway.
+ rm -r src/barcode || die 'failed to remove some barcode examples'
+
+ # We'll also want to install the config file to /etc, since it may
+ # need to be edited by the user.
+ mv src/jpg-config.inc.php ./ || die 'failed to relocate the config file'
+ rm src/jpg-config.inc.php.orig || die 'failed to remove original config file'
+}
+
+src_install() {
+ dodoc README
+ dodoc -r html
+ use examples && dodoc -r examples
+
+ insinto "/usr/share/php/${PN}"
+ doins -r src/*
+
+ insinto /etc
+ doins jpg-config.inc.php
+ # Create a symlink for the config file, because the library will only
+ # look for it in its own source tree (not in /etc where we've put it).
+ dosym ../../../../etc/jpg-config.inc.php "/usr/share/php/${PN}/jpg-config.inc.php"
+}
diff --git a/dev-php/jpgraph/jpgraph-4.2.0.ebuild b/dev-php/jpgraph/jpgraph-4.2.0.ebuild
new file mode 100644
index 000000000000..b7565d393188
--- /dev/null
+++ b/dev-php/jpgraph/jpgraph-4.2.0.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Object-oriented graphing library for PHP"
+HOMEPAGE="http://jpgraph.net/"
+# Upstream didn't have a stable download URL when this was packaged.
+SRC_URI="https://dev.gentoo.org/~grknight/distfiles/${P}.tar.gz"
+LICENSE="QPL-1.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86"
+IUSE="truetype examples"
+
+DEPEND=""
+RDEPEND="truetype? ( media-fonts/corefonts )
+ dev-lang/php[gd,truetype?]"
+
+src_prepare() {
+ default
+
+ # The DejaVu fonts are now bundled with the library and don't need
+ # to be found in TTF_DIR. Since most of the fonts supported by
+ # JpGraph are corefonts, we point the sole TTF_DIR towards them for
+ # maximum impact. Why not apply the patch unconditionally? We want
+ # to avoid a situation where TTF fonts appear to work, but then
+ # break without warning when the user e.g. removes corefonts. By
+ # applying the patch conditionally, we ensure a dependency on
+ # media-fonts/corefonts before anything will work.
+ use truetype && eapply "${FILESDIR}/gentoo_ttf_dir.patch"
+
+ # Some of the documentation and examples are shipped in the "src"
+ # directory. We want them outside of that tree so that we can simply
+ # call doins recursively on "src". First, rename the existing "docs"
+ # directory which contains the HTML manual and class reference.
+ mv docs html || die 'failed to rename "docs" directory'
+ mv src/README ./ || die 'failed to relocate the README'
+ mv src/Examples ./examples || die 'failed to relocate the examples'
+
+ # These are present (duplicated) in the other Examples directory,
+ # and don't work anyway.
+ rm -r src/barcode || die 'failed to remove some barcode examples'
+
+ # We'll also want to install the config file to /etc, since it may
+ # need to be edited by the user.
+ mv src/jpg-config.inc.php ./ || die 'failed to relocate the config file'
+ rm src/jpg-config.inc.php.orig || die 'failed to remove original config file'
+}
+
+src_install() {
+ dodoc README
+ dodoc -r html
+ use examples && dodoc -r examples
+
+ insinto "/usr/share/php/${PN}"
+ doins -r src/*
+
+ insinto /etc
+ doins jpg-config.inc.php
+ # Create a symlink for the config file, because the library will only
+ # look for it in its own source tree (not in /etc where we've put it).
+ dosym ../../../../etc/jpg-config.inc.php "/usr/share/php/${PN}/jpg-config.inc.php"
+}
diff --git a/dev-php/jpgraph/metadata.xml b/dev-php/jpgraph/metadata.xml
new file mode 100644
index 000000000000..b86acf66c756
--- /dev/null
+++ b/dev-php/jpgraph/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ <name>PHP</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/dev-php/json-schema-4.1.0 b/dev-php/json-schema-4.1.0
deleted file mode 100644
index ef40b56827e6..000000000000
--- a/dev-php/json-schema-4.1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install prepare test
-DEPEND=test? ( dev-lang/php:* dev-php/fedora-autoloader dev-php/phpunit )
-DESCRIPTION=PHP implementation of JSON schema
-EAPI=6
-HOMEPAGE=https://github.com/justinrainbow/json-schema
-IUSE=test
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-lang/php:* dev-php/fedora-autoloader
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/justinrainbow/json-schema/archive/4.1.0.tar.gz -> json-schema-4.1.0.tar.gz
-_md5_=69ba20a11fab1b69857eb7eec27a1978
diff --git a/dev-php/json-schema/Manifest b/dev-php/json-schema/Manifest
new file mode 100644
index 000000000000..2c1275b8eceb
--- /dev/null
+++ b/dev-php/json-schema/Manifest
@@ -0,0 +1,4 @@
+AUX autoload.php 272 BLAKE2B 35cf5eb6efc11395c45a12a98d2882bc249b4496cba7b1ceba2abbdfa5dbec43a782e1034701f72e12d586aa80460fa87f0623f497f0da33cd8aaff7948d7370 SHA512 d5b970d485d198c855dcebe4c04adf37d7aaa118d7546c3b6d73944809c69ed18436568e33f847329a8027220f735cd5752ef5019bf8dfad40a740d94d02733c
+DIST json-schema-4.1.0.tar.gz 24772 BLAKE2B 181c584c11113c2e0bb7b2f19ef40ae588e470169a4498a47fbd3fcae60d7bb1bb21ac4ab82ce295e487098719fca9004090142d992a296a1b5599fb909b0171 SHA512 5c6bda8c34012bc20d9bf604a6183d50f451327bded70d94415450d2b3cc8e7f6f416ddd8b13db0aeb487fe031fe3185aebd9c97e4c1f79c866dcbc3463f64d0
+EBUILD json-schema-4.1.0.ebuild 830 BLAKE2B 971c1161efe1a08fdf902496d278d712f449d0a86e5999768a91460da21a2f0b150fa14aea2d560111963a049859db3f4eeeb9c4097435fcc5b9775f3b18c6aa SHA512 f8bb9a1e53d8048a0b500069fdfa389eb0b12a6cb416791e45b34e0de1d66e5d17c3d5ae5c059936e3e6412c1fdddd6dd27723e1d46feacf2e8b8a309ae11f74
+MISC metadata.xml 681 BLAKE2B 7c94639852b0bb93de2ce1d05e53917d4fb893b503ac71f15b39233fc95a67ee469a53f175cd470b6f1f510e4f943839c848ae89ad74d3155c420740102c1185 SHA512 85ad81e521ac9eec7fcf4a8a162e412e97e29c30ed22048258a0a7a00b7f77c559544b033938570ebe64ce34ecd61d48dd20648751872d69b98740e791178845
diff --git a/dev-php/json-schema/files/autoload.php b/dev-php/json-schema/files/autoload.php
new file mode 100644
index 000000000000..c8a6c8a8b715
--- /dev/null
+++ b/dev-php/json-schema/files/autoload.php
@@ -0,0 +1,10 @@
+<?php
+/**
+ * Autoloader for justinrainbow/json-schema and its dependencies
+ */
+
+if (!class_exists('Fedora\\Autoloader\\Autoload', false)) {
+ require_once '/usr/share/php/Fedora/Autoloader/autoload.php';
+}
+
+\Fedora\Autoloader\Autoload::addPsr4('JsonSchema\\', __DIR__);
diff --git a/dev-php/json-schema/json-schema-4.1.0.ebuild b/dev-php/json-schema/json-schema-4.1.0.ebuild
new file mode 100644
index 000000000000..9412e627e0ea
--- /dev/null
+++ b/dev-php/json-schema/json-schema-4.1.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="PHP implementation of JSON schema"
+HOMEPAGE="https://github.com/justinrainbow/json-schema"
+SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+# Tests are not in the release tarball
+RESTRICT="test"
+
+RDEPEND="
+ dev-lang/php:*
+ dev-php/fedora-autoloader"
+DEPEND="
+ test? (
+ ${RDEPEND}
+ dev-php/phpunit )"
+
+src_prepare() {
+ default
+ if use test; then
+ cp "${FILESDIR}"/autoload.php "${S}"/autoload-test.php || die
+ fi
+}
+
+src_install() {
+ insinto "/usr/share/php/JsonSchema"
+ doins -r src/JsonSchema/. "${FILESDIR}"/autoload.php
+ dodoc README.md
+}
+
+src_test() {
+ phpunit --bootstrap "${S}"/autoload-test.php || die "test suite failed"
+}
diff --git a/dev-php/json-schema/metadata.xml b/dev-php/json-schema/metadata.xml
new file mode 100644
index 000000000000..dff9620c7508
--- /dev/null
+++ b/dev-php/json-schema/metadata.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>guillaumeseren@gmail.com</email>
+ <name>Guillaume Seren</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ </maintainer>
+ <longdescription>
+ A PHP library for validating JSON structures against a given
+ schema.
+ </longdescription>
+ <upstream>
+ <remote-id type="github">justinrainbow/json-schema</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-php/jsonlint-1.6.0 b/dev-php/jsonlint-1.6.0
deleted file mode 100644
index 7b02b8f3198a..000000000000
--- a/dev-php/jsonlint-1.6.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install prepare test
-DEPEND=test? ( dev-lang/php:* dev-php/fedora-autoloader dev-php/phpunit )
-DESCRIPTION=JSON Lint for PHP
-EAPI=6
-HOMEPAGE=https://github.com/Seldaek/jsonlint
-IUSE=test
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-lang/php:* dev-php/fedora-autoloader
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/Seldaek/jsonlint/archive/1.6.0.tar.gz -> jsonlint-1.6.0.tar.gz
-_md5_=45c38e19b8d9baccbada7af6db9de0de
diff --git a/dev-php/jsonlint/Manifest b/dev-php/jsonlint/Manifest
new file mode 100644
index 000000000000..6cdb6e316da5
--- /dev/null
+++ b/dev-php/jsonlint/Manifest
@@ -0,0 +1,4 @@
+AUX autoload.php 262 BLAKE2B 0394eabe0e8bc08b09cc637e514aa49dee2b83b9c424f0d767a67f75024a86a20bbe63d30fce00cb17b69ee3bd6c74cf310e16a004720fb25aad1e1c65ba82b9 SHA512 476263a08ab0137aed1bb71446f1a66a618247f9095b138b958464f4f47faf775f4bb2ecbe87efa34ff56fb386351e3a3de0dafdf7367c461f0db0717ae5d46e
+DIST jsonlint-1.6.0.tar.gz 11327 BLAKE2B 481744188c6aa8a3135fc76c1026fce75df9ceaf939db9cb88f323afae27bf5041a56d3a63618ef497dc1e8f0606a8b8c24651fab566bb421d12d0ac5853ad15 SHA512 16538781807a4ca73de83e7be69d0fc2b530dd9b25f2b9a2ee3f1156dd5ebccb79e9489b873f307718ca2da658a1ae7cef5144adb32f2d1e5c34bd192d496c79
+EBUILD jsonlint-1.6.0.ebuild 857 BLAKE2B e04940bacd72c2534c1dc05a5d7b98176cde6c7ab4a4a099bd7017d92aa8c8c0054a3c9ffe1941878cc73458c4693e5ff92843612d236c324231310688035c3a SHA512 b83f0b8899284fca3ab096f1a8d8ef167c654156cc96e7dc12e927595c0eb0567d62c3cf9e3539e8fa42311b31a6870ecba2f9d4ec6f0c33b3c6d50c795f11a8
+MISC metadata.xml 653 BLAKE2B b01de68933db99cf59ed9e8ace9af6ba3c8a5948e2478c2361b2a52beb4f617d7fc23adb6eca4d76b162648aa4082a3881c61ad0dca6e02fc9c044ae7740046c SHA512 110ede45bbe6869e8a5831d5fbd2863e69bcd03e179e249efa2b2226c48e47a88569417196dc78f14d7a769d1611b8358839ba354da3dfae05b0a4f6b5c28664
diff --git a/dev-php/jsonlint/files/autoload.php b/dev-php/jsonlint/files/autoload.php
new file mode 100644
index 000000000000..48ac68d82ab1
--- /dev/null
+++ b/dev-php/jsonlint/files/autoload.php
@@ -0,0 +1,8 @@
+<?php
+/* Autoloader for dev-php/jsonlint and its dependencies */
+
+if (!class_exists('Fedora\\Autoloader\\Autoload', false)) {
+ require_once '/usr/share/php/Fedora/Autoloader/autoload.php';
+}
+
+\Fedora\Autoloader\Autoload::addPsr4('Seld\\JsonLint\\', __DIR__);
diff --git a/dev-php/jsonlint/jsonlint-1.6.0.ebuild b/dev-php/jsonlint/jsonlint-1.6.0.ebuild
new file mode 100644
index 000000000000..ea1e8f975dc1
--- /dev/null
+++ b/dev-php/jsonlint/jsonlint-1.6.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="JSON Lint for PHP"
+HOMEPAGE="https://github.com/Seldaek/jsonlint"
+SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="test"
+
+RDEPEND="
+ dev-lang/php:*
+ dev-php/fedora-autoloader"
+DEPEND="
+ test? (
+ ${RDEPEND}
+ dev-php/phpunit )"
+
+src_prepare() {
+ default
+ if use test; then
+ cp "${FILESDIR}"/autoload.php "${S}"/autoload-test.php || die
+ sed -i -e "s:__DIR__:'${S}/src/Seld/JsonLint':" "${S}"/autoload-test.php || die
+ fi
+}
+
+src_install() {
+ insinto "/usr/share/php/Seld/JsonLint"
+ doins -r src/Seld/JsonLint/. "${FILESDIR}"/autoload.php
+ dodoc README.mdown
+}
+
+src_test() {
+ phpunit --bootstrap "${S}"/autoload-test.php || die "test suite failed"
+}
diff --git a/dev-php/jsonlint/metadata.xml b/dev-php/jsonlint/metadata.xml
new file mode 100644
index 000000000000..fec382ce7ecc
--- /dev/null
+++ b/dev-php/jsonlint/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>guillaumeseren@gmail.com</email>
+ <name>Guillaume Seren</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ </maintainer>
+ <longdescription>
+ Json linter, port of the JavaScript jsonlint library.
+ </longdescription>
+ <upstream>
+ <remote-id type="github">Seldaek/jsonlint</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-php/libchart-1.3 b/dev-php/libchart-1.3
deleted file mode 100644
index f966ad140101..000000000000
--- a/dev-php/libchart-1.3
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Easy-to-use chart creation library for PHP
-EAPI=6
-HOMEPAGE=http://naku.dohcrew.com/libchart https://github.com/naku/libchart
-IUSE=examples
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3 BitstreamVera
-RDEPEND=dev-lang/php:*[gd,truetype]
-SLOT=0
-SRC_URI=https://github.com/naku/libchart/releases/download/release/1.3/libchart-1.3.tar.gz
-_md5_=43c015d814861f69a0fc8489c4b247bf
diff --git a/dev-php/libchart/Manifest b/dev-php/libchart/Manifest
new file mode 100644
index 000000000000..d13ce27c6568
--- /dev/null
+++ b/dev-php/libchart/Manifest
@@ -0,0 +1,3 @@
+DIST libchart-1.3.tar.gz 106204 BLAKE2B 55e133ad55b54377211cf165ac77a545ba770942f383c3839ce1eacf82afaf831ec80711375a4ff4a7be55f1e4270fb886dafae2a21b1a041c5da5384e4aee93 SHA512 5d2a0b014546487029f552f225fa83de856210a997e69bb5b129e99790f5acfdcfff904077126c42f82974d10f81e7e0342991221af5f108902b2792df24d586
+EBUILD libchart-1.3.ebuild 741 BLAKE2B 818ee39f90376eb42a209b413ff8a677d2d043a9897c833bda15a77027ecdf5454447bd86aff3603708a1ed1b79a122b6408eea6a604f1cf85e2a5181396eec6 SHA512 e336b809c310da8df4b56c4e55cd7abf60c62a632a4e25d73946f3bf797809fa99d4bd28434bfd664468f8b0d6f4f6245821eb37cdff23a362d60357dc7c5a2b
+MISC metadata.xml 317 BLAKE2B a489b4ad4a1a967c43a0f5f4e346fe8279a75e1a53928fe2fcd568b6a76cb08aec16e32ab7005b68baefd3ad5a59cb46ceaa1375b7aa44d7fe329074518fab87 SHA512 3da0c7f5f082f41cd79f76699a5273859ac72b98b82d39ee2790ac5a316d79aed14f68ee579dbc28fc9ef74c47b9a76920e52848a50b6765cca4493bbcd97602
diff --git a/dev-php/libchart/libchart-1.3.ebuild b/dev-php/libchart/libchart-1.3.ebuild
new file mode 100644
index 000000000000..4e9e63418aab
--- /dev/null
+++ b/dev-php/libchart/libchart-1.3.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Easy-to-use chart creation library for PHP"
+HOMEPAGE="http://naku.dohcrew.com/libchart https://github.com/naku/libchart"
+SRC_URI="https://github.com/naku/${PN}/releases/download/release/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3 BitstreamVera"
+KEYWORDS="~amd64 ~x86"
+SLOT=0
+IUSE="examples"
+
+DEPEND=""
+RDEPEND="dev-lang/php:*[gd,truetype]"
+
+S="${WORKDIR}/${PN}"
+
+src_install() {
+ dodoc "${PN}"/{ChangeLog,README}
+
+ if use examples ; then
+ # PHP won't run a compressed example...
+ docompress -x "/usr/share/doc/${PF}/demo"
+ dodoc -r demo/
+ fi
+
+ insinto "/usr/share/php/${PN}"
+ doins -r "${PN}"/{classes,fonts,images}
+}
diff --git a/dev-php/libchart/metadata.xml b/dev-php/libchart/metadata.xml
new file mode 100644
index 000000000000..fb6b9991bc6b
--- /dev/null
+++ b/dev-php/libchart/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://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">naku/libchart</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-php/libvirt-php-0.5.3 b/dev-php/libvirt-php-0.5.3
deleted file mode 100644
index bff3d4285457..000000000000
--- a/dev-php/libvirt-php-0.5.3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=app-emulation/libvirt dev-libs/libxml2 dev-libs/libxslt virtual/pkgconfig doc? ( app-text/xhtml1 ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 )
-DESCRIPTION=PHP bindings for libvirt
-EAPI=6
-HOMEPAGE=http://libvirt.org/php/
-IUSE=doc php_targets_php5-6 php_targets_php7-0 php_targets_php7-1
-KEYWORDS=~amd64
-LICENSE=LGPL-2.1
-RDEPEND=app-emulation/libvirt dev-libs/libxml2 php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 )
-REQUIRED_USE=|| ( php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 )
-RESTRICT=test
-SLOT=0
-SRC_URI=http://libvirt.org/sources/php/libvirt-php-0.5.3.tar.gz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e php-ext-source-r3 63b281041baa106ff1ef59b602ca7e2a toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=4539752d644504c80d5c01ebdb724336
diff --git a/dev-php/libvirt-php-0.5.4 b/dev-php/libvirt-php-0.5.4
deleted file mode 100644
index 66e2033c6c1b..000000000000
--- a/dev-php/libvirt-php-0.5.4
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=app-emulation/libvirt dev-libs/libxml2 dev-libs/libxslt virtual/pkgconfig doc? ( app-text/xhtml1 ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 )
-DESCRIPTION=PHP bindings for libvirt
-EAPI=6
-HOMEPAGE=http://libvirt.org/php/
-IUSE=doc php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2
-KEYWORDS=~amd64
-LICENSE=LGPL-2.1
-RDEPEND=app-emulation/libvirt dev-libs/libxml2 php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 )
-REQUIRED_USE=|| ( php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2 )
-RESTRICT=test
-SLOT=0
-SRC_URI=http://libvirt.org/sources/php/libvirt-php-0.5.4.tar.gz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e php-ext-source-r3 63b281041baa106ff1ef59b602ca7e2a toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=1c2426bf3a080b9e090979ac8b0ccbfd
diff --git a/dev-php/libvirt-php-9999 b/dev-php/libvirt-php-9999
deleted file mode 100644
index ed5f7ed00bdd..000000000000
--- a/dev-php/libvirt-php-9999
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=app-emulation/libvirt dev-libs/libxml2 dev-libs/libxslt virtual/pkgconfig doc? ( app-text/xhtml1 ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 ) >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=PHP bindings for libvirt
-EAPI=6
-HOMEPAGE=http://libvirt.org/php/
-IUSE=doc php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2
-LICENSE=LGPL-2.1
-RDEPEND=app-emulation/libvirt dev-libs/libxml2 php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 )
-REQUIRED_USE=|| ( php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2 )
-RESTRICT=test
-SLOT=0
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 git-r3 8f6de46b0aa318aea0e8cac62ece098b libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e php-ext-source-r3 63b281041baa106ff1ef59b602ca7e2a toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=cd26b9a05324d8d7290adc2bac4ab953
diff --git a/dev-php/libvirt-php/Manifest b/dev-php/libvirt-php/Manifest
new file mode 100644
index 000000000000..f967e1fe8e12
--- /dev/null
+++ b/dev-php/libvirt-php/Manifest
@@ -0,0 +1,7 @@
+AUX remove-imagick-check.patch 331 BLAKE2B 2d9c164055c3f54baf259326abe22d5aa478141df7f6ea05ba33f040701947038490c1898e89a7019cc1e41008fde5cb43c338730ef7ec3020f5005edd612d9c SHA512 1e949f8c704a2e6b541a276b8cb53e9cf09f009dadc01f4f50ad02e92258cfe30130b2d22b811e0b5b07e1bad4023fad05040c6031bd0063999212c2d6483bcf
+DIST libvirt-php-0.5.3.tar.gz 778604 BLAKE2B 40fe4bb2f1e3fd81f1aaf09b8b92c509e79186a1a6c0dc97aa55c7164ed36cc0088141ed46c3d82cf277e25eaf3b017edac9466684e1060b5a22c18aaa7a576f SHA512 b4cbfd8840d8f114fde762b5d6ada155ebdb231b554e28e8526a7af45a802a18f28e90fa52f3d7ca9f616996fe0a8289b70c2d14dca51a52a7bf8a501c3ff44f
+DIST libvirt-php-0.5.4.tar.gz 780793 BLAKE2B 8bb4577c26cc0ef8f2a0ae813ade7f5fdea9a2a7d70c97cab1033fde21d9a1c27b8c2ad7a8284096e143e955202bb564767b4d7e1a4bb9e15993895adc119288 SHA512 b5b204549e6810668203d1df8404a5cb71f646ae7e01ea223c6e9b9eec9b1f6500cc5bb4559859959d821a213ff992f22a97e4b683da2c683be3732710943487
+EBUILD libvirt-php-0.5.3.ebuild 1395 BLAKE2B 647e79ece9175fd70fc2dbecc0de440ac4db17e5ff4a19621d78d1c1e508047233fd2311df550d2da492676b97d328cef3e92aaa66cbfc924a0c97ce01afb8a2 SHA512 aa855f216e4a71fc69be4214a70cbe2dabcc5871100c0e90a3911de1a88958ed40a53a19584d406ce7777911889166535d838ffe9d25dd8596f170e8e6bd1f0e
+EBUILD libvirt-php-0.5.4.ebuild 1424 BLAKE2B d83e13647fb36600aeb664a73ace71cc9a752c2b69e7b4b0853b97d6ad5c78f2e8e076f6ec810677af0851e15efedc11f6e121232a33c7b3d8ffb50cb8a8ab14 SHA512 68e05b6f4a2ba831eb325361f67fb115e93b6997447f861e33a1227d07bf79c696637d36957490a4ae703677d4acce3c3152fde5392cae0dcc0dc0a39d2976c1
+EBUILD libvirt-php-9999.ebuild 1402 BLAKE2B ae61aae3c201ed542e8548500f087d57b0f001abaf2ddd38608f01a97864ba0ffd838d7a159656151edfb32a28956b331c99a1c990fbc7e44dd688c578068d06 SHA512 623610c0736c1b306cc7fcd93030b9a29e6f08f3200cce93f8a7bdc614b669440fc1e5fd8a86fd2d19e1b4f370b0f9e9dd7f06ebe912f688117e13a3eb47bfa1
+MISC metadata.xml 482 BLAKE2B cc2209c8b662f3b122bcc87896f43a37767539e7cb4c2d4f5aa6dfceee8104f63b4af24a17cc05e0775e3dd2bddac36a341a7b0f8044821cc888dee594bf75bb SHA512 a1a8469c2e56cb1d32673057a3919a8f4799a921b67568a6109c60f5bacf61b879e7c07055d6b8d1b0c67faa5f7c1b468080875b7b2ce857b8e1af199d193547
diff --git a/dev-php/libvirt-php/files/remove-imagick-check.patch b/dev-php/libvirt-php/files/remove-imagick-check.patch
new file mode 100644
index 000000000000..92c0e39cd260
--- /dev/null
+++ b/dev-php/libvirt-php/files/remove-imagick-check.patch
@@ -0,0 +1,12 @@
+diff -aurN a/configure.ac b/configure.ac
+--- a/configure.ac 2017-05-11 05:28:41.000000000 -0400
++++ b/configure.ac 2017-07-01 21:46:17.636849810 -0400
+@@ -172,8 +172,6 @@
+ LIBVIRT_CHECK_PHP_EXTENSIONDIR
+ LIBVIRT_CHECK_PHP_CONFDIR
+
+-LIBVIRT_CHECK_PHP_EXTENSION([imagick])
+-
+ OS=`uname`
+ if test "$OS" = "Darwin"; then
+ WL=-Wl,
diff --git a/dev-php/libvirt-php/libvirt-php-0.5.3.ebuild b/dev-php/libvirt-php/libvirt-php-0.5.3.ebuild
new file mode 100644
index 000000000000..4c6eda7c043c
--- /dev/null
+++ b/dev-php/libvirt-php/libvirt-php-0.5.3.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PHP_EXT_NAME="libvirt-php"
+PHP_EXT_SKIP_PHPIZE="yes"
+USE_PHP="php5-6 php7-0 php7-1"
+PHP_EXT_ECONF_ARGS=()
+
+inherit php-ext-source-r3 autotools
+
+DESCRIPTION="PHP bindings for libvirt"
+HOMEPAGE="http://libvirt.org/php/"
+SRC_URI="http://libvirt.org/sources/php/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc"
+
+RDEPEND="app-emulation/libvirt
+ dev-libs/libxml2"
+DEPEND="${RDEPEND}
+ dev-libs/libxslt
+ virtual/pkgconfig
+ doc? ( app-text/xhtml1 )"
+
+RESTRICT="test"
+DOCS=( AUTHORS ChangeLog NEWS README )
+# Remove the insane check for pecl-imagick which is only used in examples
+# and is not called upon in any build
+PATCHES=( "${FILESDIR}/remove-imagick-check.patch" )
+
+src_unpack() {
+ default
+
+ # create the default modules directory to be able
+ # to use the php-ext-source-r3 eclass to configure/build
+ ln -s src "${S}/modules"
+}
+
+src_prepare() {
+ php-ext-source-r3_src_prepare
+ local slot
+ for slot in $(php_get_slots); do
+ php_init_slot_env "${slot}"
+ eautoreconf
+ done
+}
+
+src_install() {
+ local slot
+ for slot in $(php_get_slots); do
+ php_init_slot_env ${slot}
+ insinto "${EXT_DIR}"
+ doins "src/.libs/${PHP_EXT_NAME}.so"
+ done
+ php-ext-source-r3_createinifiles
+ einstalldocs
+ if use doc ; then
+ docinto /usr/share/doc/${PF}/html
+ dodoc -r docs/*
+ fi
+}
diff --git a/dev-php/libvirt-php/libvirt-php-0.5.4.ebuild b/dev-php/libvirt-php/libvirt-php-0.5.4.ebuild
new file mode 100644
index 000000000000..12877cef46ef
--- /dev/null
+++ b/dev-php/libvirt-php/libvirt-php-0.5.4.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PHP_EXT_NAME="libvirt-php"
+PHP_EXT_SKIP_PHPIZE="yes"
+USE_PHP="php5-6 php7-0 php7-1 php7-2"
+PHP_EXT_ECONF_ARGS=()
+
+inherit php-ext-source-r3 autotools
+
+DESCRIPTION="PHP bindings for libvirt"
+HOMEPAGE="http://libvirt.org/php/"
+SRC_URI="http://libvirt.org/sources/php/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc"
+
+RDEPEND="app-emulation/libvirt
+ dev-libs/libxml2"
+DEPEND="${RDEPEND}
+ dev-libs/libxslt
+ virtual/pkgconfig
+ doc? ( app-text/xhtml1 )"
+
+RESTRICT="test"
+# ChangeLog and NEWS are empty files
+DOCS=( AUTHORS README )
+# Remove the insane check for pecl-imagick which is only used in examples
+# and is not called upon in any build
+PATCHES=( "${FILESDIR}/remove-imagick-check.patch" )
+
+src_unpack() {
+ default
+
+ # create the default modules directory to be able
+ # to use the php-ext-source-r3 eclass to configure/build
+ ln -s src "${S}/modules"
+}
+
+src_prepare() {
+ php-ext-source-r3_src_prepare
+ local slot
+ for slot in $(php_get_slots); do
+ php_init_slot_env "${slot}"
+ eautoreconf
+ done
+}
+
+src_install() {
+ local slot
+ for slot in $(php_get_slots); do
+ php_init_slot_env ${slot}
+ insinto "${EXT_DIR}"
+ doins "src/.libs/${PHP_EXT_NAME}.so"
+ done
+ php-ext-source-r3_createinifiles
+ einstalldocs
+ if use doc ; then
+ docinto /usr/share/doc/${PF}/html
+ dodoc -r docs/*
+ fi
+}
diff --git a/dev-php/libvirt-php/libvirt-php-9999.ebuild b/dev-php/libvirt-php/libvirt-php-9999.ebuild
new file mode 100644
index 000000000000..862fc523ecbb
--- /dev/null
+++ b/dev-php/libvirt-php/libvirt-php-9999.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PHP_EXT_NAME="libvirt-php"
+PHP_EXT_SKIP_PHPIZE="yes"
+USE_PHP="php5-6 php7-0 php7-1 php7-2"
+PHP_EXT_ECONF_ARGS=()
+
+inherit php-ext-source-r3 git-r3 autotools
+
+DESCRIPTION="PHP bindings for libvirt"
+HOMEPAGE="http://libvirt.org/php/"
+EGIT_REPO_URI="git://libvirt.org/libvirt-php.git"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS=""
+IUSE="doc"
+
+RDEPEND="app-emulation/libvirt
+ dev-libs/libxml2"
+DEPEND="${RDEPEND}
+ dev-libs/libxslt
+ virtual/pkgconfig
+ doc? ( app-text/xhtml1 )"
+
+RESTRICT="test"
+DOCS=( ChangeLog NEWS README )
+# Remove the insane check for pecl-imagick which is only used in examples
+# and is not called upon in any build
+PATCHES=( "${FILESDIR}/remove-imagick-check.patch" )
+
+src_unpack() {
+ git-r3_src_unpack
+
+ # create the default modules directory to be able
+ # to use the php-ext-source-r3 eclass to configure/build
+ ln -s src "${S}/modules"
+}
+
+src_prepare() {
+ php-ext-source-r3_src_prepare
+ local slot
+ for slot in $(php_get_slots); do
+ php_init_slot_env "${slot}"
+ eautoreconf
+ done
+}
+
+src_install() {
+ local slot
+ for slot in $(php_get_slots); do
+ php_init_slot_env ${slot}
+ insinto "${EXT_DIR}"
+ doins "src/.libs/${PHP_EXT_NAME}.so"
+ done
+ php-ext-source-r3_createinifiles
+ einstalldocs
+ if use doc ; then
+ docinto /usr/share/doc/${PF}/html
+ dodoc -r docs/*
+ fi
+}
diff --git a/dev-php/libvirt-php/metadata.xml b/dev-php/libvirt-php/metadata.xml
new file mode 100644
index 000000000000..7ac4536773b4
--- /dev/null
+++ b/dev-php/libvirt-php/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>dev-zero@gentoo.org</email>
+ <name>Tiziano Müller</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>virtualization@gentoo.org</email>
+ <name>Gentoo Virtualization Project</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ <name>PHP</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/dev-php/magickwand-1.0.9-r3 b/dev-php/magickwand-1.0.9-r3
deleted file mode 100644
index 4f3f7ed8ea12..000000000000
--- a/dev-php/magickwand-1.0.9-r3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=media-gfx/imagemagick-6.5.2.9 <media-gfx/imagemagick-7.0 >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php5-6? ( dev-lang/php:5.6 )
-DESCRIPTION=A native PHP-extension to the ImageMagick MagickWand API
-EAPI=6
-HOMEPAGE=http://www.magickwand.org/
-IUSE=php_targets_php5-6
-KEYWORDS=~amd64 ~x86
-LICENSE=MagickWand
-RDEPEND=>=media-gfx/imagemagick-6.5.2.9 <media-gfx/imagemagick-7.0 php_targets_php5-6? ( dev-lang/php:5.6 )
-REQUIRED_USE=|| ( php_targets_php5-6 )
-SLOT=0
-SRC_URI=http://www.magickwand.org/download/php/MagickWandForPHP-1.0.9-2.tar.bz2
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e php-ext-source-r3 63b281041baa106ff1ef59b602ca7e2a toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=ec54cfe54a3897338578d8669d205436
diff --git a/dev-php/magickwand/Manifest b/dev-php/magickwand/Manifest
new file mode 100644
index 000000000000..e98531ad8ad0
--- /dev/null
+++ b/dev-php/magickwand/Manifest
@@ -0,0 +1,3 @@
+DIST MagickWandForPHP-1.0.9-2.tar.bz2 123894 BLAKE2B 627dd04a4010ce14ebb18705f11b4db8f44627b88fe993abd2b75cfff288a54d3d34440402de9d31994c0b5e330ab4aea0423a74edbc32009561c86f30359130 SHA512 67965bd5576b84786b149b64f807fc5f629cfd223013acf83823ffa168571fa5c8f264e15be2ee1c64f68250690dc60c285c6c3c8b8ce3b826b1303f4a29caef
+EBUILD magickwand-1.0.9-r3.ebuild 665 BLAKE2B 35f5bbeb7a7c7d52d1a6db743af7805edddce19b83a061eec60156e023a91f910e8e961f2c53f368a9d3b87179d0617c398028dcac2804bfc2f037e87ef4c117 SHA512 1f73946afe2696bef5a12105c300f906cbd6bb900e55be9020588b6824fde21b213b8b6562895f3877ac8437ddb5b6d3208829614b7f066f2d38f9ab87378f05
+MISC metadata.xml 365 BLAKE2B e0e6977340f1ce0776a61df96f15270679717d97e291fd0788eb1266109045930eda7f900dd32efeb1d5d3f35a5f70572ef0e94e217a55d495fbf82ba856ae8d SHA512 c57c5d696a88bdb3da4dbf3b0dbb88079a40e2024f5817406694b3abc1381167d6ab5b25ba4002610ed9ec567978f67165e64071266e7cf3ae48b0d32896f132
diff --git a/dev-php/magickwand/magickwand-1.0.9-r3.ebuild b/dev-php/magickwand/magickwand-1.0.9-r3.ebuild
new file mode 100644
index 000000000000..a13fe8d248fa
--- /dev/null
+++ b/dev-php/magickwand/magickwand-1.0.9-r3.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PHP_EXT_NAME="magickwand"
+PHP_EXT_ZENDEXT="no"
+PHP_EXT_INI="yes"
+DOCS=( AUTHOR ChangeLog CREDITS README TODO )
+
+MY_PN="MagickWandForPHP"
+IUSE=""
+
+USE_PHP="php5-6"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+inherit php-ext-source-r3
+
+DESCRIPTION="A native PHP-extension to the ImageMagick MagickWand API"
+HOMEPAGE="http://www.magickwand.org/"
+SRC_URI="http://www.magickwand.org/download/php/${MY_PN}-${PV}-2.tar.bz2"
+
+LICENSE="MagickWand"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND=">=media-gfx/imagemagick-6.5.2.9
+ <media-gfx/imagemagick-7.0"
+RDEPEND="${DEPEND}"
diff --git a/dev-php/magickwand/metadata.xml b/dev-php/magickwand/metadata.xml
new file mode 100644
index 000000000000..11314e0e899a
--- /dev/null
+++ b/dev-php/magickwand/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ <name>PHP</name>
+ </maintainer>
+ <longdescription>
+ This PHP5 extension provides
+ access to the ImageMagick MagickWand API.
+ </longdescription>
+</pkgmetadata>
diff --git a/dev-php/maxmind-db-reader-1.2.0 b/dev-php/maxmind-db-reader-1.2.0
deleted file mode 100644
index a615b8de1614..000000000000
--- a/dev-php/maxmind-db-reader-1.2.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=extension? ( dev-libs/libmaxminddb ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool extension? ( php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) )
-DESCRIPTION=PHP reader for the MaxMind database format
-EAPI=6
-HOMEPAGE=https://github.com/maxmind/MaxMind-DB-Reader-php
-IUSE=extension test php_targets_php5-6 php_targets_php7-0 php_targets_php7-1
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=extension? ( dev-libs/libmaxminddb ) dev-php/fedora-autoloader extension? ( php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) )
-REQUIRED_USE=extension? ( || ( php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 ) )
-SLOT=0
-SRC_URI=https://github.com/maxmind/MaxMind-DB-Reader-php/archive/v1.2.0.tar.gz -> MaxMind-DB-Reader-php-1.2.0.tar.gz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e php-ext-source-r3 63b281041baa106ff1ef59b602ca7e2a toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=fe7eaa321a613266f23620ef9fc2c365
diff --git a/dev-php/maxmind-db-reader-1.3.0 b/dev-php/maxmind-db-reader-1.3.0
deleted file mode 100644
index 0384cc31c416..000000000000
--- a/dev-php/maxmind-db-reader-1.3.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=extension? ( dev-libs/libmaxminddb ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool extension? ( php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 ) )
-DESCRIPTION=PHP reader for the MaxMind database format
-EAPI=6
-HOMEPAGE=https://github.com/maxmind/MaxMind-DB-Reader-php
-IUSE=extension test php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=extension? ( dev-libs/libmaxminddb ) extension? ( php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 ) )
-REQUIRED_USE=extension? ( || ( php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2 ) )
-SLOT=0
-SRC_URI=https://github.com/maxmind/MaxMind-DB-Reader-php/archive/v1.3.0.tar.gz -> MaxMind-DB-Reader-php-1.3.0.tar.gz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e php-ext-source-r3 63b281041baa106ff1ef59b602ca7e2a toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=2584780888208b6e1db57de62be8d075
diff --git a/dev-php/maxmind-db-reader/Manifest b/dev-php/maxmind-db-reader/Manifest
new file mode 100644
index 000000000000..4490f781faa4
--- /dev/null
+++ b/dev-php/maxmind-db-reader/Manifest
@@ -0,0 +1,6 @@
+AUX autoload.php 199 BLAKE2B 617ed826e95ec3cd03a8686cb3f2ffecc2eee748ccde58f0caf0d89f71187235cad969694c1f7a5fc7e16e1fc53178bf26dc3e7515b13fa264a639cc9fa2e968 SHA512 bb53c3edbab856787432d085f35af4b0388a46489ad910bce4d2e070537b5b1652da6ed7260fa5b1c0fb7f808c5e8a66b9fce0282bc0d62f3e80d1eb2284a905
+DIST MaxMind-DB-Reader-php-1.2.0.tar.gz 17488 BLAKE2B 2a511f84091ade374eb5b9a975fa6dafe75d69c4c057113790492840acfb9b8e50137bf4927814d8d77b2e17f4e0a7fe1ffda511f7c599a604bc69d4f38af406 SHA512 2965c5348ec787e503c04322961b00fe7806cd95c5f711efd9833adc0acb21f0c40cab1983868f8ea0bb4e8576186d83e1e1913b203aab999f3870ea298a9b2a
+DIST MaxMind-DB-Reader-php-1.3.0.tar.gz 18573 BLAKE2B 6f093b4343438d37a44639dd47d4c149bcfdd351b9fe68eb19c1b739a28e7c7605728e47471cc7d5d257d56df5da37b5ffd32c275cb705befe9e6d60a137ac46 SHA512 480fb38122d1700b18bb0b85d8062397ddc7f003897829f3533901c12a409d76eea9d499ffc0fdd1bfaf4d35b954a30606a053b78e787eda27771995e2a1800b
+EBUILD maxmind-db-reader-1.2.0.ebuild 2219 BLAKE2B 60b3a8de3e439e2ae603c49f88bb87f56fcbb052d7a41a0dda046f031e1e6151512f38f9eb86ef4e5274969d5d850a952aa103effba739125b1dfaa45356bc7c SHA512 657716fbf85bb2502230786d10488386d0b89ded10c2981cec1e211422dbcd5ace29182ff0b537786408c088e5c1a61ecbeb2c8d15bdd33e91823cac21111c46
+EBUILD maxmind-db-reader-1.3.0.ebuild 2160 BLAKE2B b73d6b15b781e04c5f23ff5c776e03b761695074dc19a7b74b97f6ae09d273ec53854a9c7ba6af0ecb2b07c9dd885f01aa95b1d389fc145a3d8b5e20b373cd5a SHA512 2232a93f07adf6dae4627c6332e7fd011aa776f1114fc10a987508787b4fc8bff6d3893f973281652754d7f305fb14da9ca66265c0706b5ed840417f4b60114a
+MISC metadata.xml 472 BLAKE2B eafb00cbc65f3b5363ee77c111deaab80e04072ff4669de2ee80a669b1c81f72e8dfb567de682c4b2b5597d731f1bd4480a73e0b9f3b1ee32e02b1f72ced1180 SHA512 7522517bc559e5309dce0bfa525c80f0d00ca57f03d7a6c771fc1ac20281c09efb142bfdafd56633edfa3e2a878943d6bd3c16ea3f93f0b5ca8ba11a5f28cf8d
diff --git a/dev-php/maxmind-db-reader/files/autoload.php b/dev-php/maxmind-db-reader/files/autoload.php
new file mode 100644
index 000000000000..45e8c2dfba31
--- /dev/null
+++ b/dev-php/maxmind-db-reader/files/autoload.php
@@ -0,0 +1,6 @@
+<?php
+if (!class_exists('Fedora\\Autoloader\\Autoload', false)) {
+ require_once '/usr/share/php/Fedora/Autoloader/autoload.php';
+}
+
+\Fedora\Autoloader\Autoload::addPsr4('MaxMind\\Db\\', __DIR__);
diff --git a/dev-php/maxmind-db-reader/maxmind-db-reader-1.2.0.ebuild b/dev-php/maxmind-db-reader/maxmind-db-reader-1.2.0.ebuild
new file mode 100644
index 000000000000..344af7938327
--- /dev/null
+++ b/dev-php/maxmind-db-reader/maxmind-db-reader-1.2.0.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+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="php5-6 php7-0 php7-1"
+
+inherit php-ext-source-r3
+
+DESCRIPTION="PHP reader for the MaxMind database format"
+HOMEPAGE="https://github.com/maxmind/${MY_PN}"
+SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="extension test"
+
+COMMON_DEPEND="extension? ( dev-libs/libmaxminddb )"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}
+ dev-php/fedora-autoloader"
+
+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.
+ eapply_user
+ use extension && php-ext-source-r3_src_prepare
+}
+
+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 "${FILESDIR}/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/maxmind-db-reader-1.3.0.ebuild b/dev-php/maxmind-db-reader/maxmind-db-reader-1.3.0.ebuild
new file mode 100644
index 000000000000..7d53d3fc64d6
--- /dev/null
+++ b/dev-php/maxmind-db-reader/maxmind-db-reader-1.3.0.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+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="php5-6 php7-0 php7-1 php7-2"
+
+inherit php-ext-source-r3
+
+DESCRIPTION="PHP reader for the MaxMind database format"
+HOMEPAGE="https://github.com/maxmind/${MY_PN}"
+SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="extension 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
new file mode 100644
index 000000000000..c6051cdbefb0
--- /dev/null
+++ b/dev-php/maxmind-db-reader/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ <name>PHP</name>
+ </maintainer>
+ <use>
+ <flag name="extension">
+ Build the C extension that uses <pkg>dev-libs/libmaxminddb</pkg>
+ </flag>
+ </use>
+ <upstream>
+ <remote-id type="github">maxmind/MaxMind-DB-Reader-php</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-php/metadata.xml b/dev-php/metadata.xml
new file mode 100644
index 000000000000..9d56fe4cb951
--- /dev/null
+++ b/dev-php/metadata.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<catmetadata>
+ <longdescription lang="en">
+ The dev-php category contains libraries and utilities relevant to the
+ PHP programming language.
+ </longdescription>
+ <longdescription lang="de">
+ Die Kategorie dev-php enthält Bibliotheken und Werkzeuge für die
+ Programmiersprache PHP.
+ </longdescription>
+ <longdescription lang="es">
+ La categoría dev-php contiene librerías y utilidades referentes al
+ lenguaje de programación PHP.
+ </longdescription>
+ <longdescription lang="ja">
+ dev-php カテゴリーにはPHPプログラミング言語に関連したライブラリーと
+ ユーティリティが含まれます。
+ </longdescription>
+ <longdescription lang="nl">
+ De dev-php categorie bevat bibliotheken en hulpmiddelen voor het gebruik
+ van de programmeertaal PHP.
+ </longdescription>
+ <longdescription lang="vi">
+ Nhóm dev-php chứa các thư viện và tiện ích liên quan
+ đến ngôn ngữ lập trình PHP.
+ </longdescription>
+ <longdescription lang="it">
+ La categoria dev-php contiene librerie ed utilità per il linguaggio di programmazione PHP.
+ </longdescription>
+ <longdescription lang="pt">
+ A categoria dev-php contém bibliotecas e utilitários referentes
+ à linguagem de programação PHP.
+ </longdescription>
+ <longdescription lang="pl">
+ Kategoria dev-php zawiera biblioteki i narzędzia związane z językiem
+ programowania PHP.
+ </longdescription>
+</catmetadata>
+
diff --git a/dev-php/ming-php-0.4.7 b/dev-php/ming-php-0.4.7
deleted file mode 100644
index c85c2c51200e..000000000000
--- a/dev-php/ming-php-0.4.7
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=media-libs/ming >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php5-6? ( dev-lang/php:5.6 )
-DESCRIPTION=PHP extension for the ming Flash movie generation library
-EAPI=6
-HOMEPAGE=http://ming.sourceforge.net/
-IUSE=php_targets_php5-6
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=LGPL-2.1
-RDEPEND=media-libs/ming php_targets_php5-6? ( dev-lang/php:5.6 )
-REQUIRED_USE=|| ( php_targets_php5-6 )
-SLOT=0
-SRC_URI=https://github.com/libming/libming/archive/ming-0_4_7.tar.gz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e php-ext-source-r3 63b281041baa106ff1ef59b602ca7e2a preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d2ea5e0498f60e8f56a0fa05dc123e6c
diff --git a/dev-php/ming-php-0.4.8 b/dev-php/ming-php-0.4.8
deleted file mode 100644
index 6ae0e250487f..000000000000
--- a/dev-php/ming-php-0.4.8
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=media-libs/ming >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 )
-DESCRIPTION=PHP extension for the ming Flash movie generation library
-EAPI=6
-HOMEPAGE=http://ming.sourceforge.net/
-IUSE=php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=LGPL-2.1
-RDEPEND=media-libs/ming php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 )
-REQUIRED_USE=|| ( php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2 )
-SLOT=0
-SRC_URI=https://github.com/libming/libming/archive/ming-0_4_8.tar.gz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e php-ext-source-r3 63b281041baa106ff1ef59b602ca7e2a preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=610d519ea0866df2f729508ffdb3368b
diff --git a/dev-php/ming-php/Manifest b/dev-php/ming-php/Manifest
new file mode 100644
index 000000000000..349b383190a8
--- /dev/null
+++ b/dev-php/ming-php/Manifest
@@ -0,0 +1,7 @@
+AUX ming-php-54.patch 17282 BLAKE2B 9f17a2ee92252ca2ff4bf29e4412a4493b49d4eb918772d6c931b0417ae84e22a7b138f76da989ae36a1d7f6f212e606d8232959242e86ea3515adc3ad405d3b SHA512 79aeea313bbc2b17e170998df37a0e526125ba7752533ca312f18bf31cc66ea79d6fcffd84dfccb9c7714c16345a1cb0f3107914f6ecad01702ad550145391e7
+AUX php_ext-config.m4 2939 BLAKE2B cb3e65a0397b753fb6675425e3eaab0c68349b7d14f387160133312b96f5a8101cea87125d03eafbfdef7ede77b2a85dd0b32d428e6c78019a4a3d2c84f9cd05 SHA512 88e3eb6f42c38d66c050c3e6c956e239861b8c17ed7f7c4867be00b06c9b48b806af3254bd8fbd4c7349a4ff41981bfcb1c7256d671dc5b8bf6d0089d8bf62cc
+DIST ming-0_4_7.tar.gz 14903570 BLAKE2B 48e7b3c2b8a81fa63da18dd140064c572efe563eb621f33b4bc57cdcad8d6cb828e8f62fc63b47144389b0eefa5b571c47e39013ec2724611d20e74928275213 SHA512 232cf45daabd7b60203c9382aa6568455a42ddcd1bd60eec9bfe3f5e80376fcc9ff6304efbafca1ac8a504e2e167bc394e4902e0d067303d9582551461e09d3c
+DIST ming-0_4_8.tar.gz 14908459 BLAKE2B df89beab98a7fbdcbefccad3a2fb013453405a7dba757131a61f06d9e40b7e1fe7beeadab42c113b12cff24b91cb1e76e9fabee0e1b4af58e2127eba13cc27bc SHA512 e395acde9119ad32f4cedd500bcceee70bdd563222a41dda899cc318d5e34eb580abc38ac39c6dec7821913a0a70d2f953fc81f52255b623e34f7c3aaafbc9c0
+EBUILD ming-php-0.4.7.ebuild 1332 BLAKE2B 4eb3cb1d05c52660df43e15e172154564754261cc0630669f212c31a5d551fd389966bac27becca64e5ab531a8039feb5b2cd214bd970ef21a5772f1410ad648 SHA512 0793f4410f866ae8fbe38e083c5c0a828d9e0d643aeeb1973d9b644854e336fbe3fa2f812e4a26948474af242ba7bf202c3f8dbfb4c3ad1ca63f74c4a10c3b28
+EBUILD ming-php-0.4.8.ebuild 1397 BLAKE2B d1babc9387be09e585356e7c20cdbe1417ba5500b4c88947011b00dfec05125c5cb26a47d2a035962fc76274bc355ff5fcb1b5c414a4c9b2248ae9fb1c2f7971 SHA512 00f5109e2106c534f2c10b52f5dec7e2375c86ec2dbda6f4140f4a88ad11088035d22950e77e20ea59a4c41b374ca7f22eb543d08d8aab65546d953e37c2089d
+MISC metadata.xml 475 BLAKE2B 3f1db2ece7aef5e9f24e7fc1b2649422102cacb521ba830ae36a7cb7683957bcb89366d980c305fb9ad2a7fee9ecb87176e934f6ba328a6a2039d36f9c3ca207 SHA512 f5586b50f459b96dd287bb1ee2d1a166cb8086584c76f5b5b68cf1d8271afe22903f77d8641aee3c2d68ffd2b41441aed5f641a303b6f43243d67d65d41748c4
diff --git a/dev-php/ming-php/files/ming-php-54.patch b/dev-php/ming-php/files/ming-php-54.patch
new file mode 100644
index 000000000000..79e167406800
--- /dev/null
+++ b/dev-php/ming-php/files/ming-php-54.patch
@@ -0,0 +1,479 @@
+--- a/ming.c 2015-01-19 21:46:35.299042679 -0500
++++ b/ming.c 2015-01-19 21:52:00.566380663 -0500
+@@ -370,7 +370,7 @@
+
+ input = newSWFInput_file(file);
+ zend_list_addref(Z_LVAL_P(zfile));
+- zend_list_addref(zend_list_insert(input, le_swfinputp));
++ zend_list_addref(zend_list_insert(input, le_swfinputp TSRMLS_CC));
+ return input;
+ }
+ /* }}} */
+@@ -410,7 +410,7 @@
+
+ input = newSWFInput_bufferCopy((unsigned char *)data, data_len);
+
+- ret = zend_list_insert(input, le_swfinputp);
++ ret = zend_list_insert(input, le_swfinputp TSRMLS_CC);
+ object_init_ex(getThis(), input_class_entry_ptr);
+ add_property_resource(getThis(), "input", ret);
+ zend_list_addref(ret);
+@@ -449,7 +449,7 @@
+
+ fc = newSWFFontCollection_fromFile(filename);
+ if(fc) {
+- ret = zend_list_insert(fc, le_swffontcollectionp);
++ ret = zend_list_insert(fc, le_swffontcollectionp TSRMLS_CC);
+ object_init_ex(getThis(), fontcollection_class_entry_ptr);
+ add_property_resource(getThis(), "fontcollection", ret);
+ zend_list_addref(ret);
+@@ -479,7 +479,7 @@
+ font = SWFFontCollection_getFont(getFontCollection(getThis() TSRMLS_CC), index);
+
+ if(font != NULL) {
+- ret = zend_list_insert(font, le_swffontp);
++ ret = zend_list_insert(font, le_swffontp TSRMLS_CC);
+ object_init_ex(return_value, font_class_entry_ptr);
+ add_property_resource(return_value, "font", ret);
+ zend_list_addref(ret);
+@@ -527,7 +527,7 @@
+
+ font = newSWFBrowserFont(name);
+ if(font) {
+- ret = zend_list_insert(font, le_swfbrowserfontp);
++ ret = zend_list_insert(font, le_swfbrowserfontp TSRMLS_CC);
+ object_init_ex(getThis(), browserfont_class_entry_ptr);
+ add_property_resource(getThis(), "browserfont", ret);
+ zend_list_addref(ret);
+@@ -573,7 +573,7 @@
+ WRONG_PARAM_COUNT;
+ }
+
+- ret = zend_list_insert(cx, le_swfcxformp);
++ ret = zend_list_insert(cx, le_swfcxformp TSRMLS_CC);
+ object_init_ex(getThis(), cxform_class_entry_ptr);
+ add_property_resource(getThis(), "cx", ret);
+ zend_list_addref(ret);
+@@ -736,7 +736,7 @@
+ init = newSWFInitAction_withId(getAction(zaction TSRMLS_CC), id);
+ }
+
+- ret = zend_list_insert(init, le_swfinitactionp);
++ ret = zend_list_insert(init, le_swfinitactionp TSRMLS_CC);
+ object_init_ex(getThis(), initaction_class_entry_ptr);
+ add_property_resource(getThis(), "initaction", ret);
+ zend_list_addref(ret);
+@@ -785,7 +785,7 @@
+ php_error_docref(NULL TSRMLS_CC, E_ERROR, "Couldn't compile actionscript");
+ }
+
+- ret = zend_list_insert(action, le_swfactionp);
++ ret = zend_list_insert(action, le_swfactionp TSRMLS_CC);
+
+ object_init_ex(getThis(), action_class_entry_ptr);
+ add_property_resource(getThis(), "action", ret);
+@@ -863,7 +863,7 @@
+ input = newSWFInput_filename(Z_STRVAL_P(zfile));
+ if(input == NULL)
+ php_error(E_ERROR, "opening bitmap file failed");
+- zend_list_addref(zend_list_insert(input, le_swfinputp));
++ zend_list_addref(zend_list_insert(input, le_swfinputp TSRMLS_CC));
+ break;
+
+ default:
+@@ -884,7 +884,7 @@
+ maskinput = newSWFInput_filename(Z_STRVAL_P(zmask));
+ if(maskinput == NULL)
+ php_error(E_ERROR, "opening mask file failed");
+- zend_list_addref(zend_list_insert(maskinput, le_swfinputp));
++ zend_list_addref(zend_list_insert(maskinput, le_swfinputp TSRMLS_CC));
+ break;
+
+ default:
+@@ -895,7 +895,7 @@
+ /* XXX: this is very optimistic! is it really a JPEG ?!? */
+ bitmap_alpha = newSWFJpegWithAlpha_fromInput(input, maskinput);
+ if(bitmap_alpha) {
+- ret = zend_list_insert(bitmap_alpha, le_swfbitmapp);
++ ret = zend_list_insert(bitmap_alpha, le_swfbitmapp TSRMLS_CC);
+ object_init_ex(getThis(), bitmap_class_entry_ptr);
+ add_property_resource(getThis(), "bitmap", ret);
+ zend_list_addref(ret);
+@@ -903,7 +903,7 @@
+ } else {
+ bitmap = newSWFBitmap_fromInput(input);
+ if(bitmap) {
+- ret = zend_list_insert(bitmap, le_swfbitmapp);
++ ret = zend_list_insert(bitmap, le_swfbitmapp TSRMLS_CC);
+ object_init_ex(getThis(), bitmap_class_entry_ptr);
+ add_property_resource(getThis(), "bitmap", ret);
+ zend_list_addref(ret);
+@@ -1164,7 +1164,7 @@
+ PHP_METHOD(swfbutton, __construct)
+ {
+ SWFButton button = newSWFButton();
+- int ret = zend_list_insert(button, le_swfbuttonp);
++ int ret = zend_list_insert(button, le_swfbuttonp TSRMLS_CC);
+
+ object_init_ex(getThis(), button_class_entry_ptr);
+ add_property_resource(getThis(), "button", ret);
+@@ -1297,7 +1297,7 @@
+
+ if(record != NULL)
+ {
+- ret = zend_list_insert(record, le_swfbuttonrecordp);
++ ret = zend_list_insert(record, le_swfbuttonrecordp TSRMLS_CC);
+ object_init_ex(return_value, buttonrecord_class_entry_ptr);
+ add_property_resource(return_value, "buttonrecord", ret);
+ zend_list_addref(ret);
+@@ -1384,7 +1384,7 @@
+
+ if(item != NULL) {
+ /* try and create a soundinstance object */
+- ret = zend_list_insert(item, le_swfsoundinstancep);
++ ret = zend_list_insert(item, le_swfsoundinstancep TSRMLS_CC);
+ object_init_ex(return_value, soundinstance_class_entry_ptr);
+ add_property_resource(return_value, "soundinstance", ret);
+ zend_list_addref(ret);
+@@ -1971,7 +1971,7 @@
+ m = SWFDisplayItem_getMatrix(getDisplayItem(getThis() TSRMLS_CC));
+ if(m != NULL)
+ {
+- ret = zend_list_insert(m, le_swfmatrixp);
++ ret = zend_list_insert(m, le_swfmatrixp TSRMLS_CC);
+ object_init_ex(return_value, matrix_class_entry_ptr);
+ add_property_resource(return_value, "matrix", ret);
+ zend_list_addref(ret);
+@@ -1992,7 +1992,7 @@
+ c = SWFDisplayItem_getCharacter(getDisplayItem(getThis() TSRMLS_CC));
+ if(c != NULL)
+ {
+- ret = zend_list_insert(c, le_swfcharacterp);
++ ret = zend_list_insert(c, le_swfcharacterp TSRMLS_CC);
+ object_init_ex(return_value, character_class_entry_ptr);
+ add_property_resource(return_value, "character", ret);
+ zend_list_addref(ret);
+@@ -2366,7 +2366,7 @@
+
+ if(font)
+ {
+- ret = zend_list_insert(font, le_swffontp);
++ ret = zend_list_insert(font, le_swffontp TSRMLS_CC);
+ object_init_ex(getThis(), font_class_entry_ptr);
+ add_property_resource(getThis(), "font", ret);
+ zend_list_addref(ret);
+@@ -2537,7 +2537,7 @@
+
+ matrix = newSWFFilterMatrix(cols, rows, values);
+ free(values); /* array is copied by libming */
+- ret = zend_list_insert(matrix, le_swffiltermatrixp);
++ ret = zend_list_insert(matrix, le_swffiltermatrixp TSRMLS_CC);
+ object_init_ex(getThis(), filtermatrix_class_entry_ptr);
+ add_property_resource(getThis(), "filtermatrix", ret);
+ zend_list_addref(ret);
+@@ -2582,7 +2582,7 @@
+ }
+
+ shadow = newSWFShadow(angle, distance, strength);
+- ret = zend_list_insert(shadow, le_swfshadowp);
++ ret = zend_list_insert(shadow, le_swfshadowp TSRMLS_CC);
+ object_init_ex(getThis(), shadow_class_entry_ptr);
+ add_property_resource(getThis(), "shadow", ret);
+ zend_list_addref(ret);
+@@ -2628,7 +2628,7 @@
+ }
+
+ blur = newSWFBlur(blurX, blurY, passes);
+- ret = zend_list_insert(blur, le_swfblurp);
++ ret = zend_list_insert(blur, le_swfblurp TSRMLS_CC);
+ object_init_ex(getThis(), blur_class_entry_ptr);
+ add_property_resource(getThis(), "blur", ret);
+ zend_list_addref(ret);
+@@ -2665,7 +2665,7 @@
+ PHP_METHOD(swfgradient, __construct)
+ {
+ SWFGradient gradient = newSWFGradient();
+- int ret = zend_list_insert(gradient, le_swfgradientp);
++ int ret = zend_list_insert(gradient, le_swfgradientp TSRMLS_CC);
+
+ object_init_ex(getThis(), gradient_class_entry_ptr);
+ add_property_resource(getThis(), "gradient", ret);
+@@ -3076,7 +3076,7 @@
+ if(filter == NULL)
+ WRONG_PARAM_COUNT;
+
+- ret = zend_list_insert(filter, le_swffilterp);
++ ret = zend_list_insert(filter, le_swffilterp TSRMLS_CC);
+ object_init_ex(getThis(), filter_class_entry_ptr);
+ add_property_resource(getThis(), "filter", ret);
+ zend_list_addref(ret);
+@@ -3115,7 +3115,7 @@
+ PHP_METHOD(swfmorph, __construct)
+ {
+ SWFMorph morph = newSWFMorphShape();
+- int ret = zend_list_insert(morph, le_swfmorphp);
++ int ret = zend_list_insert(morph, le_swfmorphp TSRMLS_CC);
+
+ object_init_ex(getThis(), morph_class_entry_ptr);
+ add_property_resource(getThis(), "morph", ret);
+@@ -3147,7 +3147,7 @@
+ {
+ SWFMorph morph = getMorph(getThis() TSRMLS_CC);
+ SWFShape shape = SWFMorph_getShape1(morph);
+- int ret = zend_list_insert(shape, le_swfshapep);
++ int ret = zend_list_insert(shape, le_swfshapep TSRMLS_CC);
+
+ object_init_ex(return_value, shape_class_entry_ptr);
+ add_property_resource(return_value, "shape", ret);
+@@ -3161,7 +3161,7 @@
+ {
+ SWFMorph morph = getMorph(getThis() TSRMLS_CC);
+ SWFShape shape = SWFMorph_getShape2(morph);
+- int ret = zend_list_insert(shape, le_swfshapep);
++ int ret = zend_list_insert(shape, le_swfshapep TSRMLS_CC);
+
+ object_init_ex(return_value, shape_class_entry_ptr);
+ add_property_resource(return_value, "shape", ret);
+@@ -3205,7 +3205,7 @@
+ input = newSWFInput_filename(Z_STRVAL_P(zfile));
+ if(input == NULL)
+ php_error(E_ERROR, "opening sound file failed");
+- zend_list_addref(zend_list_insert(input, le_swfinputp));
++ zend_list_addref(zend_list_insert(input, le_swfinputp TSRMLS_CC));
+ break;
+
+ default:
+@@ -3216,7 +3216,7 @@
+ sound = newSWFSoundStream_fromInput(input);
+
+ if(sound) {
+- ret = zend_list_insert(sound, le_swfsoundstreamp);
++ ret = zend_list_insert(sound, le_swfsoundstreamp TSRMLS_CC);
+ object_init_ex(getThis(), soundstream_class_entry_ptr);
+ add_property_resource(getThis(), "soundstream", ret);
+ zend_list_addref(ret);
+@@ -3331,7 +3331,7 @@
+ input = newSWFInput_filename(Z_STRVAL_P(zfile));
+ if(input == NULL)
+ php_error(E_ERROR, "opening sound file failed");
+- zend_list_addref(zend_list_insert(input, le_swfinputp));
++ zend_list_addref(zend_list_insert(input, le_swfinputp TSRMLS_CC));
+ break;
+
+ default:
+@@ -3343,7 +3343,7 @@
+
+ if(sound != NULL)
+ {
+- ret = zend_list_insert(sound, le_swfsoundp);
++ ret = zend_list_insert(sound, le_swfsoundp TSRMLS_CC);
+ object_init_ex(getThis(), sound_class_entry_ptr);
+ add_property_resource(getThis(), "sound", ret);
+ zend_list_addref(ret);
+@@ -3479,7 +3479,7 @@
+ input = newSWFInput_filename(Z_STRVAL_P(zfile));
+ if(input == NULL)
+ php_error(E_ERROR, "opening sound video failed");
+- zend_list_addref(zend_list_insert(input, le_swfinputp));
++ zend_list_addref(zend_list_insert(input, le_swfinputp TSRMLS_CC));
+ break;
+
+ default:
+@@ -3496,7 +3496,7 @@
+ }
+
+ if(stream) {
+- ret = zend_list_insert(stream, le_swfvideostreamp);
++ ret = zend_list_insert(stream, le_swfvideostreamp TSRMLS_CC);
+ object_init_ex(getThis(), videostream_class_entry_ptr);
+ add_property_resource(getThis(), "videostream", ret);
+ zend_list_addref(ret);
+@@ -3646,7 +3646,7 @@
+ bd = newSWFBinaryData((unsigned char *)data, data_len);
+
+ if(bd) {
+- ret = zend_list_insert(bd, le_swfbinarydatap);
++ ret = zend_list_insert(bd, le_swfbinarydatap TSRMLS_CC);
+ object_init_ex(getThis(), binarydata_class_entry_ptr);
+ add_property_resource(getThis(), "binarydata", ret);
+ zend_list_addref(ret);
+@@ -3704,7 +3704,7 @@
+ input = newSWFInput_filename(Z_STRVAL_P(zfile));
+ if(input == NULL)
+ php_error(E_ERROR, "opening prebuilt clip file failed");
+- zend_list_addref(zend_list_insert(input, le_swfinputp));
++ zend_list_addref(zend_list_insert(input, le_swfinputp TSRMLS_CC));
+ break;
+
+ default:
+@@ -3715,7 +3715,7 @@
+ clip = newSWFPrebuiltClip_fromInput(input);
+
+ if(clip) {
+- ret = zend_list_insert(clip, le_swfprebuiltclipp);
++ ret = zend_list_insert(clip, le_swfprebuiltclipp TSRMLS_CC);
+ object_init_ex(getThis(), prebuiltclip_class_entry_ptr);
+ add_property_resource(getThis(), "prebuiltclip", ret);
+ zend_list_addref(ret);
+@@ -3768,7 +3768,7 @@
+ movie = newSWFMovie(); /* default version 4 */
+ }
+
+- ret = zend_list_insert(movie, le_swfmoviep);
++ ret = zend_list_insert(movie, le_swfmoviep TSRMLS_CC);
+
+ object_init_ex(getThis(), movie_class_entry_ptr);
+ add_property_resource(getThis(), "movie", ret);
+@@ -3880,7 +3880,7 @@
+ item = SWFMovie_add_internal(movie, ublock);
+ if (item != NULL) {
+ /* try and create a displayitem object */
+- ret = zend_list_insert(item, le_swfdisplayitemp);
++ ret = zend_list_insert(item, le_swfdisplayitemp TSRMLS_CC);
+ object_init_ex(return_value, displayitem_class_entry_ptr);
+ add_property_resource(return_value, "displayitem", ret);
+ zend_list_addref(ret);
+@@ -4242,7 +4242,7 @@
+ php_error(E_ERROR, "opening mp3 file failed");
+ }
+
+- zend_list_addref(zend_list_insert(input, le_swfinputp));
++ zend_list_addref(zend_list_insert(input, le_swfinputp TSRMLS_CC));
+ break;
+
+ default:
+@@ -4327,7 +4327,7 @@
+ if(item != NULL)
+ {
+ /* try and create a soundinstance object */
+- ret = zend_list_insert(item, le_swfsoundinstancep);
++ ret = zend_list_insert(item, le_swfsoundinstancep TSRMLS_CC);
+ object_init_ex(return_value, soundinstance_class_entry_ptr);
+ add_property_resource(return_value, "soundinstance", ret);
+ zend_list_addref(ret);
+@@ -4369,7 +4369,7 @@
+ character = SWFMovie_importCharacter(movie, libswf, name);
+ if(character != NULL)
+ {
+- ret = zend_list_insert(character, le_swfcharacterp);
++ ret = zend_list_insert(character, le_swfcharacterp TSRMLS_CC);
+ object_init_ex(return_value, character_class_entry_ptr);
+ add_property_resource(return_value, "character", ret);
+ zend_list_addref(ret);
+@@ -4397,7 +4397,7 @@
+ if(res != NULL)
+ {
+ /* try and create a fontchar object */
+- ret = zend_list_insert(res, le_swffontcharp);
++ ret = zend_list_insert(res, le_swffontcharp TSRMLS_CC);
+ object_init_ex(return_value, fontchar_class_entry_ptr);
+ add_property_resource(return_value, "fontcharacter", ret);
+ zend_list_addref(ret);
+@@ -4424,7 +4424,7 @@
+ if(res != NULL)
+ {
+ /* try and create a fontchar object */
+- ret = zend_list_insert(res, le_swffontcharp);
++ ret = zend_list_insert(res, le_swffontcharp TSRMLS_CC);
+ object_init_ex(return_value, fontchar_class_entry_ptr);
+ add_property_resource(return_value, "fontcharacter", ret);
+ zend_list_addref(ret);
+@@ -4509,7 +4509,7 @@
+ PHP_METHOD(swfshape, __construct)
+ {
+ SWFShape shape = newSWFShape();
+- int ret = zend_list_insert(shape, le_swfshapep);
++ int ret = zend_list_insert(shape, le_swfshapep TSRMLS_CC);
+
+ object_init_ex(getThis(), shape_class_entry_ptr);
+ add_property_resource(getThis(), "shape", ret);
+@@ -4575,7 +4575,7 @@
+ }
+
+ /* return an SWFFill object */
+- ret = zend_list_insert(fill, le_swffillp);
++ ret = zend_list_insert(fill, le_swffillp TSRMLS_CC);
+ object_init_ex(return_value, fill_class_entry_ptr);
+ add_property_resource(return_value, "fill", ret);
+ zend_list_addref(ret);
+@@ -4618,7 +4618,7 @@
+ }
+
+ /* return an SWFFill object */
+- ret = zend_list_insert(fill, le_swffillp);
++ ret = zend_list_insert(fill, le_swffillp TSRMLS_CC);
+ object_init_ex(return_value, fill_class_entry_ptr);
+ add_property_resource(return_value, "fill", ret);
+ zend_list_addref(ret);
+@@ -4664,7 +4664,7 @@
+ }
+
+ /* return an SWFFill object */
+- ret = zend_list_insert(fill, le_swffillp);
++ ret = zend_list_insert(fill, le_swffillp TSRMLS_CC);
+ object_init_ex(return_value, fill_class_entry_ptr);
+ add_property_resource(return_value, "fill", ret);
+ zend_list_addref(ret);
+@@ -4719,7 +4719,7 @@
+ }
+
+ /* return an SWFFill object */
+- ret = zend_list_insert(fill, le_swffillp);
++ ret = zend_list_insert(fill, le_swffillp TSRMLS_CC);
+ object_init_ex(return_value, fill_class_entry_ptr);
+ add_property_resource(return_value, "fill", ret);
+ zend_list_addref(ret);
+@@ -5209,7 +5209,7 @@
+ PHP_METHOD(swfsprite, __construct)
+ {
+ SWFMovieClip sprite = newSWFMovieClip();
+- int ret = zend_list_insert(sprite, le_swfspritep);
++ int ret = zend_list_insert(sprite, le_swfspritep TSRMLS_CC);
+
+ object_init_ex(getThis(), sprite_class_entry_ptr);
+ add_property_resource(getThis(), "sprite", ret);
+@@ -5259,7 +5259,7 @@
+
+ if (item != NULL) {
+ /* try and create a displayitem object */
+- ret = zend_list_insert(item, le_swfdisplayitemp);
++ ret = zend_list_insert(item, le_swfdisplayitemp TSRMLS_CC);
+ object_init_ex(return_value, displayitem_class_entry_ptr);
+ add_property_resource(return_value, "displayitem", ret);
+ zend_list_addref(ret);
+@@ -5342,7 +5342,7 @@
+
+ if(item != NULL) {
+ /* try and create a displayitem object */
+- ret = zend_list_insert(item, le_swfsoundinstancep);
++ ret = zend_list_insert(item, le_swfsoundinstancep TSRMLS_CC);
+ object_init_ex(return_value, soundinstance_class_entry_ptr);
+ add_property_resource(return_value, "soundinstance", ret);
+ zend_list_addref(ret);
+@@ -5400,7 +5400,7 @@
+ input = newSWFInput_filename(Z_STRVAL_P(zfile));
+ if(input == NULL)
+ php_error(E_ERROR, "opening sound file failed");
+- zend_list_addref(zend_list_insert(input, le_swfinputp));
++ zend_list_addref(zend_list_insert(input, le_swfinputp TSRMLS_CC));
+ break;
+
+ }
+@@ -5521,7 +5521,7 @@
+ text = newSWFText2();
+ }
+
+- int ret = zend_list_insert(text, le_swftextp);
++ int ret = zend_list_insert(text, le_swftextp TSRMLS_CC);
+ object_init_ex(getThis(), text_class_entry_ptr);
+ add_property_resource(getThis(), "text", ret);
+ zend_list_addref(ret);
+@@ -5794,7 +5794,7 @@
+ {
+ long flags = 0;
+ SWFTextField field = newSWFTextField();
+- int ret = zend_list_insert(field, le_swftextfieldp);
++ int ret = zend_list_insert(field, le_swftextfieldp TSRMLS_CC);
+
+ object_init_ex(getThis(), textfield_class_entry_ptr);
+ add_property_resource(getThis(), "textfield", ret);
diff --git a/dev-php/ming-php/files/php_ext-config.m4 b/dev-php/ming-php/files/php_ext-config.m4
new file mode 100644
index 000000000000..9f4cd19790b0
--- /dev/null
+++ b/dev-php/ming-php/files/php_ext-config.m4
@@ -0,0 +1,112 @@
+PHP_LIBDIR=lib
+
+PHP_ARG_WITH(ming, for MING support,
+[ --with-ming[=DIR] Include MING support])
+
+if test "$PHP_MING" != "no"; then
+ AC_CHECK_LIB(m, sin)
+
+ for i in $PHP_MING ../../src /usr/local /usr; do
+ if test -f $i/$PHP_LIBDIR/libming.$SHLIB_SUFFIX_NAME || test -f $i/$PHP_LIBDIR/libming.a; then
+ MING_DIR=$i
+ break
+ fi
+ done
+
+ if test -z "$MING_DIR"; then
+ AC_MSG_ERROR(Please reinstall ming distribution. libming.(a|so) not found.)
+ fi
+
+ for i in ../../src $MING_DIR/include $MING_DIR/include/ming $MING_DIR/ming/include; do
+ if test -f $i/ming.h; then
+ MING_INC_DIR=$i
+ fi
+ done
+
+ if test -z "$MING_INC_DIR"; then
+ AC_MSG_ERROR(Please reinstall ming distribution. ming.h not found.)
+ fi
+
+ PHP_CHECK_LIBRARY(ming, Ming_useSWFVersion, [
+ AC_DEFINE(HAVE_MING,1,[ ])
+ ],[
+ AC_MSG_ERROR([Ming library 0.2a or greater required.])
+ ],[
+ -L$MING_DIR/$PHP_LIBDIR
+ ])
+
+ PHP_ADD_INCLUDE($MING_INC_DIR)
+ PHP_ADD_LIBRARY_WITH_PATH(ming, $MING_DIR/$PHP_LIBDIR, MING_SHARED_LIBADD)
+
+ old_CPPFLAGS=$CPPFLAGS
+ CPPFLAGS=-I$MING_INC_DIR
+ AC_MSG_CHECKING([for destroySWFBlock])
+ AC_TRY_RUN([
+#include "ming.h"
+int destroySWFBlock(int a, int b) {
+ return a+b;
+}
+int main() {
+ return destroySWFBlock(-1,1); /* returns 0 only if function is not yet defined */
+}
+ ],[
+ AC_MSG_RESULT([missing])
+ ],[
+ AC_DEFINE(HAVE_DESTROY_SWF_BLOCK,1,[ ])
+ AC_MSG_RESULT([ok])
+ ],[
+ AC_MSG_RESULT([unknown])
+ ])
+
+dnl Check Ming version (FIXME: if/when ming has some better way to detect the version..)
+ AC_EGREP_CPP(yes, [
+#include <ming.h>
+#ifdef SWF_SOUND_COMPRESSION
+yes
+#endif
+ ], [
+ AC_DEFINE(HAVE_NEW_MING, 1, [ ])
+ dnl FIXME: This is now unconditional..better check coming later.
+ ])
+
+ dnl Check if SWFVideoStream_setFrameMode() is available
+ AC_TRY_COMPILE([
+#include <ming.h>
+ ], [
+int main(void) { SWFVideoStream_setFrameMode(0, 0); return 0; }
+ ], [
+ AC_DEFINE(HAVE_SWFVIDEOSTREAM_SETFRAMEMODE, 1, [Have SWFVideoStream_setFrameMode(SWFVideoStream, int)])
+ ], [])
+
+ dnl Check if SWFVideoStream_nextFrame() is available
+ AC_TRY_COMPILE([
+#include <ming.h>
+ ], [
+int main(void) { SWFVideoStream_nextFrame(0); return 0; }
+ ], [
+ AC_DEFINE(HAVE_SWFVIDEOSTREAM_NEXTFRAME, 1, [Have SWFVideoStream_nextFrame(SWFVideoStream)])
+ ], [])
+
+ dnl Check if SWFVideoStream_seek() is available
+ AC_TRY_COMPILE([
+#include <ming.h>
+ ], [
+int main(void) { SWFVideoStream_seek(0, 0, 0); return 0; }
+ ], [
+ AC_DEFINE(HAVE_SWFVIDEOSTREAM_SEEK, 1, [Have SWFVideoStream_seek(SWFVideoStream, int frame, int whence)])
+ ], [])
+
+
+ dnl Check if SWFMovie_output() accepts the 4th parameter
+ AC_TRY_COMPILE([
+#include <ming.h>
+ ], [
+int main(void) { SWFMovie_output(NULL, NULL, NULL, 0); return 0; }
+ ], [
+ AC_DEFINE(HAVE_MING_MOVIE_LEVEL, 1, [ ])
+ ], [])
+ CPPFLAGS=$old_CPPFLAGS
+
+ PHP_NEW_EXTENSION(ming, ming.c, $ext_shared)
+ PHP_SUBST(MING_SHARED_LIBADD)
+fi
diff --git a/dev-php/ming-php/metadata.xml b/dev-php/ming-php/metadata.xml
new file mode 100644
index 000000000000..50367ee577fa
--- /dev/null
+++ b/dev-php/ming-php/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>grknight@gentoo.org</email>
+ <name>Brian Evans</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ <name>PHP</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="sourceforge">ming</remote-id>
+ <remote-id type="github">libming/libming</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-php/ming-php/ming-php-0.4.7.ebuild b/dev-php/ming-php/ming-php-0.4.7.ebuild
new file mode 100644
index 000000000000..3c335f1e51c2
--- /dev/null
+++ b/dev-php/ming-php/ming-php-0.4.7.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PHP_EXT_NAME=ming
+MY_P="${PHP_EXT_NAME}-${PV//./_}"
+USE_PHP="php5-6"
+PHP_EXT_S="${WORKDIR}/libming-${MY_P}/php_ext"
+inherit flag-o-matic php-ext-source-r3
+
+DESCRIPTION="PHP extension for the ming Flash movie generation library"
+HOMEPAGE="http://ming.sourceforge.net/"
+SRC_URI="https://github.com/libming/libming/archive/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+RDEPEND="media-libs/ming"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/libming-${MY_P}"
+PATCHES=( "${FILESDIR}/ming-php-54.patch" )
+
+src_prepare() {
+ local libdir=$(get_libdir)
+ cp "${FILESDIR}/php_ext-config.m4" "${PHP_EXT_S}/config.m4" || \
+ die "Failed to copy config.m4 to target"
+ rm "${PHP_EXT_S}/Makefile.am" || die "Failed to remove Makefile.am for ${slot}"
+ # Fix for SYMYLINK_LIB=no
+ if [[ ${libdir} != 'lib' ]] ; then
+ sed -i -e "s~PHP_LIBDIR=lib~PHP_LIBDIR=${libdir}~" "${PHP_EXT_S}/config.m4" \
+ || die "Failed to update lib directory"
+ fi
+ php-ext-source-r3_src_prepare
+}
+
+src_configure() {
+ # build is sensitive to -O3 (bug #297437)
+ replace-flags -O3 -O2
+
+ local PHP_EXT_EXTRA_ECONF="--with-ming=${S}"
+ php-ext-source-r3_src_configure
+}
diff --git a/dev-php/ming-php/ming-php-0.4.8.ebuild b/dev-php/ming-php/ming-php-0.4.8.ebuild
new file mode 100644
index 000000000000..13db203b5ab9
--- /dev/null
+++ b/dev-php/ming-php/ming-php-0.4.8.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PHP_EXT_NAME=ming
+MY_P="${PHP_EXT_NAME}-${PV//./_}"
+USE_PHP="php5-6 php7-0 php7-1 php7-2"
+PHP_EXT_S="${WORKDIR}/libming-${MY_P}/php_ext"
+inherit flag-o-matic php-ext-source-r3
+
+DESCRIPTION="PHP extension for the ming Flash movie generation library"
+HOMEPAGE="http://ming.sourceforge.net/"
+SRC_URI="https://github.com/libming/libming/archive/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+RDEPEND="media-libs/ming"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/libming-${MY_P}"
+# Clear out near-empty README files which are not helpful to the user
+DOCS=( )
+
+src_prepare() {
+ local libdir=$(get_libdir)
+ cp "${FILESDIR}/php_ext-config.m4" "${PHP_EXT_S}/config.m4" || \
+ die "Failed to copy config.m4 to target"
+ rm "${PHP_EXT_S}/Makefile.am" || die "Failed to remove Makefile.am for ${slot}"
+ # Fix for SYMYLINK_LIB=no
+ if [[ ${libdir} != 'lib' ]] ; then
+ sed -i -e "s~PHP_LIBDIR=lib~PHP_LIBDIR=${libdir}~" "${PHP_EXT_S}/config.m4" \
+ || die "Failed to update lib directory"
+ fi
+ php-ext-source-r3_src_prepare
+}
+
+src_configure() {
+ # build is sensitive to -O3 (bug #297437)
+ replace-flags -O3 -O2
+
+ local PHP_EXT_EXTRA_ECONF="--with-ming=${S}"
+ php-ext-source-r3_src_configure
+}
diff --git a/dev-php/mmslib-0.97 b/dev-php/mmslib-0.97
deleted file mode 100644
index ca884bbf3dd8..000000000000
--- a/dev-php/mmslib-0.97
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=library for encoding, decoding, and sending MMSes
-EAPI=6
-HOMEPAGE=http://www.hellkvist.org/software/#MMSLIB
-IUSE=examples
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/php:*
-SLOT=0
-SRC_URI=http://www.hellkvist.org/software/mmslib/mmslib-0.97.tar.gz
-_md5_=29bd985a825df88755aa9053253881a4
diff --git a/dev-php/mmslib/Manifest b/dev-php/mmslib/Manifest
new file mode 100644
index 000000000000..f30fb4561fd0
--- /dev/null
+++ b/dev-php/mmslib/Manifest
@@ -0,0 +1,3 @@
+DIST mmslib-0.97.tar.gz 62106 BLAKE2B 624b905748982b017fb74bebbb2c7d3a0cb004298696d4bd5159a6ac44f7460279ab09e4594ed544e3aaacdc7d98bfbdb94fab130040227137ebf8d3b2bf098e SHA512 ca406af28a25e7af042e4575d88159fbc55b1c90687c355d4175a3b6567bf8fac249b93660aa920c48aa4e05dfaa95a529f8aefedd07db9ce6edd69492918392
+EBUILD mmslib-0.97.ebuild 523 BLAKE2B 1a5503248aed3f9f1fe5a39ca17626015dca7eba0ad51e6ade578def91d23f9d4d826244ddd9e69736c54db2a0e5cfeaf329e5aaaed3721f0b11b943a5053de3 SHA512 2adccc75b10775b5aabb12a1e9a91ad70b6dfe35c0a782be2deccbdbed40cc6c62bd52838a4f9c93c94bc92de926a1dfdedd28cfd78ea63c52d9ff2e993dd101
+MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/mmslib/metadata.xml b/dev-php/mmslib/metadata.xml
new file mode 100644
index 000000000000..b86acf66c756
--- /dev/null
+++ b/dev-php/mmslib/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ <name>PHP</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/dev-php/mmslib/mmslib-0.97.ebuild b/dev-php/mmslib/mmslib-0.97.ebuild
new file mode 100644
index 000000000000..a622ac5b7a3b
--- /dev/null
+++ b/dev-php/mmslib/mmslib-0.97.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="library for encoding, decoding, and sending MMSes"
+HOMEPAGE="http://www.hellkvist.org/software/#MMSLIB"
+SRC_URI="http://www.hellkvist.org/software/mmslib/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples"
+
+DEPEND=""
+RDEPEND="dev-lang/php:*"
+
+src_install() {
+ insinto "/usr/share/php/${PN}"
+ doins mmslib.php
+
+ dodoc README
+ use examples && dodoc -r samples content
+}
diff --git a/dev-php/mockery-0.9.0-r1 b/dev-php/mockery-0.9.0-r1
deleted file mode 100644
index f1446a7edb43..000000000000
--- a/dev-php/mockery-0.9.0-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DESCRIPTION=Simple yet flexible PHP mock object framework for use in unit testing
-EAPI=6
-HOMEPAGE=https://github.com/padraic/mockery
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-php/pear-1.8.1
-SLOT=0
-SRC_URI=http:///get/Mockery-0.9.0.tgz
-_eclasses_=php-pear-r2 eb6928c33771db74564e814c5ca6c1b3
-_md5_=dc93f92f30c41c5e7c7d8e06406b7cd2
diff --git a/dev-php/mockery/Manifest b/dev-php/mockery/Manifest
new file mode 100644
index 000000000000..2ae57767bb06
--- /dev/null
+++ b/dev-php/mockery/Manifest
@@ -0,0 +1,4 @@
+AUX channel.xml 872 BLAKE2B 05caba7252a0056713ff2ac0e114b1dfd1338953f98360759d271385426529757554a8cd6ea7b049dbc6466290075d754af2db9d2ac37518bc00b51393ff742e SHA512 305859e84a3f26cfbc961d889ad448908889ab40490082064f473a3025f0d3aac20e374ee2e98dab9f861f38b7f1b74a2faf94f9c42cf379a877b1906d4ca00d
+DIST Mockery-0.9.0.tgz 30330 BLAKE2B 6b5493ee84da2f1bd43aafa4df1555577771782740061480f047af6fd262d716ec03c025716215e37638826f14721414ad31ac527354e2a4b0b5cb691f120cf3 SHA512 744f7727395feb1009ae879dd9f336a314c70d96e848efe19c399d3abee42950606352a0781a1664178f77485933491928a1bddbcdb86a5092d69434868eee1c
+EBUILD mockery-0.9.0-r1.ebuild 510 BLAKE2B aaa39a7d5328fe88c8a2800811a6629509ac3349e6554af123486eb407dd6ee0487480f11eacce48b6edd03571ce8a12767cf12345dfc3224b7628e66fb91f03 SHA512 5be295271ba886f1a9b936a9d2b6d23b4a0ed199195fcb860b4a5e671d8c80fdac6daeda13319b7793692bd6fb1206ecac13dcd17aa43affc7fdc3fb53a2a935
+MISC metadata.xml 329 BLAKE2B be5aac7b5f688b42e8ac11b57d46d0f2b00fded5a070b342397fc28aa92e85d369540df407ca586b1c45bcfcf8e5d6115d9890afa9f942ef546fee550811e7f9 SHA512 e4fbd2bfea017cb013503f7bc177c6a5aa2cb2e9f6c7d5c1ea34247ce0e4495343aa96ecdce6d0b899e6a87a704a4a9076f8aa7405af1cd8c4b90adcc13633c7
diff --git a/dev-php/mockery/files/channel.xml b/dev-php/mockery/files/channel.xml
new file mode 100644
index 000000000000..b9fe38d87b18
--- /dev/null
+++ b/dev-php/mockery/files/channel.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<channel version="1.0" xmlns="http://pear.php.net/channel-1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://pear.php.net/channel-1.0 http://pear.php.net/dtd/channel-1.0.xsd">
+ <name>pear.survivethedeepend.com</name>
+ <summary>Survive The Deep End PEAR Channel</summary>
+ <suggestedalias>deepend</suggestedalias>
+ <servers>
+ <primary>
+ <rest>
+ <baseurl type="REST1.0">http://pear.survivethedeepend.com/rest/</baseurl>
+ <baseurl type="REST1.1">http://pear.survivethedeepend.com/rest/</baseurl>
+ <baseurl type="REST1.2">http://pear.survivethedeepend.com/rest/</baseurl>
+ <baseurl type="REST1.3">http://pear.survivethedeepend.com/rest/</baseurl>
+ </rest>
+ </primary>
+ </servers>
+</channel> \ No newline at end of file
diff --git a/dev-php/mockery/metadata.xml b/dev-php/mockery/metadata.xml
new file mode 100644
index 000000000000..03bef7dd7fdf
--- /dev/null
+++ b/dev-php/mockery/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://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">padraic/mockery</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-php/mockery/mockery-0.9.0-r1.ebuild b/dev-php/mockery/mockery-0.9.0-r1.ebuild
new file mode 100644
index 000000000000..72490762ba9e
--- /dev/null
+++ b/dev-php/mockery/mockery-0.9.0-r1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PHP_PEAR_CHANNEL="${FILESDIR}/channel.xml"
+PHP_PEAR_PKG_NAME="Mockery"
+PHP_PEAR_DOMAIN="pear.survivethedeepend.com"
+inherit php-pear-r2
+
+DESCRIPTION="Simple yet flexible PHP mock object framework for use in unit testing"
+HOMEPAGE="https://github.com/padraic/mockery"
+SRC_URI="http://${PHP_PEAR_URI}/get/${PEAR_P}.tgz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
diff --git a/dev-php/myclabs-deepcopy-1.6.0 b/dev-php/myclabs-deepcopy-1.6.0
deleted file mode 100644
index aa660effa839..000000000000
--- a/dev-php/myclabs-deepcopy-1.6.0
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Create deep copies (clones) of your objects
-EAPI=6
-HOMEPAGE=https://github.com/myclabs/DeepCopy
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86
-LICENSE=MIT
-RDEPEND=dev-php/fedora-autoloader >=dev-lang/php-5.6:*
-SLOT=0
-SRC_URI=https://github.com/myclabs/DeepCopy/archive/1.6.0.tar.gz -> myclabs-deepcopy-1.6.0.tar.gz
-_md5_=99ab5b149fad0651debf9ee43db74ae9
diff --git a/dev-php/myclabs-deepcopy-1.6.1 b/dev-php/myclabs-deepcopy-1.6.1
deleted file mode 100644
index 187e24643fe6..000000000000
--- a/dev-php/myclabs-deepcopy-1.6.1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Create deep copies (clones) of your objects
-EAPI=6
-HOMEPAGE=https://github.com/myclabs/DeepCopy
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=MIT
-RDEPEND=dev-php/fedora-autoloader >=dev-lang/php-5.6:*
-SLOT=0
-SRC_URI=https://github.com/myclabs/DeepCopy/archive/1.6.1.tar.gz -> myclabs-deepcopy-1.6.1.tar.gz
-_md5_=008aec94cfec4f2d761892124db00148
diff --git a/dev-php/myclabs-deepcopy/Manifest b/dev-php/myclabs-deepcopy/Manifest
new file mode 100644
index 000000000000..401396f481ae
--- /dev/null
+++ b/dev-php/myclabs-deepcopy/Manifest
@@ -0,0 +1,6 @@
+AUX autoload.php 239 BLAKE2B c67e02841a85ce3cb1cb27286eaf799a8060644d35dad28c9a32462ea4f95b7b0b357369c19033f1408f588e2acd47ac955f99e38928bedacd1430a723dba669 SHA512 d59e462c851383a3e2a487fbdaff75c50c805572c151ca3ce4ca9ae5cba1cac85a76f2a8bb50730caaa76eabc0c76a9f97dd2135008939df874d57cc654d3fab
+DIST myclabs-deepcopy-1.6.0.tar.gz 43612 BLAKE2B 18e3f532043cfbf700230a82772938082611922b9a04c7a99d63f79210e6c6f144521a29356977f4c44843cae6628e0a13fa0a46e0d34cb2e251f138ed60ab44 SHA512 a1d0ce8386172b963bca1e34e0e6d69268177f6aaf5309498780e4f9e43b9126916937e0b422644199b96f46212d0267af9b56993b9ffe295adb5f872c24584c
+DIST myclabs-deepcopy-1.6.1.tar.gz 43589 BLAKE2B e62ed5384bf9d4ad0286189772de8eeb9fed9962cf1d109b9e282c37ceadc885c6850fbed1695de35935b85fcc789a796485f44e97269a556d3498be8b691af4 SHA512 6cf13127401304ff92277c7c433353ecc20764fd5b8db0f8ae8d6767d8d9bc9c2f6b6ed3d68eeca5960357517038062c6f6b82831f433596d0a05cd0cea916d4
+EBUILD myclabs-deepcopy-1.6.0.ebuild 652 BLAKE2B d039342eaaefa03a98a91487e01dd96ab927ea9ba598b8f0c554d503b2f2b82e9aad7b325f57f2501fe5ec061afb2a1b4ea6ce59d0b973d3f6f9c93448fae0b7 SHA512 f9735e4a1005bf3e9bd38618bd1b80fdaf1d903e3eba6310d490c8016ca03886ff7621cb887c67ff18ea620b92874d21f110bf29638dc73f4c1b054743d94f48
+EBUILD myclabs-deepcopy-1.6.1.ebuild 661 BLAKE2B 393c1d2c0f219b24bceeee802e7ec0f09a59eff1854efaf270873378b4dc345a1db340a97620dcaa67b6baf1aefd0c889e81e8f5828559e87233333571fa1320 SHA512 191e347deb345a42903bc4c61bbbc18304e0ee2c6bcb13f4149fedf84c49bd560299aabaef5499e29c0e9ada049a26b37ad1f3f54220b6597b836df42f1aa5e9
+MISC metadata.xml 320 BLAKE2B 7a39e30db8d713926fe221be630c6ff660222d62b47d5b7e561127bc63f522fa813d2ce6ba83276600cc2e3e942e27758e8268d784dd1f3bb36f182c5da3026f SHA512 a4610b9b7fc96287c53bc0501afdded0b917d842e2a263308fe20aab65678c569d6ace0576596e7d4cb75dc3af3b3af2896ac7aeb867237206b7ca3c6c8b30e8
diff --git a/dev-php/myclabs-deepcopy/files/autoload.php b/dev-php/myclabs-deepcopy/files/autoload.php
new file mode 100644
index 000000000000..0d5d92673b36
--- /dev/null
+++ b/dev-php/myclabs-deepcopy/files/autoload.php
@@ -0,0 +1,8 @@
+<?php
+/* Autoloader for dev-php/myclabs-deepcopy */
+
+if (!class_exists('Fedora\\Autoloader\\Autoload', false)) {
+ require_once '/usr/share/php/Fedora/Autoloader/autoload.php';
+}
+
+Fedora\Autoloader\Autoload::addPsr4('DeepCopy\\', __DIR__);
diff --git a/dev-php/myclabs-deepcopy/metadata.xml b/dev-php/myclabs-deepcopy/metadata.xml
new file mode 100644
index 000000000000..1aeb42359b17
--- /dev/null
+++ b/dev-php/myclabs-deepcopy/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://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">myclabs/DeepCopy</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-php/myclabs-deepcopy/myclabs-deepcopy-1.6.0.ebuild b/dev-php/myclabs-deepcopy/myclabs-deepcopy-1.6.0.ebuild
new file mode 100644
index 000000000000..6803ab223326
--- /dev/null
+++ b/dev-php/myclabs-deepcopy/myclabs-deepcopy-1.6.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PN="DeepCopy"
+
+DESCRIPTION="Create deep copies (clones) of your objects"
+HOMEPAGE="https://github.com/myclabs/${MY_PN}"
+SRC_URI="https://github.com/myclabs/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+IUSE=""
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+RDEPEND="dev-php/fedora-autoloader
+ >=dev-lang/php-5.6:*"
+
+src_install() {
+ insinto /usr/share/php/myclabs
+ doins -r src/*
+ insinto /usr/share/php/myclabs/DeepCopy
+ doins "${FILESDIR}/autoload.php"
+}
diff --git a/dev-php/myclabs-deepcopy/myclabs-deepcopy-1.6.1.ebuild b/dev-php/myclabs-deepcopy/myclabs-deepcopy-1.6.1.ebuild
new file mode 100644
index 000000000000..6966ccfabd29
--- /dev/null
+++ b/dev-php/myclabs-deepcopy/myclabs-deepcopy-1.6.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PN="DeepCopy"
+
+DESCRIPTION="Create deep copies (clones) of your objects"
+HOMEPAGE="https://github.com/myclabs/${MY_PN}"
+SRC_URI="https://github.com/myclabs/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE=""
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+RDEPEND="dev-php/fedora-autoloader
+ >=dev-lang/php-5.6:*"
+
+src_install() {
+ insinto /usr/share/php/myclabs
+ doins -r src/*
+ insinto /usr/share/php/myclabs/DeepCopy
+ doins "${FILESDIR}/autoload.php"
+}
diff --git a/dev-php/onphp-1.0.11_pre20141124 b/dev-php/onphp-1.0.11_pre20141124
deleted file mode 100644
index 612fa29d92b6..000000000000
--- a/dev-php/onphp-1.0.11_pre20141124
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=onPHP is the LGPL'ed multi-purpose object-oriented PHP framework
-EAPI=6
-HOMEPAGE=https://github.com/onPHP/onphp-framework/
-IUSE=doc
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2
-RDEPEND=dev-lang/php:*
-SLOT=0
-SRC_URI=https://github.com/onPHP/onphp-framework/archive/706ddd5a2a33bd65a13c4e3ec8c46c5ce700133c.tar.gz -> onphp-1.0.11_pre20141124.tar.gz doc? ( http://onphp.org/download/onphp-api-1.0.10.tar.bz2 )
-_eclasses_=vcs-snapshot 3be1ab44131e8c0bbdaa75823008444b
-_md5_=989437e668302b593d989f071673c9ab
diff --git a/dev-php/onphp/Manifest b/dev-php/onphp/Manifest
new file mode 100644
index 000000000000..96f5737222ab
--- /dev/null
+++ b/dev-php/onphp/Manifest
@@ -0,0 +1,4 @@
+DIST onphp-1.0.11_pre20141124.tar.gz 457828 BLAKE2B 6273483660e25d6b1e2420cab62d151ada9bb97bc7edbcd45075cd60224bf71150c834b7f7bc2677727790f6b876e67858329e7d2912b06d29ddf1900e2c0913 SHA512 d943a787d352f25f9f2fd0eadbae64a71d1fe7f6e56e98f82c803c2da53332ba659a0cc907849ec824a7d9639cde794bd84d5df82a9b724bf1c78da92a396b56
+DIST onphp-api-1.0.10.tar.bz2 35427359 BLAKE2B ed4c339d789698551f93dcf20ae8aee906f39f6d356b34b9760e17398f4163b530100c2169923fd9b1bbd1d35cdaa5a9209239fa8cb893f4a327deb4dda8562a SHA512 4acdb9c804fd2bb7cfbefd22efcb0956972b2b94679627352169948a0fb23f97deca2f7aa77690cf3a5b6614299c0d9515802d9321cfa680e9a4a06d0533d4e5
+EBUILD onphp-1.0.11_pre20141124.ebuild 813 BLAKE2B c1a2db4d71e3eef646ec6878aad38d6a5bc2bf9aabcb262efd9fea4c4bafd9d6a601aac47d7629869faa4e09d9f8a19ac91304ed8cbfaecc6e290018a7966607 SHA512 8ed80edfddccea4f75862ba334651abc7dfa74665b6460d5777c2ca0b9e83a33683edc86bc972ada4b0ffbacf7536176c75dd46c744d348e8a2d1b3a3f081c43
+MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/onphp/metadata.xml b/dev-php/onphp/metadata.xml
new file mode 100644
index 000000000000..b86acf66c756
--- /dev/null
+++ b/dev-php/onphp/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ <name>PHP</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/dev-php/onphp/onphp-1.0.11_pre20141124.ebuild b/dev-php/onphp/onphp-1.0.11_pre20141124.ebuild
new file mode 100644
index 000000000000..7c375a214679
--- /dev/null
+++ b/dev-php/onphp/onphp-1.0.11_pre20141124.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vcs-snapshot
+
+KEYWORDS="~amd64 ~x86"
+
+DESCRIPTION="onPHP is the LGPL'ed multi-purpose object-oriented PHP framework"
+HOMEPAGE="https://github.com/onPHP/onphp-framework/"
+SRC_URI="https://github.com/onPHP/onphp-framework/archive/706ddd5a2a33bd65a13c4e3ec8c46c5ce700133c.tar.gz -> ${P}.tar.gz
+ doc? ( http://onphp.org/download/${PN}-api-1.0.10.tar.bz2 )
+"
+LICENSE="LGPL-2"
+SLOT="0"
+IUSE="doc"
+
+DEPEND=""
+RDEPEND="dev-lang/php:*"
+
+src_install() {
+ rm doc/LICENSE || die
+ dodoc $(find doc -maxdepth 1 -type f -print)
+ if use doc ; then
+ local HTML_DOCS=( "${WORKDIR}/${PN}-api-1.0.10/" )
+ einstalldocs
+ fi
+ insinto "/usr/share/php/${PN}"
+ doins global.inc.php.tpl
+ doins -r core main meta
+}
diff --git a/dev-php/pear-1.10.1-r1 b/dev-php/pear-1.10.1-r1
deleted file mode 100644
index 0b911bf0f76d..000000000000
--- a/dev-php/pear-1.10.1-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=PEAR - PHP Extension and Application Repository
-EAPI=6
-HOMEPAGE=http://pear.php.net/
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86
-LICENSE=MIT
-RDEPEND=>=dev-php/PEAR-PEAR-1.10.1-r1
-SLOT=0
-_md5_=c82f0c5c3086b82b738d1040c1ae0361
diff --git a/dev-php/pear-1.10.3 b/dev-php/pear-1.10.3
deleted file mode 100644
index b46ad7b15f3a..000000000000
--- a/dev-php/pear-1.10.3
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=PEAR - PHP Extension and Application Repository
-EAPI=6
-HOMEPAGE=http://pear.php.net/
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=MIT
-RDEPEND=>=dev-php/PEAR-PEAR-1.10.3
-SLOT=0
-_md5_=3c6a74ce0165277dfe44105db873a2a2
diff --git a/dev-php/pear/Manifest b/dev-php/pear/Manifest
new file mode 100644
index 000000000000..0281b69e5def
--- /dev/null
+++ b/dev-php/pear/Manifest
@@ -0,0 +1,3 @@
+EBUILD pear-1.10.1-r1.ebuild 368 BLAKE2B efbade55190a0ab390ce054de50ec7699dddd76fc5eeeeeef560b028a15f295d2c5755728b67a7ee88929acdbfbf608e8098c83c404642c0f36876952e791306 SHA512 65a11eed3edd662844194e00b9219c17a04a05f91a0ac9a87c0d29a090f03e7023da8466d41f503adec4cd0f895f537bee91044aea00dd14a2f9dfd6ea380e39
+EBUILD pear-1.10.3.ebuild 377 BLAKE2B f852190d690fc9d44893a2cef96689194deabc1d48bc1a74f79717f142a0c2468589a9f4b12cc1aad1efcbb0eca7d5d602e5d3090fe0da3f09bf3f97a9380722 SHA512 6fa4bf70d38f7715b89bdbdcf87ac755531b9f47be5ef1e23536904cf838ed593cb52b087749f5ec4856756964bfce87f4a03e1713e9aca2e08e7f8b787649c4
+MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/pear/metadata.xml b/dev-php/pear/metadata.xml
new file mode 100644
index 000000000000..b86acf66c756
--- /dev/null
+++ b/dev-php/pear/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ <name>PHP</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/dev-php/pear/pear-1.10.1-r1.ebuild b/dev-php/pear/pear-1.10.1-r1.ebuild
new file mode 100644
index 000000000000..99c25b244064
--- /dev/null
+++ b/dev-php/pear/pear-1.10.1-r1.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+
+DESCRIPTION="PEAR - PHP Extension and Application Repository"
+HOMEPAGE="http://pear.php.net/"
+SRC_URI=""
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+
+DEPEND=""
+RDEPEND=">=dev-php/PEAR-PEAR-${PVR}"
diff --git a/dev-php/pear/pear-1.10.3.ebuild b/dev-php/pear/pear-1.10.3.ebuild
new file mode 100644
index 000000000000..418a5b571897
--- /dev/null
+++ b/dev-php/pear/pear-1.10.3.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+
+DESCRIPTION="PEAR - PHP Extension and Application Repository"
+HOMEPAGE="http://pear.php.net/"
+SRC_URI=""
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+
+DEPEND=""
+RDEPEND=">=dev-php/PEAR-PEAR-${PVR}"
diff --git a/dev-php/pecl-amqp-1.8.0 b/dev-php/pecl-amqp-1.8.0
deleted file mode 100644
index 1b512cf60540..000000000000
--- a/dev-php/pecl-amqp-1.8.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=net-libs/rabbitmq-c-0.5.2 virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 )
-DESCRIPTION=PHP Bindings for AMQP 0-9-1 compatible brokers
-EAPI=6
-HOMEPAGE=https://pecl.php.net/amqp
-IUSE=php_targets_php5-6 php_targets_php7-0 php_targets_php7-1
-KEYWORDS=~amd64 ~x86
-LICENSE=PHP-3.01
-RDEPEND=>=net-libs/rabbitmq-c-0.5.2:= php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 )
-REQUIRED_USE=|| ( php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 )
-SLOT=0
-SRC_URI=https://pecl.php.net/get/amqp-1.8.0.tgz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e php-ext-pecl-r3 a59741d3df8ea9f17afcdcfb7edaee6d php-ext-source-r3 63b281041baa106ff1ef59b602ca7e2a toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=3fb5bf621748407a79d0de3f1da863e5
diff --git a/dev-php/pecl-amqp-1.9.0 b/dev-php/pecl-amqp-1.9.0
deleted file mode 100644
index 0415f20f516f..000000000000
--- a/dev-php/pecl-amqp-1.9.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=net-libs/rabbitmq-c-0.5.2[ssl] virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 )
-DESCRIPTION=PHP Bindings for AMQP 0-9-1 compatible brokers
-EAPI=6
-HOMEPAGE=https://pecl.php.net/amqp
-IUSE=php_targets_php5-6 php_targets_php7-0 php_targets_php7-1
-KEYWORDS=~amd64 ~x86
-LICENSE=PHP-3.01
-RDEPEND=>=net-libs/rabbitmq-c-0.5.2:=[ssl] php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 )
-REQUIRED_USE=|| ( php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 )
-SLOT=0
-SRC_URI=https://pecl.php.net/get/amqp-1.9.0.tgz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e php-ext-pecl-r3 a59741d3df8ea9f17afcdcfb7edaee6d php-ext-source-r3 63b281041baa106ff1ef59b602ca7e2a toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=9f9be4218fa8d3b83d9b7f0b3c39d210
diff --git a/dev-php/pecl-amqp-1.9.3 b/dev-php/pecl-amqp-1.9.3
deleted file mode 100644
index 01d271bb534f..000000000000
--- a/dev-php/pecl-amqp-1.9.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=net-libs/rabbitmq-c-0.5.2[ssl] virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 )
-DESCRIPTION=PHP Bindings for AMQP 0-9-1 compatible brokers
-EAPI=6
-HOMEPAGE=https://pecl.php.net/amqp
-IUSE=php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2
-KEYWORDS=~amd64 ~x86
-LICENSE=PHP-3.01
-RDEPEND=>=net-libs/rabbitmq-c-0.5.2:=[ssl] php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 )
-REQUIRED_USE=|| ( php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2 )
-SLOT=0
-SRC_URI=https://pecl.php.net/get/amqp-1.9.3.tgz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e php-ext-pecl-r3 a59741d3df8ea9f17afcdcfb7edaee6d php-ext-source-r3 63b281041baa106ff1ef59b602ca7e2a toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=adbc8b15f1f526fb73198afc94d4aa9f
diff --git a/dev-php/pecl-amqp/Manifest b/dev-php/pecl-amqp/Manifest
new file mode 100644
index 000000000000..81d11f4d4298
--- /dev/null
+++ b/dev-php/pecl-amqp/Manifest
@@ -0,0 +1,7 @@
+DIST amqp-1.8.0.tgz 91850 BLAKE2B 35a0f44ce770f3d20adcbacf7a6bfd014014f1a09c2bb006e9e50c6f8f97f6d564f5db5adf0d3bceb08611d1cf3f7a95f5e6256977ed1ed134791c92a01addf6 SHA512 a70873e2f9ad47c2e6b028727e98888746e1eee8bb1007c7272e422f14527ee3e980c6ffc9a94671c548082c380cee4d9a27ac5c4adce382fdcf9251ac6eb7c7
+DIST amqp-1.9.0.tgz 98248 BLAKE2B 2bf13a72eedb0d46bfba3c5d2ec01d1a85cfd60b2dadfaa8e0475eda52ee6650f8757d7521f808043464f3a32a33e4143153136f08f9c4484316ca06785b5888 SHA512 ce77266d9c95d87c7ddf177c531540e05f9120417e645f4595f204fad2d2ecd9f388f0e1e55d69bee845333b5b5976960cc2a603ea6860708df1eafe0aef9a10
+DIST amqp-1.9.3.tgz 101342 BLAKE2B 1e9702cfd44035fe8c923cd2766ce49309310da11655e96246133bb7d8f686a661703f5c35053c19dc607a1c6d1afe515c87ceeecc1cdf93acfa6b211c6802bd SHA512 d4731ed5dc760a01621889e8518b5d1258a8335f701d241c453fd553924d83507a0a918b9733e249955fa11b43a1bdacf65c1f1cb55b8ed3c5b661277f5798b9
+EBUILD pecl-amqp-1.8.0.ebuild 390 BLAKE2B 4a6296482369976da836abd21eeb3d355388d730da3e7a6f7bd8f55746056b39333e8d8c3e9ac0288e238cd4c9fc6d35bb197368c50939f7486e5bbee2148ce5 SHA512 59e3cf6333ea7dfde25c751b75712f32d9de236775b0200811d2f8abca5578d8b14efc6ce1d0fba38cdfc2a051adc00a67bba841b3c0cdde610d6b5c6f23c062
+EBUILD pecl-amqp-1.9.0.ebuild 422 BLAKE2B 4d713959aa6afdac77d96b81d618649979d6e72bc7f1cfec257eec6761f5fecbda54ce627780e7a6268955fbdf0d176f72accd1ad34df8c373215b7fa3f33fac SHA512 c5f2e59adf902b641ae36903cd176a1edd2ea8b9f8fb56088bfe3601f54bd8c13798beef54e59982e21c1501f4bf2c13cf2ab14571f574298251dbf092f318c9
+EBUILD pecl-amqp-1.9.3.ebuild 429 BLAKE2B 899db33ffe92861102573f58f52ecceb511c47e1a130aeb8c7f3f8f2b5694094c7b4bfa073be218b82032c1856a6d1b10ae4bf860e73b3271df23881764968e1 SHA512 3c61d7bc9e664b5de1b4a298e6c14d86b82b483462646371197f84d580c408cb1f0f626af3e9512eaec2a8a7384a398c53aaefd7744894a8f276e2c40f22afd6
+MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/pecl-amqp/metadata.xml b/dev-php/pecl-amqp/metadata.xml
new file mode 100644
index 000000000000..b86acf66c756
--- /dev/null
+++ b/dev-php/pecl-amqp/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ <name>PHP</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/dev-php/pecl-amqp/pecl-amqp-1.8.0.ebuild b/dev-php/pecl-amqp/pecl-amqp-1.8.0.ebuild
new file mode 100644
index 000000000000..5960e89908b9
--- /dev/null
+++ b/dev-php/pecl-amqp/pecl-amqp-1.8.0.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_PHP="php5-6 php7-0 php7-1"
+
+inherit php-ext-pecl-r3
+
+KEYWORDS="~amd64 ~x86"
+
+DESCRIPTION="PHP Bindings for AMQP 0-9-1 compatible brokers"
+LICENSE="PHP-3.01"
+SLOT="0"
+IUSE=""
+
+DEPEND=">=net-libs/rabbitmq-c-0.5.2 virtual/pkgconfig"
+RDEPEND=">=net-libs/rabbitmq-c-0.5.2:="
diff --git a/dev-php/pecl-amqp/pecl-amqp-1.9.0.ebuild b/dev-php/pecl-amqp/pecl-amqp-1.9.0.ebuild
new file mode 100644
index 000000000000..20df124580cc
--- /dev/null
+++ b/dev-php/pecl-amqp/pecl-amqp-1.9.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_PHP="php5-6 php7-0 php7-1"
+
+inherit php-ext-pecl-r3
+
+KEYWORDS="~amd64 ~x86"
+
+DESCRIPTION="PHP Bindings for AMQP 0-9-1 compatible brokers"
+LICENSE="PHP-3.01"
+SLOT="0"
+IUSE=""
+
+DEPEND=">=net-libs/rabbitmq-c-0.5.2[ssl] virtual/pkgconfig"
+RDEPEND=">=net-libs/rabbitmq-c-0.5.2:=[ssl]"
+PHP_EXT_ECONF_ARGS=()
diff --git a/dev-php/pecl-amqp/pecl-amqp-1.9.3.ebuild b/dev-php/pecl-amqp/pecl-amqp-1.9.3.ebuild
new file mode 100644
index 000000000000..060b5164a62b
--- /dev/null
+++ b/dev-php/pecl-amqp/pecl-amqp-1.9.3.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_PHP="php5-6 php7-0 php7-1 php7-2"
+
+inherit php-ext-pecl-r3
+
+KEYWORDS="~amd64 ~x86"
+
+DESCRIPTION="PHP Bindings for AMQP 0-9-1 compatible brokers"
+LICENSE="PHP-3.01"
+SLOT="0"
+IUSE=""
+
+DEPEND=">=net-libs/rabbitmq-c-0.5.2[ssl] virtual/pkgconfig"
+RDEPEND=">=net-libs/rabbitmq-c-0.5.2:=[ssl]"
+PHP_EXT_ECONF_ARGS=()
diff --git a/dev-php/pecl-apcu-4.0.11 b/dev-php/pecl-apcu-4.0.11
deleted file mode 100644
index fd45b784494c..000000000000
--- a/dev-php/pecl-apcu-4.0.11
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 )
-DESCRIPTION=Stripped down version of APC supporting only user cache
-EAPI=6
-HOMEPAGE=https://pecl.php.net/apcu
-IUSE=+mmap lock_pthreadmutex +lock_pthreadrw lock_spinlock lock_semaphore php_targets_php5-6 php_targets_php7-0 php_targets_php7-1
-KEYWORDS=amd64 x86
-LICENSE=PHP-3.01
-PDEPEND=php_targets_php7-0? ( dev-php/pecl-apcu:7[php_targets_php7-0] ) php_targets_php7-1? ( dev-php/pecl-apcu:7[php_targets_php7-1] )
-RDEPEND=php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 )
-REQUIRED_USE=^^ ( lock_pthreadmutex lock_pthreadrw lock_spinlock lock_semaphore ) || ( php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 )
-SLOT=0
-SRC_URI=https://pecl.php.net/get/apcu-4.0.11.tgz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e php-ext-pecl-r3 a59741d3df8ea9f17afcdcfb7edaee6d php-ext-source-r3 63b281041baa106ff1ef59b602ca7e2a toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=c280a6d433fdbaf576187568a5b3facc
diff --git a/dev-php/pecl-apcu-5.1.10 b/dev-php/pecl-apcu-5.1.10
deleted file mode 100644
index 03d1b267daf9..000000000000
--- a/dev-php/pecl-apcu-5.1.10
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 )
-DESCRIPTION=Stripped down version of APC supporting only user cache
-EAPI=6
-HOMEPAGE=https://pecl.php.net/apcu
-IUSE=+mmap lock_pthreadmutex +lock_pthreadrw lock_spinlock lock_semaphore php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2
-KEYWORDS=~amd64 ~x86
-LICENSE=PHP-3.01
-RDEPEND=php_targets_php5-6? ( dev-php/pecl-apcu:0[php_targets_php5-6] ) php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 )
-REQUIRED_USE=^^ ( lock_pthreadmutex lock_pthreadrw lock_spinlock lock_semaphore ) || ( php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2 )
-SLOT=7
-SRC_URI=https://pecl.php.net/get/apcu-5.1.10.tgz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e php-ext-pecl-r3 a59741d3df8ea9f17afcdcfb7edaee6d php-ext-source-r3 63b281041baa106ff1ef59b602ca7e2a toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=c2f10da02582163b7b88c19ac5464d3a
diff --git a/dev-php/pecl-apcu-5.1.11 b/dev-php/pecl-apcu-5.1.11
deleted file mode 100644
index 2a3dc737cfa7..000000000000
--- a/dev-php/pecl-apcu-5.1.11
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 )
-DESCRIPTION=Stripped down version of APC supporting only user cache
-EAPI=6
-HOMEPAGE=https://pecl.php.net/apcu
-IUSE=+mmap lock_pthreadmutex +lock_pthreadrw lock_spinlock lock_semaphore php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2
-KEYWORDS=~amd64 ~x86
-LICENSE=PHP-3.01
-RDEPEND=php_targets_php5-6? ( dev-php/pecl-apcu:0[php_targets_php5-6] ) php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 )
-REQUIRED_USE=^^ ( lock_pthreadmutex lock_pthreadrw lock_spinlock lock_semaphore ) || ( php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2 )
-SLOT=7
-SRC_URI=https://pecl.php.net/get/apcu-5.1.11.tgz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e php-ext-pecl-r3 a59741d3df8ea9f17afcdcfb7edaee6d php-ext-source-r3 63b281041baa106ff1ef59b602ca7e2a toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=c2f10da02582163b7b88c19ac5464d3a
diff --git a/dev-php/pecl-apcu-5.1.8 b/dev-php/pecl-apcu-5.1.8
deleted file mode 100644
index 2310c645851b..000000000000
--- a/dev-php/pecl-apcu-5.1.8
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 )
-DESCRIPTION=Stripped down version of APC supporting only user cache
-EAPI=6
-HOMEPAGE=https://pecl.php.net/apcu
-IUSE=+mmap lock_pthreadmutex +lock_pthreadrw lock_spinlock lock_semaphore php_targets_php5-6 php_targets_php7-0 php_targets_php7-1
-KEYWORDS=amd64 x86
-LICENSE=PHP-3.01
-RDEPEND=php_targets_php5-6? ( dev-php/pecl-apcu:0[php_targets_php5-6] ) php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 )
-REQUIRED_USE=^^ ( lock_pthreadmutex lock_pthreadrw lock_spinlock lock_semaphore ) || ( php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 )
-SLOT=7
-SRC_URI=https://pecl.php.net/get/apcu-5.1.8.tgz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e php-ext-pecl-r3 a59741d3df8ea9f17afcdcfb7edaee6d php-ext-source-r3 63b281041baa106ff1ef59b602ca7e2a toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=fff1320dc74567eb117cc49b5527b646
diff --git a/dev-php/pecl-apcu-5.1.9 b/dev-php/pecl-apcu-5.1.9
deleted file mode 100644
index bb0eab648e31..000000000000
--- a/dev-php/pecl-apcu-5.1.9
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 )
-DESCRIPTION=Stripped down version of APC supporting only user cache
-EAPI=6
-HOMEPAGE=https://pecl.php.net/apcu
-IUSE=+mmap lock_pthreadmutex +lock_pthreadrw lock_spinlock lock_semaphore php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2
-KEYWORDS=~amd64 ~x86
-LICENSE=PHP-3.01
-RDEPEND=php_targets_php5-6? ( dev-php/pecl-apcu:0[php_targets_php5-6] ) php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 )
-REQUIRED_USE=^^ ( lock_pthreadmutex lock_pthreadrw lock_spinlock lock_semaphore ) || ( php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2 )
-SLOT=7
-SRC_URI=https://pecl.php.net/get/apcu-5.1.9.tgz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e php-ext-pecl-r3 a59741d3df8ea9f17afcdcfb7edaee6d php-ext-source-r3 63b281041baa106ff1ef59b602ca7e2a toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=c2f10da02582163b7b88c19ac5464d3a
diff --git a/dev-php/pecl-apcu/Manifest b/dev-php/pecl-apcu/Manifest
new file mode 100644
index 000000000000..d2062f0d7e21
--- /dev/null
+++ b/dev-php/pecl-apcu/Manifest
@@ -0,0 +1,11 @@
+DIST apcu-4.0.11.tgz 119535 BLAKE2B 2c1f8a0463b2802b11ae679987807127556b04fb099e4872bff9d1ea51c633140d978b66373eb987d5207403ed9389e58f1afa7ca94360680d9a9693230fb87a SHA512 e3b97066240e33850419e96f0fd9df0e66ee3b0fa238c418e07ac639d07439e9edfa1696e56a620e33f1ffc0993c57bde585b0c170b22995e7d5c0ae550b7899
+DIST apcu-5.1.10.tgz 111937 BLAKE2B 87bf86b43a775c38b232e4acd876f5c63628fc095747fecc26109fddc0473672180e3886dd613fa426772ea53aa8d7f46d08ec3e3383f6ce53be2f63a9ff066b SHA512 fdf82f2b46231849b373f50d1255bcedab8fbefa7ded7c157649cf6406fb593cc2f4e63ca7d3cecfbadb4533ecd8d0ad80e198626dc1489cea8a22ba87ca583a
+DIST apcu-5.1.11.tgz 105462 BLAKE2B 37ff632555e1bca51951db3021a4108a1de491b1bae2b12daed80e5d2d4651737cad744023c62956779395198accf33290c0c3b81b6abfc7bb54337a1a23e082 SHA512 2c284bbe84012030cc5c24ccf903c3abee995af549616c10211dbd5e463a5f37a3f27a5982127db81787a64345597a10be495380b844ce6204dc57c8b058bb88
+DIST apcu-5.1.8.tgz 111260 BLAKE2B eb41b1af33500ed9ddbbcb5e1a92884af4b356e16cf76c70f75a8853522cc91af1c156cc0bbd464fce539a138bf4e2ead5101810223b0f1bb91cd062850ef08e SHA512 4f377389e713bcae5534c64ea28f72c20ab2176aa758188c4d956c1f2370be49bc33dd2a1db43941fff5344a164aaeebc4e73e6d579f62d17334bcc520171526
+DIST apcu-5.1.9.tgz 111049 BLAKE2B c7138f65d73a056e4a34972098c2b543ad6d96d0d8215e82757c457cc8938af48fea842e006c79c83deee4060cdc94047764930592eef03c5f347abeb7730897 SHA512 3e9b29a293b5bfb29283dd650907bfb9f31a1cb99ef908021d3869c3e3ae4051a2c45aab27275e90b0a2fa94c35cc9e170637dc539184d955f3f13dc09cba060
+EBUILD pecl-apcu-4.0.11.ebuild 1453 BLAKE2B 3d0e75d3dbe866f5e10dc464fb5a54a67ed79656ef9d97d62052da4670be39d91122fb2b1da4e6629c26b7aff71585e683e3fccddf59d77afda21d47eaea2c8b SHA512 b0fb1cdceb8e2c48b459309c6e98a1fb16faa48e1228bc0bfbe5c01cee0b038121ffae8a094cdc030fd1bc94624d4602e6abcb5b99dd6a2109024856446571b1
+EBUILD pecl-apcu-5.1.10.ebuild 1980 BLAKE2B 5370b05a1172cf5ea96dc526029890c003fc802c762924063155bd4458d7273773599171e28908e69c99bcfcb3d19611df15ac8caabf26f4f20b4b6ab27e8a20 SHA512 eda7e2586c04f39c4a6217b344d97110e3a8371f43b5b06b70845b89564e6b948e7ead601c523a43d2bda8b8670bc61cf0b9b29de1e89d1cc497df349b5d6c61
+EBUILD pecl-apcu-5.1.11.ebuild 1980 BLAKE2B 5370b05a1172cf5ea96dc526029890c003fc802c762924063155bd4458d7273773599171e28908e69c99bcfcb3d19611df15ac8caabf26f4f20b4b6ab27e8a20 SHA512 eda7e2586c04f39c4a6217b344d97110e3a8371f43b5b06b70845b89564e6b948e7ead601c523a43d2bda8b8670bc61cf0b9b29de1e89d1cc497df349b5d6c61
+EBUILD pecl-apcu-5.1.8.ebuild 1860 BLAKE2B f13dd25e9afa2054bd3474d72f326f815384befe594b9bec7803021bbe4c67fc9501e9b23760b08a22d29654a3b34a6c76120ebe5baf27cb22814bef8b7425c4 SHA512 f086a6e970a87a65658064feecbe42b30c3e1bb6c01effb0cd890ced791df3228b8143374957e94c970899a7d7fffaf3abe818816de8f29b4398fbc23002be9b
+EBUILD pecl-apcu-5.1.9.ebuild 1980 BLAKE2B 5370b05a1172cf5ea96dc526029890c003fc802c762924063155bd4458d7273773599171e28908e69c99bcfcb3d19611df15ac8caabf26f4f20b4b6ab27e8a20 SHA512 eda7e2586c04f39c4a6217b344d97110e3a8371f43b5b06b70845b89564e6b948e7ead601c523a43d2bda8b8670bc61cf0b9b29de1e89d1cc497df349b5d6c61
+MISC metadata.xml 540 BLAKE2B 87b95a306509825ceb5c27c471c496692da1efaf9fc04c357d9aa47c458db302456884401b077cd040bc70a6540706cc54ac2aa76f7da8a1d3b63b6af8661e5a SHA512 46b3e028a3632c8ebfa89a9e2053bc0bb8893fd0a75ee3f84e1d62daec9be5cadbe1f9fc55bb14931a91cde04ff04c5f7c19b2dcf57551ee08fa3eb64ed88232
diff --git a/dev-php/pecl-apcu/metadata.xml b/dev-php/pecl-apcu/metadata.xml
new file mode 100644
index 000000000000..4d7374447c6f
--- /dev/null
+++ b/dev-php/pecl-apcu/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ <name>PHP</name>
+ </maintainer>
+ <use>
+ <flag name="lock_semaphore">Enable semaphore locks instead of fcntl</flag>
+ <flag name="lock_pthreadmutex">Enable pthread mutex locking</flag>
+ <flag name="lock_pthreadrw">Enable pthread read/write locking</flag>
+ <flag name="lock_spinlock">Enable spin locks (EXPERIMENTAL)</flag>
+ </use>
+</pkgmetadata>
diff --git a/dev-php/pecl-apcu/pecl-apcu-4.0.11.ebuild b/dev-php/pecl-apcu/pecl-apcu-4.0.11.ebuild
new file mode 100644
index 000000000000..9f7340d3f2ae
--- /dev/null
+++ b/dev-php/pecl-apcu/pecl-apcu-4.0.11.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PHP_EXT_NAME="apcu"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+DOCS=( NOTICE README.md TECHNOTES.txt TODO )
+
+USE_PHP="php5-6 php7-0 php7-1"
+
+inherit php-ext-pecl-r3
+
+USE_PHP="php5-6"
+
+KEYWORDS="amd64 x86"
+
+DESCRIPTION="Stripped down version of APC supporting only user cache"
+LICENSE="PHP-3.01"
+SLOT="0"
+IUSE="+mmap"
+
+DEPEND=""
+PDEPEND="
+php_targets_php7-0? ( dev-php/pecl-apcu:7[php_targets_php7-0] )
+php_targets_php7-1? ( dev-php/pecl-apcu:7[php_targets_php7-1] )
+"
+
+LOCKS="pthreadmutex pthreadrw spinlock semaphore"
+
+LUSE=""
+for l in ${LOCKS}; do
+ LUSE+="lock_${l} "
+done
+
+IUSE+=" ${LUSE/lock_pthreadrw/+lock_pthreadrw}"
+
+REQUIRED_USE="^^ ( $LUSE )"
+
+src_prepare() {
+ if use php_targets_php5-6 ; then
+ php-ext-source-r3_src_prepare
+ else
+ eapply_user
+ fi
+}
+
+src_configure() {
+ if use php_targets_php5-6 ; then
+ local PHP_EXT_ECONF_ARGS=(
+ --enable-apcu
+ $(use_enable mmap apcu-mmap)
+ $(use_enable lock_pthreadrw apcu-rwlocks)
+ $(use_enable lock_spinlock apcu-spinlocks)
+ )
+
+ php-ext-source-r3_src_configure
+ fi
+}
+
+src_install() {
+ if use php_targets_php5-6 ; then
+ php-ext-pecl-r3_src_install
+
+ insinto "${PHP_EXT_SHARED_DIR}"
+ doins apc.php
+ fi
+}
+
+pkg_postinst() {
+ if use php_targets_php5-6 ; then
+ elog "The apc.php file shipped with this release of pecl-apcu was"
+ elog "installed into ${PHP_EXT_SHARED_DIR}."
+ fi
+}
diff --git a/dev-php/pecl-apcu/pecl-apcu-5.1.10.ebuild b/dev-php/pecl-apcu/pecl-apcu-5.1.10.ebuild
new file mode 100644
index 000000000000..d78f6c0b3188
--- /dev/null
+++ b/dev-php/pecl-apcu/pecl-apcu-5.1.10.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PHP_EXT_NAME="apcu"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+DOCS=( NOTICE README.md TECHNOTES.txt TODO )
+
+# Define 5.6 here so we get the USE and REQUIRED_USE from the eclass
+# This allows us to depend on the other slot
+USE_PHP="php5-6 php7-0 php7-1 php7-2"
+
+inherit php-ext-pecl-r3
+
+# However, we only really build for 7.x; so redefine it here
+USE_PHP="php7-0 php7-1 php7-2"
+
+KEYWORDS="~amd64 ~x86"
+
+DESCRIPTION="Stripped down version of APC supporting only user cache"
+LICENSE="PHP-3.01"
+SLOT="7"
+IUSE="+mmap"
+
+DEPEND=""
+RDEPEND="${DEPEND} php_targets_php5-6? ( dev-php/pecl-apcu:0[php_targets_php5-6] )"
+
+LOCKS="pthreadmutex pthreadrw spinlock semaphore"
+
+LUSE=""
+for l in ${LOCKS}; do
+ LUSE+="lock_${l} "
+done
+
+IUSE+=" ${LUSE/lock_pthreadrw/+lock_pthreadrw}"
+
+REQUIRED_USE="^^ ( $LUSE )"
+
+src_prepare() {
+ if use php_targets_php7-0 || use php_targets_php7-1 || use php_targets_php7-2 ; then
+ php-ext-source-r3_src_prepare
+ else
+ eapply_user
+ fi
+}
+
+src_configure() {
+ if use php_targets_php7-0 || use php_targets_php7-1 || use php_targets_php7-2 ; then
+ local PHP_EXT_ECONF_ARGS=(
+ --enable-apcu
+ $(use_enable mmap apcu-mmap)
+ $(use_enable lock_pthreadrw apcu-rwlocks)
+ $(use_enable lock_spinlock apcu-spinlocks)
+ )
+
+ php-ext-source-r3_src_configure
+ fi
+}
+
+src_install() {
+ if use php_targets_php7-0 || use php_targets_php7-1 || use php_targets_php7-2 ; then
+ php-ext-pecl-r3_src_install
+
+ insinto /usr/share/php7/apcu
+ doins apc.php
+ fi
+}
+
+pkg_postinst() {
+ if use php_targets_php7-0 || use php_targets_php7-1 || use php_targets_php7-2 ; then
+ elog "The apc.php file shipped with this release of pecl-apcu was"
+ elog "installed into ${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."
+ fi
+}
diff --git a/dev-php/pecl-apcu/pecl-apcu-5.1.11.ebuild b/dev-php/pecl-apcu/pecl-apcu-5.1.11.ebuild
new file mode 100644
index 000000000000..d78f6c0b3188
--- /dev/null
+++ b/dev-php/pecl-apcu/pecl-apcu-5.1.11.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PHP_EXT_NAME="apcu"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+DOCS=( NOTICE README.md TECHNOTES.txt TODO )
+
+# Define 5.6 here so we get the USE and REQUIRED_USE from the eclass
+# This allows us to depend on the other slot
+USE_PHP="php5-6 php7-0 php7-1 php7-2"
+
+inherit php-ext-pecl-r3
+
+# However, we only really build for 7.x; so redefine it here
+USE_PHP="php7-0 php7-1 php7-2"
+
+KEYWORDS="~amd64 ~x86"
+
+DESCRIPTION="Stripped down version of APC supporting only user cache"
+LICENSE="PHP-3.01"
+SLOT="7"
+IUSE="+mmap"
+
+DEPEND=""
+RDEPEND="${DEPEND} php_targets_php5-6? ( dev-php/pecl-apcu:0[php_targets_php5-6] )"
+
+LOCKS="pthreadmutex pthreadrw spinlock semaphore"
+
+LUSE=""
+for l in ${LOCKS}; do
+ LUSE+="lock_${l} "
+done
+
+IUSE+=" ${LUSE/lock_pthreadrw/+lock_pthreadrw}"
+
+REQUIRED_USE="^^ ( $LUSE )"
+
+src_prepare() {
+ if use php_targets_php7-0 || use php_targets_php7-1 || use php_targets_php7-2 ; then
+ php-ext-source-r3_src_prepare
+ else
+ eapply_user
+ fi
+}
+
+src_configure() {
+ if use php_targets_php7-0 || use php_targets_php7-1 || use php_targets_php7-2 ; then
+ local PHP_EXT_ECONF_ARGS=(
+ --enable-apcu
+ $(use_enable mmap apcu-mmap)
+ $(use_enable lock_pthreadrw apcu-rwlocks)
+ $(use_enable lock_spinlock apcu-spinlocks)
+ )
+
+ php-ext-source-r3_src_configure
+ fi
+}
+
+src_install() {
+ if use php_targets_php7-0 || use php_targets_php7-1 || use php_targets_php7-2 ; then
+ php-ext-pecl-r3_src_install
+
+ insinto /usr/share/php7/apcu
+ doins apc.php
+ fi
+}
+
+pkg_postinst() {
+ if use php_targets_php7-0 || use php_targets_php7-1 || use php_targets_php7-2 ; then
+ elog "The apc.php file shipped with this release of pecl-apcu was"
+ elog "installed into ${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."
+ fi
+}
diff --git a/dev-php/pecl-apcu/pecl-apcu-5.1.8.ebuild b/dev-php/pecl-apcu/pecl-apcu-5.1.8.ebuild
new file mode 100644
index 000000000000..a0dd81ab461b
--- /dev/null
+++ b/dev-php/pecl-apcu/pecl-apcu-5.1.8.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PHP_EXT_NAME="apcu"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+DOCS=( NOTICE README.md TECHNOTES.txt TODO )
+
+# Define 5.6 here so we get the USE and REQUIRED_USE from the eclass
+# This allows us to depend on the other slot
+USE_PHP="php5-6 php7-0 php7-1"
+
+inherit php-ext-pecl-r3
+
+# However, we only really build for 7.x; so redefine it here
+USE_PHP="php7-0 php7-1"
+
+KEYWORDS="amd64 x86"
+
+DESCRIPTION="Stripped down version of APC supporting only user cache"
+LICENSE="PHP-3.01"
+SLOT="7"
+IUSE="+mmap"
+
+DEPEND=""
+RDEPEND="${DEPEND} php_targets_php5-6? ( dev-php/pecl-apcu:0[php_targets_php5-6] )"
+
+LOCKS="pthreadmutex pthreadrw spinlock semaphore"
+
+LUSE=""
+for l in ${LOCKS}; do
+ LUSE+="lock_${l} "
+done
+
+IUSE+=" ${LUSE/lock_pthreadrw/+lock_pthreadrw}"
+
+REQUIRED_USE="^^ ( $LUSE )"
+
+src_prepare() {
+ if use php_targets_php7-0 || use php_targets_php7-1 ; then
+ php-ext-source-r3_src_prepare
+ else
+ eapply_user
+ fi
+}
+
+src_configure() {
+ if use php_targets_php7-0 || use php_targets_php7-1 ; then
+ local PHP_EXT_ECONF_ARGS=(
+ --enable-apcu
+ $(use_enable mmap apcu-mmap)
+ $(use_enable lock_pthreadrw apcu-rwlocks)
+ $(use_enable lock_spinlock apcu-spinlocks)
+ )
+
+ php-ext-source-r3_src_configure
+ fi
+}
+
+src_install() {
+ if use php_targets_php7-0 || use php_targets_php7-1 ; then
+ php-ext-pecl-r3_src_install
+
+ insinto /usr/share/php7/apcu
+ doins apc.php
+ fi
+}
+
+pkg_postinst() {
+ if use php_targets_php7-0 || use php_targets_php7-1 ; then
+ elog "The apc.php file shipped with this release of pecl-apcu was"
+ elog "installed into ${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."
+ fi
+}
diff --git a/dev-php/pecl-apcu/pecl-apcu-5.1.9.ebuild b/dev-php/pecl-apcu/pecl-apcu-5.1.9.ebuild
new file mode 100644
index 000000000000..d78f6c0b3188
--- /dev/null
+++ b/dev-php/pecl-apcu/pecl-apcu-5.1.9.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PHP_EXT_NAME="apcu"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+DOCS=( NOTICE README.md TECHNOTES.txt TODO )
+
+# Define 5.6 here so we get the USE and REQUIRED_USE from the eclass
+# This allows us to depend on the other slot
+USE_PHP="php5-6 php7-0 php7-1 php7-2"
+
+inherit php-ext-pecl-r3
+
+# However, we only really build for 7.x; so redefine it here
+USE_PHP="php7-0 php7-1 php7-2"
+
+KEYWORDS="~amd64 ~x86"
+
+DESCRIPTION="Stripped down version of APC supporting only user cache"
+LICENSE="PHP-3.01"
+SLOT="7"
+IUSE="+mmap"
+
+DEPEND=""
+RDEPEND="${DEPEND} php_targets_php5-6? ( dev-php/pecl-apcu:0[php_targets_php5-6] )"
+
+LOCKS="pthreadmutex pthreadrw spinlock semaphore"
+
+LUSE=""
+for l in ${LOCKS}; do
+ LUSE+="lock_${l} "
+done
+
+IUSE+=" ${LUSE/lock_pthreadrw/+lock_pthreadrw}"
+
+REQUIRED_USE="^^ ( $LUSE )"
+
+src_prepare() {
+ if use php_targets_php7-0 || use php_targets_php7-1 || use php_targets_php7-2 ; then
+ php-ext-source-r3_src_prepare
+ else
+ eapply_user
+ fi
+}
+
+src_configure() {
+ if use php_targets_php7-0 || use php_targets_php7-1 || use php_targets_php7-2 ; then
+ local PHP_EXT_ECONF_ARGS=(
+ --enable-apcu
+ $(use_enable mmap apcu-mmap)
+ $(use_enable lock_pthreadrw apcu-rwlocks)
+ $(use_enable lock_spinlock apcu-spinlocks)
+ )
+
+ php-ext-source-r3_src_configure
+ fi
+}
+
+src_install() {
+ if use php_targets_php7-0 || use php_targets_php7-1 || use php_targets_php7-2 ; then
+ php-ext-pecl-r3_src_install
+
+ insinto /usr/share/php7/apcu
+ doins apc.php
+ fi
+}
+
+pkg_postinst() {
+ if use php_targets_php7-0 || use php_targets_php7-1 || use php_targets_php7-2 ; then
+ elog "The apc.php file shipped with this release of pecl-apcu was"
+ elog "installed into ${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."
+ fi
+}
diff --git a/dev-php/pecl-apcu_bc-1.0.3-r1 b/dev-php/pecl-apcu_bc-1.0.3-r1
deleted file mode 100644
index b0370b9c6a3b..000000000000
--- a/dev-php/pecl-apcu_bc-1.0.3-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-php/pecl-apcu:7[php_targets_php7-0?,php_targets_php7-1?] >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 )
-DESCRIPTION=Provides APC backwards compatibility functions via APCu
-EAPI=6
-HOMEPAGE=https://pecl.php.net/apcu_bc
-IUSE=php_targets_php7-0 php_targets_php7-1
-KEYWORDS=amd64 x86
-LICENSE=PHP-3.01
-RDEPEND=dev-php/pecl-apcu:7[php_targets_php7-0?,php_targets_php7-1?] php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 )
-REQUIRED_USE=|| ( php_targets_php7-0 php_targets_php7-1 )
-SLOT=0
-SRC_URI=https://pecl.php.net/get/apcu_bc-1.0.3.tgz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e php-ext-pecl-r3 a59741d3df8ea9f17afcdcfb7edaee6d php-ext-source-r3 63b281041baa106ff1ef59b602ca7e2a toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=1d80e8dfcddfed2d53d11750a69833cd
diff --git a/dev-php/pecl-apcu_bc-1.0.4 b/dev-php/pecl-apcu_bc-1.0.4
deleted file mode 100644
index b21f461c17a0..000000000000
--- a/dev-php/pecl-apcu_bc-1.0.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-php/pecl-apcu:7[php_targets_php7-0?,php_targets_php7-1?,php_targets_php7-2?] >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 )
-DESCRIPTION=Provides APC backwards compatibility functions via APCu
-EAPI=6
-HOMEPAGE=https://pecl.php.net/apcu_bc
-IUSE=php_targets_php7-0 php_targets_php7-1 php_targets_php7-2
-KEYWORDS=~amd64 ~x86
-LICENSE=PHP-3.01
-RDEPEND=dev-php/pecl-apcu:7[php_targets_php7-0?,php_targets_php7-1?,php_targets_php7-2?] php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 )
-REQUIRED_USE=|| ( php_targets_php7-0 php_targets_php7-1 php_targets_php7-2 )
-SLOT=0
-SRC_URI=https://pecl.php.net/get/apcu_bc-1.0.4.tgz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e php-ext-pecl-r3 a59741d3df8ea9f17afcdcfb7edaee6d php-ext-source-r3 63b281041baa106ff1ef59b602ca7e2a toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=44a10f36382e3adf278467380d0efd75
diff --git a/dev-php/pecl-apcu_bc/Manifest b/dev-php/pecl-apcu_bc/Manifest
new file mode 100644
index 000000000000..53020437a2ed
--- /dev/null
+++ b/dev-php/pecl-apcu_bc/Manifest
@@ -0,0 +1,5 @@
+DIST apcu_bc-1.0.3.tgz 7245 BLAKE2B cf3a632568218a3dead69c251aac67a3e1c9c03e0bef0b57184bb1e85c60aadc09dcbcf49f2703869783128949a9aa2f4e5eb660d9ca88f800e85ce0692847b1 SHA512 b1faf811316bbba25354b9b28d5c13c69ae93913b90eb36d1904ef4d9ca35000e1d83f8204ab4500813cb8858feccebb262523f42b3116b85c59c6a796affe67
+DIST apcu_bc-1.0.4.tgz 7406 BLAKE2B c7099f13bfe589c9752fb7fa8454f16094a13d63924ceef614db1fef11d37265673e745383241836685dcabca8ae83af3c71ba2f2d8a77b4ab213db209924f12 SHA512 633ae74c4be3ee0c2c98540f696dc440f3f345c52811e856cb46c65c6b6fa8fa9f06ecb1d784cd990cf8b5219b65e14a29b97e57828dc6e7aa6b91d2475e6a0e
+EBUILD pecl-apcu_bc-1.0.3-r1.ebuild 738 BLAKE2B 3a84093f3a30dc29947a13c78a2e8a0f05817789ae4f4ce57aaf86ad0f56d149613276168918d7c1ea2d85b5ce1283e7964243c3afa7b0cc6a1847a751c44030 SHA512 c82072c2bf7f501479cc92d379bcb53ed83e99b1da929feb1ca8a15455a01c3b48dd48f778641f091c76f13f12fe92c85a14175332f5e9a0a263a7ceb499f9fc
+EBUILD pecl-apcu_bc-1.0.4.ebuild 537 BLAKE2B a43ad349a6771bd5a295ef00fea28eeb4aea43627697b6e965f8a5cd9f5513efd298342ba98b90e515a5c0666d4a647e01316a8d2aa1c47edd1d141ee32ab6b7 SHA512 caf27a7b5a273f2058672aebce00a5b7214f8cd1914615a9cda0c905970738869ac20d4ead57619cbe19dbfda40ebf8bfe8595a34b92b57d34782e4f47433251
+MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/pecl-apcu_bc/metadata.xml b/dev-php/pecl-apcu_bc/metadata.xml
new file mode 100644
index 000000000000..b86acf66c756
--- /dev/null
+++ b/dev-php/pecl-apcu_bc/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ <name>PHP</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/dev-php/pecl-apcu_bc/pecl-apcu_bc-1.0.3-r1.ebuild b/dev-php/pecl-apcu_bc/pecl-apcu_bc-1.0.3-r1.ebuild
new file mode 100644
index 000000000000..4cc807e6da9b
--- /dev/null
+++ b/dev-php/pecl-apcu_bc/pecl-apcu_bc-1.0.3-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PHP_EXT_NAME="bc_apc"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+PHP_EXT_EXTRA_ECONF=""
+DOCS=( README.md )
+
+USE_PHP="php7-0 php7-1"
+
+inherit php-ext-pecl-r3
+
+KEYWORDS="amd64 x86"
+
+DESCRIPTION="Provides APC backwards compatibility functions via APCu"
+LICENSE="PHP-3.01"
+SLOT="0"
+IUSE=""
+
+DEPEND="dev-php/pecl-apcu:7[php_targets_php7-0?,php_targets_php7-1?]"
+RDEPEND="${DEPEND}"
+
+src_install() {
+ # Rename the apc.so to match the ini file loading requirement
+ local slot
+ for slot in $(php_get_slots); do
+ php_init_slot_env ${slot}
+ mv "modules/apc.so" "modules/${PHP_EXT_NAME}.so" || die
+ done
+ php-ext-pecl-r3_src_install
+}
diff --git a/dev-php/pecl-apcu_bc/pecl-apcu_bc-1.0.4.ebuild b/dev-php/pecl-apcu_bc/pecl-apcu_bc-1.0.4.ebuild
new file mode 100644
index 000000000000..6cb699b96c74
--- /dev/null
+++ b/dev-php/pecl-apcu_bc/pecl-apcu_bc-1.0.4.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PHP_INI_NAME="bc_apc"
+PHP_EXT_NAME="apc"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+PHP_EXT_EXTRA_ECONF=""
+DOCS=( README.md )
+
+USE_PHP="php7-0 php7-1 php7-2"
+
+inherit php-ext-pecl-r3
+
+KEYWORDS="~amd64 ~x86"
+
+DESCRIPTION="Provides APC backwards compatibility functions via APCu"
+LICENSE="PHP-3.01"
+SLOT="0"
+IUSE=""
+
+DEPEND="dev-php/pecl-apcu:7[php_targets_php7-0?,php_targets_php7-1?,php_targets_php7-2?]"
+RDEPEND="${DEPEND}"
diff --git a/dev-php/pecl-bbcode-1.0.3_beta1-r2 b/dev-php/pecl-bbcode-1.0.3_beta1-r2
deleted file mode 100644
index f9ff4ec6c4ca..000000000000
--- a/dev-php/pecl-bbcode-1.0.3_beta1-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php5-6? ( dev-lang/php:5.6 )
-DESCRIPTION=A quick and efficient BBCode Parsing Library
-EAPI=6
-HOMEPAGE=http://pecl.php.net/package/bbcode
-IUSE=php_targets_php5-6
-KEYWORDS=~amd64 ~x86
-LICENSE=PHP-3.01 BSD
-RDEPEND=php_targets_php5-6? ( dev-lang/php:5.6 )
-REQUIRED_USE=|| ( php_targets_php5-6 )
-SLOT=0
-SRC_URI=http://pecl.php.net/get/bbcode-1.0.3b1.tgz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e php-ext-pecl-r3 a59741d3df8ea9f17afcdcfb7edaee6d php-ext-source-r3 63b281041baa106ff1ef59b602ca7e2a toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=fa4db8887a9ef6a8226e56b935146346
diff --git a/dev-php/pecl-bbcode/Manifest b/dev-php/pecl-bbcode/Manifest
new file mode 100644
index 000000000000..22483e13d112
--- /dev/null
+++ b/dev-php/pecl-bbcode/Manifest
@@ -0,0 +1,3 @@
+DIST bbcode-1.0.3b1.tgz 47205 BLAKE2B 84552330406fd9ea7aea01ec7473b152e4a418d6847423b0798dc36619a9e8345705f91cda73a36a381c06010a60fb07937f1dd3a9f8b53ae106c32c44ce2886 SHA512 b631beaa062375499fdbf6129c6a7ef8151aa9f2d4e61794c56e48c218abd027b890db7b29a1c768c2d94decdb9a1194277b1da85471014b9cc09597cea7d689
+EBUILD pecl-bbcode-1.0.3_beta1-r2.ebuild 594 BLAKE2B 224416e993275873a294bdc01a45b25bc10bf32ac3f4c88988ee88b3e83673688749b3bd9a1ed308d578f531285f71f8b90a154cbb4aa1438f7fcfba1a28ed9d SHA512 7b0496b40ddcf0075bfc5abb0ec76d01bb13d1ec71ceeedebadf6103af287a266e843bd5d17ec9af8ebe992216248742c681b9bba7ee0b05b2c24ef0e651239d
+MISC metadata.xml 591 BLAKE2B 531553a1250b100c4dd376ec91918c3c310a292b1ea0742b43a95a22f0b5c2fcdcc2ffc311f38e60ab6a1069d30b64319acbb5b164fd9e2bf415622dc75017ba SHA512 da06058cdb7fdb18cd09f42a63e3dc9abc3c6e6dd810bc1e4715e64bc06ebe79bfe2c4711b5e8a675f98e22c1f60b2489ff95d7922f9290ccd085c54f8b369c1
diff --git a/dev-php/pecl-bbcode/metadata.xml b/dev-php/pecl-bbcode/metadata.xml
new file mode 100644
index 000000000000..620cd8dbb05a
--- /dev/null
+++ b/dev-php/pecl-bbcode/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ <name>PHP</name>
+</maintainer>
+<longdescription>
+This is a quick and efficient BBCode Parsing Library.It provides various tag types,
+high speed one pass parsing, callback system, tag position restriction.
+It will force closing BBCode tags in the good order, and closing terminating tags
+at the end of the string this is in order to ensure HTML Validity in all cases.
+</longdescription>
+</pkgmetadata>
diff --git a/dev-php/pecl-bbcode/pecl-bbcode-1.0.3_beta1-r2.ebuild b/dev-php/pecl-bbcode/pecl-bbcode-1.0.3_beta1-r2.ebuild
new file mode 100644
index 000000000000..eb71563ac56b
--- /dev/null
+++ b/dev-php/pecl-bbcode/pecl-bbcode-1.0.3_beta1-r2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PHP_EXT_NAME="bbcode"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+DOCS=( TODO )
+
+USE_PHP="php5-6"
+
+MY_PV="${PV/_beta/b}"
+PECL_PKG_V="${PN/pecl-/}-${MY_PV}"
+PHP_EXT_S="${WORKDIR}/${PECL_PKG_V}"
+
+inherit php-ext-pecl-r3
+
+KEYWORDS="~amd64 ~x86"
+
+SRC_URI="http://pecl.php.net/get/${PECL_PKG_V}.tgz"
+HOMEPAGE="http://pecl.php.net/package/bbcode"
+
+DESCRIPTION="A quick and efficient BBCode Parsing Library"
+LICENSE="PHP-3.01 BSD"
+SLOT="0"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+S="${PHP_EXT_S}"
diff --git a/dev-php/pecl-cairo-0.3.2-r1 b/dev-php/pecl-cairo-0.3.2-r1
deleted file mode 100644
index 9a28d1a7154e..000000000000
--- a/dev-php/pecl-cairo-0.3.2-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=x11-libs/cairo-1.4[svg] >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php5-6? ( dev-lang/php:5.6 )
-DESCRIPTION=Cairo bindings for PHP
-EAPI=6
-HOMEPAGE=https://pecl.php.net/cairo
-IUSE=php_targets_php5-6
-KEYWORDS=~amd64 ~x86
-LICENSE=PHP-3.01
-RDEPEND=>=x11-libs/cairo-1.4[svg] php_targets_php5-6? ( dev-lang/php:5.6 )
-REQUIRED_USE=|| ( php_targets_php5-6 )
-SLOT=0
-SRC_URI=https://pecl.php.net/get/cairo-0.3.2.tgz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e php-ext-pecl-r3 a59741d3df8ea9f17afcdcfb7edaee6d php-ext-source-r3 63b281041baa106ff1ef59b602ca7e2a toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=f0151842677b14562272e2843503cabe
diff --git a/dev-php/pecl-cairo/Manifest b/dev-php/pecl-cairo/Manifest
new file mode 100644
index 000000000000..6273eedbbae3
--- /dev/null
+++ b/dev-php/pecl-cairo/Manifest
@@ -0,0 +1,3 @@
+DIST cairo-0.3.2.tgz 173203 BLAKE2B 4e7f0d7ed5f161efa89b527d432127589fef2c0cf943cc523c074c09bb4fa2ecf3180619ba7f7c5a4df24df933ea7822a100315e493bda77e4964f643a46f497 SHA512 def7cb67d84349317daad8c6aa8747d7dfe66159df0d72d50e528577288859cbfb6afa982888983bd41ce7ba5267c40a38ce48b56a0d33ac56e1805485391d7a
+EBUILD pecl-cairo-0.3.2-r1.ebuild 384 BLAKE2B 41b68a2464a275f26b6bf08a70bbef38a852d283efeac8e2d76e9f52d8f51e12ea1b62e48a9bdd410874b552a984b99211d3afcc793778d3b8528a6d668bdf0f SHA512 6ad04a89612cf2f495322279a82e256c32240756372a4e39b9f30a23b2e3b6c0d17885097ba04d5b195a8936d9d733958381d58ecada3eb361e0b3b20a6e340c
+MISC metadata.xml 473 BLAKE2B 29e0d4217f282f59cb058d846989cfaececf4f7937f6b2437897a235bee6bd430e81367b4cfbb7a01b8f193387c344a19cbbfc1358eebb0ded91a5c012de1fbc SHA512 2d17569b9e975d4834f8ed9a61244ba32c482caa8f04d7d3eb6f6f913a46323f6e0cc858bfe536fa8de4031a0d66f9aac185763e789f3bfa6ac8360a87489c42
diff --git a/dev-php/pecl-cairo/metadata.xml b/dev-php/pecl-cairo/metadata.xml
new file mode 100644
index 000000000000..443b1587ff67
--- /dev/null
+++ b/dev-php/pecl-cairo/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ <name>PHP</name>
+ </maintainer>
+ <longdescription lang="en">The Cairo PHP Extension aims to provide support
+ for all officially supported font backends and surface backends, as well
+ as expose all available functionality in cairo to PHP users.
+ </longdescription>
+</pkgmetadata>
diff --git a/dev-php/pecl-cairo/pecl-cairo-0.3.2-r1.ebuild b/dev-php/pecl-cairo/pecl-cairo-0.3.2-r1.ebuild
new file mode 100644
index 000000000000..b213896dba61
--- /dev/null
+++ b/dev-php/pecl-cairo/pecl-cairo-0.3.2-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+DOCS=( TODO )
+
+USE_PHP="php5-6"
+
+PHP_EXT_S="${WORKDIR}/Cairo-${PV}"
+
+inherit php-ext-pecl-r3
+
+KEYWORDS="~amd64 ~x86"
+
+DESCRIPTION="Cairo bindings for PHP"
+LICENSE="PHP-3.01"
+SLOT="0"
+
+DEPEND=">=x11-libs/cairo-1.4[svg]"
+RDEPEND="${DEPEND}"
+
+IUSE=""
+
+S="${PHP_EXT_S}"
diff --git a/dev-php/pecl-cassandra-1.3.2 b/dev-php/pecl-cassandra-1.3.2
deleted file mode 100644
index 1438e611c38a..000000000000
--- a/dev-php/pecl-cassandra-1.3.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-db/cpp-driver-2.7.0 >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 )
-DESCRIPTION=DataStax PHP Driver for Apache Cassandra
-EAPI=6
-HOMEPAGE=https://github.com/datastax/php-driver
-IUSE=php_targets_php5-6 php_targets_php7-0 php_targets_php7-1
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-db/cpp-driver-2.7.0 php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 )
-REQUIRED_USE=|| ( php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 )
-SLOT=0
-SRC_URI=https://pecl.php.net/get/cassandra-1.3.2.tgz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e php-ext-pecl-r3 a59741d3df8ea9f17afcdcfb7edaee6d php-ext-source-r3 63b281041baa106ff1ef59b602ca7e2a toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=53439d9abc8a8a6022915d282fb396e8
diff --git a/dev-php/pecl-cassandra/Manifest b/dev-php/pecl-cassandra/Manifest
new file mode 100644
index 000000000000..7901d4f1ef0e
--- /dev/null
+++ b/dev-php/pecl-cassandra/Manifest
@@ -0,0 +1,3 @@
+DIST cassandra-1.3.2.tgz 163700 BLAKE2B 00de93b4d8725e2a5ebf4194b38c7775b7845fddb751ccb831f7ae98c397344492f9a085480b4f76a987b4f3dc23ac2431d464eaf6bc3c45d819f087130cdada SHA512 2b3605f24e81b247afa5ea6bb8e1d1c24216a281babfbd750b973fb2094c864a3d45c7769c759bfe2f3f31360766a5b2eb1ff0ee4414ec9a9e9c5f164748242a
+EBUILD pecl-cassandra-1.3.2.ebuild 396 BLAKE2B 9f6c7c58f97fb6ccb2eebaeec261bb7934bfc83ba78f19d678d565591b544802eb892d28fb9c40f879d5ab321891d47454ef3a3f7235c26542834bfd8457d771 SHA512 a0f2bd06a44b4a96a1ffba34be28545df95628888d0c05e78a26f5e31de8e93d5aa99c72bf9e6617e6d8d8160fad6f896b7312be464ae182541260f080b0cadf
+MISC metadata.xml 541 BLAKE2B c8154262ccb25ad23009cb6b21dc28d4c51bd0b7d90a81ec19b9472d568b4360d4bd97fed5b9d42ed44eddc322a999716508c164715f0b6163291e6d39ae520d SHA512 8d9a8b0ab84c8f8557dcdc46b94b22074492ceaf6ce61daf80eb5470cd58088838f78d1a54f0d5c5dc88802e9cd8e483235a27a7ddcf419e2b6ebabd3c39ffa9
diff --git a/dev-php/pecl-cassandra/metadata.xml b/dev-php/pecl-cassandra/metadata.xml
new file mode 100644
index 000000000000..4fff0a94977f
--- /dev/null
+++ b/dev-php/pecl-cassandra/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <longdescription lang="en">
+ DataStax PHP driver for Apache Cassandra or Scilla
+ </longdescription>
+ <maintainer type="person">
+ <email>geaaru@gmail.com</email>
+ <name>Geaaru</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">datastax/php-driver</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-php/pecl-cassandra/pecl-cassandra-1.3.2.ebuild b/dev-php/pecl-cassandra/pecl-cassandra-1.3.2.ebuild
new file mode 100644
index 000000000000..96329971cded
--- /dev/null
+++ b/dev-php/pecl-cassandra/pecl-cassandra-1.3.2.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_PHP="php5-6 php7-0 php7-1"
+
+inherit php-ext-pecl-r3
+
+KEYWORDS="~amd64 ~x86"
+
+DESCRIPTION="DataStax PHP Driver for Apache Cassandra"
+HOMEPAGE="https://github.com/datastax/php-driver"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+DEPEND=">=dev-db/cpp-driver-2.7.0"
+RDEPEND="${DEPEND}"
diff --git a/dev-php/pecl-crack-0.4-r6 b/dev-php/pecl-crack-0.4-r6
deleted file mode 100644
index 8a89f7190fe3..000000000000
--- a/dev-php/pecl-crack-0.4-r6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 )
-DESCRIPTION=PHP interface to the cracklib libraries
-EAPI=6
-HOMEPAGE=https://pecl.php.net/crack
-IUSE=php_targets_php5-6 php_targets_php7-0 php_targets_php7-1
-KEYWORDS=amd64 ppc ppc64 x86
-LICENSE=PHP-3 CRACKLIB
-RDEPEND=php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 )
-REQUIRED_USE=|| ( php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 )
-SLOT=0
-SRC_URI=https://pecl.php.net/get/crack-0.4.tgz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e php-ext-pecl-r3 a59741d3df8ea9f17afcdcfb7edaee6d php-ext-source-r3 63b281041baa106ff1ef59b602ca7e2a toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=8570e4a06d913e492df7c91a06692d94
diff --git a/dev-php/pecl-crack-0.4-r7 b/dev-php/pecl-crack-0.4-r7
deleted file mode 100644
index ce3297c062a4..000000000000
--- a/dev-php/pecl-crack-0.4-r7
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 )
-DESCRIPTION=PHP interface to the cracklib libraries
-EAPI=6
-HOMEPAGE=https://pecl.php.net/crack
-IUSE=php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=PHP-3 CRACKLIB
-RDEPEND=php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 )
-REQUIRED_USE=|| ( php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2 )
-SLOT=0
-SRC_URI=https://pecl.php.net/get/crack-0.4.tgz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e php-ext-pecl-r3 a59741d3df8ea9f17afcdcfb7edaee6d php-ext-source-r3 63b281041baa106ff1ef59b602ca7e2a toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=1e67db36f8d365f8f42097081001fc91
diff --git a/dev-php/pecl-crack/Manifest b/dev-php/pecl-crack/Manifest
new file mode 100644
index 000000000000..4fc3e79aa2fc
--- /dev/null
+++ b/dev-php/pecl-crack/Manifest
@@ -0,0 +1,7 @@
+AUX 0.4-php7.patch 8435 BLAKE2B 11b9d076a684fb1e3e4bef9cd733e7675909282a5e571b3db60fbd9f852273555e3ca7731a13a1811986f529ee52b24e7a9b1bf26a564bc30187241429758e26 SHA512 f164cc8e37e37636de843063426d1ba07be17362d4b0fa0de59e1a9e21a15b7d5a312ed64bd73bcd51db5185a843a05611c23c5f5c442b720f437347f0401649
+AUX fix-pecl-bug-5765.patch 375 BLAKE2B 6664659603006d260b578fc1169465007a600eb1b5ba4551339fc87488c7f94ac1ca49ebc829895ef2e6673fccbae2881e6f06a6cce4dfaa39db1350f2f4f0c6 SHA512 21f7d76242c630334e88c8bf1f6e4fe9718943c36c6886f8de6503c9c616beab7007e31127b40b1df66763893d692a65f20483addb1607e0cfc7ec7b92ff4500
+AUX fix-php-5-4-support.patch 674 BLAKE2B 5b2ce7a76aca15d6ff626ebced6e8844bac3d1fb959903c9882e1e59bdfc06027c6993431552deceb09df8d35e57e338818fa9b5ac11b31d4484369d3bd9d1e3 SHA512 ca2475557dc1d2f23a1e5745e7f3bac70855d0916a9d37d1a7efcd04e3bb973220b87aa2cc7ba8315473a2fd16dfd142c5c01608e94c595541ff15838c1e1d44
+DIST crack-0.4.tgz 25524 BLAKE2B 99e2289413a672d4dc3d8f9d70866efb499902a0d27379ac7b59d2873013c918d535851d8c3dbf2592596d6483f2abafe2f7bbd31fff40ce9827c7a97e16b8bc SHA512 0dec64d1ce859bb3d7e2b834e4bcc4ef8c6f3e88e5b61884e40dddc366a992a7c85bfad4227224d4401aad7f26843678709f29acd2dcc75563658040b8067d7f
+EBUILD pecl-crack-0.4-r6.ebuild 581 BLAKE2B 04f52129dce7e4ec373a17fd4a68b256981743d568723f428dbae41883e511ca8adad3dfd155ebd3f56feb04162b8cecde4b9619814a990ab50870be7fc9764e SHA512 7d305dc22b4972335d32906f25582b35bedaef94b0b9b53d69683f41f5f9c4011b6c5aa75f23f4f7b1eba5c8f277c77a8fc78b013669a7a96d0922e2bbdc0a27
+EBUILD pecl-crack-0.4-r7.ebuild 592 BLAKE2B 961042f4d06b5e05493fde80a8041d298a2f0430ee626606ea5c5d4013ef9726e38edb156e95ebb3e9e97686922e9c4ee3f2f99268e972b0af585a666b7b0798 SHA512 2bc9aa4c712508e712e9cf70f0c574357fdcde19fd16126d8b1c3f917ee7e83db90e7b526463e4a5cc976c16300d8f972d11bb67d482ceff2d8087100d472f8b
+MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/pecl-crack/files/0.4-php7.patch b/dev-php/pecl-crack/files/0.4-php7.patch
new file mode 100644
index 000000000000..5a00c9121810
--- /dev/null
+++ b/dev-php/pecl-crack/files/0.4-php7.patch
@@ -0,0 +1,356 @@
+--- a/crack.c 2016-12-19 16:04:09.244782234 -0500
++++ b/crack.c 2016-12-20 09:20:11.903140742 -0500
+@@ -36,13 +36,31 @@
+ /* True global resources - no need for thread safety here */
+ static int le_crack;
+
++ZEND_BEGIN_ARG_INFO_EX(crack_opendict_args, 0, ZEND_RETURN_VALUE, 1)
++ ZEND_ARG_INFO(0, dictionary)
++ZEND_END_ARG_INFO()
++
++ZEND_BEGIN_ARG_INFO_EX(crack_closedict_args, 0, ZEND_RETURN_VALUE, 0)
++ ZEND_ARG_INFO(0, dictionary)
++ZEND_END_ARG_INFO()
++
++ZEND_BEGIN_ARG_INFO_EX(crack_check_args, 0, ZEND_RETURN_VALUE, 1)
++ ZEND_ARG_INFO(0, password)
++ ZEND_ARG_INFO(0, username)
++ ZEND_ARG_INFO(0, gecos)
++ ZEND_ARG_INFO(0, dictionary)
++ZEND_END_ARG_INFO()
++
++ZEND_BEGIN_ARG_INFO_EX(crack_getlastmessage_args, 0, ZEND_RETURN_VALUE, 0)
++ZEND_END_ARG_INFO()
++
+ /* {{{ crack_functions[]
+ */
+ zend_function_entry crack_functions[] = {
+- PHP_FE(crack_opendict, NULL)
+- PHP_FE(crack_closedict, NULL)
+- PHP_FE(crack_check, NULL)
+- PHP_FE(crack_getlastmessage, NULL)
++ ZEND_FE(crack_opendict, crack_opendict_args)
++ ZEND_FE(crack_closedict, crack_closedict_args)
++ ZEND_FE(crack_check, crack_check_args)
++ ZEND_FE(crack_getlastmessage, crack_getlastmessage_args)
+ {NULL, NULL, NULL}
+ };
+ /* }}} */
+@@ -55,7 +73,7 @@
+ #endif
+ "crack",
+ crack_functions,
+- PHP_MINIT(crack),
++ PHP_MINIT(crack),
+ PHP_MSHUTDOWN(crack),
+ PHP_RINIT(crack),
+ PHP_RSHUTDOWN(crack),
+@@ -84,7 +102,11 @@
+ static void php_crack_init_globals(zend_crack_globals *crack_globals)
+ {
+ crack_globals->last_message = NULL;
++#if PHP_VERSION_ID >= 70000
++ crack_globals->default_dict = NULL;
++#else
+ crack_globals->default_dict = -1;
++#endif
+ }
+ /* }}} */
+
+@@ -95,7 +117,7 @@
+ char *filename;
+ int filename_len;
+ int result = SUCCESS;
+-
++
+ #if PHP_VERSION_ID < 50400
+ if (PG(safe_mode)) {
+ filename_len = strlen(path) + 10;
+@@ -103,7 +125,7 @@
+ if (NULL == filename) {
+ return FAILURE;
+ }
+-
++
+ memset(filename, '\0', filename_len);
+ strcpy(filename, path);
+ strcat(filename, ".pwd");
+@@ -111,7 +133,7 @@
+ efree(filename);
+ return FAILURE;
+ }
+-
++
+ memset(filename, '\0', filename_len);
+ strcpy(filename, path);
+ strcat(filename, ".pwi");
+@@ -119,7 +141,7 @@
+ efree(filename);
+ return FAILURE;
+ }
+-
++
+ memset(filename, '\0', filename_len);
+ strcpy(filename, path);
+ strcat(filename, ".hwm");
+@@ -129,39 +151,64 @@
+ }
+ }
+ #endif
+-
++
+ if (php_check_open_basedir(path TSRMLS_CC)) {
+ return FAILURE;
+ }
+-
++
+ return SUCCESS;
+ }
+ /* }}} */
+
+ /* {{{ php_crack_set_default_dict
+ */
++#if PHP_VERSION_ID >= 70000
++static void php_crack_set_default_dict(zend_resource *id)
++{
++ if (CRACKG(default_dict) != NULL) {
++ zend_list_close(CRACKG(default_dict));
++ }
++
++ CRACKG(default_dict) = id;
++ id->gc.refcount++;
++}
++#else
+ static void php_crack_set_default_dict(int id TSRMLS_DC)
+ {
+ if (CRACKG(default_dict) != -1) {
+ zend_list_delete(CRACKG(default_dict));
+ }
+-
++
+ CRACKG(default_dict) = id;
+ zend_list_addref(id);
+ }
++#endif
+ /* }}} */
+
+ /* {{{ php_crack_get_default_dict
+ */
++#if PHP_VERSION_ID >= 70000
++static zend_resource * php_crack_get_default_dict(INTERNAL_FUNCTION_PARAMETERS)
++#else
+ static int php_crack_get_default_dict(INTERNAL_FUNCTION_PARAMETERS)
++#endif
+ {
++#if PHP_VERSION_ID >= 70000
++ if ((NULL == CRACKG(default_dict)) && (NULL != CRACKG(default_dictionary))) {
++#else
+ if ((-1 == CRACKG(default_dict)) && (NULL != CRACKG(default_dictionary))) {
++#endif
+ CRACKLIB_PWDICT *pwdict;
+ printf("trying to open: %s\n", CRACKG(default_dictionary));
+ pwdict = cracklib_pw_open(CRACKG(default_dictionary), "r");
+ if (NULL != pwdict) {
++#if PHP_VERSION_ID >= 70000
++ ZVAL_RES(return_value, zend_register_resource(pwdict, le_crack));
++ php_crack_set_default_dict(Z_RES_P(return_value));
++#else
+ ZEND_REGISTER_RESOURCE(return_value, pwdict, le_crack);
+ php_crack_set_default_dict(Z_LVAL_P(return_value) TSRMLS_CC);
++#endif
+ }
+ }
+
+@@ -171,7 +218,11 @@
+
+ /* {{{ php_crack_module_dtor
+ */
++#if PHP_VERSION_ID >= 70000
++static void php_crack_module_dtor(zend_resource *rsrc)
++#else
+ static void php_crack_module_dtor(zend_rsrc_list_entry *rsrc TSRMLS_DC)
++#endif
+ {
+ CRACKLIB_PWDICT *pwdict = (CRACKLIB_PWDICT *) rsrc->ptr;
+
+@@ -191,7 +242,9 @@
+
+ REGISTER_INI_ENTRIES();
+ le_crack = zend_register_list_destructors_ex(php_crack_module_dtor, NULL, "crack dictionary", module_number);
++#if PHP_VERSION_ID < 70000
+ Z_TYPE(crack_module_entry) = type;
++#endif
+
+ return SUCCESS;
+ }
+@@ -210,7 +263,11 @@
+ PHP_RINIT_FUNCTION(crack)
+ {
+ CRACKG(last_message) = NULL;
++#if PHP_VERSION_ID >= 70000
++ CRACKG(default_dict) = NULL;
++#else
+ CRACKG(default_dict) = -1;
++#endif
+
+ return SUCCESS;
+ }
+@@ -245,7 +302,7 @@
+ PHP_FUNCTION(crack_opendict)
+ {
+ char *path;
+- int path_len;
++ size_t path_len;
+ CRACKLIB_PWDICT *pwdict;
+
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &path, &path_len) == FAILURE) {
+@@ -265,9 +322,14 @@
+ #endif
+ RETURN_FALSE;
+ }
+-
++
++#if PHP_VERSION_ID >= 70000
++ RETURN_RES(zend_register_resource(pwdict, le_crack));
++ php_crack_set_default_dict(Z_RES_P(return_value));
++#else
+ ZEND_REGISTER_RESOURCE(return_value, pwdict, le_crack);
+ php_crack_set_default_dict(Z_LVAL_P(return_value) TSRMLS_CC);
++#endif
+ }
+ /* }}} */
+
+@@ -276,7 +338,11 @@
+ PHP_FUNCTION(crack_closedict)
+ {
+ zval *dictionary = NULL;
++#if PHP_VERSION_ID >= 70000
++ zend_resource *id;
++#else
+ int id = -1;
++#endif
+ CRACKLIB_PWDICT *pwdict;
+
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|r", &dictionary)) {
+@@ -285,7 +351,11 @@
+
+ if (NULL == dictionary) {
+ id = php_crack_get_default_dict(INTERNAL_FUNCTION_PARAM_PASSTHRU);
++#if PHP_VERSION_ID >= 70000
++ if (id == NULL) {
++#else
+ if (id == -1) {
++#endif
+ #if ZEND_MODULE_API_NO >= 20021010
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not open default crack dicionary");
+ #else
+@@ -294,8 +364,21 @@
+ RETURN_FALSE;
+ }
+ }
++#if PHP_VERSION_ID >= 70000
++ if((pwdict = (CRACKLIB_PWDICT *)zend_fetch_resource(Z_RES_P(dictionary), "crack dictionary", le_crack)) == NULL)
++ {
++ RETURN_FALSE;
++ }
++ if (NULL == dictionary) {
++ zend_list_close(CRACKG(default_dict));
++ CRACKG(default_dict) = NULL;
++ }
++ else {
++ zend_list_close(Z_RES_P(dictionary));
++ }
++#else
+ ZEND_FETCH_RESOURCE(pwdict, CRACKLIB_PWDICT *, &dictionary, id, "crack dictionary", le_crack);
+-
++
+ if (NULL == dictionary) {
+ zend_list_delete(CRACKG(default_dict));
+ CRACKG(default_dict) = -1;
+@@ -303,7 +386,7 @@
+ else {
+ zend_list_delete(Z_RESVAL_P(dictionary));
+ }
+-
++#endif
+ RETURN_TRUE;
+ }
+ /* }}} */
+@@ -314,14 +397,18 @@
+ {
+ zval *dictionary = NULL;
+ char *password = NULL;
+- int password_len;
++ size_t password_len;
+ char *username = NULL;
+- int username_len;
++ size_t username_len;
+ char *gecos = NULL;
+- int gecos_len;
++ size_t gecos_len;
+ char *message;
+ CRACKLIB_PWDICT *pwdict;
++#if PHP_VERSION_ID >= 70000
++ zend_resource *crack_res;
++#else
+ int id = -1;
++#endif
+
+ if (NULL != CRACKG(last_message)) {
+ efree(CRACKG(last_message));
+@@ -335,6 +422,21 @@
+ }
+
+ if (NULL == dictionary) {
++#if PHP_VERSION_ID >= 70000
++ crack_res = php_crack_get_default_dict(INTERNAL_FUNCTION_PARAM_PASSTHRU);
++ if (crack_res == NULL || crack_res->ptr == NULL) {
++ php_error(E_WARNING, "Could not open default crack dicionary");
++ RETURN_FALSE;
++ }
++
++ }
++ else {
++ if((pwdict = (CRACKLIB_PWDICT *)zend_fetch_resource(Z_RES_P(dictionary), "crack dictionary", le_crack)) == NULL) {
++ php_error(E_WARNING, "Could not open crack dicionary resource");
++ RETURN_FALSE;
++ }
++ }
++#else
+ id = php_crack_get_default_dict(INTERNAL_FUNCTION_PARAM_PASSTHRU);
+ if (id == -1) {
+ #if ZEND_MODULE_API_NO >= 20021010
+@@ -346,6 +448,7 @@
+ }
+ }
+ ZEND_FETCH_RESOURCE(pwdict, CRACKLIB_PWDICT *, &dictionary, id, "crack dictionary", le_crack);
++#endif
+
+ message = cracklib_fascist_look_ex(pwdict, password, username, gecos);
+
+@@ -377,7 +480,11 @@
+ RETURN_FALSE;
+ }
+
++#if PHP_VERSION_ID >= 70000
++ RETURN_STRING(CRACKG(last_message));
++#else
+ RETURN_STRING(CRACKG(last_message), 1);
++#endif
+ }
+ /* }}} */
+
+--- a/php_crack.h 2005-09-21 05:00:06.000000000 -0400
++++ b/php_crack.h 2016-12-19 16:51:22.449321851 -0500
+@@ -52,7 +52,11 @@
+ ZEND_BEGIN_MODULE_GLOBALS(crack)
+ char *default_dictionary;
+ char *last_message;
++#if PHP_VERSION_ID >= 70000
++ zend_resource *default_dict;
++#else
+ int default_dict;
++#endif
+ ZEND_END_MODULE_GLOBALS(crack)
+
+ #ifdef ZTS
diff --git a/dev-php/pecl-crack/files/fix-pecl-bug-5765.patch b/dev-php/pecl-crack/files/fix-pecl-bug-5765.patch
new file mode 100644
index 000000000000..c180d5310b1b
--- /dev/null
+++ b/dev-php/pecl-crack/files/fix-pecl-bug-5765.patch
@@ -0,0 +1,11 @@
+--- crack-0.4/libcrack/src/cracklib.h 2005-09-21 11:00:06.000000000 +0200
++++ crack-0.4-new/libcrack/src/cracklib.h 2006-10-08 20:44:00.618783250 +0200
+@@ -46,7 +46,7 @@
+
+ typedef unsigned char int8;
+ typedef unsigned short int int16;
+-typedef unsigned long int int32;
++typedef unsigned int int32;
+
+ #ifndef NUMWORDS
+ # define NUMWORDS 16
diff --git a/dev-php/pecl-crack/files/fix-php-5-4-support.patch b/dev-php/pecl-crack/files/fix-php-5-4-support.patch
new file mode 100644
index 000000000000..7fddadfabbbd
--- /dev/null
+++ b/dev-php/pecl-crack/files/fix-php-5-4-support.patch
@@ -0,0 +1,30 @@
+Gentoo bug: 423869
+Thanks to hanno
+
+--- a/crack.c 2008/07/17 10:02:47 262854
++++ b/crack.c 2012/06/07 16:13:34 326013
+@@ -38,7 +38,7 @@
+
+ /* {{{ crack_functions[]
+ */
+-function_entry crack_functions[] = {
++zend_function_entry crack_functions[] = {
+ PHP_FE(crack_opendict, NULL)
+ PHP_FE(crack_closedict, NULL)
+ PHP_FE(crack_check, NULL)
+@@ -94,6 +94,7 @@
+ int filename_len;
+ int result = SUCCESS;
+
++#if PHP_VERSION_ID < 50400
+ if (PG(safe_mode)) {
+ filename_len = strlen(path) + 10;
+ filename = (char *) emalloc(filename_len);
+@@ -125,6 +126,7 @@
+ return FAILURE;
+ }
+ }
++#endif
+
+ if (php_check_open_basedir(path TSRMLS_CC)) {
+ return FAILURE;
diff --git a/dev-php/pecl-crack/metadata.xml b/dev-php/pecl-crack/metadata.xml
new file mode 100644
index 000000000000..b86acf66c756
--- /dev/null
+++ b/dev-php/pecl-crack/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ <name>PHP</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/dev-php/pecl-crack/pecl-crack-0.4-r6.ebuild b/dev-php/pecl-crack/pecl-crack-0.4-r6.ebuild
new file mode 100644
index 000000000000..dcda4876842a
--- /dev/null
+++ b/dev-php/pecl-crack/pecl-crack-0.4-r6.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PHP_EXT_NAME="crack"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+PHP_EXT_EXTRA_ECONF=""
+DOCS=( EXPERIMENTAL )
+
+USE_PHP="php5-6 php7-0 php7-1"
+
+inherit php-ext-pecl-r3
+
+KEYWORDS="amd64 ppc ppc64 x86"
+
+DESCRIPTION="PHP interface to the cracklib libraries"
+LICENSE="PHP-3 CRACKLIB"
+SLOT="0"
+IUSE=""
+# Patch for http://pecl.php.net/bugs/bug.php?id=5765
+PATCHES=( "${FILESDIR}/fix-php-5-4-support.patch"
+"${FILESDIR}/fix-pecl-bug-5765.patch"
+"${FILESDIR}/${PV}-php7.patch"
+)
diff --git a/dev-php/pecl-crack/pecl-crack-0.4-r7.ebuild b/dev-php/pecl-crack/pecl-crack-0.4-r7.ebuild
new file mode 100644
index 000000000000..4a90b507cc29
--- /dev/null
+++ b/dev-php/pecl-crack/pecl-crack-0.4-r7.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PHP_EXT_NAME="crack"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+PHP_EXT_EXTRA_ECONF=""
+DOCS=( EXPERIMENTAL )
+
+USE_PHP="php5-6 php7-0 php7-1 php7-2"
+
+inherit php-ext-pecl-r3
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+DESCRIPTION="PHP interface to the cracklib libraries"
+LICENSE="PHP-3 CRACKLIB"
+SLOT="0"
+IUSE=""
+# Patch for http://pecl.php.net/bugs/bug.php?id=5765
+PATCHES=( "${FILESDIR}/fix-php-5-4-support.patch"
+"${FILESDIR}/fix-pecl-bug-5765.patch"
+"${FILESDIR}/${PV}-php7.patch"
+)
diff --git a/dev-php/pecl-dbase-5.1.1 b/dev-php/pecl-dbase-5.1.1
deleted file mode 100644
index 61473e0bd097..000000000000
--- a/dev-php/pecl-dbase-5.1.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 )
-DESCRIPTION=dBase database file access functions
-EAPI=6
-HOMEPAGE=https://pecl.php.net/dbase
-IUSE=php_targets_php5-6 php_targets_php7-0 php_targets_php7-1
-KEYWORDS=~amd64 ~x86
-LICENSE=PHP-3.01
-PDEPEND=php_targets_php7-0? ( dev-php/pecl-dbase:7[php_targets_php7-0] ) php_targets_php7-1? ( dev-php/pecl-dbase:7[php_targets_php7-1] )
-RDEPEND=php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 )
-REQUIRED_USE=|| ( php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 )
-SLOT=0
-SRC_URI=https://pecl.php.net/get/dbase-5.1.1.tgz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e php-ext-pecl-r3 a59741d3df8ea9f17afcdcfb7edaee6d php-ext-source-r3 63b281041baa106ff1ef59b602ca7e2a toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=b4a0bb44f71d0165e289d07ebeafe113
diff --git a/dev-php/pecl-dbase-7.0.0_beta1-r1 b/dev-php/pecl-dbase-7.0.0_beta1-r1
deleted file mode 100644
index b7285f739b45..000000000000
--- a/dev-php/pecl-dbase-7.0.0_beta1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 )
-DESCRIPTION=dBase database file access functions
-EAPI=6
-HOMEPAGE=https://pecl.php.net/dbase
-IUSE=php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2
-KEYWORDS=~amd64 ~x86
-LICENSE=PHP-3.01
-RDEPEND=php_targets_php5-6? ( dev-php/pecl-dbase:0[php_targets_php5-6] ) php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 )
-REQUIRED_USE=|| ( php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2 )
-SLOT=7
-SRC_URI=https://pecl.php.net/get/dbase-7.0.0beta1.tgz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e php-ext-pecl-r3 a59741d3df8ea9f17afcdcfb7edaee6d php-ext-source-r3 63b281041baa106ff1ef59b602ca7e2a toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=698190ba69a705d85440c6f974a72832
diff --git a/dev-php/pecl-dbase/Manifest b/dev-php/pecl-dbase/Manifest
new file mode 100644
index 000000000000..b23a037b8ff8
--- /dev/null
+++ b/dev-php/pecl-dbase/Manifest
@@ -0,0 +1,5 @@
+DIST dbase-5.1.1.tgz 20751 BLAKE2B 36b7f3e0d03cfd3852333b2ed062dc5c408c29db7c5c05b1f6e57744ea651e291d958ec6216804a4328bb344b8188f6db29ffdcf9134ed7938640a08885c4a71 SHA512 52dac3e253f88de898c43864e8aff62990b33eb770fb27534bd25896c3eb330ca05e0205a1f387296637e553cf6de16a3f7b3eff082e1403a56c60decfbce33f
+DIST dbase-7.0.0beta1.tgz 16206 BLAKE2B 3921257aacb915deaad854ab54c8263646561dc2593bb4c5706fd9f27659cb1d22c0df9f88cbc7acf115d3358c25b366e5c3d1ef48eee2af17049094808113bd SHA512 623222e826509fa9b3f65353a66479fe4a5924de1b6dd4e73c106f2179f8af59740c758cf90ed8d0e9c61c31a7e5bef434cd858cde074f983b1dda69927442af
+EBUILD pecl-dbase-5.1.1.ebuild 775 BLAKE2B 35a3ab094b0a14a33c672d59ef605803bbbf5e18d09b65030107f1c79dce4bdbcbf4b5c6556639e3289c4c90cb2f6315da54e8784a42e252aef0d1cb1883aa2b SHA512 7d431710fe8a380d085bde23b49c10906677d3444ef9af999a269c371296f3396df7ccaa5d52cac9bf571f6ae4477445587ceaab4abd8c457dae6bbd10db11d8
+EBUILD pecl-dbase-7.0.0_beta1-r1.ebuild 1070 BLAKE2B 0cb69e3a4bf7f1c06fdb7967690cf74a97852568b2e55856a84c2ab8a9292dc5b200d827eec4e1d3cf6b04cf585318362fead248023bdee7bd8438f86d034abd SHA512 7eef9511bc14644ab5cc4b81a4a5bcd424a12f53a251c2a464c0aae00c8e9e9b6207fa398dd9f56d1f651a340bb789894f539e05404f9299c589459b1a16deb4
+MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/pecl-dbase/metadata.xml b/dev-php/pecl-dbase/metadata.xml
new file mode 100644
index 000000000000..b86acf66c756
--- /dev/null
+++ b/dev-php/pecl-dbase/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ <name>PHP</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/dev-php/pecl-dbase/pecl-dbase-5.1.1.ebuild b/dev-php/pecl-dbase/pecl-dbase-5.1.1.ebuild
new file mode 100644
index 000000000000..03186ce8a0bd
--- /dev/null
+++ b/dev-php/pecl-dbase/pecl-dbase-5.1.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_PHP="php5-6 php7-0 php7-1"
+
+inherit php-ext-pecl-r3
+
+USE_PHP="php5-6"
+
+KEYWORDS="~amd64 ~x86"
+
+DESCRIPTION="dBase database file access functions"
+LICENSE="PHP-3.01"
+SLOT="0"
+IUSE=""
+
+DEPEND=""
+PDEPEND="
+php_targets_php7-0? ( dev-php/pecl-dbase:7[php_targets_php7-0] )
+php_targets_php7-1? ( dev-php/pecl-dbase:7[php_targets_php7-1] )
+"
+
+src_prepare() {
+ if use php_targets_php5-6 ; then
+ php-ext-source-r3_src_prepare
+ else
+ eapply_user
+ fi
+}
+
+src_configure() {
+ if use php_targets_php5-6 ; then
+ local PHP_EXT_ECONF_ARGS=( )
+ php-ext-source-r3_src_configure
+ fi
+}
+
+src_install() {
+ if use php_targets_php5-6 ; then
+ php-ext-pecl-r3_src_install
+ fi
+}
diff --git a/dev-php/pecl-dbase/pecl-dbase-7.0.0_beta1-r1.ebuild b/dev-php/pecl-dbase/pecl-dbase-7.0.0_beta1-r1.ebuild
new file mode 100644
index 000000000000..72bf7b340134
--- /dev/null
+++ b/dev-php/pecl-dbase/pecl-dbase-7.0.0_beta1-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# Define 5.6 here so we get the USE and REQUIRED_USE from the eclass
+# This allows us to depend on the other slot
+USE_PHP="php5-6 php7-0 php7-1 php7-2"
+
+inherit php-ext-pecl-r3
+
+# However, we only really build for 7.x; so redefine it here
+USE_PHP="php7-0 php7-1 php7-2"
+
+KEYWORDS="~amd64 ~x86"
+
+DESCRIPTION="dBase database file access functions"
+LICENSE="PHP-3.01"
+SLOT="7"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND} php_targets_php5-6? ( dev-php/pecl-dbase:0[php_targets_php5-6] )"
+
+src_prepare() {
+ if use php_targets_php7-0 || use php_targets_php7-1 || use php_targets_php7-2 ; then
+ php-ext-source-r3_src_prepare
+ else
+ eapply_user
+ fi
+}
+
+src_configure() {
+ if use php_targets_php7-0 || use php_targets_php7-1 || use php_targets_php7-2 ; then
+ local PHP_EXT_ECONF_ARGS=( )
+ php-ext-source-r3_src_configure
+ fi
+}
+
+src_install() {
+ if use php_targets_php7-0 || use php_targets_php7-1 || use php_targets_php7-2 ; then
+ php-ext-pecl-r3_src_install
+ fi
+}
diff --git a/dev-php/pecl-dbx-1.1.2-r2 b/dev-php/pecl-dbx-1.1.2-r2
deleted file mode 100644
index 7649eeb06bfc..000000000000
--- a/dev-php/pecl-dbx-1.1.2-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php5-6? ( dev-lang/php:5.6 )
-DESCRIPTION=The dbx module is a database abstraction layer
-EAPI=6
-HOMEPAGE=https://pecl.php.net/dbx
-IUSE=php_targets_php5-6
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=PHP-3
-RDEPEND=php_targets_php5-6? ( dev-lang/php:5.6 )
-REQUIRED_USE=|| ( php_targets_php5-6 )
-SLOT=0
-SRC_URI=https://pecl.php.net/get/dbx-1.1.2.tgz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e php-ext-pecl-r3 a59741d3df8ea9f17afcdcfb7edaee6d php-ext-source-r3 63b281041baa106ff1ef59b602ca7e2a toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=705c07e94c0d4ae20100b5c5e2230dfc
diff --git a/dev-php/pecl-dbx/Manifest b/dev-php/pecl-dbx/Manifest
new file mode 100644
index 000000000000..13a13e6eadd0
--- /dev/null
+++ b/dev-php/pecl-dbx/Manifest
@@ -0,0 +1,3 @@
+DIST dbx-1.1.2.tgz 31348 BLAKE2B 570bf700d52739b7ecf89b0ca0c2e2112e615fc1a1bd90421ca766fbea34a54410b3bed0f6f429fd19a30018e1a08d87c6d4552dca657b28c1da266a34c83b99 SHA512 890d724d5f1c57952fc5ada8e9b3ab36cac5d9dd70c3296eadefe17fb225ad35d3002224dc03e6e2f21e974dc68c6e1a39b8a44a88ba906ab345599d73f4aeec
+EBUILD pecl-dbx-1.1.2-r2.ebuild 350 BLAKE2B 9e5127326f82474726f3a3f2f771da4e7df2ee5310135add05d7b2372da62e75b9ae2aaeca6a88b207f6864d7404a2ef6a9a2ec829ec8703150b5b99ba7549a0 SHA512 c0752c0e71de208a0660bf6438ac5ae96b892ff442a11c14781edfb39e5b6ef91925247c9a9b592efa1f55af5702b2c33b129dab94263282cac7a3f9e70044e4
+MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/pecl-dbx/metadata.xml b/dev-php/pecl-dbx/metadata.xml
new file mode 100644
index 000000000000..b86acf66c756
--- /dev/null
+++ b/dev-php/pecl-dbx/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ <name>PHP</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/dev-php/pecl-dbx/pecl-dbx-1.1.2-r2.ebuild b/dev-php/pecl-dbx/pecl-dbx-1.1.2-r2.ebuild
new file mode 100644
index 000000000000..8040881f7675
--- /dev/null
+++ b/dev-php/pecl-dbx/pecl-dbx-1.1.2-r2.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PHP_EXT_NAME="dbx"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+
+USE_PHP="php5-6"
+
+inherit php-ext-pecl-r3
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+DESCRIPTION="The dbx module is a database abstraction layer"
+LICENSE="PHP-3"
+SLOT="0"
+IUSE=""
diff --git a/dev-php/pecl-dio-0.1.0-r1 b/dev-php/pecl-dio-0.1.0-r1
deleted file mode 100644
index bd94f92239ed..000000000000
--- a/dev-php/pecl-dio-0.1.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 )
-DESCRIPTION=Direct I/O functions for PHP
-EAPI=6
-HOMEPAGE=https://pecl.php.net/dio
-IUSE=php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2
-KEYWORDS=~amd64 ~x86
-LICENSE=PHP-3.01
-RDEPEND=php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 )
-REQUIRED_USE=|| ( php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2 )
-SLOT=0
-SRC_URI=https://pecl.php.net/get/dio-0.1.0.tgz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e php-ext-pecl-r3 a59741d3df8ea9f17afcdcfb7edaee6d php-ext-source-r3 63b281041baa106ff1ef59b602ca7e2a toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=d008a0fdbb9931b8bb46c1e21f1f22c6
diff --git a/dev-php/pecl-dio/Manifest b/dev-php/pecl-dio/Manifest
new file mode 100644
index 000000000000..4931d94064da
--- /dev/null
+++ b/dev-php/pecl-dio/Manifest
@@ -0,0 +1,3 @@
+DIST dio-0.1.0.tgz 36960 BLAKE2B 0a2c1fd6289cc9606c44c81216ce8d0f63d4bbddfae554e65499f586f5aa17f419a048e97723ff365407260740d28e36ec5dae8a45e18422a7bd900ec88b60fd SHA512 6fca1c3f2d6247f5e0c52a27b49d80a6d13f9630772956ff7aa73ad45e445686502edd956346c43955cb2f858c0c0259af86c3f92b6f93309a2b90583ad8ea05
+EBUILD pecl-dio-0.1.0-r1.ebuild 427 BLAKE2B 46ca4e8726e71e69bd0507d3758a3ac078e16caef8d5cbae26549ab93d84a75a23540eecf9a00d89a72b8e258491c95800a019cb15f869d7065de4779438f9b9 SHA512 10a00712558d362109c1fb6ec624730a037cb072fff06edb0c27dd87729b95f027f91f5917718f5a47b634d6b9060eced56f7eb0e4b8e38c3e87276bd8899c2a
+MISC metadata.xml 235 BLAKE2B 5b10304feea18aae1822be7d29bcce06c8715193b14a3dd2c4d79eb75e2767670352e2ca11e06b9a10ec04b63020a18254cd167e6d6be9072f4a200ca5d11ec4 SHA512 0b3e95bbf68eddf74289dad50f8828cffce2d904ff6f9bd5468177de979677cac11da84d1e0302c52b72085915b9d1b3496107172e5726520d51dad1981daf64
diff --git a/dev-php/pecl-dio/metadata.xml b/dev-php/pecl-dio/metadata.xml
new file mode 100644
index 000000000000..aca42932b833
--- /dev/null
+++ b/dev-php/pecl-dio/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ <name>PHP</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-php/pecl-dio/pecl-dio-0.1.0-r1.ebuild b/dev-php/pecl-dio/pecl-dio-0.1.0-r1.ebuild
new file mode 100644
index 000000000000..113db6ef9fb0
--- /dev/null
+++ b/dev-php/pecl-dio/pecl-dio-0.1.0-r1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PHP_EXT_NAME="dio"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+
+USE_PHP="php5-6 php7-0 php7-1 php7-2"
+
+MY_PV=${PV/_rc/RC}
+PHP_EXT_S="${WORKDIR}/${PN/pecl-/}-${MY_PV}"
+
+inherit php-ext-pecl-r3
+
+KEYWORDS="~amd64 ~x86"
+
+DESCRIPTION="Direct I/O functions for PHP"
+LICENSE="PHP-3.01"
+SLOT="0"
+IUSE=""
+
+S="${PHP_EXT_S}"
diff --git a/dev-php/pecl-eio-2.0.2-r1 b/dev-php/pecl-eio-2.0.2-r1
deleted file mode 100644
index cd6eff586ffe..000000000000
--- a/dev-php/pecl-eio-2.0.2-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 )
-DESCRIPTION=PHP wrapper for libeio library
-EAPI=6
-HOMEPAGE=https://pecl.php.net/eio
-IUSE=debug php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2
-KEYWORDS=~amd64 ~x86
-LICENSE=PHP-3
-RDEPEND=php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 )
-REQUIRED_USE=|| ( php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2 )
-SLOT=0
-SRC_URI=https://pecl.php.net/get/eio-2.0.2.tgz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e php-ext-pecl-r3 a59741d3df8ea9f17afcdcfb7edaee6d php-ext-source-r3 63b281041baa106ff1ef59b602ca7e2a toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=2c51a876ce088d1636abefd407915596
diff --git a/dev-php/pecl-eio/Manifest b/dev-php/pecl-eio/Manifest
new file mode 100644
index 000000000000..d6a5b3ae955a
--- /dev/null
+++ b/dev-php/pecl-eio/Manifest
@@ -0,0 +1,3 @@
+DIST eio-2.0.2.tgz 74005 BLAKE2B e09f540753f2c607b95de9c3f390fc0c31ad2a34fda99aac86f057b2e664e49aded0b5f3e491138af60d00828ee9ff13f09958177e9cfed2b254473b1f814da9 SHA512 9b5ab80e6a76a1a2e99dfa641b404d0b52cd79b54267a8ded622930b4cc99f3ba1e39a70fc2d8f5c4ed50fbd67d97bc78655cd17958f0c8a2314b3b6ac1c6384
+EBUILD pecl-eio-2.0.2-r1.ebuild 505 BLAKE2B a111e8ec1dee97e11e0766490b8fb320c529e2abf862f3c8466eddec45a2102d751a091cfa88f8242491d2d8178b23d96b6ce1ed1c36624560b9844ba7d64325 SHA512 a0444dcecf3ee753e82d6ee3b3463e5fa56bd484a01d120b3827010f43ea09ee2c50babce2cb072c8b14d5f1b1e62fbfd0155f1aca3de7168e18c46716c549de
+MISC metadata.xml 354 BLAKE2B 468d2c00c6aa9335b37ad1cfe50547fd620182f78c04d924309b429f9a05475a8e023c69121ac0d47243a479d80d891956d4e8ca0edfacc3a82f05be74a6d046 SHA512 de8f034f4f5b9891d46191e0960bd7cf53c3b831908f70beb6b164d062462dab78ba5c3de85509c3b616bd0ad3a9231e991e370b674b694708afca0736e8a60b
diff --git a/dev-php/pecl-eio/metadata.xml b/dev-php/pecl-eio/metadata.xml
new file mode 100644
index 000000000000..cab0186846a3
--- /dev/null
+++ b/dev-php/pecl-eio/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+<email>rrosmanov@gmail.com</email>
+<name>Ruslan Osmanov</name>
+</maintainer>
+<maintainer type="project">
+<email>proxy-maint@gentoo.org</email>
+<name>Proxy Maintainers</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-php/pecl-eio/pecl-eio-2.0.2-r1.ebuild b/dev-php/pecl-eio/pecl-eio-2.0.2-r1.ebuild
new file mode 100644
index 000000000000..ed19c8deb059
--- /dev/null
+++ b/dev-php/pecl-eio/pecl-eio-2.0.2-r1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PHP_EXT_NAME="eio"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+DOCS=( README.md )
+
+USE_PHP="php5-6 php7-0 php7-1 php7-2"
+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"
+
+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-2.2.1 b/dev-php/pecl-event-2.2.1
deleted file mode 100644
index e29847ea75e3..000000000000
--- a/dev-php/pecl-event-2.2.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/libevent-2.0.2 php_targets_php5-6? ( dev-lang/php:5.6[sockets?] ) php_targets_php7-0? ( dev-lang/php:7.0[sockets?] ) php_targets_php7-1? ( dev-lang/php:7.1[sockets?] ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 )
-DESCRIPTION=PHP wrapper for libevent2
-EAPI=6
-HOMEPAGE=https://pecl.php.net/event
-IUSE=debug +extra +ssl threads +sockets examples php_targets_php5-6 php_targets_php7-0 php_targets_php7-1
-KEYWORDS=amd64 ia64 x86
-LICENSE=PHP-3
-RDEPEND=>=dev-libs/libevent-2.0.2 php_targets_php5-6? ( dev-lang/php:5.6[sockets?] ) php_targets_php7-0? ( dev-lang/php:7.0[sockets?] ) php_targets_php7-1? ( dev-lang/php:7.1[sockets?] ) !dev-php/pecl-libevent php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 )
-REQUIRED_USE=|| ( php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 )
-SLOT=0
-SRC_URI=https://pecl.php.net/get/event-2.2.1.tgz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e php-ext-pecl-r3 a59741d3df8ea9f17afcdcfb7edaee6d php-ext-source-r3 63b281041baa106ff1ef59b602ca7e2a toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=6f6b6c5ef9843384fecd238d310fd584
diff --git a/dev-php/pecl-event-2.3.0-r1 b/dev-php/pecl-event-2.3.0-r1
deleted file mode 100644
index 01a3f0d8ef64..000000000000
--- a/dev-php/pecl-event-2.3.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/libevent-2.0.2 ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) php_targets_php5-6? ( dev-lang/php:5.6[sockets?] ) php_targets_php7-0? ( dev-lang/php:7.0[sockets?] ) php_targets_php7-1? ( dev-lang/php:7.1[sockets?] ) php_targets_php7-2? ( dev-lang/php:7.2[sockets?] ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 )
-DESCRIPTION=PHP wrapper for libevent2
-EAPI=6
-HOMEPAGE=https://pecl.php.net/event
-IUSE=debug examples +extra libressl +sockets +ssl threads php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2
-KEYWORDS=~amd64 ~ia64 ~x86
-LICENSE=PHP-3
-RDEPEND=>=dev-libs/libevent-2.0.2 ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) php_targets_php5-6? ( dev-lang/php:5.6[sockets?] ) php_targets_php7-0? ( dev-lang/php:7.0[sockets?] ) php_targets_php7-1? ( dev-lang/php:7.1[sockets?] ) php_targets_php7-2? ( dev-lang/php:7.2[sockets?] ) !dev-php/pecl-libevent php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 )
-REQUIRED_USE=|| ( php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2 )
-SLOT=0
-SRC_URI=https://pecl.php.net/get/event-2.3.0.tgz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e php-ext-pecl-r3 a59741d3df8ea9f17afcdcfb7edaee6d php-ext-source-r3 63b281041baa106ff1ef59b602ca7e2a toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=42d66da498076f4d07042307b6629cbc
diff --git a/dev-php/pecl-event/Manifest b/dev-php/pecl-event/Manifest
new file mode 100644
index 000000000000..e56e4d427003
--- /dev/null
+++ b/dev-php/pecl-event/Manifest
@@ -0,0 +1,5 @@
+DIST event-2.2.1.tgz 133147 BLAKE2B 909892c937843821b34cb4d450b06698b23ed8aac59915ef96c72ba08e4afe84856e913527e9b0197d28ebbe5cac8ac45174d8e3fbeae33eae0619e3b3e21959 SHA512 a331e0cbb923b2efe95a366c842929e9ffcdf15d4b95dce83f5d1e9bb33045477f278672835ffc087df89aa3614106cf504f4e6a779a620b94c20d83449e95f2
+DIST event-2.3.0.tgz 135401 BLAKE2B a068142854ed908cc482ec48a249a5d213c1806652cffc698bc6dd298c136c5884bbb52b30179ef813af938d0ecb92a5414c93dea3d782d6ebfb4e886128454a SHA512 9e1f41a13a5fc534956561ea481816d6863ebe037cca0ce450cfb16375d6b49cd03c68e115c851ef6fa3022927f2e5850695880c65dd1d339bb747e171cc9f2f
+EBUILD pecl-event-2.2.1.ebuild 934 BLAKE2B 43790a9ae06ee9db90ea7e1fecf6726f326e10539d12cf59dc01c4d6a2edb5d6455e68d13a23c7d434dbf1da6ff42e68a31fb8c672a5f2744c63bf5c597608b6 SHA512 22f28502553ad020b1a762aaf3d439d1ded788f77cdc71ba49bd2ad7d95844ddd70866983c95cc6ad65c740ae63a3397bb70c3345c6d9c756bbe0c320b62b89e
+EBUILD pecl-event-2.3.0-r1.ebuild 1241 BLAKE2B cbe352d8b0c84bdd33510dbd1c9b7680934fddc6a5fca23ef52d8d5b673be2a68a82ca9c589a114690f5eb3ce8996518f45cad6b5ef234b64aaf45e0ee61842e SHA512 d8bf4c16f864d662c573141146a0256030732e72af5e1e64066dec58c3a491f56589431704f78f0292fe3a12406199c17064954c9bc6b15ed57791c1314bc613
+MISC metadata.xml 431 BLAKE2B 25421824761cdcc90c610236ac4acfd85e18fb63e4f92ff3fa5e51698a7e2004812a7193ced70646baf02bacd0bc896a5959ee88bd88dd5de68db729661ad02f SHA512 6349913306ea30f9ee6cd5ad862e0323d143815f4db47da14e5d54d0dcfb604118e3845f664f2a9b8527797b262c9567bbf5f189426f9becbd169be0ec111056
diff --git a/dev-php/pecl-event/metadata.xml b/dev-php/pecl-event/metadata.xml
new file mode 100644
index 000000000000..2bec35385627
--- /dev/null
+++ b/dev-php/pecl-event/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+<email>rrosmanov@gmail.com</email>
+<name>Ruslan Osmanov</name>
+</maintainer>
+<maintainer type="project">
+<email>proxy-maint@gentoo.org</email>
+<name>Proxy Maintainers</name>
+</maintainer>
+<use>
+<flag name="extra">Add support of the Libevent extra API</flag>
+</use>
+</pkgmetadata>
diff --git a/dev-php/pecl-event/pecl-event-2.2.1.ebuild b/dev-php/pecl-event/pecl-event-2.2.1.ebuild
new file mode 100644
index 000000000000..b097acd6f6b9
--- /dev/null
+++ b/dev-php/pecl-event/pecl-event-2.2.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PHP_EXT_NAME="event"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+DOCS=( README.md )
+
+USE_PHP="php5-6 php7-0 php7-1"
+
+inherit php-ext-pecl-r3
+
+KEYWORDS="amd64 ia64 x86"
+LICENSE="PHP-3.01"
+
+DESCRIPTION="PHP wrapper for libevent2"
+LICENSE="PHP-3"
+SLOT="0"
+
+DEPEND="
+ >=dev-libs/libevent-2.0.2
+ php_targets_php5-6? ( dev-lang/php:5.6[sockets?] )
+ php_targets_php7-0? ( dev-lang/php:7.0[sockets?] )
+ php_targets_php7-1? ( dev-lang/php:7.1[sockets?] )"
+
+RDEPEND="${DEPEND} !dev-php/pecl-libevent"
+
+IUSE="debug +extra +ssl threads +sockets examples"
+
+src_configure() {
+ local PHP_EXT_ECONF_ARGS=(
+ --with-event-core
+ $(use_enable debug event-debug)
+ $(use_with extra event-extra)
+ $(use_with ssl event-openssl)
+ $(use_with threads event-pthreads)
+ $(use_enable sockets event-sockets)
+ )
+ php-ext-source-r3_src_configure
+}
diff --git a/dev-php/pecl-event/pecl-event-2.3.0-r1.ebuild b/dev-php/pecl-event/pecl-event-2.3.0-r1.ebuild
new file mode 100644
index 000000000000..3fbf4fc20ca4
--- /dev/null
+++ b/dev-php/pecl-event/pecl-event-2.3.0-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PHP_EXT_NAME="event"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+DOCS=( README.md )
+
+USE_PHP="php5-6 php7-0 php7-1 php7-2"
+
+inherit php-ext-pecl-r3
+
+KEYWORDS="~amd64 ~ia64 ~x86"
+LICENSE="PHP-3.01"
+
+DESCRIPTION="PHP wrapper for libevent2"
+LICENSE="PHP-3"
+SLOT="0"
+
+DEPEND="
+ >=dev-libs/libevent-2.0.2
+ ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
+ php_targets_php5-6? ( dev-lang/php:5.6[sockets?] )
+ php_targets_php7-0? ( dev-lang/php:7.0[sockets?] )
+ php_targets_php7-1? ( dev-lang/php:7.1[sockets?] )
+ php_targets_php7-2? ( dev-lang/php:7.2[sockets?] )"
+
+RDEPEND="${DEPEND} !dev-php/pecl-libevent"
+
+IUSE="debug examples +extra libressl +sockets +ssl threads"
+
+src_configure() {
+ local PHP_EXT_ECONF_ARGS=(
+ --with-event-core
+ $(use_enable debug event-debug)
+ $(use_with extra event-extra)
+ $(use_with ssl event-openssl)
+ $(use_with threads event-pthreads)
+ $(use_enable sockets event-sockets)
+ )
+ php-ext-source-r3_src_configure
+}
+
+src_test() {
+ local slot
+ for slot in $(php_get_slots); do
+ php_init_slot_env "${slot}"
+ SKIP_ONLINE_TESTS="yes" NO_INTERACTION="yes" emake test
+ done
+}
diff --git a/dev-php/pecl-geoip-1.1.1-r3 b/dev-php/pecl-geoip-1.1.1-r3
deleted file mode 100644
index b7b0724cd9ba..000000000000
--- a/dev-php/pecl-geoip-1.1.1-r3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/geoip >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 )
-DESCRIPTION=PHP extension to map IP address to geographic places
-EAPI=6
-HOMEPAGE=https://pecl.php.net/geoip
-IUSE=php_targets_php5-6 php_targets_php7-0 php_targets_php7-1
-KEYWORDS=amd64 x86
-LICENSE=PHP-3
-RDEPEND=dev-libs/geoip php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 )
-REQUIRED_USE=|| ( php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 )
-SLOT=0
-SRC_URI=https://pecl.php.net/get/geoip-1.1.1.tgz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e php-ext-pecl-r3 a59741d3df8ea9f17afcdcfb7edaee6d php-ext-source-r3 63b281041baa106ff1ef59b602ca7e2a toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=0f643708aab708e3ddf75a902a29031c
diff --git a/dev-php/pecl-geoip-1.1.1-r4 b/dev-php/pecl-geoip-1.1.1-r4
deleted file mode 100644
index 82b4fbef4fdd..000000000000
--- a/dev-php/pecl-geoip-1.1.1-r4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/geoip >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 )
-DESCRIPTION=PHP extension to map IP address to geographic places
-EAPI=6
-HOMEPAGE=https://pecl.php.net/geoip
-IUSE=php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2
-KEYWORDS=~amd64 ~x86
-LICENSE=PHP-3
-RDEPEND=dev-libs/geoip php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 )
-REQUIRED_USE=|| ( php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2 )
-SLOT=0
-SRC_URI=https://pecl.php.net/get/geoip-1.1.1.tgz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e php-ext-pecl-r3 a59741d3df8ea9f17afcdcfb7edaee6d php-ext-source-r3 63b281041baa106ff1ef59b602ca7e2a toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=bcc4bdd2d0c0891e1462a9cd4426f787
diff --git a/dev-php/pecl-geoip/Manifest b/dev-php/pecl-geoip/Manifest
new file mode 100644
index 000000000000..49b7f92a8c5a
--- /dev/null
+++ b/dev-php/pecl-geoip/Manifest
@@ -0,0 +1,5 @@
+AUX fix-failing-tests-1.1.1.patch 1250 BLAKE2B 587561ec400fe54b21333d09d2ad721b66c321de5a9c1823c0cb9706e63c41a24f81e53eb9fb92bc1f33bc867e141e8f29c26abc1452058dc387d29a53b0c7bc SHA512 9e3c93b337c38feaec29001a5a5b243f376bc7a32caaafa848b51daa3f0efbdecf407de6c8f304801ad106aa0e4906513588c42aa19bc6d5b261ccd6cb00b652
+DIST geoip-1.1.1.tgz 13004 BLAKE2B fe073b9459c434751ea0291ce6802041db47254f9d2d5b930db51751b3a66ce5cf925dc4bd07764920748b1735f26ba8bd136654e08ed9c24ac3b520e842f45d SHA512 395715297726aa8e7ed71297d403bea9cb08417a03adfca29dc6ea68bbc738c176f71ea621f9026109e07cd5a2adc647e2af8e140e18a6af1c8f0fe4ed1a9c6b
+EBUILD pecl-geoip-1.1.1-r3.ebuild 442 BLAKE2B 1d4fa08a29d59bccf3f9ddd2fe68541a0499ee8fcc2c5ab20c1bd76a1deaeedd93941caeee1660d6ae56baf6af56a246f11b5b00b61464715833573b06b1272f SHA512 bc867d855dad8e5bdfd22b7ca4addd614ad1eeab50273759113be8d0ab81d081e1cf1834aec71ed73e7b1aba174902e80f117dd211a4d4695ec06a35f3c7c596
+EBUILD pecl-geoip-1.1.1-r4.ebuild 451 BLAKE2B 9af37a08d093f6569c2a8d1d2c3aa3c238215fc6122ac8ae6c6b88877c99c8a1090b04fa8a7e2e21857fb1879f776f739472ce9f27a54fff97b8757f1fe9fe2f SHA512 c359ae7ad851e763412420607c9bd853a4f7dbaff36e5f49f56f262fdab83d2f762850707360c54fdd976ef8acf69799bf5d225436459e3134f2ca6fb47e0f00
+MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/pecl-geoip/files/fix-failing-tests-1.1.1.patch b/dev-php/pecl-geoip/files/fix-failing-tests-1.1.1.patch
new file mode 100644
index 000000000000..a86994708e7b
--- /dev/null
+++ b/dev-php/pecl-geoip/files/fix-failing-tests-1.1.1.patch
@@ -0,0 +1,46 @@
+On Gentoo, we require users to download the GeoIP databases
+themselves. As a result, the databases may not be there when
+installing pecl-geoip. The first patch below skips a test if the
+database it uses is not present. The second patch disables 019.phpt
+completely, because I can't make it pass.
+
+PHP-Bug: 73416
+
+diff --git a/tests/001.phpt b/tests/001.phpt
+index a548d6e..c0e4972 100644
+--- a/tests/001.phpt
++++ b/tests/001.phpt
+@@ -1,7 +1,10 @@
+ --TEST--
+ Checking Country (Free) DB availability
+ --SKIPIF--
+-<?php if (!extension_loaded("geoip")) print "skip"; ?>
++<?php
++if (!extension_loaded("geoip")) print "skip";
++if (!file_exists(geoip_db_filename(GEOIP_COUNTRY_EDITION))) print "skip";
++?>
+ --POST--
+ --GET--
+ --FILE--
+diff --git a/tests/019.phpt b/tests/019.phpt
+deleted file mode 100644
+index 4630354..0000000
+--- a/tests/019.phpt
++++ /dev/null
+@@ -1,15 +0,0 @@
+---TEST--
+-Checking geoip_setup_custom_directory() (with trailing slash)
+---SKIPIF--
+-<?php if (!extension_loaded("geoip")) print "skip"; ?>
+---INI--
+-geoip.custom_directory="/test/"
+---FILE--
+-<?php
+-
+-var_dump( geoip_country_name_by_name_v6('0000:0000:0000:0000') );
+-
+-?>
+---EXPECT--
+-string(27) "/some/other/place/GeoIP.dat"
+-string(6) "/test/"
+\ No newline at end of file
diff --git a/dev-php/pecl-geoip/metadata.xml b/dev-php/pecl-geoip/metadata.xml
new file mode 100644
index 000000000000..b86acf66c756
--- /dev/null
+++ b/dev-php/pecl-geoip/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ <name>PHP</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/dev-php/pecl-geoip/pecl-geoip-1.1.1-r3.ebuild b/dev-php/pecl-geoip/pecl-geoip-1.1.1-r3.ebuild
new file mode 100644
index 000000000000..042049847be6
--- /dev/null
+++ b/dev-php/pecl-geoip/pecl-geoip-1.1.1-r3.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PHP_EXT_NAME="geoip"
+DOCS="README ChangeLog"
+USE_PHP="php5-6 php7-0 php7-1"
+
+inherit php-ext-pecl-r3
+
+KEYWORDS="amd64 x86"
+
+DESCRIPTION="PHP extension to map IP address to geographic places"
+LICENSE="PHP-3"
+SLOT="0"
+IUSE=""
+
+DEPEND="dev-libs/geoip"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/fix-failing-tests-1.1.1.patch" )
diff --git a/dev-php/pecl-geoip/pecl-geoip-1.1.1-r4.ebuild b/dev-php/pecl-geoip/pecl-geoip-1.1.1-r4.ebuild
new file mode 100644
index 000000000000..865b4ebe7166
--- /dev/null
+++ b/dev-php/pecl-geoip/pecl-geoip-1.1.1-r4.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PHP_EXT_NAME="geoip"
+DOCS="README ChangeLog"
+USE_PHP="php5-6 php7-0 php7-1 php7-2"
+
+inherit php-ext-pecl-r3
+
+KEYWORDS="~amd64 ~x86"
+
+DESCRIPTION="PHP extension to map IP address to geographic places"
+LICENSE="PHP-3"
+SLOT="0"
+IUSE=""
+
+DEPEND="dev-libs/geoip"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/fix-failing-tests-1.1.1.patch" )
diff --git a/dev-php/pecl-gnupg-1.4.0-r1 b/dev-php/pecl-gnupg-1.4.0-r1
deleted file mode 100644
index 01e6e53351f1..000000000000
--- a/dev-php/pecl-gnupg-1.4.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-crypt/gpgme <app-crypt/gnupg-2 >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 )
-DESCRIPTION=PHP wrapper around the gpgme library
-EAPI=6
-HOMEPAGE=https://pecl.php.net/gnupg
-IUSE=php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD-2
-RDEPEND=app-crypt/gpgme <app-crypt/gnupg-2 php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 )
-REQUIRED_USE=|| ( php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2 )
-SLOT=0
-SRC_URI=https://pecl.php.net/get/gnupg-1.4.0.tgz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e php-ext-pecl-r3 a59741d3df8ea9f17afcdcfb7edaee6d php-ext-source-r3 63b281041baa106ff1ef59b602ca7e2a toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=2b281857dffe4270223ffdeb5b45beb2
diff --git a/dev-php/pecl-gnupg/Manifest b/dev-php/pecl-gnupg/Manifest
new file mode 100644
index 000000000000..85ee92cec68a
--- /dev/null
+++ b/dev-php/pecl-gnupg/Manifest
@@ -0,0 +1,4 @@
+AUX 1.3.2/01-large_file_system.patch 260 BLAKE2B 21c52e406ee1d28c8ad0fef1cac7a4c7bb486b856a55423108daca9113416b2e906ae398ac081ce2b813f110e9cc4ce5a20ec04646c4247fe3427aa7440988f9 SHA512 095c5dc8e321c771c8a62054255f3616f3651dae470b78d47cd6032dd8ac76450a366b6a2988ca2cd510102dcedab86c05cd8cd84dbe65d6eca515e487d6dbb5
+DIST gnupg-1.4.0.tgz 28349 BLAKE2B d023746b104db38bcf7617d79570aa3c38d318879d34b1d4df7fc0c28b4e435deadc2a1a4827922cc14a8068b578896e297c8fe8461afebd2768ffb63ddc502d SHA512 70fa1d2956bc5caedbeadf556f9f40a7b963d3b519d6574b0c7695d9fb4c7f9d612306f475a90a1125661407c11de97040e54b158f38d71f239c1fe436d48018
+EBUILD pecl-gnupg-1.4.0-r1.ebuild 593 BLAKE2B bdbfadef80ea8dd5860519af401a9439da0ed78322bdd39c3dd083744b706caf6b020ad6beb0c3651f77d104efce6bca3731f66b49cd3f5374017dd1f0ea3fa0 SHA512 b5fb12744536e077bd03110587cf43bd7607158631750ec886f0183055b495f4236b10673a7bf1d8da167d4c1de4f3f6e0b79cc433509329b3cabe8599d0776a
+MISC metadata.xml 235 BLAKE2B 5b10304feea18aae1822be7d29bcce06c8715193b14a3dd2c4d79eb75e2767670352e2ca11e06b9a10ec04b63020a18254cd167e6d6be9072f4a200ca5d11ec4 SHA512 0b3e95bbf68eddf74289dad50f8828cffce2d904ff6f9bd5468177de979677cac11da84d1e0302c52b72085915b9d1b3496107172e5726520d51dad1981daf64
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
new file mode 100644
index 000000000000..c679bad631da
--- /dev/null
+++ b/dev-php/pecl-gnupg/files/1.3.2/01-large_file_system.patch
@@ -0,0 +1,9 @@
+--- 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
new file mode 100644
index 000000000000..aca42932b833
--- /dev/null
+++ b/dev-php/pecl-gnupg/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ <name>PHP</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-php/pecl-gnupg/pecl-gnupg-1.4.0-r1.ebuild b/dev-php/pecl-gnupg/pecl-gnupg-1.4.0-r1.ebuild
new file mode 100644
index 000000000000..ab2811be5020
--- /dev/null
+++ b/dev-php/pecl-gnupg/pecl-gnupg-1.4.0-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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-0 php7-1 php7-2"
+
+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-2"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}"/1.3.2/01-large_file_system.patch )
diff --git a/dev-php/pecl-haru-1.0.4-r2 b/dev-php/pecl-haru-1.0.4-r2
deleted file mode 100644
index 9137d2164774..000000000000
--- a/dev-php/pecl-haru-1.0.4-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=media-libs/libharu[png?,zlib?] >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php5-6? ( dev-lang/php:5.6 )
-DESCRIPTION=An interface to libharu, a PDF generator
-EAPI=6
-HOMEPAGE=https://pecl.php.net/haru
-IUSE=png zlib php_targets_php5-6
-KEYWORDS=~amd64 ~x86
-LICENSE=PHP-3.01
-RDEPEND=media-libs/libharu[png?,zlib?] php_targets_php5-6? ( dev-lang/php:5.6 )
-REQUIRED_USE=|| ( php_targets_php5-6 )
-SLOT=0
-SRC_URI=https://pecl.php.net/get/haru-1.0.4.tgz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e php-ext-pecl-r3 a59741d3df8ea9f17afcdcfb7edaee6d php-ext-source-r3 63b281041baa106ff1ef59b602ca7e2a toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=47cbcfb6b0c4933877b0f86652143377
diff --git a/dev-php/pecl-haru/Manifest b/dev-php/pecl-haru/Manifest
new file mode 100644
index 000000000000..7beaea865cc9
--- /dev/null
+++ b/dev-php/pecl-haru/Manifest
@@ -0,0 +1,3 @@
+DIST haru-1.0.4.tgz 27538 BLAKE2B 9a070e76c98dc59895d3dea97bdd703fd1bf103ff0f285dc28d5568f74fbf74dc0de76b7ab32ff981505f639037ff67aaad4b0f4732e08f5d3c8264fd7a5bce9 SHA512 75cb8ae200cd41372ac738f5a4ed57607e13d538e2c9a46236dc05b7d0283ed4d152478e12fdff81735a4acd914055ebd58ff937ea0ca0a80056f255217b04c0
+EBUILD pecl-haru-1.0.4-r2.ebuild 574 BLAKE2B 1d8046e2bd66739a89c74e1622b7703983f6603d603f17607015a3ebc8c7d0cfff6047c721d1caed80bb0498c17a2d9ae255f8588a7a8c3096f5dfcba8c3e95a SHA512 1e379a868e2bb4f537e596208a9e47479fe59749a64f4720d4a616f8b441099386ac53e279da90ada9600df3913995e950441cca1bae46f119161e200b3bcaef
+MISC metadata.xml 372 BLAKE2B 3c879fc263286d0ed2e08861b809fde72d9be20dd92199c72ace37d963f588c9336232aecd8b937737850416f7053a2a8420b6f3b4ee9fe72e6b246e3e1e447c SHA512 0451f4f1a39d2b353470f3141ed3d1026d000eee29ea6f74655069993c9d2a0761865df148d1e0dc2239c6be3a0d580702dab49ac24d107df85c8aa0c7b2951c
diff --git a/dev-php/pecl-haru/metadata.xml b/dev-php/pecl-haru/metadata.xml
new file mode 100644
index 000000000000..5092019265f0
--- /dev/null
+++ b/dev-php/pecl-haru/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ <name>PHP</name>
+ </maintainer>
+ <longdescription lang="en">These functions allow you to create PDF documents
+ using the Haru Free PDF Library.
+ </longdescription>
+</pkgmetadata>
diff --git a/dev-php/pecl-haru/pecl-haru-1.0.4-r2.ebuild b/dev-php/pecl-haru/pecl-haru-1.0.4-r2.ebuild
new file mode 100644
index 000000000000..5b9771f7f0fb
--- /dev/null
+++ b/dev-php/pecl-haru/pecl-haru-1.0.4-r2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_PHP="php5-6"
+
+inherit php-ext-pecl-r3
+
+DESCRIPTION="An interface to libharu, a PDF generator"
+
+LICENSE="PHP-3.01"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="png zlib"
+
+DEPEND="media-libs/libharu[png?,zlib?]"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+ # config.m4 is broken checking paths, so we need to override it
+ local PHP_EXT_ECONF_ARGS=(
+ $(usex png '--with-png-dir=/usr' '')
+ $(usex zlib '--with-zlib-dir=/usr' '')
+ )
+
+ php-ext-source-r3_src_configure
+}
diff --git a/dev-php/pecl-htscanner-1.0.1-r3 b/dev-php/pecl-htscanner-1.0.1-r3
deleted file mode 100644
index 24b345382a7c..000000000000
--- a/dev-php/pecl-htscanner-1.0.1-r3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=php_targets_php5-6? ( dev-lang/php:5.6[cgi] ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php5-6? ( dev-lang/php:5.6 )
-DESCRIPTION=Enables .htaccess options for php-scripts running as cgi
-EAPI=6
-HOMEPAGE=https://pecl.php.net/htscanner
-IUSE=php_targets_php5-6
-KEYWORDS=~amd64 ~x86
-LICENSE=PHP-3
-RDEPEND=php_targets_php5-6? ( dev-lang/php:5.6[cgi] ) php_targets_php5-6? ( dev-lang/php:5.6 )
-REQUIRED_USE=|| ( php_targets_php5-6 )
-SLOT=0
-SRC_URI=https://pecl.php.net/get/htscanner-1.0.1.tgz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e php-ext-pecl-r3 a59741d3df8ea9f17afcdcfb7edaee6d php-ext-source-r3 63b281041baa106ff1ef59b602ca7e2a toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=f2d0c0640b161f606daf7bbc09ffca41
diff --git a/dev-php/pecl-htscanner/Manifest b/dev-php/pecl-htscanner/Manifest
new file mode 100644
index 000000000000..ec9edf31cac8
--- /dev/null
+++ b/dev-php/pecl-htscanner/Manifest
@@ -0,0 +1,3 @@
+DIST htscanner-1.0.1.tgz 10229 BLAKE2B 622b44ed3fe4d18721e65235ab047b4b8b9cd1b514525f97aa4f8d1c79ad937f80fb69d4ffd1586a813b5479b3edc11061a9156e8768547ee167d53f92012c4f SHA512 c0ccc0e4c945806364d5fd162c901bb9a44afe9eeedca864ca30f9fda430e60bf86d4ef41c0540639252c215eb72b1d34b28eba823aaeb64217bd9400a99f22e
+EBUILD pecl-htscanner-1.0.1-r3.ebuild 860 BLAKE2B 69a4569a1151142f39decbae85fb9bacf6aba6881a59940b3738ecabf53da1255e6d0be1dbcf0af3aea395b1bd85787778fe2ca52191e456f87eb83d10dd6ed3 SHA512 81e5491463bc2d8e48d8dfac040e7596579f5b63fc76c80bff2bb226a23be6ca243367813eec402dfeb67eb414f5c327153521b03954221c2dc877dd0e9c5444
+MISC metadata.xml 235 BLAKE2B 5b10304feea18aae1822be7d29bcce06c8715193b14a3dd2c4d79eb75e2767670352e2ca11e06b9a10ec04b63020a18254cd167e6d6be9072f4a200ca5d11ec4 SHA512 0b3e95bbf68eddf74289dad50f8828cffce2d904ff6f9bd5468177de979677cac11da84d1e0302c52b72085915b9d1b3496107172e5726520d51dad1981daf64
diff --git a/dev-php/pecl-htscanner/metadata.xml b/dev-php/pecl-htscanner/metadata.xml
new file mode 100644
index 000000000000..aca42932b833
--- /dev/null
+++ b/dev-php/pecl-htscanner/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ <name>PHP</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-php/pecl-htscanner/pecl-htscanner-1.0.1-r3.ebuild b/dev-php/pecl-htscanner/pecl-htscanner-1.0.1-r3.ebuild
new file mode 100644
index 000000000000..7d4c784f26fb
--- /dev/null
+++ b/dev-php/pecl-htscanner/pecl-htscanner-1.0.1-r3.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PHP_EXT_NAME="htscanner"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+DOCS="README"
+PHP_EXT_SAPIS="cgi"
+
+USE_PHP="php5-6"
+
+inherit php-ext-pecl-r3
+
+KEYWORDS="~amd64 ~x86"
+
+DESCRIPTION="Enables .htaccess options for php-scripts running as cgi"
+LICENSE="PHP-3"
+SLOT="0"
+IUSE=""
+
+for target in ${USE_PHP}; do
+ slot=${target/php}
+ slot=${slot/-/.}
+ PHPUSEDEPEND="${PHPUSEDEPEND}
+ php_targets_${target}? ( dev-lang/php:${slot}[cgi] )"
+done
+
+DEPEND="${PHPUSEDEPEND}"
+RDEPEND="${DEPEND}"
+
+src_install() {
+ php-ext-pecl-r3_src_install
+
+ php-ext-source-r3_addtoinifiles "config_file" ".htaccess"
+ php-ext-source-r3_addtoinifiles "default_docroot" "/"
+ php-ext-source-r3_addtoinifiles "default_ttl" "300"
+ php-ext-source-r3_addtoinifiles "stop_on_error" "0"
+}
diff --git a/dev-php/pecl-http-2.6.0 b/dev-php/pecl-http-2.6.0
deleted file mode 100644
index 0f0a2e8b8967..000000000000
--- a/dev-php/pecl-http-2.6.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=php_targets_php5-6? ( dev-libs/libevent dev-php/pecl-propro:0[php_targets_php5-6] dev-php/pecl-raphf:0[php_targets_php5-6] net-dns/libidn sys-libs/zlib ssl? ( net-misc/curl[ssl,curl_ssl_gnutls=,curl_ssl_libressl=,curl_ssl_nss=,curl_ssl_openssl=] ) !ssl? ( net-misc/curl[-ssl] ) dev-lang/php:5.6[hash,session,iconv] ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 )
-DESCRIPTION=Extended HTTP Support for PHP
-EAPI=6
-HOMEPAGE=https://pecl.php.net/pecl_http
-IUSE=ssl curl_ssl_gnutls curl_ssl_libressl curl_ssl_nss +curl_ssl_openssl php_targets_php5-6 php_targets_php7-0 php_targets_php7-1
-KEYWORDS=amd64 x86
-LICENSE=BSD-2 MIT
-PDEPEND=php_targets_php7-0? ( dev-php/pecl-http:7[php_targets_php7-0] ) php_targets_php7-1? ( dev-php/pecl-http:7[php_targets_php7-1] )
-RDEPEND=php_targets_php5-6? ( dev-libs/libevent dev-php/pecl-propro:0[php_targets_php5-6] dev-php/pecl-raphf:0[php_targets_php5-6] net-dns/libidn sys-libs/zlib ssl? ( net-misc/curl[ssl,curl_ssl_gnutls=,curl_ssl_libressl=,curl_ssl_nss=,curl_ssl_openssl=] ) !ssl? ( net-misc/curl[-ssl] ) dev-lang/php:5.6[hash,session,iconv] ) php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 )
-REQUIRED_USE=|| ( php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 )
-SLOT=2
-SRC_URI=https://pecl.php.net/get/pecl_http-2.6.0.tgz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e php-ext-pecl-r3 a59741d3df8ea9f17afcdcfb7edaee6d php-ext-source-r3 63b281041baa106ff1ef59b602ca7e2a toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=53c6b8188aa7f481a41a159944835c4a
diff --git a/dev-php/pecl-http-2.6.0-r1 b/dev-php/pecl-http-2.6.0-r1
deleted file mode 100644
index d36f5d5967fd..000000000000
--- a/dev-php/pecl-http-2.6.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=php_targets_php5-6? ( dev-libs/libevent dev-php/pecl-propro:0[php_targets_php5-6] dev-php/pecl-raphf:0[php_targets_php5-6] net-dns/libidn sys-libs/zlib ssl? ( net-misc/curl[ssl,curl_ssl_gnutls=,curl_ssl_libressl=,curl_ssl_nss=,curl_ssl_openssl=] ) !ssl? ( net-misc/curl[-ssl] ) dev-lang/php:5.6[hash,session,iconv] ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 )
-DESCRIPTION=Extended HTTP Support for PHP
-EAPI=6
-HOMEPAGE=https://pecl.php.net/pecl_http
-IUSE=ssl curl_ssl_gnutls curl_ssl_libressl curl_ssl_nss +curl_ssl_openssl php_targets_php5-6 php_targets_php7-0 php_targets_php7-1
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD-2 MIT
-PDEPEND=php_targets_php7-0? ( dev-php/pecl-http:7[php_targets_php7-0] ) php_targets_php7-1? ( dev-php/pecl-http:7[php_targets_php7-1] )
-RDEPEND=php_targets_php5-6? ( dev-libs/libevent dev-php/pecl-propro:0[php_targets_php5-6] dev-php/pecl-raphf:0[php_targets_php5-6] net-dns/libidn sys-libs/zlib ssl? ( net-misc/curl[ssl,curl_ssl_gnutls=,curl_ssl_libressl=,curl_ssl_nss=,curl_ssl_openssl=] ) !ssl? ( net-misc/curl[-ssl] ) dev-lang/php:5.6[hash,session,iconv] ) php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 )
-REQUIRED_USE=|| ( php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 )
-SLOT=2
-SRC_URI=https://pecl.php.net/get/pecl_http-2.6.0.tgz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e php-ext-pecl-r3 a59741d3df8ea9f17afcdcfb7edaee6d php-ext-source-r3 63b281041baa106ff1ef59b602ca7e2a toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=e1e4909569304def51404bc998803d91
diff --git a/dev-php/pecl-http-2.6.0-r2 b/dev-php/pecl-http-2.6.0-r2
deleted file mode 100644
index 0fe58879b2ef..000000000000
--- a/dev-php/pecl-http-2.6.0-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=php_targets_php5-6? ( dev-libs/libevent dev-php/pecl-propro:0[php_targets_php5-6] dev-php/pecl-raphf:0[php_targets_php5-6] net-dns/libidn sys-libs/zlib ssl? ( net-misc/curl[ssl,curl_ssl_gnutls=,curl_ssl_libressl=,curl_ssl_nss=,curl_ssl_openssl=] ) !ssl? ( net-misc/curl[-ssl] ) dev-lang/php:5.6[hash,session,iconv] ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 )
-DESCRIPTION=Extended HTTP Support for PHP
-EAPI=6
-HOMEPAGE=https://pecl.php.net/pecl_http
-IUSE=ssl curl_ssl_gnutls curl_ssl_libressl curl_ssl_nss +curl_ssl_openssl php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD-2 MIT
-PDEPEND=php_targets_php7-0? ( dev-php/pecl-http:7[php_targets_php7-0] ) php_targets_php7-1? ( dev-php/pecl-http:7[php_targets_php7-1] ) php_targets_php7-2? ( dev-php/pecl-http:7[php_targets_php7-2] )
-RDEPEND=php_targets_php5-6? ( dev-libs/libevent dev-php/pecl-propro:0[php_targets_php5-6] dev-php/pecl-raphf:0[php_targets_php5-6] net-dns/libidn sys-libs/zlib ssl? ( net-misc/curl[ssl,curl_ssl_gnutls=,curl_ssl_libressl=,curl_ssl_nss=,curl_ssl_openssl=] ) !ssl? ( net-misc/curl[-ssl] ) dev-lang/php:5.6[hash,session,iconv] ) php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 )
-REQUIRED_USE=|| ( php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2 )
-SLOT=2
-SRC_URI=https://pecl.php.net/get/pecl_http-2.6.0.tgz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e php-ext-pecl-r3 a59741d3df8ea9f17afcdcfb7edaee6d php-ext-source-r3 63b281041baa106ff1ef59b602ca7e2a toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=1792f6dad9d8ec234e3f3a3194d111be
diff --git a/dev-php/pecl-http-3.1.0 b/dev-php/pecl-http-3.1.0
deleted file mode 100644
index 16f5dc941a2f..000000000000
--- a/dev-php/pecl-http-3.1.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=dev-libs/libevent dev-php/pecl-propro:7[php_targets_php5-6?,php_targets_php7-0?,php_targets_php7-1?] dev-php/pecl-raphf:7[php_targets_php5-6?,php_targets_php7-0?,php_targets_php7-1?] net-dns/libidn sys-libs/zlib ssl? ( net-misc/curl[ssl,curl_ssl_gnutls=,curl_ssl_libressl=,curl_ssl_nss=,curl_ssl_openssl=] ) !ssl? ( net-misc/curl[-ssl] ) php_targets_php7-0? ( dev-lang/php:7.0[hash,session,iconv] ) php_targets_php7-1? ( dev-lang/php:7.1[hash,session,iconv] ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 )
-DESCRIPTION=Extended HTTP Support for PHP
-EAPI=6
-HOMEPAGE=https://pecl.php.net/pecl_http
-IUSE=ssl curl_ssl_gnutls curl_ssl_libressl curl_ssl_nss +curl_ssl_openssl php_targets_php5-6 php_targets_php7-0 php_targets_php7-1
-KEYWORDS=amd64 x86
-LICENSE=BSD-2 MIT
-RDEPEND=dev-libs/libevent dev-php/pecl-propro:7[php_targets_php5-6?,php_targets_php7-0?,php_targets_php7-1?] dev-php/pecl-raphf:7[php_targets_php5-6?,php_targets_php7-0?,php_targets_php7-1?] net-dns/libidn sys-libs/zlib ssl? ( net-misc/curl[ssl,curl_ssl_gnutls=,curl_ssl_libressl=,curl_ssl_nss=,curl_ssl_openssl=] ) !ssl? ( net-misc/curl[-ssl] ) php_targets_php7-0? ( dev-lang/php:7.0[hash,session,iconv] ) php_targets_php7-1? ( dev-lang/php:7.1[hash,session,iconv] ) php_targets_php5-6? ( dev-php/pecl-http:2[php_targets_php5-6] ) php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 )
-REQUIRED_USE=|| ( php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 )
-SLOT=7
-SRC_URI=https://pecl.php.net/get/pecl_http-3.1.0.tgz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e php-ext-pecl-r3 a59741d3df8ea9f17afcdcfb7edaee6d php-ext-source-r3 63b281041baa106ff1ef59b602ca7e2a toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=c3d5d92610fe75cebf0a59a8587746f1
diff --git a/dev-php/pecl-http-3.1.0-r1 b/dev-php/pecl-http-3.1.0-r1
deleted file mode 100644
index 43fc53591398..000000000000
--- a/dev-php/pecl-http-3.1.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/libevent dev-php/pecl-propro:7[php_targets_php5-6?,php_targets_php7-0?,php_targets_php7-1?] dev-php/pecl-raphf:7[php_targets_php5-6?,php_targets_php7-0?,php_targets_php7-1?] net-dns/libidn sys-libs/zlib ssl? ( net-misc/curl[ssl,curl_ssl_gnutls=,curl_ssl_libressl=,curl_ssl_nss=,curl_ssl_openssl=] ) !ssl? ( net-misc/curl[-ssl] ) php_targets_php7-0? ( dev-lang/php:7.0[hash,session,iconv] ) php_targets_php7-1? ( dev-lang/php:7.1[hash,session,iconv] ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 )
-DESCRIPTION=Extended HTTP Support for PHP
-EAPI=6
-HOMEPAGE=https://pecl.php.net/pecl_http
-IUSE=ssl curl_ssl_gnutls curl_ssl_libressl curl_ssl_nss +curl_ssl_openssl php_targets_php5-6 php_targets_php7-0 php_targets_php7-1
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD-2 MIT
-RDEPEND=dev-libs/libevent dev-php/pecl-propro:7[php_targets_php5-6?,php_targets_php7-0?,php_targets_php7-1?] dev-php/pecl-raphf:7[php_targets_php5-6?,php_targets_php7-0?,php_targets_php7-1?] net-dns/libidn sys-libs/zlib ssl? ( net-misc/curl[ssl,curl_ssl_gnutls=,curl_ssl_libressl=,curl_ssl_nss=,curl_ssl_openssl=] ) !ssl? ( net-misc/curl[-ssl] ) php_targets_php7-0? ( dev-lang/php:7.0[hash,session,iconv] ) php_targets_php7-1? ( dev-lang/php:7.1[hash,session,iconv] ) php_targets_php5-6? ( dev-php/pecl-http:2[php_targets_php5-6] ) php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 )
-REQUIRED_USE=|| ( php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 )
-SLOT=7
-SRC_URI=https://pecl.php.net/get/pecl_http-3.1.0.tgz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e php-ext-pecl-r3 a59741d3df8ea9f17afcdcfb7edaee6d php-ext-source-r3 63b281041baa106ff1ef59b602ca7e2a toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=478178188eb66253f5009de5cf30d6fd
diff --git a/dev-php/pecl-http-3.1.0-r2 b/dev-php/pecl-http-3.1.0-r2
deleted file mode 100644
index 284836052140..000000000000
--- a/dev-php/pecl-http-3.1.0-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=dev-libs/libevent dev-php/pecl-propro:7[php_targets_php5-6?,php_targets_php7-0?,php_targets_php7-1?,php_targets_php7-2?] dev-php/pecl-raphf:7[php_targets_php5-6?,php_targets_php7-0?,php_targets_php7-1?,php_targets_php7-2?] net-dns/libidn2 sys-libs/zlib ssl? ( net-misc/curl[ssl,curl_ssl_gnutls=,curl_ssl_libressl=,curl_ssl_nss=,curl_ssl_openssl=] ) !ssl? ( net-misc/curl[-ssl] ) php_targets_php7-0? ( dev-lang/php:7.0[hash,session,iconv] ) php_targets_php7-1? ( dev-lang/php:7.1[hash,session,iconv] ) php_targets_php7-2? ( dev-lang/php:7.2[hash,session,iconv] ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 )
-DESCRIPTION=Extended HTTP Support for PHP
-EAPI=6
-HOMEPAGE=https://pecl.php.net/pecl_http
-IUSE=ssl curl_ssl_gnutls curl_ssl_libressl curl_ssl_nss +curl_ssl_openssl php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD-2 MIT
-RDEPEND=dev-libs/libevent dev-php/pecl-propro:7[php_targets_php5-6?,php_targets_php7-0?,php_targets_php7-1?,php_targets_php7-2?] dev-php/pecl-raphf:7[php_targets_php5-6?,php_targets_php7-0?,php_targets_php7-1?,php_targets_php7-2?] net-dns/libidn2 sys-libs/zlib ssl? ( net-misc/curl[ssl,curl_ssl_gnutls=,curl_ssl_libressl=,curl_ssl_nss=,curl_ssl_openssl=] ) !ssl? ( net-misc/curl[-ssl] ) php_targets_php7-0? ( dev-lang/php:7.0[hash,session,iconv] ) php_targets_php7-1? ( dev-lang/php:7.1[hash,session,iconv] ) php_targets_php7-2? ( dev-lang/php:7.2[hash,session,iconv] ) php_targets_php5-6? ( dev-php/pecl-http:2[php_targets_php5-6] ) php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 )
-REQUIRED_USE=|| ( php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2 )
-SLOT=7
-SRC_URI=https://pecl.php.net/get/pecl_http-3.1.0.tgz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e php-ext-pecl-r3 a59741d3df8ea9f17afcdcfb7edaee6d php-ext-source-r3 63b281041baa106ff1ef59b602ca7e2a toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=30a333acc42800d823b60626531d6183
diff --git a/dev-php/pecl-http/Manifest b/dev-php/pecl-http/Manifest
new file mode 100644
index 000000000000..4bff6325af6a
--- /dev/null
+++ b/dev-php/pecl-http/Manifest
@@ -0,0 +1,10 @@
+AUX pecl-http-gnutls.patch 1061 BLAKE2B f57588e2c8a7a285a68aab931e0df55cb69cb06c8753afb784542fac1ce757f7ae4e244d49b06ec33e233d01b36b3c89c82e7af3e3d73221ba65ef58ea11dde3 SHA512 a05b39188a66ed9a328f9b864008390e4703db15d15416168e31eed78e2da5239db25d98fe3f4d62c26db6a5dfae83f84db2a6f3fffce39b768a03261c308a90
+DIST pecl_http-2.6.0.tgz 217673 BLAKE2B a7147924cfc018c3e273d85666d9792ea614955d0aa20ac43171266d91d139dccdbf2472dec4d145b798ce99a541dba48f7bed6009fbdf2a7ad81ab322963788 SHA512 12d18049411a4133008449a1e7458a3055322dc337f421e0e2be126ec965f15b0189af6fccd9ca4537c48819c763b9e020906ac6d09d87ead92f4436fac595ad
+DIST pecl_http-3.1.0.tgz 214166 BLAKE2B 2f84fc9f5f7d465142e3482a9ee46b9dd80dd2b5ec58ad1d8d4fb18a665ebe70e4f872b8915c3a84484a3b1cd0709b39bf6170c6f1c6175aef7d43bac44aa3df SHA512 1c272aa476106bb61848f175f0ba6715b3d8928f70cdac1a673cc87c2dc780dff5434a3bc595d5e8a1ef7b847a1d2e214f9e9ae80b8b5d1f80a299febc85b0ea
+EBUILD pecl-http-2.6.0-r1.ebuild 1920 BLAKE2B 82a6059834c91e0128a8f37d22e69619bf8f40fe61251f4b7d577e68cd698eca0854f1e43e463420be008d63e35d0aa4dc2c30d391ddd47cfab60a758686af6c SHA512 027af36906cc4f2763a5b8328b5ce2b2705a2c62a86b30cf8f160965ef8a5635971cf7135adde5afe8a72a48abfc29f338b3cd442797a347e15cc9bb9faa64a1
+EBUILD pecl-http-2.6.0-r2.ebuild 1903 BLAKE2B 6063b2a23da518f5806250798949951e3a8668cfd4bd0c517987e8d9f20ff6606f8f4e72c05d982233a095c1c43bd422057c028e35b75860ab4d5a74253f35b5 SHA512 913fe6b153f964e52389424158cbcb945227eae652597cb5e178256ea48410aaaf72fd15509a39fb074d7313a24ca324dde1808e831a3f677a4c3e471ec5b934
+EBUILD pecl-http-2.6.0.ebuild 1384 BLAKE2B 8731362ad89d7289d2c623cc49112727fc65737fed80c92e172b5618eecca4ff38ff49a798210b4b89925d333184135aabfdbb5a71fed76c2702d3267cda418f SHA512 56afa6c46fa8a95d5fa74dcc56527f82b51aaa01d187bb2cd21f8d8a135eb139635eb8a3f298beabd95e89e9c112dffe19a9f2e8ef34acf3dd4908c6d10ee6f1
+EBUILD pecl-http-3.1.0-r1.ebuild 2123 BLAKE2B a7b5367adac7f83908f8f4bd3efc828b64e570e87cf187e32a852d566c0bb34250cb08a7e91c729ba4f4210feb2d1a1da573faff04d56a8238f18d13ea3767be SHA512 e9d1bc26b6cb8eb453f8faf1520ee7fef6ec66780d3d9d81a5f787e244b04abdd9734a73f0c47ccd717ffea20a3511cc57651c4960299ced1636129ddd17d92e
+EBUILD pecl-http-3.1.0-r2.ebuild 2352 BLAKE2B e1dd9f8daff81a591ae52ecbb2e1bd6a6374d17fdc6c68ff114b0c6b75ab39708b559e39d728bae485ece11e5f73e10049d300f558d5750c3f7c13c70ad93c7a SHA512 6eafd1b553d3d343835acbbd8096fb5ad61fe1a0eae606f1000e57cf3ff5b51d130d49ad53ee3fc9734e2871129c3578398abd000221436d0e3668c8acbac6bc
+EBUILD pecl-http-3.1.0.ebuild 1587 BLAKE2B 1347611d4ad7f0ce44ef23370797cb37faad0d6261527fe8c28d935d9920c94ee06905396be0122f68a2ae4541169d10e8600bea3691a7d82090b8131f2275ac SHA512 f5d7f29153359c1a4a6991165e42a674c086e544c37fbdc23e580e2a6714734acbccb15081eedf92be3df79a21298ad5ee81032b75278c5ffc2bbfc59b0c6215
+MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/pecl-http/files/pecl-http-gnutls.patch b/dev-php/pecl-http/files/pecl-http-gnutls.patch
new file mode 100644
index 000000000000..4b58805946dc
--- /dev/null
+++ b/dev-php/pecl-http/files/pecl-http-gnutls.patch
@@ -0,0 +1,24 @@
+diff -aurN a/autoconf/pecl/libcurl.m4 b/autoconf/pecl/libcurl.m4
+--- a/autoconf/pecl/libcurl.m4 2016-12-12 04:04:21.000000000 -0500
++++ b/autoconf/pecl/libcurl.m4 2017-01-06 09:07:17.575660038 -0500
+@@ -87,7 +87,7 @@
+ AC_REQUIRE([PECL_HAVE_LIBCURL_CA])dnl
+ PECL_HAVE_LIBCURL_FEATURE([SSL], [
+ PECL_HAVE_LIBCURL_SSLLIB([OpenSSL], [openssl/ssl.h openssl/crypto.h], [ssl crypto])
+- PECL_HAVE_LIBCURL_SSLLIB([GnuTLS], [gnutls.h gcrypt.h], [gnutls gcrypt])
++ PECL_HAVE_LIBCURL_SSLLIB([GnuTLS], [gnutls/gnutls.h gcrypt.h], [gnutls gcrypt])
+ PECL_HAVE_LIBCURL_SSLLIB([NSS])
+ PECL_HAVE_LIBCURL_SSLLIB([SecureTransport])
+ PECL_HAVE_LIBCURL_SSLLIB([GSKit])
+diff -aurN a/src/php_http_client_curl.c b/src/php_http_client_curl.c
+--- a/src/php_http_client_curl.c 2016-12-12 04:04:21.000000000 -0500
++++ b/src/php_http_client_curl.c 2017-01-06 09:09:01.631772852 -0500
+@@ -21,7 +21,7 @@
+ # include <openssl/ssl.h>
+ #endif
+ #if PHP_HTTP_HAVE_LIBCURL_GNUTLS
+-# include <gnutls.h>
++# include <gnutls/gnutls.h>
+ #endif
+
+ typedef struct php_http_client_curl_handler {
diff --git a/dev-php/pecl-http/metadata.xml b/dev-php/pecl-http/metadata.xml
new file mode 100644
index 000000000000..b86acf66c756
--- /dev/null
+++ b/dev-php/pecl-http/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ <name>PHP</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/dev-php/pecl-http/pecl-http-2.6.0-r1.ebuild b/dev-php/pecl-http/pecl-http-2.6.0-r1.ebuild
new file mode 100644
index 000000000000..17aa145af9e9
--- /dev/null
+++ b/dev-php/pecl-http/pecl-http-2.6.0-r1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PHP_EXT_NAME="http"
+PHP_EXT_PECL_PKG="pecl_http"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+
+USE_PHP="php5-6 php7-0 php7-1"
+
+inherit php-ext-pecl-r3
+
+USE_PHP="php5-6"
+
+KEYWORDS="~amd64 ~x86"
+
+DESCRIPTION="Extended HTTP Support for PHP"
+LICENSE="BSD-2 MIT"
+SLOT="2"
+IUSE="ssl curl_ssl_gnutls curl_ssl_libressl curl_ssl_nss +curl_ssl_openssl"
+
+DEPEND="php_targets_php5-6? (
+ dev-libs/libevent
+ dev-php/pecl-propro:0[php_targets_php5-6]
+ dev-php/pecl-raphf:0[php_targets_php5-6]
+ net-dns/libidn
+ sys-libs/zlib
+ ssl? ( net-misc/curl[ssl,curl_ssl_gnutls=,curl_ssl_libressl=,curl_ssl_nss=,curl_ssl_openssl=] )
+ !ssl? ( net-misc/curl[-ssl] )
+ dev-lang/php:5.6[hash,session,iconv] )"
+RDEPEND="${DEPEND}"
+PDEPEND="
+ php_targets_php7-0? ( dev-php/pecl-http:7[php_targets_php7-0] )
+ php_targets_php7-1? ( dev-php/pecl-http:7[php_targets_php7-1] )"
+
+PHP_EXT_ECONF_ARGS=( --with-http --without-http-shared-deps )
+
+src_prepare() {
+ if use php_targets_php5-6 ; then
+ php-ext-source-r3_src_prepare
+ else
+ default_src_prepare
+ fi
+}
+
+src_install() {
+ if use php_targets_php5-6 ; then
+ php-ext-pecl-r3_src_install
+
+ # Ensure that the http extension is loaded after its
+ # dependencies raphf and propro (bug 612054). Some day
+ # this should be possible through the eclass (bug 586446).
+ local slot, file, oldname, newname
+ for slot in $(php_get_slots); do
+ php_init_slot_env "${slot}"
+ for file in $(php_slot_ini_files "${slot}") ; do
+ # Prepend "zz" to the ini symlink name. This is sadly
+ # coupled to the naming convention in the eclass.
+ oldname="${ED}/${file/ext/ext-active}"
+ newname="${oldname/${PHP_EXT_NAME}.ini/zz${PHP_EXT_NAME}.ini}"
+ mv "${oldname}" "${newname}" \
+ || die "failed to rename ${oldname} to ${newname}"
+ einfo "renamed ${oldname} to ${newname}"
+ done
+ done
+ fi
+}
diff --git a/dev-php/pecl-http/pecl-http-2.6.0-r2.ebuild b/dev-php/pecl-http/pecl-http-2.6.0-r2.ebuild
new file mode 100644
index 000000000000..63cfe3ff8054
--- /dev/null
+++ b/dev-php/pecl-http/pecl-http-2.6.0-r2.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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="php5-6 php7-0 php7-1 php7-2"
+
+inherit php-ext-pecl-r3
+
+USE_PHP="php5-6"
+
+KEYWORDS="~amd64 ~x86"
+
+DESCRIPTION="Extended HTTP Support for PHP"
+LICENSE="BSD-2 MIT"
+SLOT="2"
+IUSE="ssl curl_ssl_gnutls curl_ssl_libressl curl_ssl_nss +curl_ssl_openssl"
+
+DEPEND="php_targets_php5-6? (
+ dev-libs/libevent
+ dev-php/pecl-propro:0[php_targets_php5-6]
+ dev-php/pecl-raphf:0[php_targets_php5-6]
+ net-dns/libidn
+ sys-libs/zlib
+ ssl? ( net-misc/curl[ssl,curl_ssl_gnutls=,curl_ssl_libressl=,curl_ssl_nss=,curl_ssl_openssl=] )
+ !ssl? ( net-misc/curl[-ssl] )
+ dev-lang/php:5.6[hash,session,iconv] )"
+RDEPEND="${DEPEND}"
+PDEPEND="
+ php_targets_php7-0? ( dev-php/pecl-http:7[php_targets_php7-0] )
+ php_targets_php7-1? ( dev-php/pecl-http:7[php_targets_php7-1] )
+ php_targets_php7-2? ( dev-php/pecl-http:7[php_targets_php7-2] )"
+
+PHP_EXT_ECONF_ARGS=( --with-http --without-http-shared-deps )
+
+src_prepare() {
+ if use php_targets_php5-6 ; then
+ php-ext-source-r3_src_prepare
+ else
+ default_src_prepare
+ fi
+}
+
+src_install() {
+ if use php_targets_php5-6 ; then
+ php-ext-pecl-r3_src_install
+ fi
+}
+
+src_test() {
+ for slot in $(php_get_slots); do
+ php_init_slot_env "${slot}"
+ ln -s "${EXT_DIR}/propro.so" "modules/propro.so" || die
+ ln -s "${EXT_DIR}/raphf.so" "modules/raphf.so" || die
+ sed -i \
+ 's/PHP_TEST_SHARED_EXTENSIONS)/PHP_TEST_SHARED_EXTENSIONS) -d extension=propro.so -d extension=raphf.so/' \
+ Makefile || die
+ NO_INTERACTION="yes" emake test
+ rm modules/propro.so modules/raphf.so || die
+ done
+}
+
+pkg_postinst() {
+ ewarn "This API has drastically changed and is not compatible with the 1.x syntax."
+ ewarn "Please review the documentation and update your code."
+}
diff --git a/dev-php/pecl-http/pecl-http-2.6.0.ebuild b/dev-php/pecl-http/pecl-http-2.6.0.ebuild
new file mode 100644
index 000000000000..2cb44cf7081a
--- /dev/null
+++ b/dev-php/pecl-http/pecl-http-2.6.0.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PHP_EXT_NAME="http"
+PHP_EXT_PECL_PKG="pecl_http"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+
+USE_PHP="php5-6 php7-0 php7-1"
+
+inherit php-ext-pecl-r3
+
+USE_PHP="php5-6"
+
+KEYWORDS="amd64 x86"
+
+DESCRIPTION="Extended HTTP Support for PHP"
+LICENSE="BSD-2 MIT"
+SLOT="2"
+IUSE="ssl curl_ssl_gnutls curl_ssl_libressl curl_ssl_nss +curl_ssl_openssl"
+
+DEPEND="php_targets_php5-6? (
+ dev-libs/libevent
+ dev-php/pecl-propro:0[php_targets_php5-6]
+ dev-php/pecl-raphf:0[php_targets_php5-6]
+ net-dns/libidn
+ sys-libs/zlib
+ ssl? ( net-misc/curl[ssl,curl_ssl_gnutls=,curl_ssl_libressl=,curl_ssl_nss=,curl_ssl_openssl=] )
+ !ssl? ( net-misc/curl[-ssl] )
+ dev-lang/php:5.6[hash,session,iconv] )"
+RDEPEND="${DEPEND}"
+PDEPEND="
+ php_targets_php7-0? ( dev-php/pecl-http:7[php_targets_php7-0] )
+ php_targets_php7-1? ( dev-php/pecl-http:7[php_targets_php7-1] )"
+
+PHP_EXT_ECONF_ARGS=( --with-http --without-http-shared-deps )
+
+src_prepare() {
+ if use php_targets_php5-6 ; then
+ php-ext-source-r3_src_prepare
+ else
+ default_src_prepare
+ fi
+}
+
+src_install() {
+ if use php_targets_php5-6 ; then
+ php-ext-pecl-r3_src_install
+ fi
+}
+
+pkg_postinst() {
+ ewarn "This API has drastically changed and is not compatible with the 1.x syntax."
+ ewarn "Please review the documentation and update your code."
+}
diff --git a/dev-php/pecl-http/pecl-http-3.1.0-r1.ebuild b/dev-php/pecl-http/pecl-http-3.1.0-r1.ebuild
new file mode 100644
index 000000000000..df1e34b5a7e3
--- /dev/null
+++ b/dev-php/pecl-http/pecl-http-3.1.0-r1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PHP_EXT_NAME="http"
+PHP_EXT_PECL_PKG="pecl_http"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+
+USE_PHP="php5-6 php7-0 php7-1"
+
+inherit php-ext-pecl-r3
+
+USE_PHP="php7-0 php7-1"
+
+KEYWORDS="~amd64 ~x86"
+
+DESCRIPTION="Extended HTTP Support for PHP"
+LICENSE="BSD-2 MIT"
+SLOT="7"
+IUSE="ssl curl_ssl_gnutls curl_ssl_libressl curl_ssl_nss +curl_ssl_openssl"
+
+DEPEND="dev-libs/libevent
+ dev-php/pecl-propro:7[php_targets_php5-6?,php_targets_php7-0?,php_targets_php7-1?]
+ dev-php/pecl-raphf:7[php_targets_php5-6?,php_targets_php7-0?,php_targets_php7-1?]
+ net-dns/libidn
+ sys-libs/zlib
+ ssl? ( net-misc/curl[ssl,curl_ssl_gnutls=,curl_ssl_libressl=,curl_ssl_nss=,curl_ssl_openssl=] )
+ !ssl? ( net-misc/curl[-ssl] )
+ php_targets_php7-0? ( dev-lang/php:7.0[hash,session,iconv] )
+ php_targets_php7-1? ( dev-lang/php:7.1[hash,session,iconv] )"
+RDEPEND="${DEPEND}
+ php_targets_php5-6? ( dev-php/pecl-http:2[php_targets_php5-6] )"
+
+PHP_EXT_ECONF_ARGS=( --with-http --without-http-shared-deps --without-http-libidn2-dir )
+
+PATCHES=( "${FILESDIR}/pecl-http-gnutls.patch" )
+
+src_prepare() {
+ if use php_targets_php7-0 || use php_targets_php7-1 ; then
+ php-ext-source-r3_src_prepare
+ else
+ default_src_prepare
+ fi
+}
+
+src_install() {
+ if use php_targets_php7-0 || use php_targets_php7-1 ; then
+ php-ext-pecl-r3_src_install
+
+ # Ensure that the http extension is loaded after its
+ # dependencies raphf and propro (bug 612054). Some day
+ # this should be possible through the eclass (bug 586446).
+ local slot, file, oldname, newname
+ for slot in $(php_get_slots); do
+ php_init_slot_env "${slot}"
+ for file in $(php_slot_ini_files "${slot}") ; do
+ # Prepend "zz" to the ini symlink name. This is sadly
+ # coupled to the naming convention in the eclass.
+ oldname="${ED}/${file/ext/ext-active}"
+ newname="${oldname/${PHP_EXT_NAME}.ini/zz${PHP_EXT_NAME}.ini}"
+ mv "${oldname}" "${newname}" \
+ || die "failed to rename ${oldname} to ${newname}"
+ einfo "renamed ${oldname} to ${newname}"
+ done
+ done
+ fi
+}
diff --git a/dev-php/pecl-http/pecl-http-3.1.0-r2.ebuild b/dev-php/pecl-http/pecl-http-3.1.0-r2.ebuild
new file mode 100644
index 000000000000..9351232041c4
--- /dev/null
+++ b/dev-php/pecl-http/pecl-http-3.1.0-r2.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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="php5-6 php7-0 php7-1 php7-2"
+
+inherit php-ext-pecl-r3
+
+USE_PHP="php7-0 php7-1 php7-2"
+
+KEYWORDS="~amd64 ~x86"
+
+DESCRIPTION="Extended HTTP Support for PHP"
+LICENSE="BSD-2 MIT"
+SLOT="7"
+IUSE="ssl curl_ssl_gnutls curl_ssl_libressl curl_ssl_nss +curl_ssl_openssl"
+
+DEPEND="dev-libs/libevent
+ dev-php/pecl-propro:7[php_targets_php5-6?,php_targets_php7-0?,php_targets_php7-1?,php_targets_php7-2?]
+ dev-php/pecl-raphf:7[php_targets_php5-6?,php_targets_php7-0?,php_targets_php7-1?,php_targets_php7-2?]
+ net-dns/libidn2
+ sys-libs/zlib
+ ssl? ( net-misc/curl[ssl,curl_ssl_gnutls=,curl_ssl_libressl=,curl_ssl_nss=,curl_ssl_openssl=] )
+ !ssl? ( net-misc/curl[-ssl] )
+ php_targets_php7-0? ( dev-lang/php:7.0[hash,session,iconv] )
+ php_targets_php7-1? ( dev-lang/php:7.1[hash,session,iconv] )
+ php_targets_php7-2? ( dev-lang/php:7.2[hash,session,iconv] )"
+RDEPEND="${DEPEND}
+ php_targets_php5-6? ( dev-php/pecl-http:2[php_targets_php5-6] )"
+
+PHP_EXT_ECONF_ARGS=( --with-http --without-http-shared-deps --without-http-libidn-dir )
+
+PATCHES=( "${FILESDIR}/pecl-http-gnutls.patch" )
+
+src_prepare() {
+ if use php_targets_php7-0 || use php_targets_php7-1 || use php_targets_php7-2 ; then
+ php-ext-source-r3_src_prepare
+ else
+ default_src_prepare
+ fi
+}
+
+src_install() {
+ if use php_targets_php7-0 || use php_targets_php7-1 || use php_targets_php7-2 ; 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}/propro.so" "modules/propro.so" || die
+ ln -s "${EXT_DIR}/raphf.so" "modules/raphf.so" || die
+ sed -i \
+ 's/PHP_TEST_SHARED_EXTENSIONS)/PHP_TEST_SHARED_EXTENSIONS) -d extension=propro.so -d extension=raphf.so/' \
+ Makefile || die
+ NO_INTERACTION="yes" emake test
+ # Clean up testing links
+ rm modules/propro.so modules/raphf.so || die
+ done
+}
+
+pkg_postinst() {
+ ewarn "This API has drastically changed and is not compatible with the 1.x syntax."
+ ewarn "Please review the documentation and update your code."
+}
diff --git a/dev-php/pecl-http/pecl-http-3.1.0.ebuild b/dev-php/pecl-http/pecl-http-3.1.0.ebuild
new file mode 100644
index 000000000000..c262cbac8549
--- /dev/null
+++ b/dev-php/pecl-http/pecl-http-3.1.0.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PHP_EXT_NAME="http"
+PHP_EXT_PECL_PKG="pecl_http"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+
+USE_PHP="php5-6 php7-0 php7-1"
+
+inherit php-ext-pecl-r3
+
+USE_PHP="php7-0 php7-1"
+
+KEYWORDS="amd64 x86"
+
+DESCRIPTION="Extended HTTP Support for PHP"
+LICENSE="BSD-2 MIT"
+SLOT="7"
+IUSE="ssl curl_ssl_gnutls curl_ssl_libressl curl_ssl_nss +curl_ssl_openssl"
+
+DEPEND="dev-libs/libevent
+ dev-php/pecl-propro:7[php_targets_php5-6?,php_targets_php7-0?,php_targets_php7-1?]
+ dev-php/pecl-raphf:7[php_targets_php5-6?,php_targets_php7-0?,php_targets_php7-1?]
+ net-dns/libidn
+ sys-libs/zlib
+ ssl? ( net-misc/curl[ssl,curl_ssl_gnutls=,curl_ssl_libressl=,curl_ssl_nss=,curl_ssl_openssl=] )
+ !ssl? ( net-misc/curl[-ssl] )
+ php_targets_php7-0? ( dev-lang/php:7.0[hash,session,iconv] )
+ php_targets_php7-1? ( dev-lang/php:7.1[hash,session,iconv] )"
+RDEPEND="${DEPEND}
+ php_targets_php5-6? ( dev-php/pecl-http:2[php_targets_php5-6] )"
+
+PHP_EXT_ECONF_ARGS=( --with-http --without-http-shared-deps --without-http-libidn2-dir )
+
+PATCHES=( "${FILESDIR}/pecl-http-gnutls.patch" )
+
+src_prepare() {
+ if use php_targets_php7-0 || use php_targets_php7-1 ; then
+ php-ext-source-r3_src_prepare
+ else
+ default_src_prepare
+ fi
+}
+
+src_install() {
+ if use php_targets_php7-0 || use php_targets_php7-1 ; then
+ php-ext-pecl-r3_src_install
+ fi
+}
+
+pkg_postinst() {
+ ewarn "This API has drastically changed and is not compatible with the 1.x syntax."
+ ewarn "Please review the documentation and update your code."
+}
diff --git a/dev-php/pecl-imagick-3.4.3 b/dev-php/pecl-imagick-3.4.3
deleted file mode 100644
index 05c629dc3a25..000000000000
--- a/dev-php/pecl-imagick-3.4.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=media-gfx/imagemagick-6.2.4:=[-openmp] test? ( >=media-gfx/imagemagick-6.2.4:=[jpeg,png,truetype] ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 )
-DESCRIPTION=PHP wrapper for the ImageMagick library
-EAPI=6
-HOMEPAGE=https://pecl.php.net/imagick
-IUSE=examples test php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2
-KEYWORDS=amd64 x86
-LICENSE=PHP-3.01
-RDEPEND=>=media-gfx/imagemagick-6.2.4:=[-openmp] php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 )
-REQUIRED_USE=|| ( php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2 )
-SLOT=0
-SRC_URI=https://pecl.php.net/get/imagick-3.4.3.tgz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e php-ext-pecl-r3 a59741d3df8ea9f17afcdcfb7edaee6d php-ext-source-r3 63b281041baa106ff1ef59b602ca7e2a toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=54f3aa08d0c17b1e7ae063d43b7d6083
diff --git a/dev-php/pecl-imagick/Manifest b/dev-php/pecl-imagick/Manifest
new file mode 100644
index 000000000000..1310f866fa16
--- /dev/null
+++ b/dev-php/pecl-imagick/Manifest
@@ -0,0 +1,3 @@
+DIST imagick-3.4.3.tgz 245410 BLAKE2B 778c3b8ad3ad5e698044a832d71409eea220a82041544abeb88b59370d4b719388ce13b277d7aad84e67e40fcbbfa06d66a2458d4d9e8d33bb7358ab46368230 SHA512 2cb2b856cf83a78d3542cdf7c69554dcc063a0541e9092b24e5e1fbd8928066a4a3de154049d0202c35addbc5055ccfbb5910ae92f2f13da80ddfc025340ddcd
+EBUILD pecl-imagick-3.4.3.ebuild 619 BLAKE2B 346a2b31b3bd66759246937d2145c00f14af2b86aa8bdb0eae1909c5e94f4627c1429b729f0e2396fbcb65cb69ebe5c9b8edc2dac998bac6a36976250fc2b1c1 SHA512 945955dfa61d5ba5e936a2f8780bdced9e03ec02b2f9288eb3290106e4cd47a80cb55f82a2b31a493bdc1bb849dd8db03abeca02dc98e8bb6f65177dde0eb8c4
+MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/pecl-imagick/metadata.xml b/dev-php/pecl-imagick/metadata.xml
new file mode 100644
index 000000000000..b86acf66c756
--- /dev/null
+++ b/dev-php/pecl-imagick/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ <name>PHP</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/dev-php/pecl-imagick/pecl-imagick-3.4.3.ebuild b/dev-php/pecl-imagick/pecl-imagick-3.4.3.ebuild
new file mode 100644
index 000000000000..2552562115d0
--- /dev/null
+++ b/dev-php/pecl-imagick/pecl-imagick-3.4.3.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PV="${PV/rc/RC}"
+
+USE_PHP="php5-6 php7-0 php7-1 php7-2"
+
+inherit php-ext-pecl-r3
+
+KEYWORDS="amd64 x86"
+
+DESCRIPTION="PHP wrapper for the ImageMagick library"
+LICENSE="PHP-3.01"
+SLOT="0"
+IUSE="examples 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:=[jpeg,png,truetype] )"
+
+PHP_EXT_ECONF_ARGS="--with-imagick=${EPREFIX}/usr"
diff --git a/dev-php/pecl-libevent-0.1.0-r2 b/dev-php/pecl-libevent-0.1.0-r2
deleted file mode 100644
index 53c27954c613..000000000000
--- a/dev-php/pecl-libevent-0.1.0-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/libevent-1.4.0 >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php5-6? ( dev-lang/php:5.6 )
-DESCRIPTION=PHP wrapper for libevent
-EAPI=6
-HOMEPAGE=https://pecl.php.net/libevent
-IUSE=php_targets_php5-6
-KEYWORDS=~amd64 ~x86
-LICENSE=PHP-3
-RDEPEND=>=dev-libs/libevent-1.4.0 php_targets_php5-6? ( dev-lang/php:5.6 )
-REQUIRED_USE=|| ( php_targets_php5-6 )
-SLOT=0
-SRC_URI=https://pecl.php.net/get/libevent-0.1.0.tgz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e php-ext-pecl-r3 a59741d3df8ea9f17afcdcfb7edaee6d php-ext-source-r3 63b281041baa106ff1ef59b602ca7e2a toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=af81557d1da74d39483cf115bfd4046f
diff --git a/dev-php/pecl-libevent/Manifest b/dev-php/pecl-libevent/Manifest
new file mode 100644
index 000000000000..7d411f50c6a6
--- /dev/null
+++ b/dev-php/pecl-libevent/Manifest
@@ -0,0 +1,3 @@
+DIST libevent-0.1.0.tgz 9806 BLAKE2B e54ccc345d975574bac4dd5c66e48b7f84a2fff75059cfb370faaf01adbcf10f1683fdba142ba2057d2c067d59f1dae61c42447828390a2d9fcd360a5c268191 SHA512 d49a24dcd9389ffe59e367d7c3b5d6e6cb07b5acc3f9c82cad9cd0fdcebf5feddcd7ec0bbc0c6d9eab450629e446575ce0ed711482557c4bc87cd4c6bc59f995
+EBUILD pecl-libevent-0.1.0-r2.ebuild 373 BLAKE2B 2fa87085b503cb9982742a3dc06265f933b54f85e16b6b99f0d0256bf19996165d1a6d59e8641c098756fb9c418ed5e66f9510a905f7c56528aa6759e1f239dd SHA512 aa248189304595a099b6f31ade7d449dcb9d25485d599affe66f615885892a1e789dff63d788e1ca1a6d5dcca86ac42cf8549cb666575e1ffe8827992fb7fdc7
+MISC metadata.xml 233 BLAKE2B 6007090254e38c5a2f55fae0db20ec4cd34ec990fdceb934bc7b6d27bbc5d012c53af76e0bc966dcffd1594de26a894dfe19721e06be52ec5a007b4c9ebe6fc1 SHA512 a9b5c765633c7eacd7978444e065d5eef85ce8d71de4d1467dee2ad527384e676acabde6c9daaf1ee087c1661e744d4051c983fb707c7260ddd80e50190b137c
diff --git a/dev-php/pecl-libevent/metadata.xml b/dev-php/pecl-libevent/metadata.xml
new file mode 100644
index 000000000000..034baa38a6ed
--- /dev/null
+++ b/dev-php/pecl-libevent/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+<email>php-bugs@gentoo.org</email>
+<name>PHP</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-php/pecl-libevent/pecl-libevent-0.1.0-r2.ebuild b/dev-php/pecl-libevent/pecl-libevent-0.1.0-r2.ebuild
new file mode 100644
index 000000000000..f2768d4e97b6
--- /dev/null
+++ b/dev-php/pecl-libevent/pecl-libevent-0.1.0-r2.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PHP_EXT_NAME="libevent"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+
+USE_PHP="php5-6"
+inherit php-ext-pecl-r3
+
+KEYWORDS="~amd64 ~x86"
+
+DESCRIPTION="PHP wrapper for libevent"
+LICENSE="PHP-3"
+SLOT="0"
+IUSE=""
+
+DEPEND=">=dev-libs/libevent-1.4.0"
+RDEPEND="${DEPEND}"
diff --git a/dev-php/pecl-lzf-1.6.6 b/dev-php/pecl-lzf-1.6.6
deleted file mode 100644
index eeac44055cde..000000000000
--- a/dev-php/pecl-lzf-1.6.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 )
-DESCRIPTION=This package handles LZF de/compression
-EAPI=6
-HOMEPAGE=https://pecl.php.net/LZF
-IUSE=php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2
-KEYWORDS=~amd64 ~x86
-LICENSE=PHP-3
-RDEPEND=php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 )
-REQUIRED_USE=|| ( php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2 )
-SLOT=0
-SRC_URI=https://pecl.php.net/get/LZF-1.6.6.tgz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e php-ext-pecl-r3 a59741d3df8ea9f17afcdcfb7edaee6d php-ext-source-r3 63b281041baa106ff1ef59b602ca7e2a toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=8b989474f627f1af058746fb0e38594c
diff --git a/dev-php/pecl-lzf/Manifest b/dev-php/pecl-lzf/Manifest
new file mode 100644
index 000000000000..2db402326ea1
--- /dev/null
+++ b/dev-php/pecl-lzf/Manifest
@@ -0,0 +1,3 @@
+DIST LZF-1.6.6.tgz 17603 BLAKE2B 8aab6327234b590e3b1bc22d3bf9545cd41d79ea260f73c8c6599fd88de8963e556cd71bdccdc6dfce825e24f4e1b2af477476acc1f6b184586ace7e15b28104 SHA512 a049ce5df065eb9c4d3046822f659f929ff4f270c4d80c5d0bcd44679d69524e7ee23e98931fca9f36a566ae023827eb47b66ce651ce6d0f6fbe0643692e7ef4
+EBUILD pecl-lzf-1.6.6.ebuild 372 BLAKE2B dc6212b1c1010db7b391504e55b432fb2923e32072e8faf9f8eb3095a8c16de59fb0732f070e51bd5c18b126f6e70906349ea28dc719ba993c31dfd500ca479b SHA512 b096f4fdc980a82e9dc8e40ee138b1777b0d58970456d300fc6fed50a22aa21c41549ed40f96069b1360c29ce1284cd210dd4edad57d9fbf3467ec2c9f56175f
+MISC metadata.xml 235 BLAKE2B 5b10304feea18aae1822be7d29bcce06c8715193b14a3dd2c4d79eb75e2767670352e2ca11e06b9a10ec04b63020a18254cd167e6d6be9072f4a200ca5d11ec4 SHA512 0b3e95bbf68eddf74289dad50f8828cffce2d904ff6f9bd5468177de979677cac11da84d1e0302c52b72085915b9d1b3496107172e5726520d51dad1981daf64
diff --git a/dev-php/pecl-lzf/metadata.xml b/dev-php/pecl-lzf/metadata.xml
new file mode 100644
index 000000000000..aca42932b833
--- /dev/null
+++ b/dev-php/pecl-lzf/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ <name>PHP</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-php/pecl-lzf/pecl-lzf-1.6.6.ebuild b/dev-php/pecl-lzf/pecl-lzf-1.6.6.ebuild
new file mode 100644
index 000000000000..1ee9a72e34dc
--- /dev/null
+++ b/dev-php/pecl-lzf/pecl-lzf-1.6.6.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PHP_EXT_NAME="lzf"
+PHP_EXT_PECL_PKG="LZF"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+USE_PHP="php5-6 php7-0 php7-1 php7-2"
+
+inherit php-ext-pecl-r3
+
+KEYWORDS="~amd64 ~x86"
+
+DESCRIPTION="This package handles LZF de/compression"
+LICENSE="PHP-3"
+SLOT="0"
+IUSE=""
diff --git a/dev-php/pecl-mailparse-2.1.6-r4 b/dev-php/pecl-mailparse-2.1.6-r4
deleted file mode 100644
index 7f41f344e4cb..000000000000
--- a/dev-php/pecl-mailparse-2.1.6-r4
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=php_targets_php5-6? ( dev-lang/php:5.6[unicode] ) dev-util/re2c >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 )
-DESCRIPTION=PHP extension for parsing RFC822 and RFC2045 (MIME) messages
-EAPI=6
-HOMEPAGE=https://pecl.php.net/mailparse
-IUSE=php_targets_php5-6 php_targets_php7-0 php_targets_php7-1
-KEYWORDS=amd64 ppc ppc64 x86
-LICENSE=PHP-2.02
-PDEPEND=php_targets_php7-0? ( dev-php/pecl-mailparse:7[php_targets_php7-0] ) php_targets_php7-1? ( dev-php/pecl-mailparse:7[php_targets_php7-1] )
-RDEPEND=php_targets_php5-6? ( dev-lang/php:5.6[unicode] ) php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 )
-REQUIRED_USE=|| ( php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 )
-SLOT=0
-SRC_URI=https://pecl.php.net/get/mailparse-2.1.6.tgz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e php-ext-pecl-r3 a59741d3df8ea9f17afcdcfb7edaee6d php-ext-source-r3 63b281041baa106ff1ef59b602ca7e2a toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=c269a266dc2fc120c54e1fcd56578494
diff --git a/dev-php/pecl-mailparse-3.0.2 b/dev-php/pecl-mailparse-3.0.2
deleted file mode 100644
index f2ce41d470c2..000000000000
--- a/dev-php/pecl-mailparse-3.0.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=php_targets_php7-0? ( dev-lang/php:7.0[unicode] ) php_targets_php7-1? ( dev-lang/php:7.1[unicode] ) dev-util/re2c >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php5-6? ( dev-lang/php:5.6 )
-DESCRIPTION=PHP extension for parsing and working with RFC822 and MIME compliant messages
-EAPI=6
-HOMEPAGE=https://pecl.php.net/mailparse
-IUSE=php_targets_php7-0 php_targets_php7-1 php_targets_php5-6
-KEYWORDS=amd64 ppc ppc64 x86
-LICENSE=PHP-3.01
-RDEPEND=php_targets_php7-0? ( dev-lang/php:7.0[unicode] ) php_targets_php7-1? ( dev-lang/php:7.1[unicode] ) php_targets_php5-6? ( dev-php/pecl-mailparse:0[php_targets_php5-6] ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php5-6? ( dev-lang/php:5.6 )
-REQUIRED_USE=|| ( php_targets_php7-0 php_targets_php7-1 php_targets_php5-6 )
-SLOT=7
-SRC_URI=https://pecl.php.net/get/mailparse-3.0.2.tgz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e php-ext-pecl-r3 a59741d3df8ea9f17afcdcfb7edaee6d php-ext-source-r3 63b281041baa106ff1ef59b602ca7e2a toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=aed655ccfdf4870db767bf32f3935079
diff --git a/dev-php/pecl-mailparse-3.0.2-r1 b/dev-php/pecl-mailparse-3.0.2-r1
deleted file mode 100644
index 952b7f49e9a8..000000000000
--- a/dev-php/pecl-mailparse-3.0.2-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=php_targets_php7-0? ( dev-lang/php:7.0[unicode] ) php_targets_php7-1? ( dev-lang/php:7.1[unicode] ) php_targets_php7-2? ( dev-lang/php:7.2[unicode] ) dev-util/re2c >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-2? ( dev-lang/php:7.2 )
-DESCRIPTION=PHP extension for parsing and working with RFC822 and MIME compliant messages
-EAPI=6
-HOMEPAGE=https://pecl.php.net/mailparse
-IUSE=php_targets_php7-0 php_targets_php7-1 php_targets_php5-6 php_targets_php7-2
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=PHP-3.01
-RDEPEND=php_targets_php7-0? ( dev-lang/php:7.0[unicode] ) php_targets_php7-1? ( dev-lang/php:7.1[unicode] ) php_targets_php7-2? ( dev-lang/php:7.2[unicode] ) php_targets_php5-6? ( dev-php/pecl-mailparse:0[php_targets_php5-6] ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-2? ( dev-lang/php:7.2 )
-REQUIRED_USE=|| ( php_targets_php7-0 php_targets_php7-1 php_targets_php5-6 php_targets_php7-2 )
-SLOT=7
-SRC_URI=https://pecl.php.net/get/mailparse-3.0.2.tgz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e php-ext-pecl-r3 a59741d3df8ea9f17afcdcfb7edaee6d php-ext-source-r3 63b281041baa106ff1ef59b602ca7e2a toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=888dcd01209006bd0df368b3918f2b29
diff --git a/dev-php/pecl-mailparse/Manifest b/dev-php/pecl-mailparse/Manifest
new file mode 100644
index 000000000000..a6b21761db49
--- /dev/null
+++ b/dev-php/pecl-mailparse/Manifest
@@ -0,0 +1,6 @@
+DIST mailparse-2.1.6.tgz 36538 BLAKE2B c079a5f9980384ea90113d3e295b3de4182c8c3006a62439bfb73ab39dc67bb03202298e7bf5e42f71d599d645cf4d79fbf2d09a536e621efe73f8fff6bce56a SHA512 a7337dd2e99a953a55b38c236da95a6bd2950c2bca16fc0ddfec39be8b0ffe01007353fc7b562d0509e0bb1623c3d2b03935d1c98a07dcd9f0b14bb508bce374
+DIST mailparse-3.0.2.tgz 38206 BLAKE2B f50b3f5abfc6e2e5a3647eb33ad07de9e3e66a94933be612a51c868210745b109ddca8e3e174a7a4abcfdc72856f34848e65972b277cfa3e836bef3ee4c79897 SHA512 be04e15cf3577542447186d7ead4e31159c171c99de0a255d4ee2f6f760b80ecb44be056bd9089180601f622b9a71f4331f194e1adaa702d1d964009682896f6
+EBUILD pecl-mailparse-2.1.6-r4.ebuild 839 BLAKE2B 518ecef31d10faf97091c9c7e8cd13789d47b42ecafd7c75822c5e91a10fa2a952e48440503b5697a3581d3723ebb279e134e42b66284b017b2d11ab7341bdc8 SHA512 0ca4e958f293f3dbef2cbbbd08248a11f9eeadc971c5e5f940b56fc721aaa841ae143e4a60989e344307c5641e3e1266c771397f422e8f30074b0d0041e716c9
+EBUILD pecl-mailparse-3.0.2-r1.ebuild 1102 BLAKE2B e2d3415cdf18b60b438eb722965ce005f2eff5a369b2852130f8327371ee8a8ca116c45019c6cc7c3352adca1c270f3e05ab8397b08093cac7b9e9b6133f2c65 SHA512 1abb3679ff2b75393541481a09d5652d4e17a517e1e98e916882f1081906761b66a9469e0971506b4985d1eb22c6c0c033df8c5f8314ab0dabce76858c7ade9e
+EBUILD pecl-mailparse-3.0.2.ebuild 1070 BLAKE2B ed243cc104739cca574ff091ac1ff0722e7971a05cf9fb42cc5f6592d0f6363b1f73382cf61b3181e91c7bf7f441c702e946b787749b784648c4c8c548dd2f8a SHA512 69b0b8ded36c21069f5aa10244288526af79a3afb7b24044e1ac50fc7888158c7ca6e1d6cd247c207a3c0a43892d65ea6826f579acb74fe36f4a05ed05e13d11
+MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/pecl-mailparse/metadata.xml b/dev-php/pecl-mailparse/metadata.xml
new file mode 100644
index 000000000000..b86acf66c756
--- /dev/null
+++ b/dev-php/pecl-mailparse/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ <name>PHP</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/dev-php/pecl-mailparse/pecl-mailparse-2.1.6-r4.ebuild b/dev-php/pecl-mailparse/pecl-mailparse-2.1.6-r4.ebuild
new file mode 100644
index 000000000000..aa8239c01eca
--- /dev/null
+++ b/dev-php/pecl-mailparse/pecl-mailparse-2.1.6-r4.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PHP_EXT_NAME="mailparse"
+PHP_EXT_ECONF_ARGS=""
+DOCS=( README )
+
+USE_PHP="php5-6 php7-0 php7-1"
+
+inherit php-ext-pecl-r3
+
+USE_PHP="php5-6"
+KEYWORDS="amd64 ppc ppc64 x86"
+
+DESCRIPTION="PHP extension for parsing RFC822 and RFC2045 (MIME) messages"
+LICENSE="PHP-2.02"
+SLOT="0"
+IUSE=""
+
+RDEPEND="php_targets_php5-6? ( dev-lang/php:5.6[unicode] )"
+DEPEND="${RDEPEND}
+ dev-util/re2c"
+PDEPEND="
+php_targets_php7-0? ( dev-php/pecl-mailparse:7[php_targets_php7-0] )
+php_targets_php7-1? ( dev-php/pecl-mailparse:7[php_targets_php7-1] )
+"
+
+src_prepare() {
+ if use php_targets_php5-6 ; then
+ php-ext-source-r3_src_prepare
+ else
+ eapply_user
+ fi
+}
+
+src_install() {
+ if use php_targets_php5-6 ; then
+ php-ext-pecl-r3_src_install
+ fi
+}
diff --git a/dev-php/pecl-mailparse/pecl-mailparse-3.0.2-r1.ebuild b/dev-php/pecl-mailparse/pecl-mailparse-3.0.2-r1.ebuild
new file mode 100644
index 000000000000..9b37d88dcd95
--- /dev/null
+++ b/dev-php/pecl-mailparse/pecl-mailparse-3.0.2-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PHP_EXT_NAME="mailparse"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+PHP_EXT_ECONF_ARGS=""
+DOCS=( README )
+
+USE_PHP="php7-0 php7-1 php5-6 php7-2"
+
+inherit php-ext-pecl-r3
+
+# Only build for 7.x
+USE_PHP="php7-0 php7-1 php7-2"
+
+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=""
+
+PHPUSEDEPEND="
+ php_targets_php7-0? ( dev-lang/php:7.0[unicode] )
+ php_targets_php7-1? ( dev-lang/php:7.1[unicode] )
+ php_targets_php7-2? ( dev-lang/php:7.2[unicode] )
+"
+DEPEND="${PHPUSEDEPEND}
+ dev-util/re2c"
+RDEPEND="${PHPUSEDEPEND} php_targets_php5-6? ( dev-php/pecl-mailparse:0[php_targets_php5-6] )"
+
+src_prepare() {
+ if use php_targets_php7-0 || use php_targets_php7-1 || use php_targets_php7-2 ; then
+ php-ext-source-r3_src_prepare
+ else
+ default
+ fi
+}
+
+src_install() {
+ if use php_targets_php7-0 || use php_targets_php7-1 || use php_targets_php7-2 ; then
+ php-ext-pecl-r3_src_install
+ fi
+}
diff --git a/dev-php/pecl-mailparse/pecl-mailparse-3.0.2.ebuild b/dev-php/pecl-mailparse/pecl-mailparse-3.0.2.ebuild
new file mode 100644
index 000000000000..8d774c1f57c9
--- /dev/null
+++ b/dev-php/pecl-mailparse/pecl-mailparse-3.0.2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PHP_EXT_NAME="mailparse"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+PHP_EXT_ECONF_ARGS=""
+DOCS=( README )
+
+USE_PHP="php7-0 php7-1 php5-6"
+
+inherit php-ext-pecl-r3
+
+# Only build for 7.x
+USE_PHP="php7-0 php7-1"
+
+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=""
+
+for target in ${USE_PHP}; do
+ phpslot=${target/php}
+ phpslot=${phpslot/-/.}
+ PHPUSEDEPEND="${PHPUSEDEPEND}
+ php_targets_${target}? ( dev-lang/php:${phpslot}[unicode] )"
+done
+unset target phpslot
+
+DEPEND="${PHPUSEDEPEND}
+ dev-util/re2c"
+RDEPEND="${PHPUSEDEPEND} php_targets_php5-6? ( dev-php/pecl-mailparse:0[php_targets_php5-6] )"
+
+src_prepare() {
+ if use php_targets_php7-0 || use php_targets_php7-1 ; then
+ php-ext-source-r3_src_prepare
+ else
+ default_src_prepare
+ fi
+}
+
+src_install() {
+ if use php_targets_php7-0 || use php_targets_php7-1 ; then
+ php-ext-pecl-r3_src_install
+ fi
+}
diff --git a/dev-php/pecl-memcache-3.0.8-r2 b/dev-php/pecl-memcache-3.0.8-r2
deleted file mode 100644
index 0fc306aae245..000000000000
--- a/dev-php/pecl-memcache-3.0.8-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-libs/zlib dev-lang/php:5.6[session?] >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php5-6? ( dev-lang/php:5.6 )
-DESCRIPTION=PHP extension for using memcached
-EAPI=6
-HOMEPAGE=https://pecl.php.net/memcache
-IUSE=+session php_targets_php5-6
-KEYWORDS=amd64 hppa ppc64 x86
-LICENSE=PHP-3
-RDEPEND=sys-libs/zlib dev-lang/php:5.6[session?] php_targets_php5-6? ( dev-lang/php:5.6 )
-REQUIRED_USE=|| ( php_targets_php5-6 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://pecl.php.net/get/memcache-3.0.8.tgz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e php-ext-pecl-r3 a59741d3df8ea9f17afcdcfb7edaee6d php-ext-source-r3 63b281041baa106ff1ef59b602ca7e2a preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=912f0756a251274db1f656847ab1f716
diff --git a/dev-php/pecl-memcache-3.0.8-r3 b/dev-php/pecl-memcache-3.0.8-r3
deleted file mode 100644
index e3f1ced6bf07..000000000000
--- a/dev-php/pecl-memcache-3.0.8-r3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-libs/zlib dev-lang/php:5.6[session?] >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php5-6? ( dev-lang/php:5.6 )
-DESCRIPTION=PHP extension for using memcached
-EAPI=6
-HOMEPAGE=https://pecl.php.net/memcache
-IUSE=+session php_targets_php5-6
-KEYWORDS=~amd64 ~hppa ~ppc64 ~x86
-LICENSE=PHP-3
-RDEPEND=sys-libs/zlib dev-lang/php:5.6[session?] php_targets_php5-6? ( dev-lang/php:5.6 )
-REQUIRED_USE=|| ( php_targets_php5-6 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://pecl.php.net/get/memcache-3.0.8.tgz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e php-ext-pecl-r3 a59741d3df8ea9f17afcdcfb7edaee6d php-ext-source-r3 63b281041baa106ff1ef59b602ca7e2a toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=5786ffd788a11650d106c648d49f4db0
diff --git a/dev-php/pecl-memcache/Manifest b/dev-php/pecl-memcache/Manifest
new file mode 100644
index 000000000000..d3f0ac5ea213
--- /dev/null
+++ b/dev-php/pecl-memcache/Manifest
@@ -0,0 +1,5 @@
+AUX 3.0.8-c99-inline.patch 3162 BLAKE2B 4f7fbd8f93a4388f907c342009abe691444d25f585bd592c37a76e2051dc9e0ef84cba882184945fb01037f3f27c3e708db308931be00cc1a92c218b38c25e56 SHA512 3b066a1e9277b6b4553a62970ba4f41a3bf02131db7ff5f897956e9764c29633872626dfb1f0651a09fb7282d5487d9536df0d36800e6f5ab9905d4ca6b2b2b5
+DIST memcache-3.0.8.tgz 70523 BLAKE2B 829c842ac2764327037c5ef620cd4759e16d56e22195c035eeed2722d8a499119489d3304ad5223cf1c89a8e3ab6f6830d67742958ec2a37e302bf8ea265dfb1 SHA512 916c6b21ab7c1021128626c0df35ef0b83cb76b6115fe7c45b003ca4f78ad9484bf3c998bc7ebdee19f84349ff1e56759f74e75aee5bc70b1de9a03c45a99bc3
+EBUILD pecl-memcache-3.0.8-r2.ebuild 1398 BLAKE2B 4a45e7aebad2959946f9e7d795e53c2b1f71bdf2fc43ca4d253943aec90c04820d4dcb587fdba24a3f4b239b39065617db16cc3a88aeeffe51924d14521d230d SHA512 4265b0f10d51bb484774d3aefe16196e333bba4448705aec7d46cde66aef5a2d45fd183fd7d6cb8e1fcb9cede4a4b79762365097e604d827b32844f3937acd13
+EBUILD pecl-memcache-3.0.8-r3.ebuild 1355 BLAKE2B 7ae3e333f2de1f20abff63e31d2d47569545bf747cfdb42d3770f0ff25328d91760014ade79436071ad9c6637902e89de3b089946d3db15692b37578736c395f SHA512 dabcb52a6d7263a7b89e4910ebc23c38078692a999f0ff7bbe93063a1b40020efb07c13c3446158b6123464b97da22df6860b3646aed0f140ac6e15b699411e3
+MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/pecl-memcache/files/3.0.8-c99-inline.patch b/dev-php/pecl-memcache/files/3.0.8-c99-inline.patch
new file mode 100644
index 000000000000..818b3ce1e2d9
--- /dev/null
+++ b/dev-php/pecl-memcache/files/3.0.8-c99-inline.patch
@@ -0,0 +1,85 @@
+diff -aurN a/memcache_pool.h b/memcache_pool.h
+--- a/memcache_pool.h 2013-04-07 22:12:54.000000000 -0400
++++ b/memcache_pool.h 2017-05-19 16:04:45.262858090 -0400
+@@ -135,8 +135,14 @@
+ #define mmc_buffer_release(b) memset((b), 0, sizeof(*(b)))
+ #define mmc_buffer_reset(b) (b)->value.len = (b)->idx = 0
+
+-inline void mmc_buffer_alloc(mmc_buffer_t *, unsigned int);
+-inline void mmc_buffer_free(mmc_buffer_t *);
++#if !defined __STDC_VERSION__ || __STDC_VERSION__ < 199901L
++#define MMC_POOL_INLINE inline
++#else
++#define MMC_POOL_INLINE __attribute__ ((gnu_inline)) inline
++#endif
++
++MMC_POOL_INLINE void mmc_buffer_alloc(mmc_buffer_t *, unsigned int);
++MMC_POOL_INLINE void mmc_buffer_free(mmc_buffer_t *);
+
+ /* stream handlers */
+ typedef struct mmc_stream mmc_stream_t;
+@@ -391,8 +397,8 @@
+ double timeval_to_double(struct timeval tv);
+ struct timeval double_to_timeval(double sec);
+
+-inline int mmc_prepare_key_ex(const char *, unsigned int, char *, unsigned int *);
+-inline int mmc_prepare_key(zval *, char *, unsigned int *);
++MMC_POOL_INLINE int mmc_prepare_key_ex(const char *, unsigned int, char *, unsigned int *);
++MMC_POOL_INLINE int mmc_prepare_key(zval *, char *, unsigned int *);
+
+ #define mmc_str_left(h, n, hlen, nlen) ((hlen) >= (nlen) ? memcmp((h), (n), (nlen)) == 0 : 0)
+
+diff -aurN a/memcache_queue.h b/memcache_queue.h
+--- a/memcache_queue.h 2013-04-07 22:12:54.000000000 -0400
++++ b/memcache_queue.h 2017-05-19 16:07:23.753983941 -0400
+@@ -40,7 +40,11 @@
+ #ifdef PHP_WIN32
+ #define MMC_QUEUE_INLINE
+ #else
++#if !defined __STDC_VERSION__ || __STDC_VERSION__ < 199901L
+ #define MMC_QUEUE_INLINE inline
++#else
++#define MMC_QUEUE_INLINE __attribute__ ((gnu_inline)) inline
++#endif
+ #endif
+
+ MMC_QUEUE_INLINE void mmc_queue_push(mmc_queue_t *, void *);
+diff -aurN a/memcache_pool.c b/memcache_pool.c
+--- a/memcache_pool.c 2013-04-07 22:12:54.000000000 -0400
++++ b/memcache_pool.c 2017-05-19 16:22:51.592845885 -0400
+@@ -40,7 +40,7 @@
+
+ ZEND_DECLARE_MODULE_GLOBALS(memcache)
+
+-inline void mmc_buffer_alloc(mmc_buffer_t *buffer, unsigned int size) /*
++MMC_POOL_INLINE void mmc_buffer_alloc(mmc_buffer_t *buffer, unsigned int size) /*
+ ensures space for an additional size bytes {{{ */
+ {
+ register size_t newlen;
+@@ -48,7 +48,7 @@
+ }
+ /* }}} */
+
+-inline void mmc_buffer_free(mmc_buffer_t *buffer) /* {{{ */
++MMC_POOL_INLINE void mmc_buffer_free(mmc_buffer_t *buffer) /* {{{ */
+ {
+ if (buffer->value.c != NULL) {
+ smart_str_free(&(buffer->value));
+@@ -1676,7 +1676,7 @@
+ }
+ /* }}} */
+
+-inline int mmc_prepare_key_ex(const char *key, unsigned int key_len, char *result, unsigned int *result_len) /* {{{ */
++MMC_POOL_INLINE int mmc_prepare_key_ex(const char *key, unsigned int key_len, char *result, unsigned int *result_len) /* {{{ */
+ {
+ unsigned int i;
+ if (key_len == 0) {
+@@ -1694,7 +1694,7 @@
+ }
+ /* }}} */
+
+-inline int mmc_prepare_key(zval *key, char *result, unsigned int *result_len) /* {{{ */
++MMC_POOL_INLINE int mmc_prepare_key(zval *key, char *result, unsigned int *result_len) /* {{{ */
+ {
+ if (Z_TYPE_P(key) == IS_STRING) {
+ return mmc_prepare_key_ex(Z_STRVAL_P(key), Z_STRLEN_P(key), result, result_len);
diff --git a/dev-php/pecl-memcache/metadata.xml b/dev-php/pecl-memcache/metadata.xml
new file mode 100644
index 000000000000..b86acf66c756
--- /dev/null
+++ b/dev-php/pecl-memcache/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ <name>PHP</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/dev-php/pecl-memcache/pecl-memcache-3.0.8-r2.ebuild b/dev-php/pecl-memcache/pecl-memcache-3.0.8-r2.ebuild
new file mode 100644
index 000000000000..e35e5048a992
--- /dev/null
+++ b/dev-php/pecl-memcache/pecl-memcache-3.0.8-r2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PHP_EXT_NAME="memcache"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+DOCS=( README )
+
+USE_PHP="php5-6"
+
+inherit php-ext-pecl-r3 flag-o-matic
+
+KEYWORDS="amd64 hppa ppc64 x86"
+
+DESCRIPTION="PHP extension for using memcached"
+LICENSE="PHP-3"
+SLOT="0"
+IUSE="+session"
+
+DEPEND="sys-libs/zlib
+ dev-lang/php:5.6[session?]"
+RDEPEND="${DEPEND}"
+
+# The test suite requires memcached to be running.
+RESTRICT='test'
+
+src_configure() {
+ # fix bug 618920 by restoring pre-GCC5 inline semantics
+ append-cflags -std=gnu89
+ local PHP_EXT_ECONF_ARGS=( --enable-memcache --with-zlib-dir=/usr $(use_enable session memcache-session) )
+ php-ext-source-r3_src_configure
+}
+
+src_install() {
+ php-ext-pecl-r3_src_install
+
+ php-ext-source-r3_addtoinifiles "memcache.allow_failover" "true"
+ php-ext-source-r3_addtoinifiles "memcache.max_failover_attempts" "20"
+ php-ext-source-r3_addtoinifiles "memcache.chunk_size" "32768"
+ php-ext-source-r3_addtoinifiles "memcache.default_port" "11211"
+ php-ext-source-r3_addtoinifiles "memcache.hash_strategy" "consistent"
+ php-ext-source-r3_addtoinifiles "memcache.hash_function" "crc32"
+ php-ext-source-r3_addtoinifiles "memcache.redundancy" "1"
+ php-ext-source-r3_addtoinifiles "memcache.session_redundancy" "2"
+ php-ext-source-r3_addtoinifiles "memcache.protocol" "ascii"
+}
diff --git a/dev-php/pecl-memcache/pecl-memcache-3.0.8-r3.ebuild b/dev-php/pecl-memcache/pecl-memcache-3.0.8-r3.ebuild
new file mode 100644
index 000000000000..2712c682f647
--- /dev/null
+++ b/dev-php/pecl-memcache/pecl-memcache-3.0.8-r3.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PHP_EXT_NAME="memcache"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+DOCS=( README )
+PATCHES=( "${FILESDIR}/3.0.8-c99-inline.patch" )
+
+USE_PHP="php5-6"
+
+inherit php-ext-pecl-r3
+
+KEYWORDS="~amd64 ~hppa ~ppc64 ~x86"
+
+DESCRIPTION="PHP extension for using memcached"
+LICENSE="PHP-3"
+SLOT="0"
+IUSE="+session"
+
+DEPEND="sys-libs/zlib
+ dev-lang/php:5.6[session?]"
+RDEPEND="${DEPEND}"
+
+# The test suite requires memcached to be running.
+RESTRICT='test'
+
+src_configure() {
+ local PHP_EXT_ECONF_ARGS=( --enable-memcache --with-zlib-dir=/usr $(use_enable session memcache-session) )
+ php-ext-source-r3_src_configure
+}
+
+src_install() {
+ php-ext-pecl-r3_src_install
+
+ php-ext-source-r3_addtoinifiles "memcache.allow_failover" "true"
+ php-ext-source-r3_addtoinifiles "memcache.max_failover_attempts" "20"
+ php-ext-source-r3_addtoinifiles "memcache.chunk_size" "32768"
+ php-ext-source-r3_addtoinifiles "memcache.default_port" "11211"
+ php-ext-source-r3_addtoinifiles "memcache.hash_strategy" "consistent"
+ php-ext-source-r3_addtoinifiles "memcache.hash_function" "crc32"
+ php-ext-source-r3_addtoinifiles "memcache.redundancy" "1"
+ php-ext-source-r3_addtoinifiles "memcache.session_redundancy" "2"
+ php-ext-source-r3_addtoinifiles "memcache.protocol" "ascii"
+}
diff --git a/dev-php/pecl-memcached-2.2.0-r2 b/dev-php/pecl-memcached-2.2.0-r2
deleted file mode 100644
index 0b6b7df0dbf1..000000000000
--- a/dev-php/pecl-memcached-2.2.0-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=php_targets_php5-6? ( >=dev-libs/libmemcached-1.0[sasl?] sys-libs/zlib dev-lang/php:5.6[session?,json?] igbinary? ( dev-php/igbinary[php_targets_php5-6?] ) ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 )
-DESCRIPTION=Interface PHP with memcached via libmemcached library
-EAPI=6
-HOMEPAGE=https://pecl.php.net/memcached
-IUSE=+session igbinary json sasl php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2
-KEYWORDS=amd64 x86
-LICENSE=PHP-3
-PDEPEND=php_targets_php7-0? ( dev-php/pecl-memcached:7[php_targets_php7-0] ) php_targets_php7-1? ( dev-php/pecl-memcached:7[php_targets_php7-1] ) php_targets_php7-2? ( dev-php/pecl-memcached:7[php_targets_php7-2] )
-RDEPEND=php_targets_php5-6? ( >=dev-libs/libmemcached-1.0[sasl?] sys-libs/zlib dev-lang/php:5.6[session?,json?] igbinary? ( dev-php/igbinary[php_targets_php5-6?] ) ) php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 )
-REQUIRED_USE=|| ( php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2 )
-SLOT=0
-SRC_URI=https://pecl.php.net/get/memcached-2.2.0.tgz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e php-ext-pecl-r3 a59741d3df8ea9f17afcdcfb7edaee6d php-ext-source-r3 63b281041baa106ff1ef59b602ca7e2a toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=51cd7a85263bd6b996271372f729e17e
diff --git a/dev-php/pecl-memcached-3.0.0 b/dev-php/pecl-memcached-3.0.0
deleted file mode 100644
index 949f12e8d517..000000000000
--- a/dev-php/pecl-memcached-3.0.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=php_targets_php7-0? ( >=dev-libs/libmemcached-1.0.14[sasl?] sys-libs/zlib igbinary? ( dev-php/igbinary[php_targets_php7-0?] ) dev-lang/php:7.0[session?,json?] ) php_targets_php7-1? ( >=dev-libs/libmemcached-1.0.14[sasl?] sys-libs/zlib igbinary? ( dev-php/igbinary[php_targets_php7-0?] ) dev-lang/php:7.1[session?,json?] ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 )
-DESCRIPTION=Interface PHP with memcached via libmemcached library
-EAPI=6
-HOMEPAGE=https://pecl.php.net/php-memcached
-IUSE=examples igbinary json sasl +session php_targets_php5-6 php_targets_php7-0 php_targets_php7-1
-KEYWORDS=amd64 x86
-LICENSE=PHP-3
-RDEPEND=php_targets_php7-0? ( >=dev-libs/libmemcached-1.0.14[sasl?] sys-libs/zlib igbinary? ( dev-php/igbinary[php_targets_php7-0?] ) dev-lang/php:7.0[session?,json?] ) php_targets_php7-1? ( >=dev-libs/libmemcached-1.0.14[sasl?] sys-libs/zlib igbinary? ( dev-php/igbinary[php_targets_php7-0?] ) dev-lang/php:7.1[session?,json?] ) php_targets_php5-6? ( dev-php/pecl-memcached:0[php_targets_php5-6] ) php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 )
-REQUIRED_USE=|| ( php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 )
-SLOT=7
-SRC_URI=https://github.com/php-memcached-dev/php-memcached/archive/v3.0.0.tar.gz -> pecl-memcached-3.0.0.tar.gz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e php-ext-pecl-r3 a59741d3df8ea9f17afcdcfb7edaee6d php-ext-source-r3 63b281041baa106ff1ef59b602ca7e2a toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=5b83ddbd6d7805e499c2659339d1565a
diff --git a/dev-php/pecl-memcached-3.0.3 b/dev-php/pecl-memcached-3.0.3
deleted file mode 100644
index 28d4218a1947..000000000000
--- a/dev-php/pecl-memcached-3.0.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=php_targets_php7-0? ( >=dev-libs/libmemcached-1.0.14[sasl?] sys-libs/zlib igbinary? ( dev-php/igbinary[php_targets_php7-0?] ) dev-lang/php:7.0[session?,json?] ) php_targets_php7-1? ( >=dev-libs/libmemcached-1.0.14[sasl?] sys-libs/zlib igbinary? ( dev-php/igbinary[php_targets_php7-0?] ) dev-lang/php:7.1[session?,json?] ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 )
-DESCRIPTION=Interface PHP with memcached via libmemcached library
-EAPI=6
-HOMEPAGE=https://pecl.php.net/memcached
-IUSE=examples igbinary json sasl +session php_targets_php5-6 php_targets_php7-0 php_targets_php7-1
-KEYWORDS=~amd64 ~x86
-LICENSE=PHP-3
-RDEPEND=php_targets_php7-0? ( >=dev-libs/libmemcached-1.0.14[sasl?] sys-libs/zlib igbinary? ( dev-php/igbinary[php_targets_php7-0?] ) dev-lang/php:7.0[session?,json?] ) php_targets_php7-1? ( >=dev-libs/libmemcached-1.0.14[sasl?] sys-libs/zlib igbinary? ( dev-php/igbinary[php_targets_php7-0?] ) dev-lang/php:7.1[session?,json?] ) php_targets_php5-6? ( dev-php/pecl-memcached:0[php_targets_php5-6] ) php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 )
-REQUIRED_USE=|| ( php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 )
-SLOT=7
-SRC_URI=https://pecl.php.net/get/memcached-3.0.3.tgz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e php-ext-pecl-r3 a59741d3df8ea9f17afcdcfb7edaee6d php-ext-source-r3 63b281041baa106ff1ef59b602ca7e2a toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=fd0da5edb079a123a09867ec657cdca4
diff --git a/dev-php/pecl-memcached-3.0.4 b/dev-php/pecl-memcached-3.0.4
deleted file mode 100644
index 9a9a89c00e08..000000000000
--- a/dev-php/pecl-memcached-3.0.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=php_targets_php7-0? ( >=dev-libs/libmemcached-1.0.14[sasl?] sys-libs/zlib igbinary? ( dev-php/igbinary[php_targets_php7-0?,php_targets_php7-1?,php_targets_php7-2?] ) dev-lang/php:7.0[session?,json?] ) php_targets_php7-1? ( >=dev-libs/libmemcached-1.0.14[sasl?] sys-libs/zlib igbinary? ( dev-php/igbinary[php_targets_php7-0?,php_targets_php7-1?,php_targets_php7-2?] ) dev-lang/php:7.1[session?,json?] ) php_targets_php7-2? ( >=dev-libs/libmemcached-1.0.14[sasl?] sys-libs/zlib igbinary? ( dev-php/igbinary[php_targets_php7-0?,php_targets_php7-1?,php_targets_php7-2?] ) dev-lang/php:7.2[session?,json?] ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 )
-DESCRIPTION=Interface PHP with memcached via libmemcached library
-EAPI=6
-HOMEPAGE=https://pecl.php.net/memcached
-IUSE=examples igbinary json sasl +session php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2
-KEYWORDS=amd64 x86
-LICENSE=PHP-3
-RDEPEND=php_targets_php7-0? ( >=dev-libs/libmemcached-1.0.14[sasl?] sys-libs/zlib igbinary? ( dev-php/igbinary[php_targets_php7-0?,php_targets_php7-1?,php_targets_php7-2?] ) dev-lang/php:7.0[session?,json?] ) php_targets_php7-1? ( >=dev-libs/libmemcached-1.0.14[sasl?] sys-libs/zlib igbinary? ( dev-php/igbinary[php_targets_php7-0?,php_targets_php7-1?,php_targets_php7-2?] ) dev-lang/php:7.1[session?,json?] ) php_targets_php7-2? ( >=dev-libs/libmemcached-1.0.14[sasl?] sys-libs/zlib igbinary? ( dev-php/igbinary[php_targets_php7-0?,php_targets_php7-1?,php_targets_php7-2?] ) dev-lang/php:7.2[session?,json?] ) php_targets_php5-6? ( dev-php/pecl-memcached:0[php_targets_php5-6] ) php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 )
-REQUIRED_USE=|| ( php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2 )
-SLOT=7
-SRC_URI=https://pecl.php.net/get/memcached-3.0.4.tgz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e php-ext-pecl-r3 a59741d3df8ea9f17afcdcfb7edaee6d php-ext-source-r3 63b281041baa106ff1ef59b602ca7e2a toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=eeb88e0d9ea88638008922d41a533a89
diff --git a/dev-php/pecl-memcached/Manifest b/dev-php/pecl-memcached/Manifest
new file mode 100644
index 000000000000..5cf472d882c3
--- /dev/null
+++ b/dev-php/pecl-memcached/Manifest
@@ -0,0 +1,9 @@
+DIST memcached-2.2.0.tgz 70449 BLAKE2B dca76bfb993c647860ae2ce648580e6131c6df30d30def9a1f907fce06621f3d5a21b93605da9fc50bda542fd950317a5a398d6bf0db85f61469cfb5e9757566 SHA512 61207d3f8c11b0620dbcb20fb2ebb6d1fc10159a7e879ee91556a303c3dcdf3d2571e8dda5efcbed77ff779f5c9b226aa48800630b9e7781cd964126b848c356
+DIST memcached-3.0.3.tgz 77310 BLAKE2B 9756878087594f1bf13b1edaa38dd18f7cd4d6a61618444f2c2a32972acb67e3aee66b2083b7303d50f53cfd7902374fed49db68a2780e0d824d90f4289ecb54 SHA512 cb24d76f82ce8c1fdd8877bbb46131545bba5011cfff965e3c190b7c0f71f754b47ded6289d3125724d9de781b916971aaadfa0b247c6fe2f51aab77dce61b61
+DIST memcached-3.0.4.tgz 78776 BLAKE2B ce2539e2e4960217d9ee3b50ed5625214d4b22c4d7e64595fdbfa2d130bce0402a67561f76a50690991996d84f16f926f27a057722bfab66ba3c388772ed77a8 SHA512 d0a0f9e99cbcc6829528554551dfacf0d943d54d4be60c9da708de82913a2a0bed7c51d594ae3ecf0c13b56064739f074ce6ada5d7433bdc7e26e8caf9cf5ca2
+DIST pecl-memcached-3.0.0.tar.gz 83732 BLAKE2B 0e38d34b6ccd72f1e58305c3b4fbb3437d53ba93bb00a610bf4e91701e2bee6acb20667f3a74b2f2aa8d09dfcd1475e82808aeade6b22364aea0a359edf1e889 SHA512 ddc6b6fbdd55c6cdf64b9a7833142ea43eb974ecaae3437b30ed731f0ddbf4108b46ea5eb01a197788978273bdff31da6a0c0fb0354335b85618d98ba070bfec
+EBUILD pecl-memcached-2.2.0-r2.ebuild 1326 BLAKE2B 5e8263a0affd9dd1fe3ddab2fb0e40ae9b7b7b93241d785facde7941164dcc85d4b1fb7c55c7690df75b2d6f3ec2fd2296963183763b1397036de12687cf095f SHA512 91b5c873c5a4e484c56e9ab3080972fd4bcd553c7e1630eabb7f552747a9004a3bdb3cf74993d214d6281358b4e0fde6ba3af1a8e55d0603f3828b579f499434
+EBUILD pecl-memcached-3.0.0.ebuild 1671 BLAKE2B b927ba0eef69a46c03b0a3d23f5779abdef82d14b57c268c9b9e20047212d75344025bf4160cb827f81cfa238f484b3866f488575f5cde57c621c51dbbc7bd4a SHA512 9bc30d5a84abff5cd98a9cab7b07ec00681b1e66142dc39290b6faad653266a736f05f8b6156510cf34a1d288efe68f823ff3444b465ffa1d714afe363ac0b6e
+EBUILD pecl-memcached-3.0.3.ebuild 1438 BLAKE2B 9968ae8d4b03469f33773eda816c4740294b7cddd2ada6404711beb3ee369aa8e176cb79311c0a7438d1e27fbc26bc595ccc9112cdf4e877c0d13143d3cb6699 SHA512 f62be49b9f34d5143812488d460764584521e9c2416067f38006d6c6183438613bbed1f1137b2bf644d3883c29e78b43b00f9481b7343a7077dd1c90e9d0bee2
+EBUILD pecl-memcached-3.0.4.ebuild 1621 BLAKE2B b771c0067cb973665106bfe3b1530182a5c1653a3fe0ec69db0e7402ab9f88ebb5d29aaf1d35f82a678e2785a44421545b427b74323542034ffb90f1115b0ab5 SHA512 846c2260afd11e1ecb707c3b45fb9b1d8597e91d07e419a27e292b2041041c352098fbed14367b39df1e4cfad7aa6e9d98ff95463a00ae1aef53c673825ca0c8
+MISC metadata.xml 568 BLAKE2B f99b2eb530ffd87100256bb477bfbd50e48b28283bc01147b0cb1e3dd7dbfb940cd8e16e24c68723fe764df0cbdb1ecb0b995e151c67a37673a19a2cfeb1bcfa SHA512 9fb2c3ea2dba6b4b1cdda8acc02afa006a95651b4fdb5011b15e4046bc44742cc5306d20db070f4f1977352873576040a34ed24a660ec2c640e118115359f2c6
diff --git a/dev-php/pecl-memcached/metadata.xml b/dev-php/pecl-memcached/metadata.xml
new file mode 100644
index 000000000000..84a83c7ea788
--- /dev/null
+++ b/dev-php/pecl-memcached/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>robbat2@gentoo.org</email>
+ </maintainer>
+ <maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ <name>PHP</name>
+ </maintainer>
+ <use>
+ <flag name="igbinary">Enable support for the igbinary serializer</flag>
+ <flag name="json">Enable support for json serialization</flag>
+ </use>
+ <upstream>
+ <remote-id type="github">php-memcached-dev/php-memcached</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-php/pecl-memcached/pecl-memcached-2.2.0-r2.ebuild b/dev-php/pecl-memcached/pecl-memcached-2.2.0-r2.ebuild
new file mode 100644
index 000000000000..353b38418dfa
--- /dev/null
+++ b/dev-php/pecl-memcached/pecl-memcached-2.2.0-r2.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PHP_EXT_NAME="memcached"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+DOCS=( ChangeLog README.markdown )
+
+USE_PHP="php5-6 php7-0 php7-1 php7-2"
+
+inherit php-ext-pecl-r3
+
+USE_PHP="php5-6"
+
+KEYWORDS="amd64 x86"
+
+DESCRIPTION="Interface PHP with memcached via libmemcached library"
+LICENSE="PHP-3"
+SLOT="0"
+IUSE="+session igbinary json sasl"
+
+DEPEND="php_targets_php5-6? (
+ >=dev-libs/libmemcached-1.0[sasl?]
+ sys-libs/zlib
+ dev-lang/php:5.6[session?,json?]
+ igbinary? ( dev-php/igbinary[php_targets_php5-6?] )
+ )"
+RDEPEND="${DEPEND}"
+PDEPEND="
+php_targets_php7-0? ( dev-php/pecl-memcached:7[php_targets_php7-0] )
+php_targets_php7-1? ( dev-php/pecl-memcached:7[php_targets_php7-1] )
+php_targets_php7-2? ( dev-php/pecl-memcached:7[php_targets_php7-2] )
+"
+
+src_prepare(){
+ if use php_targets_php5-6 ; then
+ php-ext-source-r3_src_prepare
+ else
+ default_src_prepare
+ fi
+}
+
+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_install() {
+ if use php_targets_php5-6 ; then
+ php-ext-pecl-r3_src_install
+ fi
+}
diff --git a/dev-php/pecl-memcached/pecl-memcached-3.0.0.ebuild b/dev-php/pecl-memcached/pecl-memcached-3.0.0.ebuild
new file mode 100644
index 000000000000..947f93918812
--- /dev/null
+++ b/dev-php/pecl-memcached/pecl-memcached-3.0.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PHP_EXT_NAME="memcached"
+PHP_EXT_PECL_PKG="php-memcached" # Needed when SRC_URI is Github.
+DOCS=( ChangeLog README.markdown )
+
+USE_PHP="php5-6 php7-0 php7-1" # Pretend to support all three targets...
+inherit php-ext-pecl-r3
+USE_PHP="php7-0 php7-1" # But only truly build for these two.
+
+DESCRIPTION="Interface PHP with memcached via libmemcached library"
+# Usually set in the eclass, but this release made it to github first.
+SRC_URI="https://github.com/php-memcached-dev/php-memcached/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="PHP-3"
+SLOT="7"
+KEYWORDS="amd64 x86"
+IUSE="examples igbinary json sasl +session "
+
+COMMON_DEPEND=">=dev-libs/libmemcached-1.0.14[sasl?]
+ sys-libs/zlib
+ igbinary? ( dev-php/igbinary[php_targets_php7-0?] )"
+
+DEPEND="
+ php_targets_php7-0? (
+ ${COMMON_DEPEND} dev-lang/php:7.0[session?,json?]
+ )
+ php_targets_php7-1? (
+ ${COMMON_DEPEND} dev-lang/php:7.1[session?,json?]
+ )"
+RDEPEND="${DEPEND}
+ php_targets_php5-6? (
+ dev-php/pecl-memcached:0[php_targets_php5-6]
+ )"
+
+src_prepare(){
+ if use php_targets_php7-0 || use php_targets_php7-1 ; then
+ php-ext-source-r3_src_prepare
+ else
+ default_src_prepare
+ fi
+}
+
+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_install(){
+ use examples && dodoc -r server-example
+
+ if use php_targets_php7-0 || use php_targets_php7-1 ; then
+ php-ext-source-r3_src_install
+ fi
+}
diff --git a/dev-php/pecl-memcached/pecl-memcached-3.0.3.ebuild b/dev-php/pecl-memcached/pecl-memcached-3.0.3.ebuild
new file mode 100644
index 000000000000..3d772ee725e7
--- /dev/null
+++ b/dev-php/pecl-memcached/pecl-memcached-3.0.3.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PHP_EXT_NAME="memcached"
+DOCS=( ChangeLog README.markdown )
+
+USE_PHP="php5-6 php7-0 php7-1" # Pretend to support all three targets...
+inherit php-ext-pecl-r3
+USE_PHP="php7-0 php7-1" # But only truly build for these two.
+
+DESCRIPTION="Interface PHP with memcached via libmemcached library"
+LICENSE="PHP-3"
+SLOT="7"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples igbinary json sasl +session "
+
+COMMON_DEPEND=">=dev-libs/libmemcached-1.0.14[sasl?]
+ sys-libs/zlib
+ igbinary? ( dev-php/igbinary[php_targets_php7-0?] )"
+
+DEPEND="
+ php_targets_php7-0? (
+ ${COMMON_DEPEND} dev-lang/php:7.0[session?,json?]
+ )
+ php_targets_php7-1? (
+ ${COMMON_DEPEND} dev-lang/php:7.1[session?,json?]
+ )"
+RDEPEND="${DEPEND}
+ php_targets_php5-6? (
+ dev-php/pecl-memcached:0[php_targets_php5-6]
+ )"
+
+src_prepare(){
+ if use php_targets_php7-0 || use php_targets_php7-1 ; then
+ php-ext-source-r3_src_prepare
+ else
+ default_src_prepare
+ fi
+}
+
+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_install(){
+ use examples && dodoc -r server-example
+
+ if use php_targets_php7-0 || use php_targets_php7-1 ; then
+ php-ext-source-r3_src_install
+ fi
+}
diff --git a/dev-php/pecl-memcached/pecl-memcached-3.0.4.ebuild b/dev-php/pecl-memcached/pecl-memcached-3.0.4.ebuild
new file mode 100644
index 000000000000..852b0db4b78d
--- /dev/null
+++ b/dev-php/pecl-memcached/pecl-memcached-3.0.4.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PHP_EXT_NAME="memcached"
+DOCS=( ChangeLog README.markdown )
+
+USE_PHP="php5-6 php7-0 php7-1 php7-2" # Pretend to support all three targets...
+inherit php-ext-pecl-r3
+USE_PHP="php7-0 php7-1 php7-2" # But only truly build for these two.
+
+DESCRIPTION="Interface PHP with memcached via libmemcached library"
+LICENSE="PHP-3"
+SLOT="7"
+KEYWORDS="amd64 x86"
+IUSE="examples igbinary json sasl +session "
+
+COMMON_DEPEND=">=dev-libs/libmemcached-1.0.14[sasl?]
+ sys-libs/zlib
+ igbinary? ( dev-php/igbinary[php_targets_php7-0?,php_targets_php7-1?,php_targets_php7-2?] )
+"
+
+DEPEND="
+ php_targets_php7-0? (
+ ${COMMON_DEPEND} dev-lang/php:7.0[session?,json?]
+ )
+ php_targets_php7-1? (
+ ${COMMON_DEPEND} dev-lang/php:7.1[session?,json?]
+ )
+ php_targets_php7-2? (
+ ${COMMON_DEPEND} dev-lang/php:7.2[session?,json?]
+ )"
+RDEPEND="${DEPEND}
+ php_targets_php5-6? (
+ dev-php/pecl-memcached:0[php_targets_php5-6]
+ )"
+
+src_prepare(){
+ if use php_targets_php7-0 || use php_targets_php7-1 || use php_targets_php7-2 ; then
+ php-ext-source-r3_src_prepare
+ else
+ default_src_prepare
+ fi
+}
+
+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_install(){
+ use examples && dodoc -r server-example
+
+ if use php_targets_php7-0 || use php_targets_php7-1 || use php_targets_php7-2 ; then
+ php-ext-source-r3_src_install
+ fi
+}
diff --git a/dev-php/pecl-mongo-1.6.14-r1 b/dev-php/pecl-mongo-1.6.14-r1
deleted file mode 100644
index 715f03edf5d6..000000000000
--- a/dev-php/pecl-mongo-1.6.14-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php5-6? ( dev-lang/php:5.6 )
-DESCRIPTION=Legacy MongoDB database driver for PHP
-EAPI=6
-HOMEPAGE=https://pecl.php.net/mongo
-IUSE=php_targets_php5-6
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=php_targets_php5-6? ( dev-lang/php:5.6 )
-REQUIRED_USE=|| ( php_targets_php5-6 )
-SLOT=0
-SRC_URI=https://pecl.php.net/get/mongo-1.6.14.tgz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e php-ext-pecl-r3 a59741d3df8ea9f17afcdcfb7edaee6d php-ext-source-r3 63b281041baa106ff1ef59b602ca7e2a toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=70af030fe74f4c74148bdc7742436400
diff --git a/dev-php/pecl-mongo-1.6.16 b/dev-php/pecl-mongo-1.6.16
deleted file mode 100644
index d272a2ca62db..000000000000
--- a/dev-php/pecl-mongo-1.6.16
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php5-6? ( dev-lang/php:5.6 )
-DESCRIPTION=Legacy MongoDB database driver for PHP
-EAPI=6
-HOMEPAGE=https://pecl.php.net/mongo
-IUSE=php_targets_php5-6
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=php_targets_php5-6? ( dev-lang/php:5.6 )
-REQUIRED_USE=|| ( php_targets_php5-6 )
-SLOT=0
-SRC_URI=https://pecl.php.net/get/mongo-1.6.16.tgz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e php-ext-pecl-r3 a59741d3df8ea9f17afcdcfb7edaee6d php-ext-source-r3 63b281041baa106ff1ef59b602ca7e2a toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=24ccb812a8e415fbf604ae77d19e52be
diff --git a/dev-php/pecl-mongo/Manifest b/dev-php/pecl-mongo/Manifest
new file mode 100644
index 000000000000..2879c209933e
--- /dev/null
+++ b/dev-php/pecl-mongo/Manifest
@@ -0,0 +1,5 @@
+DIST mongo-1.6.14.tgz 210095 BLAKE2B a23411085ee2b5f3e3a812e4d3f3af151a3573920a95bf01389270533b1f4398a086ef4f1cedb1f1215ec3b2c5a0c82d2b154ef61b8a45b3560cdd7e468919c5 SHA512 7c87e148394085e90f091a6abd3e66a02620d7990098c318b97ee333751668f77f8b45ed5d0fb9806b8169b603998f8306a55a7c607773742fc2c93076f88764
+DIST mongo-1.6.16.tgz 210341 BLAKE2B ff8008699e7573852b09f0fff5521eb5392c19845f4db2c4e8e8d2528d1a3644a47b945889eaf4f43a9c76efdf9e51ce002d714eaa4911b1376244625066db06 SHA512 8cba101958fff31c766a41000de04e97235821494b88893521ac832f7c1e2c3eab8956f2da43e5c75cb06e2c74485b539dd28dcc2fdcffb79567b1ec6d6d0be4
+EBUILD pecl-mongo-1.6.14-r1.ebuild 343 BLAKE2B f88a209665b211a63b054a8a79e118bc85fdade16b4cdc227ab42e4b0fd8efa3ff29228b637195c1dff7df7769b006a038ddbd8918a13b44dabb29d2709eb00b SHA512 b0e9ed2fe7b79a461ca5787de20b114d53bf928b4ebf611a69450ee7a236cb3aaa39834b6bed464c133eda549ff38c117c7c8caf2dce6002f3027b1fe8c18775
+EBUILD pecl-mongo-1.6.16.ebuild 345 BLAKE2B d56e89884f3cc98ebae55b330e3bc74805d52ca41af14a52e27ac3ec0a74f2d5f3b599a52e36422567f8d6c25a5c563d40a6325f0f1fc39d22151365f3575e03 SHA512 83d2ee4450c9b7da901d4c496e35b71a573d0e4315836430154e6cd95655eaf5a599c2f7745115580b4e2f088fe1b9e640d9b742af4cd066fe667d85c1264227
+MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/pecl-mongo/metadata.xml b/dev-php/pecl-mongo/metadata.xml
new file mode 100644
index 000000000000..b86acf66c756
--- /dev/null
+++ b/dev-php/pecl-mongo/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ <name>PHP</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/dev-php/pecl-mongo/pecl-mongo-1.6.14-r1.ebuild b/dev-php/pecl-mongo/pecl-mongo-1.6.14-r1.ebuild
new file mode 100644
index 000000000000..cfdf37907dd0
--- /dev/null
+++ b/dev-php/pecl-mongo/pecl-mongo-1.6.14-r1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PHP_EXT_NAME="mongo"
+USE_PHP="php5-6"
+DOCS=( README.md )
+
+inherit php-ext-pecl-r3
+
+DESCRIPTION="Legacy MongoDB database driver for PHP"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
diff --git a/dev-php/pecl-mongo/pecl-mongo-1.6.16.ebuild b/dev-php/pecl-mongo/pecl-mongo-1.6.16.ebuild
new file mode 100644
index 000000000000..79b9aaa1e996
--- /dev/null
+++ b/dev-php/pecl-mongo/pecl-mongo-1.6.16.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PHP_EXT_NAME="mongo"
+USE_PHP="php5-6"
+DOCS=( README.md )
+
+inherit php-ext-pecl-r3
+
+DESCRIPTION="Legacy MongoDB database driver for PHP"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
diff --git a/dev-php/pecl-mongodb-1.1.10 b/dev-php/pecl-mongodb-1.1.10
deleted file mode 100644
index f69a05656b3c..000000000000
--- a/dev-php/pecl-mongodb-1.1.10
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=php_targets_php5-6? ( dev-lang/php:5.6[json,ssl,zlib] ) php_targets_php7-0? ( dev-lang/php:7.0[json,ssl,zlib] ) php_targets_php7-1? ( dev-lang/php:7.1[json,ssl,zlib] ) >=dev-libs/libbson-1.3.3 >=dev-libs/mongo-c-driver-1.3.3[sasl?,ssl] !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) pcre? ( dev-libs/libpcre ) sasl? ( dev-libs/cyrus-sasl ) virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 )
-DESCRIPTION=MongoDB database driver for PHP
-EAPI=6
-HOMEPAGE=https://pecl.php.net/mongodb
-IUSE=libressl pcre sasl php_targets_php5-6 php_targets_php7-0 php_targets_php7-1
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=php_targets_php5-6? ( dev-lang/php:5.6[json,ssl,zlib] ) php_targets_php7-0? ( dev-lang/php:7.0[json,ssl,zlib] ) php_targets_php7-1? ( dev-lang/php:7.1[json,ssl,zlib] ) >=dev-libs/libbson-1.3.3 >=dev-libs/mongo-c-driver-1.3.3[sasl?,ssl] !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) pcre? ( dev-libs/libpcre ) sasl? ( dev-libs/cyrus-sasl ) php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 )
-REQUIRED_USE=|| ( php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 )
-SLOT=0
-SRC_URI=https://pecl.php.net/get/mongodb-1.1.10.tgz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e php-ext-pecl-r3 a59741d3df8ea9f17afcdcfb7edaee6d php-ext-source-r3 63b281041baa106ff1ef59b602ca7e2a toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=1e54955c0f3efe72f3ee8da0825eef9b
diff --git a/dev-php/pecl-mongodb-1.1.8 b/dev-php/pecl-mongodb-1.1.8
deleted file mode 100644
index 84f5ee02ee7b..000000000000
--- a/dev-php/pecl-mongodb-1.1.8
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=php_targets_php5-6? ( dev-lang/php:5.6[json,ssl,zlib] ) php_targets_php7-0? ( dev-lang/php:7.0[json,ssl,zlib] ) >=dev-libs/libbson-1.3.3 >=dev-libs/mongo-c-driver-1.3.3[sasl?,ssl] !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) pcre? ( dev-libs/libpcre ) sasl? ( dev-libs/cyrus-sasl ) virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 )
-DESCRIPTION=MongoDB database driver for PHP
-EAPI=6
-HOMEPAGE=https://pecl.php.net/mongodb
-IUSE=libressl pcre sasl php_targets_php5-6 php_targets_php7-0
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=php_targets_php5-6? ( dev-lang/php:5.6[json,ssl,zlib] ) php_targets_php7-0? ( dev-lang/php:7.0[json,ssl,zlib] ) >=dev-libs/libbson-1.3.3 >=dev-libs/mongo-c-driver-1.3.3[sasl?,ssl] !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) pcre? ( dev-libs/libpcre ) sasl? ( dev-libs/cyrus-sasl ) php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 )
-REQUIRED_USE=|| ( php_targets_php5-6 php_targets_php7-0 )
-SLOT=0
-SRC_URI=https://pecl.php.net/get/mongodb-1.1.8.tgz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e php-ext-pecl-r3 a59741d3df8ea9f17afcdcfb7edaee6d php-ext-source-r3 63b281041baa106ff1ef59b602ca7e2a toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=a65478dbf8684093811ef90fde80e0a9
diff --git a/dev-php/pecl-mongodb-1.2.11 b/dev-php/pecl-mongodb-1.2.11
deleted file mode 100644
index 836c7a67b4ab..000000000000
--- a/dev-php/pecl-mongodb-1.2.11
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=php_targets_php5-6? ( dev-lang/php:5.6[json,ssl,zlib] ) php_targets_php7-0? ( dev-lang/php:7.0[json,ssl,zlib] ) php_targets_php7-1? ( dev-lang/php:7.1[json,ssl,zlib] ) >=dev-libs/libbson-1.6.0 >=dev-libs/mongo-c-driver-1.6.0[sasl?,ssl] !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sasl? ( dev-libs/cyrus-sasl ) virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 )
-DESCRIPTION=MongoDB database driver for PHP
-EAPI=6
-HOMEPAGE=https://pecl.php.net/mongodb
-IUSE=libressl sasl php_targets_php5-6 php_targets_php7-0 php_targets_php7-1
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=php_targets_php5-6? ( dev-lang/php:5.6[json,ssl,zlib] ) php_targets_php7-0? ( dev-lang/php:7.0[json,ssl,zlib] ) php_targets_php7-1? ( dev-lang/php:7.1[json,ssl,zlib] ) >=dev-libs/libbson-1.6.0 >=dev-libs/mongo-c-driver-1.6.0[sasl?,ssl] !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sasl? ( dev-libs/cyrus-sasl ) php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 )
-REQUIRED_USE=|| ( php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 )
-SLOT=0
-SRC_URI=https://pecl.php.net/get/mongodb-1.2.11.tgz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e php-ext-pecl-r3 a59741d3df8ea9f17afcdcfb7edaee6d php-ext-source-r3 63b281041baa106ff1ef59b602ca7e2a toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=f4786b947a85b6b31b14054314e097fa
diff --git a/dev-php/pecl-mongodb-1.2.9 b/dev-php/pecl-mongodb-1.2.9
deleted file mode 100644
index 8b956cb30b97..000000000000
--- a/dev-php/pecl-mongodb-1.2.9
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=php_targets_php5-6? ( dev-lang/php:5.6[json,ssl,zlib] ) php_targets_php7-0? ( dev-lang/php:7.0[json,ssl,zlib] ) php_targets_php7-1? ( dev-lang/php:7.1[json,ssl,zlib] ) >=dev-libs/libbson-1.6.0 >=dev-libs/mongo-c-driver-1.6.0[sasl?,ssl] !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sasl? ( dev-libs/cyrus-sasl ) virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 )
-DESCRIPTION=MongoDB database driver for PHP
-EAPI=6
-HOMEPAGE=https://pecl.php.net/mongodb
-IUSE=libressl sasl php_targets_php5-6 php_targets_php7-0 php_targets_php7-1
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=php_targets_php5-6? ( dev-lang/php:5.6[json,ssl,zlib] ) php_targets_php7-0? ( dev-lang/php:7.0[json,ssl,zlib] ) php_targets_php7-1? ( dev-lang/php:7.1[json,ssl,zlib] ) >=dev-libs/libbson-1.6.0 >=dev-libs/mongo-c-driver-1.6.0[sasl?,ssl] !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sasl? ( dev-libs/cyrus-sasl ) php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 )
-REQUIRED_USE=|| ( php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 )
-SLOT=0
-SRC_URI=https://pecl.php.net/get/mongodb-1.2.9.tgz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e php-ext-pecl-r3 a59741d3df8ea9f17afcdcfb7edaee6d php-ext-source-r3 63b281041baa106ff1ef59b602ca7e2a toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=f4786b947a85b6b31b14054314e097fa
diff --git a/dev-php/pecl-mongodb-1.3.3 b/dev-php/pecl-mongodb-1.3.3
deleted file mode 100644
index 818cb02f403e..000000000000
--- a/dev-php/pecl-mongodb-1.3.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=php_targets_php5-6? ( dev-lang/php:5.6[json,ssl,zlib] ) php_targets_php7-0? ( dev-lang/php:7.0[json,ssl,zlib] ) php_targets_php7-1? ( dev-lang/php:7.1[json,ssl,zlib] ) >=dev-libs/libbson-1.8.2 >=dev-libs/mongo-c-driver-1.8.2[sasl?,ssl] !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sasl? ( dev-libs/cyrus-sasl ) virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 )
-DESCRIPTION=MongoDB database driver for PHP
-EAPI=6
-HOMEPAGE=https://pecl.php.net/mongodb
-IUSE=libressl sasl php_targets_php5-6 php_targets_php7-0 php_targets_php7-1
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=php_targets_php5-6? ( dev-lang/php:5.6[json,ssl,zlib] ) php_targets_php7-0? ( dev-lang/php:7.0[json,ssl,zlib] ) php_targets_php7-1? ( dev-lang/php:7.1[json,ssl,zlib] ) >=dev-libs/libbson-1.8.2 >=dev-libs/mongo-c-driver-1.8.2[sasl?,ssl] !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sasl? ( dev-libs/cyrus-sasl ) php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 )
-REQUIRED_USE=|| ( php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 )
-SLOT=0
-SRC_URI=https://pecl.php.net/get/mongodb-1.3.3.tgz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e php-ext-pecl-r3 a59741d3df8ea9f17afcdcfb7edaee6d php-ext-source-r3 63b281041baa106ff1ef59b602ca7e2a toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=368f972094edec286959873027ae2568
diff --git a/dev-php/pecl-mongodb-1.4.1 b/dev-php/pecl-mongodb-1.4.1
deleted file mode 100644
index b2373d476500..000000000000
--- a/dev-php/pecl-mongodb-1.4.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=php_targets_php5-6? ( dev-lang/php:5.6[json,ssl,zlib] ) php_targets_php7-0? ( dev-lang/php:7.0[json,ssl,zlib] ) php_targets_php7-1? ( dev-lang/php:7.1[json,ssl,zlib] ) php_targets_php7-2? ( dev-lang/php:7.2[json,ssl,zlib] ) >=dev-libs/libbson-1.9.0 >=dev-libs/mongo-c-driver-1.9.0[sasl?,ssl] !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sasl? ( dev-libs/cyrus-sasl ) virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 )
-DESCRIPTION=MongoDB database driver for PHP
-EAPI=6
-HOMEPAGE=https://pecl.php.net/mongodb
-IUSE=libressl sasl php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=php_targets_php5-6? ( dev-lang/php:5.6[json,ssl,zlib] ) php_targets_php7-0? ( dev-lang/php:7.0[json,ssl,zlib] ) php_targets_php7-1? ( dev-lang/php:7.1[json,ssl,zlib] ) php_targets_php7-2? ( dev-lang/php:7.2[json,ssl,zlib] ) >=dev-libs/libbson-1.9.0 >=dev-libs/mongo-c-driver-1.9.0[sasl?,ssl] !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sasl? ( dev-libs/cyrus-sasl ) php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 )
-REQUIRED_USE=|| ( php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2 )
-SLOT=0
-SRC_URI=https://pecl.php.net/get/mongodb-1.4.1.tgz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e php-ext-pecl-r3 a59741d3df8ea9f17afcdcfb7edaee6d php-ext-source-r3 63b281041baa106ff1ef59b602ca7e2a toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=ee480e78a39d59c170bd796394c0867b
diff --git a/dev-php/pecl-mongodb-1.4.4 b/dev-php/pecl-mongodb-1.4.4
deleted file mode 100644
index 90541e021f1e..000000000000
--- a/dev-php/pecl-mongodb-1.4.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=php_targets_php5-6? ( dev-lang/php:5.6[json,ssl,zlib] ) php_targets_php7-0? ( dev-lang/php:7.0[json,ssl,zlib] ) php_targets_php7-1? ( dev-lang/php:7.1[json,ssl,zlib] ) php_targets_php7-2? ( dev-lang/php:7.2[json,ssl,zlib] ) >=dev-libs/libbson-1.9.0 >=dev-libs/mongo-c-driver-1.9.0[sasl?,ssl] !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sasl? ( dev-libs/cyrus-sasl ) virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 )
-DESCRIPTION=MongoDB database driver for PHP
-EAPI=6
-HOMEPAGE=https://pecl.php.net/mongodb
-IUSE=libressl sasl php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=php_targets_php5-6? ( dev-lang/php:5.6[json,ssl,zlib] ) php_targets_php7-0? ( dev-lang/php:7.0[json,ssl,zlib] ) php_targets_php7-1? ( dev-lang/php:7.1[json,ssl,zlib] ) php_targets_php7-2? ( dev-lang/php:7.2[json,ssl,zlib] ) >=dev-libs/libbson-1.9.0 >=dev-libs/mongo-c-driver-1.9.0[sasl?,ssl] !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sasl? ( dev-libs/cyrus-sasl ) php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 )
-REQUIRED_USE=|| ( php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2 )
-SLOT=0
-SRC_URI=https://pecl.php.net/get/mongodb-1.4.4.tgz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e php-ext-pecl-r3 a59741d3df8ea9f17afcdcfb7edaee6d php-ext-source-r3 63b281041baa106ff1ef59b602ca7e2a toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=ee480e78a39d59c170bd796394c0867b
diff --git a/dev-php/pecl-mongodb/Manifest b/dev-php/pecl-mongodb/Manifest
new file mode 100644
index 000000000000..11c5511fc80e
--- /dev/null
+++ b/dev-php/pecl-mongodb/Manifest
@@ -0,0 +1,15 @@
+DIST mongodb-1.1.10.tgz 661847 BLAKE2B 433eddfc72fab1afdb027f87233e6026405233145c768346b335422d2f5492454b9164247320cd48e9ab0d3a4d57766bb8fa55958572788bd5fb4e970835576a SHA512 36096ceaec04aa4670b7d7d8e0b23edf786bab7184718642869455f5ddc6562eeb1a56f524550bea7f0dfe3aa44b12a25c32b20744ee8c843aacb1f03458ebd0
+DIST mongodb-1.1.8.tgz 806900 BLAKE2B 2d15bb3bc139464c0f411e86405277a7adeb0bfd1d703d10e1561079effffde53ac3376cdda0e8dd4beb07e6998cfbc5c9182b47f326c57fb782a951f3dc163d SHA512 1026b4081cd1c35f1f6fee6332c21dbe739320236377c0ed21b8d64447a9ba26464a919ceb9c16b332a64f12b834700472d6cbfb336d09d841c97ca0b402bf17
+DIST mongodb-1.2.11.tgz 786669 BLAKE2B 69c0689436f73846294f13610d569c2bdd4fc0614d179939d2c2ae67d40f9f0f2d265b1d3560e2bfe652aa36e9ad862f547530e5ae22c9f85a05a86a429b3b49 SHA512 19642bc156064e14c598b09a328b57c2f7c35c59268912edb88bbd1a144e5f2ea5a74860c3b9fb8552e45114cf712d7acf6f686486db328b34f0583aac8766f5
+DIST mongodb-1.2.9.tgz 786049 BLAKE2B 39c1ea211fdaa116e5a25fdb17a7be8b6c375909fc8a46bbcd7ed9f5d7a528f1effccec81000b61ed784fb924196237fb9cea74969cc0754dd53cb202377e800 SHA512 7eff5cfce08f3d69bc7acdb9ab5f8f55d02dab67593e5d03402c8bb6b6611fd703e8dfda89b99e8d3de387ed58cb9eea096fe68e0c9657ec3f8b1b7f622cfe58
+DIST mongodb-1.3.3.tgz 925476 BLAKE2B 845abd4c7cf5dbb1fb3b04c5fc4070f0a360874ac566f1988025701258141a89afaa0e60c3d7166484fa37eda4ef08d94deeabdcc2ebe2a4f221dcf83aff20df SHA512 16c82ada278eac6996065d3c594237fbb8c1a7fe4e21828aa8af9ef98033cf6dfaf0fee90095e8116e946e620b551a6122238f85865a6c47d4d087f784cd54ea
+DIST mongodb-1.4.1.tgz 1037836 BLAKE2B eb31be94e1508a860d88d44e3e6714bea62a34eb999285a2e40082a0b66b617d380adbbf56614244eb567b8939dae223b0553d425e608d05d86cd3232441b59d SHA512 4c053917ba6e178e114a4aafcd20ec505694bd96575235485e1524f1063d17ea1c446c86b7eb70d0c25db4ae6338d71fb33aa9df647ce1c80a17f539362230b0
+DIST mongodb-1.4.4.tgz 1043458 BLAKE2B bb159170fe6696f996a69d1a3ffbfbc66016e6f31a8c53022e836fb3c21554bd4b74f263b11c4ad78fd6e17b8ec75d551fbe65612778d3d44c9fb1c049f84e5a SHA512 fe54b169593d8cddc0318ae6e40f833796b8745a45917446ce360604bb1ceb7b3242498ac9ca6a6be1389a735c12786b0542ba29655ff42a0c96e16a4a0b68cb
+EBUILD pecl-mongodb-1.1.10.ebuild 1041 BLAKE2B 8d7f85ffb56105a779e73a180e4f84d371d4d407d97cbf99fc3bc167d16b1af1e3b40761a27688746f5a3f6f2adca2a55aaf281637c1883287298ac117a00e5e SHA512 3741733deab5a8b8896bcfb0289c94d3ee607a0d047b6f7fc5f716c782f19dcc0de3de79e5bdd202fcfb99cc4fa44577b790fabc685da5ad51abaffabe4a565b
+EBUILD pecl-mongodb-1.1.8.ebuild 977 BLAKE2B 9f914f49facf5709946fef5c21f7577a50e76422b76681a00227ac4fffbb9ac911b51b06d46e4fa14962fbc35c8b13a27cc51c021331446dbba91adc77544c0a SHA512 530ba95db69a7251560f8bcd25f247f51299fb4cc811a0acca6a85ee3dfb552f7958683d96830e71ddb2054552a42dba59de144124a3efecc9ef26a53ca18302
+EBUILD pecl-mongodb-1.2.11.ebuild 977 BLAKE2B f849f8493bf91fed804cc2f186852025a4dfdc2302fefd810004b50dfe351f42503747b3d936924ce2a21438cef5bb145b56972659d88c929946053ea72a7701 SHA512 871b2901718b5952acdfc66ddef7f009121c8354b0ff0ac8e434301bdf834e7e040db886c7e1055686ef047d29f5c3a39250f727446265d8b162986d3041d77a
+EBUILD pecl-mongodb-1.2.9.ebuild 977 BLAKE2B f849f8493bf91fed804cc2f186852025a4dfdc2302fefd810004b50dfe351f42503747b3d936924ce2a21438cef5bb145b56972659d88c929946053ea72a7701 SHA512 871b2901718b5952acdfc66ddef7f009121c8354b0ff0ac8e434301bdf834e7e040db886c7e1055686ef047d29f5c3a39250f727446265d8b162986d3041d77a
+EBUILD pecl-mongodb-1.3.3.ebuild 956 BLAKE2B 7de929ccdb22c32bd99bf35d31a3e4d491092957472b7771b866ac3c17cce14ba3c3bb593d0fc395bef0ab7c079a32ff2ee89a049f33984d4b3628d2b3f87abe SHA512 571b4af8ec1da33375b4cf609d37982fa920cf9afa97bc8db79219e1a200f3f4035bafb0aaab2419b958c9831af2a88e32a06a613c8f10afec484f6a55d327e8
+EBUILD pecl-mongodb-1.4.1.ebuild 1022 BLAKE2B 3b863c31f2450f7bfa96cd6ae5d6ea88b265cd655832816d46c528de6da1dfaffc90baf30d066eb33134b5040964feafc2c59eecdd3b625f0ac30a03969af916 SHA512 7880e5768287b0c3d6c3f0db7ee162b25efeef2b241827f741e8ce765e997cff9ea2927f019d7161fbb7968a752b5e36a15b8e78ef4aa5ebb85e1d074d62e19a
+EBUILD pecl-mongodb-1.4.4.ebuild 1022 BLAKE2B 3b863c31f2450f7bfa96cd6ae5d6ea88b265cd655832816d46c528de6da1dfaffc90baf30d066eb33134b5040964feafc2c59eecdd3b625f0ac30a03969af916 SHA512 7880e5768287b0c3d6c3f0db7ee162b25efeef2b241827f741e8ce765e997cff9ea2927f019d7161fbb7968a752b5e36a15b8e78ef4aa5ebb85e1d074d62e19a
+MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/pecl-mongodb/metadata.xml b/dev-php/pecl-mongodb/metadata.xml
new file mode 100644
index 000000000000..b86acf66c756
--- /dev/null
+++ b/dev-php/pecl-mongodb/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ <name>PHP</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/dev-php/pecl-mongodb/pecl-mongodb-1.1.10.ebuild b/dev-php/pecl-mongodb/pecl-mongodb-1.1.10.ebuild
new file mode 100644
index 000000000000..7811b31062b5
--- /dev/null
+++ b/dev-php/pecl-mongodb/pecl-mongodb-1.1.10.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PHP_EXT_NAME="mongodb"
+USE_PHP="php5-6 php7-0 php7-1"
+DOCS=( README.md )
+
+inherit php-ext-pecl-r3
+
+DESCRIPTION="MongoDB database driver for PHP"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="libressl pcre sasl"
+
+RDEPEND="
+ php_targets_php5-6? ( dev-lang/php:5.6[json,ssl,zlib] )
+ php_targets_php7-0? ( dev-lang/php:7.0[json,ssl,zlib] )
+ php_targets_php7-1? ( dev-lang/php:7.1[json,ssl,zlib] )
+ >=dev-libs/libbson-1.3.3
+ >=dev-libs/mongo-c-driver-1.3.3[sasl?,ssl]
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:0= )
+ pcre? ( dev-libs/libpcre )
+ sasl? ( dev-libs/cyrus-sasl )
+"
+# pkgconfig needed if system libraries are used for bson and libmongoc
+DEPEND="${RDEPEND} virtual/pkgconfig"
+
+src_configure() {
+ local PHP_EXT_ECONF_ARGS=(
+ --enable-mongodb
+ --with-libbson
+ --with-libmongoc
+ --with-pcre-dir=$(usex pcre)
+ --with-mongodb-sasl=$(usex sasl)
+ )
+ php-ext-source-r3_src_configure
+}
diff --git a/dev-php/pecl-mongodb/pecl-mongodb-1.1.8.ebuild b/dev-php/pecl-mongodb/pecl-mongodb-1.1.8.ebuild
new file mode 100644
index 000000000000..c8e9491f1ea5
--- /dev/null
+++ b/dev-php/pecl-mongodb/pecl-mongodb-1.1.8.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PHP_EXT_NAME="mongodb"
+USE_PHP="php5-6 php7-0"
+DOCS=( README.md )
+
+inherit php-ext-pecl-r3
+
+DESCRIPTION="MongoDB database driver for PHP"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="libressl pcre sasl"
+
+RDEPEND="
+ php_targets_php5-6? ( dev-lang/php:5.6[json,ssl,zlib] )
+ php_targets_php7-0? ( dev-lang/php:7.0[json,ssl,zlib] )
+ >=dev-libs/libbson-1.3.3
+ >=dev-libs/mongo-c-driver-1.3.3[sasl?,ssl]
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:0= )
+ pcre? ( dev-libs/libpcre )
+ sasl? ( dev-libs/cyrus-sasl )
+"
+# pkgconfig needed if system libraries are used for bson and libmongoc
+DEPEND="${RDEPEND} virtual/pkgconfig"
+
+src_configure() {
+ local PHP_EXT_ECONF_ARGS=(
+ --enable-mongodb
+ --with-libbson
+ --with-libmongoc
+ --with-pcre-dir=$(usex pcre)
+ --with-mongodb-sasl=$(usex sasl)
+ )
+ php-ext-source-r3_src_configure
+}
diff --git a/dev-php/pecl-mongodb/pecl-mongodb-1.2.11.ebuild b/dev-php/pecl-mongodb/pecl-mongodb-1.2.11.ebuild
new file mode 100644
index 000000000000..05b7ad91bd68
--- /dev/null
+++ b/dev-php/pecl-mongodb/pecl-mongodb-1.2.11.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PHP_EXT_NAME="mongodb"
+USE_PHP="php5-6 php7-0 php7-1"
+DOCS=( README.md )
+
+inherit php-ext-pecl-r3
+
+DESCRIPTION="MongoDB database driver for PHP"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="libressl sasl"
+
+RDEPEND="
+ php_targets_php5-6? ( dev-lang/php:5.6[json,ssl,zlib] )
+ php_targets_php7-0? ( dev-lang/php:7.0[json,ssl,zlib] )
+ php_targets_php7-1? ( dev-lang/php:7.1[json,ssl,zlib] )
+ >=dev-libs/libbson-1.6.0
+ >=dev-libs/mongo-c-driver-1.6.0[sasl?,ssl]
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:0= )
+ sasl? ( dev-libs/cyrus-sasl )
+"
+# pkgconfig needed if system libraries are used for bson and libmongoc
+DEPEND="${RDEPEND} virtual/pkgconfig"
+
+src_configure() {
+ local PHP_EXT_ECONF_ARGS=(
+ --enable-mongodb
+ --with-libbson
+ --with-libmongoc
+ --with-mongodb-sasl=$(usex sasl)
+ )
+ php-ext-source-r3_src_configure
+}
diff --git a/dev-php/pecl-mongodb/pecl-mongodb-1.2.9.ebuild b/dev-php/pecl-mongodb/pecl-mongodb-1.2.9.ebuild
new file mode 100644
index 000000000000..05b7ad91bd68
--- /dev/null
+++ b/dev-php/pecl-mongodb/pecl-mongodb-1.2.9.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PHP_EXT_NAME="mongodb"
+USE_PHP="php5-6 php7-0 php7-1"
+DOCS=( README.md )
+
+inherit php-ext-pecl-r3
+
+DESCRIPTION="MongoDB database driver for PHP"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="libressl sasl"
+
+RDEPEND="
+ php_targets_php5-6? ( dev-lang/php:5.6[json,ssl,zlib] )
+ php_targets_php7-0? ( dev-lang/php:7.0[json,ssl,zlib] )
+ php_targets_php7-1? ( dev-lang/php:7.1[json,ssl,zlib] )
+ >=dev-libs/libbson-1.6.0
+ >=dev-libs/mongo-c-driver-1.6.0[sasl?,ssl]
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:0= )
+ sasl? ( dev-libs/cyrus-sasl )
+"
+# pkgconfig needed if system libraries are used for bson and libmongoc
+DEPEND="${RDEPEND} virtual/pkgconfig"
+
+src_configure() {
+ local PHP_EXT_ECONF_ARGS=(
+ --enable-mongodb
+ --with-libbson
+ --with-libmongoc
+ --with-mongodb-sasl=$(usex sasl)
+ )
+ php-ext-source-r3_src_configure
+}
diff --git a/dev-php/pecl-mongodb/pecl-mongodb-1.3.3.ebuild b/dev-php/pecl-mongodb/pecl-mongodb-1.3.3.ebuild
new file mode 100644
index 000000000000..ad063c40f913
--- /dev/null
+++ b/dev-php/pecl-mongodb/pecl-mongodb-1.3.3.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PHP_EXT_NAME="mongodb"
+USE_PHP="php5-6 php7-0 php7-1"
+
+inherit php-ext-pecl-r3
+
+DESCRIPTION="MongoDB database driver for PHP"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="libressl sasl"
+
+RDEPEND="
+ php_targets_php5-6? ( dev-lang/php:5.6[json,ssl,zlib] )
+ php_targets_php7-0? ( dev-lang/php:7.0[json,ssl,zlib] )
+ php_targets_php7-1? ( dev-lang/php:7.1[json,ssl,zlib] )
+ >=dev-libs/libbson-1.8.2
+ >=dev-libs/mongo-c-driver-1.8.2[sasl?,ssl]
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:0= )
+ sasl? ( dev-libs/cyrus-sasl )
+"
+# pkgconfig needed if system libraries are used for bson and libmongoc
+DEPEND="${RDEPEND} virtual/pkgconfig"
+
+src_configure() {
+ local PHP_EXT_ECONF_ARGS=(
+ --enable-mongodb
+ --with-libbson
+ --with-libmongoc
+ --with-mongodb-sasl=$(usex sasl)
+ )
+ php-ext-source-r3_src_configure
+}
diff --git a/dev-php/pecl-mongodb/pecl-mongodb-1.4.1.ebuild b/dev-php/pecl-mongodb/pecl-mongodb-1.4.1.ebuild
new file mode 100644
index 000000000000..bc420b457167
--- /dev/null
+++ b/dev-php/pecl-mongodb/pecl-mongodb-1.4.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PHP_EXT_NAME="mongodb"
+USE_PHP="php5-6 php7-0 php7-1 php7-2"
+
+inherit php-ext-pecl-r3
+
+DESCRIPTION="MongoDB database driver for PHP"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="libressl sasl"
+
+RDEPEND="
+ php_targets_php5-6? ( dev-lang/php:5.6[json,ssl,zlib] )
+ php_targets_php7-0? ( dev-lang/php:7.0[json,ssl,zlib] )
+ php_targets_php7-1? ( dev-lang/php:7.1[json,ssl,zlib] )
+ php_targets_php7-2? ( dev-lang/php:7.2[json,ssl,zlib] )
+ >=dev-libs/libbson-1.9.0
+ >=dev-libs/mongo-c-driver-1.9.0[sasl?,ssl]
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:0= )
+ sasl? ( dev-libs/cyrus-sasl )
+"
+# pkgconfig needed if system libraries are used for bson and libmongoc
+DEPEND="${RDEPEND} virtual/pkgconfig"
+
+src_configure() {
+ local PHP_EXT_ECONF_ARGS=(
+ --enable-mongodb
+ --with-libbson
+ --with-libmongoc
+ --with-mongodb-sasl=$(usex sasl)
+ )
+ php-ext-source-r3_src_configure
+}
diff --git a/dev-php/pecl-mongodb/pecl-mongodb-1.4.4.ebuild b/dev-php/pecl-mongodb/pecl-mongodb-1.4.4.ebuild
new file mode 100644
index 000000000000..bc420b457167
--- /dev/null
+++ b/dev-php/pecl-mongodb/pecl-mongodb-1.4.4.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PHP_EXT_NAME="mongodb"
+USE_PHP="php5-6 php7-0 php7-1 php7-2"
+
+inherit php-ext-pecl-r3
+
+DESCRIPTION="MongoDB database driver for PHP"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="libressl sasl"
+
+RDEPEND="
+ php_targets_php5-6? ( dev-lang/php:5.6[json,ssl,zlib] )
+ php_targets_php7-0? ( dev-lang/php:7.0[json,ssl,zlib] )
+ php_targets_php7-1? ( dev-lang/php:7.1[json,ssl,zlib] )
+ php_targets_php7-2? ( dev-lang/php:7.2[json,ssl,zlib] )
+ >=dev-libs/libbson-1.9.0
+ >=dev-libs/mongo-c-driver-1.9.0[sasl?,ssl]
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:0= )
+ sasl? ( dev-libs/cyrus-sasl )
+"
+# pkgconfig needed if system libraries are used for bson and libmongoc
+DEPEND="${RDEPEND} virtual/pkgconfig"
+
+src_configure() {
+ local PHP_EXT_ECONF_ARGS=(
+ --enable-mongodb
+ --with-libbson
+ --with-libmongoc
+ --with-mongodb-sasl=$(usex sasl)
+ )
+ php-ext-source-r3_src_configure
+}
diff --git a/dev-php/pecl-mysqlnd_ms-1.6.0_pre20141127 b/dev-php/pecl-mysqlnd_ms-1.6.0_pre20141127
deleted file mode 100644
index ecdd29f7ba37..000000000000
--- a/dev-php/pecl-mysqlnd_ms-1.6.0_pre20141127
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/libxml2 php_targets_php5-6? ( || ( dev-lang/php:5.6[-libmysqlclient,mysql,json] dev-lang/php:5.6[-libmysqlclient,mysqli,json] ) ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php5-6? ( dev-lang/php:5.6 )
-DESCRIPTION=A replication and load balancing plugin for the mysqlnd library
-EAPI=6
-HOMEPAGE=http://pecl.php.net/package/mysqlnd_ms
-IUSE=php_targets_php5-6
-KEYWORDS=~amd64
-LICENSE=PHP-3
-RDEPEND=dev-libs/libxml2 php_targets_php5-6? ( || ( dev-lang/php:5.6[-libmysqlclient,mysql,json] dev-lang/php:5.6[-libmysqlclient,mysqli,json] ) ) php_targets_php5-6? ( dev-lang/php:5.6 )
-REQUIRED_USE=|| ( php_targets_php5-6 )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~grknight/distfiles/pecl-mysqlnd_ms-1.6.0_pre20141127.tar.xz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e php-ext-source-r3 63b281041baa106ff1ef59b602ca7e2a toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=40d577fa72e86e8b4297270ae2bc5e9e
diff --git a/dev-php/pecl-mysqlnd_ms/Manifest b/dev-php/pecl-mysqlnd_ms/Manifest
new file mode 100644
index 000000000000..e602c70c2f95
--- /dev/null
+++ b/dev-php/pecl-mysqlnd_ms/Manifest
@@ -0,0 +1,3 @@
+DIST pecl-mysqlnd_ms-1.6.0_pre20141127.tar.xz 320604 BLAKE2B 895b958a6939bef730b03a4b0a9c8dc07dbd4745ddeed074ae97a8fcbc6a2b42bf25bf695e0724e654df78dfd43306a4f9b7c4db6a99279ac9c75db91a9f45f7 SHA512 44ca22d41d1064fb7ad3545978facd73f4279611769ee450016e8325013129b4414c637f3cb621078d4cd8e46a3ea5b9f4f16a580f9ecf389c637606a8c50ec5
+EBUILD pecl-mysqlnd_ms-1.6.0_pre20141127.ebuild 870 BLAKE2B c15d699ae90108a3b40093579b8e2a41700aff4f121437265e912e27b27d1f9239ed057888cbeddef77ec3d267661b071e9ed227ed82a9c245dd5cfd7cb7e29a SHA512 4833936e6827a0c29e893819487d3d6b89cebc3c3a2fae59d09ed4091259a5ba9275ff007a3694788d38985172371bf50cf45f1a66d5e8992197990dca99d993
+MISC metadata.xml 243 BLAKE2B 11c8dc608005bfecedef961d30d557ccfea35baf5545d169b8cb47244641bb8066c06d176adb1bc50194564ef9262ea75a892f9e8e1cd79b6bb2345209cdb937 SHA512 fd91f17b0d1853b901ce01b2863396baf5a8c97066449e3761360e1f38790928216ce4fe24271a07c33ed64ae55a73f144bbf19b406ea2f976c88b04e151e4ff
diff --git a/dev-php/pecl-mysqlnd_ms/metadata.xml b/dev-php/pecl-mysqlnd_ms/metadata.xml
new file mode 100644
index 000000000000..950614534ab0
--- /dev/null
+++ b/dev-php/pecl-mysqlnd_ms/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ <name>PHP</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/dev-php/pecl-mysqlnd_ms/pecl-mysqlnd_ms-1.6.0_pre20141127.ebuild b/dev-php/pecl-mysqlnd_ms/pecl-mysqlnd_ms-1.6.0_pre20141127.ebuild
new file mode 100644
index 000000000000..e3b5b6fdf479
--- /dev/null
+++ b/dev-php/pecl-mysqlnd_ms/pecl-mysqlnd_ms-1.6.0_pre20141127.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PHP_EXT_NAME="mysqlnd_ms"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+
+USE_PHP="php5-6"
+# This is an SVN snapshot stored locally
+SRC_URI="https://dev.gentoo.org/~grknight/distfiles/${P}.tar.xz"
+inherit php-ext-source-r3
+
+HOMEPAGE="http://pecl.php.net/package/mysqlnd_ms"
+KEYWORDS="~amd64"
+
+DESCRIPTION="A replication and load balancing plugin for the mysqlnd library"
+LICENSE="PHP-3"
+SLOT="0"
+IUSE=""
+
+# Specifying targets due to USE flag transition
+DEPEND="
+ dev-libs/libxml2
+ php_targets_php5-6? ( || (
+ dev-lang/php:5.6[-libmysqlclient,mysql,json]
+ dev-lang/php:5.6[-libmysqlclient,mysqli,json]
+ )
+ )
+"
+RDEPEND="${DEPEND}"
+
+src_test() {
+ for slot in $(php_get_slots); do
+ php_init_slot_env "${slot}"
+ NO_INTERACTION="yes" emake test
+ done
+}
diff --git a/dev-php/pecl-mysqlnd_qc-1.2.0-r2 b/dev-php/pecl-mysqlnd_qc-1.2.0-r2
deleted file mode 100644
index 64a73f48e0df..000000000000
--- a/dev-php/pecl-mysqlnd_qc-1.2.0-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=memcached? ( dev-libs/libmemcached ) sqlite? ( dev-db/sqlite:3 ) php_targets_php5-6? ( || ( dev-lang/php:5.6[-libmysqlclient,mysql] dev-lang/php:5.6[-libmysqlclient,mysqli] ) ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php5-6? ( dev-lang/php:5.6 )
-DESCRIPTION=A query cache plugin for the mysqlnd library
-EAPI=6
-HOMEPAGE=https://pecl.php.net/mysqlnd_qc
-IUSE=memcached sqlite php_targets_php5-6
-KEYWORDS=~amd64
-LICENSE=PHP-3
-RDEPEND=memcached? ( dev-libs/libmemcached ) sqlite? ( dev-db/sqlite:3 ) php_targets_php5-6? ( || ( dev-lang/php:5.6[-libmysqlclient,mysql] dev-lang/php:5.6[-libmysqlclient,mysqli] ) ) php_targets_php5-6? ( dev-lang/php:5.6 )
-REQUIRED_USE=|| ( php_targets_php5-6 )
-SLOT=0
-SRC_URI=https://pecl.php.net/get/mysqlnd_qc-1.2.0.tgz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e php-ext-pecl-r3 a59741d3df8ea9f17afcdcfb7edaee6d php-ext-source-r3 63b281041baa106ff1ef59b602ca7e2a preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=15cfe2609b615e0d1426c6db32f800fd
diff --git a/dev-php/pecl-mysqlnd_qc/Manifest b/dev-php/pecl-mysqlnd_qc/Manifest
new file mode 100644
index 000000000000..396b9afde4a2
--- /dev/null
+++ b/dev-php/pecl-mysqlnd_qc/Manifest
@@ -0,0 +1,4 @@
+AUX pecl-mysqlnd_qc-1.2.0-php56.patch 1649 BLAKE2B 15d7572b2ccf530053e0ae946ecc88d84f68f1595d637930c25d9e310846319a2c13794ac935b8987b85145eec79db376142983f43f14d5bf6584b99a95430b8 SHA512 fcb07f6e6367a6ac140057ea11e78fad811e7e9124eaf7829e79edec399ef75a8c3f28bb012c452f1018c2eb4705ef82be3476b5e95b70dd1f4fb3af124f3611
+DIST mysqlnd_qc-1.2.0.tgz 147416 BLAKE2B 11bf82ca978a809e7aa196a7d9e4b93930e99c4c09081980c27d0145250b0a0c34f62cdbf2eb4bc62015fd66d8adbf869944c6f69a99aab0ceb9ead173f8308e SHA512 7f04167e671f7018a72293c665f7d2b041c90a7005748ad102a2bbcbfb2331a07335f8a624ac35f1dc05066811e3a1caa1a2314c3b083a1276e36818872df8d2
+EBUILD pecl-mysqlnd_qc-1.2.0-r2.ebuild 1211 BLAKE2B e930e286863d1c9ccdfb55ac20b19623920d06ad6c86f5324ca4b64b05c4aa10119929814fc28592431a5f5f61daddc3ee2d8164daf448cc82ce60dc0fab5503 SHA512 b5b37235eee171dd99da1427f6f360f7bef9c3aa6bdafb26c1723b7dd5fad04df351b346443b3b65d665bfd886ed033d5f66bced064ab8078ea2c8e69d7c1cd8
+MISC metadata.xml 435 BLAKE2B a85db36b5da5d48ec23ebbb0790a80b05d3a8cce34b70333b3dfcb0d89e1c78966cd33ca0fb9d7de0cbd2db731741be6d6cbc3d589b74659bbe82a3ce77ba606 SHA512 3de93890c62bfc8be4db5a6eae215a4dbe18b9c2078448327e5f1d7dd7cef7e21e5fddeda61be36cb3320b24cfb4ac2813ec8aa3073ff575f6223840ae04cba9
diff --git a/dev-php/pecl-mysqlnd_qc/files/pecl-mysqlnd_qc-1.2.0-php56.patch b/dev-php/pecl-mysqlnd_qc/files/pecl-mysqlnd_qc-1.2.0-php56.patch
new file mode 100644
index 000000000000..6f3b24171a3b
--- /dev/null
+++ b/dev-php/pecl-mysqlnd_qc/files/pecl-mysqlnd_qc-1.2.0-php56.patch
@@ -0,0 +1,48 @@
+--- a/mysqlnd_qc.c 2013/09/17 08:28:58 331414
++++ b/mysqlnd_qc.c 2014/03/22 08:20:55 333056
+@@ -613,7 +613,11 @@
+
+ /* {{{ MYSQLND_METHOD(mysqlnd_qc, store_result) */
+ static MYSQLND_RES *
++#if PHP_VERSION_ID < 50600
+ MYSQLND_METHOD(mysqlnd_qc, store_result)(MYSQLND_CONN_DATA * const conn TSRMLS_DC)
++#else
++MYSQLND_METHOD(mysqlnd_qc, store_result)(MYSQLND_CONN_DATA * const conn, const unsigned int flags TSRMLS_DC)
++#endif
+ {
+ MYSQLND_RES * result;
+ uint64_t store_time;
+@@ -621,7 +625,11 @@
+ DBG_ENTER("mysqlnd_qc::store_result");
+
+ STATS_TIME_SET(store_time);
++#if PHP_VERSION_ID < 50600
+ result = QC_CALL_ORIGINAL_CONN_DATA_METHOD(store_result)(conn TSRMLS_CC);
++#else
++ result = QC_CALL_ORIGINAL_CONN_DATA_METHOD(store_result)(conn, flags TSRMLS_CC);
++#endif
+ STATS_TIME_DIFF(store_time);
+ MYSQLND_QC_INC_STATISTIC_W_VALUE(QC_STAT_QUERY_AGGR_STORE_TIME_TOTAL, (uint64_t)store_time);
+
+@@ -777,13 +785,21 @@
+
+ /* {{{ MYSQLND_METHOD(mysqlnd_qc, use_result) */
+ static MYSQLND_RES *
++#if PHP_VERSION_ID < 50600
+ MYSQLND_METHOD(mysqlnd_qc, use_result)(MYSQLND_CONN_DATA * const conn TSRMLS_DC)
++#else
++MYSQLND_METHOD(mysqlnd_qc, use_result)(MYSQLND_CONN_DATA * const conn, const unsigned int flags TSRMLS_DC)
++#endif
+ {
+ MYSQLND_RES * ret;
+ DBG_ENTER("mysqlnd_qc::use_result");
+ MYSQLND_QC_INC_STATISTIC_W_VALUE2(QC_STAT_MISS, 1, QC_STAT_QUERY_UNCACHED_USE_RESULT, 1);
+
++#if PHP_VERSION_ID < 50600
+ ret = QC_CALL_ORIGINAL_CONN_DATA_METHOD(use_result)(conn TSRMLS_CC);
++#else
++ ret = QC_CALL_ORIGINAL_CONN_DATA_METHOD(use_result)(conn, flags TSRMLS_CC);
++#endif
+ if (ret) {
+ QC_DECLARE_AND_LOAD_CONN_DATA(conn_data_pp, conn);
+
diff --git a/dev-php/pecl-mysqlnd_qc/metadata.xml b/dev-php/pecl-mysqlnd_qc/metadata.xml
new file mode 100644
index 000000000000..fb173f77d37a
--- /dev/null
+++ b/dev-php/pecl-mysqlnd_qc/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ <name>PHP</name>
+ </maintainer>
+ <use>
+ <flag name="memcached">Use <pkg>dev-libs/libmemcached</pkg> as a storage handler</flag>
+ <flag name="sqlite">Use <pkg>dev-db/sqlite</pkg> as a storage handler</flag>
+ </use>
+</pkgmetadata>
diff --git a/dev-php/pecl-mysqlnd_qc/pecl-mysqlnd_qc-1.2.0-r2.ebuild b/dev-php/pecl-mysqlnd_qc/pecl-mysqlnd_qc-1.2.0-r2.ebuild
new file mode 100644
index 000000000000..45eba445ab3e
--- /dev/null
+++ b/dev-php/pecl-mysqlnd_qc/pecl-mysqlnd_qc-1.2.0-r2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PHP_EXT_NAME="mysqlnd_qc"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+
+USE_PHP="php5-6"
+
+inherit php-ext-pecl-r3 flag-o-matic
+
+KEYWORDS="~amd64"
+
+DESCRIPTION="A query cache plugin for the mysqlnd library"
+LICENSE="PHP-3"
+SLOT="0"
+IUSE="memcached sqlite"
+
+# Specifying targets due to USE flag transition
+DEPEND="
+ memcached? ( dev-libs/libmemcached )
+ sqlite? ( dev-db/sqlite:3 )
+ php_targets_php5-6? ( || (
+ dev-lang/php:5.6[-libmysqlclient,mysql]
+ dev-lang/php:5.6[-libmysqlclient,mysqli]
+ )
+ )
+"
+RDEPEND="${DEPEND}"
+PATCHES=( "${FILESDIR}/${P}-php56.patch" )
+
+src_configure() {
+ local PHP_EXT_ECONF_ARGS=()
+ if use memcached ; then
+ # configure does not find pthreads when memcache is enabled
+ append-flags -pthread
+ PHP_EXT_ECONF_ARGS+=( --enable-mysqlnd_qc_memcache --with-libmemcached-dir="${ROOT}usr" )
+ else
+ PHP_EXT_ECONF_ARGS+=( --disable-mysqlnd_qc_memcache )
+ fi
+ if use sqlite ; then
+ PHP_EXT_ECONF_ARGS+=( --enable-mysqlnd_qc_sqlite --with-sqlite-dir="${ROOT}usr" )
+ else
+ PHP_EXT_ECONF_ARGS+=( --disable-mysqlnd_qc_sqlite )
+ fi
+ php-ext-source-r3_src_configure
+}
diff --git a/dev-php/pecl-ncurses-1.0.2-r4 b/dev-php/pecl-ncurses-1.0.2-r4
deleted file mode 100644
index 2efe1fd1f3c4..000000000000
--- a/dev-php/pecl-ncurses-1.0.2-r4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-libs/ncurses:0= >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 )
-DESCRIPTION=Terminal screen handling and optimization package
-EAPI=6
-HOMEPAGE=https://pecl.php.net/ncurses
-IUSE=php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2
-KEYWORDS=~amd64
-LICENSE=PHP-3.01
-RDEPEND=sys-libs/ncurses:0= php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 )
-REQUIRED_USE=|| ( php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2 )
-SLOT=0
-SRC_URI=https://pecl.php.net/get/ncurses-1.0.2.tgz https://dev.gentoo.org/~grknight/distfiles/pecl-ncurses-1.0.2-php7.patch.xz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e php-ext-pecl-r3 a59741d3df8ea9f17afcdcfb7edaee6d php-ext-source-r3 63b281041baa106ff1ef59b602ca7e2a toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=d3725b7dda6049a9c8d3e4c901ea88f3
diff --git a/dev-php/pecl-ncurses/Manifest b/dev-php/pecl-ncurses/Manifest
new file mode 100644
index 000000000000..92ae23d02bfd
--- /dev/null
+++ b/dev-php/pecl-ncurses/Manifest
@@ -0,0 +1,4 @@
+DIST ncurses-1.0.2.tgz 16226 BLAKE2B 2b50fb953594f71e8ba2c93cc8ac1443168ea360c5c752eb4ebb941cdbd4e576bd6d5516722bbe06f31a5dd4732bf47c6fd740599af161cb33cbcb45493bbc5d SHA512 e1f684dcab2aa4dd3fded79fed02c78de1525f0384027fe64ad08759617f13ca6fb11742e3407723eecc431ed99847c0c98ae559797dc98ce373a01ba8413bf2
+DIST pecl-ncurses-1.0.2-php7.patch.xz 5096 BLAKE2B 8034121b97cc1769534923570c929444c0cd01238615e51c47845b9b10db4b62353a853a17d8ddd44c8ad47e68c44363321f7d08c2dfdd0e2948ddc7d33b2b9d SHA512 1f1dcaaa61033d7db55048f97e48029a335d5d191447038324eb170c9877da62a7b03cec20ea7496c073b76d7ba1009b4374b088c87e1838ee2dc433749c41fa
+EBUILD pecl-ncurses-1.0.2-r4.ebuild 507 BLAKE2B 275b0b12f0bc566b2a79146a41f096f5d1b8637c2c8ce92101ff342580459e7f44637dd99cf2e86df23bdf1d63a871647e0fd6873fb7b14962715c47f07885ea SHA512 8369d7f22e6209d7d4d6917a531bacb9ed8a98afc2613f767bcca390ead79036fec5fd1dcfd23cf024c20343fa2c45d44c2213e6235182708b93433e4b6273c3
+MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/pecl-ncurses/metadata.xml b/dev-php/pecl-ncurses/metadata.xml
new file mode 100644
index 000000000000..b86acf66c756
--- /dev/null
+++ b/dev-php/pecl-ncurses/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ <name>PHP</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/dev-php/pecl-ncurses/pecl-ncurses-1.0.2-r4.ebuild b/dev-php/pecl-ncurses/pecl-ncurses-1.0.2-r4.ebuild
new file mode 100644
index 000000000000..eb953b941e90
--- /dev/null
+++ b/dev-php/pecl-ncurses/pecl-ncurses-1.0.2-r4.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_PHP="php5-6 php7-0 php7-1 php7-2"
+
+inherit php-ext-pecl-r3
+
+SRC_URI+=" https://dev.gentoo.org/~grknight/distfiles/${P}-php7.patch.xz"
+
+DESCRIPTION="Terminal screen handling and optimization package"
+
+LICENSE="PHP-3.01"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="sys-libs/ncurses:0="
+RDEPEND="${DEPEND}"
+
+PHP_EXT_ECONF_ARGS=( --enable-ncursesw )
+PATCHES=( "${WORKDIR}/${P}-php7.patch" )
diff --git a/dev-php/pecl-oauth-1.2.3-r5 b/dev-php/pecl-oauth-1.2.3-r5
deleted file mode 100644
index a5753e9fb044..000000000000
--- a/dev-php/pecl-oauth-1.2.3-r5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=php_targets_php5-6? ( dev-lang/php:5.6[hash] dev-libs/libpcre:3= curl? ( net-misc/curl:0= ) ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 )
-DESCRIPTION=OAuth is an authorization protocol built on top of HTTP
-EAPI=6
-HOMEPAGE=https://pecl.php.net/oauth
-IUSE=+curl examples php_targets_php5-6 php_targets_php7-0 php_targets_php7-1
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=php_targets_php5-6? ( dev-lang/php:5.6[hash] dev-libs/libpcre:3= curl? ( net-misc/curl:0= ) ) php_targets_php7-0? ( dev-php/pecl-oauth:7[php_targets_php7-0(-)?] ) php_targets_php7-1? ( dev-php/pecl-oauth:7[php_targets_php7-1(-)?] ) php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 )
-REQUIRED_USE=|| ( php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 )
-SLOT=0
-SRC_URI=https://pecl.php.net/get/oauth-1.2.3.tgz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e php-ext-pecl-r3 a59741d3df8ea9f17afcdcfb7edaee6d php-ext-source-r3 63b281041baa106ff1ef59b602ca7e2a toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=0cb893076ba0d450bf8b461881944975
diff --git a/dev-php/pecl-oauth-2.0.2-r2 b/dev-php/pecl-oauth-2.0.2-r2
deleted file mode 100644
index 4aebedd3e94d..000000000000
--- a/dev-php/pecl-oauth-2.0.2-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=php_targets_php7-0? ( dev-lang/php:7.0[hash] dev-libs/libpcre:3= curl? ( net-misc/curl:0= ) ) php_targets_php7-1? ( dev-lang/php:7.1[hash] dev-libs/libpcre:3= curl? ( net-misc/curl:0= ) ) php_targets_php7-2? ( dev-lang/php:7.2[hash] dev-libs/libpcre:3= curl? ( net-misc/curl:0= ) ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 )
-DESCRIPTION=OAuth is an authorization protocol built on top of HTTP
-EAPI=6
-HOMEPAGE=https://pecl.php.net/oauth
-IUSE=+curl examples php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=php_targets_php7-0? ( dev-lang/php:7.0[hash] dev-libs/libpcre:3= curl? ( net-misc/curl:0= ) ) php_targets_php7-1? ( dev-lang/php:7.1[hash] dev-libs/libpcre:3= curl? ( net-misc/curl:0= ) ) php_targets_php7-2? ( dev-lang/php:7.2[hash] dev-libs/libpcre:3= curl? ( net-misc/curl:0= ) ) php_targets_php5-6? ( dev-php/pecl-oauth:0[php_targets_php5-6(-)?] ) php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 )
-REQUIRED_USE=|| ( php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2 )
-SLOT=7
-SRC_URI=https://pecl.php.net/get/oauth-2.0.2.tgz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e php-ext-pecl-r3 a59741d3df8ea9f17afcdcfb7edaee6d php-ext-source-r3 63b281041baa106ff1ef59b602ca7e2a toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=768a44481f72f809b8407ef8ca83c1b1
diff --git a/dev-php/pecl-oauth/Manifest b/dev-php/pecl-oauth/Manifest
new file mode 100644
index 000000000000..ec6fcaf766e7
--- /dev/null
+++ b/dev-php/pecl-oauth/Manifest
@@ -0,0 +1,8 @@
+AUX 1.2.3-prce.h-check.patch 757 BLAKE2B 75c725cc7b73d260c1168deb524581ad2d745e57fa780a0579970cde706fdae1aac5c0b3b11afead865a075d8b596c9f9b934dd06d982d70cbebc7641d759cd1 SHA512 e3f3ba2f60ec65e6dd80bb0e6980f2597b746ae6bad302fca4a295eb3fb7da9448d756ff1106fe0543151b90c50d4f4dd01ccccd1ee61455544046b2ca15b79b
+AUX 1.2.3-withcurl.patch 2099 BLAKE2B cbbc746f5e233830a7c2fc81ddcaf4a3a9ca25afa6cd2168d82b656d80c26f9297e4fadfca8e6680027069bd9f5b1e75f9068448b331585692e2e0d229919504 SHA512 f40d0d48a35f54b09d6eb2c44af1c191416840e922cb030b27b95501558e356252793a43f02ade85eecc498968aff85c7498fef546e7d24e94c583a88b14c2e5
+AUX 2.0.2-compare_segfault.patch 1664 BLAKE2B 099aa3f78002d734306673d817e21d75bcbf6e5ece41f9c8290ebfaa1ec68d944de86f4dc3af8139143392121ec73b00c481f77599fb541c3ae5b7d435e6c0b3 SHA512 1d8da5be1648738b4a03f5e8b47b016418096a38571d6aa518c486ff799e09152af1a33c39ad9d0c8d81ee2d5500d58aa78dcc4f46e1e746a4a9bc688dcd08e1
+DIST oauth-1.2.3.tgz 45531 BLAKE2B 10fb5a3d1a46ee17fef7b129b3c29d67d565d296579aff63d8309f4efc5b881450249fb8e6d25703a33ad53e336775abc73f3d8e489f78c00c8988219b02ae1b SHA512 ca61dbec8fa51679accb31eab90b8699c7780f2d60a83566ce05667148ee44b7dc70fd8235414d6a3a996b252ad4a236b3e8a549685fd7e890e0874029c455e1
+DIST oauth-2.0.2.tgz 49115 BLAKE2B 292c8c2d7fa3728aa6a73cdb65ee1c603f341cd24596d64b910f495ef649adb1f90ba4dfdab5ce1802dee9e8a0e3a6af502da340ed467de6e8c5d83df18abc7d SHA512 b7aa9459542ec390a5420127d75607702ae6df6254f4e39acb62d35c6a39b8b7990499c279df07ce681081e455b55219c51df42fd516321f317465badf6d459d
+EBUILD pecl-oauth-1.2.3-r5.ebuild 1147 BLAKE2B ccab8eb759914ca9d30e73e8d23a829f3ab0ef120f7c9ecd70466f16658ef8e02763ffb64ed33b7cb4b797c3dbbbb9e3980bc93e3bb08d349dda02930545a48b SHA512 2b30cde4d028f636becc2f1d61e0c56a55c021910567fa78bb387ba0c83949d3d104026d917fbe63836850b374e8a1c1bc1f91bbaf102029a1ffb60e469a9e3d
+EBUILD pecl-oauth-2.0.2-r2.ebuild 1407 BLAKE2B f048f3a75f5511e0ef9efc9a5e0428f0d30ae98e3ffb3664b417a87e9725f6db34ac9b959cad9b12941962849f03199525022d119d768722769340ecfaa92567 SHA512 08f2136c40fbe88a7ca94a27ca09ccd8fcac6a0367c32a28272b472243ff036192202adec19bb401b7274c65e2b1eb63911a07ab5ca76741d15b0e24a937aaa8
+MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/pecl-oauth/files/1.2.3-prce.h-check.patch b/dev-php/pecl-oauth/files/1.2.3-prce.h-check.patch
new file mode 100644
index 000000000000..995ef51f28ca
--- /dev/null
+++ b/dev-php/pecl-oauth/files/1.2.3-prce.h-check.patch
@@ -0,0 +1,26 @@
+From f12e2bd72b238da2dbf3bd0f882d977073cca282 Mon Sep 17 00:00:00 2001
+From: John Jawed <jawed@php.net>
+Date: Thu, 24 Jul 2014 15:19:18 +0000
+Subject: [PATCH] Bug #67658 (configure does not detect missing pcre.h)
+
+git-svn-id: https://svn.php.net/repository/pecl/oauth/trunk@334377 c90b9560-bf6c-de11-be94-00142212c4b1
+---
+ config.m4 | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/config.m4 b/config.m4
+index 48e2608..53a5ea8 100644
+--- a/config.m4
++++ b/config.m4
+@@ -14,6 +14,8 @@ if test "$PHP_OAUTH" != "no"; then
+ PHP_NEW_EXTENSION(oauth, oauth.c provider.c, $ext_shared)
+ CFLAGS="$CFLAGS -Wall -g"
+
++ AC_CHECK_HEADERS(pcre.h)
++
+ AS_IF([test "x$with_curl" != "xno"],
+ [
+ AC_MSG_CHECKING(for cURL in default path)
+--
+2.1.4
+
diff --git a/dev-php/pecl-oauth/files/1.2.3-withcurl.patch b/dev-php/pecl-oauth/files/1.2.3-withcurl.patch
new file mode 100644
index 000000000000..5069ae92b146
--- /dev/null
+++ b/dev-php/pecl-oauth/files/1.2.3-withcurl.patch
@@ -0,0 +1,71 @@
+From 1b68ce035883f1ae186d82682fbbc5ea7d1834b3 Mon Sep 17 00:00:00 2001
+From: John Jawed <jawed@php.net>
+Date: Fri, 18 Jan 2013 20:28:05 +0000
+Subject: [PATCH] Bug 64025 (patch via mattsch at gmail dot com)
+
+git-svn-id: https://svn.php.net/repository/pecl/oauth/trunk@329234 c90b9560-bf6c-de11-be94-00142212c4b1
+---
+ config.m4 | 40 ++++++++++++++++++++++++++--------------
+ 1 file changed, 26 insertions(+), 14 deletions(-)
+
+diff --git a/config.m4 b/config.m4
+index 832c577..48e2608 100644
+--- a/config.m4
++++ b/config.m4
+@@ -5,27 +5,39 @@ dnl
+ PHP_ARG_ENABLE(oauth, for oauth support,
+ [ --enable-oauth Include oauth support])
+
++AC_ARG_WITH([curl],
++ AS_HELP_STRING([--without-curl], [Ignore presence of cURL and disable it]))
++
+ if test "$PHP_OAUTH" != "no"; then
+ PHP_SUBST(OAUTH_SHARED_LIBADD)
+
+ PHP_NEW_EXTENSION(oauth, oauth.c provider.c, $ext_shared)
+ CFLAGS="$CFLAGS -Wall -g"
+
+- AC_MSG_CHECKING(for cURL in default path)
+- for i in /usr/local /usr; do
+- if test -r $i/include/curl/easy.h; then
+- CURL_DIR=$i
+- AC_MSG_RESULT(found in $i)
+- break
+- fi
+- done
++ AS_IF([test "x$with_curl" != "xno"],
++ [
++ AC_MSG_CHECKING(for cURL in default path)
++ have_curl=no
++ for i in /usr/local /usr; do
++ if test -r $i/include/curl/easy.h; then
++ have_curl=yes
++ CURL_DIR=$i
++ AC_MSG_RESULT(found in $i)
++ break
++ fi
++ done
++ ],
++ [have_curl=no])
+
+- if test -z "$CURL_DIR"; then
+- AC_MSG_RESULT(cURL not found, cURL support disabled)
+- else
+- PHP_ADD_LIBRARY(curl,,OAUTH_SHARED_LIBADD)
+- AC_DEFINE(OAUTH_USE_CURL, 1, [Whether cURL is present and should be used])
+- fi
++ AS_IF([test "x$have_curl" = "xyes"],
++ [
++ PHP_ADD_LIBRARY(curl,,OAUTH_SHARED_LIBADD)
++ AC_DEFINE(OAUTH_USE_CURL, 1, [Whether cURL is present and should be used])
++ ],
++ [AS_IF([test "x$with_curl" = "xyes"],
++ [AC_MSG_ERROR([cURL requested but not found])
++ ])
++ ])
+
+ PHP_ADD_EXTENSION_DEP(oauth, hash)
+ fi
+--
+2.1.4
+
diff --git a/dev-php/pecl-oauth/files/2.0.2-compare_segfault.patch b/dev-php/pecl-oauth/files/2.0.2-compare_segfault.patch
new file mode 100644
index 000000000000..f0b8d7ae216f
--- /dev/null
+++ b/dev-php/pecl-oauth/files/2.0.2-compare_segfault.patch
@@ -0,0 +1,48 @@
+From f1a5b6dea1982dab03c810edd321ca57907d41fe Mon Sep 17 00:00:00 2001
+From: Adam Saponara <as@php.net>
+Date: Fri, 24 Feb 2017 17:20:51 -0500
+Subject: [PATCH] Fix bug #74163: Segfault in oauth_compare_value
+
+Credit to @russpos for finding this bug
+---
+ oauth.c | 4 ++--
+ tests/oauth_sbs.phpt | 4 ++++
+ 2 files changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/oauth.c b/oauth.c
+index 62522bd..198e2cb 100644
+--- a/oauth.c
++++ b/oauth.c
+@@ -374,8 +374,8 @@ static int oauth_strcmp(zval *first, zval *second)
+ static int oauth_compare_value(const void *a, const void *b)
+ {
+ Bucket *f, *s;
+- f = *(Bucket **)a;
+- s = *(Bucket **)b;
++ f = (Bucket *)a;
++ s = (Bucket *)b;
+
+ return oauth_strcmp(&f->val, &s->val);
+ }
+diff --git a/tests/oauth_sbs.phpt b/tests/oauth_sbs.phpt
+index a49d2b4..4e9269e 100644
+--- a/tests/oauth_sbs.phpt
++++ b/tests/oauth_sbs.phpt
+@@ -21,6 +21,8 @@ echo "-- putting oauth_signature inside by mistake --\n";
+ echo oauth_get_sbs('GET', 'http://127.0.0.1:12342/',array('oauth_signature'=>'hello world')),"\n";
+ echo "-- merging url query and extra params --\n";
+ echo oauth_get_sbs('GET', 'http://127.0.0.1:12342/script?arg1=1',array('arg2' => '2')),"\n";
++echo "-- with array value --\n";
++echo oauth_get_sbs('GET', 'http://127.0.0.1:12342/script',array('arg2' => [1, 2, 3])),"\n";
+
+ ?>
+ --EXPECTF--
+@@ -44,3 +46,5 @@ GET&http%3A%2F%2F127.0.0.1%3A12342%2F&test%3D
+ GET&http%3A%2F%2F127.0.0.1%3A12342%2F&
+ -- merging url query and extra params --
+ GET&http%3A%2F%2F127.0.0.1%3A12342%2Fscript&arg1%3D1%26arg2%3D2
++-- with array value --
++GET&http%3A%2F%2F127.0.0.1%3A12342%2Fscript&arg2%3D1%26arg2%3D2%26arg2%3D3
+--
+2.1.4
+
diff --git a/dev-php/pecl-oauth/metadata.xml b/dev-php/pecl-oauth/metadata.xml
new file mode 100644
index 000000000000..b86acf66c756
--- /dev/null
+++ b/dev-php/pecl-oauth/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ <name>PHP</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/dev-php/pecl-oauth/pecl-oauth-1.2.3-r5.ebuild b/dev-php/pecl-oauth/pecl-oauth-1.2.3-r5.ebuild
new file mode 100644
index 000000000000..460f2c39256c
--- /dev/null
+++ b/dev-php/pecl-oauth/pecl-oauth-1.2.3-r5.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PHP_EXT_NAME="oauth"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+
+USE_PHP="php5-6 php7-0 php7-1"
+
+inherit php-ext-pecl-r3
+
+# Really only build for 5.6
+USE_PHP="php5-6"
+
+KEYWORDS="~amd64 ~x86"
+
+DESCRIPTION="OAuth is an authorization protocol built on top of HTTP"
+LICENSE="BSD"
+SLOT="0"
+IUSE="+curl examples"
+
+DEPEND="php_targets_php5-6? ( dev-lang/php:5.6[hash]
+ dev-libs/libpcre:3= curl? ( net-misc/curl:0= ) )
+"
+RDEPEND="${DEPEND} php_targets_php7-0? ( ${CATEGORY}/${PN}:7[php_targets_php7-0(-)?] )
+ php_targets_php7-1? ( ${CATEGORY}/${PN}:7[php_targets_php7-1(-)?] )"
+
+src_prepare() {
+ if use php_targets_php5-6 ; then
+ local PATCHES=(
+ "${FILESDIR}/${PV}-withcurl.patch"
+ "${FILESDIR}/${PV}-prce.h-check.patch"
+ )
+ php-ext-source-r3_src_prepare
+ else
+ eapply_user
+ fi
+}
+
+src_configure() {
+ if use php_targets_php5-6 ; then
+ local PHP_EXT_ECONF_ARGS=(
+ --enable-oauth
+ $(use_with curl)
+ )
+
+ php-ext-source-r3_src_configure
+ fi
+}
+
+src_install() {
+ if use php_targets_php5-6 ; then
+ php-ext-pecl-r3_src_install
+ fi
+}
diff --git a/dev-php/pecl-oauth/pecl-oauth-2.0.2-r2.ebuild b/dev-php/pecl-oauth/pecl-oauth-2.0.2-r2.ebuild
new file mode 100644
index 000000000000..987a87b85ee0
--- /dev/null
+++ b/dev-php/pecl-oauth/pecl-oauth-2.0.2-r2.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PHP_EXT_NAME="oauth"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+
+USE_PHP="php5-6 php7-0 php7-1 php7-2"
+
+inherit php-ext-pecl-r3
+
+# Really only build for 7.0
+USE_PHP="php7-0 php7-1 php7-2"
+
+KEYWORDS="~amd64 ~x86"
+
+DESCRIPTION="OAuth is an authorization protocol built on top of HTTP"
+LICENSE="BSD"
+SLOT="7"
+IUSE="+curl examples"
+
+DEPEND="php_targets_php7-0? ( dev-lang/php:7.0[hash]
+ dev-libs/libpcre:3= curl? ( net-misc/curl:0= ) )
+ php_targets_php7-1? ( dev-lang/php:7.1[hash]
+ dev-libs/libpcre:3= curl? ( net-misc/curl:0= ) )
+ php_targets_php7-2? ( dev-lang/php:7.2[hash]
+ dev-libs/libpcre:3= curl? ( net-misc/curl:0= ) )
+"
+RDEPEND="${DEPEND} php_targets_php5-6? ( ${CATEGORY}/${PN}:0[php_targets_php5-6(-)?] )"
+
+src_prepare() {
+ if use php_targets_php7-0 || use php_targets_php7-1 || use php_targets_php7-2; then
+ local PATCHES=( "${FILESDIR}/${PV}-compare_segfault.patch" )
+ php-ext-source-r3_src_prepare
+ else
+ eapply_user
+ fi
+}
+
+src_configure() {
+ if use php_targets_php7-0 || use php_targets_php7-1 || use php_targets_php7-2; then
+ local PHP_EXT_ECONF_ARGS=(
+ --enable-oauth
+ $(use_with curl)
+ )
+
+ php-ext-source-r3_src_configure
+ fi
+}
+
+src_install() {
+ if use php_targets_php7-0 || use php_targets_php7-1 || use php_targets_php7-2; then
+ php-ext-pecl-r3_src_install
+ fi
+}
diff --git a/dev-php/pecl-pam-1.0.3-r3 b/dev-php/pecl-pam-1.0.3-r3
deleted file mode 100644
index 8ac28d8fe66c..000000000000
--- a/dev-php/pecl-pam-1.0.3-r3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-libs/pam >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 )
-DESCRIPTION=This extension provides PAM (Pluggable Authentication Modules) integration
-EAPI=6
-HOMEPAGE=https://pecl.php.net/pam
-IUSE=debug php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2
-KEYWORDS=~amd64 ~x86
-LICENSE=PHP-2.02
-RDEPEND=sys-libs/pam php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 )
-REQUIRED_USE=|| ( php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2 )
-SLOT=0
-SRC_URI=https://pecl.php.net/get/pam-1.0.3.tgz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e pam 3e788d86170dfcd5b06824d898315e18 php-ext-pecl-r3 a59741d3df8ea9f17afcdcfb7edaee6d php-ext-source-r3 63b281041baa106ff1ef59b602ca7e2a preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a986c1250bf872bff0027b8d11db5a77
diff --git a/dev-php/pecl-pam/Manifest b/dev-php/pecl-pam/Manifest
new file mode 100644
index 000000000000..402a39c18f24
--- /dev/null
+++ b/dev-php/pecl-pam/Manifest
@@ -0,0 +1,4 @@
+AUX 1.0.3-php7.patch 3519 BLAKE2B 649f278a88e12ecbf895ab372aaa97c9f1f7cdcf4724eeda63368daefc89e89c3e5aae9e09cb7026058ca18aa4569423d75ee125795b56d8e2d372ccc93123f1 SHA512 9877b6bede71f402166253521aec667e4f9da99fbbf4fc0e74b9a5c48e498df717f869969b5d7a6432427a50030370771774f77ecb876ef133288eab174c9289
+DIST pam-1.0.3.tgz 6671 BLAKE2B f416fd0e47d3fda6a1d86e44a7ca17fc9a0428f976f18e2b663a2fd1e09b790cd069ca16d930d6dca6554762ca59bda987929e52365ed813949c1a93291c1dcc SHA512 3580582f1456b31be30a713cadaaca106527f2d4f3f12032b5d3617cc361aaf49539a9db3dd27221ce40320187abaac0f6ad4e23cdfe5eaa94436e3eaef3fb9c
+EBUILD pecl-pam-1.0.3-r3.ebuild 820 BLAKE2B 60fc2dd45e6390ffcc7b97ddffc3c93574184df28dd14231b4232549cd13a9e5ceff152419ced823248506ee7919f117643d0c2b6d6691fa5b403ae0fe8eddbe SHA512 24d6a9c2cce0b83d418f436826716aa5506520dbff58c37fe2d69331929cf0fdd803fb9d2b380e6218befcc8597538333254fa8dec2f91a48d8168ad105468dc
+MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/pecl-pam/files/1.0.3-php7.patch b/dev-php/pecl-pam/files/1.0.3-php7.patch
new file mode 100644
index 000000000000..d56fffb08d38
--- /dev/null
+++ b/dev-php/pecl-pam/files/1.0.3-php7.patch
@@ -0,0 +1,118 @@
+--- a/pam.c 2016-12-01 14:29:27.453904230 -0500
++++ b/pam.c 2016-12-01 14:27:26.496109755 -0500
+@@ -227,8 +227,13 @@
+ PHP_FUNCTION(pam_auth)
+ {
+ char *username, *password;
++#if PHP_MAJOR_VERSION >= 7
++ size_t username_len, password_len;
++ zval *status = NULL, *server, *remote_addr;
++#else
+ int username_len, password_len;
+ zval *status = NULL, **server, **remote_addr;
++#endif
+ zend_bool checkacctmgmt = 1;
+
+ pam_auth_t userinfo = {NULL, NULL};
+@@ -248,22 +253,37 @@
+ if (status) {
+ spprintf(&error_msg, 0, "%s (in %s)", (char *) pam_strerror(pamh, result), "pam_start");
+ zval_dtor(status);
++#if PHP_MAJOR_VERSION >= 7
++ ZVAL_STRING(status, error_msg);
++ efree(error_msg);
++#else
+ ZVAL_STRING(status, error_msg, 0);
++#endif
+ }
+ RETURN_FALSE;
+ }
+
++#if PHP_MAJOR_VERSION >= 7
++ if ((remote_addr = zend_hash_str_find(Z_ARR(PG(http_globals)[TRACK_VARS_SERVER]), "REMOTE_ADDR", sizeof("REMOTE_ADDR")-1)) != NULL && Z_TYPE_P(remote_addr) == IS_STRING) {
++ pam_set_item(pamh, PAM_RHOST, Z_STRVAL_P(remote_addr));
++#else
+ if (zend_hash_find(&EG(symbol_table), "_SERVER", sizeof("_SERVER"), (void **)&server) == SUCCESS && Z_TYPE_PP(server) == IS_ARRAY) {
+ if (zend_hash_find(Z_ARRVAL_PP(server), "REMOTE_ADDR", sizeof("REMOTE_ADDR"), (void **)&remote_addr) == SUCCESS && Z_TYPE_PP(remote_addr) == IS_STRING) {
+ pam_set_item(pamh, PAM_RHOST, Z_STRVAL_PP(remote_addr));
+ }
++#endif
+ }
+
+ if ((result = pam_authenticate(pamh, PAM_DISALLOW_NULL_AUTHTOK)) != PAM_SUCCESS) {
+ if (status) {
+ spprintf(&error_msg, 0, "%s (in %s)", (char *) pam_strerror(pamh, result), "pam_authenticate");
+ zval_dtor(status);
++#if PHP_MAJOR_VERSION >= 7
++ ZVAL_STRING(status, error_msg);
++ efree(error_msg);
++#else
+ ZVAL_STRING(status, error_msg, 0);
++#endif
+ }
+ pam_end(pamh, PAM_SUCCESS);
+ RETURN_FALSE;
+@@ -274,7 +294,12 @@
+ if (status) {
+ spprintf(&error_msg, 0, "%s (in %s)", (char *) pam_strerror(pamh, result), "pam_acct_mgmt");
+ zval_dtor(status);
++#if PHP_MAJOR_VERSION >= 7
++ ZVAL_STRING(status, error_msg);
++ efree(error_msg);
++#else
+ ZVAL_STRING(status, error_msg, 0);
++#endif
+ }
+ pam_end(pamh, PAM_SUCCESS);
+ RETURN_FALSE;
+@@ -291,7 +316,11 @@
+ PHP_FUNCTION(pam_chpass)
+ {
+ char *username, *oldpass, *newpass;
++#if PHP_MAJOR_VERSION >= 7
++ size_t username_len, oldpass_len, newpass_len;
++#else
+ int username_len, oldpass_len, newpass_len;
++#endif
+ zval *status = NULL;
+
+ pam_chpass_t userinfo = {NULL, NULL, NULL, 0};
+@@ -312,7 +341,12 @@
+ if (status) {
+ spprintf(&error_msg, 0, "%s (in %s)", (char *) pam_strerror(pamh, result), "pam_start");
+ zval_dtor(status);
++#if PHP_MAJOR_VERSION >= 7
++ ZVAL_STRING(status, error_msg);
++ efree(error_msg);
++#else
+ ZVAL_STRING(status, error_msg, 0);
++#endif
+ }
+ RETURN_FALSE;
+ }
+@@ -321,7 +355,12 @@
+ if (status) {
+ spprintf(&error_msg, 0, "%s (in %s)", (char *) pam_strerror(pamh, result), "pam_authenticate");
+ zval_dtor(status);
++#if PHP_MAJOR_VERSION >= 7
++ ZVAL_STRING(status, error_msg);
++ efree(error_msg);
++#else
+ ZVAL_STRING(status, error_msg, 0);
++#endif
+ }
+ pam_end(pamh, PAM_SUCCESS);
+ RETURN_FALSE;
+@@ -331,7 +370,12 @@
+ if (status) {
+ spprintf(&error_msg, 0, "%s (in %s)", (char *) pam_strerror(pamh, result), "pam_chauthtok");
+ zval_dtor(status);
++#if PHP_MAJOR_VERSION >= 7
++ ZVAL_STRING(status, error_msg);
++ efree(error_msg);
++#else
+ ZVAL_STRING(status, error_msg, 0);
++#endif
+ }
+ pam_end(pamh, PAM_SUCCESS);
+ RETURN_FALSE;
diff --git a/dev-php/pecl-pam/metadata.xml b/dev-php/pecl-pam/metadata.xml
new file mode 100644
index 000000000000..b86acf66c756
--- /dev/null
+++ b/dev-php/pecl-pam/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ <name>PHP</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/dev-php/pecl-pam/pecl-pam-1.0.3-r3.ebuild b/dev-php/pecl-pam/pecl-pam-1.0.3-r3.ebuild
new file mode 100644
index 000000000000..db57bd508765
--- /dev/null
+++ b/dev-php/pecl-pam/pecl-pam-1.0.3-r3.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PHP_EXT_NAME="pam"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+DOCS=( README )
+
+USE_PHP="php5-6 php7-0 php7-1 php7-2"
+
+inherit php-ext-pecl-r3 pam
+
+KEYWORDS="~amd64 ~x86"
+
+DESCRIPTION="This extension provides PAM (Pluggable Authentication Modules) integration"
+LICENSE="PHP-2.02"
+SLOT="0"
+IUSE="debug"
+
+DEPEND="sys-libs/pam"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${PV}-php7.patch" )
+
+src_prepare() {
+ #Fix DOS line endings
+ sed -i 's/\r$//' -- pam.c || die
+ php-ext-source-r3_src_prepare
+}
+
+src_configure() {
+ local PHP_EXT_ECONF_ARGS=( --with-pam=/usr $(use_enable debug) )
+ php-ext-source-r3_src_configure
+}
+
+src_install() {
+ pamd_mimic_system php auth account password
+ php-ext-pecl-r3_src_install
+}
diff --git a/dev-php/pecl-propro-1.0.2-r1 b/dev-php/pecl-propro-1.0.2-r1
deleted file mode 100644
index 2527dbe592d2..000000000000
--- a/dev-php/pecl-propro-1.0.2-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 )
-DESCRIPTION=A reusable, property proxy API for PHP
-EAPI=6
-HOMEPAGE=https://pecl.php.net/propro
-IUSE=php_targets_php5-6 php_targets_php7-0 php_targets_php7-1
-KEYWORDS=amd64 x86
-LICENSE=BSD-2
-PDEPEND=php_targets_php7-0? ( dev-php/pecl-propro:7[php_targets_php7-0] ) php_targets_php7-1? ( dev-php/pecl-propro:7[php_targets_php7-1] )
-RDEPEND=php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 )
-REQUIRED_USE=|| ( php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 )
-SLOT=0
-SRC_URI=https://pecl.php.net/get/propro-1.0.2.tgz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e php-ext-pecl-r3 a59741d3df8ea9f17afcdcfb7edaee6d php-ext-source-r3 63b281041baa106ff1ef59b602ca7e2a toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=3eb098e95bec9fd89ebc7797f4817c8b
diff --git a/dev-php/pecl-propro-1.0.2-r2 b/dev-php/pecl-propro-1.0.2-r2
deleted file mode 100644
index 4f1f8003c43b..000000000000
--- a/dev-php/pecl-propro-1.0.2-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 )
-DESCRIPTION=A reusable, property proxy API for PHP
-EAPI=6
-HOMEPAGE=https://pecl.php.net/propro
-IUSE=php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD-2
-PDEPEND=php_targets_php7-0? ( dev-php/pecl-propro:7[php_targets_php7-0] ) php_targets_php7-1? ( dev-php/pecl-propro:7[php_targets_php7-1] ) php_targets_php7-2? ( dev-php/pecl-propro:7[php_targets_php7-2] )
-RDEPEND=php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 )
-REQUIRED_USE=|| ( php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2 )
-SLOT=0
-SRC_URI=https://pecl.php.net/get/propro-1.0.2.tgz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e php-ext-pecl-r3 a59741d3df8ea9f17afcdcfb7edaee6d php-ext-source-r3 63b281041baa106ff1ef59b602ca7e2a toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=14b1046bfca7128e1c6674cea908f5df
diff --git a/dev-php/pecl-propro-2.0.1-r1 b/dev-php/pecl-propro-2.0.1-r1
deleted file mode 100644
index f17fa5f0cb7f..000000000000
--- a/dev-php/pecl-propro-2.0.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 )
-DESCRIPTION=A reusable property proxy API for PHP
-EAPI=6
-HOMEPAGE=https://pecl.php.net/propro
-IUSE=php_targets_php5-6 php_targets_php7-0 php_targets_php7-1
-KEYWORDS=amd64 x86
-LICENSE=BSD-2
-RDEPEND=php_targets_php5-6? ( dev-php/pecl-propro:0[php_targets_php5-6] ) php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 )
-REQUIRED_USE=|| ( php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 )
-SLOT=7
-SRC_URI=https://pecl.php.net/get/propro-2.0.1.tgz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e php-ext-pecl-r3 a59741d3df8ea9f17afcdcfb7edaee6d php-ext-source-r3 63b281041baa106ff1ef59b602ca7e2a toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=b9c676e2211117f2311197a266819a15
diff --git a/dev-php/pecl-propro-2.1.0 b/dev-php/pecl-propro-2.1.0
deleted file mode 100644
index 8e66bd228ea3..000000000000
--- a/dev-php/pecl-propro-2.1.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 )
-DESCRIPTION=A reusable property proxy API for PHP
-EAPI=6
-HOMEPAGE=https://pecl.php.net/propro
-IUSE=php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD-2
-RDEPEND=php_targets_php5-6? ( dev-php/pecl-propro:0[php_targets_php5-6] ) php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 )
-REQUIRED_USE=|| ( php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2 )
-SLOT=7
-SRC_URI=https://pecl.php.net/get/propro-2.1.0.tgz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e php-ext-pecl-r3 a59741d3df8ea9f17afcdcfb7edaee6d php-ext-source-r3 63b281041baa106ff1ef59b602ca7e2a toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=c7bbd0263a130bb62b44b25e331f905c
diff --git a/dev-php/pecl-propro/Manifest b/dev-php/pecl-propro/Manifest
new file mode 100644
index 000000000000..9e80850ac90a
--- /dev/null
+++ b/dev-php/pecl-propro/Manifest
@@ -0,0 +1,8 @@
+DIST propro-1.0.2.tgz 13393 BLAKE2B c451ad6e1e0f93308497514de22a949dfbbea54e326c18688d6883aeb4d6adb920c42adfa458faf4c350755da72c1db06f77efc408fbc182fbb950e2f8b33302 SHA512 a4a3216d13c412051c063e0370c5f0badb65aa7054a43b0f6eb387a7a5fbbba1800b7f5f5113ba68ca8c7fe19932184a069864d1362239c71e0f55466c9cc8eb
+DIST propro-2.0.1.tgz 13399 BLAKE2B 88b099602ed19da96570c6b65981158d1f8f335470e6cd7afa517844a71258b04d9cb294bf91c15a23bbc016b303b2e42a2dea263808e0ed92905ba9ba47247f SHA512 c5a5f7c1fdf042d49597df789dc2b2e4e1512e7320a3a39cad344a9dfa3b9253b4a98d2f33e10e04ee608e5b8d1e1b50238787510db0a0f99d8f8b45b91c5c22
+DIST propro-2.1.0.tgz 14253 BLAKE2B 44c9bde831486fa41520ce75b313865b90a057acd0d566ae7e5c2aca97240e089580ca79ef04842a57a5d8eb76a179e57c505e977913567c1e97260f87fe2165 SHA512 94fc97f7bf17661ec7ecbe4d13b4fc98b8381469140d121fef49d32a4b767e956ed87b9f5bbb794f27ca47ce4b7b3125ea2b9091eb9d1f0a52b5c8f9df7ee145
+EBUILD pecl-propro-1.0.2-r1.ebuild 735 BLAKE2B 7dff63db99c42ef41175493c6b2a754ec2b5ced16ca5594161a0ddaa20317be54e00c08ae04fc16337582c79403986e84c395b1740a95930dc3e7344b0c96aa5 SHA512 1333f462b538f9cd7f2b3ed27a7c01741bff390fb63dcd94238c5af75d0ffc247fb1485fe2aaedb3e984f7fb01aba5cb68d59100e0e5d734f02ae1d090c40a43
+EBUILD pecl-propro-1.0.2-r2.ebuild 836 BLAKE2B c8be1849bebd99025649f1758ab1d12484b53b6f19b2b51a379fa11030bc208b8d1a2f78533eeafac1c9c0c3dc058f94ef339ba852146b52494600691a7bb093 SHA512 7df406dd15a07b47b449c70559f2645eecb65fe62f46b4528805b2e02eaff51444d37373ae30689ebd852583c0e04fd1e4acca36fdb5fc097f961271af01f0ed
+EBUILD pecl-propro-2.0.1-r1.ebuild 750 BLAKE2B 36855ce79ce527a94d0e7177e5c1ca98723078713be9351a8cb38364f0091988b11bfe96afe6d35bd7870fe268e1998c5c794b3206bf25ea38fc5033f674622c SHA512 842c94056e314877518f017231827f74bbaee853e1c69fbdd7e74a1092a196a07c174cfa1e36f7934b8f881573e5c7de859c3ef212fd1eb165ca74969d982f25
+EBUILD pecl-propro-2.1.0.ebuild 852 BLAKE2B 072d8c80981db40997b5d4e40ca603e3ff186320bb6258ae0d292796888319fa1fcfa8d6579f79fc889fbc56a51c8744e8007c5f2997e0568f923548b00d01c6 SHA512 8fd7d2ce6e863450466cbb99cde4f25e1f5b74428b3513056d31caa29b1063e19d921ed99909fc08fd2fe382cda444aadab81550b8c2ec046fb3eb7910a72674
+MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/pecl-propro/metadata.xml b/dev-php/pecl-propro/metadata.xml
new file mode 100644
index 000000000000..b86acf66c756
--- /dev/null
+++ b/dev-php/pecl-propro/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ <name>PHP</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/dev-php/pecl-propro/pecl-propro-1.0.2-r1.ebuild b/dev-php/pecl-propro/pecl-propro-1.0.2-r1.ebuild
new file mode 100644
index 000000000000..92df8ac50b7f
--- /dev/null
+++ b/dev-php/pecl-propro/pecl-propro-1.0.2-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PHP_EXT_NAME="propro"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+PHP_EXT_ECONF_ARGS=""
+
+USE_PHP="php5-6 php7-0 php7-1"
+
+inherit php-ext-pecl-r3
+
+USE_PHP="php5-6"
+
+KEYWORDS="amd64 x86"
+
+DESCRIPTION="A reusable, property proxy API for PHP"
+LICENSE="BSD-2"
+SLOT="0"
+IUSE=""
+
+PDEPEND="
+ php_targets_php7-0? ( dev-php/pecl-propro:7[php_targets_php7-0] )
+ php_targets_php7-1? ( dev-php/pecl-propro:7[php_targets_php7-1] )"
+
+src_prepare() {
+ if use php_targets_php5-6 ; then
+ php-ext-source-r3_src_prepare
+ else
+ default_src_prepare
+ fi
+}
+
+src_install() {
+ if use php_targets_php5-6 ; then
+ php-ext-pecl-r3_src_install
+ fi
+}
diff --git a/dev-php/pecl-propro/pecl-propro-1.0.2-r2.ebuild b/dev-php/pecl-propro/pecl-propro-1.0.2-r2.ebuild
new file mode 100644
index 000000000000..1f4ad87e5332
--- /dev/null
+++ b/dev-php/pecl-propro/pecl-propro-1.0.2-r2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PHP_EXT_NAME="propro"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+PHP_EXT_ECONF_ARGS=""
+PHP_INI_NAME="30-propro"
+
+USE_PHP="php5-6 php7-0 php7-1 php7-2"
+
+inherit php-ext-pecl-r3
+
+USE_PHP="php5-6"
+
+KEYWORDS="~amd64 ~x86"
+
+DESCRIPTION="A reusable, property proxy API for PHP"
+LICENSE="BSD-2"
+SLOT="0"
+IUSE=""
+
+PDEPEND="
+ php_targets_php7-0? ( dev-php/pecl-propro:7[php_targets_php7-0] )
+ php_targets_php7-1? ( dev-php/pecl-propro:7[php_targets_php7-1] )
+ php_targets_php7-2? ( dev-php/pecl-propro:7[php_targets_php7-2] )"
+
+src_prepare() {
+ if use php_targets_php5-6 ; then
+ php-ext-source-r3_src_prepare
+ else
+ default_src_prepare
+ fi
+}
+
+src_install() {
+ if use php_targets_php5-6 ; then
+ php-ext-pecl-r3_src_install
+ fi
+}
diff --git a/dev-php/pecl-propro/pecl-propro-2.0.1-r1.ebuild b/dev-php/pecl-propro/pecl-propro-2.0.1-r1.ebuild
new file mode 100644
index 000000000000..4f22d4dce0c1
--- /dev/null
+++ b/dev-php/pecl-propro/pecl-propro-2.0.1-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PHP_EXT_NAME="propro"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+PHP_EXT_ECONF_ARGS=""
+
+USE_PHP="php5-6 php7-0 php7-1"
+
+inherit php-ext-pecl-r3
+
+# Only really build for 7.x
+USE_PHP="php7-0 php7-1"
+
+KEYWORDS="amd64 x86"
+
+DESCRIPTION="A reusable property proxy API for PHP"
+LICENSE="BSD-2"
+SLOT="7"
+IUSE=""
+
+RDEPEND="php_targets_php5-6? ( ${CATEGORY}/${PN}:0[php_targets_php5-6] )"
+
+src_prepare() {
+ if use php_targets_php7-0 || use php_targets_php7-1 ; then
+ php-ext-source-r3_src_prepare
+ else
+ default_src_prepare
+ fi
+}
+
+src_install() {
+ if use php_targets_php7-0 || use php_targets_php7-1 ; then
+ php-ext-pecl-r3_src_install
+ fi
+}
diff --git a/dev-php/pecl-propro/pecl-propro-2.1.0.ebuild b/dev-php/pecl-propro/pecl-propro-2.1.0.ebuild
new file mode 100644
index 000000000000..1c8c99bad920
--- /dev/null
+++ b/dev-php/pecl-propro/pecl-propro-2.1.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PHP_EXT_NAME="propro"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+PHP_EXT_ECONF_ARGS=""
+PHP_INI_NAME="30-${PHP_EXT_NAME}"
+
+USE_PHP="php5-6 php7-0 php7-1 php7-2"
+
+inherit php-ext-pecl-r3
+
+# Only really build for 7.x
+USE_PHP="php7-0 php7-1 php7-2"
+
+KEYWORDS="~amd64 ~x86"
+
+DESCRIPTION="A reusable property proxy API for PHP"
+LICENSE="BSD-2"
+SLOT="7"
+IUSE=""
+
+RDEPEND="php_targets_php5-6? ( ${CATEGORY}/${PN}:0[php_targets_php5-6] )"
+
+src_prepare() {
+ if use php_targets_php7-0 || use php_targets_php7-1 || use php_targets_php7-2 ; then
+ php-ext-source-r3_src_prepare
+ else
+ default_src_prepare
+ fi
+}
+
+src_install() {
+ if use php_targets_php7-0 || use php_targets_php7-1 || use php_targets_php7-2 ; then
+ php-ext-pecl-r3_src_install
+ fi
+}
diff --git a/dev-php/pecl-ps-1.3.7-r1 b/dev-php/pecl-ps-1.3.7-r1
deleted file mode 100644
index 26b9397bba29..000000000000
--- a/dev-php/pecl-ps-1.3.7-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/pslib >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php5-6? ( dev-lang/php:5.6 )
-DESCRIPTION=PHP extension for creating PostScript files
-EAPI=6
-HOMEPAGE=https://pecl.php.net/ps
-IUSE=examples php_targets_php5-6
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=PHP-2.02
-RDEPEND=dev-libs/pslib php_targets_php5-6? ( dev-lang/php:5.6 )
-REQUIRED_USE=|| ( php_targets_php5-6 )
-SLOT=0
-SRC_URI=https://pecl.php.net/get/ps-1.3.7.tgz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e php-ext-pecl-r3 a59741d3df8ea9f17afcdcfb7edaee6d php-ext-source-r3 63b281041baa106ff1ef59b602ca7e2a toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=5fb13c544d1da0c14999fa4b3dbcadef
diff --git a/dev-php/pecl-ps-1.3.7-r2 b/dev-php/pecl-ps-1.3.7-r2
deleted file mode 100644
index a0cbd2ecc8ba..000000000000
--- a/dev-php/pecl-ps-1.3.7-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=php_targets_php5-6? ( dev-libs/pslib ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 )
-DESCRIPTION=PHP extension for creating PostScript files
-EAPI=6
-HOMEPAGE=https://pecl.php.net/ps
-IUSE=examples php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=PHP-2.02
-PDEPEND=php_targets_php7-0? ( dev-php/pecl-ps:7[php_targets_php7-0] ) php_targets_php7-1? ( dev-php/pecl-ps:7[php_targets_php7-1] ) php_targets_php7-2? ( dev-php/pecl-ps:7[php_targets_php7-2] )
-RDEPEND=php_targets_php5-6? ( dev-libs/pslib ) php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 )
-REQUIRED_USE=|| ( php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2 )
-SLOT=0
-SRC_URI=https://pecl.php.net/get/ps-1.3.7.tgz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e php-ext-pecl-r3 a59741d3df8ea9f17afcdcfb7edaee6d php-ext-source-r3 63b281041baa106ff1ef59b602ca7e2a toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=e91676158f153c38883c08c6b8d5524c
diff --git a/dev-php/pecl-ps-1.4.0 b/dev-php/pecl-ps-1.4.0
deleted file mode 100644
index 48c59b8de11e..000000000000
--- a/dev-php/pecl-ps-1.4.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/pslib >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 )
-DESCRIPTION=PHP extension for creating PostScript files
-EAPI=6
-HOMEPAGE=https://pecl.php.net/ps
-IUSE=examples php_targets_php5-6 php_targets_php7-0
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=PHP-2.02
-RDEPEND=dev-libs/pslib php_targets_php5-6? ( dev-php/pecl-ps:0[php_targets_php5-6] ) php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 )
-REQUIRED_USE=|| ( php_targets_php5-6 php_targets_php7-0 )
-SLOT=7
-SRC_URI=https://pecl.php.net/get/ps-1.4.0.tgz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e php-ext-pecl-r3 a59741d3df8ea9f17afcdcfb7edaee6d php-ext-source-r3 63b281041baa106ff1ef59b602ca7e2a toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=e1676a12743f275bba9e92b39cdfd4b6
diff --git a/dev-php/pecl-ps-1.4.1 b/dev-php/pecl-ps-1.4.1
deleted file mode 100644
index 33b7c74aa5e4..000000000000
--- a/dev-php/pecl-ps-1.4.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=php_targets_php7-0? ( dev-libs/pslib ) php_targets_php7-1? ( dev-libs/pslib ) php_targets_php7-2? ( dev-libs/pslib ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 )
-DESCRIPTION=PHP extension for creating PostScript files
-EAPI=6
-HOMEPAGE=https://pecl.php.net/ps
-IUSE=examples php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=BSD
-RDEPEND=php_targets_php7-0? ( dev-libs/pslib ) php_targets_php7-1? ( dev-libs/pslib ) php_targets_php7-2? ( dev-libs/pslib ) php_targets_php5-6? ( dev-php/pecl-ps:0[php_targets_php5-6] ) php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 )
-REQUIRED_USE=|| ( php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2 )
-SLOT=7
-SRC_URI=https://pecl.php.net/get/ps-1.4.1.tgz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e php-ext-pecl-r3 a59741d3df8ea9f17afcdcfb7edaee6d php-ext-source-r3 63b281041baa106ff1ef59b602ca7e2a toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=981219bb86653bfb5e23624ee72d74b8
diff --git a/dev-php/pecl-ps/Manifest b/dev-php/pecl-ps/Manifest
new file mode 100644
index 000000000000..9707556bed62
--- /dev/null
+++ b/dev-php/pecl-ps/Manifest
@@ -0,0 +1,8 @@
+DIST ps-1.3.7.tgz 634024 BLAKE2B 8007922cf4ed8c98fbf9524f66deda7136e2e5788f60e4647253545091cc30c4ee3a7de30adb06b470d18d96874afc58d5251c9342e9aa7db0491fa3daeac269 SHA512 cec6ecad27d35787a92453482f0e45fdcfe4bf79aab9cf1f7f6bc4468cf626343ed2b33d52d2ec48302a2ede9ecca3b397fb2d56fbc088997f39014f3dc47770
+DIST ps-1.4.0.tgz 634272 BLAKE2B 07928ac1ea77c3d634496e0a4e6e434b51b9d9938a40b9eb54622ade97c0cd8bb2197e5d544c9051d726a3cb51f67a43f4047974f588361734688fb6c1f12c92 SHA512 c268bc8d675d7082690d892448a458d69234b504b3be2408d2744224c356e7444fe1320af1256b974a2ee0fd6e0eca48fe0fa633b1df84da2e9532cd953bc306
+DIST ps-1.4.1.tgz 578991 BLAKE2B 549fae78ffb6e91f39b6292d969b9b80adba1a5911fb52e99c5fcbc940b9470205556e3e11c2940fadc7cc084400bc08ae7255b79e175d705c9bacb8eb3d6e71 SHA512 e9eeb5ad1c9314af0fcfd33e461b560f6cc599a679bc0a5541994fa698e3da63b7cb523f617647bdb2ac1c8fc090263e314ddf956a1e6126f8813de92e49f3af
+EBUILD pecl-ps-1.3.7-r1.ebuild 360 BLAKE2B eaec0c769677b48b4676606004b950f477b0c4b6d208111bffcceb9b785bad45c9a1a6e316e286bd8cf464f96925ef1f9fd8b1a9b9b3b3b53f05232249d8b232 SHA512 60096699ced3e3b021827c5e0c866b8466ad21a99daa72028e5191d06353081e6ee338869bfa3aabb05972155fa1f85592ee994ead0144c21b62c7ffeea84149
+EBUILD pecl-ps-1.3.7-r2.ebuild 878 BLAKE2B 2db2c23d2c933d2e48872dd1799e06ccf08bb1702c4149390a71c6b09e5c4284803df36cbf6f47768234f14c1b0ed2472f4352db4f5c0626849fe9f2d1baeacf SHA512 c5b73568c4aae62ea5a46d936ba40a93062cfc2ff8d9b02e937091256d2d2d28d65a9d829c0a1ce6ce64a26aa340792042dabcafe68c71ab310c27a69ee7488b
+EBUILD pecl-ps-1.4.0.ebuild 614 BLAKE2B 8279b0d1eb3c38107771e49b130600c2d3dad22060878b8d287677dbd8db56f43739673fdf88579e558103ea55bfb3bbbe70ed2cf14990698a73c185545efa01 SHA512 b0ceba0358fbf105ecaed96ff76e69cdba3014511af83f9dfd8791e714b6a775b9d01d98ae4087f8ed4042265b9b9f2cf2f75f7a2a0c2902e54f8b6531be00b8
+EBUILD pecl-ps-1.4.1.ebuild 937 BLAKE2B 8300f3fd0db96b04ff6cf5378881f264b183edf31fb0193ff269cad1be37f33fed7dcaa02070768c187fd1f955bf81e829fe646134a52ff7717b12082bbfac75 SHA512 fdbc7cf5d3f257dfef6d2066cebd60a63e17b95857e68b3e336019b092d974da6f1cb2ca04b43e555079441b64d4867d2de02c26b579d518d87a2d2e5f90313c
+MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/pecl-ps/metadata.xml b/dev-php/pecl-ps/metadata.xml
new file mode 100644
index 000000000000..b86acf66c756
--- /dev/null
+++ b/dev-php/pecl-ps/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ <name>PHP</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/dev-php/pecl-ps/pecl-ps-1.3.7-r1.ebuild b/dev-php/pecl-ps/pecl-ps-1.3.7-r1.ebuild
new file mode 100644
index 000000000000..7c6080aff5e2
--- /dev/null
+++ b/dev-php/pecl-ps/pecl-ps-1.3.7-r1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PHP_EXT_NAME="ps"
+USE_PHP="php5-6"
+
+inherit php-ext-pecl-r3
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+DESCRIPTION="PHP extension for creating PostScript files"
+LICENSE="PHP-2.02"
+SLOT="0"
+IUSE="examples"
+
+DEPEND="dev-libs/pslib"
+RDEPEND="${DEPEND}"
diff --git a/dev-php/pecl-ps/pecl-ps-1.3.7-r2.ebuild b/dev-php/pecl-ps/pecl-ps-1.3.7-r2.ebuild
new file mode 100644
index 000000000000..c01be7d3e797
--- /dev/null
+++ b/dev-php/pecl-ps/pecl-ps-1.3.7-r2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PHP_EXT_NAME="ps"
+USE_PHP="php5-6 php7-0 php7-1 php7-2"
+
+inherit php-ext-pecl-r3
+
+# Only really build for 5.6
+USE_PHP="php5-6"
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+DESCRIPTION="PHP extension for creating PostScript files"
+LICENSE="PHP-2.02"
+SLOT="0"
+IUSE="examples"
+
+DEPEND="php_targets_php5-6? ( dev-libs/pslib )"
+RDEPEND="${DEPEND}"
+PDEPEND="
+ php_targets_php7-0? ( dev-php/pecl-ps:7[php_targets_php7-0] )
+ php_targets_php7-1? ( dev-php/pecl-ps:7[php_targets_php7-1] )
+ php_targets_php7-2? ( dev-php/pecl-ps:7[php_targets_php7-2] )
+"
+PHP_EXT_ECONF_ARGS=""
+
+src_prepare() {
+ if use php_targets_php5-6 ; then
+ php-ext-source-r3_src_prepare
+ else
+ default_src_prepare
+ fi
+}
+
+src_install() {
+ if use php_targets_php5-6 ; then
+ php-ext-pecl-r3_src_install
+ fi
+}
diff --git a/dev-php/pecl-ps/pecl-ps-1.4.0.ebuild b/dev-php/pecl-ps/pecl-ps-1.4.0.ebuild
new file mode 100644
index 000000000000..eed300a35e25
--- /dev/null
+++ b/dev-php/pecl-ps/pecl-ps-1.4.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PHP_EXT_NAME="ps"
+USE_PHP="php5-6 php7-0"
+
+inherit php-ext-pecl-r3
+
+# Only really build for 7.0
+USE_PHP="php7-0"
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+DESCRIPTION="PHP extension for creating PostScript files"
+LICENSE="PHP-2.02"
+SLOT="7"
+IUSE="examples"
+
+DEPEND="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-0 ; then
+ php-ext-source-r3_src_prepare
+ else
+ default_src_prepare
+ fi
+}
diff --git a/dev-php/pecl-ps/pecl-ps-1.4.1.ebuild b/dev-php/pecl-ps/pecl-ps-1.4.1.ebuild
new file mode 100644
index 000000000000..e9eca43623d7
--- /dev/null
+++ b/dev-php/pecl-ps/pecl-ps-1.4.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PHP_EXT_NAME="ps"
+USE_PHP="php5-6 php7-0 php7-1 php7-2"
+
+inherit php-ext-pecl-r3
+
+# Only really build for >=7.0
+USE_PHP="php7-0 php7-1 php7-2"
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+DESCRIPTION="PHP extension for creating PostScript files"
+LICENSE="BSD"
+SLOT="7"
+IUSE="examples"
+
+DEPEND="
+ php_targets_php7-0? ( dev-libs/pslib )
+ php_targets_php7-1? ( dev-libs/pslib )
+ php_targets_php7-2? ( 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-0 || use php_targets_php7-1 || use php_targets_php7-2 ; then
+ php-ext-source-r3_src_prepare
+ else
+ default_src_prepare
+ fi
+}
+
+src_install() {
+ if use php_targets_php7-0 || use php_targets_php7-1 || use php_targets_php7-2 ; then
+ php-ext-pecl-r3_src_install
+ fi
+}
diff --git a/dev-php/pecl-radius-1.3.0-r1 b/dev-php/pecl-radius-1.3.0-r1
deleted file mode 100644
index 51eb7ccbb7ad..000000000000
--- a/dev-php/pecl-radius-1.3.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php5-6? ( dev-lang/php:5.6 )
-DESCRIPTION=Provides support for RADIUS authentication (RFC 2865) and accounting (RFC 2866)
-EAPI=6
-HOMEPAGE=https://pecl.php.net/radius
-IUSE=examples php_targets_php5-6
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=php_targets_php5-6? ( dev-lang/php:5.6[pcntl,sockets] ) php_targets_php5-6? ( dev-lang/php:5.6 )
-REQUIRED_USE=|| ( php_targets_php5-6 )
-SLOT=0
-SRC_URI=https://pecl.php.net/get/radius-1.3.0.tgz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e php-ext-pecl-r3 a59741d3df8ea9f17afcdcfb7edaee6d php-ext-source-r3 63b281041baa106ff1ef59b602ca7e2a toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=5627c8fbf89a1b68d042462482b6ad84
diff --git a/dev-php/pecl-radius-1.4.0_beta1-r2 b/dev-php/pecl-radius-1.4.0_beta1-r2
deleted file mode 100644
index 3e33b1def762..000000000000
--- a/dev-php/pecl-radius-1.4.0_beta1-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 )
-DESCRIPTION=Provides support for RADIUS authentication (RFC 2865) and accounting (RFC 2866)
-EAPI=6
-HOMEPAGE=https://pecl.php.net/radius
-IUSE=examples php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=php_targets_php5-6? ( dev-lang/php:5.6[pcntl,sockets] ) php_targets_php7-0? ( dev-lang/php:7.0[pcntl,sockets] ) php_targets_php7-1? ( dev-lang/php:7.1[pcntl,sockets] ) php_targets_php7-2? ( dev-lang/php:7.2[pcntl,sockets] ) php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 )
-REQUIRED_USE=|| ( php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2 )
-SLOT=0
-SRC_URI=https://pecl.php.net/get/radius-1.4.0b1.tgz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e php-ext-pecl-r3 a59741d3df8ea9f17afcdcfb7edaee6d php-ext-source-r3 63b281041baa106ff1ef59b602ca7e2a toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=e8f982f968a9c8b198d94d0e2cbe90f8
diff --git a/dev-php/pecl-radius/Manifest b/dev-php/pecl-radius/Manifest
new file mode 100644
index 000000000000..2fcd4c997c92
--- /dev/null
+++ b/dev-php/pecl-radius/Manifest
@@ -0,0 +1,5 @@
+DIST radius-1.3.0.tgz 43060 BLAKE2B e348ca5693872a7af142f2f60dd91613980046ff1479894518591a9db4229147963bfc70dd7f2797ace070d89015096b7877915df18decc03ae3cc092d8d02c6 SHA512 79126a852701e77f782283b0cf2ad99cb05418c69ed39d70608f62021f3da06f5e5867ac5b09cc75806feeb3d1a06f24eeb6ff4e56cb2fde5f05bcd198b5a661
+DIST radius-1.4.0b1.tgz 50953 BLAKE2B 1f6f2a4c4cfa7600a37b8bc30e4d263b899a687becac83fd01bac2466de08cad4233984ca694dc73eaf20b64ef94e1e6a6ca7f843474c8f0c9de2c39df9d9705 SHA512 db6ebe928673db1ff4c565338010ef5acf6029844994eb240f2e8eaeda4aff734ed300a7ddf16c09e245671aad377283f99cf1c485569b3bad0c7c7b24a19664
+EBUILD pecl-radius-1.3.0-r1.ebuild 445 BLAKE2B 3afb0fe648378416f7377c872a201effb1cac2802b064edbe332a6be18bdafc8645dedbedba2d8853b899d260eddb3c33b5be683f0a85eed5b4668622d159334 SHA512 b7ecd2945d33352f62bef13b7a91feebf1968ddc4fca208c8c040bbe6e8c15628a8f1e8dff0721f16117f6be862fc7629ccadccb9af064bd46c4bee2c2d91c49
+EBUILD pecl-radius-1.4.0_beta1-r2.ebuild 766 BLAKE2B fa265218acc35154f9489e0698fccb7dea5c1352762628ae5e01a038b92d88307e960dc95267e5f5fa82232d0e264f289b564ac533fb22a145bd513ef39d45ea SHA512 26c1a13e77f07c2fb0c127e7db88db661ae4c10478545c18ac0c3c61b9ff49300fb98cdcc9d44b5e256574dc4389c54226a00005fe716ee88c41a907d8ba9d50
+MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/pecl-radius/metadata.xml b/dev-php/pecl-radius/metadata.xml
new file mode 100644
index 000000000000..b86acf66c756
--- /dev/null
+++ b/dev-php/pecl-radius/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ <name>PHP</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/dev-php/pecl-radius/pecl-radius-1.3.0-r1.ebuild b/dev-php/pecl-radius/pecl-radius-1.3.0-r1.ebuild
new file mode 100644
index 000000000000..0b5a3b4507f4
--- /dev/null
+++ b/dev-php/pecl-radius/pecl-radius-1.3.0-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PHP_EXT_NAME="radius"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+
+USE_PHP="php5-6"
+
+inherit php-ext-pecl-r3
+
+KEYWORDS="~amd64 ~x86"
+
+DESCRIPTION="Provides support for RADIUS authentication (RFC 2865) and accounting (RFC 2866)"
+LICENSE="BSD"
+SLOT="0"
+IUSE="examples"
+
+RDEPEND="php_targets_php5-6? ( dev-lang/php:5.6[pcntl,sockets] )"
diff --git a/dev-php/pecl-radius/pecl-radius-1.4.0_beta1-r2.ebuild b/dev-php/pecl-radius/pecl-radius-1.4.0_beta1-r2.ebuild
new file mode 100644
index 000000000000..318f7f3641bf
--- /dev/null
+++ b/dev-php/pecl-radius/pecl-radius-1.4.0_beta1-r2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PHP_EXT_NAME="radius"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+
+USE_PHP="php5-6 php7-0 php7-1 php7-2"
+PHP_EXT_PECL_FILENAME="${PN/pecl-/}-${PV/_beta/b}.tgz"
+PHP_EXT_S="${WORKDIR}/${PHP_EXT_PECL_FILENAME%.tgz}"
+
+inherit php-ext-pecl-r3
+
+KEYWORDS="~amd64 ~x86"
+
+DESCRIPTION="Provides support for RADIUS authentication (RFC 2865) and accounting (RFC 2866)"
+LICENSE="BSD"
+SLOT="0"
+IUSE="examples"
+
+S="${PHP_EXT_S}"
+
+RDEPEND="
+ php_targets_php5-6? ( dev-lang/php:5.6[pcntl,sockets] )
+ php_targets_php7-0? ( dev-lang/php:7.0[pcntl,sockets] )
+ php_targets_php7-1? ( dev-lang/php:7.1[pcntl,sockets] )
+ php_targets_php7-2? ( dev-lang/php:7.2[pcntl,sockets] )
+"
diff --git a/dev-php/pecl-raphf-1.1.2-r1 b/dev-php/pecl-raphf-1.1.2-r1
deleted file mode 100644
index 53d6e728aeae..000000000000
--- a/dev-php/pecl-raphf-1.1.2-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 )
-DESCRIPTION=A reusable, persistent handle and resource factory API
-EAPI=6
-HOMEPAGE=https://pecl.php.net/raphf
-IUSE=php_targets_php5-6 php_targets_php7-0 php_targets_php7-1
-KEYWORDS=amd64 x86
-LICENSE=BSD-2
-PDEPEND=php_targets_php7-0? ( dev-php/pecl-raphf:7[php_targets_php7-0] ) php_targets_php7-1? ( dev-php/pecl-raphf:7[php_targets_php7-1] )
-RDEPEND=php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 )
-REQUIRED_USE=|| ( php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 )
-SLOT=0
-SRC_URI=https://pecl.php.net/get/raphf-1.1.2.tgz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e php-ext-pecl-r3 a59741d3df8ea9f17afcdcfb7edaee6d php-ext-source-r3 63b281041baa106ff1ef59b602ca7e2a toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=17b026fd8454c71fe961db0fc67cc98d
diff --git a/dev-php/pecl-raphf-1.1.2-r2 b/dev-php/pecl-raphf-1.1.2-r2
deleted file mode 100644
index 4bd636f35621..000000000000
--- a/dev-php/pecl-raphf-1.1.2-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 )
-DESCRIPTION=A reusable, persistent handle and resource factory API
-EAPI=6
-HOMEPAGE=https://pecl.php.net/raphf
-IUSE=php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD-2
-PDEPEND=php_targets_php7-0? ( dev-php/pecl-raphf:7[php_targets_php7-0] ) php_targets_php7-1? ( dev-php/pecl-raphf:7[php_targets_php7-1] ) php_targets_php7-2? ( dev-php/pecl-raphf:7[php_targets_php7-2] )
-RDEPEND=php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 )
-REQUIRED_USE=|| ( php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2 )
-SLOT=0
-SRC_URI=https://pecl.php.net/get/raphf-1.1.2.tgz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e php-ext-pecl-r3 a59741d3df8ea9f17afcdcfb7edaee6d php-ext-source-r3 63b281041baa106ff1ef59b602ca7e2a toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=8f7483e5d96cb07f6820ce921a9d1b3f
diff --git a/dev-php/pecl-raphf-2.0.0-r1 b/dev-php/pecl-raphf-2.0.0-r1
deleted file mode 100644
index 14eb9db3c8e0..000000000000
--- a/dev-php/pecl-raphf-2.0.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 )
-DESCRIPTION=A reusable, persistent handle and resource factory API
-EAPI=6
-HOMEPAGE=https://pecl.php.net/raphf
-IUSE=php_targets_php5-6 php_targets_php7-0 php_targets_php7-1
-KEYWORDS=amd64 x86
-LICENSE=BSD-2
-RDEPEND=php_targets_php5-6? ( dev-php/pecl-raphf:0[php_targets_php5-6] ) php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 )
-REQUIRED_USE=|| ( php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 )
-SLOT=7
-SRC_URI=https://pecl.php.net/get/raphf-2.0.0.tgz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e php-ext-pecl-r3 a59741d3df8ea9f17afcdcfb7edaee6d php-ext-source-r3 63b281041baa106ff1ef59b602ca7e2a toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=3775a8122744a72079004af48bb14a3a
diff --git a/dev-php/pecl-raphf-2.0.0-r2 b/dev-php/pecl-raphf-2.0.0-r2
deleted file mode 100644
index 0aa24e18eeb1..000000000000
--- a/dev-php/pecl-raphf-2.0.0-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 )
-DESCRIPTION=A reusable, persistent handle and resource factory API
-EAPI=6
-HOMEPAGE=https://pecl.php.net/raphf
-IUSE=php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD-2
-RDEPEND=php_targets_php5-6? ( dev-php/pecl-raphf:0[php_targets_php5-6] ) php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 )
-REQUIRED_USE=|| ( php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2 )
-SLOT=7
-SRC_URI=https://pecl.php.net/get/raphf-2.0.0.tgz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e php-ext-pecl-r3 a59741d3df8ea9f17afcdcfb7edaee6d php-ext-source-r3 63b281041baa106ff1ef59b602ca7e2a toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=1b06891853640b072750fa2cd1c9f28e
diff --git a/dev-php/pecl-raphf/Manifest b/dev-php/pecl-raphf/Manifest
new file mode 100644
index 000000000000..267d78f86c94
--- /dev/null
+++ b/dev-php/pecl-raphf/Manifest
@@ -0,0 +1,7 @@
+DIST raphf-1.1.2.tgz 15915 BLAKE2B eb6135ab97b7842168c71fd037858c4e9f59573be89e8b4d4192f6cb94b73cb72f3d85fe2cbfe7d99a89c4e6a84480992db6103e969925c556d7790968f499d3 SHA512 dbde89a8ba508727ab2511b977b74fcc06010d75d043c2acca31e75cac2a105a8c322a01995271ab89fcd39d42a16b36c6d1c06a569e33926c0626d30a6672eb
+DIST raphf-2.0.0.tgz 15715 BLAKE2B bab2997d9ce8358efaa69f2e633f49e4dd16f640e8d30284ebb33767285bead1aabcd973e7133152b82cf624e2c2e68cc6247e424aa5ed540e4211b5ed3da365 SHA512 16b029b694d30817a68a1a9d80bdf031d058ada45a93a4b34b49ec5d61fa8af78d0dbf1a3e5e2f1b950b2a11ac0b86b5a467807551556ab2a77f7f99739ed11b
+EBUILD pecl-raphf-1.1.2-r1.ebuild 748 BLAKE2B 062779c09b82c1145df97742a6d970ddc0c687248b336995217f93c7c3ed7d7eaa500888e4818cfa8176dae10f7b74fa6bd90f9688bfc1d2f0744b49d0b90a0f SHA512 5d9a4f730c469b06822e7af96db120a28f4353d59b2200c2b68849c956999a574592326594749533c5d3ddb423d206822d7c8eb157ffae541cd7117c20537400
+EBUILD pecl-raphf-1.1.2-r2.ebuild 857 BLAKE2B 45d170823d7f9bcd8944f56241c17a6922ee813deec961c5b2dd7e0c659f08d56295e28ed3d187ab21b3c50d0d641c104ca19fc6f329a887cae4c4345bb82b55 SHA512 b2b4994345835fa4c68b07eb0102b0e041d0b7c4c7adea6da13fd5a7bd20cd998defcb759f91690776d81be00f8df0e8ef6bf022d0cebaf2b88de9e7348413dd
+EBUILD pecl-raphf-2.0.0-r1.ebuild 766 BLAKE2B 58af3a334c323199b9494c17bbb119aafcaa53e7b7d98f98aa42837777418bd3d920c6422ff35546a45b1aad84943e21c2eaebddf3af89e4726d578e4d1c2955 SHA512 9d12d7141ce035e9d8a901ee847d313b580192b4d71f441aa77d0ac501113eefada26186696ee9ab820b64eb635fb529b025e72a0400914f5085f0263514659e
+EBUILD pecl-raphf-2.0.0-r2.ebuild 866 BLAKE2B 6be9b487787e3c36bde27fd24fad12925d910d5b9a824e79027379d6dae3c795f35df6e34ae572ea4fcba059ff658c6f36d1e8678deddb9bc18b84e792115b87 SHA512 b8c9842082fcfc253f04dde3382bd6538a4672d0c5dd4bcac4d6b962e7585fb15eff68a23bc43285f38fcd92da4240aee1d66e48f448952ac5daeaf73073ac53
+MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/pecl-raphf/metadata.xml b/dev-php/pecl-raphf/metadata.xml
new file mode 100644
index 000000000000..b86acf66c756
--- /dev/null
+++ b/dev-php/pecl-raphf/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ <name>PHP</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/dev-php/pecl-raphf/pecl-raphf-1.1.2-r1.ebuild b/dev-php/pecl-raphf/pecl-raphf-1.1.2-r1.ebuild
new file mode 100644
index 000000000000..2470d0e11fa9
--- /dev/null
+++ b/dev-php/pecl-raphf/pecl-raphf-1.1.2-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PHP_EXT_NAME="raphf"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+PHP_EXT_ECONF_ARGS=""
+
+USE_PHP="php5-6 php7-0 php7-1"
+
+inherit php-ext-pecl-r3
+
+USE_PHP="php5-6"
+
+KEYWORDS="amd64 x86"
+
+DESCRIPTION="A reusable, persistent handle and resource factory API"
+LICENSE="BSD-2"
+SLOT="0"
+IUSE=""
+
+PDEPEND="
+ php_targets_php7-0? ( dev-php/pecl-raphf:7[php_targets_php7-0] )
+ php_targets_php7-1? ( dev-php/pecl-raphf:7[php_targets_php7-1] )"
+
+src_prepare() {
+ if use php_targets_php5-6 ; then
+ php-ext-source-r3_src_prepare
+ else
+ default_src_prepare
+ fi
+}
+
+src_install() {
+ if use php_targets_php5-6 ; then
+ php-ext-pecl-r3_src_install
+ fi
+}
diff --git a/dev-php/pecl-raphf/pecl-raphf-1.1.2-r2.ebuild b/dev-php/pecl-raphf/pecl-raphf-1.1.2-r2.ebuild
new file mode 100644
index 000000000000..4fedb7a084a9
--- /dev/null
+++ b/dev-php/pecl-raphf/pecl-raphf-1.1.2-r2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PHP_EXT_NAME="raphf"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+PHP_EXT_ECONF_ARGS=""
+PHP_INI_NAME="30-${PHP_EXT_NAME}"
+
+USE_PHP="php5-6 php7-0 php7-1 php7-2"
+
+inherit php-ext-pecl-r3
+
+USE_PHP="php5-6"
+
+KEYWORDS="~amd64 ~x86"
+
+DESCRIPTION="A reusable, persistent handle and resource factory API"
+LICENSE="BSD-2"
+SLOT="0"
+IUSE=""
+
+PDEPEND="
+ php_targets_php7-0? ( dev-php/pecl-raphf:7[php_targets_php7-0] )
+ php_targets_php7-1? ( dev-php/pecl-raphf:7[php_targets_php7-1] )
+ php_targets_php7-2? ( dev-php/pecl-raphf:7[php_targets_php7-2] )"
+
+src_prepare() {
+ if use php_targets_php5-6 ; then
+ php-ext-source-r3_src_prepare
+ else
+ default_src_prepare
+ fi
+}
+
+src_install() {
+ if use php_targets_php5-6 ; then
+ php-ext-pecl-r3_src_install
+ fi
+}
diff --git a/dev-php/pecl-raphf/pecl-raphf-2.0.0-r1.ebuild b/dev-php/pecl-raphf/pecl-raphf-2.0.0-r1.ebuild
new file mode 100644
index 000000000000..2883d3f333e7
--- /dev/null
+++ b/dev-php/pecl-raphf/pecl-raphf-2.0.0-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PHP_EXT_NAME="raphf"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+PHP_EXT_ECONF_ARGS=""
+
+USE_PHP="php5-6 php7-0 php7-1"
+
+inherit php-ext-pecl-r3
+
+# Only really build for 7.x
+USE_PHP="php7-0 php7-1"
+
+KEYWORDS="amd64 x86"
+
+DESCRIPTION="A reusable, persistent handle and resource factory API"
+LICENSE="BSD-2"
+SLOT="7"
+IUSE=""
+
+RDEPEND="php_targets_php5-6? ( ${CATEGORY}/${PN}:0[php_targets_php5-6] )"
+
+src_prepare() {
+ if use php_targets_php7-0 || use php_targets_php7-1 ; then
+ php-ext-source-r3_src_prepare
+ else
+ default_src_prepare
+ fi
+}
+
+src_install() {
+ if use php_targets_php7-0 || use php_targets_php7-1 ; then
+ php-ext-pecl-r3_src_install
+ fi
+}
diff --git a/dev-php/pecl-raphf/pecl-raphf-2.0.0-r2.ebuild b/dev-php/pecl-raphf/pecl-raphf-2.0.0-r2.ebuild
new file mode 100644
index 000000000000..51817913cb68
--- /dev/null
+++ b/dev-php/pecl-raphf/pecl-raphf-2.0.0-r2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PHP_EXT_NAME="raphf"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+PHP_EXT_ECONF_ARGS=""
+PHP_INI_NAME="30-${PHP_EXT_NAME}"
+
+USE_PHP="php5-6 php7-0 php7-1 php7-2"
+
+inherit php-ext-pecl-r3
+
+# Only really build for 7.x
+USE_PHP="php7-0 php7-1 php7-2"
+
+KEYWORDS="~amd64 ~x86"
+
+DESCRIPTION="A reusable, persistent handle and resource factory API"
+LICENSE="BSD-2"
+SLOT="7"
+IUSE=""
+
+RDEPEND="php_targets_php5-6? ( ${CATEGORY}/${PN}:0[php_targets_php5-6] )"
+
+src_prepare() {
+ if use php_targets_php7-0 || use php_targets_php7-1 || use php_targets_php7-2; then
+ php-ext-source-r3_src_prepare
+ else
+ default_src_prepare
+ fi
+}
+
+src_install() {
+ if use php_targets_php7-0 || use php_targets_php7-1 || use php_targets_php7-2; then
+ php-ext-pecl-r3_src_install
+ fi
+}
diff --git a/dev-php/pecl-redis-3.1.6-r1 b/dev-php/pecl-redis-3.1.6-r1
deleted file mode 100644
index 219c0b107c90..000000000000
--- a/dev-php/pecl-redis-3.1.6-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=php_targets_php5-6? ( dev-lang/php:5.6[session?] igbinary? ( dev-php/igbinary[php_targets_php5-6] ) ) php_targets_php7-0? ( dev-lang/php:7.0[session?] igbinary? ( dev-php/igbinary[php_targets_php7-0] ) ) php_targets_php7-1? ( dev-lang/php:7.1[session?] igbinary? ( dev-php/igbinary[php_targets_php7-1] ) ) php_targets_php7-2? ( dev-lang/php:7.2[session?] igbinary? ( dev-php/igbinary[php_targets_php7-2] ) ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 )
-DESCRIPTION=PHP extension for interfacing with Redis
-EAPI=6
-HOMEPAGE=https://pecl.php.net/redis
-IUSE=igbinary +session php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2
-KEYWORDS=amd64 ~arm
-LICENSE=PHP-3.01
-RDEPEND=php_targets_php5-6? ( dev-lang/php:5.6[session?] igbinary? ( dev-php/igbinary[php_targets_php5-6] ) ) php_targets_php7-0? ( dev-lang/php:7.0[session?] igbinary? ( dev-php/igbinary[php_targets_php7-0] ) ) php_targets_php7-1? ( dev-lang/php:7.1[session?] igbinary? ( dev-php/igbinary[php_targets_php7-1] ) ) php_targets_php7-2? ( dev-lang/php:7.2[session?] igbinary? ( dev-php/igbinary[php_targets_php7-2] ) ) !dev-php/pecl-redis:7 php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 )
-REQUIRED_USE=|| ( php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://pecl.php.net/get/redis-3.1.6.tgz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e php-ext-pecl-r3 a59741d3df8ea9f17afcdcfb7edaee6d php-ext-source-r3 63b281041baa106ff1ef59b602ca7e2a toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=0578797e0185dfd9648dba34d32f9733
diff --git a/dev-php/pecl-redis-4.0.0-r1 b/dev-php/pecl-redis-4.0.0-r1
deleted file mode 100644
index feb88be5d444..000000000000
--- a/dev-php/pecl-redis-4.0.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=php_targets_php5-6? ( dev-lang/php:5.6[session?] igbinary? ( dev-php/igbinary[php_targets_php5-6] ) ) php_targets_php7-0? ( dev-lang/php:7.0[session?] igbinary? ( dev-php/igbinary[php_targets_php7-0] ) ) php_targets_php7-1? ( dev-lang/php:7.1[session?] igbinary? ( dev-php/igbinary[php_targets_php7-1] ) ) php_targets_php7-2? ( dev-lang/php:7.2[session?] igbinary? ( dev-php/igbinary[php_targets_php7-2] ) ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 )
-DESCRIPTION=PHP extension for interfacing with Redis
-EAPI=6
-HOMEPAGE=https://pecl.php.net/redis
-IUSE=igbinary +session php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2
-KEYWORDS=~amd64 ~arm
-LICENSE=PHP-3.01
-RDEPEND=php_targets_php5-6? ( dev-lang/php:5.6[session?] igbinary? ( dev-php/igbinary[php_targets_php5-6] ) ) php_targets_php7-0? ( dev-lang/php:7.0[session?] igbinary? ( dev-php/igbinary[php_targets_php7-0] ) ) php_targets_php7-1? ( dev-lang/php:7.1[session?] igbinary? ( dev-php/igbinary[php_targets_php7-1] ) ) php_targets_php7-2? ( dev-lang/php:7.2[session?] igbinary? ( dev-php/igbinary[php_targets_php7-2] ) ) !dev-php/pecl-redis:7 php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 )
-REQUIRED_USE=|| ( php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://pecl.php.net/get/redis-4.0.0.tgz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e php-ext-pecl-r3 a59741d3df8ea9f17afcdcfb7edaee6d php-ext-source-r3 63b281041baa106ff1ef59b602ca7e2a toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=95042c583794bec7616c9abed2c24f64
diff --git a/dev-php/pecl-redis-4.0.2 b/dev-php/pecl-redis-4.0.2
deleted file mode 100644
index 746627a97bab..000000000000
--- a/dev-php/pecl-redis-4.0.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=php_targets_php5-6? ( dev-lang/php:5.6[session?] igbinary? ( dev-php/igbinary[php_targets_php5-6] ) ) php_targets_php7-0? ( dev-lang/php:7.0[session?] igbinary? ( dev-php/igbinary[php_targets_php7-0] ) ) php_targets_php7-1? ( dev-lang/php:7.1[session?] igbinary? ( dev-php/igbinary[php_targets_php7-1] ) ) php_targets_php7-2? ( dev-lang/php:7.2[session?] igbinary? ( dev-php/igbinary[php_targets_php7-2] ) ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 )
-DESCRIPTION=PHP extension for interfacing with Redis
-EAPI=6
-HOMEPAGE=https://pecl.php.net/redis
-IUSE=igbinary +session php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2
-KEYWORDS=~amd64 ~arm
-LICENSE=PHP-3.01
-RDEPEND=php_targets_php5-6? ( dev-lang/php:5.6[session?] igbinary? ( dev-php/igbinary[php_targets_php5-6] ) ) php_targets_php7-0? ( dev-lang/php:7.0[session?] igbinary? ( dev-php/igbinary[php_targets_php7-0] ) ) php_targets_php7-1? ( dev-lang/php:7.1[session?] igbinary? ( dev-php/igbinary[php_targets_php7-1] ) ) php_targets_php7-2? ( dev-lang/php:7.2[session?] igbinary? ( dev-php/igbinary[php_targets_php7-2] ) ) !dev-php/pecl-redis:7 php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 )
-REQUIRED_USE=|| ( php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://pecl.php.net/get/redis-4.0.2.tgz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e php-ext-pecl-r3 a59741d3df8ea9f17afcdcfb7edaee6d php-ext-source-r3 63b281041baa106ff1ef59b602ca7e2a toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=7ff160455c2e80ddd8f5ea370b85d1a4
diff --git a/dev-php/pecl-redis/Manifest b/dev-php/pecl-redis/Manifest
new file mode 100644
index 000000000000..ad9e2e73649a
--- /dev/null
+++ b/dev-php/pecl-redis/Manifest
@@ -0,0 +1,7 @@
+DIST redis-3.1.6.tgz 199920 BLAKE2B 00aa81cdbedc03b4a672a58be98d8f01d2076038622b9d1e9673c0628c096152f12f9f5ff540af639da73b4458fcb1fce9c1c8b49a95db48970bab07806ac8d0 SHA512 4263d150c93f11dd06587925ad9a3cd8fbba2e4a18b2f23e6adfaeb25d566a1c2d256551a50ae1b9c770fd0f9bc4c92f483c46d60be9d4f5b5ba056231b7d527
+DIST redis-4.0.0.tgz 212340 BLAKE2B 996138b3dd92e839fbebaf5d562cfbe90e66384233c83612c8726fa41f10c106d0195c87449fc7886b3e832fd551b962ef50c161372c04c899c9fe7fd1140101 SHA512 e4bf2294f696e468174c0fff9ed33831cf81c3548ce30ede01bc3c45a15cb87b9b9ea02899c451f63211be8cb37e953be138e93c16d9e0f12772b7b6d03e8dcd
+DIST redis-4.0.2.tgz 212617 BLAKE2B 5778cf08e93fe8343e8fa07f1314c39b2d6d9a150d70c5b2084274afb163f1132a4be81385563f74d3b1d8f2dc32bf6578e98a123b43a941635fd85ebb229771 SHA512 3b296926ddd6a69a4d633da8bf6257c9b2962dffb4dd38c20eaf821a8c64262b476a7fb10ab4412ceb2d1307aef26c3d1d4b72141d29dab262d521a08df13a6a
+EBUILD pecl-redis-3.1.6-r1.ebuild 1504 BLAKE2B 39cd4e0402cde5507b4de802e6ec1a9855f293ea1710f1987690c9c4dca507c72045b87b423c89950e76facff3699ec782df904904c4f361f304f9a3f0095f2f SHA512 6588808380496dbf7f46e85483393a1c2fbe10720959a113cdf19e527a43e72e11fa948a168d965d3dbd1c1d3809051246d2a1ed504fb0958a728b20191b2ec1
+EBUILD pecl-redis-4.0.0-r1.ebuild 1638 BLAKE2B 3072def07f464db1a3148b4c1ac52db50bf47c858db808696505597e67d0adee8b5a10bb72105cfe7e51973d26233ae35410efd6599ca9c3e53ae5665b64219e SHA512 580d168d0eccc106f367457986faaadbbb9ef0cd0263e25a91202388f03363a4ad5bbc62ffa25a7c8b22d76f573bb6a5efe7202f97fbfe47789fd92abe21bbd0
+EBUILD pecl-redis-4.0.2.ebuild 1641 BLAKE2B 3f295bc8a957011d8eb7e86d268cb2411093e0e1b89ba25bbc5b143131fdc6769f5f5c79f56b99cdfdf3d6effa434224c524d6b946f525300f2ed3c408bf1ac2 SHA512 256b408e3d849a86fefec8383831e1a561c8b95d13e777e412fd820fd82e95977189d4a1eb5de5ac71b385f87ee6d41caa23ff7820a627ae95ef668ebc36db17
+MISC metadata.xml 324 BLAKE2B fc4145f462dd06f7a34385a0d8e2cbc6da6744094e84851891d5513f7be39c89cebe439e566fc2ead0afdb8ee3885b4a4d448e63d4c1a1d20a5bb8791c12d313 SHA512 916879a4b7ed11e30634a1c95637e9426932bac3c6aba2c7e686d9835097873e142f062e7d81e3ac99c3aef972b40db67b3809116cff4a3742ba6c669d999066
diff --git a/dev-php/pecl-redis/metadata.xml b/dev-php/pecl-redis/metadata.xml
new file mode 100644
index 000000000000..2cc19020124f
--- /dev/null
+++ b/dev-php/pecl-redis/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ <name>PHP</name>
+ </maintainer>
+ <use>
+ <flag name="igbinary">Enables igbinary serialisation support</flag>
+ </use>
+</pkgmetadata>
diff --git a/dev-php/pecl-redis/pecl-redis-3.1.6-r1.ebuild b/dev-php/pecl-redis/pecl-redis-3.1.6-r1.ebuild
new file mode 100644
index 000000000000..6c219bc92938
--- /dev/null
+++ b/dev-php/pecl-redis/pecl-redis-3.1.6-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PHP_EXT_NAME="redis"
+USE_PHP="php5-6 php7-0 php7-1 php7-2"
+DOCS=( arrays.markdown cluster.markdown README.markdown CREDITS )
+MY_P="${PN/pecl-/}-${PV/_rc/RC}"
+PHP_EXT_PECL_FILENAME="${MY_P}.tgz"
+PHP_EXT_S="${WORKDIR}/${MY_P}"
+
+inherit php-ext-pecl-r3
+
+DESCRIPTION="PHP extension for interfacing with Redis"
+LICENSE="PHP-3.01"
+SLOT="0"
+KEYWORDS="amd64 ~arm"
+IUSE="igbinary +session"
+
+DEPEND="
+ php_targets_php5-6? ( dev-lang/php:5.6[session?] igbinary? ( dev-php/igbinary[php_targets_php5-6] ) )
+ php_targets_php7-0? ( dev-lang/php:7.0[session?] igbinary? ( dev-php/igbinary[php_targets_php7-0] ) )
+ php_targets_php7-1? ( dev-lang/php:7.1[session?] igbinary? ( dev-php/igbinary[php_targets_php7-1] ) )
+ php_targets_php7-2? ( dev-lang/php:7.2[session?] igbinary? ( dev-php/igbinary[php_targets_php7-2] ) )
+"
+RDEPEND="${DEPEND} !dev-php/pecl-redis:7"
+
+# The test suite requires network access.
+RESTRICT=test
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+ local PHP_EXT_ECONF_ARGS=(
+ --enable-redis
+ $(use_enable igbinary redis-igbinary)
+ $(use_enable session redis-session)
+ )
+ php-ext-source-r3_src_configure
+}
+
+src_test(){
+ local slot
+ for slot in $(php_get_slots); do
+ php_init_slot_env "${slot}"
+ # Run tests for Redis class
+ ${PHPCLI} -d extension=modules/redis.so \
+ tests/TestRedis.php \
+ --class Redis \
+ --host ${PECL_REDIS_HOST} || die 'test suite failed'
+ done
+}
diff --git a/dev-php/pecl-redis/pecl-redis-4.0.0-r1.ebuild b/dev-php/pecl-redis/pecl-redis-4.0.0-r1.ebuild
new file mode 100644
index 000000000000..4cf2aa9cb6cf
--- /dev/null
+++ b/dev-php/pecl-redis/pecl-redis-4.0.0-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PHP_EXT_NAME="redis"
+USE_PHP="php5-6 php7-0 php7-1 php7-2"
+DOCS=( arrays.markdown cluster.markdown README.markdown CREDITS )
+MY_P="${PN/pecl-/}-${PV/_rc/RC}"
+PHP_EXT_PECL_FILENAME="${MY_P}.tgz"
+PHP_EXT_S="${WORKDIR}/${MY_P}"
+
+inherit php-ext-pecl-r3
+
+DESCRIPTION="PHP extension for interfacing with Redis"
+LICENSE="PHP-3.01"
+SLOT="0"
+KEYWORDS="~amd64 ~arm"
+IUSE="igbinary +session"
+
+DEPEND="
+ php_targets_php5-6? ( dev-lang/php:5.6[session?] igbinary? ( dev-php/igbinary[php_targets_php5-6] ) )
+ php_targets_php7-0? ( dev-lang/php:7.0[session?] igbinary? ( dev-php/igbinary[php_targets_php7-0] ) )
+ php_targets_php7-1? ( dev-lang/php:7.1[session?] igbinary? ( dev-php/igbinary[php_targets_php7-1] ) )
+ php_targets_php7-2? ( dev-lang/php:7.2[session?] igbinary? ( dev-php/igbinary[php_targets_php7-2] ) )
+"
+RDEPEND="${DEPEND} !dev-php/pecl-redis:7"
+
+# The test suite requires network access.
+RESTRICT=test
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+ local PHP_EXT_ECONF_ARGS=(
+ --enable-redis
+ $(use_enable igbinary redis-igbinary)
+ $(use_enable session redis-session)
+ )
+ php-ext-source-r3_src_configure
+}
+
+src_test(){
+ local slot
+ for slot in $(php_get_slots); do
+ php_init_slot_env "${slot}"
+ # Run tests for Redis class
+ ${PHPCLI} -d extension=modules/redis.so \
+ tests/TestRedis.php \
+ --class Redis \
+ --host ${PECL_REDIS_HOST} || die 'test suite failed'
+ done
+}
+
+pkg_postinst() {
+ elog "This version comes with breaking API changes."
+ elog "Be sure to verify any applications upon upgrading."
+}
diff --git a/dev-php/pecl-redis/pecl-redis-4.0.2.ebuild b/dev-php/pecl-redis/pecl-redis-4.0.2.ebuild
new file mode 100644
index 000000000000..7c75c710c648
--- /dev/null
+++ b/dev-php/pecl-redis/pecl-redis-4.0.2.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PHP_EXT_NAME="redis"
+USE_PHP="php5-6 php7-0 php7-1 php7-2"
+DOCS=( arrays.markdown cluster.markdown README.markdown CREDITS )
+MY_P="${PN/pecl-/}-${PV/_rc/RC}"
+PHP_EXT_PECL_FILENAME="${MY_P}.tgz"
+PHP_EXT_S="${WORKDIR}/${MY_P}"
+
+inherit php-ext-pecl-r3
+
+DESCRIPTION="PHP extension for interfacing with Redis"
+LICENSE="PHP-3.01"
+SLOT="0"
+KEYWORDS="~amd64 ~arm"
+IUSE="igbinary +session"
+
+DEPEND="
+ php_targets_php5-6? ( dev-lang/php:5.6[session?] igbinary? ( dev-php/igbinary[php_targets_php5-6] ) )
+ php_targets_php7-0? ( dev-lang/php:7.0[session?] igbinary? ( dev-php/igbinary[php_targets_php7-0] ) )
+ php_targets_php7-1? ( dev-lang/php:7.1[session?] igbinary? ( dev-php/igbinary[php_targets_php7-1] ) )
+ php_targets_php7-2? ( dev-lang/php:7.2[session?] igbinary? ( dev-php/igbinary[php_targets_php7-2] ) )
+"
+RDEPEND="${DEPEND} !dev-php/pecl-redis:7"
+
+# The test suite requires network access.
+RESTRICT=test
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+ local PHP_EXT_ECONF_ARGS=(
+ --enable-redis
+ $(use_enable igbinary redis-igbinary)
+ $(use_enable session redis-session)
+ )
+ php-ext-source-r3_src_configure
+}
+
+src_test(){
+ local slot
+ for slot in $(php_get_slots); do
+ php_init_slot_env "${slot}"
+ # Run tests for Redis class
+ ${PHPCLI} -d extension=modules/redis.so \
+ tests/TestRedis.php \
+ --class Redis \
+ --host ${PECL_REDIS_HOST} || die 'test suite failed'
+ done
+}
+
+pkg_postinst() {
+ elog "The 4.0 release comes with breaking API changes."
+ elog "Be sure to verify any applications upon upgrading."
+}
diff --git a/dev-php/pecl-rrd-1.1.3-r2 b/dev-php/pecl-rrd-1.1.3-r2
deleted file mode 100644
index c2b958e1470d..000000000000
--- a/dev-php/pecl-rrd-1.1.3-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=php_targets_php5-6? ( net-analyzer/rrdtool[graph] ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 )
-DESCRIPTION=RRDtool bindings for PHP
-EAPI=6
-HOMEPAGE=https://pecl.php.net/rrd
-IUSE=php_targets_php5-6 php_targets_php7-0 php_targets_php7-1
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-PDEPEND=php_targets_php7-0? ( dev-php/pecl-rrd:7[php_targets_php7-0(-)] ) php_targets_php7-1? ( dev-php/pecl-rrd:7[php_targets_php7-1(-)] )
-RDEPEND=php_targets_php5-6? ( net-analyzer/rrdtool[graph] ) php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 )
-REQUIRED_USE=|| ( php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 )
-SLOT=0
-SRC_URI=https://pecl.php.net/get/rrd-1.1.3.tgz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e php-ext-pecl-r3 a59741d3df8ea9f17afcdcfb7edaee6d php-ext-source-r3 63b281041baa106ff1ef59b602ca7e2a toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=04a9bfc0c681d3394afde73d70ccbfec
diff --git a/dev-php/pecl-rrd-2.0.1-r3 b/dev-php/pecl-rrd-2.0.1-r3
deleted file mode 100644
index 8945710a05d5..000000000000
--- a/dev-php/pecl-rrd-2.0.1-r3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=php_targets_php7-0? ( net-analyzer/rrdtool[graph] ) php_targets_php7-1? ( net-analyzer/rrdtool[graph] ) php_targets_php7-2? ( net-analyzer/rrdtool[graph] ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 )
-DESCRIPTION=RRDtool bindings for PHP
-EAPI=6
-HOMEPAGE=https://pecl.php.net/rrd
-IUSE=php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=php_targets_php7-0? ( net-analyzer/rrdtool[graph] ) php_targets_php7-1? ( net-analyzer/rrdtool[graph] ) php_targets_php7-2? ( net-analyzer/rrdtool[graph] ) php_targets_php5-6? ( dev-php/pecl-rrd:0 ) php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 )
-REQUIRED_USE=|| ( php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2 )
-SLOT=7
-SRC_URI=https://pecl.php.net/get/rrd-2.0.1.tgz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e php-ext-pecl-r3 a59741d3df8ea9f17afcdcfb7edaee6d php-ext-source-r3 63b281041baa106ff1ef59b602ca7e2a toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=6fcd1a4e277912d91190c297bd1cfa4e
diff --git a/dev-php/pecl-rrd/Manifest b/dev-php/pecl-rrd/Manifest
new file mode 100644
index 000000000000..1df13739c55b
--- /dev/null
+++ b/dev-php/pecl-rrd/Manifest
@@ -0,0 +1,5 @@
+DIST rrd-1.1.3.tgz 19229 BLAKE2B 14bbc97ec52be8f1b99471380cc1408c81056841d932818681868e31badc1a0abefc0d155e594a05492b86b826f21b8dadb0a0dcb43313f48863c64fd8e88a71 SHA512 356264de1b967af0f78e25e3c0afcbec704dd3e49d828e08d21d744d5fcdc46f4cd7f7c118b4e283c20bcaf2a4c29e0ac9437c7f66ca0d260a76fddf7b9d3242
+DIST rrd-2.0.1.tgz 18880 BLAKE2B c3fb65e95aece39690085830ec1c43ba173e173591215d6a66145ac71079f8d5ba5b097acd9018c86d2342550001334f8e1c98e22204d94a24aee5cc086295ca SHA512 b6f7173f54fcf49bf014cc6c78263c169cdf53dac66c12f5f88db7e01b49ea74da84a55f61deb25c866e6e2e74275ec48fc4a3d1b46719f66b5b7b7eb000b6b3
+EBUILD pecl-rrd-1.1.3-r2.ebuild 792 BLAKE2B 6ea7717d68feaf96d919f4d7e29cf10185588a29a687e068ae768555f340deb8bd93fad6111720248d8fb389fab95f6a8235af50736b54928067cbfd8f8dcdf8 SHA512 b00f02cc0ed6678df78eed5fd0a2417daf2423cf04a524429b1da116babc0baa2d45c90458ec26e71bbb5b843c1a86eee6b34ae410706f5e3fe85e4dd2580dfd
+EBUILD pecl-rrd-2.0.1-r3.ebuild 1367 BLAKE2B 2ac6444ff160545e5ce4635337729ba95dc98304a70b22c9347d7fb0042b863c5af6f572391450ea2cff1cf965d24be122a23a3627a93f42d54bdb4374ab50a5 SHA512 7f5a17ce552a015eeb4a4ca9cb1d1203dff03ad49ce6f592e674a8eaf82d10e407cba1e0a7566d3178c720232686e8a60be06b78d3b504e3f943e0b95c7311b0
+MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/pecl-rrd/metadata.xml b/dev-php/pecl-rrd/metadata.xml
new file mode 100644
index 000000000000..b86acf66c756
--- /dev/null
+++ b/dev-php/pecl-rrd/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ <name>PHP</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/dev-php/pecl-rrd/pecl-rrd-1.1.3-r2.ebuild b/dev-php/pecl-rrd/pecl-rrd-1.1.3-r2.ebuild
new file mode 100644
index 000000000000..ac2a4557ce6d
--- /dev/null
+++ b/dev-php/pecl-rrd/pecl-rrd-1.1.3-r2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_PHP="php5-6 php7-0 php7-1"
+
+inherit php-ext-pecl-r3
+
+USE_PHP="php5-6"
+
+DESCRIPTION="RRDtool bindings for PHP"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="php_targets_php5-6? ( net-analyzer/rrdtool[graph] )"
+RDEPEND="${DEPEND}"
+
+PDEPEND="
+ php_targets_php7-0? ( dev-php/pecl-rrd:7[php_targets_php7-0(-)] )
+ php_targets_php7-1? ( dev-php/pecl-rrd:7[php_targets_php7-1(-)] )
+"
+
+src_prepare() {
+ if use php_targets_php5-6 ; then
+ php-ext-source-r3_src_prepare
+ else
+ default_src_prepare
+ fi
+}
+
+src_configure() {
+ local PHP_EXT_ECONF_ARGS=()
+ php-ext-source-r3_src_configure
+}
+
+src_install() {
+ if use php_targets_php5-6 ; then
+ php-ext-pecl-r3_src_install
+ fi
+}
diff --git a/dev-php/pecl-rrd/pecl-rrd-2.0.1-r3.ebuild b/dev-php/pecl-rrd/pecl-rrd-2.0.1-r3.ebuild
new file mode 100644
index 000000000000..8a4100b18f95
--- /dev/null
+++ b/dev-php/pecl-rrd/pecl-rrd-2.0.1-r3.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# Define 5.6 here to have the {I,REQUIRED_}USE generated
+USE_PHP="php5-6 php7-0 php7-1 php7-2"
+
+inherit php-ext-pecl-r3
+
+# But we really only build 7.0
+USE_PHP="php7-0 php7-1 php7-2"
+
+DESCRIPTION="RRDtool bindings for PHP"
+LICENSE="BSD"
+SLOT="7"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+ php_targets_php7-0? ( net-analyzer/rrdtool[graph] )
+ php_targets_php7-1? ( net-analyzer/rrdtool[graph] )
+ php_targets_php7-2? ( net-analyzer/rrdtool[graph] )
+"
+RDEPEND="${DEPEND} php_targets_php5-6? ( ${CATEGORY}/${PN}:0 )"
+
+src_prepare() {
+ if use php_targets_php7-0 || use php_targets_php7-1 || use php_targets_php7-2 ; then
+ php-ext-source-r3_src_prepare
+ else
+ default
+ fi
+}
+
+src_configure() {
+ if use php_targets_php7-0 || use php_targets_php7-1 || use php_targets_php7-2 ; then
+ local PHP_EXT_ECONF_ARGS=()
+ php-ext-source-r3_src_configure
+ fi
+}
+
+src_install() {
+ if use php_targets_php7-0 || use php_targets_php7-1 || use php_targets_php7-2 ; then
+ php-ext-pecl-r3_src_install
+ fi
+}
+
+src_test() {
+ local slot
+ if use php_targets_php7-0 || use php_targets_php7-1 || use php_targets_php7-2 ; then
+ 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
+ fi
+}
diff --git a/dev-php/pecl-sphinx-1.3.3-r1 b/dev-php/pecl-sphinx-1.3.3-r1
deleted file mode 100644
index c9d171b05fdb..000000000000
--- a/dev-php/pecl-sphinx-1.3.3-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-misc/sphinx >=dev-util/re2c-0.13 >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php5-6? ( dev-lang/php:5.6 )
-DESCRIPTION=PHP extension to execute search queries on a sphinx daemon
-EAPI=6
-HOMEPAGE=https://pecl.php.net/sphinx
-IUSE=php_targets_php5-6
-KEYWORDS=~amd64
-LICENSE=PHP-3
-RDEPEND=app-misc/sphinx php_targets_php5-6? ( dev-lang/php:5.6 )
-REQUIRED_USE=|| ( php_targets_php5-6 )
-SLOT=0
-SRC_URI=https://pecl.php.net/get/sphinx-1.3.3.tgz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e php-ext-pecl-r3 a59741d3df8ea9f17afcdcfb7edaee6d php-ext-source-r3 63b281041baa106ff1ef59b602ca7e2a toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=df0d3137659baed8c961284e67b67198
diff --git a/dev-php/pecl-sphinx/Manifest b/dev-php/pecl-sphinx/Manifest
new file mode 100644
index 000000000000..7af0800cd165
--- /dev/null
+++ b/dev-php/pecl-sphinx/Manifest
@@ -0,0 +1,3 @@
+DIST sphinx-1.3.3.tgz 15555 BLAKE2B 4ebc61d9f8d018dc75acc51afc8c744803c1b65e208d171e4fdca9eb53dbf7f17a0d61e574171b8f777aa77b7102919b0a8bd7d33b2d94acbb41c9d248898647 SHA512 86e40660bc3be346f23eaa98eb49552c2e51385c41e5c0ac04ba26776375816d777e470765e103d771bd46206ced1778ffb80747a6656c4948f047e61a4112b7
+EBUILD pecl-sphinx-1.3.3-r1.ebuild 415 BLAKE2B 5e7c6c4ceb8d45b2b698cd9246996bc52438f0471ae9949358b5ccd3b929de7859574cfcab21f539895e0a6529f3b9df1efd70e88c555d11b5172d1c9ccd4e01 SHA512 04dfb55a45581ebf5ea4f90263de90e1fdee2cb6a6cfa7b59e54849c138c80404aa39a2bad27d198289b51fc435a4f7405985d6c5db2e3ce1c7b762b7289019d
+MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/pecl-sphinx/metadata.xml b/dev-php/pecl-sphinx/metadata.xml
new file mode 100644
index 000000000000..b86acf66c756
--- /dev/null
+++ b/dev-php/pecl-sphinx/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ <name>PHP</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/dev-php/pecl-sphinx/pecl-sphinx-1.3.3-r1.ebuild b/dev-php/pecl-sphinx/pecl-sphinx-1.3.3-r1.ebuild
new file mode 100644
index 000000000000..040749f7cee6
--- /dev/null
+++ b/dev-php/pecl-sphinx/pecl-sphinx-1.3.3-r1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PHP_EXT_NAME="sphinx"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+
+USE_PHP="php5-6"
+
+inherit php-ext-pecl-r3
+
+KEYWORDS="~amd64"
+
+DESCRIPTION="PHP extension to execute search queries on a sphinx daemon"
+LICENSE="PHP-3"
+SLOT="0"
+IUSE=""
+
+RDEPEND="app-misc/sphinx"
+DEPEND="${RDEPEND}
+ >=dev-util/re2c-0.13"
diff --git a/dev-php/pecl-spl_types-0.4.0-r2 b/dev-php/pecl-spl_types-0.4.0-r2
deleted file mode 100644
index 948938613e6c..000000000000
--- a/dev-php/pecl-spl_types-0.4.0-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php5-6? ( dev-lang/php:5.6 )
-DESCRIPTION=Standard PHP library types add-on
-EAPI=6
-HOMEPAGE=https://pecl.php.net/SPL_Types
-IUSE=php_targets_php5-6
-KEYWORDS=~amd64 ~x86
-LICENSE=PHP-3
-RDEPEND=php_targets_php5-6? ( dev-lang/php:5.6 )
-REQUIRED_USE=|| ( php_targets_php5-6 )
-SLOT=0
-SRC_URI=https://pecl.php.net/get/SPL_Types-0.4.0.tgz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e php-ext-pecl-r3 a59741d3df8ea9f17afcdcfb7edaee6d php-ext-source-r3 63b281041baa106ff1ef59b602ca7e2a toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=6cab4e272ef07bdaa9261ae88e638ddc
diff --git a/dev-php/pecl-spl_types/Manifest b/dev-php/pecl-spl_types/Manifest
new file mode 100644
index 000000000000..975653cbe2c2
--- /dev/null
+++ b/dev-php/pecl-spl_types/Manifest
@@ -0,0 +1,3 @@
+DIST SPL_Types-0.4.0.tgz 8388 BLAKE2B 6452b6f9257e1162a756fbb1e2bbe15afeb5b4815c9835110d10aa81b9602fb596fc073b11c6f980ec46bdddcb60d7ba7995cac897ba354a8bb4574df93330a1 SHA512 8d1d9c3159bf7856cd02ae159a4b58bd396ac4a396f071ca5f034481d4aa3d627a114d8cd49344d70873551a3086cb8d91b3f1468d35d12dd424b0933c51dfc2
+EBUILD pecl-spl_types-0.4.0-r2.ebuild 390 BLAKE2B c7368e28e93d9fa1a1f5674c9b8595a817cb2eaf2c56c108d09f6ddc343d9d6a8ab7928ad39e210e5e984717cf4f7e91cb4f1058ce992c09c2727fb4f89e8b8d SHA512 fbdf4255357399380ef7ce9d7479b9d2974e57fea45787c1cbc5e249577c5edaa65ecb001f81fc93315b7ffb24e65d36ff37957fcf1a32dc63b57d253700f1b6
+MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/pecl-spl_types/metadata.xml b/dev-php/pecl-spl_types/metadata.xml
new file mode 100644
index 000000000000..b86acf66c756
--- /dev/null
+++ b/dev-php/pecl-spl_types/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ <name>PHP</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/dev-php/pecl-spl_types/pecl-spl_types-0.4.0-r2.ebuild b/dev-php/pecl-spl_types/pecl-spl_types-0.4.0-r2.ebuild
new file mode 100644
index 000000000000..fbf3f035b659
--- /dev/null
+++ b/dev-php/pecl-spl_types/pecl-spl_types-0.4.0-r2.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PHP_EXT_NAME="spl_types"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+PHP_EXT_PECL_PKG="SPL_Types"
+
+USE_PHP="php5-6"
+
+inherit php-ext-pecl-r3
+
+KEYWORDS="~amd64 ~x86"
+
+DESCRIPTION="Standard PHP library types add-on"
+LICENSE="PHP-3"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/dev-php/pecl-ssh2-0.13-r3 b/dev-php/pecl-ssh2-0.13-r3
deleted file mode 100644
index bf4f232c2058..000000000000
--- a/dev-php/pecl-ssh2-0.13-r3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=net-libs/libssh2[-gcrypt] >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 )
-DESCRIPTION=PHP bindings for the libssh2 library
-EAPI=6
-HOMEPAGE=https://pecl.php.net/ssh2
-IUSE=php_targets_php5-6 php_targets_php7-0 php_targets_php7-1
-KEYWORDS=amd64 x86
-LICENSE=PHP-3.01
-PDEPEND=php_targets_php7-0? ( dev-php/pecl-ssh2:7 ) php_targets_php7-1? ( dev-php/pecl-ssh2:7 )
-RDEPEND=net-libs/libssh2[-gcrypt] php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 )
-REQUIRED_USE=|| ( php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 )
-SLOT=0
-SRC_URI=https://pecl.php.net/get/ssh2-0.13.tgz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e php-ext-pecl-r3 a59741d3df8ea9f17afcdcfb7edaee6d php-ext-source-r3 63b281041baa106ff1ef59b602ca7e2a toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=38c4d2f14af78ac730b16525a55ed288
diff --git a/dev-php/pecl-ssh2-1.1.1 b/dev-php/pecl-ssh2-1.1.1
deleted file mode 100644
index 14653e66f2e4..000000000000
--- a/dev-php/pecl-ssh2-1.1.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=net-libs/libssh2-1.2[-gcrypt] >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 )
-DESCRIPTION=PHP bindings for the libssh2 library
-EAPI=6
-HOMEPAGE=https://pecl.php.net/ssh2
-IUSE=php_targets_php5-6 php_targets_php7-0 php_targets_php7-1
-KEYWORDS=amd64 x86
-LICENSE=PHP-3.01
-RDEPEND=>=net-libs/libssh2-1.2[-gcrypt] php_targets_php5-6? ( dev-php/pecl-ssh2:0[php_targets_php5-6] ) php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 )
-REQUIRED_USE=|| ( php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 )
-SLOT=7
-SRC_URI=https://pecl.php.net/get/ssh2-1.1.1.tgz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e php-ext-pecl-r3 a59741d3df8ea9f17afcdcfb7edaee6d php-ext-source-r3 63b281041baa106ff1ef59b602ca7e2a toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=6f983a1ffece80017ea5486c8407db47
diff --git a/dev-php/pecl-ssh2-1.1.2 b/dev-php/pecl-ssh2-1.1.2
deleted file mode 100644
index 56c12c9a473a..000000000000
--- a/dev-php/pecl-ssh2-1.1.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=net-libs/libssh2-1.2[-gcrypt] >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 )
-DESCRIPTION=PHP bindings for the libssh2 library
-EAPI=6
-HOMEPAGE=https://pecl.php.net/ssh2
-IUSE=php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2
-KEYWORDS=~amd64 ~x86
-LICENSE=PHP-3.01
-RDEPEND=>=net-libs/libssh2-1.2[-gcrypt] php_targets_php5-6? ( dev-php/pecl-ssh2:0[php_targets_php5-6] ) php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 )
-REQUIRED_USE=|| ( php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2 )
-SLOT=7
-SRC_URI=https://pecl.php.net/get/ssh2-1.1.2.tgz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e php-ext-pecl-r3 a59741d3df8ea9f17afcdcfb7edaee6d php-ext-source-r3 63b281041baa106ff1ef59b602ca7e2a toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=c16e310fd56a066f4e814376f541455b
diff --git a/dev-php/pecl-ssh2-9999 b/dev-php/pecl-ssh2-9999
deleted file mode 100644
index 6d95df2d83aa..000000000000
--- a/dev-php/pecl-ssh2-9999
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=net-libs/libssh2-1.2 >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 ) >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=PHP bindings for the libssh2 library
-EAPI=6
-HOMEPAGE=https://pecl.php.net/package/ssh2
-IUSE=php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2
-LICENSE=PHP-3.01
-RDEPEND=>=net-libs/libssh2-1.2 php_targets_php5-6? ( dev-php/pecl-ssh2:0[php_targets_php5-6] ) php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 )
-REQUIRED_USE=|| ( php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2 )
-SLOT=7
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 git-r3 8f6de46b0aa318aea0e8cac62ece098b libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e php-ext-source-r3 63b281041baa106ff1ef59b602ca7e2a toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=24c3e5a3321588671618a321b3815933
diff --git a/dev-php/pecl-ssh2/Manifest b/dev-php/pecl-ssh2/Manifest
new file mode 100644
index 000000000000..55c2573f4f28
--- /dev/null
+++ b/dev-php/pecl-ssh2/Manifest
@@ -0,0 +1,9 @@
+AUX 0.13-parse_url-fix.patch 1777 BLAKE2B db7f6bd23cbe6552fce870044b1839eadba5c9089ffee2da52c1c998856083636c221d7386f52ba689f9796807e2abce447541dfb247c6d20f7898254e0f0dc7 SHA512 9628c0cd1d09d64be3824485ec54ad9bb477a18b9178a120b8fc17ca5e5f2055d23019495741d7e85841f9e0b5f7dc991fb14ead04cc60f95127099e3e5fb205
+DIST ssh2-0.13.tgz 28984 BLAKE2B 3c18cb7aba146801325eeaca3ffb6e3780675a7ce6d78aea5fbc16f75662284f7773de2161789f68af0b5499e9cb813f4046d674758c138849eb6735344249f9 SHA512 c031e22853bf5cf8ee59dc5b99d9e7e60af1507a22e7d0a9e2f54b8f1758a03a6cea91c539e0f667d48ec66185fdc8a28c47e5a1e10a72220c0cb16b3948e1d0
+DIST ssh2-1.1.1.tgz 27551 BLAKE2B 5e8e32c790a1d8646497ea6c4893694b2cc511a9a4753d66788c618ce7f8cb04d37fcd54a21c59dda918ba6ef27a1abd1b32c2d515d07c0925ab26e9a7e58941 SHA512 92cc40627a6114a4b0e7b8437e5e0b219b49dfbed9668937e7d0d37492a101c9f25381b5a1533f91c0530fdebe66af7bcb68ff4231a7ecd806b99d8a04f74d79
+DIST ssh2-1.1.2.tgz 32057 BLAKE2B 88ffb3fb608687a086bbe345677982e944210791acc100312ba56ac7c35188a52cde5529d78caf473d19710e9965fba853ea9ff046715413a0b488ae2d8b690c SHA512 36793191448745b8a9b3cc628fe9fb431480792c7a2ff0bf2eccd58cda1cf944933be1d301c455d4a6f3dabf7e04ffef248bc402a8ff99bfafcba0deddb25c36
+EBUILD pecl-ssh2-0.13-r3.ebuild 707 BLAKE2B 9a32418bac7fd95bbc56f316ff4b8a09f61aa009bc5ce6262b52224672ef2ec6ccef102e1fa6ca15982c736ac1640b57c912d33e555e71f4eeafc17b1e002b5b SHA512 05ee3824bb54b54940f982d4b96bfb9ceb546f40b55067bfb1df24123c662786f87faf12905b58cc24188160f0af4f06e0c150a6c32f5e0b93f1343ea64b179a
+EBUILD pecl-ssh2-1.1.1.ebuild 653 BLAKE2B 4625ade7081cf94d3aadd7f5ecbd299ff962e08547d793a82ecab8e6b167e3ead768a9b4b6141d9790647dc2d0a49af18544165938119bad02145426eacb0dcf SHA512 4e86a46a4d758326de99069c925e46acebb92ab9867b62623c7b90c5a15763dc3900530a4d2d868bd99edb4c5dc5285b493333bae1ba76a635253cbce61e6bea
+EBUILD pecl-ssh2-1.1.2.ebuild 695 BLAKE2B 13cf11fe0e7896048ac96adf5b1be5047b0b04fe038f25ab7e8a21da7024196d3b4d40281819d52c175a69584d9874ec33d5b02329a6674ca305d87ae226ce19 SHA512 47a9bf5e8cf5a56772741aaddf2521fe67a31f5e151b27d3f92d4840d47bf8be77b4cb594ca0f0aecba67e4b6528ad78ea92722b088ddc2184a6ffe54367db4c
+EBUILD pecl-ssh2-9999.ebuild 744 BLAKE2B ea9fe3fe4b516c25fed214c1a48eb5fb0221048f96540090ea50136489cc91c4dde2407289175b44d4169d71dd723163a8814f784290ee4cfd67d23484903720 SHA512 970871b295857af4ccd1bb68680b883c677c161189025326e32d317aef6867261b34343371003152d60fe7bf40c19a3130bd5f8b748d7d7ba263e70f6fd22e55
+MISC metadata.xml 235 BLAKE2B 5b10304feea18aae1822be7d29bcce06c8715193b14a3dd2c4d79eb75e2767670352e2ca11e06b9a10ec04b63020a18254cd167e6d6be9072f4a200ca5d11ec4 SHA512 0b3e95bbf68eddf74289dad50f8828cffce2d904ff6f9bd5468177de979677cac11da84d1e0302c52b72085915b9d1b3496107172e5726520d51dad1981daf64
diff --git a/dev-php/pecl-ssh2/files/0.13-parse_url-fix.patch b/dev-php/pecl-ssh2/files/0.13-parse_url-fix.patch
new file mode 100644
index 000000000000..c9c052fd32db
--- /dev/null
+++ b/dev-php/pecl-ssh2/files/0.13-parse_url-fix.patch
@@ -0,0 +1,49 @@
+From 093906ec1c065e86ad1cd4dabbc89b1ccae11938 Mon Sep 17 00:00:00 2001
+From: Remi Collet <remi@php.net>
+Date: Thu, 10 Nov 2016 09:16:02 +0100
+Subject: [PATCH] fix for PHP 7.0.13 where php_url_parse fails
+
+---
+ ssh2_fopen_wrappers.c | 17 ++++++++++++-----
+ 1 file changed, 12 insertions(+), 5 deletions(-)
+
+diff --git a/ssh2_fopen_wrappers.c b/ssh2_fopen_wrappers.c
+index 8472ddd..89b34eb 100644
+--- a/ssh2_fopen_wrappers.c
++++ b/ssh2_fopen_wrappers.c
+@@ -198,10 +198,20 @@ php_url *php_ssh2_fopen_wraper_parse_path( char *path, char *type, php_stream_co
+ php_url *resource;
+ zval *methods = NULL, *callbacks = NULL, zsession, **tmpzval;
+ long resource_id;
+- char *s, *username = NULL, *password = NULL, *pubkey_file = NULL, *privkey_file = NULL;
++ char *h, *s, *username = NULL, *password = NULL, *pubkey_file = NULL, *privkey_file = NULL;
+ int username_len = 0, password_len = 0;
+
+- resource = php_url_parse(path);
++ h = strstr(path, "Resource id #");
++ if (h) {
++ /* Starting with 5.6.28, 7.0.13 need to be clean, else php_url_parse will fail */
++ char *tmp = estrdup(path);
++
++ strncpy(tmp + (h-path), h + sizeof("Resource id #")-1, strlen(tmp)-sizeof("Resource id #"));
++ resource = php_url_parse(tmp);
++ efree(tmp);
++ } else {
++ resource = php_url_parse(path);
++ }
+ if (!resource || !resource->path) {
+ return NULL;
+ }
+@@ -232,9 +242,6 @@ php_url *php_ssh2_fopen_wraper_parse_path( char *path, char *type, php_stream_co
+
+ /* Look for a resource ID to reuse a session */
+ s = resource->host;
+- if (strncmp(resource->host, "Resource id #", sizeof("Resource id #") - 1) == 0) {
+- s = resource->host + sizeof("Resource id #") - 1;
+- }
+ if (is_numeric_string(s, strlen(s), &resource_id, NULL, 0) == IS_LONG) {
+ php_ssh2_sftp_data *sftp_data;
+
+--
+2.1.4
+
diff --git a/dev-php/pecl-ssh2/metadata.xml b/dev-php/pecl-ssh2/metadata.xml
new file mode 100644
index 000000000000..aca42932b833
--- /dev/null
+++ b/dev-php/pecl-ssh2/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ <name>PHP</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-php/pecl-ssh2/pecl-ssh2-0.13-r3.ebuild b/dev-php/pecl-ssh2/pecl-ssh2-0.13-r3.ebuild
new file mode 100644
index 000000000000..25a9a72ff7ce
--- /dev/null
+++ b/dev-php/pecl-ssh2/pecl-ssh2-0.13-r3.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PHP_EXT_NAME="ssh2"
+
+USE_PHP="php5-6 php7-0 php7-1"
+
+inherit php-ext-pecl-r3
+
+USE_PHP="php5-6"
+
+DESCRIPTION="PHP bindings for the libssh2 library"
+LICENSE="PHP-3.01"
+SLOT="0"
+IUSE=""
+KEYWORDS="amd64 x86"
+# Upstream notes say there are errors with gcrypt backend
+DEPEND="net-libs/libssh2[-gcrypt]"
+RDEPEND="${DEPEND}"
+PDEPEND="php_targets_php7-0? ( dev-php/pecl-ssh2:7 )
+ php_targets_php7-1? ( dev-php/pecl-ssh2:7 )"
+
+src_prepare(){
+ if use php_targets_php5-6 ; then
+ local PATCHES=( "${FILESDIR}/0.13-parse_url-fix.patch" )
+ php-ext-source-r3_src_prepare
+ else
+ default_src_prepare
+ fi
+}
diff --git a/dev-php/pecl-ssh2/pecl-ssh2-1.1.1.ebuild b/dev-php/pecl-ssh2/pecl-ssh2-1.1.1.ebuild
new file mode 100644
index 000000000000..2c2f92bed940
--- /dev/null
+++ b/dev-php/pecl-ssh2/pecl-ssh2-1.1.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PHP_EXT_NAME="ssh2"
+
+USE_PHP="php5-6 php7-0 php7-1"
+
+inherit php-ext-pecl-r3
+
+USE_PHP="php7-0 php7-1"
+
+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-0 || use php_targets_php7-1; then
+ php-ext-source-r3_src_prepare
+ else
+ default_src_prepare
+ fi
+}
diff --git a/dev-php/pecl-ssh2/pecl-ssh2-1.1.2.ebuild b/dev-php/pecl-ssh2/pecl-ssh2-1.1.2.ebuild
new file mode 100644
index 000000000000..09e08c191229
--- /dev/null
+++ b/dev-php/pecl-ssh2/pecl-ssh2-1.1.2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PHP_EXT_NAME="ssh2"
+
+USE_PHP="php5-6 php7-0 php7-1 php7-2"
+
+inherit php-ext-pecl-r3
+
+USE_PHP="php7-0 php7-1 php7-2"
+
+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-0 || use php_targets_php7-1 || use php_targets_php7-2; then
+ php-ext-source-r3_src_prepare
+ else
+ default_src_prepare
+ fi
+}
diff --git a/dev-php/pecl-ssh2/pecl-ssh2-9999.ebuild b/dev-php/pecl-ssh2/pecl-ssh2-9999.ebuild
new file mode 100644
index 000000000000..e493a7b71a86
--- /dev/null
+++ b/dev-php/pecl-ssh2/pecl-ssh2-9999.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PHP_EXT_NAME="ssh2"
+
+USE_PHP="php5-6 php7-0 php7-1 php7-2"
+EGIT_REPO_URI="https://git.php.net/repository/pecl/networking/ssh2.git"
+
+inherit php-ext-source-r3 git-r3
+
+USE_PHP="php7-0 php7-1 php7-2"
+
+DESCRIPTION="PHP bindings for the libssh2 library"
+LICENSE="PHP-3.01"
+SLOT="7"
+IUSE=""
+KEYWORDS=""
+DEPEND=">=net-libs/libssh2-1.2"
+RDEPEND="${DEPEND}
+ php_targets_php5-6? ( dev-php/pecl-ssh2:0[php_targets_php5-6] )"
+HOMEPAGE="https://pecl.php.net/package/ssh2"
+
+src_prepare() {
+ if use php_targets_php7-0 || use php_targets_php7-1 || use php_targets_php7-2 ; then
+ php-ext-source-r3_src_prepare
+ else
+ default_src_prepare
+ fi
+}
diff --git a/dev-php/pecl-stomp-1.0.9-r1 b/dev-php/pecl-stomp-1.0.9-r1
deleted file mode 100644
index a9ed08f7fbd2..000000000000
--- a/dev-php/pecl-stomp-1.0.9-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=php_targets_php5-6? ( dev-lang/php:5.6[ssl?] ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 )
-DESCRIPTION=PHP extension to communicate with Stomp message brokers
-EAPI=6
-HOMEPAGE=https://pecl.php.net/stomp
-IUSE=examples ssl php_targets_php5-6 php_targets_php7-0
-KEYWORDS=~amd64 ~x86
-LICENSE=PHP-3.01
-PDEPEND=php_targets_php7-0? ( dev-php/pecl-stomp:7 )
-RDEPEND=php_targets_php5-6? ( dev-lang/php:5.6[ssl?] ) php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 )
-REQUIRED_USE=|| ( php_targets_php5-6 php_targets_php7-0 )
-SLOT=0
-SRC_URI=https://pecl.php.net/get/stomp-1.0.9.tgz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e php-ext-pecl-r3 a59741d3df8ea9f17afcdcfb7edaee6d php-ext-source-r3 63b281041baa106ff1ef59b602ca7e2a toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=6764abc5365b6493e8a43c1d9f1b7779
diff --git a/dev-php/pecl-stomp-2.0.1-r1 b/dev-php/pecl-stomp-2.0.1-r1
deleted file mode 100644
index 730aeb745196..000000000000
--- a/dev-php/pecl-stomp-2.0.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=php_targets_php7-0? ( dev-lang/php:7.0[ssl?] ) php_targets_php7-1? ( dev-lang/php:7.1[ssl?] ) php_targets_php7-2? ( dev-lang/php:7.1[ssl?] ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 )
-DESCRIPTION=PHP extension to communicate with Stomp message brokers
-EAPI=6
-HOMEPAGE=https://pecl.php.net/stomp
-IUSE=examples ssl test php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2
-KEYWORDS=~amd64 ~x86
-LICENSE=PHP-3.01
-RDEPEND=php_targets_php7-0? ( dev-lang/php:7.0[ssl?] ) php_targets_php7-1? ( dev-lang/php:7.1[ssl?] ) php_targets_php7-2? ( dev-lang/php:7.1[ssl?] ) php_targets_php5-6? ( dev-php/pecl-stomp:0 ) php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 )
-REQUIRED_USE=|| ( php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2 )
-SLOT=7
-SRC_URI=https://pecl.php.net/get/stomp-2.0.1.tgz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e php-ext-pecl-r3 a59741d3df8ea9f17afcdcfb7edaee6d php-ext-source-r3 63b281041baa106ff1ef59b602ca7e2a toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=3db976d42672e58a0e1f52e2eb1c25c9
diff --git a/dev-php/pecl-stomp/Manifest b/dev-php/pecl-stomp/Manifest
new file mode 100644
index 000000000000..82e52dddb9fa
--- /dev/null
+++ b/dev-php/pecl-stomp/Manifest
@@ -0,0 +1,5 @@
+DIST stomp-1.0.9.tgz 23166 BLAKE2B 804fbe2703f5035a8faa744cddc84de5249b74186c22ab5e26c075a2f241262cadd237c7f566262fcdc25def846968a7788d80817743cdf53eb255cbc25053e1 SHA512 e3ab5bfb03c29edde63de4006b448e0204efbac5817b1443ee5b1a0249c2f96d58443847b878e838108b66e5307f6e803f807aff7430af748af4994bfca5199a
+DIST stomp-2.0.1.tgz 23494 BLAKE2B 3e9f042ffa4a8f54a0746db638ade4bf75febad0359e398894714c6c4d4b6bbaee65cfa384c379d14387026219f02013c6dbb7faba62ae11b4231215be7310ad SHA512 61cfacbd96f1061dc869ede6c1ca0f7bceb6120b28cc4a78fabcbace54a66ba540faf41ef72747b8bcc6a4ef98e405daac04e82bd4e079d90293f030684b04d3
+EBUILD pecl-stomp-1.0.9-r1.ebuild 899 BLAKE2B edeab12f987c00ac202b5bcdf848757ec686b56d602e6761741ca7d703a2733e8e81704c7ca47ec8825c0305767b12175911563515b69fad567c9e6c3d429a3e SHA512 1b645c6e9e90ea33397e7c963f1551c9b369100e65b085229f3882ca6d6f9a341b1f224ccb399bf147f330fde6ba218ca20b192973b598a5b170fce80fe73d67
+EBUILD pecl-stomp-2.0.1-r1.ebuild 1206 BLAKE2B 4bf5f2d2003a7cd3799218dbfd4025c88fcecfff01ef365a75250aea5a35a7fe21beb7b0e060b4b01897c0bb0c685718902d817c68d60678e241d37dec11b62d SHA512 45d183ed424595af9de5a600e1fdcc9faf4246a2779b6d25040684c2bd6db0ff296a1e6677099350936dda1fe427822deb7bcb16574e5804b19fb4672d452bc9
+MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/pecl-stomp/metadata.xml b/dev-php/pecl-stomp/metadata.xml
new file mode 100644
index 000000000000..b86acf66c756
--- /dev/null
+++ b/dev-php/pecl-stomp/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ <name>PHP</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/dev-php/pecl-stomp/pecl-stomp-1.0.9-r1.ebuild b/dev-php/pecl-stomp/pecl-stomp-1.0.9-r1.ebuild
new file mode 100644
index 000000000000..8349a99f9a6c
--- /dev/null
+++ b/dev-php/pecl-stomp/pecl-stomp-1.0.9-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_PHP="php5-6 php7-0"
+PHP_EXT_NAME="stomp"
+DOCS=( CREDITS doc/classes.php doc/functions.php )
+
+inherit php-ext-pecl-r3
+
+USE_PHP="php5-6"
+
+KEYWORDS="~amd64 ~x86"
+
+DESCRIPTION="PHP extension to communicate with Stomp message brokers"
+LICENSE="PHP-3.01"
+SLOT="0"
+IUSE="examples ssl"
+
+DEPEND="${DEPEND}
+ php_targets_php5-6? ( dev-lang/php:5.6[ssl?] )
+"
+
+RDEPEND="${DEPEND}"
+PDEPEND="php_targets_php7-0? ( dev-php/pecl-stomp:7 )"
+
+src_prepare() {
+ if use php_targets_php5-6 ; then
+ php-ext-source-r3_src_prepare
+ else
+ default_src_prepare
+ fi
+}
+
+src_configure() {
+ local PHP_EXT_ECONF_ARGS=(
+ --enable-stomp
+ --with-openssl-dir=$(usex ssl "${EPREFIX}/usr")
+ )
+ php-ext-source-r3_src_configure
+}
+
+src_install() {
+ if use php_targets_php5-6 ; then
+ php-ext-pecl-r3_src_install
+ fi
+}
diff --git a/dev-php/pecl-stomp/pecl-stomp-2.0.1-r1.ebuild b/dev-php/pecl-stomp/pecl-stomp-2.0.1-r1.ebuild
new file mode 100644
index 000000000000..dc494fe74045
--- /dev/null
+++ b/dev-php/pecl-stomp/pecl-stomp-2.0.1-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_PHP="php5-6 php7-0 php7-1 php7-2"
+PHP_EXT_NAME="stomp"
+DOCS=( CREDITS doc/classes.php doc/functions.php )
+
+inherit php-ext-pecl-r3
+
+USE_PHP="php7-0 php7-1 php7-2"
+
+KEYWORDS="~amd64 ~x86"
+
+DESCRIPTION="PHP extension to communicate with Stomp message brokers"
+LICENSE="PHP-3.01"
+SLOT="7"
+IUSE="examples ssl test"
+
+DEPEND="${DEPEND}
+ php_targets_php7-0? ( dev-lang/php:7.0[ssl?] )
+ php_targets_php7-1? ( dev-lang/php:7.1[ssl?] )
+ php_targets_php7-2? ( dev-lang/php:7.1[ssl?] )
+"
+
+RDEPEND="${DEPEND}
+ php_targets_php5-6? ( dev-php/pecl-stomp:0 )"
+
+src_prepare() {
+ if use php_targets_php7-0 || use php_targets_php7-1 || use php_targets_php7-2 ; then
+ php-ext-source-r3_src_prepare
+ else
+ default
+ fi
+}
+
+src_configure() {
+ if use php_targets_php7-0 || use php_targets_php7-1 || use php_targets_php7_2 ; then
+ local PHP_EXT_ECONF_ARGS=(
+ --enable-stomp
+ --with-openssl-dir=$(usex ssl "${EPREFIX}/usr")
+ )
+ php-ext-source-r3_src_configure
+ fi
+}
+
+src_install() {
+ if use php_targets_php7-0 || use php_targets_php7-1 || use php_targets_php7_2 ; then
+ php-ext-pecl-r3_src_install
+ fi
+}
diff --git a/dev-php/pecl-svn-1.0.3-r1 b/dev-php/pecl-svn-1.0.3-r1
deleted file mode 100644
index 197c3db7e0a1..000000000000
--- a/dev-php/pecl-svn-1.0.3-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-vcs/subversion >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php5-6? ( dev-lang/php:5.6 )
-DESCRIPTION=PHP Bindings for the Subversion Revision control system
-EAPI=6
-HOMEPAGE=https://pecl.php.net/svn
-IUSE=php_targets_php5-6
-KEYWORDS=~amd64 ~x86
-LICENSE=PHP-3.01
-RDEPEND=dev-vcs/subversion php_targets_php5-6? ( dev-lang/php:5.6 )
-REQUIRED_USE=|| ( php_targets_php5-6 )
-SLOT=0
-SRC_URI=https://pecl.php.net/get/svn-1.0.3.tgz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e php-ext-pecl-r3 a59741d3df8ea9f17afcdcfb7edaee6d php-ext-source-r3 63b281041baa106ff1ef59b602ca7e2a toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=afa51cc5041ad15adc681aa7e7ebfbe2
diff --git a/dev-php/pecl-svn/Manifest b/dev-php/pecl-svn/Manifest
new file mode 100644
index 000000000000..a1dd8fa1d17e
--- /dev/null
+++ b/dev-php/pecl-svn/Manifest
@@ -0,0 +1,4 @@
+AUX 1.0.3-c99-fixes.patch 2241 BLAKE2B 8371def71451c0234b533bba30b3990441b95a7d0ab3de36548c71f452d5badd3a49905d64fe5267b66b087f9422a95f2846f862fb81304eba626898629a5142 SHA512 817048816e43f62246a172164691f95d9b84cc18fde096ed7ff9ce115e36b41942b22915dc149a9cbc972923d8f5f828e6197cc00503d7bca21bbb9bbba3c740
+DIST svn-1.0.3.tgz 27216 BLAKE2B 906f11dbc048f3bc7fa2b27c19661ce40c3008b35344cd0446c88432e2a6423ab6aeb396ded7723f70229767238d8a10eed6f8cd4ae29e73497eee6c5a0ac0a9 SHA512 41f111c3a47f66317c47318162bfd17c22ffef6462ababdafd9ed38220b1135464e52a365fbc206fd510dafad739437174faf1d0dd144707fad62da43c6c1a79
+EBUILD pecl-svn-1.0.3-r1.ebuild 407 BLAKE2B 2ca9546708eef06339f67bd9f7108bf332fb2fd8676052bcfc32cb2550149a3089a01be3670f9bfb33f64ec48b571efa5649253fe7e06f8e1d484f45ec02de0a SHA512 e6ad7b64b58704364e1efbd6af381bc46551239912a66cba0a4da98a064f8170d283c3c6fa7c23f8967c1e149a4340ebf041c4d66f48bb95f420ca7ed957fafe
+MISC metadata.xml 235 BLAKE2B 5b10304feea18aae1822be7d29bcce06c8715193b14a3dd2c4d79eb75e2767670352e2ca11e06b9a10ec04b63020a18254cd167e6d6be9072f4a200ca5d11ec4 SHA512 0b3e95bbf68eddf74289dad50f8828cffce2d904ff6f9bd5468177de979677cac11da84d1e0302c52b72085915b9d1b3496107172e5726520d51dad1981daf64
diff --git a/dev-php/pecl-svn/files/1.0.3-c99-fixes.patch b/dev-php/pecl-svn/files/1.0.3-c99-fixes.patch
new file mode 100644
index 000000000000..a1214ffd0cbe
--- /dev/null
+++ b/dev-php/pecl-svn/files/1.0.3-c99-fixes.patch
@@ -0,0 +1,68 @@
+--- a/svn.c 2016/05/04 04:14:33 339123
++++ b/svn.c 2016/05/04 07:32:45 339129
+@@ -977,6 +977,7 @@
+ apr_pool_t *subpool;
+ svn_opt_revision_t peg_revision;
+ const char *true_path;
++ apr_hash_index_t *hi;
+
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|lbb",
+ &repos_url, &repos_url_len, &revision.value.number, &recurse, &peg) == FAILURE) {
+@@ -1021,7 +1022,7 @@
+
+ array_init(return_value);
+
+- for (apr_hash_index_t *hi = apr_hash_first(subpool, dirents); hi; hi = apr_hash_next(hi)) {
++ for (hi = apr_hash_first(subpool, dirents); hi; hi = apr_hash_next(hi)) {
+ const char *utf8_entryname;
+ svn_dirent_t *dirent;
+ apr_time_t now = apr_time_now();
+@@ -1031,9 +1032,10 @@
+ char timestr[20];
+ const char *utf8_timestr;
+ zval *row;
++ const char *key;
+
+- svn_utf_cstring_to_utf8 (&utf8_entryname, apr_hash_this_key(hi), subpool);
+- dirent = apr_hash_this_val(hi);
++ apr_hash_this(hi, &key, NULL, &dirent);
++ svn_utf_cstring_to_utf8 (&utf8_entryname, key, subpool);
+
+ /* svn_time_to_human_cstring gives us something *way* too long
+ to use for this, so we have to roll our own. We include
+@@ -1101,6 +1103,7 @@
+ {
+ struct php_svn_log_receiver_baton *baton = (struct php_svn_log_receiver_baton*) ibaton;
+ zval *row, *paths;
++ apr_hash_index_t *hi;
+ TSRMLS_FETCH();
+
+ if (rev == 0) {
+@@ -1127,7 +1130,7 @@
+ MAKE_STD_ZVAL(paths);
+ array_init(paths);
+
+- for (apr_hash_index_t *hi = apr_hash_first(pool, changed_paths); hi; hi = apr_hash_next(hi)) {
++ for (hi = apr_hash_first(pool, changed_paths); hi; hi = apr_hash_next(hi)) {
+ svn_log_changed_path_t *log_item;
+ zval *zpaths;
+ const char *path;
+@@ -1135,8 +1138,7 @@
+ MAKE_STD_ZVAL(zpaths);
+ array_init(zpaths);
+
+- path = apr_hash_this_key(hi);
+- log_item = apr_hash_this_val(hi);
++ apr_hash_this(hi, &path, NULL, &log_item);
+
+ add_assoc_stringl(zpaths, "action", &(log_item->action), 1,1);
+ add_assoc_string(zpaths, "path", path, 1);
+@@ -1152,7 +1154,7 @@
+ add_assoc_zval(paths, path, zpaths);
+ }
+
+- zend_hash_sort(Z_ARRVAL_P(paths), zend_qsort, compare_keys_as_paths, 1);
++ zend_hash_sort(Z_ARRVAL_P(paths), zend_qsort, compare_keys_as_paths, 1 TSRMLS_CC);
+ add_assoc_zval(row,"paths",paths);
+ }
+
diff --git a/dev-php/pecl-svn/metadata.xml b/dev-php/pecl-svn/metadata.xml
new file mode 100644
index 000000000000..aca42932b833
--- /dev/null
+++ b/dev-php/pecl-svn/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ <name>PHP</name>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-php/pecl-svn/pecl-svn-1.0.3-r1.ebuild b/dev-php/pecl-svn/pecl-svn-1.0.3-r1.ebuild
new file mode 100644
index 000000000000..52eb35c8875d
--- /dev/null
+++ b/dev-php/pecl-svn/pecl-svn-1.0.3-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PHP_EXT_NAME="svn"
+
+USE_PHP="php5-6"
+
+inherit php-ext-pecl-r3
+
+KEYWORDS="~amd64 ~x86"
+
+DESCRIPTION="PHP Bindings for the Subversion Revision control system"
+LICENSE="PHP-3.01"
+SLOT="0"
+IUSE=""
+
+DEPEND="dev-vcs/subversion"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/1.0.3-c99-fixes.patch" )
diff --git a/dev-php/pecl-taint-2.0.2 b/dev-php/pecl-taint-2.0.2
deleted file mode 100644
index 19a7c0f89926..000000000000
--- a/dev-php/pecl-taint-2.0.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 )
-DESCRIPTION=Extension used for detecting XSS code (tainted strings)
-EAPI=6
-HOMEPAGE=https://pecl.php.net/taint
-IUSE=php_targets_php7-0 php_targets_php7-1
-KEYWORDS=~amd64 ~x86
-LICENSE=PHP-3.01
-RDEPEND=php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 )
-REQUIRED_USE=|| ( php_targets_php7-0 php_targets_php7-1 )
-SLOT=0
-SRC_URI=https://pecl.php.net/get/taint-2.0.2.tgz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e php-ext-pecl-r3 a59741d3df8ea9f17afcdcfb7edaee6d php-ext-source-r3 63b281041baa106ff1ef59b602ca7e2a toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=1cc73e1fbf0b8c62f782d9ed85e66704
diff --git a/dev-php/pecl-taint-2.0.4 b/dev-php/pecl-taint-2.0.4
deleted file mode 100644
index 4f26b05e4a8d..000000000000
--- a/dev-php/pecl-taint-2.0.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 )
-DESCRIPTION=Extension used for detecting XSS code (tainted strings)
-EAPI=6
-HOMEPAGE=https://pecl.php.net/taint
-IUSE=php_targets_php7-0 php_targets_php7-1 php_targets_php7-2
-KEYWORDS=~amd64 ~x86
-LICENSE=PHP-3.01
-RDEPEND=php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 )
-REQUIRED_USE=|| ( php_targets_php7-0 php_targets_php7-1 php_targets_php7-2 )
-SLOT=0
-SRC_URI=https://pecl.php.net/get/taint-2.0.4.tgz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e php-ext-pecl-r3 a59741d3df8ea9f17afcdcfb7edaee6d php-ext-source-r3 63b281041baa106ff1ef59b602ca7e2a toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=2244f2ba07cba206962c5fe393378b6c
diff --git a/dev-php/pecl-taint/Manifest b/dev-php/pecl-taint/Manifest
new file mode 100644
index 000000000000..85f03a82274e
--- /dev/null
+++ b/dev-php/pecl-taint/Manifest
@@ -0,0 +1,5 @@
+DIST taint-2.0.2.tgz 18550 BLAKE2B 70bd0425ab179c5313108a363b24310ed0c438a208ec15158d8c760cc8e2514b1031554827ced569c71cdb5109634463f75ca583fcc5cad56946947ab569fe25 SHA512 fe1375062f716a32b093942d173cf78024ed457fb5980ec8b50852ca922d8e15ec82696be2478cbbf8b9cd0620be0c2f88b18de55dec4dacec5be664b95c7108
+DIST taint-2.0.4.tgz 18063 BLAKE2B 1ef1d44cc3dac5e25aeeac86b04d491e050174ed9ced1424729b29531917baf0776c8a6d78bc2d7b42bc768ba6744833d08c8df525d5fdd962b590b2d4c2a009 SHA512 d1c265e0fa4293b2aeb0f7413b852e85c6c321c67e31ff8fd51afefd157af4b733dfdf1452f50bcf3b05c1b5f26de9ebabe4ebe862657a05c4b6abc6770c2c7f
+EBUILD pecl-taint-2.0.2.ebuild 425 BLAKE2B 229e8816bd226a259ca73d97a3796cb5f1217fe059333dd47bf961bae498582d04ec1888895610fda229513b8e02f373b36e752330838f0c098ef6ec67e87d83 SHA512 bc62f5828f98be1bbfad72e58aac0a7d6f12bb21fd632b684841231879b0726db19d47cc9d488318e13ffa035863915d5e743976ec7404c54496d5f83988b0b9
+EBUILD pecl-taint-2.0.4.ebuild 432 BLAKE2B 3af9a1e629f986dc10764a5fb1c39cc41862c2998fd88ca51009adf0978f6a26d6343bd1abc8081d487398e1e31172dc238451bc592762900744ec155b61086a SHA512 50d97b6e65260e210bc457a668d9a25766d3496591ca4456fddb87a97e09669d7459c1bbc51043aadc58940feea221383b2ea06a039f4d1d045e33ac5ae51768
+MISC metadata.xml 345 BLAKE2B 1bce954b00c4fe92867211caee4fc891eee89ebea7550eef40e775794fd13b285f3b00e1ad25f5b8c967b946bf3545a661053068a2c077e8051bd30915b55049 SHA512 f6c8ba5b96f05f24c3e2b7245fc72b9ee34ddc61a335081cf50d4e0f9915d3891599ff9e086d52f7d19a44c633d9a880941d8a18c5a583659c410de2086b6717
diff --git a/dev-php/pecl-taint/metadata.xml b/dev-php/pecl-taint/metadata.xml
new file mode 100644
index 000000000000..9199ac2d2e71
--- /dev/null
+++ b/dev-php/pecl-taint/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ <name>PHP</name>
+ </maintainer>
+ <longdescription lang="en">
+ Extension used for detecting XSS codes(tainted string)
+ </longdescription>
+</pkgmetadata>
diff --git a/dev-php/pecl-taint/pecl-taint-2.0.2.ebuild b/dev-php/pecl-taint/pecl-taint-2.0.2.ebuild
new file mode 100644
index 000000000000..281e7a24dfb8
--- /dev/null
+++ b/dev-php/pecl-taint/pecl-taint-2.0.2.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_PHP="php7-0 php7-1"
+inherit php-ext-pecl-r3
+
+DESCRIPTION="Extension used for detecting XSS code (tainted strings)"
+LICENSE="PHP-3.01"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+pkg_postinst() {
+ elog 'To enable this extension, add'
+ elog ' taint.enable=1'
+ elog 'to /etc/php/<sapi>-<slot>/ext/taint.ini'
+}
diff --git a/dev-php/pecl-taint/pecl-taint-2.0.4.ebuild b/dev-php/pecl-taint/pecl-taint-2.0.4.ebuild
new file mode 100644
index 000000000000..d040e2ceac50
--- /dev/null
+++ b/dev-php/pecl-taint/pecl-taint-2.0.4.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_PHP="php7-0 php7-1 php7-2"
+inherit php-ext-pecl-r3
+
+DESCRIPTION="Extension used for detecting XSS code (tainted strings)"
+LICENSE="PHP-3.01"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+pkg_postinst() {
+ elog 'To enable this extension, add'
+ elog ' taint.enable=1'
+ elog 'to /etc/php/<sapi>-<slot>/ext/taint.ini'
+}
diff --git a/dev-php/pecl-timezonedb-2016.10 b/dev-php/pecl-timezonedb-2016.10
deleted file mode 100644
index edf9945dcdeb..000000000000
--- a/dev-php/pecl-timezonedb-2016.10
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 )
-DESCRIPTION=Timezone Database to be used with PHP's date and time functions
-EAPI=6
-HOMEPAGE=https://pecl.php.net/timezonedb
-IUSE=php_targets_php5-6 php_targets_php7-0
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=PHP-3
-RDEPEND=php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 )
-REQUIRED_USE=|| ( php_targets_php5-6 php_targets_php7-0 )
-SLOT=0
-SRC_URI=https://pecl.php.net/get/timezonedb-2016.10.tgz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e php-ext-pecl-r3 a59741d3df8ea9f17afcdcfb7edaee6d php-ext-source-r3 63b281041baa106ff1ef59b602ca7e2a toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=4fc0bc972d1230c89b73fb5491484d51
diff --git a/dev-php/pecl-timezonedb-2017.3 b/dev-php/pecl-timezonedb-2017.3
deleted file mode 100644
index 6a77acbe22b7..000000000000
--- a/dev-php/pecl-timezonedb-2017.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 )
-DESCRIPTION=Timezone Database to be used with PHP's date and time functions
-EAPI=6
-HOMEPAGE=https://pecl.php.net/timezonedb
-IUSE=php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=PHP-3
-RDEPEND=php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 )
-REQUIRED_USE=|| ( php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2 )
-SLOT=0
-SRC_URI=https://pecl.php.net/get/timezonedb-2017.3.tgz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e php-ext-pecl-r3 a59741d3df8ea9f17afcdcfb7edaee6d php-ext-source-r3 63b281041baa106ff1ef59b602ca7e2a toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=521b1054711ace65c0b9ceb6c641e4f1
diff --git a/dev-php/pecl-timezonedb/Manifest b/dev-php/pecl-timezonedb/Manifest
new file mode 100644
index 000000000000..004871249210
--- /dev/null
+++ b/dev-php/pecl-timezonedb/Manifest
@@ -0,0 +1,5 @@
+DIST timezonedb-2016.10.tgz 421824 BLAKE2B 900bc7a7e3450a3da119262bb67815dbec921d9f730c37bdc9859ad3a7f87ed4b1e9379e08ba7ede018737a4b5fd998cb2f740c1c7367aeb0c4036224274aa6b SHA512 062c5cec18ba091a1b38fcf07059b42b2aad1205fd4b83e87f2a6b59ab68b9a2906a46a9f24214b7feeb802f126282b612cb866870a31f58c7c7e30f54040731
+DIST timezonedb-2017.3.tgz 421152 BLAKE2B 1d2579d88d1c1f5a00d46488d54606ba24a63d4b7c267121bdd7cc725e3dbc7d7484a9988fdbaff186bbceda130bb31e6e8f01c45d53c25d61c4b55092c8a390 SHA512 5f6064064a71bf973f7581d452cad909ca2203c4c8773ca7cb31307c3cbe63613adf972cfc6c7b0800215018e2fb3c4b7a2d7d0df171243319ab63047e9099fc
+EBUILD pecl-timezonedb-2016.10.ebuild 441 BLAKE2B f91b956ea57b0c77c4d135fcfbde816f9f5f6b284791442f6579eabc4f6d4eb426a072af4ffc65e85d5fc695140a8cc45e69626f448357e58646503037d0123f SHA512 8cae37b48ea29ea53f9c26c6d835c1a13810669398e98069651ab9c0913646dbe5b6f7f0e9c3ea7c76bdd1470490b8cf5314d9cb24360f38a5308e8d715bacde
+EBUILD pecl-timezonedb-2017.3.ebuild 455 BLAKE2B 37eca70ef8e6b10c32e31f39a7d1c6d1ea0814178007d4f9d5016e07f3e2a5543d5e187df2a9329043d8f520f5b92d7171f088b520c5d9268e5f0e7f0ca77d77 SHA512 69ac53b3324ec436a02645eb847452cc3e2a3c9c6db30d4b68011f73d56d885c26728fb64f61add6d2dda2c4606817d8d8874f031c677a167edb53e267981dd1
+MISC metadata.xml 635 BLAKE2B 9c3fa685e184fdb85fd630b9bbbd69bfc20569455f1fa84f147b2d2404739077f5bffbe2c4e5d1a1ff28a9f2ec36bb04d7d55952c7cee4cc5ee3dbc1b11bbc40 SHA512 3b06142a7f995b5859650fa156973deb5cf783be8ee123dc2820f1c4a0d8588d6c73a739a3fe547a3b450ee544a0a69abd260c44d53c87ba0c9911cd68e539dc
diff --git a/dev-php/pecl-timezonedb/metadata.xml b/dev-php/pecl-timezonedb/metadata.xml
new file mode 100644
index 000000000000..aed048d4616c
--- /dev/null
+++ b/dev-php/pecl-timezonedb/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ <name>PHP</name>
+ </maintainer>
+ <longdescription>
+ This extension is a drop-in replacement for the builtin timezone database that
+ comes with PHP. You should only install this extension in case you need to get
+ a later version of the timezone database than the one that ships with PHP.
+
+ The data that this extension uses comes from the "Olson" database, which is
+ located at ftp://elsie.nci.nih.gov/pub/.
+ </longdescription>
+</pkgmetadata>
diff --git a/dev-php/pecl-timezonedb/pecl-timezonedb-2016.10.ebuild b/dev-php/pecl-timezonedb/pecl-timezonedb-2016.10.ebuild
new file mode 100644
index 000000000000..896160f9e570
--- /dev/null
+++ b/dev-php/pecl-timezonedb/pecl-timezonedb-2016.10.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PHP_EXT_NAME="timezonedb"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+
+USE_PHP="php5-6 php7-0"
+
+inherit php-ext-pecl-r3
+
+DESCRIPTION="Timezone Database to be used with PHP's date and time functions"
+LICENSE="PHP-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE=""
+PHP_EXT_ECONF_ARGS=""
diff --git a/dev-php/pecl-timezonedb/pecl-timezonedb-2017.3.ebuild b/dev-php/pecl-timezonedb/pecl-timezonedb-2017.3.ebuild
new file mode 100644
index 000000000000..5726f88a5132
--- /dev/null
+++ b/dev-php/pecl-timezonedb/pecl-timezonedb-2017.3.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PHP_EXT_NAME="timezonedb"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+
+USE_PHP="php5-6 php7-0 php7-1 php7-2"
+
+inherit php-ext-pecl-r3
+
+DESCRIPTION="Timezone Database to be used with PHP's date and time functions"
+LICENSE="PHP-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE=""
+PHP_EXT_ECONF_ARGS=""
diff --git a/dev-php/pecl-translit-0.6.2-r2 b/dev-php/pecl-translit-0.6.2-r2
deleted file mode 100644
index 58fec59ed925..000000000000
--- a/dev-php/pecl-translit-0.6.2-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 )
-DESCRIPTION=Transliterates non-latin character sets to latin
-EAPI=6
-HOMEPAGE=https://github.com/derickr/pecl-translit
-IUSE=php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD-2
-RDEPEND=php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 )
-REQUIRED_USE=|| ( php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2 )
-SLOT=0
-SRC_URI=https://github.com/derickr/pecl-translit/archive/RELEASE_0_6_2.tar.gz -> pecl-translit-0.6.2.tar.gz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e php-ext-source-r3 63b281041baa106ff1ef59b602ca7e2a toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=e1a3118d8190066b6fcd7af8386ef522
diff --git a/dev-php/pecl-translit/Manifest b/dev-php/pecl-translit/Manifest
new file mode 100644
index 000000000000..6add2621160b
--- /dev/null
+++ b/dev-php/pecl-translit/Manifest
@@ -0,0 +1,3 @@
+DIST pecl-translit-0.6.2.tar.gz 226445 BLAKE2B c5fbf99134b7f933f1d8209ebffa97a28c927b8db917319a9308debfa4275d8e6e3e0c261cfb0661c8202f25c0cdf5a888bc90f356cd80a2ab788366c4c3cb85 SHA512 1d5229ceb2c06f5e4a9e3f7e1e760fc2974c01b732f8e220b9b1ddd49a82c932f4237fb6a19c82017270614881156f9637cffbe7896132e4a07e7a6547915ebb
+EBUILD pecl-translit-0.6.2-r2.ebuild 774 BLAKE2B 0721d8d612cf3326fc3975cb350bfcf435eaab1d5c2154c006e3b9db70a419017040a5dbf816400a7ce5cef9880e1b019bccd1ea3a5fdf00ff6d431aab73ab2a SHA512 a59ef148f8a099b043df99d0fedad0a8f2e5eb5d560a722165365c92366d0eff71724e1e7b67ee0fbe71571a4e5bdd1a24abda69c8456cc1312f4f3f0c5cea7f
+MISC metadata.xml 325 BLAKE2B a089699f9d6ab5df97554c8ff39057077aa28eb48f636adf1d2f85eafb3a4952d7c1dc5b86e1bf1e147bf020ed27119a3567c23b7fcd562ca44966970addbbc5 SHA512 b81117beceea889e292daa2bfad712b51f40a2e12e826388bc0d0f2ae2455dacbcdb4a041fdc72bdbfcc123af11c87346643fd0298b0c2bc726c13ede3a2ea5e
diff --git a/dev-php/pecl-translit/metadata.xml b/dev-php/pecl-translit/metadata.xml
new file mode 100644
index 000000000000..92808a053d08
--- /dev/null
+++ b/dev-php/pecl-translit/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://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">derickr/pecl-translit</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-php/pecl-translit/pecl-translit-0.6.2-r2.ebuild b/dev-php/pecl-translit/pecl-translit-0.6.2-r2.ebuild
new file mode 100644
index 000000000000..82fd86110534
--- /dev/null
+++ b/dev-php/pecl-translit/pecl-translit-0.6.2-r2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PHP_EXT_NAME="translit"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+
+USE_PHP="php5-6 php7-0 php7-1 php7-2"
+PHP_EXT_NAME="translit"
+
+MY_PV="${PV//./_}"
+S="${WORKDIR}/${PN}-RELEASE_${MY_PV}"
+
+inherit php-ext-source-r3
+
+SRC_URI="https://github.com/derickr/${PN}/archive/RELEASE_${MY_PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64 ~x86"
+HOMEPAGE="https://github.com/derickr/pecl-translit"
+
+DESCRIPTION="Transliterates non-latin character sets to latin"
+LICENSE="BSD-2"
+SLOT="0"
+IUSE=""
+PHP_EXT_ECONF_ARGS=()
+
+src_test() {
+ for slot in $(php_get_slots); do
+ php_init_slot_env ${slot}
+ NO_INTERACTION="yes" emake test || die "emake test failed for slot ${slot}"
+ done
+}
diff --git a/dev-php/pecl-uploadprogress-1.0.3.1-r4 b/dev-php/pecl-uploadprogress-1.0.3.1-r4
deleted file mode 100644
index b431d617acb0..000000000000
--- a/dev-php/pecl-uploadprogress-1.0.3.1-r4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 )
-DESCRIPTION=An extension to track progress of a file upload
-EAPI=6
-HOMEPAGE=https://pecl.php.net/uploadprogress
-IUSE=php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2
-KEYWORDS=~amd64 ~x86
-LICENSE=PHP-3.01
-RDEPEND=php_targets_php5-6? ( dev-lang/php:5.6[apache2] ) php_targets_php7-0? ( dev-lang/php:7.0[apache2] ) php_targets_php7-1? ( dev-lang/php:7.1[apache2] ) php_targets_php7-2? ( dev-lang/php:7.2[apache2] ) php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 )
-REQUIRED_USE=|| ( php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2 )
-SLOT=0
-SRC_URI=https://pecl.php.net/get/uploadprogress-1.0.3.1.tgz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e php-ext-pecl-r3 a59741d3df8ea9f17afcdcfb7edaee6d php-ext-source-r3 63b281041baa106ff1ef59b602ca7e2a toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=c1fe381ad0924cfe4344a6321ceba7c2
diff --git a/dev-php/pecl-uploadprogress/Manifest b/dev-php/pecl-uploadprogress/Manifest
new file mode 100644
index 000000000000..878b07617bb2
--- /dev/null
+++ b/dev-php/pecl-uploadprogress/Manifest
@@ -0,0 +1,4 @@
+AUX 1.0.3.1-php7.patch 4948 BLAKE2B 12ee139944a17989429e696e7457a3926d18f4300bf5bc2f9bfab2a036be88a47ea03ca64f06e378bb2811fdaba390e29a905eae87362c4a979c17407de53f3c SHA512 5b913ac4c006cee917ddb7140dd2e34dee6da9fac11001e6ee9f41ac0b65e3caa493c81612b05ef8ff99fec9c9a4cd4a2c2c275fc6124223d04648d43cae4fe4
+DIST uploadprogress-1.0.3.1.tgz 9040 BLAKE2B b926ee0cc7d40276425ea8eed86c5934c35ff2436b5785888394927a145620caa335d4eae87fd85bd754f8a67c1562f3b8d23a2c626f0d0ca4bed4bf4872e465 SHA512 c317a30ed81430184b643e2755867cdccf9848312aa31a5527e4fe229ac19ee3099121de8e253207b55dd7e788c28720bd3c477663c4ca15100478647a6dc1bb
+EBUILD pecl-uploadprogress-1.0.3.1-r4.ebuild 563 BLAKE2B fcc84e59b3228d4b94707e58bf56c1fdc9e189ce8b314fd2c4f80fc8dd1d8d5d4dab978ad94570c31f92713f281146c4057e07c45f9f01819da222dc26039294 SHA512 e9aa81d47e2d1b5e253bf2aea06f0989ee429e11df963115f34f1c8d2ced49ff9c6e7ba6d4fd0534965a447ecb6f9fd0b62235621b67a047a73cfe4185c2d4e0
+MISC metadata.xml 526 BLAKE2B 719015d4f11e9af4765f71ca1b8706fdf93c214ac7390f72579068151adebe0c39a29019201323aff6668ca2c7b31daeab247a867262138358a29034238a875a SHA512 18d72c569825f9dfd79a69d4ad1bc824f99001f2b1545aaaf6777a67050d9812dd81737c9e74bc9520aa5b375db4d94c5219f359eeaa5c8d7ae0a6437c96ec56
diff --git a/dev-php/pecl-uploadprogress/files/1.0.3.1-php7.patch b/dev-php/pecl-uploadprogress/files/1.0.3.1-php7.patch
new file mode 100644
index 000000000000..c90f4bd9539f
--- /dev/null
+++ b/dev-php/pecl-uploadprogress/files/1.0.3.1-php7.patch
@@ -0,0 +1,148 @@
+From 7a4d6b3ac3575caedf9429940f54688411cbf5e9 Mon Sep 17 00:00:00 2001
+From: Jan-E <github@ehrhardt.nl>
+Date: Sun, 19 Apr 2015 18:49:48 +0200
+Subject: [PATCH 1/2] PHP7 compatibility
+
+---
+ uploadprogress.c | 36 +++++++++++++++++++++++++++++++++---
+ 1 file changed, 33 insertions(+), 3 deletions(-)
+
+diff --git a/uploadprogress.c b/uploadprogress.c
+index 30f6758..7a52ba7 100644
+--- a/uploadprogress.c
++++ b/uploadprogress.c
+@@ -71,7 +71,7 @@ PHPAPI extern int (*php_rfc1867_callback)(unsigned int , void *, void ** TSRMLS_
+ */
+ static int uploadprogress_php_rfc1867_file(unsigned int event, void *event_data, void **data TSRMLS_DC)
+ {
+- zval handler;
++ //zval handler;
+ char *callable = NULL;
+ uploadprogress_data * progress;
+ int read_bytes;
+@@ -157,7 +157,11 @@ static int uploadprogress_php_rfc1867_file(unsigned int event, void *event_data
+
+ if (get_contents) {
+ php_stream *stream;
++#if defined(ZEND_ENGINE_3)
++ int options = 0;
++#else
+ int options = ENFORCE_SAFE_MODE;
++#endif
+
+ stream = php_stream_open_wrapper(progress->data_filename, "ab", options, NULL);
+ if (stream) {
+@@ -301,7 +305,7 @@ PHP_FUNCTION(uploadprogress_get_info)
+ {
+ char * id;
+ int id_lg;
+- char method;
++ //char method;
+
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &id, &id_lg) == FAILURE) {
+ return;
+@@ -417,7 +421,11 @@ static void uploadprogress_file_php_get_info(char * id, zval * return_value)
+ v[index] = 0;
+ }
+ }
++#if defined(ZEND_ENGINE_3)
++ add_assoc_string( return_value, k, v );
++#else
+ add_assoc_string( return_value, k, v, 1 );
++#endif
+ }
+ fclose(F);
+ }
+@@ -432,10 +440,22 @@ static void uploadprogress_file_php_get_info(char * id, zval * return_value)
+ */
+ static void uploadprogress_file_php_get_contents(char *id, char *fieldname, long maxlen, zval *return_value)
+ {
++#if defined(ZEND_ENGINE_3)
++ char *filename, *template, *data_identifier;
++ zend_string *contents;
++#else
+ char *filename, *template, *contents, *data_identifier;
++#endif
+ php_stream *stream;
++#if defined(ZEND_ENGINE_3)
++ int options = 0;
++#else
+ int options = ENFORCE_SAFE_MODE;
+- int len, newlen;
++#endif
++ int len;
++#if PHP_API_VERSION < 20100412
++ int newlen;
++#endif
+ TSRMLS_FETCH();
+
+ template = INI_STR("uploadprogress.file.contents_template");
+@@ -455,7 +475,13 @@ static void uploadprogress_file_php_get_contents(char *id, char *fieldname, long
+ }
+
+ /* uses mmap if possible */
++#if defined(ZEND_ENGINE_3)
++ contents = php_stream_copy_to_mem(stream, maxlen, 0);
++ len = contents->len;
++ if (contents && len > 0) {
++#else
+ if ((len = php_stream_copy_to_mem(stream, &contents, maxlen, 0)) > 0) {
++#endif
+
+ #if PHP_API_VERSION < 20100412
+ if (PG(magic_quotes_runtime)) {
+@@ -463,7 +489,11 @@ static void uploadprogress_file_php_get_contents(char *id, char *fieldname, long
+ len = newlen;
+ }
+ #endif
++#if defined(ZEND_ENGINE_3)
++ RETVAL_STR(contents);
++#else
+ RETVAL_STRINGL(contents, len, 0);
++#endif
+ } else if (len == 0) {
+ RETVAL_EMPTY_STRING();
+ } else {
+--
+2.1.4
+
+
+From 95d8a0fd4554e10c215d3ab301e901bd8f99c5d9 Mon Sep 17 00:00:00 2001
+From: Jan-E <github@ehrhardt.nl>
+Date: Mon, 20 Apr 2015 22:20:40 +0200
+Subject: [PATCH 2/2] int id_lg should be size_t id_lg
+
+---
+ uploadprogress.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/uploadprogress.c b/uploadprogress.c
+index 7a52ba7..3d73d15 100644
+--- a/uploadprogress.c
++++ b/uploadprogress.c
+@@ -304,7 +304,11 @@ PHP_MINFO_FUNCTION(uploadprogress)
+ PHP_FUNCTION(uploadprogress_get_info)
+ {
+ char * id;
++#if defined(ZEND_ENGINE_3)
++ size_t id_lg;
++#else
+ int id_lg;
++#endif
+ //char method;
+
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &id, &id_lg) == FAILURE) {
+--
+2.1.4
+
+--- a/uploadprogress.c 2011-08-15 09:21:10.000000000 -0400
++++ b/uploadprogress.c 2016-12-07 11:05:47.961377088 -0500
+@@ -213,7 +213,7 @@
+ FILE *F;
+ F = VCWD_FOPEN(progress->identifier_tmp, "wb");
+ if (F) {
+- fprintf(F, "upload_id=%s\nfieldname=%s\nfilename=%s\ntime_start=%d\ntime_last=%d\nspeed_average=%d\nspeed_last=%d\nbytes_uploaded=%d\nbytes_total=%d\nfiles_uploaded=%d\nest_sec=%d\n",
++ fprintf(F, "upload_id=%s\nfieldname=%s\nfilename=%s\ntime_start=%ld\ntime_last=%ld\nspeed_average=%d\nspeed_last=%d\nbytes_uploaded=%ld\nbytes_total=%ld\nfiles_uploaded=%d\nest_sec=%d\n",
+ progress->upload_id, progress->fieldname, progress->filename,
+ progress->time_start, progress->time_last,
+ progress->speed_average, progress->speed_last,
diff --git a/dev-php/pecl-uploadprogress/metadata.xml b/dev-php/pecl-uploadprogress/metadata.xml
new file mode 100644
index 000000000000..5f21917bcc4e
--- /dev/null
+++ b/dev-php/pecl-uploadprogress/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ <name>PHP</name>
+</maintainer>
+<longdescription lang="en">An extension to track progress of a file upload.
+See http://cvs.php.net/viewvc.cgi/pecl/uploadprogress/examples/ for a little example. It is only known to work on Apache with mod_php, other SAPI implementations unfortunately still have issues.
+</longdescription>
+</pkgmetadata>
diff --git a/dev-php/pecl-uploadprogress/pecl-uploadprogress-1.0.3.1-r4.ebuild b/dev-php/pecl-uploadprogress/pecl-uploadprogress-1.0.3.1-r4.ebuild
new file mode 100644
index 000000000000..062036ebd698
--- /dev/null
+++ b/dev-php/pecl-uploadprogress/pecl-uploadprogress-1.0.3.1-r4.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_PHP="php5-6 php7-0 php7-1 php7-2"
+
+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=""
+
+RDEPEND="
+ php_targets_php5-6? ( dev-lang/php:5.6[apache2] )
+ php_targets_php7-0? ( dev-lang/php:7.0[apache2] )
+ php_targets_php7-1? ( dev-lang/php:7.1[apache2] )
+ php_targets_php7-2? ( dev-lang/php:7.2[apache2] )
+"
+PATCHES=( "${FILESDIR}/1.0.3.1-php7.patch" )
diff --git a/dev-php/pecl-uuid-1.0.4-r2 b/dev-php/pecl-uuid-1.0.4-r2
deleted file mode 100644
index 914f70db2975..000000000000
--- a/dev-php/pecl-uuid-1.0.4-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-apps/util-linux >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 )
-DESCRIPTION=A wrapper around libuuid
-EAPI=6
-HOMEPAGE=https://pecl.php.net/uuid
-IUSE=php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2
-KEYWORDS=~amd64
-LICENSE=LGPL-2.1
-RDEPEND=sys-apps/util-linux php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 )
-REQUIRED_USE=|| ( php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2 )
-SLOT=0
-SRC_URI=https://pecl.php.net/get/uuid-1.0.4.tgz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e php-ext-pecl-r3 a59741d3df8ea9f17afcdcfb7edaee6d php-ext-source-r3 63b281041baa106ff1ef59b602ca7e2a toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=4b718688b70df4409e52c5eb63b9cd19
diff --git a/dev-php/pecl-uuid/Manifest b/dev-php/pecl-uuid/Manifest
new file mode 100644
index 000000000000..239510e1f7f8
--- /dev/null
+++ b/dev-php/pecl-uuid/Manifest
@@ -0,0 +1,3 @@
+DIST uuid-1.0.4.tgz 14900 BLAKE2B d653329fbac1bec66d842e048b290ac6b0382f78e6ccd6f2158bafaaa375ae4e951f794d4b70c139b23a28d6ddbc1f44be47cf2af0bd2fd09de33beb17b0f837 SHA512 989d993f8158a13026b8e5c02f4aa50489b1a946d12da81dd1fff6091839a45b180562f74c8af368a498c495477374ec9e1d536e7de0178c1f288e3abe360164
+EBUILD pecl-uuid-1.0.4-r2.ebuild 425 BLAKE2B 87a37601431502d73fc71875098d26d302093c78821035f21d51fe00205cb440bca2145660a6f87ff61bbeb550cc8bfe331d656d67e6a7d6570fe8c31ef073fb SHA512 e64de3ff12aa08ea9a5a43659cbba984622d5ebda5d20a1d2a74a27a6163b1f631583e6a1126ec66cbb1498da3467459a5641fdf2830c369d8f7856694e0e9a1
+MISC metadata.xml 362 BLAKE2B 013c34069d2045f4a178b6f9bfbb4eed8ce99d7a9776ab75fc6004827108079a9ee7f844d49df36459118b3c3179d19b0f97073ce4bcfdbbb2384759d01de4fa SHA512 05766bb146f375f58fbb7d3fa384e7da07be02502f3958fc0141e7e4da622d59212af71a8fd89c24304e8b2c2ce517b51851875e5d58b9a080dab4a3a002a873
diff --git a/dev-php/pecl-uuid/metadata.xml b/dev-php/pecl-uuid/metadata.xml
new file mode 100644
index 000000000000..ffeb9c617b08
--- /dev/null
+++ b/dev-php/pecl-uuid/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>dev-zero@gentoo.org</email>
+ <name>Tiziano Müller</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ <name>PHP</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/dev-php/pecl-uuid/pecl-uuid-1.0.4-r2.ebuild b/dev-php/pecl-uuid/pecl-uuid-1.0.4-r2.ebuild
new file mode 100644
index 000000000000..7a7a10100158
--- /dev/null
+++ b/dev-php/pecl-uuid/pecl-uuid-1.0.4-r2.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PHP_EXT_NAME="uuid"
+PHP_EXT_INIT="yes"
+PHP_EXT_ZENDEXT="no"
+DOCS=( CREDITS )
+
+USE_PHP="php5-6 php7-0 php7-1 php7-2"
+
+inherit php-ext-pecl-r3
+
+DESCRIPTION="A wrapper around libuuid"
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="sys-apps/util-linux"
+RDEPEND="${DEPEND}"
+PHP_EXT_ECONF_ARGS=()
diff --git a/dev-php/pecl-xdiff-1.5.2-r5 b/dev-php/pecl-xdiff-1.5.2-r5
deleted file mode 100644
index 184c6cab6a47..000000000000
--- a/dev-php/pecl-xdiff-1.5.2-r5
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=php_targets_php5-6? ( dev-libs/libxdiff ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 )
-DESCRIPTION=PHP extension for generating diff files
-EAPI=6
-HOMEPAGE=https://pecl.php.net/xdiff
-IUSE=php_targets_php5-6 php_targets_php7-0 php_targets_php7-1
-KEYWORDS=~amd64 ~x86
-LICENSE=PHP-3.01
-PDEPEND=php_targets_php7-0? ( dev-php/pecl-xdiff:7[php_targets_php7-0] ) php_targets_php7-1? ( dev-php/pecl-xdiff:7[php_targets_php7-1] )
-RDEPEND=php_targets_php5-6? ( dev-libs/libxdiff ) php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 )
-REQUIRED_USE=|| ( php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 )
-SLOT=0
-SRC_URI=https://pecl.php.net/get/xdiff-1.5.2.tgz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e php-ext-pecl-r3 a59741d3df8ea9f17afcdcfb7edaee6d php-ext-source-r3 63b281041baa106ff1ef59b602ca7e2a toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=2492051b1fe1a360e7a7a58cc792a99b
diff --git a/dev-php/pecl-xdiff-2.0.1-r2 b/dev-php/pecl-xdiff-2.0.1-r2
deleted file mode 100644
index 4777a6561196..000000000000
--- a/dev-php/pecl-xdiff-2.0.1-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=php_targets_php7-0? ( dev-libs/libxdiff ) php_targets_php7-1? ( dev-libs/libxdiff ) php_targets_php7-2? ( dev-libs/libxdiff ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 )
-DESCRIPTION=PHP extension for generating diff files
-EAPI=6
-HOMEPAGE=https://pecl.php.net/xdiff
-IUSE=php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2
-KEYWORDS=~amd64 ~x86
-LICENSE=PHP-3.01
-RDEPEND=php_targets_php7-0? ( dev-libs/libxdiff ) php_targets_php7-1? ( dev-libs/libxdiff ) php_targets_php7-2? ( dev-libs/libxdiff ) php_targets_php5-6? ( dev-php/pecl-xdiff:0[php_targets_php5-6] ) php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 )
-REQUIRED_USE=|| ( php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2 )
-SLOT=7
-SRC_URI=https://pecl.php.net/get/xdiff-2.0.1.tgz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e php-ext-pecl-r3 a59741d3df8ea9f17afcdcfb7edaee6d php-ext-source-r3 63b281041baa106ff1ef59b602ca7e2a toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=c267462bb7814f68cd140d7bd663d55e
diff --git a/dev-php/pecl-xdiff/Manifest b/dev-php/pecl-xdiff/Manifest
new file mode 100644
index 000000000000..214910ac01cb
--- /dev/null
+++ b/dev-php/pecl-xdiff/Manifest
@@ -0,0 +1,5 @@
+DIST xdiff-1.5.2.tgz 9275 BLAKE2B c22ab9e6263392251f6465e2f7583da0f6b5de430ba82b7e3df1949b77b727c01e84e6d405bc09f931e14094f72d915f47002014e8a1c3d6790a7eda821c3548 SHA512 738d9624155b6d77b01fdef59eb0d34de6b4a8f757d2c0ccb6dd0140d021b6c88388312d6a43197dc5c24f8e643069c3a265fc0d17246e25e8104b00facf2dd0
+DIST xdiff-2.0.1.tgz 10418 BLAKE2B d80afd629db788343e5804925fb8a9971cb0df2db6462be5adcace7e15e9b7fb2bf52cbb49f900878659fcf5e91c69b721c01e01f04876e8245ecc8094f0be61 SHA512 43f2bddac82ac19ac688ae7dad3fef65b0d8887c0e6adefd1fc15236582c31d78a54538903760270dee294ca8b8ba3def48bfa9b1d44160bcc450f5c6516402a
+EBUILD pecl-xdiff-1.5.2-r5.ebuild 897 BLAKE2B 9d8ae6c86f8dbb6dc016f803011cd6040203dff50243b9db5319a15f0081c27d4770a7a4c35ad6b248aa98050a649669d90db00c178d4e90eb4cfb8e57038e3e SHA512 0c51ffd14bf599e5d28857597044977acbec8bcc06b9b94fa16a1519a58368534df40b6a77c40b4d6f793ee7a5b3c878a59e9c98cd335c3a2dae4753828684a5
+EBUILD pecl-xdiff-2.0.1-r2.ebuild 1086 BLAKE2B 2ec26d4ad32ae587fb3a6afea97e63b26afe39b6fa23d798601178652a8d1a9d342b3f81abd13da12199b15142b7fedf776e3461d6b12a685d94f14f2cf1101f SHA512 731aaefc3526500f53c590607ad7b0a114aab4a1024a3c64fea3a9f0a886162928f9a3dc7ac19f1d9538c6223a2b5221ecfb9596a11309b3589339bc0709c2b8
+MISC metadata.xml 333 BLAKE2B dd00945bd203358c600ca21b80034f9d42bf71a8ecc2fdef73bcd871a87addd962e82357f274e35bbc31bc3debf329283adff20870f56f54116800df5d6ca7d4 SHA512 c91d330b2363fbc4286bd17dfdf5883e1cb3c111a68c0f7cf795967775b4a45a00907c7c85a8ff70f59d379c7ccd2d4ad909235e0b4ace619602cc068e99a599
diff --git a/dev-php/pecl-xdiff/metadata.xml b/dev-php/pecl-xdiff/metadata.xml
new file mode 100644
index 000000000000..fa339cc6f309
--- /dev/null
+++ b/dev-php/pecl-xdiff/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://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">php/pecl-text-xdiff</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-php/pecl-xdiff/pecl-xdiff-1.5.2-r5.ebuild b/dev-php/pecl-xdiff/pecl-xdiff-1.5.2-r5.ebuild
new file mode 100644
index 000000000000..4a9ca4d80720
--- /dev/null
+++ b/dev-php/pecl-xdiff/pecl-xdiff-1.5.2-r5.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PHP_EXT_NAME="xdiff"
+PHP_EXT_PECL_PKG="xdiff"
+DOCS=( README.API )
+
+USE_PHP="php5-6 php7-0 php7-1"
+
+inherit php-ext-pecl-r3
+
+USE_PHP="php5-6"
+
+KEYWORDS="~amd64 ~x86"
+
+DESCRIPTION="PHP extension for generating diff files"
+LICENSE="PHP-3.01"
+SLOT="0"
+
+DEPEND="php_targets_php5-6? ( dev-libs/libxdiff )"
+RDEPEND="${DEPEND}"
+PDEPEND="
+php_targets_php7-0? ( dev-php/pecl-xdiff:7[php_targets_php7-0] )
+php_targets_php7-1? ( dev-php/pecl-xdiff:7[php_targets_php7-1] )
+"
+
+src_prepare() {
+ if use php_targets_php5-6 ; then
+ php-ext-source-r3_src_prepare
+ else
+ eapply_user
+ fi
+}
+
+src_configure() {
+ if use php_targets_php5-6 ; then
+ local PHP_EXT_ECONF_ARGS=()
+ php-ext-source-r3_src_configure
+ fi
+}
+
+src_install() {
+ if use php_targets_php5-6 ; then
+ php-ext-pecl-r3_src_install
+ fi
+}
diff --git a/dev-php/pecl-xdiff/pecl-xdiff-2.0.1-r2.ebuild b/dev-php/pecl-xdiff/pecl-xdiff-2.0.1-r2.ebuild
new file mode 100644
index 000000000000..5bc4d42fc327
--- /dev/null
+++ b/dev-php/pecl-xdiff/pecl-xdiff-2.0.1-r2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PHP_EXT_NAME="xdiff"
+PHP_EXT_PECL_PKG="xdiff"
+DOCS=( README.API )
+
+USE_PHP="php5-6 php7-0 php7-1 php7-2"
+
+inherit php-ext-pecl-r3
+
+USE_PHP="php7-0 php7-1 php7-2"
+
+KEYWORDS="~amd64 ~x86"
+
+DESCRIPTION="PHP extension for generating diff files"
+LICENSE="PHP-3.01"
+SLOT="7"
+
+DEPEND="
+ php_targets_php7-0? ( dev-libs/libxdiff )
+ php_targets_php7-1? ( dev-libs/libxdiff )
+ php_targets_php7-2? ( dev-libs/libxdiff )
+"
+RDEPEND="${DEPEND} php_targets_php5-6? ( dev-php/pecl-xdiff:0[php_targets_php5-6] )"
+
+src_prepare() {
+ if use php_targets_php7-0 || use php_targets_php7-1 || use php_targets_php7-2 ; then
+ php-ext-source-r3_src_prepare
+ else
+ eapply_user
+ fi
+}
+
+src_configure() {
+ if use php_targets_php7-0 || use php_targets_php7-1 || use php_targets_php7-2 ; then
+ local PHP_EXT_ECONF_ARGS=()
+ php-ext-source-r3_src_configure
+ fi
+}
+
+src_install() {
+ if use php_targets_php7-0 || use php_targets_php7-1 || use php_targets_php7-2 ; then
+ php-ext-pecl-r3_src_install
+ fi
+}
diff --git a/dev-php/pecl-xrange-1.3.2-r2 b/dev-php/pecl-xrange-1.3.2-r2
deleted file mode 100644
index d467c0b24a33..000000000000
--- a/dev-php/pecl-xrange-1.3.2-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php5-6? ( dev-lang/php:5.6 )
-DESCRIPTION=Implementation of weak references
-EAPI=6
-HOMEPAGE=https://pecl.php.net/xrange
-IUSE=php_targets_php5-6
-KEYWORDS=~amd64 ~x86
-LICENSE=PHP-3
-RDEPEND=php_targets_php5-6? ( dev-lang/php:5.6 )
-REQUIRED_USE=|| ( php_targets_php5-6 )
-SLOT=0
-SRC_URI=https://pecl.php.net/get/xrange-1.3.2.tgz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e php-ext-pecl-r3 a59741d3df8ea9f17afcdcfb7edaee6d php-ext-source-r3 63b281041baa106ff1ef59b602ca7e2a toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=37ae46afea15774de815634601745614
diff --git a/dev-php/pecl-xrange/Manifest b/dev-php/pecl-xrange/Manifest
new file mode 100644
index 000000000000..44ae5f37982c
--- /dev/null
+++ b/dev-php/pecl-xrange/Manifest
@@ -0,0 +1,4 @@
+AUX 1.3.2-fixes.patch 4474 BLAKE2B 026720c5f485a7bdc279988bd25b02809b213c7d5e220defaa4c9e2bb6c666bf6c7df102a9593c18404c20e4add493814550d3f8828cbbc1ba666c9b8a5e565a SHA512 66b110209dbdeb3ea8f79d98eb2549ace61d2272130472f75daf435c92ae3bd3ff354f3eb4ff96e374559521f45cedfbb0c1c3c5d189e5138a1765e695dbae05
+DIST xrange-1.3.2.tgz 8767 BLAKE2B bc68954f4bb81e10e71583d58d0d513fbfc8f591469fa520232b13ee46d472a3f757911ce3f3e8d8cd0b24be92fd18869fab5bc2bb5d1ea1421cd0949f45ff96 SHA512 76b43867d1225249347e489dd24a0d278b45288e26f90b0678b657ac21e0d45c5c90496ca13b534f581643d865b266dabc2cad41fec0214951a4630e98efa5e4
+EBUILD pecl-xrange-1.3.2-r2.ebuild 424 BLAKE2B 0846710e35fbfd04e0f54068b2834fbb674ee4316d621531112baa8d2e2bdd02abfd9977c3b6daf9a2a6143f5106451e4f969ec699f74ee45ff356efa48505e5 SHA512 c68d85e1d88219617955a6748037470632ffe6fec3854e3d5fcefeff980df4e8a0d6b623638c9a3eff2b75c380691d11f6838e0d18e0620da8941832caec49ef
+MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/pecl-xrange/files/1.3.2-fixes.patch b/dev-php/pecl-xrange/files/1.3.2-fixes.patch
new file mode 100644
index 000000000000..4664a5d1feb2
--- /dev/null
+++ b/dev-php/pecl-xrange/files/1.3.2-fixes.patch
@@ -0,0 +1,133 @@
+--- a/xrange.c 2012/07/28 23:20:09 326859
++++ b/xrange.c 2013/10/06 11:48:38 331707
+@@ -175,21 +175,21 @@
+ zend_class_implements(php_xrange_xri_entry TSRMLS_CC, 1, spl_ce_Countable);
+
+ /* Register Class: OddFilterIterator */
+- memset(&ce, sizeof(ce), '\0');
++ memset(&ce, 0, sizeof(ce));
+ INIT_CLASS_ENTRY(ce, PHP_XRANGE_ODDFILTERITERATOR_NAME, php_xrange_OddFilterIterator_functions);
+ ce.name_length = strlen(PHP_XRANGE_ODDFILTERITERATOR_NAME);
+ php_xrange_OddFilterIterator_entry =
+ zend_register_internal_class_ex(&ce, spl_ce_FilterIterator, NULL TSRMLS_CC);
+
+ /* Register Class: EvenFilterIterator */
+- memset(&ce, sizeof(ce), '\0');
++ memset(&ce, 0, sizeof(ce));
+ INIT_CLASS_ENTRY(ce, PHP_XRANGE_EVENFILTERITERATOR_NAME, php_xrange_EvenFilterIterator_functions);
+ ce.name_length = strlen(PHP_XRANGE_EVENFILTERITERATOR_NAME);
+ php_xrange_EvenFilterIterator_entry =
+ zend_register_internal_class_ex(&ce, spl_ce_FilterIterator, NULL TSRMLS_CC);
+
+ /* Register Class: NumericFilterIterator */
+- memset(&ce, sizeof(ce), '\0');
++ memset(&ce, 0, sizeof(ce));
+ INIT_CLASS_ENTRY(ce, PHP_XRANGE_NUMERICFILTERITERATOR_NAME, php_xrange_NumericFilterIterator_functions);
+ ce.name_length = strlen(PHP_XRANGE_NUMERICFILTERITERATOR_NAME);
+ php_xrange_NumericFilterIterator_entry =
+@@ -225,13 +225,16 @@
+ {
+ if (return_value_used) {
+ int param_count = ZEND_NUM_ARGS();
++ zval ***params;
++ zval *retval = NULL;
++ zval methodName;
+
+ /* because I'm passing the arguments as an array, I'll need to manually
+ check arg length. */
+ if (param_count != 2 && param_count != 3) WRONG_PARAM_COUNT;
+
+ /* retrieve the function's argument list */
+- zval ***params = (zval ***) safe_emalloc(param_count, sizeof(zval*), 0);
++ params = (zval ***) safe_emalloc(param_count, sizeof(zval*), 0);
+ if (zend_get_parameters_array_ex(param_count, params) == FAILURE) {
+ efree(params);
+ WRONG_PARAM_COUNT;
+@@ -244,8 +247,6 @@
+ );
+
+ /* setup call to XRangeIterator's constructor (must do manually) */
+- zval *retval = NULL;
+- zval methodName;
+ ZVAL_STRING(&methodName, "__construct", 0);
+
+ /* pass all arguments through to the XRangeIterator constructor */
+@@ -286,6 +287,9 @@
+ Return a configured range iterator / generator */
+ PHP_METHOD(PHP_XRANGE_XRI_NAME, __construct)
+ {
++ xrange_module_storage *internalStorage;
++ double iterations;
++
+ if (!getThis()) {
+ php_error_docref(
+ NULL TSRMLS_CC, E_WARNING, "Don't call the constructor statically"
+@@ -293,7 +297,7 @@
+ RETURN_FALSE;
+ }
+
+- xrange_module_storage *internalStorage = PHP_XRANGE_ZOS_GET;
++ internalStorage = PHP_XRANGE_ZOS_GET;
+
+ /* parse argument list */
+ internalStorage->step = 1.0; /* default */
+@@ -322,7 +326,7 @@
+ ) internalStorage->step *= -1;
+
+ /* calculate the total number of iterations before completion */
+- double iterations = fabs(
++ iterations = fabs(
+ (internalStorage->high - internalStorage->low) / internalStorage->step
+ );
+
+@@ -453,6 +457,7 @@
+ PHP_METHOD(PHP_XRANGE_ODDFILTERITERATOR_NAME, accept)
+ {
+ zval *currentValue;
++ int isOdd;
+
+ // method A: bypass getInnerIterator() call
+ spl_dual_it_object *intern =
+@@ -464,7 +469,7 @@
+ // TODO: method B - use getInnerIterator() w/ compilation option
+
+ if (Z_TYPE_P(currentValue) != IS_LONG) convert_to_long(currentValue);
+- int isOdd = Z_LVAL_P(currentValue) & 1;
++ isOdd = Z_LVAL_P(currentValue) & 1;
+
+ zval_ptr_dtor(&currentValue); /* clean-up */
+ RETURN_BOOL(isOdd);
+@@ -476,6 +481,7 @@
+ PHP_METHOD(PHP_XRANGE_EVENFILTERITERATOR_NAME, accept)
+ {
+ zval *currentValue;
++ int isEven;
+
+ /* method A: bypass getInnerIterator() call */
+ spl_dual_it_object *intern =
+@@ -487,7 +493,7 @@
+ /* TODO: method B - use getInnerIterator() w/ compilation option */
+
+ if (Z_TYPE_P(currentValue) != IS_LONG) convert_to_long(currentValue);
+- int isEven = !(Z_LVAL_P(currentValue) & 1);
++ isEven = !(Z_LVAL_P(currentValue) & 1);
+
+ zval_ptr_dtor(&currentValue); /* clean-up */
+ RETURN_BOOL(isEven);
+@@ -499,6 +505,7 @@
+ PHP_METHOD(PHP_XRANGE_NUMERICFILTERITERATOR_NAME, accept)
+ {
+ zval *currentValue;
++ int isNumeric;
+
+ /* method A: bypass getInnerIterator() call */
+ spl_dual_it_object *intern =
+@@ -509,8 +516,6 @@
+ );
+ /* TODO: method B - use getInnerIterator() w/ compilation option */
+
+- int isNumeric;
+-
+ /* this code comes from is_numeric() the implementation. it's here to
+ * to eliminate the overhead of a PHP function call. */
+ switch (Z_TYPE_P(currentValue)) {
diff --git a/dev-php/pecl-xrange/metadata.xml b/dev-php/pecl-xrange/metadata.xml
new file mode 100644
index 000000000000..b86acf66c756
--- /dev/null
+++ b/dev-php/pecl-xrange/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ <name>PHP</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/dev-php/pecl-xrange/pecl-xrange-1.3.2-r2.ebuild b/dev-php/pecl-xrange/pecl-xrange-1.3.2-r2.ebuild
new file mode 100644
index 000000000000..bc6d23e24b29
--- /dev/null
+++ b/dev-php/pecl-xrange/pecl-xrange-1.3.2-r2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PHP_EXT_NAME="xrange"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+
+USE_PHP="php5-6"
+
+inherit php-ext-pecl-r3
+
+KEYWORDS="~amd64 ~x86"
+
+DESCRIPTION="Implementation of weak references"
+LICENSE="PHP-3"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
+PATCHES=( "${FILESDIR}/1.3.2-fixes.patch" )
+PHP_EXT_ECONF_ARGS=()
diff --git a/dev-php/pecl-yaml-1.3.0 b/dev-php/pecl-yaml-1.3.0
deleted file mode 100644
index 5e513e026f86..000000000000
--- a/dev-php/pecl-yaml-1.3.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/libyaml-0.1.0 >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php5-6? ( dev-lang/php:5.6 )
-DESCRIPTION=YAML 1.1 (YAML Ain't Markup Language) serialization for PHP
-EAPI=6
-HOMEPAGE=https://pecl.php.net/yaml
-IUSE=php_targets_php7-0 php_targets_php5-6
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-PDEPEND=php_targets_php7-0? ( dev-php/pecl-yaml:7 )
-RDEPEND=>=dev-libs/libyaml-0.1.0 php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php5-6? ( dev-lang/php:5.6 )
-REQUIRED_USE=|| ( php_targets_php7-0 php_targets_php5-6 )
-SLOT=0
-SRC_URI=https://pecl.php.net/get/yaml-1.3.0.tgz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e php-ext-pecl-r3 a59741d3df8ea9f17afcdcfb7edaee6d php-ext-source-r3 63b281041baa106ff1ef59b602ca7e2a toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=220c1a94b7ef441bd7578da4bf5679c3
diff --git a/dev-php/pecl-yaml-1.3.1 b/dev-php/pecl-yaml-1.3.1
deleted file mode 100644
index 0011188ee5ee..000000000000
--- a/dev-php/pecl-yaml-1.3.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/libyaml-0.1.0 >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 ) php_targets_php5-6? ( dev-lang/php:5.6 )
-DESCRIPTION=YAML 1.1 (YAML Ain't Markup Language) serialization for PHP
-EAPI=6
-HOMEPAGE=https://pecl.php.net/yaml
-IUSE=php_targets_php7-0 php_targets_php7-1 php_targets_php7-2 php_targets_php5-6
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-PDEPEND=php_targets_php7-0? ( dev-php/pecl-yaml:7[php_targets_php7-0] ) php_targets_php7-1? ( dev-php/pecl-yaml:7[php_targets_php7-1] ) php_targets_php7-2? ( dev-php/pecl-yaml:7[php_targets_php7-2] )
-RDEPEND=>=dev-libs/libyaml-0.1.0 php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 ) php_targets_php5-6? ( dev-lang/php:5.6 )
-REQUIRED_USE=|| ( php_targets_php7-0 php_targets_php7-1 php_targets_php7-2 php_targets_php5-6 )
-SLOT=0
-SRC_URI=https://pecl.php.net/get/yaml-1.3.1.tgz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e php-ext-pecl-r3 a59741d3df8ea9f17afcdcfb7edaee6d php-ext-source-r3 63b281041baa106ff1ef59b602ca7e2a toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=c8bb42079506eb895737c64d80c91a08
diff --git a/dev-php/pecl-yaml-2.0.0 b/dev-php/pecl-yaml-2.0.0
deleted file mode 100644
index 69c742b800dc..000000000000
--- a/dev-php/pecl-yaml-2.0.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/libyaml-0.1.0 >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php5-6? ( dev-lang/php:5.6 )
-DESCRIPTION=YAML 1.1 (YAML Ain't Markup Language) serialization for PHP
-EAPI=6
-HOMEPAGE=https://pecl.php.net/yaml
-IUSE=php_targets_php7-0 php_targets_php5-6
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-libs/libyaml-0.1.0 php_targets_php5-6? ( dev-php/pecl-yaml:0[php_targets_php5-6] ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php5-6? ( dev-lang/php:5.6 )
-REQUIRED_USE=|| ( php_targets_php7-0 php_targets_php5-6 )
-SLOT=7
-SRC_URI=https://pecl.php.net/get/yaml-2.0.0.tgz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e php-ext-pecl-r3 a59741d3df8ea9f17afcdcfb7edaee6d php-ext-source-r3 63b281041baa106ff1ef59b602ca7e2a toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=a422cdede5883dc4d67613bc40181064
diff --git a/dev-php/pecl-yaml-2.0.2 b/dev-php/pecl-yaml-2.0.2
deleted file mode 100644
index e9ca5d6f7446..000000000000
--- a/dev-php/pecl-yaml-2.0.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/libyaml-0.1.0 >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 ) php_targets_php5-6? ( dev-lang/php:5.6 )
-DESCRIPTION=YAML 1.1 (YAML Ain't Markup Language) serialization for PHP
-EAPI=6
-HOMEPAGE=https://pecl.php.net/yaml
-IUSE=php_targets_php7-0 php_targets_php7-1 php_targets_php7-2 php_targets_php5-6
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-libs/libyaml-0.1.0 php_targets_php5-6? ( dev-php/pecl-yaml:0[php_targets_php5-6] ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 ) php_targets_php5-6? ( dev-lang/php:5.6 )
-REQUIRED_USE=|| ( php_targets_php7-0 php_targets_php7-1 php_targets_php7-2 php_targets_php5-6 )
-SLOT=7
-SRC_URI=https://pecl.php.net/get/yaml-2.0.2.tgz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e php-ext-pecl-r3 a59741d3df8ea9f17afcdcfb7edaee6d php-ext-source-r3 63b281041baa106ff1ef59b602ca7e2a toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=3c07088c241fec4afe08f1ea69b11c6d
diff --git a/dev-php/pecl-yaml/Manifest b/dev-php/pecl-yaml/Manifest
new file mode 100644
index 000000000000..bc846b721898
--- /dev/null
+++ b/dev-php/pecl-yaml/Manifest
@@ -0,0 +1,9 @@
+DIST yaml-1.3.0.tgz 37075 BLAKE2B 90fc101dc5b1d040efbbda481d28a862dd4021d09cf1853644db8769b04ca7c986a38758247b6e61dd38bdae31f995fef04f7b381d303b3914b8126806e99ce8 SHA512 60f54db7cd22ef1dc31cb5b31950a138e0bd2cc436f9e667aaa69ddceb4dcd7aeea9ecca9d424cb6822c2300b382de8f10c07403f80df749192820b27881d96a
+DIST yaml-1.3.1.tgz 37263 BLAKE2B 4be9dad710a4b7b2ea3ed8222500bbf2c94807b1bed627c1460beb31b5745c1dd5484fed11d23bb7deec454fcbb5d88a93034c82f7fe978e6cbb26944c9f7c4f SHA512 67359e6b8d5b19ad594acd741dfb53006079fbdbdb7c3402be57c006f45c992158c505ad2bf0c52a1b997c9b9fac48724b1a44fc5744689b0f02b308324a4a4f
+DIST yaml-2.0.0.tgz 37960 BLAKE2B df325cb73c4788a3022661e841c9ab479a103bcee76d4f911d2ba673d7fa7344006d8ba9a22aed3a701accee49593d524ee506052ac30231f02463c34d7b51e9 SHA512 760c9f9f5738594e3ad55c030fa619bc891e1d5a8feb85bec2389e2fd4d6d4933fd13abf68c85eb1bb4cc3b6f4a66079ea75a2046c47fe4095b01a50c8e65eab
+DIST yaml-2.0.2.tgz 38495 BLAKE2B c992c72b7ba84ca3d953109a9d274c7c3b203f3ce75630860f40a43a565e9ffd92f1d831e386624351879598ee305a64cb3b4228eccfa58b4bf1db76f994cab9 SHA512 b3dd2098826cd7cdcfd1e5d97b9015de66812dc90e506e74a4a50a56afed5f9de0449465bb807a36a13170f479897cc62a9b108653aa7eb81895abd5966bde1a
+EBUILD pecl-yaml-1.3.0.ebuild 843 BLAKE2B 481ca5f3e246f42f6b3beb3bdac479c86ebc13309f82914eb374d50fd51f5b45327efd71cbd053a7e0f79d6714537fc31bca39231d9e5f223e964ac17a6b61de SHA512 90520c8e294d98b0f5081b5b13b12d16e96920f5726d39a0da703b5c50d725be1a8cca7e138f998aaaf58950f5c53dc32fd79b5c80f95773716021cad2a26700
+EBUILD pecl-yaml-1.3.1.ebuild 1010 BLAKE2B 7a0510d95b887c6fb53f0d7c8e48775671c15380bdb8835e36f6dba68fed82e1fc1e1e4a5d2bc10968f89bdbc72678f0d8113c9ded4313b02ae211c99eae48ff SHA512 ddd9a554be36a50ad40197b15b3851505311a5d7946936dda2dc427f79d2e7dcc5dfbbc15e55301676c00c5fb21ab2d71ee56bed63d03a8e57695e7b3ece5ee7
+EBUILD pecl-yaml-2.0.0.ebuild 851 BLAKE2B 7985abf810e41d6724e694c079410bea56f60dd68a655d76e9aa31fb7ca8ff07380984a2ce928b3e24d68304560bf7721a759d03bd0ee4ad0d3242be53eb75e3 SHA512 094aace10ba13de4dfdb15872ae454797fe582a32074f4f2612a3cbf5d8e7b3129b615560c5a0eb4d9970a9012003a19fd2f6b8bcf989cb85659744b2af634ee
+EBUILD pecl-yaml-2.0.2.ebuild 983 BLAKE2B e9ec310ecf527f7e962c8773fc1e759aea2f65f53c4eed0ec147e6b92d8a58b3761bfeb8800cb0602487ae40e2d42c61fc10eac8655dcaa6a0fed93fc41309a1 SHA512 16d5d58753e7a6ff02fc561ee45f90deeaed89c88f2d3b6ad2971e96c0c1066f3bed30c8fa0bab6c5de2ea4b590234f2fc54427addb0555f41edeb25778753f7
+MISC metadata.xml 238 BLAKE2B 1bb4abee8d968b36a69efa8f634c2d2e4422f5ac0611f123cf9794f1784e155a16cfd98ee209c16a745a58ddfa85d134c68a22bb5bde264c35ea285caa2d4d9a SHA512 560ff28e3776267c429b8d553d2dfc8991fa8d5845af5937c46ec68674d2b3c5cb922e557f43fcba113a70d4b3b5a32f39fc1fbed38de5781c7504fd526430cc
diff --git a/dev-php/pecl-yaml/metadata.xml b/dev-php/pecl-yaml/metadata.xml
new file mode 100644
index 000000000000..749b4249f16e
--- /dev/null
+++ b/dev-php/pecl-yaml/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ <name>PHP</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/dev-php/pecl-yaml/pecl-yaml-1.3.0.ebuild b/dev-php/pecl-yaml/pecl-yaml-1.3.0.ebuild
new file mode 100644
index 000000000000..a09636e5e61d
--- /dev/null
+++ b/dev-php/pecl-yaml/pecl-yaml-1.3.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PV="${PV/_beta/b}"
+PHP_EXT_PECL_FILENAME="yaml-${MY_PV}.tgz"
+PHP_EXT_NAME="yaml"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+DOCS=( CREDITS README )
+
+USE_PHP="php7-0 php5-6"
+
+inherit php-ext-pecl-r3
+
+USE_PHP="php5-6"
+
+S="${WORKDIR}/yaml-${MY_PV}"
+PHP_EXT_S="${S}"
+
+KEYWORDS="~amd64 ~x86"
+
+DESCRIPTION="YAML 1.1 (YAML Ain't Markup Language) serialization for PHP"
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+
+DEPEND=">=dev-libs/libyaml-0.1.0"
+RDEPEND="${DEPEND}"
+PDEPEND="php_targets_php7-0? ( dev-php/pecl-yaml:7 )"
+PHP_EXT_ECONF_ARGS=""
+
+src_prepare() {
+ if use php_targets_php5-6 ; then
+ php-ext-source-r3_src_prepare
+ else
+ default_src_prepare
+ fi
+}
+
+src_install() {
+ if use php_targets_php5-6 ; then
+ php-ext-pecl-r3_src_install
+ fi
+}
diff --git a/dev-php/pecl-yaml/pecl-yaml-1.3.1.ebuild b/dev-php/pecl-yaml/pecl-yaml-1.3.1.ebuild
new file mode 100644
index 000000000000..b8e538af44ba
--- /dev/null
+++ b/dev-php/pecl-yaml/pecl-yaml-1.3.1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PV="${PV/_beta/b}"
+PHP_EXT_PECL_FILENAME="yaml-${MY_PV}.tgz"
+PHP_EXT_NAME="yaml"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+DOCS=( CREDITS README )
+
+USE_PHP="php7-0 php7-1 php7-2 php5-6"
+
+inherit php-ext-pecl-r3
+
+USE_PHP="php5-6"
+
+S="${WORKDIR}/yaml-${MY_PV}"
+PHP_EXT_S="${S}"
+
+KEYWORDS="~amd64 ~x86"
+
+DESCRIPTION="YAML 1.1 (YAML Ain't Markup Language) serialization for PHP"
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+
+DEPEND=">=dev-libs/libyaml-0.1.0"
+RDEPEND="${DEPEND}"
+PDEPEND="
+ php_targets_php7-0? ( dev-php/pecl-yaml:7[php_targets_php7-0] )
+ php_targets_php7-1? ( dev-php/pecl-yaml:7[php_targets_php7-1] )
+ php_targets_php7-2? ( dev-php/pecl-yaml:7[php_targets_php7-2] )
+"
+PHP_EXT_ECONF_ARGS=""
+
+src_prepare() {
+ if use php_targets_php5-6 ; then
+ php-ext-source-r3_src_prepare
+ else
+ default_src_prepare
+ fi
+}
+
+src_install() {
+ if use php_targets_php5-6 ; then
+ php-ext-pecl-r3_src_install
+ fi
+}
diff --git a/dev-php/pecl-yaml/pecl-yaml-2.0.0.ebuild b/dev-php/pecl-yaml/pecl-yaml-2.0.0.ebuild
new file mode 100644
index 000000000000..cb318ec1f047
--- /dev/null
+++ b/dev-php/pecl-yaml/pecl-yaml-2.0.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PV="${PV/_rc/RC}"
+PHP_EXT_PECL_FILENAME="yaml-${MY_PV}.tgz"
+PHP_EXT_NAME="yaml"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+DOCS=( CREDITS README )
+
+USE_PHP="php7-0 php5-6"
+
+inherit php-ext-pecl-r3
+
+S="${WORKDIR}/yaml-${MY_PV}"
+PHP_EXT_S="${S}"
+USE_PHP="php7-0"
+
+KEYWORDS="~amd64 ~x86"
+
+DESCRIPTION="YAML 1.1 (YAML Ain't Markup Language) serialization for PHP"
+LICENSE="MIT"
+SLOT="7"
+IUSE=""
+
+DEPEND=">=dev-libs/libyaml-0.1.0"
+RDEPEND="${DEPEND} php_targets_php5-6? ( dev-php/pecl-yaml:0[php_targets_php5-6] )"
+PHP_EXT_ECONF_ARGS=""
+
+src_prepare() {
+ if use php_targets_php7-0 ; then
+ php-ext-source-r3_src_prepare
+ else
+ default_src_prepare
+ fi
+}
+
+src_install() {
+ if use php_targets_php7-0 ; then
+ php-ext-pecl-r3_src_install
+ fi
+}
diff --git a/dev-php/pecl-yaml/pecl-yaml-2.0.2.ebuild b/dev-php/pecl-yaml/pecl-yaml-2.0.2.ebuild
new file mode 100644
index 000000000000..bcd73c631481
--- /dev/null
+++ b/dev-php/pecl-yaml/pecl-yaml-2.0.2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PV="${PV/_rc/RC}"
+PHP_EXT_PECL_FILENAME="yaml-${MY_PV}.tgz"
+PHP_EXT_NAME="yaml"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+DOCS=( CREDITS README )
+
+USE_PHP="php7-0 php7-1 php7-2 php5-6"
+
+inherit php-ext-pecl-r3
+
+S="${WORKDIR}/yaml-${MY_PV}"
+PHP_EXT_S="${S}"
+USE_PHP="php7-0 php7-1 php7-2"
+
+KEYWORDS="~amd64 ~x86"
+
+DESCRIPTION="YAML 1.1 (YAML Ain't Markup Language) serialization for PHP"
+LICENSE="MIT"
+SLOT="7"
+IUSE=""
+
+DEPEND=">=dev-libs/libyaml-0.1.0"
+RDEPEND="${DEPEND} php_targets_php5-6? ( dev-php/pecl-yaml:0[php_targets_php5-6] )"
+PHP_EXT_ECONF_ARGS=""
+
+src_prepare() {
+ if use php_targets_php7-0 || use php_targets_php7-1 || use php_targets_php7-2 ; then
+ php-ext-source-r3_src_prepare
+ else
+ default_src_prepare
+ fi
+}
+
+src_install() {
+ if use php_targets_php7-0 || use php_targets_php7-1 || use php_targets_php7-2 ; then
+ php-ext-pecl-r3_src_install
+ fi
+}
diff --git a/dev-php/pecl-yaz-1.2.1 b/dev-php/pecl-yaz-1.2.1
deleted file mode 100644
index 124949c62194..000000000000
--- a/dev-php/pecl-yaz-1.2.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/yaz-3.0.2:0= >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php5-6? ( dev-lang/php:5.6 )
-DESCRIPTION=This extension implements a Z39.50 client for PHP using the YAZ toolkit
-EAPI=6
-HOMEPAGE=https://pecl.php.net/yaz
-IUSE=php_targets_php7-0 php_targets_php5-6
-KEYWORDS=alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86
-LICENSE=BSD
-RDEPEND=>=dev-libs/yaz-3.0.2:0= php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php5-6? ( dev-lang/php:5.6 )
-REQUIRED_USE=|| ( php_targets_php7-0 php_targets_php5-6 )
-SLOT=0
-SRC_URI=https://pecl.php.net/get/yaz-1.2.1.tgz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e php-ext-pecl-r3 a59741d3df8ea9f17afcdcfb7edaee6d php-ext-source-r3 63b281041baa106ff1ef59b602ca7e2a toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=6f6788e82f8fb376f9d561b1fad3b57a
diff --git a/dev-php/pecl-yaz-1.2.2-r1 b/dev-php/pecl-yaz-1.2.2-r1
deleted file mode 100644
index a435bc9bcc78..000000000000
--- a/dev-php/pecl-yaz-1.2.2-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/yaz-3.0.2:0= >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 )
-DESCRIPTION=This extension implements a Z39.50 client for PHP using the YAZ toolkit
-EAPI=6
-HOMEPAGE=https://pecl.php.net/yaz
-IUSE=php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=BSD
-RDEPEND=>=dev-libs/yaz-3.0.2:0= php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 )
-REQUIRED_USE=|| ( php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2 )
-SLOT=0
-SRC_URI=https://pecl.php.net/get/yaz-1.2.2.tgz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e php-ext-pecl-r3 a59741d3df8ea9f17afcdcfb7edaee6d php-ext-source-r3 63b281041baa106ff1ef59b602ca7e2a toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=1d38351f38cbb241c9e56a2be83274b3
diff --git a/dev-php/pecl-yaz/Manifest b/dev-php/pecl-yaz/Manifest
new file mode 100644
index 000000000000..43d751293ed6
--- /dev/null
+++ b/dev-php/pecl-yaz/Manifest
@@ -0,0 +1,5 @@
+DIST yaz-1.2.1.tgz 20147 BLAKE2B fa6c4b8d8d55ff734093950d1ddd2f24375aacce9d34e52680925874dafed5b0be769cb5768f02d89af573c7a1d5f1aa8290bff2cbd1c8a23a5de011bebd930a SHA512 92525e485e5499f8b4ef8b1e9b21a3fa7004206f545a3a5b300ee11e3c5ff10d335645d5c42fe3b7523a55fe58ffb0a671c67dfc627bc4bd36aeab63dfe42bf1
+DIST yaz-1.2.2.tgz 20131 BLAKE2B 7aa0729ba6033870099ed7c0d4961eac02d74d5aed6c7a58c0ccf59f57401cd7b438594c388ffc7c7b9d73cfc9f1c466c718ad685cc638651a9ac4e605b38ed5 SHA512 cb90d4ac9fcdadcb9215f7b795657dd3fdff69f2b2d399beb2afa6327a0be733d2a563863e2ca861182eadcc2faccfbe64e72d108662afc68d393a6bc5cc4bb2
+EBUILD pecl-yaz-1.2.1.ebuild 522 BLAKE2B 162fa067a1c7c9d2ed34612b5133513e7260d4f5fc3f06de16e11a4a37f30d86b22b80fc952aea8480f3007811baa7968b48d674f00d1e2fc7c3abc1a47fbae9 SHA512 80156ddce79ffa8a460fec70c99cbc68681cd4204ac6f0e18b40521ba17d81d2b4c0da6d162debb3070eb2d4477902203b431692d43a26037232a3424be54910
+EBUILD pecl-yaz-1.2.2-r1.ebuild 541 BLAKE2B 0e232da1bc871c8a77fa6256e5ab6e6d7670ceba6fb78e7b9d4aa07ec9b239727c7ceb8b8792f1321d94384854fc9ce438c5039619686a978bf112227f53c6e5 SHA512 93e618f7415e8785799215fd4222870167a90b306a632e5a5ee7bc7e59b8dca8b0eaecab56d70572f474c6bcc275d96e3357d4f40208345b3724a6530bc4b603
+MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/pecl-yaz/metadata.xml b/dev-php/pecl-yaz/metadata.xml
new file mode 100644
index 000000000000..b86acf66c756
--- /dev/null
+++ b/dev-php/pecl-yaz/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ <name>PHP</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/dev-php/pecl-yaz/pecl-yaz-1.2.1.ebuild b/dev-php/pecl-yaz/pecl-yaz-1.2.1.ebuild
new file mode 100644
index 000000000000..bc9e07448519
--- /dev/null
+++ b/dev-php/pecl-yaz/pecl-yaz-1.2.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PHP_EXT_NAME="yaz"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+DOCS=( README )
+
+USE_PHP="php7-0 php5-6"
+
+inherit php-ext-pecl-r3
+
+KEYWORDS="alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~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}"
+
+PHP_EXT_ECONF_ARGS="--with-yaz=/usr"
diff --git a/dev-php/pecl-yaz/pecl-yaz-1.2.2-r1.ebuild b/dev-php/pecl-yaz/pecl-yaz-1.2.2-r1.ebuild
new file mode 100644
index 000000000000..aa7a51a8b8ad
--- /dev/null
+++ b/dev-php/pecl-yaz/pecl-yaz-1.2.2-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PHP_EXT_NAME="yaz"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+DOCS=( README )
+
+USE_PHP="php5-6 php7-0 php7-1 php7-2"
+
+inherit php-ext-pecl-r3
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+
+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}"
+
+PHP_EXT_ECONF_ARGS="--with-yaz=/usr"
diff --git a/dev-php/pecl-zmq-1.1.3-r1 b/dev-php/pecl-zmq-1.1.3-r1
deleted file mode 100644
index 96903f97ac91..000000000000
--- a/dev-php/pecl-zmq-1.1.3-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=net-libs/zeromq czmq? ( <net-libs/czmq-3 ) virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 )
-DESCRIPTION=PHP Bindings for ZeroMQ messaging
-EAPI=6
-HOMEPAGE=https://pecl.php.net/zmq
-IUSE=czmq php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=net-libs/zeromq czmq? ( <net-libs/czmq-3 ) php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 )
-REQUIRED_USE=|| ( php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2 )
-SLOT=0
-SRC_URI=https://pecl.php.net/get/zmq-1.1.3.tgz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e php-ext-pecl-r3 a59741d3df8ea9f17afcdcfb7edaee6d php-ext-source-r3 63b281041baa106ff1ef59b602ca7e2a toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=68036c3f673dccf1c8b47a3362f6b6eb
diff --git a/dev-php/pecl-zmq-9999 b/dev-php/pecl-zmq-9999
deleted file mode 100644
index ad5c05702204..000000000000
--- a/dev-php/pecl-zmq-9999
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=net-libs/zeromq czmq? ( <net-libs/czmq-3 ) virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 ) >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=PHP Bindings for ZeroMQ messaging
-EAPI=6
-HOMEPAGE=https://pecl.php.net/zmq
-IUSE=czmq php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2
-LICENSE=BSD
-RDEPEND=net-libs/zeromq czmq? ( <net-libs/czmq-3 ) php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 )
-REQUIRED_USE=|| ( php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2 )
-SLOT=0
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 git-r3 8f6de46b0aa318aea0e8cac62ece098b libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e php-ext-pecl-r3 a59741d3df8ea9f17afcdcfb7edaee6d php-ext-source-r3 63b281041baa106ff1ef59b602ca7e2a toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=27e1e917d800fc7e0e95500c4c1b6d13
diff --git a/dev-php/pecl-zmq/Manifest b/dev-php/pecl-zmq/Manifest
new file mode 100644
index 000000000000..c096fb1c065c
--- /dev/null
+++ b/dev-php/pecl-zmq/Manifest
@@ -0,0 +1,4 @@
+DIST zmq-1.1.3.tgz 82397 BLAKE2B 5c221abf614bcc33c4c69e64308508d544f790371549c421fe2fcdedd67f2e843b2b82d96f517ea9413ffedd128838725e9afc18f0d4048b270d4982571874d0 SHA512 0f03016e315a6c6a1e1d6eca1e20564834d2a924cef06af1b38693933f1e5a094c37e9c432705a64f61d95e82655f61358fc7783e7a6f06c7dd9ad84fc6f7bbc
+EBUILD pecl-zmq-1.1.3-r1.ebuild 480 BLAKE2B 93811446ab4f8a932491441f33a5a7766c36d9c95de8bd8616e5e35a57e702a01862cf0cee3c6834a3767110d68e7573c8eacbd8fd3d812fca814c919aeecdf3 SHA512 f7a9f300d5869334ea00e7cef1747420ebd5941aab24dd522e7061d6ab9f79d81cb8504a01de6165b2927aae787fe588ff6a35cf13c4680fd717d72d19201954
+EBUILD pecl-zmq-9999.ebuild 577 BLAKE2B 4182d8b9a05520ca0790a381f72dc73496e5b315bef721c43415aeb137a79525917acf2990778c42d202118eef84e8465c8e45b7af12325f31ca3064f397ee07 SHA512 2626d87bb6ceb4f56c6185c8e2b3c54c164faeb8e9e21af61d8cdd34b5b64d05032731772f3c1f2343c4c7e5722db9b6133b91d51d0ff17f3f0661c85d3bf4c7
+MISC metadata.xml 314 BLAKE2B 91b4ef1c9615ad2dac01ed638378dc0de90a173047cab6f9ec0875bbd66b97c8c6442a305ef7ff9791a5ccc67ec789440a26b3e65b05b3b76052cb8ba06c39db SHA512 40085d291b0f504d6253df236db0e3d3a0886e9a49b39330130c9578e25290cb11aba524b383186ee72c60f2adb0cea18d27bf3523d7651ba5f711f5cc2b1853
diff --git a/dev-php/pecl-zmq/metadata.xml b/dev-php/pecl-zmq/metadata.xml
new file mode 100644
index 000000000000..0a03180aed3b
--- /dev/null
+++ b/dev-php/pecl-zmq/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ <name>PHP</name>
+ </maintainer>
+ <use>
+ <flag name="czmq">Use the czmq high level bindings</flag>
+ </use>
+</pkgmetadata>
diff --git a/dev-php/pecl-zmq/pecl-zmq-1.1.3-r1.ebuild b/dev-php/pecl-zmq/pecl-zmq-1.1.3-r1.ebuild
new file mode 100644
index 000000000000..f11a7b1e8df9
--- /dev/null
+++ b/dev-php/pecl-zmq/pecl-zmq-1.1.3-r1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_PHP="php5-6 php7-0 php7-1 php7-2"
+
+inherit php-ext-pecl-r3
+
+KEYWORDS="~amd64 ~x86"
+
+DESCRIPTION="PHP Bindings for ZeroMQ messaging"
+LICENSE="BSD"
+SLOT="0"
+IUSE="czmq"
+
+RDEPEND="net-libs/zeromq czmq? ( <net-libs/czmq-3 )"
+DEPEND="${RDEPEND} virtual/pkgconfig"
+
+src_configure() {
+ local PHP_EXT_ECONF_ARGS=( $(use_with czmq) )
+ php-ext-source-r3_src_configure
+}
diff --git a/dev-php/pecl-zmq/pecl-zmq-9999.ebuild b/dev-php/pecl-zmq/pecl-zmq-9999.ebuild
new file mode 100644
index 000000000000..0045fcc8b0a7
--- /dev/null
+++ b/dev-php/pecl-zmq/pecl-zmq-9999.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_PHP="php5-6 php7-0 php7-1 php7-2"
+
+inherit php-ext-pecl-r3 git-r3
+
+KEYWORDS=""
+
+DESCRIPTION="PHP Bindings for ZeroMQ messaging"
+LICENSE="BSD"
+SLOT="0"
+IUSE="czmq"
+
+RDEPEND="net-libs/zeromq czmq? ( <net-libs/czmq-3 )"
+DEPEND="${RDEPEND} virtual/pkgconfig"
+SRC_URI=""
+EGIT_REPO_URI="https://github.com/mkoppanen/php-zmq.git"
+EGIT_CHECKOUT_DIR="${PHP_EXT_S}"
+
+src_configure() {
+ local PHP_EXT_ECONF_ARGS=( $(use_with czmq) )
+ php-ext-source-r3_src_configure
+}
diff --git a/dev-php/phar-io-manifest-1.0.1 b/dev-php/phar-io-manifest-1.0.1
deleted file mode 100644
index d3922f85ed08..000000000000
--- a/dev-php/phar-io-manifest-1.0.1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Reading phar.io manifest information from a PHP Archive (PHAR)
-EAPI=6
-HOMEPAGE=https://github.com/phar-io/manifest
-IUSE=examples
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=BSD
-RDEPEND=dev-php/fedora-autoloader dev-php/phar-io-version dev-lang/php:*[phar]
-SLOT=0
-SRC_URI=https://github.com/phar-io/manifest/archive/1.0.1.tar.gz -> phar-io-manifest-1.0.1.tar.gz
-_md5_=1d0c8ccd24fcc1b7486ef613540d284d
diff --git a/dev-php/phar-io-manifest/Manifest b/dev-php/phar-io-manifest/Manifest
new file mode 100644
index 000000000000..0cdafb6e72cf
--- /dev/null
+++ b/dev-php/phar-io-manifest/Manifest
@@ -0,0 +1,4 @@
+AUX autoload.php 3913 BLAKE2B a3c8a3b75e2b150157892bc8ea168e7c60e5cef95cdee1279579a4b1efd4a4647bb5ec22f272575342d8945674fce048b1a091cd48977cdc77a975668c3a0849 SHA512 d43f3a726eb79ee88e674ac0ec3fb4d175ac0041b96638e4d2a40a47720ebd3a983cd36dd943fff9c0220dda68549361628636e94f595b0601d6eddf2b937fe6
+DIST phar-io-manifest-1.0.1.tar.gz 21403 BLAKE2B 0f18d94d127ec54914cb60756fd3e75c2d13ec593b7101735e385e4515abf4da0f03ef94d0bbbfaee02f348309525504f5e99e150a68b0d0fcd2129ccade4541 SHA512 3e4dd7ddd6de0a9f70595d0d8a6721782d2584526d3d4649cf0338ab36f106798daf4b7dcbf5bd972893a1569b622e4217212e5812b14e4bf3f698504f4d2228
+EBUILD phar-io-manifest-1.0.1.ebuild 690 BLAKE2B b6bd099ec1e2f0a60c2f2290bcfa2a8bdb95e48d6caa396f027a715f2b7a3d527a8e49520e79baac0c3781160819ea864c336e3169877f99a1c01ba7aa7fc253 SHA512 1bd0b6cdb2d85a41191defdf180fac23d4004ad21080553165b4519479b7b810011cf10cd8c0c19881b6eaf5f5290eed9d6b66445933ccdb4b8b1423eb92b692
+MISC metadata.xml 320 BLAKE2B 2a537b76317bec0310e9c6912562d75b512f00dae3ae411aff048a15e7b0986328699427135dedeb990f3f64f3b4b012e139349c5c082a7ba4c6447ce7b68143 SHA512 7ddc7f302bdafae9be276682a0c57125beeb45a9b96afd3fa1662cb699b95c96c36151ab91027e890c33054bd735ae250667292552ea20397587e6f547ad5aa6
diff --git a/dev-php/phar-io-manifest/files/autoload.php b/dev-php/phar-io-manifest/files/autoload.php
new file mode 100644
index 000000000000..f604d8b1f924
--- /dev/null
+++ b/dev-php/phar-io-manifest/files/autoload.php
@@ -0,0 +1,62 @@
+<?php
+
+require_once 'Fedora/Autoloader/autoload.php';
+
+\Fedora\Autoloader\Autoload::addClassMap(
+ [
+ 'phario\\manifest\\manifestdocumentmapper' => '/ManifestDocumentMapper.php',
+ 'phario\\manifest\\manifestloader' => '/ManifestLoader.php',
+ 'phario\\manifest\\manifestserializer' => '/ManifestSerializer.php',
+ 'phario\\manifest\\exception' => '/exceptions/Exception.php',
+ 'phario\\manifest\\invalidapplicationnameexception' => '/exceptions/InvalidApplicationNameException.php',
+ 'phario\\manifest\\invalidemailexception' => '/exceptions/InvalidEmailException.php',
+ 'phario\\manifest\\invalidurlexception' => '/exceptions/InvalidUrlException.php',
+ 'phario\\manifest\\manifestdocumentexception' => '/exceptions/ManifestDocumentException.php',
+ 'phario\\manifest\\manifestdocumentmapperexception' => '/exceptions/ManifestDocumentMapperException.php',
+ 'phario\\manifest\\manifestelementexception' => '/exceptions/ManifestElementException.php',
+ 'phario\\manifest\\manifestloaderexception' => '/exceptions/ManifestLoaderException.php',
+ 'phario\\manifest\\application' => '/values/Application.php',
+ 'phario\\manifest\\applicationname' => '/values/ApplicationName.php',
+ 'phario\\manifest\\author' => '/values/Author.php',
+ 'phario\\manifest\\authorcollection' => '/values/AuthorCollection.php',
+ 'phario\\manifest\\authorcollectioniterator' => '/values/AuthorCollectionIterator.php',
+ 'phario\\manifest\\bundledcomponent' => '/values/BundledComponent.php',
+ 'phario\\manifest\\bundledcomponentcollection' => '/values/BundledComponentCollection.php',
+ 'phario\\manifest\\bundledcomponentcollectioniterator' => '/values/BundledComponentCollectionIterator.php',
+ 'phario\\manifest\\copyrightinformation' => '/values/CopyrightInformation.php',
+ 'phario\\manifest\\email' => '/values/Email.php',
+ 'phario\\manifest\\extension' => '/values/Extension.php',
+ 'phario\\manifest\\library' => '/values/Library.php',
+ 'phario\\manifest\\license' => '/values/License.php',
+ 'phario\\manifest\\manifest' => '/values/Manifest.php',
+ 'phario\\manifest\\phpextensionrequirement' => '/values/PhpExtensionRequirement.php',
+ 'phario\\manifest\\phpversionrequirement' => '/values/PhpVersionRequirement.php',
+ 'phario\\manifest\\requirement' => '/values/Requirement.php',
+ 'phario\\manifest\\requirementcollection' => '/values/RequirementCollection.php',
+ 'phario\\manifest\\requirementcollectioniterator' => '/values/RequirementCollectionIterator.php',
+ 'phario\\manifest\\type' => '/values/Type.php',
+ 'phario\\manifest\\url' => '/values/Url.php',
+ 'phario\\manifest\\authorelement' => '/xml/AuthorElement.php',
+ 'phario\\manifest\\authorelementcollection' => '/xml/AuthorElementCollection.php',
+ 'phario\\manifest\\bundleselement' => '/xml/BundlesElement.php',
+ 'phario\\manifest\\componentelement' => '/xml/ComponentElement.php',
+ 'phario\\manifest\\componentelementcollection' => '/xml/ComponentElementCollection.php',
+ 'phario\\manifest\\containselement' => '/xml/ContainsElement.php',
+ 'phario\\manifest\\copyrightelement' => '/xml/CopyrightElement.php',
+ 'phario\\manifest\\elementcollection' => '/xml/ElementCollection.php',
+ 'phario\\manifest\\extelement' => '/xml/ExtElement.php',
+ 'phario\\manifest\\extelementcollection' => '/xml/ExtElementCollection.php',
+ 'phario\\manifest\\extensionelement' => '/xml/ExtensionElement.php',
+ 'phario\\manifest\\licenseelement' => '/xml/LicenseElement.php',
+ 'phario\\manifest\\manifestdocument' => '/xml/ManifestDocument.php',
+ 'phario\\manifest\\manifestdocumentloadingexception' => '/xml/ManifestDocumentLoadingException.php',
+ 'phario\\manifest\\manifestelement' => '/xml/ManifestElement.php',
+ 'phario\\manifest\\phpelement' => '/xml/PhpElement.php',
+ 'phario\\manifest\\requireselement' => '/xml/RequiresElement.php',
+ ],
+ __DIR__
+);
+
+\Fedora\Autoloader\Dependencies::required([
+ '/usr/share/php/PharIo/Version/autoload.php'
+]);
diff --git a/dev-php/phar-io-manifest/metadata.xml b/dev-php/phar-io-manifest/metadata.xml
new file mode 100644
index 000000000000..622fae9de476
--- /dev/null
+++ b/dev-php/phar-io-manifest/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://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">phar-io/manifest</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-php/phar-io-manifest/phar-io-manifest-1.0.1.ebuild b/dev-php/phar-io-manifest/phar-io-manifest-1.0.1.ebuild
new file mode 100644
index 000000000000..c70be9f4ebe4
--- /dev/null
+++ b/dev-php/phar-io-manifest/phar-io-manifest-1.0.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Reading phar.io manifest information from a PHP Archive (PHAR)"
+HOMEPAGE="https://github.com/phar-io/manifest"
+SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="examples"
+
+S="${WORKDIR}/manifest-${PV}"
+
+RDEPEND="dev-php/fedora-autoloader
+ dev-php/phar-io-version
+ dev-lang/php:*[phar]"
+
+src_install() {
+ insinto /usr/share/php/PharIo/Manifest
+ doins -r src/*
+ doins "${FILESDIR}/autoload.php"
+ dodoc README.md
+ use examples && dodoc -r examples
+}
diff --git a/dev-php/phar-io-version-1.0.1 b/dev-php/phar-io-version-1.0.1
deleted file mode 100644
index df3a03e5befb..000000000000
--- a/dev-php/phar-io-version-1.0.1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Library for handling version information and constraints
-EAPI=6
-HOMEPAGE=https://github.com/phar-io/version
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=BSD
-RDEPEND=dev-php/fedora-autoloader dev-lang/php:*
-SLOT=0
-SRC_URI=https://github.com/phar-io/version/archive/1.0.1.tar.gz -> phar-io-version-1.0.1.tar.gz
-_md5_=23f9d230584af3e711404a4a9b3871ef
diff --git a/dev-php/phar-io-version/Manifest b/dev-php/phar-io-version/Manifest
new file mode 100644
index 000000000000..dfda2a28e7e5
--- /dev/null
+++ b/dev-php/phar-io-version/Manifest
@@ -0,0 +1,4 @@
+AUX autoload.php 168 BLAKE2B 8a0af6dc727f5f2fb7d43beda5e7d83bf5879117b4017ca3467d7f5da2e76dd50e58260ee0c3dd043a2da04693cca0fde4f1124aab317ef52cbc3855bd305683 SHA512 d02b31090ab4b2efe92ed0243c4a877a4a0731fc65fc7dd688087b08b3ced80c33570d9f081829354b35612e80b22f28df14cb35faad7466f925aa1c523f7404
+DIST phar-io-version-1.0.1.tar.gz 8686 BLAKE2B 2cb7208f24ebce981b1b487170d8f07fd43c6dc53782e2797c3172736255e29863aa832d8e63f59e9f941fc154a1e3ebc6452437641f92521f84ddfdf2d3e6ec SHA512 c3bd6e7426bbac99c2b7028d86429f954daafebb7aea3c969305035ce5fc98c3d718f34efbf36658442bb4f60518dbb8217c314f2a3afd429e037120cc7428d9
+EBUILD phar-io-version-1.0.1.ebuild 608 BLAKE2B 59c9d1d45bef023a078b225e84ad17a3a32d199899c81088b354d0a394055438b7530ec80585e35f59bd5ba98969d84c1767ec6299e7b2b0386c04220a296259 SHA512 c2f2592d011a7d051c5cd4a1734dbd421e64107451122f0e5d83b1211bb931ed15a54fdbed88b0e596de0458c9d1a065fcf573492e6e49affb5061ed7aa2b9b5
+MISC metadata.xml 319 BLAKE2B 7b19dcdee79f5b221681a56499a5b1a088bb6b8bb1b98d4c38a0d9c65212f26cc9fc8e830ed60eb077b9804b9d9d8cf3033ef809ebbb4de14b23507d8ca9e1c3 SHA512 c229ce6bba2b1abd6e744e26e8d9f4653ee53567d6eee13fb2b2b485db84963a121349fd9a26c5c89c63e52545605903a3d066bce5aed1ab17ed75d57bf96b11
diff --git a/dev-php/phar-io-version/files/autoload.php b/dev-php/phar-io-version/files/autoload.php
new file mode 100644
index 000000000000..0036ced557a9
--- /dev/null
+++ b/dev-php/phar-io-version/files/autoload.php
@@ -0,0 +1,6 @@
+<?php
+/* Autoloader for dev-php/phar-io-version */
+
+require_once 'Fedora/Autoloader/autoload.php';
+
+\Fedora\Autoloader\Autoload::addPsr4('PharIo\\Version\\', __DIR__);
diff --git a/dev-php/phar-io-version/metadata.xml b/dev-php/phar-io-version/metadata.xml
new file mode 100644
index 000000000000..49b1640723c4
--- /dev/null
+++ b/dev-php/phar-io-version/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://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">phar-io/version</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-php/phar-io-version/phar-io-version-1.0.1.ebuild b/dev-php/phar-io-version/phar-io-version-1.0.1.ebuild
new file mode 100644
index 000000000000..6a4c90ec3d51
--- /dev/null
+++ b/dev-php/phar-io-version/phar-io-version-1.0.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Library for handling version information and constraints"
+HOMEPAGE="https://github.com/phar-io/version"
+SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE=""
+
+S="${WORKDIR}/version-${PV}"
+
+RDEPEND="dev-php/fedora-autoloader
+ dev-lang/php:*"
+
+src_install() {
+ insinto /usr/share/php/PharIo/Version
+ doins src/*.php
+ doins "${FILESDIR}/autoload.php"
+ dodoc README.md
+}
diff --git a/dev-php/phar-utils-1.0.0 b/dev-php/phar-utils-1.0.0
deleted file mode 100644
index 9c23fe25e2ee..000000000000
--- a/dev-php/phar-utils-1.0.0
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=PHAR file format utilities, for when PHP phars you up
-EAPI=6
-HOMEPAGE=https://github.com/Seldaek/phar-utils
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-lang/php:*[phar] dev-php/fedora-autoloader
-SLOT=0
-SRC_URI=https://github.com/Seldaek/phar-utils/archive/1.0.0.tar.gz -> phar-utils-1.0.0.tar.gz
-_md5_=5a4df9476fdeb500f71ead810d60d97b
diff --git a/dev-php/phar-utils/Manifest b/dev-php/phar-utils/Manifest
new file mode 100644
index 000000000000..4bf77d3b054d
--- /dev/null
+++ b/dev-php/phar-utils/Manifest
@@ -0,0 +1,4 @@
+AUX autoload.php 261 BLAKE2B e3aef92345eb95b936a4b3edc12e9518804c9f75087d73deec3882c113a913a17f2bad46c6a2e9c7c6e396e795863cf930775b566cccee77fb275013fb29c0bb SHA512 9e4820ee718f642ff95baaff3cd848b868465d5b6538377517f384aa6e0198e0cd3298e98ddd4ffa86e6669f438a6ce8236f4d56440e9e77b3df20599699753d
+DIST phar-utils-1.0.0.tar.gz 3152 BLAKE2B c4dfd3d659989bc22adcc14c79e28d623753988742d2fdd178dfd98590b629083ad85c9f112ab23c6213fa70cdad838ebbdc01c45551892ed9a20a3374abd28c SHA512 bf3d7074a3f1101a7f03e8fb8a5bc1456674bf2f9ded6a5fc5fb2f892c1cc3c4643fab6c003851ed12ea16ce6390f482cf897beee7d7c38922b6c54c90b0934e
+EBUILD phar-utils-1.0.0.ebuild 540 BLAKE2B db97fcd60bf5c51010548dd186b3957f277b2a2818d8cd60b7cbc62457a96850956012a44ceddb663931fb2ee4035cadca813373ce5f16c9046c667abcc47ef3 SHA512 d3e797a0fdfa3a43717d8947fb0b4e1d1dc3720ef9303dd8dd27ee77e3e6bbf603d00a2b4fec9dddab7f1d6f9102e63ea7426cd13ac226fc701c7c28d84be6c2
+MISC metadata.xml 655 BLAKE2B 141d8e0009997b21831892bdc2b8765bbfabb21d9f26a4d5af6a5193373e05cccde913fad8320593d2c394ef8af26ec7bc7b13ae89642420363bc4efe3fee3e0 SHA512 98e651be3649ef21f90165756ab53052bee40104a6e819f29e56565436c3ad9ec853ae5a9cbaf9fed911d579c7d16a22a68f328103a2ef23a66ad6e550163d70
diff --git a/dev-php/phar-utils/files/autoload.php b/dev-php/phar-utils/files/autoload.php
new file mode 100644
index 000000000000..44f0299fd7bd
--- /dev/null
+++ b/dev-php/phar-utils/files/autoload.php
@@ -0,0 +1,8 @@
+<?php
+/* Autoloader for symfony-finder and its dependencies */
+
+if (!class_exists('Fedora\\Autoloader\\Autoload', false)) {
+ require_once '/usr/share/php/Fedora/Autoloader/autoload.php';
+}
+
+\Fedora\Autoloader\Autoload::addPsr4('Seld\\PharUtils\\', __DIR__);
diff --git a/dev-php/phar-utils/metadata.xml b/dev-php/phar-utils/metadata.xml
new file mode 100644
index 000000000000..2cb3579612b7
--- /dev/null
+++ b/dev-php/phar-utils/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>guillaumeseren@gmail.com</email>
+ <name>Guillaume Seren</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ </maintainer>
+ <longdescription>
+ PHAR file format utilities, for when PHP phars you up
+ </longdescription>
+ <upstream>
+ <remote-id type="github">Seldaek/phar-utils</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-php/phar-utils/phar-utils-1.0.0.ebuild b/dev-php/phar-utils/phar-utils-1.0.0.ebuild
new file mode 100644
index 000000000000..6607a9e370ae
--- /dev/null
+++ b/dev-php/phar-utils/phar-utils-1.0.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+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-2.16.1 b/dev-php/phing-2.16.1
deleted file mode 100644
index dccefc4528aa..000000000000
--- a/dev-php/phing-2.16.1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=PHP project build system based on Apache Ant
-EAPI=6
-HOMEPAGE=https://www.phing.info/
-IUSE=doc examples minimal zip
-KEYWORDS=~amd64 ~x86
-LICENSE=FDL-1.3 LGPL-2.1
-RDEPEND=dev-lang/php:*[cli,xml,xslt,zip?] dev-php/symfony-yaml !minimal? ( dev-php/PEAR-HTTP_Request2 dev-php/PEAR-PEAR_PackageFileManager dev-php/PEAR-VersionControl_SVN dev-php/PHP_CodeCoverage dev-php/phpDocumentor dev-php/phpmd dev-php/phpunit dev-php/simpletest dev-php/xdebug )
-SLOT=0
-SRC_URI=https://www.phing.info/get/phing-2.16.1.tgz
-_md5_=4b1969ef12d00a035e0c35280860d299
diff --git a/dev-php/phing/Manifest b/dev-php/phing/Manifest
new file mode 100644
index 000000000000..f46f095785ac
--- /dev/null
+++ b/dev-php/phing/Manifest
@@ -0,0 +1,4 @@
+AUX autoload.php 418 BLAKE2B 8999ecee030a7d3eab49102bea8bf3aedff8c0e35021947279fee65ed9c0fa2f6bdc923a5e48437f314623cfed7545b3f4e30e8eb19610091c13a897c93278ca SHA512 81a22775a38d08e681e0f0a97fd6f125065be86fb491894f397cb25cc8240a7038b6cf061c77cc0c4837cc5a68aef909fe3a94ae84165a5f358050fac0164cd1
+DIST phing-2.16.1.tgz 4149013 BLAKE2B 266c124237d437361e9e18a42c9358fc18cfacfaa798a3a92a31858b7c1af847cde2cac43e0fcfe3759e8291639de9ec564f977fe00939316dbacdfd266e4e92 SHA512 e0832396dac9fbd43680f01acfa55f3ed2819726ace1db4ec9addf18c9c023c4f63143c6a63bbe1b16c2bd19dba54f503efdc77d772a3239bc8f9efe0ab375bb
+EBUILD phing-2.16.1.ebuild 1552 BLAKE2B 4ebbe638f537094ae2fc898f9fa9f3d1d6fa3955a4b0ba7f2da50cf03efc24e42917ccb02caed1855858ea8dea7885a0e5b7142848c42cec3cd35cfcc1842cbd SHA512 3e10a755f846b85b70e405839537c237c373b4c1a3428157077d2621ce023e4d0d59573e81d706a8cf85e505329b7511153bbc8e92292b7475db813a5ca55773
+MISC metadata.xml 471 BLAKE2B eed7a2c37fef52fce309821dbeb3dd30276d438cdd3b00b709b8fd5c5814f2e25c48465eaa1abd7aef190f3a3b1c502be1066e6b8479761001c71ffd94f91999 SHA512 a0b77b3717c96c2aa8807f967c5c5a61dbcaa543ac7467a6f36bfdb9a74897b975d543ea2515180718cd016d7ec72989e985ce45c87cec04923f9226a2c97254
diff --git a/dev-php/phing/files/autoload.php b/dev-php/phing/files/autoload.php
new file mode 100644
index 000000000000..437a7dc7ee1e
--- /dev/null
+++ b/dev-php/phing/files/autoload.php
@@ -0,0 +1,14 @@
+<?php
+$vendor_dir = '/usr/share/php';
+if (!class_exists('Fedora\\Autoloader\\Autoload', false)) {
+ require_once("${vendor_dir}/Fedora/Autoloader/autoload.php");
+}
+
+/*
+ At least for the moment, we don't need to autoload the Phing classes
+ themselves, because the "require" statements are all still there.
+*/
+
+\Fedora\Autoloader\Dependencies::required(
+ array("${vendor_dir}/Symfony/Component/Yaml/autoload.php")
+);
diff --git a/dev-php/phing/metadata.xml b/dev-php/phing/metadata.xml
new file mode 100644
index 000000000000..104818de2b2f
--- /dev/null
+++ b/dev-php/phing/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://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">phingofficial/phing</remote-id>
+ </upstream>
+ <use>
+ <flag name="zip">
+ Support zip archives by requiring said support in
+ <pkg>dev-lang/php</pkg>.
+ </flag>
+ </use>
+</pkgmetadata>
diff --git a/dev-php/phing/phing-2.16.1.ebuild b/dev-php/phing/phing-2.16.1.ebuild
new file mode 100644
index 000000000000..30583fdb8fe3
--- /dev/null
+++ b/dev-php/phing/phing-2.16.1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="PHP project build system based on Apache Ant"
+HOMEPAGE="https://www.phing.info/"
+SRC_URI="https://www.phing.info/get/${P}.tgz"
+
+LICENSE="FDL-1.3 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples minimal zip"
+
+RDEPEND="dev-lang/php:*[cli,xml,xslt,zip?]
+ dev-php/symfony-yaml
+ !minimal? (
+ dev-php/PEAR-HTTP_Request2
+ dev-php/PEAR-PEAR_PackageFileManager
+ dev-php/PEAR-VersionControl_SVN
+ dev-php/PHP_CodeCoverage
+ dev-php/phpDocumentor
+ dev-php/phpmd
+ dev-php/phpunit
+ dev-php/simpletest
+ dev-php/xdebug
+ )"
+
+S="${WORKDIR}"
+
+src_install() {
+ dodoc CHANGELOG.md CREDITS.md README.md
+ dodoc -r docs/docbook5/en/output/hlhtml
+ use doc && dodoc -r docs/api
+ use examples && dodoc -r docs/example
+
+ # Install the executable (and the PHP file it wraps) outside of the
+ # PHP include directory, since nobody should be including it.
+ exeinto "/usr/share/${PN}/bin"
+ doexe "bin/${PN}"
+ insinto "/usr/share/${PN}/bin"
+ doins "bin/${PN}.php"
+ dosym "../share/${PN}/bin/${PN}" "/usr/bin/${PN}"
+
+ # Phing tries to get the version number from this file.
+ insinto "/usr/share/${PN}/etc"
+ doins etc/VERSION.TXT
+
+ # The executable will only look for autoload.php in one place, so we
+ # create an (otherwise pointless) vendor directory to house it.
+ insinto "/usr/share/${PN}/vendor"
+ doins "${FILESDIR}/autoload.php"
+
+ # But install the library under /usr/share/php.
+ insinto "/usr/share/php"
+ doins -r "classes/${PN}"
+}
diff --git a/dev-php/php-codebrowser-1.0.2-r1 b/dev-php/php-codebrowser-1.0.2-r1
deleted file mode 100644
index 1bca154456fc..000000000000
--- a/dev-php/php-codebrowser-1.0.2-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare
-DESCRIPTION=Creates highlighted code by reading xml reports from codesniffer or phpunit
-EAPI=6
-HOMEPAGE=http://pear.phpunit.de
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-php/PEAR-Console_CommandLine-1.1.3 >=dev-php/File_Iterator-1.3.0 >=dev-php/PEAR-Log-1.12.1 >=dev-php/pear-1.8.1
-SLOT=0
-SRC_URI=http:///get/PHP_CodeBrowser-1.0.2.tgz
-_eclasses_=php-pear-r2 eb6928c33771db74564e814c5ca6c1b3
-_md5_=6d939c10a08e964b406431b8fc7d8824
diff --git a/dev-php/php-codebrowser/Manifest b/dev-php/php-codebrowser/Manifest
new file mode 100644
index 000000000000..b6df686cdd53
--- /dev/null
+++ b/dev-php/php-codebrowser/Manifest
@@ -0,0 +1,4 @@
+AUX channel.xml 804 BLAKE2B d6a965a41a220f07e3a0d206bc3359e2649b55d186e7975726c1b0ad344e063ca1fa98cde446078346384e946f6b31f9caaf49cf7c82b4568f697a1ba0d2e633 SHA512 44f5d66b967cff45b87795609e6dd14443a4ce5ae8f3430a281429ba21e834bc3feb7f539fb6cd8349017eb301054a33dfcd7062d58f9fd0c1c7cd1892580092
+DIST PHP_CodeBrowser-1.0.2.tgz 171746 BLAKE2B ceffe162cc64387d086f6b16b03449ec80a360a34ba2740f6f482f5b592439a9c40fe0b1d2706638967586df06dd2dd601cc48ce03e16f45c7427820bcf884d8 SHA512 6b0a174e25ae76f8218856ee52dcb78a09bfe4084f79c241d6ef5f90ffb2c7cee68aa6557717f26a3ce91b09b0b15cd75352f4f59e04e9a74f7a4a9ed33e2c89
+EBUILD php-codebrowser-1.0.2-r1.ebuild 1189 BLAKE2B 4b4f95cf5b2eca3b15e84b3715b38c8745572a163a12d6bff7174c4ce825b7ef7dd58bcea8bf978bb573e73fa99b2aeaec9cefb794a20e8cfa1107eba868f48e SHA512 b0ae0e62ceee529f5e7d5e88b5d30ff1300693dc188ebf3cb2fc11200dfa0c7bad7d38dfe94d3f7cb284d5bad5e4bce7b60f425d921fd94efba63eb827996adb
+MISC metadata.xml 435 BLAKE2B b0c0dd54e03106b1ce6be03de7c2aab76132f28802bcd43105a7bd0054a1f658312119cb485ea81d6cca75b874cd4140ead073a3fb97f3b02a21795044d02cd9 SHA512 442fec1369c9fd308569fb2473afd44d183aeaa208c32786994a2368907c193d31fbaed1403d103b5a05d37fa764c618fc27aeea51bc5fe89bff51f570e78072
diff --git a/dev-php/php-codebrowser/files/channel.xml b/dev-php/php-codebrowser/files/channel.xml
new file mode 100644
index 000000000000..91bb6786f543
--- /dev/null
+++ b/dev-php/php-codebrowser/files/channel.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<channel version="1.0" xmlns="http://pear.php.net/channel-1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://pear.php.net/channel-1.0 http://pear.php.net/dtd/channel-1.0.xsd">
+ <name>pear.phpunit.de</name>
+ <summary>PHPUnit PEAR Channel</summary>
+ <suggestedalias>phpunit</suggestedalias>
+ <servers>
+ <primary>
+ <rest>
+ <baseurl type="REST1.0">http://pear.phpunit.de/rest/</baseurl>
+ <baseurl type="REST1.1">http://pear.phpunit.de/rest/</baseurl>
+ <baseurl type="REST1.2">http://pear.phpunit.de/rest/</baseurl>
+ <baseurl type="REST1.3">http://pear.phpunit.de/rest/</baseurl>
+ </rest>
+ </primary>
+ </servers>
+</channel> \ No newline at end of file
diff --git a/dev-php/php-codebrowser/metadata.xml b/dev-php/php-codebrowser/metadata.xml
new file mode 100644
index 000000000000..596e8a4211f4
--- /dev/null
+++ b/dev-php/php-codebrowser/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+<email>php-bugs@gentoo.org</email>
+<name>PHP</name>
+</maintainer>
+<longdescription lang="en">
+PHP_CodeBrowser generates a html view for code browsing with higlighted and colored errors, parsed from xml reports generated from codesniffer or phpunit.
+</longdescription>
+</pkgmetadata>
diff --git a/dev-php/php-codebrowser/php-codebrowser-1.0.2-r1.ebuild b/dev-php/php-codebrowser/php-codebrowser-1.0.2-r1.ebuild
new file mode 100644
index 000000000000..2c85f0c8d57a
--- /dev/null
+++ b/dev-php/php-codebrowser/php-codebrowser-1.0.2-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PHP_PEAR_CHANNEL="${FILESDIR}/channel.xml"
+PHP_PEAR_DOMAIN="pear.phpunit.de"
+PHP_PEAR_PKG_NAME="PHP_CodeBrowser"
+inherit php-pear-r2
+
+DESCRIPTION="Creates highlighted code by reading xml reports from codesniffer or phpunit"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+HOMEPAGE="http://pear.phpunit.de"
+SRC_URI="http://${PHP_PEAR_URI}/get/${PEAR_P}.tgz"
+
+RDEPEND="${RDEPEND}
+ >=dev-php/PEAR-Console_CommandLine-1.1.3
+ >=dev-php/File_Iterator-1.3.0
+ >=dev-php/PEAR-Log-1.12.1"
+
+src_prepare() {
+ sed -i -e "s~@php_dir@~${EPREFIX}/usr/share/php~" \
+ -e "s~@data_dir@~${EPREFIX}/usr/share/php/data~" \
+ -e "s~@package_version@~${PV}~" \
+ "${S}/src/CLIController.php" || die
+ sed -i -e "s~@php_dir@~${EPREFIX}/usr/share/php~" \
+ "${S}/bin/phpcb.php" || die
+ eapply_user
+}
+
+src_install() {
+ local DOCS=( CHANGELOG.markdown README.markdown )
+ insinto /usr/share/php/data/${PHP_PEAR_PKG_NAME}
+ doins -r templates
+ insinto /usr/share/php/${PHP_PEAR_PKG_NAME}
+ doins -r src/*
+ exeinto /usr/bin
+ newexe bin/phpcb.php phpcb
+ php-pear-r2_install_packagexml
+ einstalldocs
+}
diff --git a/dev-php/php-openid-2.3.1_pre20180219 b/dev-php/php-openid-2.3.1_pre20180219
deleted file mode 100644
index ee62a00e2065..000000000000
--- a/dev-php/php-openid-2.3.1_pre20180219
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst
-DESCRIPTION=PHP OpenID implementation
-EAPI=6
-HOMEPAGE=https://github.com/openid/php-openid
-IUSE=examples
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=|| ( dev-lang/php[gmp] dev-lang/php[bcmath] ) dev-lang/php[curl,xml,ssl] net-misc/curl[ssl]
-SLOT=0
-SRC_URI=https://github.com/openid/php-openid/archive/26d5e12ea2a1eae180b11b061160d6f78fbedd17.tar.gz -> php-openid-26d5e12ea2a1eae180b11b061160d6f78fbedd17.tar.gz
-_md5_=f1e259ab0d80db8ba6a81f6f5e57a67f
diff --git a/dev-php/php-openid/Manifest b/dev-php/php-openid/Manifest
new file mode 100644
index 000000000000..1a9d34eddcf7
--- /dev/null
+++ b/dev-php/php-openid/Manifest
@@ -0,0 +1,3 @@
+DIST php-openid-26d5e12ea2a1eae180b11b061160d6f78fbedd17.tar.gz 399502 BLAKE2B f18b74c9db19d30710ad35cb97fd426e515cfb1426c887d194a5ef62352fca09ac801c32501eb95005bf2c6cfa13ff5b166972d1b10dbb8a2dcdab2780073f56 SHA512 d63bc7e4f79ecb07958a71dfc8eedae3d1fb0b41070be9b8d1036a08861497cd858602d23158f92ccf7bfa2b1ecdc999397c62f99b8ebb2dc65a8f1f2e2911f3
+EBUILD php-openid-2.3.1_pre20180219.ebuild 806 BLAKE2B 7c53d60ed9cc9747f11c2e9ed6dbb9e75d71864f261207da78c382c6bf5ce123a8601591c35a707ebd8ee6a0ac7d9fcd93305cb0d9182f00b82c9b1fb45da3d6 SHA512 a2168cff8a37cc233dc0f3319d67e3f0254982551bf87f54890ddd87cfb6aa4c5b0a59ec86e8cde6715cefa691508e903b298de7f6a8263b885dc3c47f6b4a90
+MISC metadata.xml 331 BLAKE2B 49a262d2af79ab181642cf0631eb6b66ba316ad939d8b7b05cffef02d7f33a64d8625bdf079936ebadc6451b7065133bd44d6e7a23679ab2839b30231a758ec6 SHA512 4ec00f5e5faeb348fc161d5789a6a822fc64baff7586e5e7778c3afa16697a500cff705c0d543e8a327fc43e3c3ba23b1180a6b0016a7eabe8d72f317a55b702
diff --git a/dev-php/php-openid/metadata.xml b/dev-php/php-openid/metadata.xml
new file mode 100644
index 000000000000..159f94a361b5
--- /dev/null
+++ b/dev-php/php-openid/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://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">openid/php-openid</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-php/php-openid/php-openid-2.3.1_pre20180219.ebuild b/dev-php/php-openid/php-openid-2.3.1_pre20180219.ebuild
new file mode 100644
index 000000000000..f1991435566f
--- /dev/null
+++ b/dev-php/php-openid/php-openid-2.3.1_pre20180219.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+MY_PV="26d5e12ea2a1eae180b11b061160d6f78fbedd17"
+MY_P="${PN}-${MY_PV}"
+
+PHP_LIB_NAME="Auth"
+DESCRIPTION="PHP OpenID implementation"
+HOMEPAGE="https://github.com/openid/php-openid"
+SRC_URI="https://github.com/openid/${PN}/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples"
+
+DEPEND=""
+RDEPEND="|| ( dev-lang/php[gmp] dev-lang/php[bcmath] )
+ dev-lang/php[curl,xml,ssl]
+ net-misc/curl[ssl]"
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+ insinto "/usr/share/php/${PN}"
+ cd "${S}/Auth" && doins -r .
+
+ use examples && dodoc -r ../examples
+}
+
+pkg_postinst() {
+ elog "This ebuild can optionally make use of:"
+ elog " dev-php/PEAR-MDB2"
+}
diff --git a/dev-php/php-redmine-api-1.5.9 b/dev-php/php-redmine-api-1.5.9
deleted file mode 100644
index c9c1b51b962f..000000000000
--- a/dev-php/php-redmine-api-1.5.9
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst test
-DEPEND=test? ( dev-lang/php:*[curl,json,simplexml] >=dev-php/phpunit-4 )
-DESCRIPTION=A simple, object-oriented, PHP Redmine API client
-EAPI=6
-HOMEPAGE=https://github.com/kbsali/php-redmine-api
-IUSE=test
-KEYWORDS=amd64 x86
-LICENSE=MIT
-RDEPEND=dev-lang/php:*[curl,json,simplexml]
-SLOT=0
-SRC_URI=https://github.com/kbsali/php-redmine-api/archive/v1.5.9.tar.gz -> php-redmine-api-1.5.9.tar.gz
-_md5_=da9f434d7348e7fbd0258e0674dd96f1
diff --git a/dev-php/php-redmine-api/Manifest b/dev-php/php-redmine-api/Manifest
new file mode 100644
index 000000000000..976a896de563
--- /dev/null
+++ b/dev-php/php-redmine-api/Manifest
@@ -0,0 +1,3 @@
+DIST php-redmine-api-1.5.9.tar.gz 36297 BLAKE2B 32c8cd500b0134afcb20e792f21585315f9635e038bca118d6ea289e2c0f91632aa5e2db2c023969cb228d592a242902a47bbef119e58560b39ba4b418854f8b SHA512 dd23dcadb27965568c3066f417edbff633eee5e804430568e60abf6b69f0fdfe36b73497984f80b055fae07cd3bb6f94264875f076b98f05327c474eb3f2ae5e
+EBUILD php-redmine-api-1.5.9.ebuild 895 BLAKE2B 002086e4b38a22aba61f309aa17f2d6d3457b176030da9d28835e387964e76fb76b682887e8e75b33f88699d3b044918719333eefe0e1163eba633698caf77b8 SHA512 7aed8f5b78d51d3d6e865680ac7172e426f814de0087d2161a6fe479ba81bc7641eb580c9c6adffcc59efdfba8bde7e994cb49dfd0f1dedee3b482257c458146
+MISC metadata.xml 449 BLAKE2B 21f0010b9e04eae8ffbfd97b1f011e6eefc3a31e994e87d83133dcc71ac255eadcec04b57ff00c2a3ca9078173a08961bd46f3c6bd3cb4922f35564f25aa5c6c SHA512 6f2086e4973ea34367123c33eb9b54de38f77619ed548a2db6803634e4dba6ebb4fce03825affd26d58b204b184b0e1207316c7aba277bae7c96c7ea319c216f
diff --git a/dev-php/php-redmine-api/metadata.xml b/dev-php/php-redmine-api/metadata.xml
new file mode 100644
index 000000000000..cd1ae1186934
--- /dev/null
+++ b/dev-php/php-redmine-api/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>mjo@gentoo.org</email>
+ <name>Michael Orlitzky</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ <name>PHP</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">kbsali/php-redmine-api</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-php/php-redmine-api/php-redmine-api-1.5.9.ebuild b/dev-php/php-redmine-api/php-redmine-api-1.5.9.ebuild
new file mode 100644
index 000000000000..d17187da48ac
--- /dev/null
+++ b/dev-php/php-redmine-api/php-redmine-api-1.5.9.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="A simple, object-oriented, PHP Redmine API client"
+HOMEPAGE="https://github.com/kbsali/${PN}"
+SRC_URI="https://github.com/kbsali/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="test"
+
+RDEPEND="dev-lang/php:*[curl,json,simplexml]"
+DEPEND="test? ( ${RDEPEND} >=dev-php/phpunit-4 )"
+
+src_install() {
+ insinto "/usr/share/php/${PN}"
+ doins -r lib
+
+ dodoc example.php README.markdown
+}
+
+src_test() {
+ phpunit || die "test suite failed"
+}
+
+pkg_postinst() {
+ elog "${PN} has been installed in /usr/share/php/${PN}/."
+ elog "To use it in a script, require('${PN}/lib/autoload.php'), and then"
+ elog "use the Redmine\\Client class normally. Most of the examples in the"
+ elog "documentation should work without modification."
+}
diff --git a/dev-php/phpDocumentor-2.9.0 b/dev-php/phpDocumentor-2.9.0
deleted file mode 100644
index c1b33c349e00..000000000000
--- a/dev-php/phpDocumentor-2.9.0
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Automatic documenting of php api directly from the source
-EAPI=6
-HOMEPAGE=http://phpdoc.org
-KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=MIT
-RDEPEND=!dev-php/PEAR-PhpDocumentor media-gfx/graphviz dev-lang/php:*[cli,iconv,intl,phar,xmlreader,xslt]
-SLOT=0
-SRC_URI=https://github.com/phpDocumentor/phpDocumentor2/releases/download/v2.9.0/phpDocumentor.phar -> phpDocumentor-2.9.0.phar
-_md5_=83ea7f0ed8622e3265963aab3ef3db05
diff --git a/dev-php/phpDocumentor/Manifest b/dev-php/phpDocumentor/Manifest
new file mode 100644
index 000000000000..130f35e9912e
--- /dev/null
+++ b/dev-php/phpDocumentor/Manifest
@@ -0,0 +1,3 @@
+DIST phpDocumentor-2.9.0.phar 18276081 BLAKE2B 988d9ae15a369c94d6dd83d68b64054d4d1829d651ae28a5082913ebd47666a73f5e48d331c09561777b58c6716707f4751b047e1aad9545d83ac9c964933b80 SHA512 62efc492d387675f753094bf4c42f890808bc3f45ae4a6908a519722af11ffbda41b47100e68f12e5b73a2eaa49fe8afc8143c751518a2a68b10afa18f896f10
+EBUILD phpDocumentor-2.9.0.ebuild 745 BLAKE2B be399471b00f8acdc9912cc1a841e926fc11f61e57cc3abc5a5fc77c8c81bdb03a1af40ead995fa36a93896319dbf583ea32dda5ab2e731970a658829d4f872b SHA512 46250496a8aabb2aa3c342aa48dca3b0afb00e28a2bdb90404482d115489ee5c0c52b2580d52d9d0c1e0e4ca0a00f5b290552bbc23fd1a68741cbe4f5da24e57
+MISC metadata.xml 342 BLAKE2B f63e91a30eafcf4313f7b1d1da9a1403cf3b74277d6e45063002413f5c5f12343e59cc58a0d2893c6d9b8798c0b732bf370f4f4b2a41d4a9534b720e53ed8979 SHA512 100907bbb2b93327787d11f6046e7058a350d9525baab105ff5033a0ed61bf33a1e04f7fc6626b751f40187c981298d636e6c311be514020303cea222ec12e58
diff --git a/dev-php/phpDocumentor/metadata.xml b/dev-php/phpDocumentor/metadata.xml
new file mode 100644
index 000000000000..5b3f6d868306
--- /dev/null
+++ b/dev-php/phpDocumentor/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://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">phpDocumentor/phpDocumentor2</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-php/phpDocumentor/phpDocumentor-2.9.0.ebuild b/dev-php/phpDocumentor/phpDocumentor-2.9.0.ebuild
new file mode 100644
index 000000000000..48f99127a9eb
--- /dev/null
+++ b/dev-php/phpDocumentor/phpDocumentor-2.9.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Automatic documenting of php api directly from the source"
+HOMEPAGE="http://phpdoc.org"
+SRC_URI="https://github.com/${PN}/${PN}2/releases/download/v${PV}/${PN}.phar -> ${P}.phar"
+
+LICENSE="MIT"
+SLOT="0"
+
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+# block old version that provides the same binary
+RDEPEND="!dev-php/PEAR-PhpDocumentor
+ media-gfx/graphviz
+ dev-lang/php:*[cli,iconv,intl,phar,xmlreader,xslt]"
+S="${WORKDIR}"
+
+src_unpack() { :; }
+
+src_install() {
+ exeinto /usr/share/php/${PN}
+ newexe "${DISTDIR}/${P}.phar" ${PN}.phar
+ dosym "../share/php/${PN}/${PN}.phar" /usr/bin/phpdoc
+}
diff --git a/dev-php/phpcov-5.0.0 b/dev-php/phpcov-5.0.0
deleted file mode 100644
index caaa02a2d8b8..000000000000
--- a/dev-php/phpcov-5.0.0
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=CLI frontend for PHP_CodeCoverage
-EAPI=6
-HOMEPAGE=https://github.com/sebastianbergmann/phpcov
-KEYWORDS=~amd64 ~hppa ~x86
-LICENSE=BSD
-RDEPEND=dev-lang/php:*[phar] dev-php/xdebug
-SLOT=0
-SRC_URI=https://phar.phpunit.de/phpcov-5.0.0.phar
-_md5_=8d13c2ca32252a7ec25eb16766561464
diff --git a/dev-php/phpcov/Manifest b/dev-php/phpcov/Manifest
new file mode 100644
index 000000000000..d55a7ee89d8c
--- /dev/null
+++ b/dev-php/phpcov/Manifest
@@ -0,0 +1,3 @@
+DIST phpcov-5.0.0.phar 2946681 BLAKE2B e343a9c9b56a9f8a43994cb9ffc5920e01b8b42f3fd6436c519535060f5e678e2c0b4a861ad5e15988b06b921e00e9ca0f9ba31eefedee25188d8c75eddff976 SHA512 780ecf6ef5a07801b107659cac4019ac3738833311408bc43d6fbe1041b974ea311ea581c06a49f7fc1d8ff953c36e7cb92b87fb7ad81e0cc1b8f04e7df5d37e
+EBUILD phpcov-5.0.0.ebuild 571 BLAKE2B 7dc349ad850bbda4e104362c468d6d238ae93972f235a8443fda386f8087aa1be18c63a1b5bd23eed584e2121194dd77ae46d23df854de08d13e02aca83953df SHA512 b2b24557947ef8addafcafce81ea03b02d1ef0390ff4dc18d5d68f1e9b86243332dc7ea97802667a0527c6d08b23be8935f9a5953964b5f8e1fdd3294df3c381
+MISC metadata.xml 338 BLAKE2B 1d8f0767a836d03604313fd351222bdadc017aa14963f5e2cac9e63a9edfbe979aa12d3396e81425963ce077b2da9bdfb13d721cbbb50c9a9056af71b33e184f SHA512 5e5a7802515563d9a767e3dd23e751ecca6c22d0288e77e42c62721f34ac6d2666d99108e6ee65179265b8d033a375326cf13ca91fa62e84ac15c700177563d2
diff --git a/dev-php/phpcov/metadata.xml b/dev-php/phpcov/metadata.xml
new file mode 100644
index 000000000000..68745855add1
--- /dev/null
+++ b/dev-php/phpcov/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://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">sebastianbergmann/phpcov</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-php/phpcov/phpcov-5.0.0.ebuild b/dev-php/phpcov/phpcov-5.0.0.ebuild
new file mode 100644
index 000000000000..366e9349d37d
--- /dev/null
+++ b/dev-php/phpcov/phpcov-5.0.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="CLI frontend for PHP_CodeCoverage"
+HOMEPAGE="https://github.com/sebastianbergmann/phpcov"
+SRC_URI="https://phar.phpunit.de/${P}.phar"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="dev-lang/php:*[phar]
+ dev-php/xdebug"
+
+S="${WORKDIR}"
+
+src_unpack() {
+ return
+}
+
+src_install() {
+ exeinto /usr/share/php/${PN}
+ newexe "${DISTDIR}"/${P}.phar "${PN}.phar"
+ dosym "../share/php/${PN}/${PN}.phar" /usr/bin/${PN}
+}
diff --git a/dev-php/phpdepend-2.5.0-r1 b/dev-php/phpdepend-2.5.0-r1
deleted file mode 100644
index 2c21c562401e..000000000000
--- a/dev-php/phpdepend-2.5.0-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Static code analysis for PHP
-EAPI=6
-HOMEPAGE=http://www.pdepend.org/
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-lang/php dev-php/fedora-autoloader >=dev-php/symfony-config-2.3 >=dev-php/symfony-dependency-injection-2.3 >=dev-php/symfony-filesystem-2.3
-SLOT=0
-SRC_URI=https://github.com/pdepend/pdepend/archive/2.5.0.tar.gz -> phpdepend-2.5.0.tar.gz
-_md5_=5262ffd1cae21aac1b058cfb9905fc60
diff --git a/dev-php/phpdepend/Manifest b/dev-php/phpdepend/Manifest
new file mode 100644
index 000000000000..d872d583dc5a
--- /dev/null
+++ b/dev-php/phpdepend/Manifest
@@ -0,0 +1,4 @@
+AUX autoload.php 514 BLAKE2B b03d6c08102ab04c83b1fe24484b83b89856f5bcee913c73d87b3ff6cf584b6051fe1b895cc94a84818257bcdb0b4f0d8139f7dd6f33b7aa7b5159027d716317 SHA512 f4cf9fd93bc24e28cd93f0597fed3b5c4166668ba8fe5dc4259001975eb96e6eab5b0006fc5a897041f29f6c3447968f89a5651a76a41c6b1777bb712b2b1e42
+DIST phpdepend-2.5.0.tar.gz 190823 BLAKE2B 9711a6bd113e912b651a577e1b00f388262843796219cdd26e012f1beccfd54aca62f4998a47d69c5ff3cc8705551fdd86bc538fdaf7173f5f25bc41f509c3e1 SHA512 927ff961773c3b2076b11b374035482c05b2da3a9777418c6fe0a491bd20eec431bfd75cd706674e231c9f73d97b6b0236eea12794cfff2d8ad52a6a6170e137
+EBUILD phpdepend-2.5.0-r1.ebuild 1269 BLAKE2B 7751fbc2492871bd1d241e3d376211d97b8a0ce2d72875afe7be87d6ff5aabf81089942f5fabbceac949e799d1b88f7963157fb2776cc5757a960e86201e72a6 SHA512 79207c24d76fee170e3c60ffc78b99daf5e2fc583d2123cf5b71e261e7c038c1fa8116db8c1c16ee2489725849c39fb9817b14adf9c807eabc931db3e9cf21d2
+MISC metadata.xml 397 BLAKE2B 15e4fcd425f244c822ef1d5ac230ecae70f7245d312dee234718f6bfee254ef4cb8a3ad06f66ba234832c0c35c06dce75f8979ad6efa5fa0f287ca6e74d4f4d2 SHA512 b6c82fa15bdfc3e8e852ac8e0d49bbffafcef1f8ddf89032590409b7749250f1feb7ae13fe4fbec625317b2abe473a95c84583f20238987b1a12cc347aebcbb3
diff --git a/dev-php/phpdepend/files/autoload.php b/dev-php/phpdepend/files/autoload.php
new file mode 100644
index 000000000000..ce186c4f3d86
--- /dev/null
+++ b/dev-php/phpdepend/files/autoload.php
@@ -0,0 +1,19 @@
+<?php
+$vendor_dir = '/usr/share/php';
+if (!class_exists('Fedora\\Autoloader\\Autoload', false)) {
+ require_once("${vendor_dir}/Fedora/Autoloader/autoload.php");
+}
+
+\Fedora\Autoloader\Autoload::addPsr4(
+ 'PDepend\\',
+ __DIR__ . '/../src/main/php/PDepend'
+);
+
+
+\Fedora\Autoloader\Dependencies::required(
+ array(
+ "${vendor_dir}/Symfony/Component/Config/autoload.php",
+ "${vendor_dir}/Symfony/Component/DependencyInjection/autoload.php",
+ "${vendor_dir}/Symfony/Component/Filesystem/autoload.php"
+ )
+);
diff --git a/dev-php/phpdepend/metadata.xml b/dev-php/phpdepend/metadata.xml
new file mode 100644
index 000000000000..1be341e7ec05
--- /dev/null
+++ b/dev-php/phpdepend/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ <name>PHP</name>
+ </maintainer>
+ <longdescription lang="en">
+Static code analyser for PHP
+ </longdescription>
+ <upstream>
+ <remote-id type="github">pdepend/pdepend</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-php/phpdepend/phpdepend-2.5.0-r1.ebuild b/dev-php/phpdepend/phpdepend-2.5.0-r1.ebuild
new file mode 100644
index 000000000000..1ea5cc4ab920
--- /dev/null
+++ b/dev-php/phpdepend/phpdepend-2.5.0-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PN=pdepend
+
+DESCRIPTION="Static code analysis for PHP"
+HOMEPAGE="http://www.pdepend.org/"
+
+# The test suite is absent from the release tarballs because
+# the only build system that Composer understands is "cp -r".
+# To obtain the tests, we would need to grab a VCS snapshot.
+SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/${PV}.tar.gz
+ -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-lang/php
+ dev-php/fedora-autoloader
+ >=dev-php/symfony-config-2.3
+ >=dev-php/symfony-dependency-injection-2.3
+ >=dev-php/symfony-filesystem-2.3"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_install() {
+ dodoc CHANGELOG
+
+ # The executable will only look for autoload.php in one place, so we
+ # create an (otherwise pointless) vendor directory to house it.
+ insinto "/usr/share/${PN}/vendor"
+ doins "${FILESDIR}/autoload.php"
+
+ insinto "/usr/share/${PN}/src"
+ doins -r src/main
+
+ # The executable uses relative include paths, so the one users will
+ # actually run needs to be symlinked into the source tree.
+ exeinto "/usr/share/${PN}/src/bin"
+ doexe "src/bin/${MY_PN}"
+ dosym "../share/${PN}/src/bin/${MY_PN}" "/usr/bin/${MY_PN}"
+}
diff --git a/dev-php/phpdocumentor-reflection-common-1.0 b/dev-php/phpdocumentor-reflection-common-1.0
deleted file mode 100644
index 8a6e44728b91..000000000000
--- a/dev-php/phpdocumentor-reflection-common-1.0
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Common reflection classes used by phpdocumentor to reflect the code structure
-EAPI=6
-HOMEPAGE=https://www.phpdoc.org
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86
-LICENSE=MIT
-RDEPEND=dev-php/fedora-autoloader >=dev-lang/php-5.6:*
-SLOT=0
-SRC_URI=https://github.com/phpDocumentor/ReflectionCommon/archive/1.0.tar.gz -> phpdocumentor-reflection-common-1.0.tar.gz
-_md5_=549fe070546dd8674fb04d70bf8fa334
diff --git a/dev-php/phpdocumentor-reflection-common/Manifest b/dev-php/phpdocumentor-reflection-common/Manifest
new file mode 100644
index 000000000000..4a58a3131e94
--- /dev/null
+++ b/dev-php/phpdocumentor-reflection-common/Manifest
@@ -0,0 +1,4 @@
+AUX autoload.php 271 BLAKE2B 755d18da274f77605c5873c2ddfde9ff2f47ea325f647d405a1519b660d51bd057a2e299cc4797ad4578ee3af1d56e05ce6cf272fd7e4019d2ad86f4e12dd324 SHA512 7aae3acc76199fd18558d5ae048e6d32d122a2b5310709f7b6129e3ea53be140e290b0ef8e1f69a153f9ee387de959047a6a8c4ec780df98e51c9f56a7af6e81
+DIST phpdocumentor-reflection-common-1.0.tar.gz 7746 BLAKE2B 0e7119b9a55e4408160c7e04f569831b491c801f4a12e4b17af21eb4a1fcd9b7f84f23548551f829506649d3accbd3a890bae7ba8ef4390051f45f68143f76a2 SHA512 63d76282d0921535af70e084d3621d8cc6b07f49bc5348429a340730212f3c99f8e64636e43cebb3140fa4f6363b4f2a0c02cbe38036a28123e7bbeb67c61a0d
+EBUILD phpdocumentor-reflection-common-1.0.ebuild 685 BLAKE2B e0bb9d856ca939e7e66ca5278b74a592675b96fcb6fb7abef1072542e2df7cf0103307fcff83079fd08bf2b6274b193294f8d2fd20ab97d512263f2e15f3033b SHA512 409593e77da518cacb28f8185b61717b3d225190037f93040fe320e5e2629d77adbc9b8c06d941977896b8e05622eb7998fad314f553a53739423103a2392e9c
+MISC metadata.xml 334 BLAKE2B 1b34b1832ed2c8cde0a91717334174f49fb69986aceac768cecf15e1898acf8b5e1ed12ff361be20cce83e8e8b7c31c87408b924b5e6a8d17700b5d6a88285bc SHA512 9db658eed874814225b9a118d88b900e7a6965cd629da7aa98cbbac2f1708425ae463a9dee7ce12cf9dc9b78cd2c123a0b5bd4056ca25feb47e5747112a4d0e5
diff --git a/dev-php/phpdocumentor-reflection-common/files/autoload.php b/dev-php/phpdocumentor-reflection-common/files/autoload.php
new file mode 100644
index 000000000000..356515b7a000
--- /dev/null
+++ b/dev-php/phpdocumentor-reflection-common/files/autoload.php
@@ -0,0 +1,8 @@
+<?php
+/* Autoloader for dev-php/phpdocumentor-reflection-common */
+
+if (!class_exists('Fedora\\Autoloader\\Autoload', false)) {
+ require_once '/usr/share/php/Fedora/Autoloader/autoload.php';
+}
+
+Fedora\Autoloader\Autoload::addPsr4('phpDocumentor\\Reflection\\', __DIR__);
diff --git a/dev-php/phpdocumentor-reflection-common/metadata.xml b/dev-php/phpdocumentor-reflection-common/metadata.xml
new file mode 100644
index 000000000000..99183602ecfc
--- /dev/null
+++ b/dev-php/phpdocumentor-reflection-common/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://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">phpDocumentor/ReflectionCommon</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-php/phpdocumentor-reflection-common/phpdocumentor-reflection-common-1.0.ebuild b/dev-php/phpdocumentor-reflection-common/phpdocumentor-reflection-common-1.0.ebuild
new file mode 100644
index 000000000000..13c895fea14d
--- /dev/null
+++ b/dev-php/phpdocumentor-reflection-common/phpdocumentor-reflection-common-1.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PN="ReflectionCommon"
+MY_VENDOR="phpDocumentor"
+
+DESCRIPTION="Common reflection classes used by phpdocumentor to reflect the code structure"
+HOMEPAGE="https://www.phpdoc.org"
+SRC_URI="https://github.com/${MY_VENDOR}/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+IUSE=""
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+RDEPEND="dev-php/fedora-autoloader
+ >=dev-lang/php-5.6:*"
+
+src_install() {
+ insinto /usr/share/php/${MY_VENDOR}/${MY_PN}
+ doins -r src/*
+ doins "${FILESDIR}/autoload.php"
+}
diff --git a/dev-php/phpdocumentor-reflection-docblock-3.1.1 b/dev-php/phpdocumentor-reflection-docblock-3.1.1
deleted file mode 100644
index 6a43c14fd3fd..000000000000
--- a/dev-php/phpdocumentor-reflection-docblock-3.1.1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Provide support for annotations via DocBlocks
-EAPI=6
-HOMEPAGE=https://www.phpdoc.org
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86
-LICENSE=MIT
-RDEPEND=dev-php/fedora-autoloader <dev-php/phpdocumentor-reflection-common-2 <dev-php/phpdocumentor-type-resolver-1 <dev-php/webmozart-assert-2 >=dev-lang/php-5.6:*
-SLOT=0
-SRC_URI=https://github.com/phpDocumentor/ReflectionDocBlock/archive/3.1.1.tar.gz -> phpdocumentor-reflection-docblock-3.1.1.tar.gz
-_md5_=c109298524158df67b89e7c34728c7d7
diff --git a/dev-php/phpdocumentor-reflection-docblock/Manifest b/dev-php/phpdocumentor-reflection-docblock/Manifest
new file mode 100644
index 000000000000..8be122bbb93f
--- /dev/null
+++ b/dev-php/phpdocumentor-reflection-docblock/Manifest
@@ -0,0 +1,4 @@
+AUX autoload.php 499 BLAKE2B 8e159b25c5682a68259674aa256c667da624f17b1b784c93cbdcd792f4fe4066122f5848ddb99a7011022b389a1cf2dc955c1b45c4771446363f1e873b32b3ac SHA512 9674ebd512047c27ac986eb63395cc4762c4b0dce3ad5ba1fd76284767e1c724c1b61855a32d96fe925bc1d8c1f76e8c12e016156028a66f7d909dbbf4d676ad
+DIST phpdocumentor-reflection-docblock-3.1.1.tar.gz 42935 BLAKE2B a18fbc5012a28e9f0ab59c6f485bec692aed5e7d245845be1c20a34e51b646b3cfd57d84f10f60a5e64c3ad0cc916b1bd97f07629035d3d4991056665012bb39 SHA512 43f1824db3a7a3793db88817e3cedd6379c8e9074fac1a3e781d049a74a13bde3c519c0a9b2a9219d7869339ab16276229d5d3d9398d9bf7f6cdac6dea5a12d5
+EBUILD phpdocumentor-reflection-docblock-3.1.1.ebuild 768 BLAKE2B c5e018a70473c1e8454b585f15af2ef58568d6e745eb6920536013d70b786184cb9e42efce50167184802f8e90c806b722b87324e81ade163399f36155a96513 SHA512 5d4252a78dad89968eaacfba0f3d3a728cf87915ad76520c3152323520ce857f6f994d6b0420a7cb0096fcfed0d4c75938850cf08cea6122001d5888b020050a
+MISC metadata.xml 336 BLAKE2B b7192560a302045b5f417f3e9c1330c0e73b0fe6c95b79dcacdcae41db70b8b4ef749b7eec902dacbd9e11750d5487c6260013446044dd0cc4a610bcfc83a697 SHA512 6e525276f4719b05ca8d891b76a742450940dd4b6a2bbdb839a5c7556f3ddff370f3e504f9a05449161105b838228519d5d14be2d3994335d7f8e4f90d7eec61
diff --git a/dev-php/phpdocumentor-reflection-docblock/files/autoload.php b/dev-php/phpdocumentor-reflection-docblock/files/autoload.php
new file mode 100644
index 000000000000..70091f310ed1
--- /dev/null
+++ b/dev-php/phpdocumentor-reflection-docblock/files/autoload.php
@@ -0,0 +1,14 @@
+<?php
+/* Autoloader for dev-php/phpdocumentor-reflection-common */
+
+if (!class_exists('Fedora\\Autoloader\\Autoload', false)) {
+ require_once '/usr/share/php/Fedora/Autoloader/autoload.php';
+}
+
+Fedora\Autoloader\Autoload::addPsr4('phpDocumentor\\Reflection\\', __DIR__);
+
+\Fedora\Autoloader\Dependencies::required(array(
+ '/usr/share/php/phpDocumentor/TypeResolver/autoload.php',
+ '/usr/share/php/phpDocumentor/ReflectionCommon/autoload.php',
+ '/usr/share/php/Webmozart/Assert/autoload.php',
+));
diff --git a/dev-php/phpdocumentor-reflection-docblock/metadata.xml b/dev-php/phpdocumentor-reflection-docblock/metadata.xml
new file mode 100644
index 000000000000..b6164cd9043f
--- /dev/null
+++ b/dev-php/phpdocumentor-reflection-docblock/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://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">phpDocumentor/ReflectionDocBlock</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-php/phpdocumentor-reflection-docblock/phpdocumentor-reflection-docblock-3.1.1.ebuild b/dev-php/phpdocumentor-reflection-docblock/phpdocumentor-reflection-docblock-3.1.1.ebuild
new file mode 100644
index 000000000000..0ab2ddb1f323
--- /dev/null
+++ b/dev-php/phpdocumentor-reflection-docblock/phpdocumentor-reflection-docblock-3.1.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PN="ReflectionDocBlock"
+MY_VENDOR="phpDocumentor"
+
+DESCRIPTION="Provide support for annotations via DocBlocks"
+HOMEPAGE="https://www.phpdoc.org"
+SRC_URI="https://github.com/${MY_VENDOR}/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+IUSE=""
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+RDEPEND="dev-php/fedora-autoloader
+ <dev-php/phpdocumentor-reflection-common-2
+ <dev-php/phpdocumentor-type-resolver-1
+ <dev-php/webmozart-assert-2
+ >=dev-lang/php-5.6:*"
+
+src_install() {
+ insinto /usr/share/php/${MY_VENDOR}/${MY_PN}
+ doins -r src/*
+ doins "${FILESDIR}/autoload.php"
+}
diff --git a/dev-php/phpdocumentor-type-resolver-0.2.1 b/dev-php/phpdocumentor-type-resolver-0.2.1
deleted file mode 100644
index bdd4e2d27fee..000000000000
--- a/dev-php/phpdocumentor-type-resolver-0.2.1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=PSR-5 based resolver of Class names, Types and Structural Element Names
-EAPI=6
-HOMEPAGE=https://www.phpdoc.org
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86
-LICENSE=MIT
-RDEPEND=dev-php/fedora-autoloader <dev-php/phpdocumentor-reflection-common-2 >=dev-lang/php-5.6:*
-SLOT=0
-SRC_URI=https://github.com/phpDocumentor/TypeResolver/archive/0.2.1.tar.gz -> phpdocumentor-type-resolver-0.2.1.tar.gz
-_md5_=5ad484837c1cdac53be42c962a41fcaf
diff --git a/dev-php/phpdocumentor-type-resolver/Manifest b/dev-php/phpdocumentor-type-resolver/Manifest
new file mode 100644
index 000000000000..52144e8b3f06
--- /dev/null
+++ b/dev-php/phpdocumentor-type-resolver/Manifest
@@ -0,0 +1,4 @@
+AUX autoload.php 271 BLAKE2B 755d18da274f77605c5873c2ddfde9ff2f47ea325f647d405a1519b660d51bd057a2e299cc4797ad4578ee3af1d56e05ce6cf272fd7e4019d2ad86f4e12dd324 SHA512 7aae3acc76199fd18558d5ae048e6d32d122a2b5310709f7b6129e3ea53be140e290b0ef8e1f69a153f9ee387de959047a6a8c4ec780df98e51c9f56a7af6e81
+DIST phpdocumentor-type-resolver-0.2.1.tar.gz 15231 BLAKE2B 1c47c8de34bf97cbfd7fa8c5c138a61e77f8897ab8009ae24b4a05e83bd58b9a0990bf365d3578d6b15f642cdb53b9a62a6485887350e19763320d46bf59d7b7 SHA512 888d165b397831d7319116c71dc34a3c738601bdb9956d250f80ee89374a9f063449ae9a82a43646e9156ad720e84e5d951c35dee746a37354388cd1f69d5154
+EBUILD phpdocumentor-type-resolver-0.2.1.ebuild 719 BLAKE2B d62d608131c8be6d414d17258421b4d8277eab3ddbf8b6a50d1ced2f3317c7c53a324bca2a18e0b2d7f048b04bf7f6abe7146ee4744097ead832d01ead194848 SHA512 3992fc5179086deb01ba6b2902be97b3845e0fe4f691e8ac45683e557bda0bb852d70a10d3a11f2e94d59a84a7c793a407082525202afd726d2f52410c002c48
+MISC metadata.xml 330 BLAKE2B a68bfeb6fd53ba7c9ee80e5ea5ea50bdc531eccd13caf0b6e9efc0d4585a6d05e782312bfb4bf4fac4a3df596f029cf0e42a23d9a70ea66fbbd95eae1e259d73 SHA512 3c2e71a10cb0191aa7ab5332bdce3e38465514611dabd3374bb29fe4411f68e0382e5bcc66a0782ba56b1bbc823dd0f435f830809c1bd36e9fb142a68774f353
diff --git a/dev-php/phpdocumentor-type-resolver/files/autoload.php b/dev-php/phpdocumentor-type-resolver/files/autoload.php
new file mode 100644
index 000000000000..356515b7a000
--- /dev/null
+++ b/dev-php/phpdocumentor-type-resolver/files/autoload.php
@@ -0,0 +1,8 @@
+<?php
+/* Autoloader for dev-php/phpdocumentor-reflection-common */
+
+if (!class_exists('Fedora\\Autoloader\\Autoload', false)) {
+ require_once '/usr/share/php/Fedora/Autoloader/autoload.php';
+}
+
+Fedora\Autoloader\Autoload::addPsr4('phpDocumentor\\Reflection\\', __DIR__);
diff --git a/dev-php/phpdocumentor-type-resolver/metadata.xml b/dev-php/phpdocumentor-type-resolver/metadata.xml
new file mode 100644
index 000000000000..4f1ebd70ec3b
--- /dev/null
+++ b/dev-php/phpdocumentor-type-resolver/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://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">phpDocumentor/TypeResolver</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-php/phpdocumentor-type-resolver/phpdocumentor-type-resolver-0.2.1.ebuild b/dev-php/phpdocumentor-type-resolver/phpdocumentor-type-resolver-0.2.1.ebuild
new file mode 100644
index 000000000000..0f2ee07377c6
--- /dev/null
+++ b/dev-php/phpdocumentor-type-resolver/phpdocumentor-type-resolver-0.2.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PN="TypeResolver"
+MY_VENDOR="phpDocumentor"
+
+DESCRIPTION="PSR-5 based resolver of Class names, Types and Structural Element Names"
+HOMEPAGE="https://www.phpdoc.org"
+SRC_URI="https://github.com/${MY_VENDOR}/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+IUSE=""
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+RDEPEND="dev-php/fedora-autoloader
+ <dev-php/phpdocumentor-reflection-common-2
+ >=dev-lang/php-5.6:*"
+
+src_install() {
+ insinto /usr/share/php/${MY_VENDOR}/${MY_PN}
+ doins -r src/*
+ doins "${FILESDIR}/autoload.php"
+}
diff --git a/dev-php/phpmd-2.6.0 b/dev-php/phpmd-2.6.0
deleted file mode 100644
index 959639b4c9c0..000000000000
--- a/dev-php/phpmd-2.6.0
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=PHP mess detector
-EAPI=6
-HOMEPAGE=http://www.phpmd.org/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-lang/php[xml] dev-php/phpdepend
-SLOT=0
-SRC_URI=https://github.com/phpmd/phpmd/archive/2.6.0.tar.gz -> phpmd-2.6.0.tar.gz
-_md5_=92e96440b0f407f0928eac1af09981dc
diff --git a/dev-php/phpmd/Manifest b/dev-php/phpmd/Manifest
new file mode 100644
index 000000000000..5c6918920320
--- /dev/null
+++ b/dev-php/phpmd/Manifest
@@ -0,0 +1,4 @@
+AUX autoload.php 325 BLAKE2B 73cdf98199c37978e3a82ff70583220bc9a93494ca204d6a9da321b943407db5144ac376c40590a7bf784109633679a267838e9e52889977947395e5ee38528c SHA512 2cbb2349a598c9515cd995b22cb685d4ea6e9e5edc6c0e5ce602f7520c4aa70cc63872c31209720019c424ab188b063aedf7829899882608eafca9c83794d219
+DIST phpmd-2.6.0.tar.gz 57496 BLAKE2B 447e1b0a18372abc82746e8f2a47ea0df76fdeea51e7012ea63a0d644f7cd71790a3e354584d18f57bab3e7211f1037ff3f61aff367c3419caa44e77e79d1cbb SHA512 7c81bef8457f28dd40b908f535cf432d65ba6910c54f730b4d9f7a0bffa096653af029701a6ce4bd22910ec69453c5ff22c657100757d7d6eacff2226b597023
+EBUILD phpmd-2.6.0.ebuild 1124 BLAKE2B 6e6e34fb5ddb5c00a14c76df601255368822c999ab8756fa35af633e4857759d6fa9d641ef25095bd5bbf703a46fef32d42c0d9e3e5f027e31811d425ce1ccac SHA512 1fe7d91ededcddcdc8b3b8b722be70592ee2f6d2fca08543a62abdc5e6dc7bbfee5cad97774fed9c3394134c230b35a45d2799043da2e609b36e64ae641ebc87
+MISC metadata.xml 325 BLAKE2B 80b920bf354b940ca23aaf02297c6ca21ef4d782831c2f4edfba9756c29dc13ed7c74d6d8e58635c0f3915e3c939dc6a4290ce00751965eaabad995b6969fff9 SHA512 d2f6eb6841f0c21aeea3e158ef62388d2cddb3eb4c9a363b211fe232d9b64e4d45d80856986d5293c1d5ad17948648bc606133d28b3001b912ed1fe022ee2432
diff --git a/dev-php/phpmd/files/autoload.php b/dev-php/phpmd/files/autoload.php
new file mode 100644
index 000000000000..b0fa4764c7ca
--- /dev/null
+++ b/dev-php/phpmd/files/autoload.php
@@ -0,0 +1,14 @@
+<?php
+if (!class_exists('Fedora\\Autoloader\\Autoload', false)) {
+ require_once('/usr/share/php/Fedora/Autoloader/autoload.php');
+}
+
+\Fedora\Autoloader\Autoload::addPsr4(
+ 'PHPMD\\',
+ __DIR__ . '/../src/main/php/PHPMD'
+);
+
+
+\Fedora\Autoloader\Dependencies::required(
+ array('/usr/share/phpdepend/vendor/autoload.php')
+);
diff --git a/dev-php/phpmd/metadata.xml b/dev-php/phpmd/metadata.xml
new file mode 100644
index 000000000000..133c28059f56
--- /dev/null
+++ b/dev-php/phpmd/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://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">phpmd/phpmd</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-php/phpmd/phpmd-2.6.0.ebuild b/dev-php/phpmd/phpmd-2.6.0.ebuild
new file mode 100644
index 000000000000..dc08acef5020
--- /dev/null
+++ b/dev-php/phpmd/phpmd-2.6.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="PHP mess detector"
+HOMEPAGE="http://www.phpmd.org/"
+
+# The test suite is absent from the release tarballs because
+# the only build system that Composer understands is "cp -r".
+# To obtain the tests, we would need to grab a VCS snapshot.
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-lang/php[xml]
+ dev-php/phpdepend"
+
+src_install() {
+ dodoc AUTHORS.rst CHANGELOG CONTRIBUTING.md README.rst
+
+ # The executable will only look for autoload.php in one place, so we
+ # create an (otherwise pointless) vendor directory to house it.
+ insinto "/usr/share/${PN}/vendor"
+ doins "${FILESDIR}/autoload.php"
+
+ insinto "/usr/share/${PN}/src"
+ doins -r src/main
+
+ # The executable uses relative include paths, so the one users will
+ # actually run needs to be symlinked into the source tree.
+ exeinto "/usr/share/${PN}/src/bin"
+ doexe "src/bin/${PN}"
+ dosym "../share/${PN}/src/bin/${PN}" "/usr/bin/${PN}"
+}
diff --git a/dev-php/phpspec-prophecy-1.7.0 b/dev-php/phpspec-prophecy-1.7.0
deleted file mode 100644
index e0ec5d848208..000000000000
--- a/dev-php/phpspec-prophecy-1.7.0
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Highly opinionated mocking framework
-EAPI=6
-HOMEPAGE=https://github.com/phpspec/prophecy
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86
-LICENSE=MIT
-RDEPEND=dev-php/fedora-autoloader <dev-php/doctrine-instantiator-2 <dev-php/phpdocumentor-reflection-docblock-4 <dev-php/sebastian-comparator-3 <dev-php/sebastian-recursion-context-4 >=dev-lang/php-5.6:*
-SLOT=0
-SRC_URI=https://github.com/phpspec/prophecy/archive/v1.7.0.tar.gz -> phpspec-prophecy-1.7.0.tar.gz
-_md5_=118350d1f45f0b55fb8c038c28cb73e6
diff --git a/dev-php/phpspec-prophecy/Manifest b/dev-php/phpspec-prophecy/Manifest
new file mode 100644
index 000000000000..484330529c6f
--- /dev/null
+++ b/dev-php/phpspec-prophecy/Manifest
@@ -0,0 +1,4 @@
+AUX autoload.php 544 BLAKE2B d6ec873ca93869028f105eb90480031805bf2a377ca73824ae363456388d0ecbebcc5a736ec0e9ba507f7bb00e2843aa6cb3a1cad15ea849d825080ff0c6cb09 SHA512 4c75d70b199ca708d6dbd8975df0fe1e73db9b91bbce1f4360dca7405e3bc782f10331e83399a09fe2ea7373064f70538ba0b7525be008614be75b52ee7267fb
+DIST phpspec-prophecy-1.7.0.tar.gz 60338 BLAKE2B 8171120d8407f2e554150d5e3ea1972c54d4e2ce0e6698763f0b3c7e1645340ce22404da7844fed8412579c46f372852b4553c6d8a65c8094ef3065b0dbbd80c SHA512 e8efb3882d869f10fe39dff7c2185e1ec6f044c794fd6a5785e1c1c69c71b91dc3997f61bd2566d3243dde0becce568beba9a18fa0fd152e6ce74ca43a9a0fb0
+EBUILD phpspec-prophecy-1.7.0.ebuild 811 BLAKE2B 53818c6a4f2dd8ed05c6e1789fe95d25bab7265c1d5f13641fc269d32eb34337537ef2911fe8e4003e1e8b858a80f7a72477896dd3613bbec1824c54402b9668 SHA512 38e47098997e435e5f91f6775ee2f63f41170c29af6868f942481fdaacad40167bcac7f9f48a52591a3ff39781c3cca2e5bc712ebe9046eb97ca87cfc889c765
+MISC metadata.xml 320 BLAKE2B 52dc068f02b6134f5fb38c8a527e6c2cd4f47e260654e0558377fa7b188d5beebcc1c503137014842ff6081f576986e8b1585f61047e019facf4261d54437c6f SHA512 1772f2d920e747cc7e4b1bd32dcc503f72f17c7bcb964e01c74df781a114e0c4879d6018bab9c9244be3adcdc52a5f36e0de9b4ea34743fa9b64313a6a691ad3
diff --git a/dev-php/phpspec-prophecy/files/autoload.php b/dev-php/phpspec-prophecy/files/autoload.php
new file mode 100644
index 000000000000..eb61ccb5eedb
--- /dev/null
+++ b/dev-php/phpspec-prophecy/files/autoload.php
@@ -0,0 +1,15 @@
+<?php
+/* Autoloader for dev-php/phpspec-prophecy */
+
+if (!class_exists('Fedora\\Autoloader\\Autoload', false)) {
+ require_once '/usr/share/php/Fedora/Autoloader/autoload.php';
+}
+
+Fedora\Autoloader\Autoload::addPsr0('Prophecy\\', __DIR__);
+
+\Fedora\Autoloader\Dependencies::required(array(
+ '/usr/share/php/phpDocumentor/ReflectionDocBlock/autoload.php',
+ '/usr/share/php/SebastianBergmann/Comparator/autoload.php',
+ '/usr/share/php/Doctrine/Instantiator/autoload.php',
+ '/usr/share/php/SebastianBergmann/RecursionContext/autoload.php',
+));
diff --git a/dev-php/phpspec-prophecy/metadata.xml b/dev-php/phpspec-prophecy/metadata.xml
new file mode 100644
index 000000000000..d8cce3e62197
--- /dev/null
+++ b/dev-php/phpspec-prophecy/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://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">phpspec/prophecy</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-php/phpspec-prophecy/phpspec-prophecy-1.7.0.ebuild b/dev-php/phpspec-prophecy/phpspec-prophecy-1.7.0.ebuild
new file mode 100644
index 000000000000..da0780af3c9f
--- /dev/null
+++ b/dev-php/phpspec-prophecy/phpspec-prophecy-1.7.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PN="prophecy"
+MY_VENDOR="phpspec"
+
+DESCRIPTION="Highly opinionated mocking framework"
+HOMEPAGE="https://github.com/${MY_VENDOR}/${MY_PN}"
+SRC_URI="https://github.com/${MY_VENDOR}/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+IUSE=""
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+RDEPEND="dev-php/fedora-autoloader
+ <dev-php/doctrine-instantiator-2
+ <dev-php/phpdocumentor-reflection-docblock-4
+ <dev-php/sebastian-comparator-3
+ <dev-php/sebastian-recursion-context-4
+ >=dev-lang/php-5.6:*"
+
+src_install() {
+ insinto /usr/share/php/${MY_VENDOR}/Prophecy
+ doins -r src/Prophecy/*
+ doins "${FILESDIR}/autoload.php"
+}
diff --git a/dev-php/phptal-1.3.1 b/dev-php/phptal-1.3.1
deleted file mode 100644
index c4226a3e34e4..000000000000
--- a/dev-php/phptal-1.3.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install test
-DEPEND=test? ( dev-lang/php:* dev-php/phpunit )
-DESCRIPTION=A templating engine for PHP5 that implements Zope Page Templates syntax
-EAPI=6
-HOMEPAGE=https://phptal.org/
-IUSE=test
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=dev-lang/php:*
-SLOT=0
-SRC_URI=https://github.com/phptal/PHPTAL/archive/v1.3.1.tar.gz -> phptal-1.3.1.tar.gz
-_md5_=5e0cca57d8c4a7fe971bded1286bf5a6
diff --git a/dev-php/phptal/Manifest b/dev-php/phptal/Manifest
new file mode 100644
index 000000000000..fa28599243ac
--- /dev/null
+++ b/dev-php/phptal/Manifest
@@ -0,0 +1,3 @@
+DIST phptal-1.3.1.tar.gz 272883 BLAKE2B 4914b8bb40464f22417fd7ed7dbf88709b95b69a69a905a5152ff640dd5af6af2be7c7d67a622d78029e4075b6b19d8d1bf537a4a6ccc0c97260e5183a961ecd SHA512 74856cbeab3f8d9d552bcb7275a0180fd25e7703230c90e4343fbe9be4001118b091fabbace89efa98a8bf0344f46edf36c4ba709ed0e9b040b82204ea3b7290
+EBUILD phptal-1.3.1.ebuild 808 BLAKE2B 28f94a4cfbef459c5a6b4cd2362529e358f692c346c46481f37757fd5d9d6112a6528ce77bde166e87d02242c19e73ed997bcdeb80c6b082e07f0ed84e4658e3 SHA512 cbc0477ffd9e5288df3bfcd374fcc9f4187730cf284fbc4d930be38134d34a201302abec8fc1d9f2428ef6d0af36c21d96df2811b1d150c88a8c171513dc52ba
+MISC metadata.xml 245 BLAKE2B 7d88a41bb224d6e6c8bc6ed766d24c4141ff7079307fc4e2dadd0d2300b565f5d8332f5a61ad49896af208f136f102bbfedb7b1f61241a82f21cbb6b0d9cc7e9 SHA512 81a613ac5d1bbcb88aad55e16c2b878dcc3a985a8c0d3b802a302067d94c3f878fa8b10aa4804a799a4180464b523eac2ee1bd6547d8baca8647e1e5cce38897
diff --git a/dev-php/phptal/metadata.xml b/dev-php/phptal/metadata.xml
new file mode 100644
index 000000000000..04d9b1663bd1
--- /dev/null
+++ b/dev-php/phptal/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ <name>PHP</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/dev-php/phptal/phptal-1.3.1.ebuild b/dev-php/phptal/phptal-1.3.1.ebuild
new file mode 100644
index 000000000000..f5ab86bdfd82
--- /dev/null
+++ b/dev-php/phptal/phptal-1.3.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PHP_LIB_NAME="PHPTAL"
+
+DESCRIPTION="A templating engine for PHP5 that implements Zope Page Templates syntax"
+HOMEPAGE="https://phptal.org/"
+SRC_URI="https://github.com/${PN}/${PHP_LIB_NAME}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="dev-lang/php:*"
+DEPEND="test? ( ${RDEPEND} dev-php/phpunit )"
+
+S="${WORKDIR}/${PHP_LIB_NAME}-${PV}"
+
+src_compile() { :; }
+
+src_install() {
+ insinto /usr/share/php/${PN}
+ doins -r "classes/${PHP_LIB_NAME}"
+ doins classes/PHPTAL.php tools/phptal_lint.php
+
+ dodoc README.md
+}
+
+src_test() {
+ [[ -z $(locale -a |grep en_GB) ]] && ewarn "Tests require en_GB locale to complete"
+ phpunit || die
+}
diff --git a/dev-php/phpunit-5.7.15-r1 b/dev-php/phpunit-5.7.15-r1
deleted file mode 100644
index 381ac863277a..000000000000
--- a/dev-php/phpunit-5.7.15-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install postinst
-DESCRIPTION=A PHP Unit Testing framework
-EAPI=6
-HOMEPAGE=http://phpunit.de
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86
-LICENSE=BSD
-RDEPEND=dev-php/fedora-autoloader >=dev-php/File_Iterator-1.4.0 !>=dev-php/File_Iterator-2.0 >=dev-php/Text_Template-1.2.0 !>=dev-php/Text_Template-2.0 >=dev-php/PHP_CodeCoverage-4.0.4 !>=dev-php/PHP_CodeCoverage-5.0 >=dev-php/PHP_Timer-1.0.6 !>=dev-php/PHP_Timer-2.0 <dev-php/myclabs-deepcopy-2.0 <dev-php/phpspec-prophecy-2.0 <dev-php/phpunit-mock-objects-4.0 <dev-php/sebastian-comparator-2.0 <dev-php/sebastian-diff-2.0 <dev-php/sebastian-environment-3.0 <dev-php/sebastian-exporter-3.0 <dev-php/sebastian-global-state-2.0 <dev-php/sebastian-object-enumerator-3.0 <dev-php/sebastian-resource-operations-2.0 <dev-php/sebastian-version-3.0 <dev-php/symfony-yaml-4.0 || ( dev-lang/php:5.6[cli,json,unicode,xml] dev-lang/php:7.0[cli,json,unicode,xml] dev-lang/php:7.1[cli,json,unicode,xml] )
-SLOT=0
-SRC_URI=https://github.com/sebastianbergmann/phpunit/archive/5.7.15.tar.gz -> phpunit-5.7.15.tar.gz
-_md5_=7caae7c2dfa991b1b71108cd52b4db26
diff --git a/dev-php/phpunit-mock-objects-3.4.3 b/dev-php/phpunit-mock-objects-3.4.3
deleted file mode 100644
index d2285df60a4c..000000000000
--- a/dev-php/phpunit-mock-objects-3.4.3
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Mock Object library for PHPUnit
-EAPI=6
-HOMEPAGE=http://phpunit.de
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86
-LICENSE=BSD
-RDEPEND=dev-php/fedora-autoloader >=dev-php/Text_Template-1.2 !>=dev-php/Text_Template-2.0 <dev-php/doctrine-instantiator-2.0 <dev-php/sebastian-exporter-3.0 !<dev-php/phpunit-5.4.0 >=dev-lang/php-5.6:*
-SLOT=0
-SRC_URI=https://github.com/sebastianbergmann/phpunit-mock-objects/archive/3.4.3.tar.gz -> phpunit-mock-objects-3.4.3.tar.gz
-_md5_=c1d79eccd5849aac4992d5c212c35689
diff --git a/dev-php/phpunit-mock-objects/Manifest b/dev-php/phpunit-mock-objects/Manifest
new file mode 100644
index 000000000000..f5b585c5f6a3
--- /dev/null
+++ b/dev-php/phpunit-mock-objects/Manifest
@@ -0,0 +1,4 @@
+AUX autoload.php 3973 BLAKE2B 0d76a132dd080b8f8fe839b1c3cb750372440ff903e464232bdcbaf2fc499c96a7579c63735631885b7e7422b3f6646179a0c4748d3885b81b53fc6652d1c164 SHA512 aee22419472bbca6c5b6a951a41c0a4098071679e5ddd40282a2d717a854189546ac8d2a8d2a9aad43e28b6ff831cedd6541c3b5e19d5599d62ffe2815204ea0
+DIST phpunit-mock-objects-3.4.3.tar.gz 37921 BLAKE2B 1d1cb1dc0bf024525f3d226d1fa67eb27a6de747ac90d58c54d145d284bb0edc06821f45b7b7bb8a3378bd68baa01c31e773da9ff522a410b3f5038746eadf67 SHA512 c9305796062a9ef412c194a82322c913b695c74fd9505580707381f9d9f96f6d69a16bde2c35226240e3c2bfaa6f0f9bf1c94c178b8a1f050b5afef7e53611de
+EBUILD phpunit-mock-objects-3.4.3.ebuild 746 BLAKE2B 0045f8e5cd267b585742c8f38049aa7448d59cccb0a68173b853cd60b8c3a17fb223fb2707e89919e8bea25587f94bcc424dbc341e7deaa214c3e128c7ff3655 SHA512 eb0f1e41a6a49f179da237d6a7e32629b2ae9b6226af0a68208dfb26de198d5b8a66e5db5c68ce9ca5c49b8c013d3dd575eaa6a341fe2b2575fa73d4bc7d5111
+MISC metadata.xml 342 BLAKE2B 1dd45edd9b24f97ff402f3b3821e9019873024d52cf1dad8541fbb165393ef9b6f38834744c9093ea033eec4b901c91e59713d3c879a6f93c8ae5f3863980b42 SHA512 81c56c098a010d97eada1ff754710726c9ede41eec3605bd7dc0e69e5066b58afcab886d4a55fa2977482cee82f7c203ae6f9e794b4c190359e66b5a756ece51
diff --git a/dev-php/phpunit-mock-objects/files/autoload.php b/dev-php/phpunit-mock-objects/files/autoload.php
new file mode 100644
index 000000000000..96bcae916553
--- /dev/null
+++ b/dev-php/phpunit-mock-objects/files/autoload.php
@@ -0,0 +1,61 @@
+<?php
+/* Autoloader for dev-php/sebastian-diff */
+
+if (!class_exists('Fedora\\Autoloader\\Autoload', false)) {
+ require_once '/usr/share/php/Fedora/Autoloader/autoload.php';
+}
+
+\Fedora\Autoloader\Autoload::addClassMap(
+ array(
+ 'phpunit_framework_mockobject_badmethodcallexception' => '/Exception/BadMethodCallException.php',
+ 'phpunit_framework_mockobject_builder_identity' => '/Builder/Identity.php',
+ 'phpunit_framework_mockobject_builder_invocationmocker' => '/Builder/InvocationMocker.php',
+ 'phpunit_framework_mockobject_builder_match' => '/Builder/Match.php',
+ 'phpunit_framework_mockobject_builder_methodnamematch' => '/Builder/MethodNameMatch.php',
+ 'phpunit_framework_mockobject_builder_namespace' => '/Builder/Namespace.php',
+ 'phpunit_framework_mockobject_builder_parametersmatch' => '/Builder/ParametersMatch.php',
+ 'phpunit_framework_mockobject_builder_stub' => '/Builder/Stub.php',
+ 'phpunit_framework_mockobject_exception' => '/Exception/Exception.php',
+ 'phpunit_framework_mockobject_generator' => '/Generator.php',
+ 'phpunit_framework_mockobject_invocation' => '/Invocation.php',
+ 'phpunit_framework_mockobject_invocationmocker' => '/InvocationMocker.php',
+ 'phpunit_framework_mockobject_invocation_object' => '/Invocation/Object.php',
+ 'phpunit_framework_mockobject_invocation_static' => '/Invocation/Static.php',
+ 'phpunit_framework_mockobject_invokable' => '/Invokable.php',
+ 'phpunit_framework_mockobject_matcher' => '/Matcher.php',
+ 'phpunit_framework_mockobject_matcher_anyinvokedcount' => '/Matcher/AnyInvokedCount.php',
+ 'phpunit_framework_mockobject_matcher_anyparameters' => '/Matcher/AnyParameters.php',
+ 'phpunit_framework_mockobject_matcher_consecutiveparameters' => '/Matcher/ConsecutiveParameters.php',
+ 'phpunit_framework_mockobject_matcher_invocation' => '/Matcher/Invocation.php',
+ 'phpunit_framework_mockobject_matcher_invokedatindex' => '/Matcher/InvokedAtIndex.php',
+ 'phpunit_framework_mockobject_matcher_invokedatleastcount' => '/Matcher/InvokedAtLeastCount.php',
+ 'phpunit_framework_mockobject_matcher_invokedatleastonce' => '/Matcher/InvokedAtLeastOnce.php',
+ 'phpunit_framework_mockobject_matcher_invokedatmostcount' => '/Matcher/InvokedAtMostCount.php',
+ 'phpunit_framework_mockobject_matcher_invokedcount' => '/Matcher/InvokedCount.php',
+ 'phpunit_framework_mockobject_matcher_invokedrecorder' => '/Matcher/InvokedRecorder.php',
+ 'phpunit_framework_mockobject_matcher_methodname' => '/Matcher/MethodName.php',
+ 'phpunit_framework_mockobject_matcher_parameters' => '/Matcher/Parameters.php',
+ 'phpunit_framework_mockobject_matcher_statelessinvocation' => '/Matcher/StatelessInvocation.php',
+ 'phpunit_framework_mockobject_mockbuilder' => '/MockBuilder.php',
+ 'phpunit_framework_mockobject_mockobject' => '/MockObject.php',
+ 'phpunit_framework_mockobject_runtimeexception' => '/Exception/RuntimeException.php',
+ 'phpunit_framework_mockobject_stub' => '/Stub.php',
+ 'phpunit_framework_mockobject_stub_consecutivecalls' => '/Stub/ConsecutiveCalls.php',
+ 'phpunit_framework_mockobject_stub_exception' => '/Stub/Exception.php',
+ 'phpunit_framework_mockobject_stub_matchercollection' => '/Stub/MatcherCollection.php',
+ 'phpunit_framework_mockobject_stub_return' => '/Stub/Return.php',
+ 'phpunit_framework_mockobject_stub_returnargument' => '/Stub/ReturnArgument.php',
+ 'phpunit_framework_mockobject_stub_returncallback' => '/Stub/ReturnCallback.php',
+ 'phpunit_framework_mockobject_stub_returnreference' => '/Stub/ReturnReference.php',
+ 'phpunit_framework_mockobject_stub_returnself' => '/Stub/ReturnSelf.php',
+ 'phpunit_framework_mockobject_stub_returnvaluemap' => '/Stub/ReturnValueMap.php',
+ 'phpunit_framework_mockobject_verifiable' => '/Verifiable.php',
+ ),
+ __DIR__
+);
+
+\Fedora\Autoloader\Dependencies::required(array(
+ '/usr/share/php/Doctrine/Instantiator/autoload.php',
+ '/usr/share/php/SebastianBergmann/Exporter/autoload.php',
+ '/usr/share/php/Text/Template/autoload.php',
+));
diff --git a/dev-php/phpunit-mock-objects/metadata.xml b/dev-php/phpunit-mock-objects/metadata.xml
new file mode 100644
index 000000000000..f248b11380b7
--- /dev/null
+++ b/dev-php/phpunit-mock-objects/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://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">sebastianbergmann/phpunit-mock-objects</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-php/phpunit-mock-objects/phpunit-mock-objects-3.4.3.ebuild b/dev-php/phpunit-mock-objects/phpunit-mock-objects-3.4.3.ebuild
new file mode 100644
index 000000000000..83773b85230f
--- /dev/null
+++ b/dev-php/phpunit-mock-objects/phpunit-mock-objects-3.4.3.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Mock Object library for PHPUnit"
+HOMEPAGE="http://phpunit.de"
+SRC_URI="https://github.com/sebastianbergmann/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+IUSE=""
+
+RDEPEND="dev-php/fedora-autoloader
+ >=dev-php/Text_Template-1.2
+ !>=dev-php/Text_Template-2.0
+ <dev-php/doctrine-instantiator-2.0
+ <dev-php/sebastian-exporter-3.0
+ !<dev-php/phpunit-5.4.0
+ >=dev-lang/php-5.6:*"
+
+src_install() {
+ insinto /usr/share/php/PHPUnit/
+ doins -r src/*
+ insinto /usr/share/php/PHPUnit/Framework/MockObject
+ doins "${FILESDIR}/autoload.php"
+}
diff --git a/dev-php/phpunit/Manifest b/dev-php/phpunit/Manifest
new file mode 100644
index 000000000000..1a998a740532
--- /dev/null
+++ b/dev-php/phpunit/Manifest
@@ -0,0 +1,4 @@
+AUX autoload.php 11422 BLAKE2B 90c68a16ab1c2a81c31430984b426e0717881e29231ea008c6e75113d4180733af64a5edf7b1aabd8fd6e84b312ed79b80ee001d805d40f060b9b641c0c27948 SHA512 1d4fd0854a85bc404f5567b78effbc0eb41859601b8e56faaa4362e85ec4d07969864b21df3188fc5e82d5993c67655fa278a9c310b2ec7366aa2195c91e90da
+DIST phpunit-5.7.15.tar.gz 205474 BLAKE2B 0220edd59fc3f191b7621f275d3e4ee8f8bf514f74533d99bfb925e11cc54a235fb292ffd1bb54f6bec1e038c06e35a0dc43c1227618590f99e7e85638a7de28 SHA512 6a836e1ad1656fd1d1c5a58ced3c1826b4decc01798b6a804b487c9b4e094ec32f6eb8a84058e268eade62a2fe19d7bd1e760b8b9433299d9fe9c09afdf2bdd3
+EBUILD phpunit-5.7.15-r1.ebuild 1616 BLAKE2B 08105d6c0d1928bf94b7bba2ad8d04461e22df6cace49739c944213f55d9089e29c0f0fb89806dbecadc8af0288a65c88a2edccfc535e934b021665a8eb8ec60 SHA512 026a7ed14423a855d23cc254bb2b0c3062ad5f59af7092cb92fbc47b47db97a09e5c78db7202a99a11e82745f69a4c4029d69812baeff3ad87d965a81c5c0dc7
+MISC metadata.xml 329 BLAKE2B 45eb57929680d3c3d1c60a22dd1b760db42b1ce2a157c9b87209c391a08022c01a103972267b2f36cea142681d3cc3691a27c726b9a132974d7bb418e5316928 SHA512 007a4fea4de75a468e377398bb1539e25eedc8009ad6dcb6c170be653821b73d8eaaaeb236e207a2e33a509d2966f6a9571d8f0219d90b1662d4da1cdc7de896
diff --git a/dev-php/phpunit/files/autoload.php b/dev-php/phpunit/files/autoload.php
new file mode 100644
index 000000000000..f33b4c8881a1
--- /dev/null
+++ b/dev-php/phpunit/files/autoload.php
@@ -0,0 +1,170 @@
+<?php
+/* Autoloader for dev-php/phpunit and its dependencies */
+
+$include_dir = '/usr/share/php';
+
+if (!class_exists('Fedora\\Autoloader\\Autoload', false)) {
+ require_once "${include_dir}/Fedora/Autoloader/autoload.php";
+}
+
+\Fedora\Autoloader\Autoload::addClassMap(
+ array(
+ 'phpunit\\framework\\assert' => '/ForwardCompatibility/Assert.php',
+ 'phpunit\\framework\\basetestlistener' => '/ForwardCompatibility/BaseTestListener.php',
+ 'phpunit\\framework\\testcase' => '/ForwardCompatibility/TestCase.php',
+ 'phpunit\\framework\\testlistener' => '/ForwardCompatibility/TestListener.php',
+ 'phpunit_exception' => '/Exception.php',
+ 'phpunit_extensions_grouptestsuite' => '/Extensions/GroupTestSuite.php',
+ 'phpunit_extensions_phpttestcase' => '/Extensions/PhptTestCase.php',
+ 'phpunit_extensions_phpttestsuite' => '/Extensions/PhptTestSuite.php',
+ 'phpunit_extensions_repeatedtest' => '/Extensions/RepeatedTest.php',
+ 'phpunit_extensions_testdecorator' => '/Extensions/TestDecorator.php',
+ 'phpunit_extensions_ticketlistener' => '/Extensions/TicketListener.php',
+ 'phpunit_framework_assert' => '/Framework/Assert.php',
+ 'phpunit_framework_assertionfailederror' => '/Framework/AssertionFailedError.php',
+ 'phpunit_framework_basetestlistener' => '/Framework/BaseTestListener.php',
+ 'phpunit_framework_codecoverageexception' => '/Framework/CodeCoverageException.php',
+ 'phpunit_framework_constraint' => '/Framework/Constraint.php',
+ 'phpunit_framework_constraint_and' => '/Framework/Constraint/And.php',
+ 'phpunit_framework_constraint_arrayhaskey' => '/Framework/Constraint/ArrayHasKey.php',
+ 'phpunit_framework_constraint_arraysubset' => '/Framework/Constraint/ArraySubset.php',
+ 'phpunit_framework_constraint_attribute' => '/Framework/Constraint/Attribute.php',
+ 'phpunit_framework_constraint_callback' => '/Framework/Constraint/Callback.php',
+ 'phpunit_framework_constraint_classhasattribute' => '/Framework/Constraint/ClassHasAttribute.php',
+ 'phpunit_framework_constraint_classhasstaticattribute' => '/Framework/Constraint/ClassHasStaticAttribute.php',
+ 'phpunit_framework_constraint_composite' => '/Framework/Constraint/Composite.php',
+ 'phpunit_framework_constraint_count' => '/Framework/Constraint/Count.php',
+ 'phpunit_framework_constraint_directoryexists' => '/Framework/Constraint/DirectoryExists.php',
+ 'phpunit_framework_constraint_exception' => '/Framework/Constraint/Exception.php',
+ 'phpunit_framework_constraint_exceptioncode' => '/Framework/Constraint/ExceptionCode.php',
+ 'phpunit_framework_constraint_exceptionmessage' => '/Framework/Constraint/ExceptionMessage.php',
+ 'phpunit_framework_constraint_exceptionmessageregexp' => '/Framework/Constraint/ExceptionMessageRegExp.php',
+ 'phpunit_framework_constraint_fileexists' => '/Framework/Constraint/FileExists.php',
+ 'phpunit_framework_constraint_greaterthan' => '/Framework/Constraint/GreaterThan.php',
+ 'phpunit_framework_constraint_isanything' => '/Framework/Constraint/IsAnything.php',
+ 'phpunit_framework_constraint_isempty' => '/Framework/Constraint/IsEmpty.php',
+ 'phpunit_framework_constraint_isequal' => '/Framework/Constraint/IsEqual.php',
+ 'phpunit_framework_constraint_isfalse' => '/Framework/Constraint/IsFalse.php',
+ 'phpunit_framework_constraint_isfinite' => '/Framework/Constraint/IsFinite.php',
+ 'phpunit_framework_constraint_isidentical' => '/Framework/Constraint/IsIdentical.php',
+ 'phpunit_framework_constraint_isinfinite' => '/Framework/Constraint/IsInfinite.php',
+ 'phpunit_framework_constraint_isinstanceof' => '/Framework/Constraint/IsInstanceOf.php',
+ 'phpunit_framework_constraint_isjson' => '/Framework/Constraint/IsJson.php',
+ 'phpunit_framework_constraint_isnan' => '/Framework/Constraint/IsNan.php',
+ 'phpunit_framework_constraint_isnull' => '/Framework/Constraint/IsNull.php',
+ 'phpunit_framework_constraint_isreadable' => '/Framework/Constraint/IsReadable.php',
+ 'phpunit_framework_constraint_istrue' => '/Framework/Constraint/IsTrue.php',
+ 'phpunit_framework_constraint_istype' => '/Framework/Constraint/IsType.php',
+ 'phpunit_framework_constraint_iswritable' => '/Framework/Constraint/IsWritable.php',
+ 'phpunit_framework_constraint_jsonmatches' => '/Framework/Constraint/JsonMatches.php',
+ 'phpunit_framework_constraint_jsonmatches_errormessageprovider' => '/Framework/Constraint/JsonMatches/ErrorMessageProvider.php',
+ 'phpunit_framework_constraint_lessthan' => '/Framework/Constraint/LessThan.php',
+ 'phpunit_framework_constraint_not' => '/Framework/Constraint/Not.php',
+ 'phpunit_framework_constraint_objecthasattribute' => '/Framework/Constraint/ObjectHasAttribute.php',
+ 'phpunit_framework_constraint_or' => '/Framework/Constraint/Or.php',
+ 'phpunit_framework_constraint_pcrematch' => '/Framework/Constraint/PCREMatch.php',
+ 'phpunit_framework_constraint_samesize' => '/Framework/Constraint/SameSize.php',
+ 'phpunit_framework_constraint_stringcontains' => '/Framework/Constraint/StringContains.php',
+ 'phpunit_framework_constraint_stringendswith' => '/Framework/Constraint/StringEndsWith.php',
+ 'phpunit_framework_constraint_stringmatches' => '/Framework/Constraint/StringMatches.php',
+ 'phpunit_framework_constraint_stringstartswith' => '/Framework/Constraint/StringStartsWith.php',
+ 'phpunit_framework_constraint_traversablecontains' => '/Framework/Constraint/TraversableContains.php',
+ 'phpunit_framework_constraint_traversablecontainsonly' => '/Framework/Constraint/TraversableContainsOnly.php',
+ 'phpunit_framework_constraint_xor' => '/Framework/Constraint/Xor.php',
+ 'phpunit_framework_coveredcodenotexecutedexception' => '/Framework/CoveredCodeNotExecutedException.php',
+ 'phpunit_framework_error' => '/Framework/Error.php',
+ 'phpunit_framework_error_deprecated' => '/Framework/Error/Deprecated.php',
+ 'phpunit_framework_error_notice' => '/Framework/Error/Notice.php',
+ 'phpunit_framework_error_warning' => '/Framework/Error/Warning.php',
+ 'phpunit_framework_exception' => '/Framework/Exception.php',
+ 'phpunit_framework_exceptionwrapper' => '/Framework/ExceptionWrapper.php',
+ 'phpunit_framework_expectationfailedexception' => '/Framework/ExpectationFailedException.php',
+ 'phpunit_framework_incompletetest' => '/Framework/IncompleteTest.php',
+ 'phpunit_framework_incompletetestcase' => '/Framework/IncompleteTestCase.php',
+ 'phpunit_framework_incompletetesterror' => '/Framework/IncompleteTestError.php',
+ 'phpunit_framework_invalidcoverstargetexception' => '/Framework/InvalidCoversTargetException.php',
+ 'phpunit_framework_missingcoversannotationexception' => '/Framework/MissingCoversAnnotationException.php',
+ 'phpunit_framework_outputerror' => '/Framework/OutputError.php',
+ 'phpunit_framework_riskytest' => '/Framework/RiskyTest.php',
+ 'phpunit_framework_riskytesterror' => '/Framework/RiskyTestError.php',
+ 'phpunit_framework_selfdescribing' => '/Framework/SelfDescribing.php',
+ 'phpunit_framework_skippedtest' => '/Framework/SkippedTest.php',
+ 'phpunit_framework_skippedtestcase' => '/Framework/SkippedTestCase.php',
+ 'phpunit_framework_skippedtesterror' => '/Framework/SkippedTestError.php',
+ 'phpunit_framework_skippedtestsuiteerror' => '/Framework/SkippedTestSuiteError.php',
+ 'phpunit_framework_syntheticerror' => '/Framework/SyntheticError.php',
+ 'phpunit_framework_test' => '/Framework/Test.php',
+ 'phpunit_framework_testcase' => '/Framework/TestCase.php',
+ 'phpunit_framework_testfailure' => '/Framework/TestFailure.php',
+ 'phpunit_framework_testlistener' => '/Framework/TestListener.php',
+ 'phpunit_framework_testresult' => '/Framework/TestResult.php',
+ 'phpunit_framework_testsuite' => '/Framework/TestSuite.php',
+ 'phpunit_framework_testsuite_dataprovider' => '/Framework/TestSuite/DataProvider.php',
+ 'phpunit_framework_unintentionallycoveredcodeerror' => '/Framework/UnintentionallyCoveredCodeError.php',
+ 'phpunit_framework_warning' => '/Framework/Warning.php',
+ 'phpunit_framework_warningtestcase' => '/Framework/WarningTestCase.php',
+ 'phpunit_runner_basetestrunner' => '/Runner/BaseTestRunner.php',
+ 'phpunit_runner_exception' => '/Runner/Exception.php',
+ 'phpunit_runner_filter_factory' => '/Runner/Filter/Factory.php',
+ 'phpunit_runner_filter_group_exclude' => '/Runner/Filter/Group/Exclude.php',
+ 'phpunit_runner_filter_group_include' => '/Runner/Filter/Group/Include.php',
+ 'phpunit_runner_filter_groupfilteriterator' => '/Runner/Filter/Group.php',
+ 'phpunit_runner_filter_test' => '/Runner/Filter/Test.php',
+ 'phpunit_runner_standardtestsuiteloader' => '/Runner/StandardTestSuiteLoader.php',
+ 'phpunit_runner_testsuiteloader' => '/Runner/TestSuiteLoader.php',
+ 'phpunit_runner_version' => '/Runner/Version.php',
+ 'phpunit_textui_command' => '/TextUI/Command.php',
+ 'phpunit_textui_resultprinter' => '/TextUI/ResultPrinter.php',
+ 'phpunit_textui_testrunner' => '/TextUI/TestRunner.php',
+ 'phpunit_util_blacklist' => '/Util/Blacklist.php',
+ 'phpunit_util_configuration' => '/Util/Configuration.php',
+ 'phpunit_util_configurationgenerator' => '/Util/ConfigurationGenerator.php',
+ 'phpunit_util_errorhandler' => '/Util/ErrorHandler.php',
+ 'phpunit_util_fileloader' => '/Util/Fileloader.php',
+ 'phpunit_util_filesystem' => '/Util/Filesystem.php',
+ 'phpunit_util_filter' => '/Util/Filter.php',
+ 'phpunit_util_getopt' => '/Util/Getopt.php',
+ 'phpunit_util_globalstate' => '/Util/GlobalState.php',
+ 'phpunit_util_invalidargumenthelper' => '/Util/InvalidArgumentHelper.php',
+ 'phpunit_util_log_json' => '/Util/Log/JSON.php',
+ 'phpunit_util_log_junit' => '/Util/Log/JUnit.php',
+ 'phpunit_util_log_tap' => '/Util/Log/TAP.php',
+ 'phpunit_util_log_teamcity' => '/Util/Log/TeamCity.php',
+ 'phpunit_util_php' => '/Util/PHP.php',
+ 'phpunit_util_php_default' => '/Util/PHP/Default.php',
+ 'phpunit_util_php_windows' => '/Util/PHP/Windows.php',
+ 'phpunit_util_printer' => '/Util/Printer.php',
+ 'phpunit_util_regex' => '/Util/Regex.php',
+ 'phpunit_util_string' => '/Util/String.php',
+ 'phpunit_util_test' => '/Util/Test.php',
+ 'phpunit_util_testdox_nameprettifier' => '/Util/TestDox/NamePrettifier.php',
+ 'phpunit_util_testdox_resultprinter' => '/Util/TestDox/ResultPrinter.php',
+ 'phpunit_util_testdox_resultprinter_html' => '/Util/TestDox/ResultPrinter/HTML.php',
+ 'phpunit_util_testdox_resultprinter_text' => '/Util/TestDox/ResultPrinter/Text.php',
+ 'phpunit_util_testdox_resultprinter_xml' => '/Util/TestDox/ResultPrinter/XML.php',
+ 'phpunit_util_testsuiteiterator' => '/Util/TestSuiteIterator.php',
+ 'phpunit_util_type' => '/Util/Type.php',
+ 'phpunit_util_xml' => '/Util/XML.php',
+),
+ "${include_dir}/PHPUnit"
+);
+
+// Dependencies
+\Fedora\Autoloader\Dependencies::required(array(
+ "${include_dir}/File/Iterator/autoload.php",
+ "${include_dir}/PHP/CodeCoverage/autoload.php",
+ "${include_dir}/PHP/Timer/autoload.php",
+ "${include_dir}/SebastianBergmann/Version/autoload.php",
+ "${include_dir}/SebastianBergmann/Diff/autoload.php",
+ "${include_dir}/SebastianBergmann/Environment/autoload.php",
+ "${include_dir}/SebastianBergmann/Exporter/autoload.php",
+ "${include_dir}/SebastianBergmann/GlobalState/autoload.php",
+ "${include_dir}/SebastianBergmann/Comparator/autoload.php",
+ "${include_dir}/SebastianBergmann/ObjectEnumerator/autoload.php",
+ "${include_dir}/SebastianBergmann/ResourceOperations/autoload.php",
+ "${include_dir}/Symfony/Component/Yaml/autoload.php",
+ "${include_dir}/Text/Template/autoload.php",
+ "${include_dir}/myclabs/DeepCopy/autoload.php",
+ "${include_dir}/PHPUnit/Framework/MockObject/autoload.php",
+ "${include_dir}/phpspec/Prophecy/autoload.php",
+));
diff --git a/dev-php/phpunit/metadata.xml b/dev-php/phpunit/metadata.xml
new file mode 100644
index 000000000000..44a54c50110f
--- /dev/null
+++ b/dev-php/phpunit/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://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">sebastianbergmann/phpunit</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-php/phpunit/phpunit-5.7.15-r1.ebuild b/dev-php/phpunit/phpunit-5.7.15-r1.ebuild
new file mode 100644
index 000000000000..6fa7de02877f
--- /dev/null
+++ b/dev-php/phpunit/phpunit-5.7.15-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="A PHP Unit Testing framework"
+HOMEPAGE="http://phpunit.de"
+SRC_URI="https://github.com/sebastianbergmann/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+IUSE=""
+
+RDEPEND="dev-php/fedora-autoloader
+ >=dev-php/File_Iterator-1.4.0
+ !>=dev-php/File_Iterator-2.0
+ >=dev-php/Text_Template-1.2.0
+ !>=dev-php/Text_Template-2.0
+ >=dev-php/PHP_CodeCoverage-4.0.4
+ !>=dev-php/PHP_CodeCoverage-5.0
+ >=dev-php/PHP_Timer-1.0.6
+ !>=dev-php/PHP_Timer-2.0
+ <dev-php/myclabs-deepcopy-2.0
+ <dev-php/phpspec-prophecy-2.0
+ <dev-php/phpunit-mock-objects-4.0
+ <dev-php/sebastian-comparator-2.0
+ <dev-php/sebastian-diff-2.0
+ <dev-php/sebastian-environment-3.0
+ <dev-php/sebastian-exporter-3.0
+ <dev-php/sebastian-global-state-2.0
+ <dev-php/sebastian-object-enumerator-3.0
+ <dev-php/sebastian-resource-operations-2.0
+ <dev-php/sebastian-version-3.0
+ <dev-php/symfony-yaml-4.0
+ || (
+ dev-lang/php:5.6[cli,json,unicode,xml]
+ dev-lang/php:7.0[cli,json,unicode,xml]
+ dev-lang/php:7.1[cli,json,unicode,xml]
+ )"
+
+src_install() {
+ insinto /usr/share/php/PHPUnit
+ doins -r src/*
+ insinto /usr/share/php/PHPUnit/vendor
+ doins "${FILESDIR}/autoload.php"
+ exeinto /usr/share/php/PHPUnit
+ doexe phpunit
+ dosym ../share/php/PHPUnit/phpunit /usr/bin/phpunit
+}
+
+pkg_postinst() {
+ elog "${PN} can optionally use json, pdo-sqlite and pdo-mysql features."
+ elog "If you want those, emerge dev-lang/php with USE=\"json pdo sqlite mysql\"."
+}
diff --git a/dev-php/psr-log-1.0.2 b/dev-php/psr-log-1.0.2
deleted file mode 100644
index 2dea9b452866..000000000000
--- a/dev-php/psr-log-1.0.2
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Common interface for logging libraries
-EAPI=6
-HOMEPAGE=https://github.com/php-fig/log
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-lang/php:* dev-php/fedora-autoloader
-SLOT=0
-SRC_URI=https://github.com/php-fig/log/archive/1.0.2.tar.gz -> psr-log-1.0.2.tar.gz
-_md5_=770b8a9cfe159e6082ec6c96082764d2
diff --git a/dev-php/psr-log/Manifest b/dev-php/psr-log/Manifest
new file mode 100644
index 000000000000..aabae34172ef
--- /dev/null
+++ b/dev-php/psr-log/Manifest
@@ -0,0 +1,4 @@
+AUX autoload.php 258 BLAKE2B 64c22f9d35d5b8a66d0823348273123a8440eb3f93b3627767ea9112f23d488422137e5abf329d68b4f320032e1dd74ad5e17b914ca3158036d440e6acadb696 SHA512 ced0c315c49aa13275c6b06ad0c10d2601654408aa4bd535103ac518c977554c7dfaccb31a7c151ada94dfc9c1198a3c4758ce6a020d6a70041aa9cc3fea634e
+DIST psr-log-1.0.2.tar.gz 4755 BLAKE2B d56a388a94b7cfacbe082280736e5ef203c271de0aec159da56c1ad17efb3bc92e8b4bf45b9d9f5b6fd4c84c107d0c1bc28ab329fcac3b43d179233e1905497c SHA512 a95cf38a92e7259d615d48cf002c4a0a0b6d6a166a345dc40e7636f913e7a787fdc35d4279741d90e04f9b564b608a138ce2e59115014da6be9d779de2a01bf8
+EBUILD psr-log-1.0.2.ebuild 533 BLAKE2B ba31a5751c781fe59f2ce5b73c565d4098ff011f44410cd2249435db0737c33b7fb58b441a8a4b560724bba3ccbdce68a12fc16f2f896a8ab0b7c35927cc21e4 SHA512 084b128cb1cda9b2a285607062dc6ccd33d9f4dab7ed0a1f0c67e9f719bb29a583e6446082edfd7a0f26daedce176bd28dfb5b31aad9a1ee52fa3e22a83c1377
+MISC metadata.xml 802 BLAKE2B a50b772abd7bebd2cf16fa744d0be648addc253b3c5be3c5450786af67bd66d11f2522bc27aa8b94ee3fb33d1d52225291e134a25a85468eb533cd0ef22007d2 SHA512 40f97201809cdbb080091ad04a06c6d9fd890ee0834be17591fcd91ae69a8af45c19f7ba09b6da85ea06b4b7ff8057533519a780b8121a02ba71bbc5ee7f0cff
diff --git a/dev-php/psr-log/files/autoload.php b/dev-php/psr-log/files/autoload.php
new file mode 100644
index 000000000000..fac5a688b5a9
--- /dev/null
+++ b/dev-php/psr-log/files/autoload.php
@@ -0,0 +1,8 @@
+<?php
+/* Autoloader for composer/ca-bundle and its dependencies */
+
+if (!class_exists('Fedora\\Autoloader\\Autoload', false)) {
+ require_once '/usr/share/php/Fedora/Autoloader/autoload.php';
+}
+
+\Fedora\Autoloader\Autoload::addPsr4('Psr\\Log\\', __DIR__);
diff --git a/dev-php/psr-log/metadata.xml b/dev-php/psr-log/metadata.xml
new file mode 100644
index 000000000000..fe0e94c1cd9a
--- /dev/null
+++ b/dev-php/psr-log/metadata.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>guillaumeseren@gmail.com</email>
+ <name>Guillaume Seren</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ </maintainer>
+ <longdescription>
+ PSR-3 logger, provide a common interface for logging libraries.
+ The main goal is to allow libraries to receive a
+ Psr\Log\LoggerInterface object and write logs to it in a simple
+ and universal way.
+ </longdescription>
+ <upstream>
+ <remote-id type="github">php-fig/log</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-php/psr-log/psr-log-1.0.2.ebuild b/dev-php/psr-log/psr-log-1.0.2.ebuild
new file mode 100644
index 000000000000..f8330e5d3cf8
--- /dev/null
+++ b/dev-php/psr-log/psr-log-1.0.2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Common interface for logging libraries"
+HOMEPAGE="https://github.com/php-fig/log"
+SRC_URI="https://github.com/php-fig/log/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+ dev-lang/php:*
+ dev-php/fedora-autoloader"
+
+S="${WORKDIR}/log-${PV}"
+
+src_install() {
+ insinto "/usr/share/php/Psr/Log"
+ doins -r Psr/Log/. "${FILESDIR}"/autoload.php
+ dodoc README.md
+}
diff --git a/dev-php/recaptcha-1.1.3 b/dev-php/recaptcha-1.1.3
deleted file mode 100644
index a02c3918fb16..000000000000
--- a/dev-php/recaptcha-1.1.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst test
-DEPEND=test? ( dev-php/phpunit )
-DESCRIPTION=PHP client library for Google's reCAPTCHA service
-EAPI=6
-HOMEPAGE=https://github.com/google/recaptcha
-IUSE=examples test
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=dev-lang/php
-SLOT=0
-SRC_URI=https://github.com/google/recaptcha/archive/1.1.3.tar.gz -> recaptcha-1.1.3.tar.gz
-_md5_=91de61376997f16265226998a493c7ce
diff --git a/dev-php/recaptcha/Manifest b/dev-php/recaptcha/Manifest
new file mode 100644
index 000000000000..7f1f03a4bf16
--- /dev/null
+++ b/dev-php/recaptcha/Manifest
@@ -0,0 +1,3 @@
+DIST recaptcha-1.1.3.tar.gz 12909 BLAKE2B cbffb64148f3359f4d351089fde65d2b9c8136e0814b5f6aedb3cd9b7f7d3f8f77d9673059f3909b381cf9151ca34a31bb961fe8686bdda4612c718828e46036 SHA512 54e22654d3b24400e448260f1d075ba2586d33cf44e0a5187b5c1288705b29bf9de394f8ca48f7717a2480cb1ae21348cc63e724f1eb93f268407a942b13f9dd
+EBUILD recaptcha-1.1.3.ebuild 919 BLAKE2B 8e8949018ab7f21addc45fe32ffff4cba9031d2045f0133e41024f39049b9a59d43f9c848b1dec9c3ab779b8aaa52727d15f5f355d6628dc8d6b95d6b69f4eb5 SHA512 87b6ea66c192985a3e9a6502cefd9e7710a7ba6545201bd2f26245db4577ddaa9511ba26f3e56a62309bf46cb7745c568022cbea967a40c6e2e2594a363a23ac
+MISC metadata.xml 337 BLAKE2B f5bf73fb4a4f700d08f240f2f5fbf629322ab2f8db346085d09331b69958545dbbf53973a6f04d105edc070901b2cc82ee7800f6be134f159bd7b6587631119b SHA512 abbe5982149863ee6b21edcc5299238a1449ec2ff4088b86453ef4196a2903c1d6fe38cec785562904369944fc6231b463cc1c4914e3eba8e6744bbe2a8ed520
diff --git a/dev-php/recaptcha/metadata.xml b/dev-php/recaptcha/metadata.xml
new file mode 100644
index 000000000000..199668983735
--- /dev/null
+++ b/dev-php/recaptcha/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>mjo@gentoo.org</email>
+ <name>Michael Orlitzky</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">google/recaptcha</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-php/recaptcha/recaptcha-1.1.3.ebuild b/dev-php/recaptcha/recaptcha-1.1.3.ebuild
new file mode 100644
index 000000000000..c91f2b60d6f1
--- /dev/null
+++ b/dev-php/recaptcha/recaptcha-1.1.3.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="PHP client library for Google's reCAPTCHA service"
+HOMEPAGE="https://github.com/google/recaptcha"
+SRC_URI="https://github.com/google/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="examples test"
+
+DEPEND="test? ( dev-php/phpunit )"
+RDEPEND="dev-lang/php"
+
+src_install(){
+ insinto "/usr/share/php/${PN}"
+ doins -r src/autoload.php src/ReCaptcha
+ dodoc CONTRIBUTING.md README.md
+ use examples && dodoc -r examples
+}
+
+src_test(){
+ phpunit || die "test suite failed"
+}
+
+pkg_postinst(){
+ elog "${PN} has been installed in /usr/share/php/${PN}/."
+ elog "To use it in a script, require('${PN}/autoload.php'),"
+ elog "and then use the ${PN} class normally. Most of the examples in"
+ elog "the documentation should work without further modification."
+}
diff --git a/dev-php/sebastian-code-unit-reverse-lookup-1.0.1 b/dev-php/sebastian-code-unit-reverse-lookup-1.0.1
deleted file mode 100644
index ff6b3a8f1153..000000000000
--- a/dev-php/sebastian-code-unit-reverse-lookup-1.0.1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Looks up which function or method a line of code belongs to
-EAPI=6
-HOMEPAGE=http://phpunit.de
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86
-LICENSE=BSD
-RDEPEND=dev-php/fedora-autoloader >=dev-lang/php-5.6:*
-SLOT=0
-SRC_URI=https://github.com/sebastianbergmann/code-unit-reverse-lookup/archive/1.0.1.tar.gz -> sebastian-code-unit-reverse-lookup-1.0.1.tar.gz
-_md5_=8c429d8d1d7b66cebfffdde0f8cda526
diff --git a/dev-php/sebastian-code-unit-reverse-lookup/Manifest b/dev-php/sebastian-code-unit-reverse-lookup/Manifest
new file mode 100644
index 000000000000..e91e2214bd8b
--- /dev/null
+++ b/dev-php/sebastian-code-unit-reverse-lookup/Manifest
@@ -0,0 +1,4 @@
+AUX autoload.php 312 BLAKE2B 9552693fde0e523fb2d9e5b23e9a9463ef365a3804648a1c416d201d6a3dc2ed9f1b8893c05cfb93a91a70005fb95d26cb1949cf5758cde12b6a8effa602fe92 SHA512 ff06926ebe557373a0e0b5b19b2c10c6104693ba1dcc4f1c0fdfeccb9ca499d43fcbb476816f6e861f48f8636534892851f2ac4831ed153da108e6f0b24d1dd0
+DIST sebastian-code-unit-reverse-lookup-1.0.1.tar.gz 4326 BLAKE2B 1c1f65d70a90b9f6d665cb80f3272d95f003bb61e7f682b7c2d7d0010ddd2b26a90ce0cb2a217445df6fff6aa0c7d414e8951d7ad5a0763fc715504e8f649c5d SHA512 bb6419a13b645a4f35d688d3dd47b0d10de8c996721e95805c08119925fa66ef89cca38f94d3818c62c2eb9a978ee231e91fdeb47bf3b640eeefceaaca135469
+EBUILD sebastian-code-unit-reverse-lookup-1.0.1.ebuild 660 BLAKE2B 1932dcb0b4b1f94d5a403b0dcb208db6473a2f184ffab15281b87396a218b5f31918347267b8cef8f1b59b4bbc386a9c612310ec9e7aefc05b89fd230166d9ea SHA512 bb48de94f43d7cbea7e29a1089036607524c86b6b09e6c16880f5393b5cc6e282ce20dede03d69721953fe102da499faa25fb96b23b1ff420193a3c3e1a06b15
+MISC metadata.xml 346 BLAKE2B 9379848a8118427efc3ec84f4896f1ce436658dfb852aaf94bda1b2057d47647dad6486664ebeb4eb0498462ba0c58b5d902ff5df748f7555e91ce652d60ee68 SHA512 61330d4e03be274063d0bae2f4259a6c4a0f14d97d68dcf6dafd7fed090e7c76bac945d67d925f4d512735c2d5145c50f14f7b1ca17c31ce843113c2c7f6d723
diff --git a/dev-php/sebastian-code-unit-reverse-lookup/files/autoload.php b/dev-php/sebastian-code-unit-reverse-lookup/files/autoload.php
new file mode 100644
index 000000000000..b721c7324032
--- /dev/null
+++ b/dev-php/sebastian-code-unit-reverse-lookup/files/autoload.php
@@ -0,0 +1,13 @@
+<?php
+/* Autoloader for dev-php/sebastian-diff */
+
+if (!class_exists('Fedora\\Autoloader\\Autoload', false)) {
+ require_once '/usr/share/php/Fedora/Autoloader/autoload.php';
+}
+
+\Fedora\Autoloader\Autoload::addClassMap(
+ array(
+ 'sebastianbergmann\codeunitreverselookup\wizard' => '/Wizard.php',
+ ),
+ __DIR__
+);
diff --git a/dev-php/sebastian-code-unit-reverse-lookup/metadata.xml b/dev-php/sebastian-code-unit-reverse-lookup/metadata.xml
new file mode 100644
index 000000000000..cac51766daa3
--- /dev/null
+++ b/dev-php/sebastian-code-unit-reverse-lookup/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://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">sebastianbergmann/code-unit-reverse-lookup</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-php/sebastian-code-unit-reverse-lookup/sebastian-code-unit-reverse-lookup-1.0.1.ebuild b/dev-php/sebastian-code-unit-reverse-lookup/sebastian-code-unit-reverse-lookup-1.0.1.ebuild
new file mode 100644
index 000000000000..b3a093ce238f
--- /dev/null
+++ b/dev-php/sebastian-code-unit-reverse-lookup/sebastian-code-unit-reverse-lookup-1.0.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PN="${PN/sebastian-/}"
+
+DESCRIPTION="Looks up which function or method a line of code belongs to"
+HOMEPAGE="http://phpunit.de"
+SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+IUSE=""
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+RDEPEND="dev-php/fedora-autoloader
+ >=dev-lang/php-5.6:*"
+
+src_install() {
+ insinto /usr/share/php/SebastianBergmann/CodeUnitReverseLookup
+ doins -r src/*
+ doins "${FILESDIR}/autoload.php"
+}
diff --git a/dev-php/sebastian-comparator-1.2.4 b/dev-php/sebastian-comparator-1.2.4
deleted file mode 100644
index ea25f091776e..000000000000
--- a/dev-php/sebastian-comparator-1.2.4
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Compare PHP values for equality
-EAPI=6
-HOMEPAGE=http://phpunit.de
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86
-LICENSE=BSD
-RDEPEND=dev-php/fedora-autoloader <dev-php/sebastian-diff-2.0 <dev-php/sebastian-exporter-3.0 >=dev-lang/php-5.6:*
-SLOT=0
-SRC_URI=https://github.com/sebastianbergmann//comparator/archive/1.2.4.tar.gz -> sebastian-comparator-1.2.4.tar.gz
-_md5_=8704bb1c5428f28788b6fb8ba44b90b6
diff --git a/dev-php/sebastian-comparator/Manifest b/dev-php/sebastian-comparator/Manifest
new file mode 100644
index 000000000000..475bbec7131a
--- /dev/null
+++ b/dev-php/sebastian-comparator/Manifest
@@ -0,0 +1,4 @@
+AUX autoload.php 1601 BLAKE2B f3f668b40b4d8a3259e11fc0fbe3a810157c2bcf40c3d8372dcebf2bdcec7fa999654d88db19fd50169563d34e3b4754101010bb80cef39ed71c0747d3d3c9b6 SHA512 477a0610c65ad7f6fa07532c97f62ec6968fe88810782fd37024767d89dc1e8e59de1e1cbfbf8fdf8d6a363d0e202ae659c6fffda8cd8cf7916b2ed089aa3457
+DIST sebastian-comparator-1.2.4.tar.gz 13402 BLAKE2B 5fc664e42408a188ed8601f2413f0b6517e5fd9b26f85be3177f09d6aaf4fda8eaa2e9e643e08914fb18aca0c795989d1e341d28476e3857c7d991bd2c06d51c SHA512 b7ca4bbdd91c9d59f83c4ccbd63d7755205f6686de7d7e41808faba404df8f58173a0699a0e4d1fbc09914c2fcf841ddc4df41a86aa5cd0fdffa3be4d438a8aa
+EBUILD sebastian-comparator-1.2.4.ebuild 684 BLAKE2B 29006b23d32f55fb09accecdc6185cc24b25d0f011ff2497c79cf76d714f64e6c598396c4334d6176ce7d05502449b0b8471eedb91c682ac3c124f811df56819 SHA512 f2c441f50c693e9ac8d16e335334c4bd2197ed66006697f1eaec5fa24903095766aac2cc5c46d76a6d0c04a7f48d5282f87266f45c0ad65741cfb456747dfd05
+MISC metadata.xml 322 BLAKE2B b031a3917e07e8c98b19228e012a05a46e4ad57b59e394efc345092541c652f2df5f2fe4fe35be69eb9c62f64bf55f0a12636ff9cafa2f510d06b86916f869cb SHA512 e345c6459f1c0f795081e2874aa4a4023998d0a0f6b28462468ef89c7cfaf38366671a68d05516e6d0f3e03b0cdfcbe849c1e224f7b1e3a723232c7db32281b6
diff --git a/dev-php/sebastian-comparator/files/autoload.php b/dev-php/sebastian-comparator/files/autoload.php
new file mode 100644
index 000000000000..696ae0327d79
--- /dev/null
+++ b/dev-php/sebastian-comparator/files/autoload.php
@@ -0,0 +1,32 @@
+<?php
+/* Autoloader for dev-php/sebastian-comparator */
+
+if (!class_exists('Fedora\\Autoloader\\Autoload', false)) {
+ require_once '/usr/share/php/Fedora/Autoloader/autoload.php';
+}
+
+\Fedora\Autoloader\Autoload::addClassMap(
+ array(
+ 'sebastianbergmann\comparator\arraycomparator' => '/ArrayComparator.php',
+ 'sebastianbergmann\comparator\comparator' => '/Comparator.php',
+ 'sebastianbergmann\comparator\comparisonfailure' => '/ComparisonFailure.php',
+ 'sebastianbergmann\comparator\domnodecomparator' => '/DOMNodeComparator.php',
+ 'sebastianbergmann\comparator\datetimecomparator' => '/DateTimeComparator.php',
+ 'sebastianbergmann\comparator\doublecomparator' => '/DoubleComparator.php',
+ 'sebastianbergmann\comparator\exceptioncomparator' => '/ExceptionComparator.php',
+ 'sebastianbergmann\comparator\factory' => '/Factory.php',
+ 'sebastianbergmann\comparator\mockobjectcomparator' => '/MockObjectComparator.php',
+ 'sebastianbergmann\comparator\numericcomparator' => '/NumericComparator.php',
+ 'sebastianbergmann\comparator\objectcomparator' => '/ObjectComparator.php',
+ 'sebastianbergmann\comparator\resourcecomparator' => '/ResourceComparator.php',
+ 'sebastianbergmann\comparator\scalarcomparator' => '/ScalarComparator.php',
+ 'sebastianbergmann\comparator\splobjectstoragecomparator' => '/SplObjectStorageComparator.php',
+ 'sebastianbergmann\comparator\typecomparator' => '/TypeComparator.php',
+ ),
+ __DIR__
+);
+
+\Fedora\Autoloader\Dependencies::required(array(
+ '/usr/share/php/SebastianBergmann/Diff/autoload.php',
+ '/usr/share/php/SebastianBergmann/Exporter/autoload.php',
+));
diff --git a/dev-php/sebastian-comparator/metadata.xml b/dev-php/sebastian-comparator/metadata.xml
new file mode 100644
index 000000000000..f5ad6af5af2e
--- /dev/null
+++ b/dev-php/sebastian-comparator/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://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">sebastianbergmann/</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-php/sebastian-comparator/sebastian-comparator-1.2.4.ebuild b/dev-php/sebastian-comparator/sebastian-comparator-1.2.4.ebuild
new file mode 100644
index 000000000000..b732a9c03635
--- /dev/null
+++ b/dev-php/sebastian-comparator/sebastian-comparator-1.2.4.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PN="${PN/sebastian-//}"
+
+DESCRIPTION="Compare PHP values for equality"
+HOMEPAGE="http://phpunit.de"
+SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+IUSE=""
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+RDEPEND="dev-php/fedora-autoloader
+ <dev-php/sebastian-diff-2.0
+ <dev-php/sebastian-exporter-3.0
+ >=dev-lang/php-5.6:*
+"
+src_install() {
+ insinto /usr/share/php/SebastianBergmann/Comparator
+ doins -r src/*
+ doins "${FILESDIR}/autoload.php"
+}
diff --git a/dev-php/sebastian-diff-1.4.1-r1 b/dev-php/sebastian-diff-1.4.1-r1
deleted file mode 100644
index 6e5c9c05bf8b..000000000000
--- a/dev-php/sebastian-diff-1.4.1-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=PHP Diff implementation
-EAPI=6
-HOMEPAGE=http://phpunit.de
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86
-LICENSE=BSD
-RDEPEND=dev-php/fedora-autoloader >=dev-lang/php-5.6:*
-SLOT=0
-SRC_URI=https://github.com/sebastianbergmann/diff/archive/1.4.1.tar.gz -> sebastian-diff-1.4.1.tar.gz
-_md5_=d91c4747d1c455a822a78075ea7be94a
diff --git a/dev-php/sebastian-diff/Manifest b/dev-php/sebastian-diff/Manifest
new file mode 100644
index 000000000000..17fc43353164
--- /dev/null
+++ b/dev-php/sebastian-diff/Manifest
@@ -0,0 +1,4 @@
+AUX autoload.php 859 BLAKE2B 00158f99e34866d4cb452af6a27a7b02678c09217d9e0b4f88bb6283b5268a91af56ae948639defdd48cdf35dc97642b11e3dd26685422df565cac57b70a2780 SHA512 0d1a073f461947956fb61d8eaae06765b0f24fba3e01bddd9a75f6a9e8abd0edecaf0266c457df39d2dc02eecfc1947cdc6da589ce38a6db8ad1716ba62a0e30
+DIST sebastian-diff-1.4.1.tar.gz 10310 BLAKE2B facb81bb6ec7a60714493b531eecd0cea6fc8fde0811de982f3a149b2446cfe71f32bfca62bb830dee734966ac6161990e14b666426f5b34c4068922c544f36f SHA512 b355f1407619ea6f1e9153a7946c339e790530c1c86369005998dc0c1078b96ef1ca369fec32f134b056dd8833770fcdb30443334275c8cb17b69e95ef8325a9
+EBUILD sebastian-diff-1.4.1-r1.ebuild 594 BLAKE2B 15bc30c754e0f47b2f4160a96dde9923870545579413b9c88392d90b0b435a6ced7d23bf3c9126ac1f1b8a7e604e1e46a3ffed707606b849501cadfc7424eed3 SHA512 21663384796584872f7ac07653c40dc8c37d8c2bd6f3789c02251e577e185915a9534e66d76de07b733192453996354507d44662329f08248acbbc3aecdbc3c8
+MISC metadata.xml 326 BLAKE2B f5c8c04139228c5dc8b69de1a7503814e75e363a79563dd816763301e5e56a617fa7f24aa58b81f82acd1b2bb304d89873dd32df3d645752b1fe90db655d7bae SHA512 b209d3b3b9d215d0f5549baedc6ecd6a03b0ce461dd276f20f794f4e17c500b02a53885fc2926675ccb1669e5335f4bd5ce75552470abef1b73bf9cb3e3e6e74
diff --git a/dev-php/sebastian-diff/files/autoload.php b/dev-php/sebastian-diff/files/autoload.php
new file mode 100644
index 000000000000..5b72dc303318
--- /dev/null
+++ b/dev-php/sebastian-diff/files/autoload.php
@@ -0,0 +1,20 @@
+<?php
+/* Autoloader for dev-php/sebastian-diff */
+
+if (!class_exists('Fedora\\Autoloader\\Autoload', false)) {
+ require_once '/usr/share/php/Fedora/Autoloader/autoload.php';
+}
+
+\Fedora\Autoloader\Autoload::addClassMap(
+ array(
+ 'sebastianbergmann\diff\chunk' => '/Chunk.php',
+ 'sebastianbergmann\diff\diff' => '/Diff.php',
+ 'sebastianbergmann\diff\differ' => '/Differ.php',
+ 'sebastianbergmann\diff\line' => '/Line.php',
+ 'sebastianbergmann\diff\parser' => '/Parser.php',
+ 'sebastianbergmann\diff\lcs\longestcommonsubsequence' => '/LCS/LongestCommonSubsequence.php',
+ 'sebastianbergmann\diff\lcs\memoryefficientimplementation' => '/LCS/MemoryEfficientLongestCommonSubsequenceImplementation.php',
+ 'sebastianbergmann\diff\lcs\timeefficientimplementation' => '/LCS/TimeEfficientLongestCommonSubsequenceImplementation.php',
+ ),
+ __DIR__
+);
diff --git a/dev-php/sebastian-diff/metadata.xml b/dev-php/sebastian-diff/metadata.xml
new file mode 100644
index 000000000000..352667478b8a
--- /dev/null
+++ b/dev-php/sebastian-diff/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://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">sebastianbergmann/diff</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-php/sebastian-diff/sebastian-diff-1.4.1-r1.ebuild b/dev-php/sebastian-diff/sebastian-diff-1.4.1-r1.ebuild
new file mode 100644
index 000000000000..15d63392d86e
--- /dev/null
+++ b/dev-php/sebastian-diff/sebastian-diff-1.4.1-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PN="diff"
+
+DESCRIPTION="PHP Diff implementation"
+HOMEPAGE="http://phpunit.de"
+SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+IUSE=""
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+RDEPEND="dev-php/fedora-autoloader
+ >=dev-lang/php-5.6:*"
+
+src_install() {
+ insinto /usr/share/php/SebastianBergmann/Diff
+ doins -r src/*
+ doins "${FILESDIR}/autoload.php"
+}
diff --git a/dev-php/sebastian-environment-2.0.0 b/dev-php/sebastian-environment-2.0.0
deleted file mode 100644
index 439c797390b7..000000000000
--- a/dev-php/sebastian-environment-2.0.0
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Helps writing PHP code that has runtime-specific execution paths
-EAPI=6
-HOMEPAGE=http://phpunit.de
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86
-LICENSE=BSD
-RDEPEND=dev-php/fedora-autoloader >=dev-lang/php-5.6:*
-SLOT=0
-SRC_URI=https://github.com/sebastianbergmann//environment/archive/2.0.0.tar.gz -> sebastian-environment-2.0.0.tar.gz
-_md5_=976c44d1b7fe20d2111055c0f8fa79e4
diff --git a/dev-php/sebastian-environment/Manifest b/dev-php/sebastian-environment/Manifest
new file mode 100644
index 000000000000..2bb5af06f683
--- /dev/null
+++ b/dev-php/sebastian-environment/Manifest
@@ -0,0 +1,4 @@
+AUX autoload.php 372 BLAKE2B 3d2843946daf17f3c367b04f1b5295ac67bdff8e1a409537f895eb7ed06a946ca3bc52647e8454d398b574ca948588951b29156d553b0a5f4b741b9dc828c708 SHA512 7fc348367571b5c7409635ec61c2b06f7fea3b640998f93eca87423529ecc4c933cfb5b033152081dd42817e9861d2fdfddcfb5f0d08d51ccf60d5c12f56a76d
+DIST sebastian-environment-2.0.0.tar.gz 5607 BLAKE2B 3c34c6e61d9a0bdc5df8083331390935bd513d735a1509890a9af05be8b5a718bbb1d5826ab0cb80da2ee5c4cd436b22ef4ccb50c7b4e1c11d361a78b51621c3 SHA512 cf91f0a5f057007f318c5d6b11f8a1345b8df35d513c6291c5b725f0874ed301a64d1097c3fac1e6b32533caa96b3f78ac415d99b9b6ef63dc4a303b90d49c88
+EBUILD sebastian-environment-2.0.0.ebuild 656 BLAKE2B 49d6b5efe432e3e095a9386fe4f9fc6972d275df11d2c23c7b2416e5b764176b356c9a2a435b31ac3a656ba9035866f65a96a99746ad3592081a77449f651380 SHA512 5872fb40b001e6ff45ef3db6e69308c2e71e2694ad30020c052d0128a51ae873b030d79399955df5a4d7e893d1a534afc92c0334e48a65fc5696551226fbe6f6
+MISC metadata.xml 322 BLAKE2B b031a3917e07e8c98b19228e012a05a46e4ad57b59e394efc345092541c652f2df5f2fe4fe35be69eb9c62f64bf55f0a12636ff9cafa2f510d06b86916f869cb SHA512 e345c6459f1c0f795081e2874aa4a4023998d0a0f6b28462468ef89c7cfaf38366671a68d05516e6d0f3e03b0cdfcbe849c1e224f7b1e3a723232c7db32281b6
diff --git a/dev-php/sebastian-environment/files/autoload.php b/dev-php/sebastian-environment/files/autoload.php
new file mode 100644
index 000000000000..3abd16ee357b
--- /dev/null
+++ b/dev-php/sebastian-environment/files/autoload.php
@@ -0,0 +1,14 @@
+<?php
+/* Autoloader for dev-php/sebastian-environment */
+
+if (!class_exists('Fedora\\Autoloader\\Autoload', false)) {
+ require_once '/usr/share/php/Fedora/Autoloader/autoload.php';
+}
+
+\Fedora\Autoloader\Autoload::addClassMap(
+ array(
+ 'sebastianbergmann\environment\console' => '/Console.php',
+ 'sebastianbergmann\environment\runtime' => '/Runtime.php',
+ ),
+ __DIR__
+);
diff --git a/dev-php/sebastian-environment/metadata.xml b/dev-php/sebastian-environment/metadata.xml
new file mode 100644
index 000000000000..f5ad6af5af2e
--- /dev/null
+++ b/dev-php/sebastian-environment/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://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">sebastianbergmann/</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-php/sebastian-environment/sebastian-environment-2.0.0.ebuild b/dev-php/sebastian-environment/sebastian-environment-2.0.0.ebuild
new file mode 100644
index 000000000000..82b41ca2bfcd
--- /dev/null
+++ b/dev-php/sebastian-environment/sebastian-environment-2.0.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PN="${PN/sebastian-//}"
+
+DESCRIPTION="Helps writing PHP code that has runtime-specific execution paths"
+HOMEPAGE="http://phpunit.de"
+SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+IUSE=""
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+RDEPEND="dev-php/fedora-autoloader
+ >=dev-lang/php-5.6:*"
+
+src_install() {
+ insinto /usr/share/php/SebastianBergmann/Environment
+ doins -r src/*
+ doins "${FILESDIR}/autoload.php"
+}
diff --git a/dev-php/sebastian-exporter-2.0.0 b/dev-php/sebastian-exporter-2.0.0
deleted file mode 100644
index 557f1a366296..000000000000
--- a/dev-php/sebastian-exporter-2.0.0
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Export PHP variables for visualization
-EAPI=6
-HOMEPAGE=http://phpunit.de
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86
-LICENSE=BSD
-RDEPEND=dev-php/fedora-autoloader =dev-php/sebastian-recursion-context-2* >=dev-lang/php-5.6:*
-SLOT=0
-SRC_URI=https://github.com/sebastianbergmann//exporter/archive/2.0.0.tar.gz -> sebastian-exporter-2.0.0.tar.gz
-_md5_=ad94a6d99d7a7dbdb636e0e10807f50a
diff --git a/dev-php/sebastian-exporter/Manifest b/dev-php/sebastian-exporter/Manifest
new file mode 100644
index 000000000000..97169deebad0
--- /dev/null
+++ b/dev-php/sebastian-exporter/Manifest
@@ -0,0 +1,4 @@
+AUX autoload.php 429 BLAKE2B 7fb7aabe5cee47b74491d50a2a01f60ee45f5d0698f5bd5c908ec1796bbd31cb003de188c61dd4492a5e1556b47e3ab8ef77019ce4dc9cfb90a2e3af96527694 SHA512 06f8a87461a518009d2dd4298637ede677d6304b36d25d94c75472420cf2e4a8fa6aef23b5e21f98ee4ad03b2886fc946c5b0213944947290a3dd9c5308f8509
+DIST sebastian-exporter-2.0.0.tar.gz 7473 BLAKE2B c8f39c9fb19d146959e184ca1356a2f802bb29d31792575fe624072fcc7fc44f5d5d619dbc9dafc9114c46e91ba64338af6902abc2fecc96cfbd0b28294a97cc SHA512 0d418973a6e272e327c16f2393bde09424f8dea6991a804259ac57261efddeb99e33a904bbf2ede99b07def897c0baa12ad9fc04c8c33af684f1fd19d976948a
+EBUILD sebastian-exporter-2.0.0.ebuild 668 BLAKE2B 8429cd7f2029591664c0e41b9d70e1df98a4fb5e6a42f16d33a7643ec263dd3bbe5ae0b5ad018f84857ed7044043b797e213b9bbf1bc0759041b4a36329b5ccf SHA512 836908d9048249a3783abdaa022e2308855230fa38a9e2aafe3a9432e6dd7026796b7d0379913b31831411072741dab1342a3dfff2e4e90e09a78d4a4341093e
+MISC metadata.xml 322 BLAKE2B b031a3917e07e8c98b19228e012a05a46e4ad57b59e394efc345092541c652f2df5f2fe4fe35be69eb9c62f64bf55f0a12636ff9cafa2f510d06b86916f869cb SHA512 e345c6459f1c0f795081e2874aa4a4023998d0a0f6b28462468ef89c7cfaf38366671a68d05516e6d0f3e03b0cdfcbe849c1e224f7b1e3a723232c7db32281b6
diff --git a/dev-php/sebastian-exporter/files/autoload.php b/dev-php/sebastian-exporter/files/autoload.php
new file mode 100644
index 000000000000..7803f5f61891
--- /dev/null
+++ b/dev-php/sebastian-exporter/files/autoload.php
@@ -0,0 +1,17 @@
+<?php
+/* Autoloader for dev-php/sebastian-exporter */
+
+if (!class_exists('Fedora\\Autoloader\\Autoload', false)) {
+ require_once '/usr/share/php/Fedora/Autoloader/autoload.php';
+}
+
+\Fedora\Autoloader\Autoload::addClassMap(
+ array(
+ 'sebastianbergmann\exporter\exporter' => '/Exporter.php',
+ ),
+ __DIR__
+);
+
+\Fedora\Autoloader\Dependencies::required(array(
+ '/usr/share/php/SebastianBergmann/RecursionContext/autoload.php',
+));
diff --git a/dev-php/sebastian-exporter/metadata.xml b/dev-php/sebastian-exporter/metadata.xml
new file mode 100644
index 000000000000..f5ad6af5af2e
--- /dev/null
+++ b/dev-php/sebastian-exporter/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://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">sebastianbergmann/</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-php/sebastian-exporter/sebastian-exporter-2.0.0.ebuild b/dev-php/sebastian-exporter/sebastian-exporter-2.0.0.ebuild
new file mode 100644
index 000000000000..a7b6e735d61a
--- /dev/null
+++ b/dev-php/sebastian-exporter/sebastian-exporter-2.0.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PN="${PN/sebastian-//}"
+
+DESCRIPTION="Export PHP variables for visualization"
+HOMEPAGE="http://phpunit.de"
+SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+IUSE=""
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+RDEPEND="dev-php/fedora-autoloader
+ =dev-php/sebastian-recursion-context-2*
+ >=dev-lang/php-5.6:*"
+
+src_install() {
+ insinto /usr/share/php/SebastianBergmann/Exporter
+ doins -r src/*
+ doins "${FILESDIR}/autoload.php"
+}
diff --git a/dev-php/sebastian-global-state-1.1.1 b/dev-php/sebastian-global-state-1.1.1
deleted file mode 100644
index 052ffaa345d3..000000000000
--- a/dev-php/sebastian-global-state-1.1.1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Snapshotting of global state
-EAPI=6
-HOMEPAGE=http://phpunit.de
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86
-LICENSE=BSD
-RDEPEND=dev-php/fedora-autoloader >=dev-lang/php-5.6:*
-SLOT=0
-SRC_URI=https://github.com/sebastianbergmann//global-state/archive/1.1.1.tar.gz -> sebastian-global-state-1.1.1.tar.gz
-_md5_=471c845a1af804fc584a2b4098ab59c2
diff --git a/dev-php/sebastian-global-state/Manifest b/dev-php/sebastian-global-state/Manifest
new file mode 100644
index 000000000000..29f70118490d
--- /dev/null
+++ b/dev-php/sebastian-global-state/Manifest
@@ -0,0 +1,4 @@
+AUX autoload.php 657 BLAKE2B 239a7bcc4ac117a513f807d8c3266c4951e4b3bf86a6c2625c2ab480905a99b5e9175238b8d8bec080228f7f7c734eefe5325fc147dfadb73a988aaa7ac3fcf1 SHA512 26f6a18f580a3080c80ef6abe8598fa589ade4343152fffcf3e967a208ec1e28b3231f241402cb6f8e22b8f6c1d248f0d999186846d5ced069a624571133f7f5
+DIST sebastian-global-state-1.1.1.tar.gz 7659 BLAKE2B 9793e68f226901cb2d67e3d4ac03cc41323485a1b7d819dfe0a4cd9c00b19eb79ebf539a8705545a4c132ef8a2a286edc804016cb76400256008ecd298f2f3c5 SHA512 dec6387183ea6cf869b1302e641a9d85b6dd69ebf299354825ab2f8a06a82609f8e3a2bdeea6924b5520f813af7493fc8e957c3f9876dcaa302066770997186c
+EBUILD sebastian-global-state-1.1.1.ebuild 620 BLAKE2B e0798061025f0d8742caed1bba52da58ac237bcc22789d260ac83c1907aa7cbefbdf0167e46987e91fe7a07bd6d4a4dbc8e589d7fb74ccb9fd93e10cbb252164 SHA512 35c80599c591cea3dc57a1224679efd32564066b607b20a51bd02c3c96e8f3c23aaef5b148ad33eb988fbced375c05e5c3eec4ee58d4b63357383bc925e455b9
+MISC metadata.xml 322 BLAKE2B b031a3917e07e8c98b19228e012a05a46e4ad57b59e394efc345092541c652f2df5f2fe4fe35be69eb9c62f64bf55f0a12636ff9cafa2f510d06b86916f869cb SHA512 e345c6459f1c0f795081e2874aa4a4023998d0a0f6b28462468ef89c7cfaf38366671a68d05516e6d0f3e03b0cdfcbe849c1e224f7b1e3a723232c7db32281b6
diff --git a/dev-php/sebastian-global-state/files/autoload.php b/dev-php/sebastian-global-state/files/autoload.php
new file mode 100644
index 000000000000..e7c855e9b3f3
--- /dev/null
+++ b/dev-php/sebastian-global-state/files/autoload.php
@@ -0,0 +1,18 @@
+<?php
+/* Autoloader for dev-php/sebastian-global-state */
+
+if (!class_exists('Fedora\\Autoloader\\Autoload', false)) {
+ require_once '/usr/share/php/Fedora/Autoloader/autoload.php';
+}
+
+\Fedora\Autoloader\Autoload::addClassMap(
+ array(
+ 'sebastianbergmann\globalstate\blacklist' => '/Blacklist.php',
+ 'sebastianbergmann\globalstate\codeexporter' => '/CodeExporter.php',
+ 'sebastianbergmann\globalstate\exception' => '/Exception.php',
+ 'sebastianbergmann\globalstate\restorer' => '/Restorer.php',
+ 'sebastianbergmann\globalstate\runtimeexception' => '/RuntimeException.php',
+ 'sebastianbergmann\globalstate\snapshot' => '/Snapshot.php',
+ ),
+ __DIR__
+);
diff --git a/dev-php/sebastian-global-state/metadata.xml b/dev-php/sebastian-global-state/metadata.xml
new file mode 100644
index 000000000000..f5ad6af5af2e
--- /dev/null
+++ b/dev-php/sebastian-global-state/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://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">sebastianbergmann/</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-php/sebastian-global-state/sebastian-global-state-1.1.1.ebuild b/dev-php/sebastian-global-state/sebastian-global-state-1.1.1.ebuild
new file mode 100644
index 000000000000..857b100c116c
--- /dev/null
+++ b/dev-php/sebastian-global-state/sebastian-global-state-1.1.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PN="${PN/sebastian-//}"
+
+DESCRIPTION="Snapshotting of global state"
+HOMEPAGE="http://phpunit.de"
+SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+IUSE=""
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+RDEPEND="dev-php/fedora-autoloader
+ >=dev-lang/php-5.6:*"
+
+src_install() {
+ insinto /usr/share/php/SebastianBergmann/GlobalState
+ doins -r src/*
+ doins "${FILESDIR}/autoload.php"
+}
diff --git a/dev-php/sebastian-object-enumerator-2.0.1 b/dev-php/sebastian-object-enumerator-2.0.1
deleted file mode 100644
index 8f70805b5b29..000000000000
--- a/dev-php/sebastian-object-enumerator-2.0.1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Traverses array structures and object graphs to enumerate all referenced objects
-EAPI=6
-HOMEPAGE=http://phpunit.de
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86
-LICENSE=BSD
-RDEPEND=dev-php/fedora-autoloader <dev-php/sebastian-recursion-context-3.0 >=dev-lang/php-5.6:*
-SLOT=0
-SRC_URI=https://github.com/sebastianbergmann//object-enumerator/archive/2.0.1.tar.gz -> sebastian-object-enumerator-2.0.1.tar.gz
-_md5_=35a65077ae0c8444b7820f77f7d7ea70
diff --git a/dev-php/sebastian-object-enumerator/Manifest b/dev-php/sebastian-object-enumerator/Manifest
new file mode 100644
index 000000000000..b7571f0e2cae
--- /dev/null
+++ b/dev-php/sebastian-object-enumerator/Manifest
@@ -0,0 +1,4 @@
+AUX autoload.php 620 BLAKE2B 0f78748010526a3f72d61ef23121a573fba13b7c945e66056888e833673dba8dbe691087910a8d6e72c9a3a4febe6c3f6897bcdb1b8cb846dd832bc30dc864a5 SHA512 6b7ea509b19366d7de9a5e7c45e5f11f56824d19b6af08af8523d1a02bdb690b6f5639b0a324966bf14a9ef06c0ed5c224c52e9d5bc529095f1125507bd94aa9
+DIST sebastian-object-enumerator-2.0.1.tar.gz 4861 BLAKE2B cc68da9e38e756e478eedab588c023ebbf15d28d6f9e5399f178c581765aa02324ffe6f0bdf5e561f61791f449d8763e6cfdb572c779adaa9c7dedcc8b0f15a8 SHA512 087ef23c079be2ef56948c734cbdefbf4d8cad36c6c26aae5e38401ec3f306d91067aea28a2226811d1ed90611c7c8070a4f5c3733a24eb56f6a177eb332a9b3
+EBUILD sebastian-object-enumerator-2.0.1.ebuild 719 BLAKE2B f90ea030967411ca0aaa05809205f1a0680ed83aae0502a554c735300645ece733e8667ab0e9208c04d39fe681b2ec627b57edc2d71c11a3f347b99ea6587fef SHA512 0dee8dedf157a002153b474eb2db14eb156fa5203e05349cd318ccc79ef5395e02ebca8677d348a243a7fdee969fb2f070a39794a2a518e08982e9dabc565425
+MISC metadata.xml 322 BLAKE2B b031a3917e07e8c98b19228e012a05a46e4ad57b59e394efc345092541c652f2df5f2fe4fe35be69eb9c62f64bf55f0a12636ff9cafa2f510d06b86916f869cb SHA512 e345c6459f1c0f795081e2874aa4a4023998d0a0f6b28462468ef89c7cfaf38366671a68d05516e6d0f3e03b0cdfcbe849c1e224f7b1e3a723232c7db32281b6
diff --git a/dev-php/sebastian-object-enumerator/files/autoload.php b/dev-php/sebastian-object-enumerator/files/autoload.php
new file mode 100644
index 000000000000..cac71a54f125
--- /dev/null
+++ b/dev-php/sebastian-object-enumerator/files/autoload.php
@@ -0,0 +1,19 @@
+<?php
+/* Autoloader for dev-php/sebastian-object-enumerator */
+
+if (!class_exists('Fedora\\Autoloader\\Autoload', false)) {
+ require_once '/usr/share/php/Fedora/Autoloader/autoload.php';
+}
+
+\Fedora\Autoloader\Autoload::addClassMap(
+ array(
+ 'sebastianbergmann\objectenumerator\enumerator' => '/Enumerator.php',
+ 'sebastianbergmann\objectenumerator\exception' => '/Exception.php',
+ 'sebastianbergmann\objectenumerator\invalidargumentexception' => '/InvalidArgumentException.php',
+ ),
+ __DIR__
+);
+
+\Fedora\Autoloader\Dependencies::required(array(
+ '/usr/share/php/SebastianBergmann/RecursionContext/autoload.php',
+));
diff --git a/dev-php/sebastian-object-enumerator/metadata.xml b/dev-php/sebastian-object-enumerator/metadata.xml
new file mode 100644
index 000000000000..f5ad6af5af2e
--- /dev/null
+++ b/dev-php/sebastian-object-enumerator/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://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">sebastianbergmann/</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-php/sebastian-object-enumerator/sebastian-object-enumerator-2.0.1.ebuild b/dev-php/sebastian-object-enumerator/sebastian-object-enumerator-2.0.1.ebuild
new file mode 100644
index 000000000000..1fedec0cb35f
--- /dev/null
+++ b/dev-php/sebastian-object-enumerator/sebastian-object-enumerator-2.0.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PN="${PN/sebastian-//}"
+
+DESCRIPTION="Traverses array structures and object graphs to enumerate all referenced objects"
+HOMEPAGE="http://phpunit.de"
+SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+IUSE=""
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+RDEPEND="dev-php/fedora-autoloader
+ <dev-php/sebastian-recursion-context-3.0
+ >=dev-lang/php-5.6:*"
+
+src_install() {
+ insinto /usr/share/php/SebastianBergmann/ObjectEnumerator
+ doins -r src/*
+ doins "${FILESDIR}/autoload.php"
+}
diff --git a/dev-php/sebastian-recursion-context-2.0.0 b/dev-php/sebastian-recursion-context-2.0.0
deleted file mode 100644
index 81d922764fc8..000000000000
--- a/dev-php/sebastian-recursion-context-2.0.0
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Recursively process PHP variables
-EAPI=6
-HOMEPAGE=http://phpunit.de
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86
-LICENSE=BSD
-RDEPEND=dev-php/fedora-autoloader >=dev-lang/php-5.6:*
-SLOT=0
-SRC_URI=https://github.com/sebastianbergmann//recursion-context/archive/2.0.0.tar.gz -> sebastian-recursion-context-2.0.0.tar.gz
-_md5_=55037ee337d8ab7067c8dba259b33b6c
diff --git a/dev-php/sebastian-recursion-context/Manifest b/dev-php/sebastian-recursion-context/Manifest
new file mode 100644
index 000000000000..991c6cd50c1d
--- /dev/null
+++ b/dev-php/sebastian-recursion-context/Manifest
@@ -0,0 +1,4 @@
+AUX autoload.php 492 BLAKE2B 141d4ab79acd2614a81a85411eb7514489e0e34256c50d9bae5b82106e24d84d03b465dce5a29e254ec2b7989d24f5fb3adb457e71e5026cf7445801a36f1d92 SHA512 6850fe9b76c5055d42cb8fd21496082b626c113fccbaa9048c7fc07c4853c610f91f83665df441964175265ab2df7244e7ae67c7ed5664ed2850886b973fcf97
+DIST sebastian-recursion-context-2.0.0.tar.gz 4526 BLAKE2B 54ecdfc255c3bdbedc2a909f5b569c62b19e2e66fc5ea4ae7be8401516c142b43e611d5e8f1c056be329983f21e1a8b85e7fb2ff1ddb92a2f6aad4d4191418a6 SHA512 9d25d148decc81f5a21d7a4e1f966563bf6ec765fcc1b1ce779668b74dfa39959db07cf296e9cffcbcb3943c8911709bb73f22c5bfcc81c5d2fcbb51967cf75e
+EBUILD sebastian-recursion-context-2.0.0.ebuild 630 BLAKE2B 195785226570db605e44a2930e54aad329d185fa7b8034136e1a30a240443c93b69370c7b450384deca1744ddf85995348e5bcf9a05f506e5dc4bc1ea303a331 SHA512 03e1fcd72d7ae72c333fd4dc66375326ad8ef0ac8cac413c748324a4127b06a1b82cc7b002b5f3b5ff0eaad4d97832471fea95554b83c195ede639a97a33bb6f
+MISC metadata.xml 322 BLAKE2B b031a3917e07e8c98b19228e012a05a46e4ad57b59e394efc345092541c652f2df5f2fe4fe35be69eb9c62f64bf55f0a12636ff9cafa2f510d06b86916f869cb SHA512 e345c6459f1c0f795081e2874aa4a4023998d0a0f6b28462468ef89c7cfaf38366671a68d05516e6d0f3e03b0cdfcbe849c1e224f7b1e3a723232c7db32281b6
diff --git a/dev-php/sebastian-recursion-context/files/autoload.php b/dev-php/sebastian-recursion-context/files/autoload.php
new file mode 100644
index 000000000000..5f7e83143612
--- /dev/null
+++ b/dev-php/sebastian-recursion-context/files/autoload.php
@@ -0,0 +1,15 @@
+<?php
+/* Autoloader for dev-php/sebastian-recursion-context */
+
+if (!class_exists('Fedora\\Autoloader\\Autoload', false)) {
+ require_once '/usr/share/php/Fedora/Autoloader/autoload.php';
+}
+
+\Fedora\Autoloader\Autoload::addClassMap(
+ array(
+ 'sebastianbergmann\recursioncontext\context' => '/Context.php',
+ 'sebastianbergmann\recursioncontext\exception' => '/Exception.php',
+ 'sebastianbergmann\recursioncontext\invalidargumentexception' => '/InvalidArgumentException.php',
+ ),
+ __DIR__
+);
diff --git a/dev-php/sebastian-recursion-context/metadata.xml b/dev-php/sebastian-recursion-context/metadata.xml
new file mode 100644
index 000000000000..f5ad6af5af2e
--- /dev/null
+++ b/dev-php/sebastian-recursion-context/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://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">sebastianbergmann/</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-php/sebastian-recursion-context/sebastian-recursion-context-2.0.0.ebuild b/dev-php/sebastian-recursion-context/sebastian-recursion-context-2.0.0.ebuild
new file mode 100644
index 000000000000..a76b00f43964
--- /dev/null
+++ b/dev-php/sebastian-recursion-context/sebastian-recursion-context-2.0.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PN="${PN/sebastian-//}"
+
+DESCRIPTION="Recursively process PHP variables"
+HOMEPAGE="http://phpunit.de"
+SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+IUSE=""
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+RDEPEND="dev-php/fedora-autoloader
+ >=dev-lang/php-5.6:*"
+
+src_install() {
+ insinto /usr/share/php/SebastianBergmann/RecursionContext
+ doins -r src/*
+ doins "${FILESDIR}/autoload.php"
+}
diff --git a/dev-php/sebastian-resource-operations-1.0.0 b/dev-php/sebastian-resource-operations-1.0.0
deleted file mode 100644
index 509897b01db0..000000000000
--- a/dev-php/sebastian-resource-operations-1.0.0
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Provides a list of PHP built-in functions that operate on resources
-EAPI=6
-HOMEPAGE=http://phpunit.de
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86
-LICENSE=BSD
-RDEPEND=dev-php/fedora-autoloader >=dev-lang/php-5.6:*
-SLOT=0
-SRC_URI=https://github.com/sebastianbergmann//resource-operations/archive/1.0.0.tar.gz -> sebastian-resource-operations-1.0.0.tar.gz
-_md5_=426a8a85e7f2c48f0c4d6be3d1d0020e
diff --git a/dev-php/sebastian-resource-operations/Manifest b/dev-php/sebastian-resource-operations/Manifest
new file mode 100644
index 000000000000..e032400fa843
--- /dev/null
+++ b/dev-php/sebastian-resource-operations/Manifest
@@ -0,0 +1,4 @@
+AUX autoload.php 348 BLAKE2B 541a6d82f57c1b48b0087ac070058c1f5e575d35e7a69bec64ac18971a64f609beb65bbbaf58a9c1aed6293f863ed9c866024ad2c1531f8f8ec91893d2dfcce2 SHA512 8a6c7dbddc55527db9bdc1973682b09a3e615c3fbb0b473cb3b93b88acba62a7ac46e297582ab4a6611d99325d557425f40f83ed9afe6d82d6073f56e66fd0a4
+DIST sebastian-resource-operations-1.0.0.tar.gz 6449 BLAKE2B 0f748d4792a3d4705560c79047fbdb9c6371435600dbd8373e4c60c8edc436f3487264107b7f3d76125bde3ec7b30062587c96dad7612fdc4e4132d3912813ef SHA512 d11d06c9b8b4a1507238443588f34a85836fcd65d2afdb9bcf3cecfe352cba46c9349988550e901c301db8a21f19cc960a8164653ac66e57661cebddf52ad906
+EBUILD sebastian-resource-operations-1.0.0.ebuild 668 BLAKE2B c8310acff02871649167a99c778c168e74f1118687bc92867b7befc0fdcb0609331d0953d8d40821cd2e7af066029651fcea68014e5228f82b8a0b6309cb99be SHA512 9f00108bf2d61b6a67e4634ef7aa903c1816c49ace083e28089b3e180c9ad1ab05a91013de5da224089c0a31668037e22264693835154b3189cb1be334a3262a
+MISC metadata.xml 322 BLAKE2B b031a3917e07e8c98b19228e012a05a46e4ad57b59e394efc345092541c652f2df5f2fe4fe35be69eb9c62f64bf55f0a12636ff9cafa2f510d06b86916f869cb SHA512 e345c6459f1c0f795081e2874aa4a4023998d0a0f6b28462468ef89c7cfaf38366671a68d05516e6d0f3e03b0cdfcbe849c1e224f7b1e3a723232c7db32281b6
diff --git a/dev-php/sebastian-resource-operations/files/autoload.php b/dev-php/sebastian-resource-operations/files/autoload.php
new file mode 100644
index 000000000000..f7b9a4d6f681
--- /dev/null
+++ b/dev-php/sebastian-resource-operations/files/autoload.php
@@ -0,0 +1,13 @@
+<?php
+/* Autoloader for dev-php/sebastian-resource-operations */
+
+if (!class_exists('Fedora\\Autoloader\\Autoload', false)) {
+ require_once '/usr/share/php/Fedora/Autoloader/autoload.php';
+}
+
+\Fedora\Autoloader\Autoload::addClassMap(
+ array(
+ 'sebastianbergmann\resourceoperations\resourceoperations' => '/ResourceOperations.php',
+ ),
+ __DIR__
+);
diff --git a/dev-php/sebastian-resource-operations/metadata.xml b/dev-php/sebastian-resource-operations/metadata.xml
new file mode 100644
index 000000000000..f5ad6af5af2e
--- /dev/null
+++ b/dev-php/sebastian-resource-operations/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://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">sebastianbergmann/</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-php/sebastian-resource-operations/sebastian-resource-operations-1.0.0.ebuild b/dev-php/sebastian-resource-operations/sebastian-resource-operations-1.0.0.ebuild
new file mode 100644
index 000000000000..3c67da67a446
--- /dev/null
+++ b/dev-php/sebastian-resource-operations/sebastian-resource-operations-1.0.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PN="${PN/sebastian-//}"
+
+DESCRIPTION="Provides a list of PHP built-in functions that operate on resources"
+HOMEPAGE="http://phpunit.de"
+SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+IUSE=""
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+RDEPEND="dev-php/fedora-autoloader
+ >=dev-lang/php-5.6:*
+ "
+
+src_install() {
+ insinto /usr/share/php/SebastianBergmann/ResourceOperations
+ doins -r src/*
+ doins "${FILESDIR}/autoload.php"
+}
diff --git a/dev-php/sebastian-version-2.0.1 b/dev-php/sebastian-version-2.0.1
deleted file mode 100644
index ea624f5b2555..000000000000
--- a/dev-php/sebastian-version-2.0.1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Helps with managing the version number of Git-hosted PHP projects
-EAPI=6
-HOMEPAGE=http://phpunit.de
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86
-LICENSE=BSD
-RDEPEND=dev-php/fedora-autoloader >=dev-lang/php-5.6:*
-SLOT=0
-SRC_URI=https://github.com/sebastianbergmann/version/archive/2.0.1.tar.gz -> sebastian-version-2.0.1.tar.gz
-_md5_=9dafee6cecd0637e554c93123b4b87b3
diff --git a/dev-php/sebastian-version/Manifest b/dev-php/sebastian-version/Manifest
new file mode 100644
index 000000000000..1646ee2d58df
--- /dev/null
+++ b/dev-php/sebastian-version/Manifest
@@ -0,0 +1,4 @@
+AUX autoload.php 305 BLAKE2B fd6d3f90f1a7b421f68876765e7a5646c291bd7a72b06a6827c1472f5a772cfd4afb23a597ba63dbce0cb2dd999d2ea43b61c9d8e559ffa5ae4a7c3669f9dc9a SHA512 8a3e0a151a2d6b33e168907a3e30778104d2f33ece499b9f6836be807a16bad4f234fddeaae61f56a69f085b3e7e5e4434297e2557b36b62c8e124ba041cb5e1
+DIST sebastian-version-2.0.1.tar.gz 3581 BLAKE2B c6da754aa5ef6f46309d52f7d36a30a1d1b9b847aa90d62481633e0c290fe58554772d4016aa90f79b153b0e3df377269f7dbf007dc7049226899ef9bc2aa868 SHA512 12a813ff08996f8a6e53069ea297fb00f5fc9b58ce463b4008791cadc19575539bdb17acbf1f2fa67b18ce5a9207c9acd47183d520b60d6a188569f513d8a661
+EBUILD sebastian-version-2.0.1.ebuild 691 BLAKE2B 979428304d5ee4b1df97017d8e2e08757c7c7fe8bb9f3e4256dc266aa3ddff6053462f1dba3efe0f0a447d30908397567de3820a7ea5ef42ca28f3a7a417f49c SHA512 0fef8cfb3916a2b2a0fe1ae8109ea423f1249eb0ec0a1a90f73ebd42eb02f90dceded0a8dc36d61730ce6fad648ecd7e6995d0bde8163c9cc12f870f90bb1686
+MISC metadata.xml 329 BLAKE2B 9d69f662322b740a5b9f215d24bde8b76d01bf1de4fe251c9c0a5e3ca3a6254e20b5fc64e06b8f29a060e9336573121e0f63bc1b276f397c0c455af5f376533c SHA512 1c8237de0ca8ba4b3bf588e100df2b966a496ba96dd29ab2cc78cdacec00836e017bc7a32be5f31471eefbe50a144d583d1220a91523dca329d0369920ee15ad
diff --git a/dev-php/sebastian-version/files/autoload.php b/dev-php/sebastian-version/files/autoload.php
new file mode 100644
index 000000000000..3839169bafb5
--- /dev/null
+++ b/dev-php/sebastian-version/files/autoload.php
@@ -0,0 +1,13 @@
+<?php
+/* Autoloader for dev-php/sebastian-version */
+
+if (!class_exists('Fedora\\Autoloader\\Autoload', false)) {
+ require_once '/usr/share/php/Fedora/Autoloader/autoload.php';
+}
+
+\Fedora\Autoloader\Autoload::addClassMap(
+ array(
+ 'sebastianbergmann\version' => '/../Version.php',
+ ),
+ __DIR__
+);
diff --git a/dev-php/sebastian-version/metadata.xml b/dev-php/sebastian-version/metadata.xml
new file mode 100644
index 000000000000..145e45a7391b
--- /dev/null
+++ b/dev-php/sebastian-version/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://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">sebastianbergmann/version</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-php/sebastian-version/sebastian-version-2.0.1.ebuild b/dev-php/sebastian-version/sebastian-version-2.0.1.ebuild
new file mode 100644
index 000000000000..31ce752fd96f
--- /dev/null
+++ b/dev-php/sebastian-version/sebastian-version-2.0.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PN="version"
+
+DESCRIPTION="Helps with managing the version number of Git-hosted PHP projects"
+HOMEPAGE="http://phpunit.de"
+SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+IUSE=""
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+RDEPEND="dev-php/fedora-autoloader
+ >=dev-lang/php-5.6:*"
+
+src_install() {
+ insinto /usr/share/php/SebastianBergmann
+ doins src/Version.php
+ insinto /usr/share/php/SebastianBergmann/Version
+ doins "${FILESDIR}/autoload.php"
+}
diff --git a/dev-php/securimage-3.6.5 b/dev-php/securimage-3.6.5
deleted file mode 100644
index b87930b2cbb5..000000000000
--- a/dev-php/securimage-3.6.5
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=PHP captcha creator and validator library
-EAPI=6
-HOMEPAGE=https://www.phpcaptcha.org/
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD GPL-3+
-RDEPEND=dev-lang/php[gd,truetype] virtual/httpd-php
-SLOT=0
-SRC_URI=https://github.com/dapphp/securimage/archive/3.6.5.tar.gz -> securimage-3.6.5.tar.gz
-_md5_=32fff8338092298c123b825b615dc44a
diff --git a/dev-php/securimage/Manifest b/dev-php/securimage/Manifest
new file mode 100644
index 000000000000..6a8884bd956e
--- /dev/null
+++ b/dev-php/securimage/Manifest
@@ -0,0 +1,3 @@
+DIST securimage-3.6.5.tar.gz 7590487 BLAKE2B 0285860497edf6c89e043b8cb660a6f5948e6ae7d80dacdd83ed37705856fd225e0c9ed43973eb837e85734f1d3c528d210f251d5cbc68c457cac224fea55fb7 SHA512 776130271f54d50cae5d9a71fed4bfe4870c187cbda55314b49706b3d88c8e76c283c09ead195f89b074fba8b16ddb22e25c268d80d01ee34e9dc5d624e12e7d
+EBUILD securimage-3.6.5.ebuild 635 BLAKE2B 8fc02aae3d8e8d53646feaf29d109ca6abe3a08f07815d57a78ba106a3db4d889d79265c5a53f01e45d55409387f275b2c59a5f432d3f38ddeed0d444f0a116c SHA512 c462622f8e1c59907563a99224fefd12eca557065b6971832a857f8b4c8da7ef1cc8e81524e72192150e80f71cb8c93e6c277c2c88f3615baa944b10e8829d8b
+MISC metadata.xml 139 BLAKE2B b4a59c22790dfec3fbcfaea41ef363401766736b68a85bedae00e1944d0a848aa97104c2f34244c0fe7b6363029281f965fc1b3545301d341cda371eaa976274 SHA512 8be912ace7468a4396eb1da00a9785030a8ce35da4357a01591876a1056fd45e44da65de2af3e1eb0506ce6551714962c40c3ae5a3aefa2ad231de35af2519be
diff --git a/dev-php/securimage/metadata.xml b/dev-php/securimage/metadata.xml
new file mode 100644
index 000000000000..097975e3adc2
--- /dev/null
+++ b/dev-php/securimage/metadata.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+</pkgmetadata>
diff --git a/dev-php/securimage/securimage-3.6.5.ebuild b/dev-php/securimage/securimage-3.6.5.ebuild
new file mode 100644
index 000000000000..29e513246e5c
--- /dev/null
+++ b/dev-php/securimage/securimage-3.6.5.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="PHP captcha creator and validator library"
+HOMEPAGE="https://www.phpcaptcha.org/"
+SRC_URI="https://github.com/dapphp/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-lang/php[gd,truetype]
+ virtual/httpd-php"
+
+src_install()
+{
+ # Grab all PHP files except the examples.
+ set *.php
+ local php_files=${@/*example*/}
+
+ insinto /usr/share/php/${PN}
+ doins -r ${php_files} *.{ttf,swf} audio backgrounds database images words
+
+ dodoc README*
+}
diff --git a/dev-php/semver-1.4.2 b/dev-php/semver-1.4.2
deleted file mode 100644
index 29e03c9e4cca..000000000000
--- a/dev-php/semver-1.4.2
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Semantic versioning utilities, constraint parsing, and checking
-EAPI=6
-HOMEPAGE=https://github.com/composer/semver
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-lang/php:* dev-php/fedora-autoloader
-SLOT=0
-SRC_URI=https://github.com/composer/semver/archive/1.4.2.tar.gz -> semver-1.4.2.tar.gz
-_md5_=ab83c487e750f8f4b3b40bc250ba200d
diff --git a/dev-php/semver/Manifest b/dev-php/semver/Manifest
new file mode 100644
index 000000000000..e0dfda114890
--- /dev/null
+++ b/dev-php/semver/Manifest
@@ -0,0 +1,4 @@
+AUX autoload.php 251 BLAKE2B 6d0768402735be6031c510b158bf29c0bc38a7c59317319e7b3240275903ece9a24c6eecacdac60b7dcb41c8b06513972cc649f7a36064adf7be33e1fa25ab67 SHA512 acae828e0308a02338aa850f4ba68a8becf171e9ddc6d9d6d1f48dfe24b100b53cd7b5d42d723f69e4e19aded8fe36c86ea3172b5681b0d96ec9e1a9661460f1
+DIST semver-1.4.2.tar.gz 10408 BLAKE2B 1504b6dff157e1b3c5ca338060e668f478fdd4e6a61be7835af6da669d22ef15a2143551e96bd01926fd2b408736fd8e70df22e1364b80712dc7d65608889b27 SHA512 2e41e2e70e9e62b280bff40b1a05b3803d95fb088eb4ce395e1f1fed79a40efc3a0ad16f8506d83a81b0e1d08e069640b2b084cc91aeb1ed41d934fd18249fe2
+EBUILD semver-1.4.2.ebuild 630 BLAKE2B 7741098c8702cf362044f6b6726df614cc85521f82e3a392ab79e47061691205c22bd4c74bb58cf2330f000b45b47143949f312a351e082af75ce10e1a3d3a43 SHA512 83b91af48b58ba6ffa34b26c30c0291c76146fb3088ce76fa5ab93a5b13888037527961934e460d6433716c74a09b02f9393d70280627a713686b9341a0c0374
+MISC metadata.xml 691 BLAKE2B d635ca9e1849cddd3377081ddd927fcb15d092728a624c408d17aa0a307751150212f1a4abacec0dc03618402f05cdd226f0cbbaea4b47d66141637f7d5c6aad SHA512 58d106fb2642c5445fcc487b818a7d0ddb21bf56d17455fd21cab83d9941437a4f339cdd192ca212645891bce3da01bf936e503b63665cf014d55ebe12b635d4
diff --git a/dev-php/semver/files/autoload.php b/dev-php/semver/files/autoload.php
new file mode 100644
index 000000000000..bf9e65beee0b
--- /dev/null
+++ b/dev-php/semver/files/autoload.php
@@ -0,0 +1,8 @@
+<?php
+/* Autoloader for composer/ca-bundle and its dependencies */
+
+if (!class_exists('Fedora\\Autoloader\\Autoload', false)) {
+ require_once 'Fedora/Autoloader/autoload.php';
+}
+
+\Fedora\Autoloader\Autoload::addPsr4('Composer\\Semver\\', __DIR__);
diff --git a/dev-php/semver/metadata.xml b/dev-php/semver/metadata.xml
new file mode 100644
index 000000000000..031f9b3cd5ec
--- /dev/null
+++ b/dev-php/semver/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>guillaumeseren@gmail.com</email>
+ <name>Guillaume Seren</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ </maintainer>
+ <longdescription>
+ Semantic versioning utilities with the addition of version constraints parsing and checking.
+ </longdescription>
+ <upstream>
+ <remote-id type="github">composer/semver</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-php/semver/semver-1.4.2.ebuild b/dev-php/semver/semver-1.4.2.ebuild
new file mode 100644
index 000000000000..21aed1b27903
--- /dev/null
+++ b/dev-php/semver/semver-1.4.2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Semantic versioning utilities, constraint parsing, and checking"
+HOMEPAGE="https://github.com/composer/semver"
+SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-lang/php:*
+ dev-php/fedora-autoloader"
+
+# The releases don't contain the test suite at the moment, see
+# https://github.com/composer/semver/issues/59
+
+src_install() {
+ insinto '/usr/share/php/Composer/Semver'
+ doins -r src/. "${FILESDIR}/autoload.php"
+ dodoc README.md
+}
diff --git a/dev-php/simpletest-1.1.7 b/dev-php/simpletest-1.1.7
deleted file mode 100644
index 1c97f7c27290..000000000000
--- a/dev-php/simpletest-1.1.7
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=A PHP testing framework
-EAPI=6
-HOMEPAGE=http://www.simpletest.org/
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=dev-lang/php:*
-SLOT=0
-SRC_URI=https://github.com/simpletest/simpletest/archive/v1.1.7.tar.gz -> simpletest-1.1.7.tar.gz
-_md5_=02489d2dcbba09f3135b9a4d8d0999b6
diff --git a/dev-php/simpletest/Manifest b/dev-php/simpletest/Manifest
new file mode 100644
index 000000000000..68876e825f6a
--- /dev/null
+++ b/dev-php/simpletest/Manifest
@@ -0,0 +1,3 @@
+DIST simpletest-1.1.7.tar.gz 763745 BLAKE2B 20c61b8dce5c628c6f26ef60b605b7ce3bb61c95a43a8f29bf5d176c03bc43f1e463d5ff301c93ddd71e43419773f2c99a3cb52561c6a8d6b0d586ef2341708e SHA512 105ce73a36bb3885ee27052b5bc7fde775ec04afc725ab45c79cf103639e9c7d8bd7f9e279f5b07ad5d1e9ccf3797741506e3bf07b57283b5f1b3f39901ad852
+EBUILD simpletest-1.1.7.ebuild 550 BLAKE2B b0c760fd6746b8a973af59e77e81507a9f6b311b02fc55d60c035d09cab4fd547dbbd095612315f579b4b52ecb30f2d445291ed92edb4ccd9739449882c1cbab SHA512 1d2f01ed7f9da2eca32283459a35668847e43c0329380f276fec6b315bf9301f73ca6af6733907df1ceba394b75881ed2113cd4ae0aaa769f36b1b8f68b34286
+MISC metadata.xml 325 BLAKE2B 9119779a0864434dff5529f6175515b981526d193a4b1bf80381fbb1c8d26e6958c06205145b4b85f7bb33cc6c03b54ffa997d80b09cdfa23feb94206249293e SHA512 2b84e2a69b03c95ab22964906cc4fecfd749ed3e34bd8c3334ea9638548ee07f6e359a805d6531d912cf01d94a004167ba584b06ea94428adaf812b90692bef3
diff --git a/dev-php/simpletest/metadata.xml b/dev-php/simpletest/metadata.xml
new file mode 100644
index 000000000000..26c2f4a62f95
--- /dev/null
+++ b/dev-php/simpletest/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://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">simpletest/simpletest</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-php/simpletest/simpletest-1.1.7.ebuild b/dev-php/simpletest/simpletest-1.1.7.ebuild
new file mode 100644
index 000000000000..90a8205b07e1
--- /dev/null
+++ b/dev-php/simpletest/simpletest-1.1.7.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KEYWORDS="~amd64 ~x86"
+
+DESCRIPTION="A PHP testing framework"
+HOMEPAGE="http://www.simpletest.org/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE=""
+
+DEPEND=""
+RDEPEND="dev-lang/php:*"
+
+src_install() {
+ local DOCS=( docs HELP_MY_TESTS_DONT_WORK_ANYMORE README.md TODO.xml )
+ einstalldocs
+
+ insinto "/usr/share/php/${PN}"
+ doins -r *.php extensions packages tutorials
+}
diff --git a/dev-php/smarty-3.1.30 b/dev-php/smarty-3.1.30
deleted file mode 100644
index c59305c066e5..000000000000
--- a/dev-php/smarty-3.1.30
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst
-DEPEND=doc? ( app-arch/unzip )
-DESCRIPTION=A template engine for PHP
-EAPI=6
-HOMEPAGE=https://www.smarty.net/
-IUSE=doc
-KEYWORDS=alpha amd64 hppa ia64 ppc ppc64 sparc x86
-LICENSE=LGPL-3
-RDEPEND=dev-lang/php:*[unicode]
-SLOT=0
-SRC_URI=https://github.com/smarty-php/smarty/archive/v3.1.30.tar.gz -> smarty-3.1.30.tar.gz doc? ( https://www.smarty.net/files/docs/manual-en.3.1.14.zip )
-_md5_=a6bcf98c26602fed492eb723d7e97a82
diff --git a/dev-php/smarty-3.1.31 b/dev-php/smarty-3.1.31
deleted file mode 100644
index 97813b5c546a..000000000000
--- a/dev-php/smarty-3.1.31
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst
-DEPEND=doc? ( app-arch/unzip )
-DESCRIPTION=A template engine for PHP
-EAPI=6
-HOMEPAGE=https://www.smarty.net/
-IUSE=doc
-KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=LGPL-3
-RDEPEND=dev-lang/php:*[unicode]
-SLOT=0
-SRC_URI=https://github.com/smarty-php/smarty/archive/v3.1.31.tar.gz -> smarty-3.1.31.tar.gz doc? ( https://www.smarty.net/files/docs/manual-en.3.1.14.zip )
-_md5_=a36576a188e93b16233776af02b6a5c3
diff --git a/dev-php/smarty-3.1.32 b/dev-php/smarty-3.1.32
deleted file mode 100644
index b2903aa0da02..000000000000
--- a/dev-php/smarty-3.1.32
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst
-DEPEND=doc? ( app-arch/unzip )
-DESCRIPTION=A template engine for PHP
-EAPI=6
-HOMEPAGE=https://www.smarty.net/
-IUSE=doc
-KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=LGPL-3
-RDEPEND=dev-lang/php:*[unicode]
-SLOT=0
-SRC_URI=https://github.com/smarty-php/smarty/archive/v3.1.32.tar.gz -> smarty-3.1.32.tar.gz doc? ( https://www.smarty.net/files/docs/manual-en.3.1.14.zip )
-_md5_=a36576a188e93b16233776af02b6a5c3
diff --git a/dev-php/smarty/Manifest b/dev-php/smarty/Manifest
new file mode 100644
index 000000000000..4aeea542c64d
--- /dev/null
+++ b/dev-php/smarty/Manifest
@@ -0,0 +1,8 @@
+DIST manual-en.3.1.14.zip 408414 BLAKE2B 03d4e7a386eb3bd5b19e5c555ec34b86812838a5b5fac8ec0ab9701fba89a5867714da57d950f68224a89bbe2267c18d638ee850681860de309c74bbfb3d0a0b SHA512 d384e3856b45ed3f992f3732a5465120abe9fb947cdf13ff67a9c4264f72987d24885ee61cd7309b728e64cdfe4f34c3e7f757096d35de56d962f3b78def9e58
+DIST smarty-3.1.30.tar.gz 255464 BLAKE2B 8378e6336f271e3c41e16b8fbb70356827ff4a9a61e3cf2a23fdbd0617155ec9dca6a5b6372327d4b35a5c6f7c3b58e807afe7403b7ed929ebacfb3c36e124d0 SHA512 6ad9a6cf10b81fecbdc4daa4acbd9724db5f1c2a014e35039b36b0bf00ba000946a2126f7da5899e587a79419f451aafcd1ee14597a32cf290bbd0bf13a877d0
+DIST smarty-3.1.31.tar.gz 244196 BLAKE2B 695bd40d337e8f2d4a44a7b30b743ab4e5b6a7b024a514de956cd513dd6639ac6f9ae464f0d3b4cfcaf7de17994837a866cdd4945780bd3a96ff32df300302a3 SHA512 807343e4229413ea0f5219a828d4e91603fb5454f4abe8aa2d41f0a6fe32fa476e791340e1e95178ded3774d1524e98489c104c6fa391e70a8225de28fdcca18
+DIST smarty-3.1.32.tar.gz 250680 BLAKE2B 92d4942f2d3d802b18082f5f6079c8b6945abadd8ef2c87ea217b106eeeedfbde7f1bd00c6fced67b73fc3cf328ec91fc1fb61c7f991b992167fa9d2fb1f2ad2 SHA512 07c95177172718158b9b562c6d8ff79566f4bd8e07ba394cc82c52dec7ec869935fd03ce523115c08472159adf68b902d1db5f8543201a35adf22027c5978080
+EBUILD smarty-3.1.30.ebuild 1331 BLAKE2B 59393ee7db8482c6af06ce4430e638ce02ca1ea3f9dbc1264f867bd94aa5b55a3b9321f90f6fc4a1a8c9e7c6bfdeb64342b67e2117e1b3b5586258d8b692bb22 SHA512 e79707cc1e841806d654a597c7b7c2e0e3465a5bd6354652247d6e697bf8e6b3727ff52cf441aa72abb470d0ff1c325526489e3169062ee537ca80b98685e7dd
+EBUILD smarty-3.1.31.ebuild 1339 BLAKE2B b64063186aaac934f8604f67ebe1b53cf171d024db96388eac4950508ec9278f3f85e61df1147bb395ea9d84447281860e2d9994a21d06de36ec59d26900c228 SHA512 fb0c063f295956b275023751ca12cdc7110de17430214a42020840221697892ffc5045f16fa09cbd4b19b409188e9607adcf640f824c668395e8b62d560d7b1e
+EBUILD smarty-3.1.32.ebuild 1339 BLAKE2B b64063186aaac934f8604f67ebe1b53cf171d024db96388eac4950508ec9278f3f85e61df1147bb395ea9d84447281860e2d9994a21d06de36ec59d26900c228 SHA512 fb0c063f295956b275023751ca12cdc7110de17430214a42020840221697892ffc5045f16fa09cbd4b19b409188e9607adcf640f824c668395e8b62d560d7b1e
+MISC metadata.xml 581 BLAKE2B c8e02efefe221a4cea961b32c448d3a69f2dbec795a1a012c727777dfc4a448fd0bb23816564843f0a3fe6eb67453175ee84417e7ffe0e72aa48f8f131b72aaa SHA512 1bf0fea8d62a06b1b67ee417eeb44dbb476ba590b35808f7c7bc1b40a6758b2c3f931e8290c2908a14828f8e2789eb8e2c6d5a26e106f97359f45a476fd31401
diff --git a/dev-php/smarty/metadata.xml b/dev-php/smarty/metadata.xml
new file mode 100644
index 000000000000..65adc5d3d3e2
--- /dev/null
+++ b/dev-php/smarty/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ <name>PHP</name>
+ </maintainer>
+ <longdescription lang="en">
+ Smarty is a template engine for PHP, facilitating the separation of
+ presentation (HTML/CSS) from application logic. This implies that PHP
+ code is application logic, and is separated from the presentation.
+ </longdescription>
+ <upstream>
+ <remote-id type="github">smarty-php/smarty</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-php/smarty/smarty-3.1.30.ebuild b/dev-php/smarty/smarty-3.1.30.ebuild
new file mode 100644
index 000000000000..8d68f8465a42
--- /dev/null
+++ b/dev-php/smarty/smarty-3.1.30.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DOC_PV="3.1.14"
+
+DESCRIPTION="A template engine for PHP"
+HOMEPAGE="https://www.smarty.net/"
+SRC_URI="https://github.com/smarty-php/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+ doc? ( https://www.smarty.net/files/docs/manual-en.${DOC_PV}.zip )"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
+IUSE="doc"
+
+DEPEND="doc? ( app-arch/unzip )"
+
+# PHP unicode support is detected at runtime, and the cached templates
+# that smarty generates depend on it. If, later on, PHP is reinstalled
+# without unicode support, all of the previously-generated cached
+# templates will begin to throw 500 errrors for missing mb_foo
+# functions. See bug #532618.
+RDEPEND="dev-lang/php:*[unicode]"
+
+src_install() {
+ insinto "/usr/share/php/${PN}"
+ doins -r libs/*
+
+ local DOCS=( *.txt README README.md )
+ local HTML_DOCS
+ use doc && HTML_DOCS="${WORKDIR}/manual-en/"*
+ einstalldocs
+}
+
+pkg_postinst() {
+ elog "${PN} has been installed in /usr/share/php/${PN}/."
+ elog
+ elog 'To use it in your scripts, include the Smarty.class.php file'
+ elog "from the \"${PN}\" directory; for example,"
+ elog
+ elog " require('${PN}/Smarty.class.php');"
+ elog
+ elog 'After that, the Smarty class will be available to you.'
+}
diff --git a/dev-php/smarty/smarty-3.1.31.ebuild b/dev-php/smarty/smarty-3.1.31.ebuild
new file mode 100644
index 000000000000..c1b265f15ead
--- /dev/null
+++ b/dev-php/smarty/smarty-3.1.31.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DOC_PV="3.1.14"
+
+DESCRIPTION="A template engine for PHP"
+HOMEPAGE="https://www.smarty.net/"
+SRC_URI="https://github.com/smarty-php/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+ doc? ( https://www.smarty.net/files/docs/manual-en.${DOC_PV}.zip )"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc"
+
+DEPEND="doc? ( app-arch/unzip )"
+
+# PHP unicode support is detected at runtime, and the cached templates
+# that smarty generates depend on it. If, later on, PHP is reinstalled
+# without unicode support, all of the previously-generated cached
+# templates will begin to throw 500 errrors for missing mb_foo
+# functions. See bug #532618.
+RDEPEND="dev-lang/php:*[unicode]"
+
+src_install() {
+ insinto "/usr/share/php/${PN}"
+ doins -r libs/*
+
+ local DOCS=( *.txt README README.md )
+ local HTML_DOCS
+ use doc && HTML_DOCS="${WORKDIR}/manual-en/"*
+ einstalldocs
+}
+
+pkg_postinst() {
+ elog "${PN} has been installed in /usr/share/php/${PN}/."
+ elog
+ elog 'To use it in your scripts, include the Smarty.class.php file'
+ elog "from the \"${PN}\" directory; for example,"
+ elog
+ elog " require('${PN}/Smarty.class.php');"
+ elog
+ elog 'After that, the Smarty class will be available to you.'
+}
diff --git a/dev-php/smarty/smarty-3.1.32.ebuild b/dev-php/smarty/smarty-3.1.32.ebuild
new file mode 100644
index 000000000000..c1b265f15ead
--- /dev/null
+++ b/dev-php/smarty/smarty-3.1.32.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DOC_PV="3.1.14"
+
+DESCRIPTION="A template engine for PHP"
+HOMEPAGE="https://www.smarty.net/"
+SRC_URI="https://github.com/smarty-php/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+ doc? ( https://www.smarty.net/files/docs/manual-en.${DOC_PV}.zip )"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc"
+
+DEPEND="doc? ( app-arch/unzip )"
+
+# PHP unicode support is detected at runtime, and the cached templates
+# that smarty generates depend on it. If, later on, PHP is reinstalled
+# without unicode support, all of the previously-generated cached
+# templates will begin to throw 500 errrors for missing mb_foo
+# functions. See bug #532618.
+RDEPEND="dev-lang/php:*[unicode]"
+
+src_install() {
+ insinto "/usr/share/php/${PN}"
+ doins -r libs/*
+
+ local DOCS=( *.txt README README.md )
+ local HTML_DOCS
+ use doc && HTML_DOCS="${WORKDIR}/manual-en/"*
+ einstalldocs
+}
+
+pkg_postinst() {
+ elog "${PN} has been installed in /usr/share/php/${PN}/."
+ elog
+ elog 'To use it in your scripts, include the Smarty.class.php file'
+ elog "from the \"${PN}\" directory; for example,"
+ elog
+ elog " require('${PN}/Smarty.class.php');"
+ elog
+ elog 'After that, the Smarty class will be available to you.'
+}
diff --git a/dev-php/spdx-licenses-1.2.0 b/dev-php/spdx-licenses-1.2.0
deleted file mode 100644
index aaf725e15c7d..000000000000
--- a/dev-php/spdx-licenses-1.2.0
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Tools for working with and validating SPDX licenses
-EAPI=6
-HOMEPAGE=https://github.com/composer/spdx-licenses
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-lang/php:* dev-php/fedora-autoloader
-SLOT=0
-SRC_URI=https://github.com/composer/spdx-licenses/archive/1.2.0.tar.gz -> spdx-licenses-1.2.0.tar.gz
-_md5_=0a5ffcecb6fcdad3cbdf7d71f1501751
diff --git a/dev-php/spdx-licenses/Manifest b/dev-php/spdx-licenses/Manifest
new file mode 100644
index 000000000000..b0c57258a277
--- /dev/null
+++ b/dev-php/spdx-licenses/Manifest
@@ -0,0 +1,4 @@
+AUX autoload.php 264 BLAKE2B f5084534435d4e00c9a97ff6a068ff94b32b5e533095046357d7a1565c4e2422f6985c0b66ac73ce706c4cb53261d05abf3b6e5f0724bdc34e497fa2e1abc959 SHA512 6dd28dc205943fa5fa8fb7577a88926573533d553e86577ec2d2e34045ea744731ea08c9dfee277dd1550cac033ac53d1648aa8b28fc78eaa73d0613371aaaa7
+DIST spdx-licenses-1.2.0.tar.gz 10974 BLAKE2B 52cba9837202b1ae598b6d3b36f4ef67ec27988fa5911f2dfff92d39515d0401f5636922a3d205413489d21fd1dfacbf68f72c907503807317c7c9e51392e016 SHA512 fdb63dd29a099afbc116b30d1deec3d2b46be998a55fd741126f1bc393c5037a9a7477e55f7e030585d826be7d72db26be5ce0b5bb57dd536137cc45890ea9c9
+EBUILD spdx-licenses-1.2.0.ebuild 540 BLAKE2B 5408ae142e124053f36c38f211f8cbd7cd4cd37cf34d4a6bdf9049458107d9b3fc1c9b7f70168e67eaf2bcb0ad8b62b382f3312928bb013e2dfac1748a9203e7 SHA512 61e9ef062aec32f723ce485dd5f1b0dd84355894571f78f38c13dca00756d9bbb8de0703b2fd5466e806efb0b7e5e147d87061e95d003c81fc2b4f0cd789c3b3
+MISC metadata.xml 675 BLAKE2B 6ae4ff5df27e2d6334deee789bf253f71f6b55999e2cd9f0c4a1be6358c63c74f668624025f0d8fedb24dea3ccb36ad7d97972f1f627979b7c40e5ca1c389eeb SHA512 f660171c2d2bf3582a91e72a9a92b8f1270a1339c8f68d47c3d6abc2d642027873b8c6a4b2ec7c8bf968cfc37de208c3505899bc2d4fd472cfd403b73dd9fefa
diff --git a/dev-php/spdx-licenses/files/autoload.php b/dev-php/spdx-licenses/files/autoload.php
new file mode 100644
index 000000000000..6ebf96e7378c
--- /dev/null
+++ b/dev-php/spdx-licenses/files/autoload.php
@@ -0,0 +1,8 @@
+<?php
+/* Autoloader for composer/ca-bundle and its dependencies */
+
+if (!class_exists('Fedora\\Autoloader\\Autoload', false)) {
+ require_once '/usr/share/php/Fedora/Autoloader/autoload.php';
+}
+
+\Fedora\Autoloader\Autoload::addPsr4('Composer\\Spdx\\', __DIR__);
diff --git a/dev-php/spdx-licenses/metadata.xml b/dev-php/spdx-licenses/metadata.xml
new file mode 100644
index 000000000000..393828b4566f
--- /dev/null
+++ b/dev-php/spdx-licenses/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>guillaumeseren@gmail.com</email>
+ <name>Guillaume Seren</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ </maintainer>
+ <longdescription>
+ Tools for working with the SPDX license list and validating licenses.
+ </longdescription>
+ <upstream>
+ <remote-id type="github">composer/spdx-licenses</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-php/spdx-licenses/spdx-licenses-1.2.0.ebuild b/dev-php/spdx-licenses/spdx-licenses-1.2.0.ebuild
new file mode 100644
index 000000000000..c23832e1773c
--- /dev/null
+++ b/dev-php/spdx-licenses/spdx-licenses-1.2.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Tools for working with and validating SPDX licenses"
+HOMEPAGE="https://github.com/composer/spdx-licenses"
+SRC_URI="https://github.com/composer/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+ dev-lang/php:*
+ dev-php/fedora-autoloader"
+
+src_install() {
+ insinto "/usr/share/php/Composer/Spdx"
+ doins -r src/. res "${FILESDIR}"/autoload.php
+ dodoc README.md
+}
diff --git a/dev-php/stringparser_bbcode-0.3.3-r1 b/dev-php/stringparser_bbcode-0.3.3-r1
deleted file mode 100644
index e079a4e15e72..000000000000
--- a/dev-php/stringparser_bbcode-0.3.3-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=A PHP class to parse BB codes
-EAPI=6
-HOMEPAGE=http://christian-seiler.de/projekte/php/bbcode/index_en.html
-IUSE=doc
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-lang/php
-SLOT=0
-SRC_URI=http://christian-seiler.de/projekte/php/bbcode/download/stringparser_bbcode-0.3.3.tar.gz
-_md5_=81f919a85a2ae71f09247154231c3319
diff --git a/dev-php/stringparser_bbcode/Manifest b/dev-php/stringparser_bbcode/Manifest
new file mode 100644
index 000000000000..af40eaf3b7a8
--- /dev/null
+++ b/dev-php/stringparser_bbcode/Manifest
@@ -0,0 +1,3 @@
+DIST stringparser_bbcode-0.3.3.tar.gz 338784 BLAKE2B 4f3d53fa42ddf0dc15c88d84d5b590a3d1611f0cf99ea19e6eaf015febf723d5ea16b24669ed51e1134098150188974e5dcb576e1c88dbe76fa50696f003ba17 SHA512 45cdbe717d8c11a138ed700b987dc4e0f5c85048b402a6ef24c35941342680c341c4ddbdc2ac984976a56128a2a80a8457d5b884ea92dab019f094886c77d1bd
+EBUILD stringparser_bbcode-0.3.3-r1.ebuild 519 BLAKE2B 2a0fe135b0451b326c9b7ba6a4e4dd6426932a4335e1e00fed82c19ca2a0cb2eb99fda1b0859ba09ebf968675883f7dadfb30b38c92a1d474f7f496e7fb4978a SHA512 e0d1e3820049015d67c52b7453dfd998f6e60bda19a19bd22e38e376cd8f21fcb8b48d32931294bed0510497a1fa48c6960e3668ebedbfe1b18fc290d5d02d33
+MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/stringparser_bbcode/metadata.xml b/dev-php/stringparser_bbcode/metadata.xml
new file mode 100644
index 000000000000..b86acf66c756
--- /dev/null
+++ b/dev-php/stringparser_bbcode/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ <name>PHP</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/dev-php/stringparser_bbcode/stringparser_bbcode-0.3.3-r1.ebuild b/dev-php/stringparser_bbcode/stringparser_bbcode-0.3.3-r1.ebuild
new file mode 100644
index 000000000000..6b8bd6e4d4da
--- /dev/null
+++ b/dev-php/stringparser_bbcode/stringparser_bbcode-0.3.3-r1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="A PHP class to parse BB codes"
+HOMEPAGE="http://christian-seiler.de/projekte/php/bbcode/index_en.html"
+SRC_URI="http://christian-seiler.de/projekte/php/bbcode/download/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+RDEPEND="dev-lang/php"
+
+src_install() {
+ insinto "/usr/share/php/${PN}"
+ doins -r src/*
+
+ dodoc AUTHORS ChangeLog THANKS
+ use doc && dodoc -r doc/*
+}
diff --git a/dev-php/suhosin-0.9.38-r1 b/dev-php/suhosin-0.9.38-r1
deleted file mode 100644
index be117d3a4e4e..000000000000
--- a/dev-php/suhosin-0.9.38-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=php_targets_php5-6? ( dev-lang/php:5.6[unicode] ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php5-6? ( dev-lang/php:5.6 )
-DESCRIPTION=Suhosin is an advanced protection system for PHP installations
-EAPI=6
-HOMEPAGE=https://www.suhosin.org/
-IUSE=php_targets_php5-6
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=PHP-3.01
-RDEPEND=php_targets_php5-6? ( dev-lang/php:5.6[unicode] ) php_targets_php5-6? ( dev-lang/php:5.6 )
-REQUIRED_USE=|| ( php_targets_php5-6 )
-SLOT=0
-SRC_URI=https://download.suhosin.org/suhosin-0.9.38.tar.gz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e php-ext-source-r3 63b281041baa106ff1ef59b602ca7e2a toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=e4a0ddbefa672b7c576c6b0afd1db15c
diff --git a/dev-php/suhosin/Manifest b/dev-php/suhosin/Manifest
new file mode 100644
index 000000000000..489e1ffd4a84
--- /dev/null
+++ b/dev-php/suhosin/Manifest
@@ -0,0 +1,4 @@
+AUX suhosin-0.9.38-libcrypt.patch 590 BLAKE2B db02346c66f348fd0be16fea1647deb1a6e44c2b10077f410ab919e7800e160439780d7b1c807f455cd3efb115765288c869cd96d719f4315150edfd73693085 SHA512 fa834f26803e2f623a269bc1cc81e305e081397717e0058315cac8087f04c33ff7f2eeee2052dada75559e5b35dc85c55499d74635dacd0f08fcc226ec3d0de3
+DIST suhosin-0.9.38.tar.gz 122800 BLAKE2B e016091e370bbcfdaad91d10858541cd730951be1032e95b4d372b5a77fce719e300cfa0638bf3ebde68e91d76b95c94ca56ce239997da69fc7ce5068b26ab49 SHA512 cc4eb38b5d6673cc3f2dc395e5a8b5461d3221019ac9849b747b6d5bae423cd5bd01a75b9432414dc7c26c78bab9f2381a5414712a6906a999f3ec9dc77ebc45
+EBUILD suhosin-0.9.38-r1.ebuild 1330 BLAKE2B bee0345e89d02138a9d79b5c91cf4c75fad99626e42a503034c2047910bf96f00941a066518633e4c84f6cede39bff9fe3414ede6c38ceb3dcec944b75e68058 SHA512 79341927c5c6351514d9ef257be38884c27beab3a91b3d873d52b2b1c34b6977296a499fc226c0b3ecbe5b7ef49d1d3f1e5f00acd834d1372babca6b7f9ef53f
+MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/suhosin/files/suhosin-0.9.38-libcrypt.patch b/dev-php/suhosin/files/suhosin-0.9.38-libcrypt.patch
new file mode 100644
index 000000000000..691f70c1b4c5
--- /dev/null
+++ b/dev-php/suhosin/files/suhosin-0.9.38-libcrypt.patch
@@ -0,0 +1,12 @@
+Index: suhosin-0.9.32.1/config.m4
+===================================================================
+--- suhosin-0.9.33.orig/config.m4
++++ suhosin-0.9.33/config.m4
+@@ -6,4 +6,7 @@ PHP_ARG_ENABLE(suhosin, whether to enabl
+
+ if test "$PHP_SUHOSIN" != "no"; then
+ PHP_NEW_EXTENSION(suhosin, suhosin.c sha256.c memory_limit.c treat_data.c ifilter.c post_handler.c ufilter.c rfc1867_new.c log.c header.c execute.c ex_imp.c session.c aes.c crypt.c, $ext_shared)
++ PHP_CHECK_LIBRARY(crypt, crypt,
++ [PHP_ADD_LIBRARY(crypt,, SUHOSIN_SHARED_LIBADD)])
++ PHP_SUBST(SUHOSIN_SHARED_LIBADD)
+ fi
diff --git a/dev-php/suhosin/metadata.xml b/dev-php/suhosin/metadata.xml
new file mode 100644
index 000000000000..b86acf66c756
--- /dev/null
+++ b/dev-php/suhosin/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ <name>PHP</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/dev-php/suhosin/suhosin-0.9.38-r1.ebuild b/dev-php/suhosin/suhosin-0.9.38-r1.ebuild
new file mode 100644
index 000000000000..3372f3abe755
--- /dev/null
+++ b/dev-php/suhosin/suhosin-0.9.38-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PHP_EXT_NAME="suhosin"
+PHP_EXT_INI="no"
+PHP_EXT_ZENDEXT="no"
+USE_PHP="php5-6"
+
+inherit php-ext-source-r3
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+
+DESCRIPTION="Suhosin is an advanced protection system for PHP installations"
+HOMEPAGE="https://www.suhosin.org/"
+SRC_URI="https://download.suhosin.org/${P}.tar.gz"
+LICENSE="PHP-3.01"
+SLOT="0"
+IUSE=""
+
+for target in ${USE_PHP}; do
+ slot=${target/php}
+ slot=${slot/-/.}
+ PHPUSEDEPEND="${PHPUSEDEPEND}
+ php_targets_${target}? ( dev-lang/php:${slot}[unicode] )"
+done
+
+DEPEND="${PHPUSEDEPEND}"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}"/${P}-libcrypt.patch )
+DOCS=( CREDITS )
+
+src_install() {
+ php-ext-source-r3_src_install
+
+ local slot inifile
+ for slot in $(php_get_slots); do
+ php_init_slot_env ${slot}
+ for inifile in $(php_slot_ini_files "${slot}") ; do
+ insinto "${inifile/${PHP_EXT_NAME}.ini/}"
+ insopts -m644
+ doins "suhosin.ini"
+ done
+ done
+}
+
+src_test() {
+ # Makefile passes a hard-coded -d extension_dir=./modules, we move the lib
+ # away from there in src_compile
+ for slot in `php_get_slots`; do
+ php_init_slot_env ${slot}
+ NO_INTERACTION="yes" emake test || die "emake test failed for slot ${slot}"
+ done
+}
diff --git a/dev-php/swoole-4.0.1 b/dev-php/swoole-4.0.1
deleted file mode 100644
index eb5030b4c4cb..000000000000
--- a/dev-php/swoole-4.0.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/libaio dev-libs/boost:0= dev-libs/libpcre http2? ( net-libs/nghttp2:0= ) redis? ( dev-libs/hiredis:0= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) php_targets_php7-0? ( dev-lang/php:7.0[cli,sockets?] ) php_targets_php7-1? ( dev-lang/php:7.1[cli,sockets?] ) php_targets_php7-2? ( dev-lang/php:7.2[cli,sockets?] ) mysql? ( php_targets_php7-0? ( dev-lang/php:7.0[mysql,mysqli(+)] ) php_targets_php7-1? ( dev-lang/php:7.1[mysql,mysqli(+)] ) php_targets_php7-2? ( dev-lang/php:7.2[mysql,mysqli(+)] ) ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 )
-DESCRIPTION=Event-driven asynchronous & concurrent & coroutine networking engine
-EAPI=6
-HOMEPAGE=https://www.swoole.co.uk
-IUSE=debug http2 libressl mysql redis sockets ssl threads php_targets_php7-0 php_targets_php7-1 php_targets_php7-2
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-libs/libaio dev-libs/boost:0= dev-libs/libpcre http2? ( net-libs/nghttp2:0= ) redis? ( dev-libs/hiredis:0= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) php_targets_php7-0? ( dev-lang/php:7.0[cli,sockets?] ) php_targets_php7-1? ( dev-lang/php:7.1[cli,sockets?] ) php_targets_php7-2? ( dev-lang/php:7.2[cli,sockets?] ) mysql? ( php_targets_php7-0? ( dev-lang/php:7.0[mysql,mysqli(+)] ) php_targets_php7-1? ( dev-lang/php:7.1[mysql,mysqli(+)] ) php_targets_php7-2? ( dev-lang/php:7.2[mysql,mysqli(+)] ) ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 )
-REQUIRED_USE=|| ( php_targets_php7-0 php_targets_php7-1 php_targets_php7-2 )
-SLOT=0
-SRC_URI=https://pecl.php.net/get/swoole-4.0.1.tgz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e php-ext-pecl-r3 a59741d3df8ea9f17afcdcfb7edaee6d php-ext-source-r3 63b281041baa106ff1ef59b602ca7e2a toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=478a77927ed7fdbdd3cd23445d9b3c72
diff --git a/dev-php/swoole/Manifest b/dev-php/swoole/Manifest
new file mode 100644
index 000000000000..40acb3ad6c11
--- /dev/null
+++ b/dev-php/swoole/Manifest
@@ -0,0 +1,3 @@
+DIST swoole-4.0.1.tgz 899395 BLAKE2B 7e7320905cb83794115280977031cc5254a4947781fde05db6e7803f34ff0f5c0ecad84f8aa86adc3c21320b031fa3104fb6c953e9060791dbd9d5c497edbcfc SHA512 0df6ae1bf28ec52abebf1a597c0774e7e5de4bb8378c916a46896c7f84822c8466bbb0d3d188e671e7c39faafa94d2dc2245a468dacb2711c7f0fa617dc42aa8
+EBUILD swoole-4.0.1.ebuild 1695 BLAKE2B 7720c6946b04a5c35c012187873a351919f02a4c9b8cf041b20f4777b57db65e8f2376a1cd121af0203d802227bedae046fd1aa3b3ea3c0fecc6c677f9f029ce SHA512 fa2a870086d261175ff9ed262bd3051a62bd12ba979a384d8fbfca121ba9cba74ffe55cf8f84c687eec4b449d57904d73232c637d87fb6cd5d42e7d1bff19ee5
+MISC metadata.xml 424 BLAKE2B abaaecb73dd8caf77e25775dc2b3307efa430399d197b24f3ade567b93989108c70216949327677f5c9540e6aaafaf2f77d9af17b01f99de2ac6f04a95abb03b SHA512 52dc7ac48b61458b810ba467bbe5cfaeaef808ae7db72f58ba4ad4dd8723c7149995e43e94c8b4552e7dfc38cd1c3e627dd5c9854652ee656f421f345dd72471
diff --git a/dev-php/swoole/metadata.xml b/dev-php/swoole/metadata.xml
new file mode 100644
index 000000000000..067ddccde379
--- /dev/null
+++ b/dev-php/swoole/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+<email>php-bugs@gentoo.org</email>
+<name>PHP Project</name>
+</maintainer>
+<use>
+<flag name="http2">Add support for HTTP/2 protocol via <pkg>net-libs/nghttp2</pkg></flag>
+<flag name="redis">Add support for redis via <pkg>dev-libs/hiredis</pkg></flag>
+</use>
+</pkgmetadata>
diff --git a/dev-php/swoole/swoole-4.0.1.ebuild b/dev-php/swoole/swoole-4.0.1.ebuild
new file mode 100644
index 000000000000..8a332f5938d2
--- /dev/null
+++ b/dev-php/swoole/swoole-4.0.1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PHP_EXT_NAME="swoole"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+PHP_EXT_SAPIS="cli"
+DOCS=( README.md )
+
+USE_PHP="php7-0 php7-1 php7-2"
+
+inherit php-ext-pecl-r3
+
+HOMEPAGE="https://www.swoole.co.uk"
+KEYWORDS="~amd64 ~x86"
+
+DESCRIPTION="Event-driven asynchronous & concurrent & coroutine networking engine"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+DEPEND="
+ dev-libs/libaio
+ dev-libs/boost:0=
+ dev-libs/libpcre
+ http2? ( net-libs/nghttp2:0= )
+ redis? ( dev-libs/hiredis:0= )
+ ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
+ php_targets_php7-0? ( dev-lang/php:7.0[cli,sockets?] )
+ php_targets_php7-1? ( dev-lang/php:7.1[cli,sockets?] )
+ php_targets_php7-2? ( dev-lang/php:7.2[cli,sockets?] )
+ mysql? (
+ php_targets_php7-0? ( dev-lang/php:7.0[mysql,mysqli(+)] )
+ php_targets_php7-1? ( dev-lang/php:7.1[mysql,mysqli(+)] )
+ php_targets_php7-2? ( dev-lang/php:7.2[mysql,mysqli(+)] )
+ )
+"
+
+RDEPEND="${DEPEND}"
+
+IUSE="debug http2 libressl mysql redis sockets ssl threads"
+
+src_configure() {
+ # PostgreSQL disabled due to Gentoo's slot system
+ local PHP_EXT_ECONF_ARGS=(
+ --with-swoole
+ --disable-coroutine-postgresql
+ $(use_enable debug swoole-debug)
+ $(use_enable http2)
+ $(use_enable mysql mysqlnd)
+ $(use_enable redis async_redis)
+ $(use_enable ssl openssl)
+ $(use_with ssl openssl-dir "${EROOT%/}/usr")
+ $(use_enable threads thread)
+ $(use_enable sockets)
+ )
+
+ php-ext-source-r3_src_configure
+}
+
+src_test() {
+ local slot
+ for slot in $(php_get_slots); do
+ php_init_slot_env "${slot}"
+ SKIP_ONLINE_TESTS="yes" NO_INTERACTION="yes" emake test
+ done
+}
diff --git a/dev-php/symfony-config-2.8.20 b/dev-php/symfony-config-2.8.20
deleted file mode 100644
index 1187405fb21a..000000000000
--- a/dev-php/symfony-config-2.8.20
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare test
-DEPEND=test? ( dev-lang/php:* dev-php/fedora-autoloader dev-php/symfony-filesystem >=dev-php/phpunit-5.7.15 )
-DESCRIPTION=Symfony Config Component
-EAPI=6
-HOMEPAGE=https://github.com/symfony/config
-IUSE=test
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-lang/php:* dev-php/fedora-autoloader dev-php/symfony-filesystem
-SLOT=0
-SRC_URI=https://github.com/symfony/config/archive/v2.8.20.tar.gz -> symfony-config-2.8.20.tar.gz
-_md5_=a5c72c58a248fa691363785395e41e9e
diff --git a/dev-php/symfony-config/Manifest b/dev-php/symfony-config/Manifest
new file mode 100644
index 000000000000..293db88ded8a
--- /dev/null
+++ b/dev-php/symfony-config/Manifest
@@ -0,0 +1,4 @@
+AUX autoload.php 577 BLAKE2B 4a36bd333f27a143517c8e81c4749dee06a4f6ef228f6b0af7e94d544118b2345aa6860abeb9386998df5c57e2689d467f075344cf7ed0882baaa8f0d6a29f85 SHA512 ef699576d866c6a2c8893f8ca5c74d6b019b0cd554e3dfb2946d96cf20c9117e7a6b966c3386f6e1294dcd55feb05df437166711008242cc52bcb1a94ae5e8c6
+DIST symfony-config-2.8.20.tar.gz 52587 BLAKE2B 540ed96ebc9d3c5e6d460003c47e2d0612037acc2e40ff413d4195a1f7d48e7e7edb2b0bbf17f982d9ea48242439d819f2b6b442dcd22fa7cc9fa0b29ef2b6e7 SHA512 f515f9886be8daa85a3cfe70935b4586ee749a62c3c73c6f2c934af16d4a81f9e49445bdae85329f88fa4dacaf87c56b9b599793d7926e712242bd1fc9dc0675
+EBUILD symfony-config-2.8.20.ebuild 854 BLAKE2B 4b59a655ec4a3e8f6f1a6a6fa36d95f7d8cfd2d95173e4da97f2fdd9dc688fee8b679873339e2de2abe583136cf25f15086a56f701629276e07f7cd9cf9e3f87 SHA512 8d52044d63b2927dea7901f0fe81789a02498f7fcb1ccd6f2cbabf05b9a7b1800e7261efe16c00cb855fb37d2b874bc86ddc732de6e87f617bd20cd2710a7d42
+MISC metadata.xml 825 BLAKE2B 0360fe3b9d09d22a1a2511ba9632137f06bbed62ecceb5da51a0f634fa603c8bc4cba95cb66cf35a9024b6a7f01502234fba33ee8f4f092a1b32a20b7f2628f1 SHA512 3feeb922f4e961b192ecc9581b468a10121bf522ff51e48ad2cc61e358b2f994037ca1cecb603c5543f74f5753963e8a2a3438de1602b18efe9b0175ee2d7b53
diff --git a/dev-php/symfony-config/files/autoload.php b/dev-php/symfony-config/files/autoload.php
new file mode 100644
index 000000000000..6c6f5c501beb
--- /dev/null
+++ b/dev-php/symfony-config/files/autoload.php
@@ -0,0 +1,20 @@
+<?php
+/* Autoloader for dev-php/symfony-config and its dependencies */
+
+$vendor_dir = '/usr/share/php';
+
+if (!class_exists('Fedora\\Autoloader\\Autoload', false)) {
+ require_once("${vendor_dir}/Fedora/Autoloader/autoload.php");
+}
+
+\Fedora\Autoloader\Autoload::addPsr4('Symfony\\Component\\Config\\', __DIR__);
+
+// Required dependencies.
+\Fedora\Autoloader\Dependencies::required(array(
+ "${vendor_dir}/Symfony/Component/Filesystem/autoload.php"
+));
+
+// Optional dependencies.
+\Fedora\Autoloader\Dependencies::optional(array(
+ "${vendor_dir}/PHPUnit/vendor/autoload.php"
+));
diff --git a/dev-php/symfony-config/metadata.xml b/dev-php/symfony-config/metadata.xml
new file mode 100644
index 000000000000..bc820db2a2f2
--- /dev/null
+++ b/dev-php/symfony-config/metadata.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>guillaumeseren@gmail.com</email>
+ <name>Guillaume Seren</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ </maintainer>
+ <longdescription>
+ The Config component provides several classes to help you find,
+ load, combine, autofill and validate configuration values of any
+ kind, whatever their source may be (YAML, XML, INI files, or for
+ instance a database).
+ </longdescription>
+ <upstream>
+ <remote-id type="github">symfony/config</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-php/symfony-config/symfony-config-2.8.20.ebuild b/dev-php/symfony-config/symfony-config-2.8.20.ebuild
new file mode 100644
index 000000000000..0daa831d25f0
--- /dev/null
+++ b/dev-php/symfony-config/symfony-config-2.8.20.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Symfony Config Component"
+HOMEPAGE="https://github.com/symfony/config"
+SRC_URI="https://github.com/symfony/config/archive/v${PV}.tar.gz
+ -> symfony-config-${PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+ dev-lang/php:*
+ dev-php/fedora-autoloader
+ dev-php/symfony-filesystem"
+DEPEND="test? ( ${RDEPEND} >=dev-php/phpunit-5.7.15 )"
+
+S="${WORKDIR}/config-${PV}"
+
+src_prepare() {
+ default
+ if use test; then
+ cp "${FILESDIR}"/autoload.php "${S}"/autoload-test.php || die
+ fi
+}
+
+src_install() {
+ insinto "/usr/share/php/Symfony/Component/Config"
+ doins -r . "${FILESDIR}"/autoload.php
+ dodoc README.md
+}
+
+src_test() {
+ phpunit --bootstrap "${S}/autoload-test.php" || die 'test suite failed'
+}
diff --git a/dev-php/symfony-console-2.7.9-r1 b/dev-php/symfony-console-2.7.9-r1
deleted file mode 100644
index 17e8a81b7ac8..000000000000
--- a/dev-php/symfony-console-2.7.9-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Subtree split of the Symfony Console Component
-EAPI=6
-HOMEPAGE=https://github.com/symfony/console
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-lang/php:* dev-php/fedora-autoloader >=dev-php/psr-log-1.0.2 >=dev-php/symfony-event-dispatcher-2.1.0 >=dev-php/symfony-process-2.8.12
-SLOT=0
-SRC_URI=https://github.com/symfony/console/archive/v2.7.9.tar.gz -> symfony-console-2.7.9.tar.gz
-_md5_=1089176547e8f3f14380b0fde46f9cf5
diff --git a/dev-php/symfony-console/Manifest b/dev-php/symfony-console/Manifest
new file mode 100644
index 000000000000..c1d801642522
--- /dev/null
+++ b/dev-php/symfony-console/Manifest
@@ -0,0 +1,4 @@
+AUX autoload.php 536 BLAKE2B 1a65551494d6fb49e9e21cb397bc5d53ff2fbc1c09af6c426e2b142c5fc440290ccbe18ec1a3451053b856b334ee99c5016e3b645ae7eb0b84452155cb484dca SHA512 cf67d18e3717b9498386be165095a26679daf3a815fe314f23cf14513ba9e3b97f51c1052e9df18106c735c5b41262de0f3badd59517d1a94dce2f1e53f8fa2b
+DIST symfony-console-2.7.9.tar.gz 116610 BLAKE2B 1b1da6f81a88b2887a6a5eb5553c4aa2d3a013b68d8e469e27da42409d5bc50208cc0ff8983afd22163a724e61cf7637728939f2a92137f0b1619ad5a833ba2a SHA512 3de7d78b92c8f0c99d3c90e83a23f6b61eecc195cf92b5c9ebea03a1dc85d2166287e619822238a2f2cd54a430b4a38c7c88be3ba74dab0b66c6104e980a088b
+EBUILD symfony-console-2.7.9-r1.ebuild 666 BLAKE2B fc6405f880bf61141284960755ff4e0737edd3a1dae204316289b930035aa14a6afa7afc556a06ab181737f339d717d94e9fd5abb219204d1cc39632f29b6fcf SHA512 0e65babf5287b41f5e2ce9d435e1fb5a8c3ec3326f6be7a70cb1a4aa5b5e38ea03fd9473ae86e3dc59950e127380fcc275c6d86e6783f5b41237fc0fb26d9ab8
+MISC metadata.xml 694 BLAKE2B 9305b006f06841ee70939962c1a72d5efab4b6e3065ad720bb83ce84ee210bab45dee93dba63c19d74e7227c458a347346c5f5a3d5724b682047f5212e83f495 SHA512 abc6b86ecc143c9a02616b46628129fa02c00e693af762a220bdb4fbd4abca4bf304dc4526dbadee11672123cc743fbe89969fbb6af3b6c6c85f6864fcc4ccb8
diff --git a/dev-php/symfony-console/files/autoload.php b/dev-php/symfony-console/files/autoload.php
new file mode 100644
index 000000000000..14a8fabf46cb
--- /dev/null
+++ b/dev-php/symfony-console/files/autoload.php
@@ -0,0 +1,16 @@
+<?php
+/* Autoloader for symfony-console and its dependencies */
+
+$vendorDir = '/usr/share/php';
+if (!class_exists('Fedora\\Autoloader\\Autoload', false)) {
+ require_once '/usr/share/php/Fedora/Autoloader/autoload.php';
+}
+
+\Fedora\Autoloader\Autoload::addPsr4('Symfony\\Component\\Console\\', __DIR__);
+
+// Dependencies
+\Fedora\Autoloader\Dependencies::required(array(
+ $vendorDir . '/Symfony/Component/EventDispatcher/autoload.php',
+ $vendorDir . '/Psr/Log/autoload.php',
+ $vendorDir . '/Symfony/Component/Process/autoload.php',
+));
diff --git a/dev-php/symfony-console/metadata.xml b/dev-php/symfony-console/metadata.xml
new file mode 100644
index 000000000000..d0eada9bbff3
--- /dev/null
+++ b/dev-php/symfony-console/metadata.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>guillaumeseren@gmail.com</email>
+ <name>Guillaume Seren</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ </maintainer>
+ <longdescription>
+ The Console component eases the creation of beautiful and testable
+ command line interfaces.
+ </longdescription>
+ <upstream>
+ <remote-id type="github">symfony/console</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-php/symfony-console/symfony-console-2.7.9-r1.ebuild b/dev-php/symfony-console/symfony-console-2.7.9-r1.ebuild
new file mode 100644
index 000000000000..1cdcfc26ca55
--- /dev/null
+++ b/dev-php/symfony-console/symfony-console-2.7.9-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Subtree split of the Symfony Console Component"
+HOMEPAGE="https://github.com/symfony/console"
+SRC_URI="https://github.com/symfony/console/archive/v${PV}.tar.gz
+ -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+ dev-lang/php:*
+ dev-php/fedora-autoloader
+ >=dev-php/psr-log-1.0.2
+ >=dev-php/symfony-event-dispatcher-2.1.0
+ >=dev-php/symfony-process-2.8.12"
+
+S="${WORKDIR}/console-${PV}"
+
+src_install() {
+ insinto "/usr/share/php/Symfony/Component/Console"
+ doins -r . "${FILESDIR}"/autoload.php
+ dodoc README.md
+}
diff --git a/dev-php/symfony-dependency-injection-2.8.20 b/dev-php/symfony-dependency-injection-2.8.20
deleted file mode 100644
index cb31a650c37b..000000000000
--- a/dev-php/symfony-dependency-injection-2.8.20
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install prepare test
-DEPEND=test? ( dev-lang/php:* dev-php/fedora-autoloader >=dev-php/symfony-config-2.1.0 >=dev-php/symfony-yaml-2.1.0 >=dev-php/phpunit-5.7.15 )
-DESCRIPTION=Symfony DependencyInjection Component
-EAPI=6
-HOMEPAGE=https://github.com/symfony/dependency-injection
-IUSE=test
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-lang/php:* dev-php/fedora-autoloader >=dev-php/symfony-config-2.1.0 >=dev-php/symfony-yaml-2.1.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/symfony/dependency-injection/archive/v2.8.20.tar.gz -> symfony-dependency-injection-2.8.20.tar.gz
-_md5_=0295fc1ce0e2f3accc19b7c85caefa29
diff --git a/dev-php/symfony-dependency-injection/Manifest b/dev-php/symfony-dependency-injection/Manifest
new file mode 100644
index 000000000000..84c864203d32
--- /dev/null
+++ b/dev-php/symfony-dependency-injection/Manifest
@@ -0,0 +1,4 @@
+AUX autoload.php 518 BLAKE2B c30fc902cb212ea271a76bb5dfd4b5292c68c483a3e37403c2ed305d0338bc4d8c94c6368108b29e07170c962475448e12806277690c033ece159279b35825a1 SHA512 eefcab891547ce99a3ec9b11f7e4edb5de3164958fa5c698d64411c0a2c1a72711d94fda4e32ceb4fec6b7d2f83f159d4f80bbc3719c18895708652af2b5e377
+DIST symfony-dependency-injection-2.8.20.tar.gz 117123 BLAKE2B 469b11d55bbfdffe46b5cc94592f0bf81c1ddf82c656bbf9914a78cb7e5164960455c2ef1a70ef905b35775e91e279693af19015e586ddb3c95a0184d1737f32 SHA512 9ab6a4b36fde3908f26c2211066df501dd73387a7ec3d0aae85f8289257653bb54393bd9f4b50c347a4d5ba47214f13c089e475eaace3868f5c18f67b69bd829
+EBUILD symfony-dependency-injection-2.8.20.ebuild 1225 BLAKE2B 0e86710dcd78ec76c9ad18e1cfdbde03f47c03b2cb81462ec15e6636515ede5fb1c2870fca93f79d23e356def7daba3946da61bbb7b3511074818447c6e7571d SHA512 0a356695ee5aba4ad3484447f091db58a1ad133fccfa00d4cae723516ec84fa153fa77ab4a05dc86dfea37dc6d9607c111647cba7178235ba1bb5d87441901b0
+MISC metadata.xml 743 BLAKE2B 6b4332ed5a925353809cddc1b6136ec7f3f657039372b9ba7ea1e93285ecbfb780b09a7882f6b573a6d942eaa7a2ea1a6e0db1475dd9bc89efbc5171e7abd3ae SHA512 0a3cc149f3df429f4a6aa1e9941ffaa5969cd5f41444496ed120653e546fb240ee0afcefd44f984536c5bd48cfe867828ab6df5687b375163bb7aa7e3a05976c
diff --git a/dev-php/symfony-dependency-injection/files/autoload.php b/dev-php/symfony-dependency-injection/files/autoload.php
new file mode 100644
index 000000000000..4df35ec39a58
--- /dev/null
+++ b/dev-php/symfony-dependency-injection/files/autoload.php
@@ -0,0 +1,15 @@
+<?php
+/* Autoloader for dev-php/symfony-dependency-injection and its dependencies */
+
+$vendorDir = '/usr/share/php';
+if (!class_exists('Fedora\\Autoloader\\Autoload', false)) {
+ require_once '/usr/share/php/Fedora/Autoloader/autoload.php';
+}
+
+\Fedora\Autoloader\Autoload::addPsr4('Symfony\\Component\\DependencyInjection\\', __DIR__);
+
+// Dependencies
+\Fedora\Autoloader\Dependencies::required(array(
+ $vendorDir . '/Symfony/Component/Yaml/autoload.php',
+ $vendorDir . '/Symfony/Component/Config/autoload.php',
+));
diff --git a/dev-php/symfony-dependency-injection/metadata.xml b/dev-php/symfony-dependency-injection/metadata.xml
new file mode 100644
index 000000000000..fad21997665b
--- /dev/null
+++ b/dev-php/symfony-dependency-injection/metadata.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>guillaumeseren@gmail.com</email>
+ <name>Guillaume Seren</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ </maintainer>
+ <longdescription>
+ The DependencyInjection component allows you to standardize
+ and centralize the way objects are constructed in your application.
+ </longdescription>
+ <upstream>
+ <remote-id type="github">symfony/dependency-injection</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-php/symfony-dependency-injection/symfony-dependency-injection-2.8.20.ebuild b/dev-php/symfony-dependency-injection/symfony-dependency-injection-2.8.20.ebuild
new file mode 100644
index 000000000000..9b26caf5c58d
--- /dev/null
+++ b/dev-php/symfony-dependency-injection/symfony-dependency-injection-2.8.20.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Symfony DependencyInjection Component"
+HOMEPAGE="https://github.com/symfony/dependency-injection"
+SRC_URI="https://github.com/symfony/dependency-injection/archive/v${PV}.tar.gz
+ -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+# The test suite requires the unpackaged symfony-expression-language.
+RESTRICT=test
+
+# I'm not sure if symfony-config and symfony-yaml are actually needed if
+# you're not running the test suite...
+RDEPEND="dev-lang/php:*
+ dev-php/fedora-autoloader
+ >=dev-php/symfony-config-2.1.0
+ >=dev-php/symfony-yaml-2.1.0"
+DEPEND="test? ( ${RDEPEND} >=dev-php/phpunit-5.7.15 )"
+
+S="${WORKDIR}/dependency-injection-${PV}"
+
+src_prepare() {
+ default
+ if use test; then
+ cp "${FILESDIR}/autoload.php" "${S}/autoload-test.php" || die
+ fi
+}
+
+src_install() {
+ insinto "/usr/share/php/Symfony/Component/DependencyInjection"
+ doins -r Compiler Dumper Exception Extension LazyProxy Loader ParameterBag
+ doins *.php "${FILESDIR}/autoload.php"
+ dodoc CHANGELOG.md README.md
+}
+
+src_test() {
+ phpunit --bootstrap "${S}/autoload-test.php" || die 'test suite failed'
+}
diff --git a/dev-php/symfony-event-dispatcher-2.1.0-r1 b/dev-php/symfony-event-dispatcher-2.1.0-r1
deleted file mode 100644
index e868404b6ae3..000000000000
--- a/dev-php/symfony-event-dispatcher-2.1.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare test
-DEPEND=test? ( dev-lang/php:* dev-php/fedora-autoloader >=dev-php/symfony-dependency-injection-2.1.0 dev-php/phpunit )
-DESCRIPTION=Symfony EventDispatcher Component
-EAPI=6
-HOMEPAGE=https://github.com/symfony/event-dispatcher
-IUSE=test
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-lang/php:* dev-php/fedora-autoloader >=dev-php/symfony-dependency-injection-2.1.0
-SLOT=0
-SRC_URI=https://github.com/symfony/event-dispatcher/archive/v2.1.0.tar.gz -> symfony-event-dispatcher-2.1.0.tar.gz
-_md5_=282c9b3bbad5a6d489412aed848880be
diff --git a/dev-php/symfony-event-dispatcher/Manifest b/dev-php/symfony-event-dispatcher/Manifest
new file mode 100644
index 000000000000..ee31c60b2152
--- /dev/null
+++ b/dev-php/symfony-event-dispatcher/Manifest
@@ -0,0 +1,4 @@
+AUX autoload.php 469 BLAKE2B d86604375d82bf06cf1a50404d9218f7c73a9b08b3b1add7b123fdf82d199ea757259f5f4d8c4876b3537022a35a0a5dec627b5e94df596cfc19cc7f8801639e SHA512 742d6a7be50fcf6f07d5b23abd7aa965986d8effde182769ce46894370d0d05e8cc0c7d62c0ec0bf2f8c2f33e3253a5381952e3b36434027219dcac7b4fe1f14
+DIST symfony-event-dispatcher-2.1.0.tar.gz 10271 BLAKE2B 0fcb3fd95643a24ff31d4e60c31e801e488c323358dc723be95471dc01df9d052fc6cb19ce5401ba4512cc4e308fd149975f969cf89406b48d11e48ef6313ee1 SHA512 2430e0955322aa938635b34cfa151166218da51bcc7ac1ff52789fc16aef9eeaa5c504f9d03daa819f47652e5207703314c8695e5023369fe8edf88af06bc54b
+EBUILD symfony-event-dispatcher-2.1.0-r1.ebuild 900 BLAKE2B fbfb113a55195326e8d8ec72dc79856f80fc12db43afd17c6f3a46f815495477d307f1aea03ef1e7ca5bc765a4c4c0ac20649065b331bb22d88c0c01cdfb1144 SHA512 1ff87aca4eebe3628b105214b531c472184f403260ef6b57a9ceffacaae433375c08fb688d6c816798d037d19348eecc344c5e4b686dc6776ef315e9ed71e5d3
+MISC metadata.xml 775 BLAKE2B e25fad462227e8d7ae05cfe82044f57c9f8c5de7dc8d88d8151c549a2e040dbeaee82866919dda13efe6d8574e3160725fbd9d42019593177d03ea352cadce9a SHA512 11095327870ea93690d14782556a5c28fa6cf2a099ff63b9f8d0ced042f79e4fc96d4b7b33b9fe4820eaf8159385a6b8056ddb32309d376675646dc1e262fe00
diff --git a/dev-php/symfony-event-dispatcher/files/autoload.php b/dev-php/symfony-event-dispatcher/files/autoload.php
new file mode 100644
index 000000000000..e1accd4c7a6a
--- /dev/null
+++ b/dev-php/symfony-event-dispatcher/files/autoload.php
@@ -0,0 +1,14 @@
+<?php
+/* Autoloader for dev-php/symfony-event-dispatcher and its dependencies */
+
+$vendorDir = '/usr/share/php';
+if (!class_exists('Fedora\\Autoloader\\Autoload', false)) {
+ require_once '/usr/share/php/Fedora/Autoloader/autoload.php';
+}
+
+\Fedora\Autoloader\Autoload::addPsr4('Symfony\\Component\\EventDispatcher\\', __DIR__);
+
+// Dependencies
+\Fedora\Autoloader\Dependencies::required(array(
+ $vendorDir . '/Symfony/Component/DependencyInjection/autoload.php',
+));
diff --git a/dev-php/symfony-event-dispatcher/metadata.xml b/dev-php/symfony-event-dispatcher/metadata.xml
new file mode 100644
index 000000000000..d12fba00b1aa
--- /dev/null
+++ b/dev-php/symfony-event-dispatcher/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>guillaumeseren@gmail.com</email>
+ <name>Guillaume Seren</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ </maintainer>
+ <longdescription>
+ The EventDispatcher component provides tools that allow your
+ application components to communicate with each other by
+ dispatching events and listening to them.
+ </longdescription>
+ <upstream>
+ <remote-id type="github">symfony/event-dispatcher</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-php/symfony-event-dispatcher/symfony-event-dispatcher-2.1.0-r1.ebuild b/dev-php/symfony-event-dispatcher/symfony-event-dispatcher-2.1.0-r1.ebuild
new file mode 100644
index 000000000000..9ec88c6a4770
--- /dev/null
+++ b/dev-php/symfony-event-dispatcher/symfony-event-dispatcher-2.1.0-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Symfony EventDispatcher Component"
+HOMEPAGE="https://github.com/symfony/event-dispatcher"
+SRC_URI="https://github.com/symfony/event-dispatcher/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+ dev-lang/php:*
+ dev-php/fedora-autoloader
+ >=dev-php/symfony-dependency-injection-2.1.0"
+DEPEND="
+ test? (
+ ${RDEPEND}
+ dev-php/phpunit )"
+
+S="${WORKDIR}/event-dispatcher-${PV}"
+
+src_prepare() {
+ default
+ if use test; then
+ cp "${FILESDIR}"/autoload.php "${S}"/autoload-test.php || die
+ fi
+}
+
+src_install() {
+ insinto "/usr/share/php/Symfony/Component/EventDispatcher"
+ doins -r . "${FILESDIR}"/autoload.php
+ dodoc README.md
+}
+
+src_test() {
+ phpunit --bootstrap "${S}"/autoload-test.php || die "test suite failed"
+}
diff --git a/dev-php/symfony-filesystem-3.2.8 b/dev-php/symfony-filesystem-3.2.8
deleted file mode 100644
index 7ff76ed60901..000000000000
--- a/dev-php/symfony-filesystem-3.2.8
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare test
-DEPEND=test? ( dev-lang/php:* dev-php/fedora-autoloader >=dev-php/phpunit-5.7.15 )
-DESCRIPTION=Symfony Filesystem Component
-EAPI=6
-HOMEPAGE=https://github.com/symfony/filesystem
-IUSE=test
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-lang/php:* dev-php/fedora-autoloader
-SLOT=0
-SRC_URI=https://github.com/symfony/filesystem/archive/v3.2.8.tar.gz -> symfony-filesystem-3.2.8.tar.gz
-_md5_=1d5989717cd5366f2db7c6364cbb57b8
diff --git a/dev-php/symfony-filesystem/Manifest b/dev-php/symfony-filesystem/Manifest
new file mode 100644
index 000000000000..e70de5ac4232
--- /dev/null
+++ b/dev-php/symfony-filesystem/Manifest
@@ -0,0 +1,5 @@
+AUX annotate-network-tests.patch 865 BLAKE2B ffe8e19500e00493496ab845ec8222356030f2f61167fff3158017d94887e5652a220deefb019b00a4b79d02b1bc027646da4ad775d6e319129d8038fb6d6758 SHA512 feebf037ca0040f828cbbb15c290045dc1f0c533fa418bbe81cc4f1cb2c8080af264982129203a4b2172a05920b8e807b32040f79d60fbc4144ef3fe8c09c436
+AUX autoload.php 280 BLAKE2B f482a272729d9e859d789f38b8ae9179c4e79132019e62c5ab2c215697a99f29f89b80d10cdeb2d3a8cbc130fc5ad15c32ee217c80c1e93390d730254c5e3815 SHA512 27642698b0f10e96c8fb3ba5619c8b230bc830140d87593c61351c43b1eddb10f82770b37899f305587c9187c673f4b8f889ead8d34926c02e99957620693a0a
+DIST symfony-filesystem-3.2.8.tar.gz 17361 BLAKE2B 8ce4fd987ee7e0609433de8428b849645a9c8372029e0a075d3070786441577c5413e1a2f13e1581afc90cb69fe04c2b64e75de3e23ea532dd7ffd63e2bd8ee2 SHA512 b9464dec0c5100877bb7178a118ab34e9893307df371e9a9f8df8d69e59b6e14c9f7143e4eaf5b47662f69dce1b5fa975b6bb78e93a5c7455eb44dacfaab82e8
+EBUILD symfony-filesystem-3.2.8.ebuild 981 BLAKE2B 5790c3d693827dcea588a70d4c0cf27b28b050101717170ce1ed8137f8c1bb4ad47c5f4b46d56cff31383cb399f0abd926dfe042ea8ca9a8e0e68c8bdcc721ec SHA512 87e695ed50eed4b9ce39db0a7357edefe935032134adb8f306b7ce02a14131da9e13484d5b0a9c0fb27cc33bab02fc6edf5317d85927424ab9005047cf93699f
+MISC metadata.xml 671 BLAKE2B 6bac5eae2bf1dcf6ee982be6ee6bddf3c3e0b767b6fc1920f2bc7d7bd3798f6b1567a4ee9fe79c7ebe704572b633d129ea7eef0828a481bfc19fe2d4ae3fc87d SHA512 bbc967795d3f2cac6bca2c94805e8e412cacf7a32699222b27f8f658c54363c1ab49cb0e68b2323ad7d8dd71a5983aeae5e2ad52e23759b3cf9f0ff8662d4e6c
diff --git a/dev-php/symfony-filesystem/files/annotate-network-tests.patch b/dev-php/symfony-filesystem/files/annotate-network-tests.patch
new file mode 100644
index 000000000000..38c83753195f
--- /dev/null
+++ b/dev-php/symfony-filesystem/files/annotate-network-tests.patch
@@ -0,0 +1,27 @@
+From cda6fa8801d04b149592c5789c0d060c4ca4e9db Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky <michael@orlitzky.com>
+Date: Wed, 3 May 2017 18:33:56 -0400
+Subject: [PATCH 1/1] Annotate the one network test as being a part of the
+ "network" group.
+
+---
+ Tests/FilesystemTest.php | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/Tests/FilesystemTest.php b/Tests/FilesystemTest.php
+index 1341392..a862fa8 100644
+--- a/Tests/FilesystemTest.php
++++ b/Tests/FilesystemTest.php
+@@ -156,6 +156,9 @@ class FilesystemTest extends FilesystemTestCase
+ $this->assertEquals('SOURCE FILE', file_get_contents($targetFilePath));
+ }
+
++ /**
++ * @group network
++ */
+ public function testCopyForOriginUrlsAndExistingLocalFileDefaultsToCopy()
+ {
+ $sourceFilePath = 'http://symfony.com/images/common/logo/logo_symfony_header.png';
+--
+2.10.2
+
diff --git a/dev-php/symfony-filesystem/files/autoload.php b/dev-php/symfony-filesystem/files/autoload.php
new file mode 100644
index 000000000000..8ea8655d904f
--- /dev/null
+++ b/dev-php/symfony-filesystem/files/autoload.php
@@ -0,0 +1,8 @@
+<?php
+/* Autoloader for symfony-filesystem and its dependencies */
+
+if (!class_exists('Fedora\\Autoloader\\Autoload', false)) {
+ require_once '/usr/share/php/Fedora/Autoloader/autoload.php';
+}
+
+\Fedora\Autoloader\Autoload::addPsr4('Symfony\\Component\\Filesystem\\', __DIR__);
diff --git a/dev-php/symfony-filesystem/metadata.xml b/dev-php/symfony-filesystem/metadata.xml
new file mode 100644
index 000000000000..eaf5253c5494
--- /dev/null
+++ b/dev-php/symfony-filesystem/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>guillaumeseren@gmail.com</email>
+ <name>Guillaume Seren</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ </maintainer>
+ <longdescription>
+ The Filesystem component provides basic utilities for the filesystem.
+ </longdescription>
+ <upstream>
+ <remote-id type="github">symfony/filesystem</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-php/symfony-filesystem/symfony-filesystem-3.2.8.ebuild b/dev-php/symfony-filesystem/symfony-filesystem-3.2.8.ebuild
new file mode 100644
index 000000000000..942c49c4b135
--- /dev/null
+++ b/dev-php/symfony-filesystem/symfony-filesystem-3.2.8.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Symfony Filesystem Component"
+HOMEPAGE="https://github.com/symfony/filesystem"
+SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="dev-lang/php:*
+ dev-php/fedora-autoloader"
+DEPEND="test? ( ${RDEPEND} >=dev-php/phpunit-5.7.15 )"
+
+S="${WORKDIR}/filesystem-${PV}"
+
+# This patch is https://github.com/symfony/symfony/pull/22630
+PATCHES=( "${FILESDIR}/annotate-network-tests.patch" )
+
+src_prepare() {
+ default
+ if use test; then
+ cp "${FILESDIR}/autoload.php" "${S}/autoload-test.php" || die
+ fi
+}
+
+src_install() {
+ insinto "/usr/share/php/Symfony/Component/Filesystem"
+ doins -r Exception
+ doins *.php "${FILESDIR}/autoload.php"
+ dodoc CHANGELOG.md README.md
+}
+
+src_test() {
+ phpunit --bootstrap "${S}/autoload-test.php" \
+ --exclude-group network || die 'test suite failed'
+}
diff --git a/dev-php/symfony-finder-3.2.8 b/dev-php/symfony-finder-3.2.8
deleted file mode 100644
index a03c8c46ac72..000000000000
--- a/dev-php/symfony-finder-3.2.8
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare test
-DEPEND=test? ( dev-lang/php:* dev-php/fedora-autoloader >=dev-php/phpunit-5.7.15 )
-DESCRIPTION=Symfony Finder Component
-EAPI=6
-HOMEPAGE=https://github.com/symfony/finder
-IUSE=test
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-lang/php:* dev-php/fedora-autoloader
-SLOT=0
-SRC_URI=https://github.com/symfony/finder/archive/v3.2.8.tar.gz -> symfony-finder-3.2.8.tar.gz
-_md5_=95890d50a44c1b5b64c18da6073ba22e
diff --git a/dev-php/symfony-finder/Manifest b/dev-php/symfony-finder/Manifest
new file mode 100644
index 000000000000..f5d2d83fac3b
--- /dev/null
+++ b/dev-php/symfony-finder/Manifest
@@ -0,0 +1,5 @@
+AUX autoload.php 272 BLAKE2B 53ab5f647a53f82edd22bec0b29d10ac89a488bdee8cc67365190887c65f2233f72a2db01a82f7bdace894fb0a4ed1b31b3b7c6856cf36e7900512d4afde7063 SHA512 b10296ebdf173be6e8b4d98013888778269d08915e1e30f1c00f59dbfb15af5b8a39d59a302b3ea65ba811d8c51c975b876fff1a3adf2a6cf6cf129172525f17
+AUX skip-file-time-sort-tests.patch 1211 BLAKE2B 84e77e610c1c57e54063d50e7ed4fe70e7678954ea7917c9096a723aac16906427e1f9a27092e3dc8e908cd9b53d266d7651704469ab29832ab596792edf98e4 SHA512 bf8e229ab4d9afbe991c60710eefc4a741ee87671dd3fef386548cacfff160e56b455437c9af94dc1e88253111d10edb3133762c781673e962428150589231e3
+DIST symfony-finder-3.2.8.tar.gz 24452 BLAKE2B eed88ea672381fa3a0fef9390109fa7b89b8de87f4e0174fcb24c009044818b7c56846eec0b3240eed1c05fe7d682713fdd41c84e5d766cc2632e5576b38b741 SHA512 7eff457c6c70bf58b4af7e9adbeeb68a1ad684b95510d929f137545be6b755ece37949687f4de27c7fb4d5f208e30c6b0b3a32a804f7a6a6b8ed0d4ed7dfd9cd
+EBUILD symfony-finder-3.2.8.ebuild 936 BLAKE2B c291d2c2b89cab1a8d498e36a2cb7e313512a7914afed8f20c220714a1badca4c0bebbec06040f7776a4425ec9d9e1450e89acefb03377c6d77b8c3790b1be6b SHA512 0bbf0ec089f3c9772324bcb0a67644ea6a5ab9df95b6350ca000483b9d0bf59ffda0bda34d5a68b73e302480e9d4dfa2d2f1dc592a80e1cd2210229f613164c5
+MISC metadata.xml 685 BLAKE2B feba013286ccce28abfb477e4c32c105bced39a175c00aab8c2413144100758914f93380418fbf9acce9c44ea9887b34b77cc674240edcac687449b1c5a7e36c SHA512 664abc5b0e4894c547f4d39ed3cc3c4f4b6526e0ad9dec4a83f43410121b2aaeccc969bf4393a899d309e71c21fd6e06df7f4547927a8ae1ee0b1382a8c5dc92
diff --git a/dev-php/symfony-finder/files/autoload.php b/dev-php/symfony-finder/files/autoload.php
new file mode 100644
index 000000000000..f08b7856a720
--- /dev/null
+++ b/dev-php/symfony-finder/files/autoload.php
@@ -0,0 +1,8 @@
+<?php
+/* Autoloader for symfony-finder and its dependencies */
+
+if (!class_exists('Fedora\\Autoloader\\Autoload', false)) {
+ require_once '/usr/share/php/Fedora/Autoloader/autoload.php';
+}
+
+\Fedora\Autoloader\Autoload::addPsr4('Symfony\\Component\\Finder\\', __DIR__);
diff --git a/dev-php/symfony-finder/files/skip-file-time-sort-tests.patch b/dev-php/symfony-finder/files/skip-file-time-sort-tests.patch
new file mode 100644
index 000000000000..d0ee130b4e76
--- /dev/null
+++ b/dev-php/symfony-finder/files/skip-file-time-sort-tests.patch
@@ -0,0 +1,24 @@
+There's one set of tests that tries to sort an array of files by their
+access and modification times, and that doesn't work if your filesystem
+is mounted with noatime (a lot of our users do that).
+
+This should probably be fixed upstream, and has been reported here:
+
+ https://github.com/symfony/symfony/issues/17489
+
+diff --git a/Tests/Iterator/SortableIteratorTest.php b/Tests/Iterator/SortableIteratorTest.php
+index 4750f25..29d176a 100644
+--- a/Tests/Iterator/SortableIteratorTest.php
++++ b/Tests/Iterator/SortableIteratorTest.php
+@@ -62,10 +62,7 @@ class SortableIteratorTest extends RealIteratorTestCase
+ || $mode === SortableIterator::SORT_BY_CHANGED_TIME
+ || $mode === SortableIterator::SORT_BY_MODIFIED_TIME
+ ) {
+- if ('\\' === DIRECTORY_SEPARATOR && SortableIterator::SORT_BY_MODIFIED_TIME !== $mode) {
+- $this->markTestSkipped('Sorting by atime or ctime is not supported on Windows');
+- }
+- $this->assertOrderedIteratorForGroups($expected, $iterator);
++ $this->markTestSkipped('Sorting by time is failure-prone on Gentoo');
+ } else {
+ $this->assertOrderedIterator($expected, $iterator);
+ }
diff --git a/dev-php/symfony-finder/metadata.xml b/dev-php/symfony-finder/metadata.xml
new file mode 100644
index 000000000000..b0b66ef709b8
--- /dev/null
+++ b/dev-php/symfony-finder/metadata.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>guillaumeseren@gmail.com</email>
+ <name>Guillaume Seren</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ </maintainer>
+ <longdescription>
+ The Finder component finds files and directories
+ via an intuitive fluent interface.
+ </longdescription>
+ <upstream>
+ <remote-id type="github">symfony/finder</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-php/symfony-finder/symfony-finder-3.2.8.ebuild b/dev-php/symfony-finder/symfony-finder-3.2.8.ebuild
new file mode 100644
index 000000000000..2d435d348b79
--- /dev/null
+++ b/dev-php/symfony-finder/symfony-finder-3.2.8.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Symfony Finder Component"
+HOMEPAGE="https://github.com/symfony/finder"
+SRC_URI="https://github.com/symfony/finder/archive/v${PV}.tar.gz -> symfony-finder-${PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="dev-lang/php:*
+ dev-php/fedora-autoloader"
+DEPEND="test? ( ${RDEPEND} >=dev-php/phpunit-5.7.15 )"
+
+S="${WORKDIR}/finder-${PV}"
+
+PATCHES=( "${FILESDIR}/skip-file-time-sort-tests.patch" )
+
+src_prepare() {
+ default
+ if use test; then
+ cp "${FILESDIR}/autoload.php" "${S}/autoload-test.php" || die
+ fi
+}
+
+src_install() {
+ insinto "/usr/share/php/Symfony/Component/Finder"
+ doins -r Comparator Exception Iterator
+ doins *.php "${FILESDIR}"/autoload.php
+ dodoc CHANGELOG.md README.md
+}
+
+src_test() {
+ phpunit --bootstrap "${S}/autoload-test.php" || die 'test suite failed'
+}
diff --git a/dev-php/symfony-process-3.2.6 b/dev-php/symfony-process-3.2.6
deleted file mode 100644
index 3bba4ab0da31..000000000000
--- a/dev-php/symfony-process-3.2.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install prepare test
-DEPEND=test? ( dev-lang/php:* dev-php/fedora-autoloader dev-php/phpunit )
-DESCRIPTION=Symfony Process Component
-EAPI=6
-HOMEPAGE=https://github.com/symfony/process
-IUSE=test
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-lang/php:* dev-php/fedora-autoloader
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/symfony/process/archive/v3.2.6.tar.gz -> symfony-process-3.2.6.tar.gz
-_md5_=b52e995980d97f108507cd762cceedb2
diff --git a/dev-php/symfony-process/Manifest b/dev-php/symfony-process/Manifest
new file mode 100644
index 000000000000..882271693dbd
--- /dev/null
+++ b/dev-php/symfony-process/Manifest
@@ -0,0 +1,4 @@
+AUX autoload.php 305 BLAKE2B 2f3deeaeeea219b68e90d366779152d17ce734001f208d169c7e4b70cd1050a09225cd8a49b3028995862f6578a9cde3b9a4d4497598c2574f6ecc81db4ed5cf SHA512 339e20b7d5ea454a8d5dc25ebdd4690067f39966a985071fc584652b8df15c0513b2673107e6beee58c412e203f0fcef9915a93ffce6e62c78b3b5b6f3eb26bc
+DIST symfony-process-3.2.6.tar.gz 31684 BLAKE2B 5129b6a7a01c137b9468950b8da58674343131863283cd96f8afac6d0d86969a61a1effc7d59c3735e6370059fb4f53e084011c07b629bddbd153fb6394d3d15 SHA512 8fd7712b2f63a46b6dea0b6cb76825c1e4c7b6a33123fe0949fedec820e599ffe5175bac567e8b453be7964f8b070bc2a2b9554b102a33834dfdbe959a23a3d4
+EBUILD symfony-process-3.2.6.ebuild 958 BLAKE2B b8acfee6ca46e709f856369d101fe222e20413fd9b7bb91df6bdfa4daa42db8bd4a4406d2111a9b0402ee968ad2d60608d0b5f9051531e98a24a6826d503ccaf SHA512 9cb72f33897c1a0b8da7a09da96c1ac5865b512ecabdee15ef44020254a2ed2172f04c414769329c40cccfaa762f8fcf2e07793296eb86d6513000aa63027cf7
+MISC metadata.xml 656 BLAKE2B b24f6c06a9b8eafa0e4855d25d863bdb10e06a701937661cde7bcbf5d0bacec793c6e6aa4be7d2cab34f711e07e5432f987ff401dfa6e517ef14664c7fbe07fb SHA512 6018e74e6aa1b03d8723f33f38fc8855f1ba1d4316472d960f4a296748a7aa9a6282c51c243b0cac98148ec9a921545c8a1947d5f32f4f5853ead46c9bcf19a0
diff --git a/dev-php/symfony-process/files/autoload.php b/dev-php/symfony-process/files/autoload.php
new file mode 100644
index 000000000000..f0b5ceb02c9b
--- /dev/null
+++ b/dev-php/symfony-process/files/autoload.php
@@ -0,0 +1,9 @@
+<?php
+/* Autoloader for symfony-process and its dependencies */
+
+$vendorDir = '/usr/share/php';
+if (!class_exists('Fedora\\Autoloader\\Autoload', false)) {
+ require_once '/usr/share/php/Fedora/Autoloader/autoload.php';
+}
+
+\Fedora\Autoloader\Autoload::addPsr4('Symfony\\Component\\Process\\', __DIR__);
diff --git a/dev-php/symfony-process/metadata.xml b/dev-php/symfony-process/metadata.xml
new file mode 100644
index 000000000000..e4ce1396c58a
--- /dev/null
+++ b/dev-php/symfony-process/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>guillaumeseren@gmail.com</email>
+ <name>Guillaume Seren</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ </maintainer>
+ <longdescription>
+ The Process component executes commands in sub-processes.
+ </longdescription>
+ <upstream>
+ <remote-id type="github">symfony/process</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-php/symfony-process/symfony-process-3.2.6.ebuild b/dev-php/symfony-process/symfony-process-3.2.6.ebuild
new file mode 100644
index 000000000000..03d09390cc59
--- /dev/null
+++ b/dev-php/symfony-process/symfony-process-3.2.6.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Symfony Process Component"
+HOMEPAGE="https://github.com/symfony/process"
+SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="test"
+
+RDEPEND="
+ dev-lang/php:*
+ dev-php/fedora-autoloader"
+DEPEND="
+ test? (
+ ${RDEPEND}
+ dev-php/phpunit )"
+
+S="${WORKDIR}/process-${PV}"
+
+src_prepare() {
+ default
+ if use test; then
+ cp "${FILESDIR}"/autoload.php "${S}"/autoload-test.php || die
+ fi
+}
+
+src_install() {
+ insinto "/usr/share/php/Symfony/Component/Process"
+ doins -r Exception/ Pipes/ ExecutableFinder.php InputStream.php \
+ LICENSE PhpExecutableFinder.php PhpProcess.php ProcessBuilder.php \
+ Process.php ProcessUtils.php "${FILESDIR}"/autoload.php
+ dodoc README.md
+}
+
+src_test() {
+ phpunit --bootstrap "${S}"/autoload-test.php || die "test suite failed"
+}
diff --git a/dev-php/symfony-yaml-2.1.0 b/dev-php/symfony-yaml-2.1.0
deleted file mode 100644
index 8a37813bed11..000000000000
--- a/dev-php/symfony-yaml-2.1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install prepare test
-DEPEND=test? ( dev-lang/php:* dev-php/fedora-autoloader dev-php/phpunit )
-DESCRIPTION=Symfony YAML Component
-EAPI=6
-HOMEPAGE=https://github.com/symfony/yaml
-IUSE=test
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86
-LICENSE=MIT
-RDEPEND=dev-lang/php:* dev-php/fedora-autoloader
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/symfony/yaml/archive/v2.1.0.tar.gz -> symfony-yaml-2.1.0.tar.gz
-_md5_=13cef8b82006eb8e31281309e3642b42
diff --git a/dev-php/symfony-yaml/Manifest b/dev-php/symfony-yaml/Manifest
new file mode 100644
index 000000000000..348bf7739bfd
--- /dev/null
+++ b/dev-php/symfony-yaml/Manifest
@@ -0,0 +1,4 @@
+AUX autoload.php 276 BLAKE2B 1eac0f1626d3639f38c44ee0408a44c90961773c155a5ee40dc20060acac55fca1ceb6b07579d136120dd5070b1383677a7bee3134325eeba5e5ac62bf8b9694 SHA512 1b5cff9898160608f4fa4e639d73ee3f561136797a9d85216b9342c6a7b11cf4b5fe3dc548baf3494a0a9387761ffaa1f0bb09aa1ebac181705000cf6ac62a84
+DIST symfony-yaml-2.1.0.tar.gz 37056 BLAKE2B df1eb0164db026e8157ec8e61941b158b252c048349acc37a060ab44e27004653c3deafc48d6d99e61cda1d67978742d1dd7e74e144adf114d8bcc39610a2b9a SHA512 984fbd624d4bf70ae964da60d55b6d9883642eabce54f080c04d3d12b4d64e63f036683bc12052b0958bd4575f1b693f1453b2505e5e5666ddf2fb13c40e927f
+EBUILD symfony-yaml-2.1.0.ebuild 856 BLAKE2B f0fb14010a48de5ad6444ff232a6652d2111122d306a061e6902340e11705b5906621f0c5fc5e040a55d0756f5c043d22381adae4f90aad96ecbfd4940847a0e SHA512 f22d6dc1d9887d96471c44a1d33925de1a5a4b61de963cec79cd50767d4d2c39e4491bde0a3e9a808dc68b3b051f2d2a3e705e46743a92f22098b97d77a8fde7
+MISC metadata.xml 642 BLAKE2B 3a3a88d5c5e4836915d9e34c2b5e8caa8a98a040be40b40224143381b632508c16a2352ef2a56a001af7293fb34022570e55c94590949a585f96df6c5106904a SHA512 69b107f86e884aa73cf8280bc3e375dfff7af3ea28dc844e874c5c47d5ff1604a1f285ef19d66f6c18eda2394344cec34fba32dfc0e079a602bd50699d5ddeb9
diff --git a/dev-php/symfony-yaml/files/autoload.php b/dev-php/symfony-yaml/files/autoload.php
new file mode 100644
index 000000000000..32b88aa583a0
--- /dev/null
+++ b/dev-php/symfony-yaml/files/autoload.php
@@ -0,0 +1,8 @@
+<?php
+/* Autoloader for dev-php/symfony-yaml and its dependencies */
+
+if (!class_exists('Fedora\\Autoloader\\Autoload', false)) {
+ require_once '/usr/share/php/Fedora/Autoloader/autoload.php';
+}
+
+\Fedora\Autoloader\Autoload::addPsr4('Symfony\\Component\\Yaml\\', __DIR__);
diff --git a/dev-php/symfony-yaml/metadata.xml b/dev-php/symfony-yaml/metadata.xml
new file mode 100644
index 000000000000..a6914444334d
--- /dev/null
+++ b/dev-php/symfony-yaml/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>guillaumeseren@gmail.com</email>
+ <name>Guillaume Seren</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ </maintainer>
+ <longdescription>
+ The Yaml component loads and dumps YAML files.
+ </longdescription>
+ <upstream>
+ <remote-id type="github">symfony/yaml</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-php/symfony-yaml/symfony-yaml-2.1.0.ebuild b/dev-php/symfony-yaml/symfony-yaml-2.1.0.ebuild
new file mode 100644
index 000000000000..192744738918
--- /dev/null
+++ b/dev-php/symfony-yaml/symfony-yaml-2.1.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Symfony YAML Component"
+HOMEPAGE="https://github.com/symfony/yaml"
+SRC_URI="https://github.com/symfony/yaml/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+IUSE="test"
+RESTRICT="test"
+
+RDEPEND="
+ dev-lang/php:*
+ dev-php/fedora-autoloader"
+DEPEND="
+ test? (
+ ${RDEPEND}
+ dev-php/phpunit )"
+
+S="${WORKDIR}/yaml-${PV}"
+
+src_prepare() {
+ default
+ if use test; then
+ cp "${FILESDIR}"/autoload.php "${S}"/autoload-test.php || die
+ fi
+}
+
+src_install() {
+ insinto "/usr/share/php/Symfony/Component/Yaml"
+ doins -r . "${FILESDIR}"/autoload.php
+ dodoc README.md
+}
+
+src_test() {
+ phpunit --bootstrap "${S}"/autoload-test.php || die "test suite failed"
+}
diff --git a/dev-php/tcpdf-6.2.16 b/dev-php/tcpdf-6.2.16
deleted file mode 100644
index 08d669819f2d..000000000000
--- a/dev-php/tcpdf-6.2.16
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=TCPDF is a FLOSS PHP class for generating PDF documents
-EAPI=6
-HOMEPAGE=http://www.tcpdf.org/
-IUSE=examples
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-3+ GPL-3 BitstreamVera GPL-2
-RDEPEND=dev-lang/php
-SLOT=0
-SRC_URI=https://github.com/tecnickcom/TCPDF/archive/6.2.16.tar.gz -> tcpdf-6.2.16.tar.gz
-_md5_=1b455980649b959f9885c2a1c0bf357e
diff --git a/dev-php/tcpdf/Manifest b/dev-php/tcpdf/Manifest
new file mode 100644
index 000000000000..606d9ad1f551
--- /dev/null
+++ b/dev-php/tcpdf/Manifest
@@ -0,0 +1,3 @@
+DIST tcpdf-6.2.16.tar.gz 17006033 BLAKE2B a4a9b502812bca3babe9d89bc215e75c951a2f3649ac01cf7327d5e13ccfd36e9586eb15a712fd48245f504ace2bcf7075413f9ee06526f4dec5c7d6c3e34b9d SHA512 302022636cd2c178e2d015b702188d59b608855110928e253daf7dd14e117a6770ad85385023c7970f13347142c60cc62a8fbdcee471364c47cb499fc3fbaa6c
+EBUILD tcpdf-6.2.16.ebuild 1016 BLAKE2B 7bc6a2f7a8d6eddb96ef8dbea07e6303d9557de293324c7541d455756f9003e91e339f6a1ed2cc7c8b0bb0f49c6e916c1ecfed56380e78139623a566b45ad635 SHA512 901a4fad0c30a5b8d76d78f0f60621f17f593dfa999a9482390ffd04f6e79f11d00c28d9fad57654dbf89a3eca5ea10a98bdf5c8255f6517a75c55daa70b3473
+MISC metadata.xml 320 BLAKE2B 74e0f7eb2cfc2dbbea9b1c275a52625a8d649aa2f5ae467c2df348f034ba51cadc4a6b34f66c2c8dc7752dc62e17441c0d92edacc065e5f2b295bada6c4928cd SHA512 b4f9bc199e0af92d393023cefbb7879bcf1631f6043f400254d948aba10b90a858c6d3a7a41f9ad14334a653ece24d1036acd0e18d7ae06363c1ae6364a0a120
diff --git a/dev-php/tcpdf/metadata.xml b/dev-php/tcpdf/metadata.xml
new file mode 100644
index 000000000000..40391479723e
--- /dev/null
+++ b/dev-php/tcpdf/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://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">tecnickcom/TCPDF</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-php/tcpdf/tcpdf-6.2.16.ebuild b/dev-php/tcpdf/tcpdf-6.2.16.ebuild
new file mode 100644
index 000000000000..5b1b109e8504
--- /dev/null
+++ b/dev-php/tcpdf/tcpdf-6.2.16.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="TCPDF is a FLOSS PHP class for generating PDF documents"
+HOMEPAGE="http://www.tcpdf.org/"
+SRC_URI="https://github.com/tecnickcom/TCPDF/archive/${PV}.tar.gz
+ -> ${P}.tar.gz"
+# Main source is LGPL-3+, some included fonts have other licenses
+LICENSE="LGPL-3+ GPL-3 BitstreamVera GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples"
+
+RDEPEND="dev-lang/php"
+
+S="${WORKDIR}/${P^^}"
+
+src_install() {
+ insinto /etc
+ doins config/tcpdf_config.php
+ # Create a symlink for the config file, because the library will only
+ # look for it in its own source tree (not in /etc where we've put it).
+ dosym ../../../../../etc/tcpdf_config.php "/usr/share/php/${PN}/config/tcpdf_config.php"
+
+ exeinto "/usr/share/php/${PN}/tools"
+ doexe tools/tcpdf_addfont.php
+
+ insinto "/usr/share/php/${PN}"
+ doins tcpdf*.php
+ doins -r include fonts
+ dodoc CHANGELOG.TXT README.md
+
+ use examples && dodoc -r examples
+}
diff --git a/dev-php/theseer-tokenizer-1.1.0 b/dev-php/theseer-tokenizer-1.1.0
deleted file mode 100644
index ef17b368f77e..000000000000
--- a/dev-php/theseer-tokenizer-1.1.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare test
-DEPEND=test? ( dev-php/fedora-autoloader >=dev-lang/php-7.0:*[tokenizer,xmlwriter] dev-php/phpunit )
-DESCRIPTION=Convert tokenized PHP source code into XML and other formats
-EAPI=6
-HOMEPAGE=https://github.com/theseer/tokenizer
-IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=BSD
-RDEPEND=dev-php/fedora-autoloader >=dev-lang/php-7.0:*[tokenizer,xmlwriter]
-SLOT=0
-SRC_URI=https://github.com/theseer/tokenizer/archive/1.1.0.tar.gz -> theseer-tokenizer-1.1.0.tar.gz
-_md5_=ca5807d22f119877748a2c4a30616753
diff --git a/dev-php/theseer-tokenizer/Manifest b/dev-php/theseer-tokenizer/Manifest
new file mode 100644
index 000000000000..d3cdbd2f72e6
--- /dev/null
+++ b/dev-php/theseer-tokenizer/Manifest
@@ -0,0 +1,4 @@
+AUX autoload.php 740 BLAKE2B 1776060d0cbd86a165e293cf24ba31c7c6eef748f7d34681d110f1f99f62909f6619f4917743a995c2c9f2edc5de99b5762d3997d09f14c66a6bfe3569f5e17a SHA512 23ec36f9afc24a4df46a866376db86727127351a1c6d9c16f864804ff31fe64c0c0c8a8306fb1a91fce0dd165cbf5fb02cbe545b4f00dc96bcff2dcce7a82b7c
+DIST theseer-tokenizer-1.1.0.tar.gz 10163 BLAKE2B b2360f901d60f784db2045912707a8e293a55967d60d4e72168a1c4b0c9a2d5bdb739fbed9bfec02075476e7bf6762eb1cc7e36870b84fcc341b609527579ca2 SHA512 8b500565dc0d6c8513db3aa72a7ee1fa04510a712ce9b0977feccddc6b2dae53825e39182d43508e196f326776115789e81697116418f6f9f63d08f0c05d0543
+EBUILD theseer-tokenizer-1.1.0.ebuild 789 BLAKE2B 4ad456d6883e1b3341c203e042b98745c18ca2df690d32a3b04eba43b9912dadff15019937e2e0dad2d3a13166799487d6f5475fcb6f4cb98d81aa02a185534f SHA512 384095d3444136a3bda2ef0c91b159e626d92b177a4663ee8d8ddb1449cb2dad2689fbf54ffbead1b5bb608c77431e4337e51cc44774fb18d6cf3090fa02e932
+MISC metadata.xml 321 BLAKE2B c4c16164af66494e41a3bfe90f4943c905560440eaea9de1a4f82148e1cdc353f9b6871efb618af4ab7ddb8c9fa1dfd931e0610b79c41750744aa6e5dd70580d SHA512 75a4155fe11d88a9d1bde7d46f68954c175c2b8d89872bd53496f11ffd22aa4cbf9f487e36217522e7201aae85c089422a3c7bea3fdec21fc3048b20aad6e5a9
diff --git a/dev-php/theseer-tokenizer/files/autoload.php b/dev-php/theseer-tokenizer/files/autoload.php
new file mode 100644
index 000000000000..67f5bd3506e0
--- /dev/null
+++ b/dev-php/theseer-tokenizer/files/autoload.php
@@ -0,0 +1,20 @@
+<?php
+/* Autoloader for dev-php/theseer-tokenizer */
+
+if (!class_exists('Fedora\\Autoloader\\Autoload', false)) {
+ require_once 'Fedora/Autoloader/autoload.php';
+}
+
+\Fedora\Autoloader\Autoload::addClassMap(
+ [
+ 'theseer\\tokenizer\\exception' => '/Exception.php',
+ 'theseer\\tokenizer\\namespaceuri' => '/NamespaceUri.php',
+ 'theseer\\tokenizer\\namespaceuriexception' => '/NamespaceUriException.php',
+ 'theseer\\tokenizer\\token' => '/Token.php',
+ 'theseer\\tokenizer\\tokencollection' => '/TokenCollection.php',
+ 'theseer\\tokenizer\\tokencollectionexception' => '/TokenCollectionException.php',
+ 'theseer\\tokenizer\\tokenizer' => '/Tokenizer.php',
+ 'theseer\\tokenizer\\xmlserializer' => '/XMLSerializer.php',
+ ],
+ __DIR__
+);
diff --git a/dev-php/theseer-tokenizer/metadata.xml b/dev-php/theseer-tokenizer/metadata.xml
new file mode 100644
index 000000000000..ba2f818dd93c
--- /dev/null
+++ b/dev-php/theseer-tokenizer/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://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">theseer/tokenizer</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-php/theseer-tokenizer/theseer-tokenizer-1.1.0.ebuild b/dev-php/theseer-tokenizer/theseer-tokenizer-1.1.0.ebuild
new file mode 100644
index 000000000000..2f736a8e8645
--- /dev/null
+++ b/dev-php/theseer-tokenizer/theseer-tokenizer-1.1.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Convert tokenized PHP source code into XML and other formats"
+HOMEPAGE="https://github.com/theseer/tokenizer"
+SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="test"
+
+S="${WORKDIR}/tokenizer-${PV}"
+
+RDEPEND="dev-php/fedora-autoloader
+ >=dev-lang/php-7.0:*[tokenizer,xmlwriter]"
+
+DEPEND="test? ( ${RDEPEND} dev-php/phpunit )"
+
+src_prepare() {
+ cp "${FILESDIR}/autoload.php" src/ || die
+ default
+}
+
+src_install() {
+ insinto /usr/share/php/TheSeer/Tokenizer
+ doins src/*.php
+ dodoc README.md
+}
+
+src_test() {
+ phpunit || die "Unit testing failed!"
+}
diff --git a/dev-php/twig-1.31.0 b/dev-php/twig-1.31.0
deleted file mode 100644
index 312540641a40..000000000000
--- a/dev-php/twig-1.31.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=test? ( dev-php/phpunit ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool extension? ( php_targets_php5-6? ( dev-lang/php:5.6 ) )
-DESCRIPTION=PHP templating engine with syntax similar to Django
-EAPI=6
-HOMEPAGE=http://twig.sensiolabs.org/
-IUSE=doc extension test php_targets_php5-6
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-lang/php extension? ( php_targets_php5-6? ( dev-lang/php:5.6 ) )
-REQUIRED_USE=extension? ( || ( php_targets_php5-6 ) )
-SLOT=0
-SRC_URI=https://github.com/twigphp/Twig/archive/v1.31.0.tar.gz -> twig-1.31.0.tar.gz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e php-ext-source-r3 63b281041baa106ff1ef59b602ca7e2a toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=0c64f9725770f7f4275651dca1c9f662
diff --git a/dev-php/twig-1.35.3 b/dev-php/twig-1.35.3
deleted file mode 100644
index f710da04a3e1..000000000000
--- a/dev-php/twig-1.35.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=test? ( dev-php/phpunit ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool extension? ( php_targets_php5-6? ( dev-lang/php:5.6 ) )
-DESCRIPTION=PHP templating engine with syntax similar to Django
-EAPI=6
-HOMEPAGE=http://twig.sensiolabs.org/
-IUSE=doc extension test php_targets_php5-6
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-lang/php extension? ( php_targets_php5-6? ( dev-lang/php:5.6 ) )
-REQUIRED_USE=extension? ( || ( php_targets_php5-6 ) )
-SLOT=0
-SRC_URI=https://github.com/twigphp/Twig/archive/v1.35.3.tar.gz -> twig-1.35.3.tar.gz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e php-ext-source-r3 63b281041baa106ff1ef59b602ca7e2a toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=53fe957115cf7dce1817a58631d68fe3
diff --git a/dev-php/twig/Manifest b/dev-php/twig/Manifest
new file mode 100644
index 000000000000..fba00734fe8a
--- /dev/null
+++ b/dev-php/twig/Manifest
@@ -0,0 +1,5 @@
+DIST twig-1.31.0.tar.gz 242247 BLAKE2B f11195b235c5dd8cda5373394d94306c81810d46c155194cc11bfcb832778b03085bf05de10b636ebda9223876ab9b752214e8676c000578c702f6d9b832ffe1 SHA512 c8c25139b2568d40c9d1b14d8f489047abe13b1598c9d3292ddd3898a685ac69ede00a516c12c4f22805314fca4712991cd27e39dd9c4f57e5576f86e2746401
+DIST twig-1.35.3.tar.gz 256758 BLAKE2B e96f6651fddd2fab3a1d379a2996ded594942bcb511548d419a56e8e4cc6c6b30e6a0a96b44211351ce9b3d2f36cde6b1c85acd46e51d5c2e19793703fccecc4 SHA512 c27d4407b5ad0e51724599fe0371a5951e8a8654df443ca6ac817a9c6958c3235b4d56a396eeceb71eaf707887420a6beace10ca42f1c09882988039c932fe7b
+EBUILD twig-1.31.0.ebuild 2521 BLAKE2B 3bca6d375823553584cda2bdd243f19dbe8854bdb80ea6a8a62aae9e33e651c7b1a0e73c26fbcf938c03c9c9a182f1ef8c8e69f29fda5c039934f4276c3facca SHA512 83e3df9db7d32fdf7c7cb29c30d43422aaffc04f55976b8267781e2f0c383a6a69605ba4ed6369a8ff65e8819418db76bcd1a0035291727287d1d82a512845a3
+EBUILD twig-1.35.3.ebuild 2521 BLAKE2B 1422899758d8b3c8bcc9877e954ddd1f7cf8c09c4e6c43cb840120f1dd45ab1f2f332d3ebc0321a7bf5618d185df0fe3da7999dede68d339443b9ea0cb947893 SHA512 aeb548e3ce955ec8f4a75e5a830ec45cde36ce535b8b9df87a3e6503436f0763e8d9d0ab02d7680fab83d352ad829a4b4a4f2f7873e26ca7fadf3016b0ab09b2
+MISC metadata.xml 545 BLAKE2B ccc89ed2677959e71586c28951a718dc42b2dbce61803762b75198606407ed8ed4eebbcd18cee00591fb6c9f22e422c8e026d4a5cd4814db3af47b8f31eb88ad SHA512 7374d514d449d55037c8c57a0fb95162bb11b9ad80cb9896510cc1fddad6a984c19fff5431ce4f2d9ecd49dad72cd54edc25e521c986c4347a841c1a4b8435de
diff --git a/dev-php/twig/metadata.xml b/dev-php/twig/metadata.xml
new file mode 100644
index 000000000000..434d766441f9
--- /dev/null
+++ b/dev-php/twig/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>djc@gentoo.org</email>
+ <name>Dirkjan Ochtman</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ <name>PHP</name>
+ </maintainer>
+ <use>
+ <flag name="extension">
+ Build the C extension (only for php-5.6.x).
+ </flag>
+ </use>
+ <upstream>
+ <remote-id type="github">twigphp/Twig</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-php/twig/twig-1.31.0.ebuild b/dev-php/twig/twig-1.31.0.ebuild
new file mode 100644
index 000000000000..7e678f068e6b
--- /dev/null
+++ b/dev-php/twig/twig-1.31.0.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PN="Twig"
+USE_PHP="php5-6"
+S="${WORKDIR}/${MY_PN}-${PV}"
+PHP_EXT_S="${S}/ext/${PN}"
+PHP_EXT_NAME="${PN}"
+PHP_EXT_OPTIONAL_USE="extension"
+
+inherit php-ext-source-r3
+
+DESCRIPTION="PHP templating engine with syntax similar to Django"
+HOMEPAGE="http://twig.sensiolabs.org/"
+SRC_URI="https://github.com/twigphp/${MY_PN}/archive/v${PV}.tar.gz
+ -> ${P}.tar.gz"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc extension test"
+
+DEPEND="test? ( dev-php/phpunit )"
+
+# We always require *some* version of PHP; the eclass (conditionally)
+# requires *specific* versions.
+RDEPEND="dev-lang/php"
+
+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 (does not contain "php5-6"). 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.
+ eapply_user
+ use extension && php-ext-source-r3_src_prepare
+}
+
+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(){
+ use extension && php-ext-source-r3_src_install
+
+ cd "${S}" || die
+ # The autoloader requires the 'T' in "Twig" capitalized.
+ insinto "/usr/share/php/${MY_PN}"
+ doins -r lib/"${MY_PN}"/*
+
+ # The eclass src_install calls einstalldocs, so we may install a few
+ # files twice. Doing so should be harmless.
+ dodoc README.rst CHANGELOG
+
+ # This installs the reStructuredText source documents. There's got
+ # to be some way to turn them into HTML using Sphinx, but upstream
+ # doesn't provide for it.
+ use doc && dodoc -r doc
+}
+
+src_test(){
+ phpunit --bootstrap test/bootstrap.php || die "test suite failed"
+}
+
+pkg_postinst(){
+ elog "${PN} has been installed in /usr/share/php/${MY_PN}/."
+ elog "To use it in a script, require('${MY_PN}/Autoloader.php'),"
+ elog "and then run \"Twig_Autoloader::register();\". Most of"
+ elog "the examples in the documentation should work without"
+ elog "further modification."
+}
diff --git a/dev-php/twig/twig-1.35.3.ebuild b/dev-php/twig/twig-1.35.3.ebuild
new file mode 100644
index 000000000000..b4bbd806de7e
--- /dev/null
+++ b/dev-php/twig/twig-1.35.3.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PN="Twig"
+USE_PHP="php5-6"
+S="${WORKDIR}/${MY_PN}-${PV}"
+PHP_EXT_S="${S}/ext/${PN}"
+PHP_EXT_NAME="${PN}"
+PHP_EXT_OPTIONAL_USE="extension"
+
+inherit php-ext-source-r3
+
+DESCRIPTION="PHP templating engine with syntax similar to Django"
+HOMEPAGE="http://twig.sensiolabs.org/"
+SRC_URI="https://github.com/twigphp/${MY_PN}/archive/v${PV}.tar.gz
+ -> ${P}.tar.gz"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc extension test"
+
+DEPEND="test? ( dev-php/phpunit )"
+
+# We always require *some* version of PHP; the eclass (conditionally)
+# requires *specific* versions.
+RDEPEND="dev-lang/php"
+
+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 (does not contain "php5-6"). 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.
+ eapply_user
+ use extension && php-ext-source-r3_src_prepare
+}
+
+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(){
+ use extension && php-ext-source-r3_src_install
+
+ cd "${S}" || die
+ # The autoloader requires the 'T' in "Twig" capitalized.
+ insinto "/usr/share/php/${MY_PN}"
+ doins -r lib/"${MY_PN}"/*
+
+ # The eclass src_install calls einstalldocs, so we may install a few
+ # files twice. Doing so should be harmless.
+ dodoc README.rst CHANGELOG
+
+ # This installs the reStructuredText source documents. There's got
+ # to be some way to turn them into HTML using Sphinx, but upstream
+ # doesn't provide for it.
+ use doc && dodoc -r doc
+}
+
+src_test(){
+ phpunit --bootstrap test/bootstrap.php || die "test suite failed"
+}
+
+pkg_postinst(){
+ elog "${PN} has been installed in /usr/share/php/${MY_PN}/."
+ elog "To use it in a script, require('${MY_PN}/Autoloader.php'),"
+ elog "and then run \"Twig_Autoloader::register();\". Most of"
+ elog "the examples in the documentation should work without"
+ elog "further modification."
+}
diff --git a/dev-php/webmozart-assert-1.2.0 b/dev-php/webmozart-assert-1.2.0
deleted file mode 100644
index ecfc4afe9e17..000000000000
--- a/dev-php/webmozart-assert-1.2.0
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Assertions to validate method input/output with nice error messages
-EAPI=6
-HOMEPAGE=https://github.com/webmozart/assert
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86
-LICENSE=MIT
-RDEPEND=dev-php/fedora-autoloader >=dev-lang/php-5.6:*
-SLOT=0
-SRC_URI=https://github.com/webmozart//assert/archive/1.2.0.tar.gz -> webmozart-assert-1.2.0.tar.gz
-_md5_=eec098eed4dd74b3e183d778095686ef
diff --git a/dev-php/webmozart-assert/Manifest b/dev-php/webmozart-assert/Manifest
new file mode 100644
index 000000000000..8a5629fa0f1b
--- /dev/null
+++ b/dev-php/webmozart-assert/Manifest
@@ -0,0 +1,4 @@
+AUX autoload.php 248 BLAKE2B c849a044a627ed56e60c90aa46711a63507f3eaa5837234d0ed02136f1c99f55d28d7c216830d9ed71290bcfabd7ce4ba47ff1f84d454e98181bbdb809eead27 SHA512 3fcb244b4801ae29b4972d3e1008570f2bd392339539d0d6cff465b0724f9df581935a0d2e2ad4369bf7350678e24d624ec63a2ce966ded0cb4f60d5c02becbd
+DIST webmozart-assert-1.2.0.tar.gz 11866 BLAKE2B 86cb0f299efff9822ea79964153b17337eac3e17a968b5201680186cfb3f6721b2ca561e041e71b304c6d29d227b446f7f52b65d5a6fc490c8535dd4fee0160c SHA512 36bae648cfe5bbd258d738574a820ea3de2e95b59700d556dd5eadbb1657bc09a7e73000e3436d020e060ecd2a99944199795f315a278acbeeea90570b0a4a22
+EBUILD webmozart-assert-1.2.0.ebuild 656 BLAKE2B 876df828e35c9e84848f171301aa64867490bf509767c1fdd53083d1034f056494e96a84663d80f9cca78d5578e924d2459ba9d73bd63dbef80965975dfb88dd SHA512 acc975f88ae8bc24f9e0ebf5f2cf716cb693b139f7b8e171ac7cfeedacbd6c685f2aba4721c7fc65f729e1d80bf5b1c0f87c65bb28972eb28fedd07492ca842a
+MISC metadata.xml 314 BLAKE2B 4fd853abe0d4a1c6d7f1e64b55116e8e02d4b800ec5ef7d7026a004d634b5c50dc40f8f826465dae59138cc1bad91ff842cb0cca348fb8d8acc9b3a75ca8cb4c SHA512 fad867b572c3a97beb2cc361fccb6cbfe6ca7c9bd421937c99783f25287cd2017df54b8d7b5f067a1f65528d3bb284140a9decc3701e2ef753cf6eaa4c2511a1
diff --git a/dev-php/webmozart-assert/files/autoload.php b/dev-php/webmozart-assert/files/autoload.php
new file mode 100644
index 000000000000..45ece0641b6b
--- /dev/null
+++ b/dev-php/webmozart-assert/files/autoload.php
@@ -0,0 +1,8 @@
+<?php
+/* Autoloader for dev-php/webmozart-assert */
+
+if (!class_exists('Fedora\\Autoloader\\Autoload', false)) {
+ require_once '/usr/share/php/Fedora/Autoloader/autoload.php';
+}
+
+Fedora\Autoloader\Autoload::addPsr4('Webmozart\\Assert\\', __DIR__);
diff --git a/dev-php/webmozart-assert/metadata.xml b/dev-php/webmozart-assert/metadata.xml
new file mode 100644
index 000000000000..9e8b6de4665e
--- /dev/null
+++ b/dev-php/webmozart-assert/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://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">webmozart/</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-php/webmozart-assert/webmozart-assert-1.2.0.ebuild b/dev-php/webmozart-assert/webmozart-assert-1.2.0.ebuild
new file mode 100644
index 000000000000..c91ad43b1a53
--- /dev/null
+++ b/dev-php/webmozart-assert/webmozart-assert-1.2.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PN="${PN/webmozart-//}"
+
+DESCRIPTION="Assertions to validate method input/output with nice error messages"
+HOMEPAGE="https://github.com/webmozart/assert"
+SRC_URI="https://github.com/webmozart/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+IUSE=""
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+RDEPEND="dev-php/fedora-autoloader
+ >=dev-lang/php-5.6:*"
+
+src_install() {
+ insinto /usr/share/php/Webmozart/Assert
+ doins -r src/*
+ doins "${FILESDIR}/autoload.php"
+}
diff --git a/dev-php/xcache-3.2.0-r2 b/dev-php/xcache-3.2.0-r2
deleted file mode 100644
index 8c96c0d90fa4..000000000000
--- a/dev-php/xcache-3.2.0-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=!dev-php/eaccelerator !dev-php/pecl-apc virtual/httpd-php:* >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php5-6? ( dev-lang/php:5.6 )
-DESCRIPTION=A fast and stable PHP opcode cacher
-EAPI=6
-HOMEPAGE=http://xcache.lighttpd.net/
-IUSE=coverage php_targets_php5-6
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=!dev-php/eaccelerator !dev-php/pecl-apc virtual/httpd-php:* php_targets_php5-6? ( dev-lang/php:5.6 )
-REQUIRED_USE=|| ( php_targets_php5-6 )
-RESTRICT=test
-SLOT=0
-SRC_URI=http://xcache.lighttpd.net/pub/Releases/3.2.0/xcache-3.2.0.tar.bz2
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e php-ext-source-r3 63b281041baa106ff1ef59b602ca7e2a toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=468831722348dd23d5c131e42a3b1418
diff --git a/dev-php/xcache/Manifest b/dev-php/xcache/Manifest
new file mode 100644
index 000000000000..548cdb34b8b7
--- /dev/null
+++ b/dev-php/xcache/Manifest
@@ -0,0 +1,3 @@
+DIST xcache-3.2.0.tar.bz2 148392 BLAKE2B f366b3b3563f6e150851bc2b2cea099abb29c778bebbbd69d83ec1d7f6dd4f808d28e082c945ffee49b303af34a9c43a0f9f1c61fb1072b57cc28d85bb2fa3c8 SHA512 9d7bec73ac941c8e38b2cda15af65044291adc0806b39586048943515d67656d64871bea4ea05b3dff76761ebed462db2d6ad0e489079291abc55313b1508946
+EBUILD xcache-3.2.0-r2.ebuild 1462 BLAKE2B 9e2fda3e6e46837fa50baf95c1b1cac36db88f0436a70979b7c7c938982b98c6c3e44a9a28eb6339dcba03b12c8c27ca9bd9f73ddb4a822034617a5b0ae6b3ae SHA512 822c073f2892b314bfc7ba123080fb48544e16f322df49501e556e4877f7218f63d735c52859826f4ce0fe869e768a867cdf31b20b446d6e432f3435d1319486
+MISC metadata.xml 384 BLAKE2B a5308404632412bfa16b41ae5605d58bb6a97a29e9c6ad82d53ec9d8407e342437835b169d19d55d32382953a13950f2f51c3ae138c9f7d07a6aab723e559ec0 SHA512 45a0dea232bce265fcf7d6dceb8529ad81aa3df55b6dd83e45fb4d5d2063cee0c05dc61582c2e095f196d6c812be3f8e089e2bdffb7d5ca7f3b6301be8dcb450
diff --git a/dev-php/xcache/metadata.xml b/dev-php/xcache/metadata.xml
new file mode 100644
index 000000000000..c8185e7f2890
--- /dev/null
+++ b/dev-php/xcache/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ <name>PHP</name>
+ </maintainer>
+
+ <use>
+ <flag name="coverage">
+ Enable the coverager module (not recommended for
+ production servers).
+ </flag>
+ </use>
+</pkgmetadata>
diff --git a/dev-php/xcache/xcache-3.2.0-r2.ebuild b/dev-php/xcache/xcache-3.2.0-r2.ebuild
new file mode 100644
index 000000000000..64e55e43a542
--- /dev/null
+++ b/dev-php/xcache/xcache-3.2.0-r2.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PHP_EXT_NAME="xcache"
+PHP_EXT_SAPIS="apache2 cgi fpm"
+USE_PHP="php5-6"
+
+inherit php-ext-source-r3
+
+DESCRIPTION="A fast and stable PHP opcode cacher"
+HOMEPAGE="http://xcache.lighttpd.net/"
+SRC_URI="http://xcache.lighttpd.net/pub/Releases/${PV}/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="coverage"
+
+# make test would just run php's test and as such need the full php source
+RESTRICT="test"
+
+DEPEND="
+ !dev-php/eaccelerator
+ !dev-php/pecl-apc
+ virtual/httpd-php:*
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( AUTHORS ChangeLog NEWS README THANKS )
+
+src_configure() {
+ local PHP_EXT_ECONF_ARGS=(
+ --enable-xcache=shared
+ --enable-xcache-constant \
+ --enable-xcache-optimizer \
+ $(use_enable coverage xcache-coverager) \
+ --enable-xcache-assembler \
+ --enable-xcache-encoder \
+ --enable-xcache-decoder )
+
+ php-ext-source-r3_src_configure
+}
+
+src_install() {
+ php-ext-source-r3_src_install
+
+ insinto "${PHP_EXT_SHARED_DIR}"
+ doins lib/Decompiler.class.php
+
+ # Install the admin interface somewhere where it can be
+ # copied/symlinked into a document root.
+ insinto "/usr/share/${PN}"
+ doins -r htdocs
+}
+
+pkg_postinst() {
+ elog "The lib/Decompiler.class.php file shipped with this release"
+ elog "was installed into ${PHP_EXT_SHARED_DIR}. The htdocs/ admin"
+ elog "interface directory can be found under ${EPREFIX}/usr/share/${PN}."
+}
diff --git a/dev-php/xdebug-2.4.1 b/dev-php/xdebug-2.4.1
deleted file mode 100644
index b07f11c1679f..000000000000
--- a/dev-php/xdebug-2.4.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php5-6? ( dev-lang/php:5.6 )
-DESCRIPTION=A PHP debugging and profiling extension
-EAPI=6
-HOMEPAGE=http://www.xdebug.org/
-IUSE=php_targets_php7-0 php_targets_php5-6
-KEYWORDS=amd64 ~hppa ppc ppc64 x86
-LICENSE=Xdebug
-RDEPEND=~dev-php/xdebug-client-2.4.1 php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php5-6? ( dev-lang/php:5.6 )
-REQUIRED_USE=|| ( php_targets_php7-0 php_targets_php5-6 )
-SLOT=0
-SRC_URI=http://pecl.php.net/get/xdebug-2.4.1.tgz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e php-ext-source-r3 63b281041baa106ff1ef59b602ca7e2a toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=a89d5ec96b8a9cd6a37830dc09300bd1
diff --git a/dev-php/xdebug-2.5.0 b/dev-php/xdebug-2.5.0
deleted file mode 100644
index 6febf440e6e9..000000000000
--- a/dev-php/xdebug-2.5.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php5-6? ( dev-lang/php:5.6 )
-DESCRIPTION=A PHP debugging and profiling extension
-EAPI=6
-HOMEPAGE=http://www.xdebug.org/
-IUSE=php_targets_php7-1 php_targets_php7-0 php_targets_php5-6
-KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~x86
-LICENSE=Xdebug
-RDEPEND=~dev-php/xdebug-client-2.5.0 php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php5-6? ( dev-lang/php:5.6 )
-REQUIRED_USE=|| ( php_targets_php7-1 php_targets_php7-0 php_targets_php5-6 )
-SLOT=0
-SRC_URI=http://pecl.php.net/get/xdebug-2.5.0.tgz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e php-ext-source-r3 63b281041baa106ff1ef59b602ca7e2a toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=05f766c40ca9aa428a99dc10c1afe3c9
diff --git a/dev-php/xdebug-2.5.3 b/dev-php/xdebug-2.5.3
deleted file mode 100644
index 554fddda230b..000000000000
--- a/dev-php/xdebug-2.5.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php5-6? ( dev-lang/php:5.6 )
-DESCRIPTION=A PHP debugging and profiling extension
-EAPI=6
-HOMEPAGE=http://www.xdebug.org/
-IUSE=php_targets_php7-1 php_targets_php7-0 php_targets_php5-6
-KEYWORDS=amd64 ~hppa ppc ppc64 x86
-LICENSE=Xdebug
-RDEPEND=~dev-php/xdebug-client-2.5.3 php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php5-6? ( dev-lang/php:5.6 )
-REQUIRED_USE=|| ( php_targets_php7-1 php_targets_php7-0 php_targets_php5-6 )
-SLOT=0
-SRC_URI=http://pecl.php.net/get/xdebug-2.5.3.tgz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e php-ext-source-r3 63b281041baa106ff1ef59b602ca7e2a toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=19a06c4f702cb48d59bed8a274990e54
diff --git a/dev-php/xdebug-2.5.5 b/dev-php/xdebug-2.5.5
deleted file mode 100644
index 55279a41ba0f..000000000000
--- a/dev-php/xdebug-2.5.5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php5-6? ( dev-lang/php:5.6 )
-DESCRIPTION=A PHP debugging and profiling extension
-EAPI=6
-HOMEPAGE=http://www.xdebug.org/
-IUSE=php_targets_php7-1 php_targets_php7-0 php_targets_php5-6
-KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~x86
-LICENSE=Xdebug
-RDEPEND=~dev-php/xdebug-client-2.5.5 php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php5-6? ( dev-lang/php:5.6 )
-REQUIRED_USE=|| ( php_targets_php7-1 php_targets_php7-0 php_targets_php5-6 )
-SLOT=0
-SRC_URI=http://pecl.php.net/get/xdebug-2.5.5.tgz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e php-ext-source-r3 63b281041baa106ff1ef59b602ca7e2a toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=f6ce88019d89516a2e368cbbcdc7f778
diff --git a/dev-php/xdebug-2.6.0 b/dev-php/xdebug-2.6.0
deleted file mode 100644
index c53862180c0c..000000000000
--- a/dev-php/xdebug-2.6.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 )
-DESCRIPTION=A PHP debugging and profiling extension
-EAPI=6
-HOMEPAGE=http://www.xdebug.org/
-IUSE=php_targets_php7-0 php_targets_php7-1 php_targets_php7-2
-KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~x86
-LICENSE=Xdebug
-RDEPEND=~dev-php/xdebug-client-2.6.0 php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 )
-REQUIRED_USE=|| ( php_targets_php7-0 php_targets_php7-1 php_targets_php7-2 )
-SLOT=0
-SRC_URI=http://pecl.php.net/get/xdebug-2.6.0.tgz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e php-ext-source-r3 63b281041baa106ff1ef59b602ca7e2a toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=9e6044c2a9e719f0d0df67a44de512fc
diff --git a/dev-php/xdebug-client-2.4.1 b/dev-php/xdebug-client-2.4.1
deleted file mode 100644
index 96b3b6f95e0e..000000000000
--- a/dev-php/xdebug-client-2.4.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=libedit? ( dev-libs/libedit )
-DESCRIPTION=Xdebug client for the Common Debugger Protocol (DBGP)
-EAPI=6
-HOMEPAGE=http://www.xdebug.org/
-IUSE=libedit
-KEYWORDS=amd64 ~hppa ppc ppc64 x86
-LICENSE=Xdebug
-RDEPEND=libedit? ( dev-libs/libedit )
-SLOT=0
-SRC_URI=http://pecl.php.net/get/xdebug-2.4.1.tgz
-_md5_=07b3a35dfa06fb0608a778a8e03e4483
diff --git a/dev-php/xdebug-client-2.5.0 b/dev-php/xdebug-client-2.5.0
deleted file mode 100644
index 24fe72c48594..000000000000
--- a/dev-php/xdebug-client-2.5.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=libedit? ( dev-libs/libedit )
-DESCRIPTION=Xdebug client for the Common Debugger Protocol (DBGP)
-EAPI=6
-HOMEPAGE=http://www.xdebug.org/
-IUSE=libedit
-KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~x86
-LICENSE=Xdebug
-RDEPEND=libedit? ( dev-libs/libedit )
-SLOT=0
-SRC_URI=http://pecl.php.net/get/xdebug-2.5.0.tgz
-_md5_=e8b64399adfe35c7a72a7fe86f337f4f
diff --git a/dev-php/xdebug-client-2.5.3 b/dev-php/xdebug-client-2.5.3
deleted file mode 100644
index 4dfa2047a20b..000000000000
--- a/dev-php/xdebug-client-2.5.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=libedit? ( dev-libs/libedit )
-DESCRIPTION=Xdebug client for the Common Debugger Protocol (DBGP)
-EAPI=6
-HOMEPAGE=http://www.xdebug.org/
-IUSE=libedit
-KEYWORDS=amd64 ~hppa ppc ppc64 x86
-LICENSE=Xdebug
-RDEPEND=libedit? ( dev-libs/libedit )
-SLOT=0
-SRC_URI=http://pecl.php.net/get/xdebug-2.5.3.tgz
-_md5_=ccfb2541a4b82b450599ef0e6b23353c
diff --git a/dev-php/xdebug-client-2.5.5-r1 b/dev-php/xdebug-client-2.5.5-r1
deleted file mode 100644
index f70f39ab4374..000000000000
--- a/dev-php/xdebug-client-2.5.5-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=libedit? ( dev-libs/libedit ) net-libs/libnsl:0=
-DESCRIPTION=Xdebug client for the Common Debugger Protocol (DBGP)
-EAPI=6
-HOMEPAGE=http://www.xdebug.org/
-IUSE=libedit
-KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~x86
-LICENSE=Xdebug
-RDEPEND=libedit? ( dev-libs/libedit ) net-libs/libnsl:0=
-SLOT=0
-SRC_URI=http://pecl.php.net/get/xdebug-2.5.5.tgz
-_md5_=b40c4ea2c6d2318d9339cafa63254d8a
diff --git a/dev-php/xdebug-client-2.6.0 b/dev-php/xdebug-client-2.6.0
deleted file mode 100644
index 7ed35d34dabe..000000000000
--- a/dev-php/xdebug-client-2.6.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=libedit? ( dev-libs/libedit ) net-libs/libnsl:0=
-DESCRIPTION=Xdebug client for the Common Debugger Protocol (DBGP)
-EAPI=6
-HOMEPAGE=http://www.xdebug.org/
-IUSE=libedit
-KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~x86
-LICENSE=Xdebug
-RDEPEND=libedit? ( dev-libs/libedit ) net-libs/libnsl:0=
-SLOT=0
-SRC_URI=http://pecl.php.net/get/xdebug-2.6.0.tgz
-_md5_=892015333cc32025dddc3f18746c7927
diff --git a/dev-php/xdebug-client/Manifest b/dev-php/xdebug-client/Manifest
new file mode 100644
index 000000000000..ef7ac989c621
--- /dev/null
+++ b/dev-php/xdebug-client/Manifest
@@ -0,0 +1,11 @@
+DIST xdebug-2.4.1.tgz 265542 BLAKE2B 01526f01bc24f6b241c9647da100b3c080a93bcce4cc00f6a0311b15759457735f1465022874d673069afe6a9a51fe5a7d6a1a2bbf190200193496d640e4381d SHA512 64b345b4809fb0f020eb8fe7a0826056a64728ec9565bbb2d0e717ac7b3ca8aa0856b91c2ba47a7435b7500c5efa643682f245d6cd9d0a537f8bb9ab0d5cea3a
+DIST xdebug-2.5.0.tgz 267640 BLAKE2B beaa0ac97867a4d28f7daca3277f3c2071f2bc5cfa9302b64f8e02b65b2745340a689962d4f8e1668e3434ed271af741f8d47466f501e1d05c0e2240f0f39730 SHA512 75b1dbf32059eebb6ea3fb6ebb50ab26d73f8ce2964be1fec41ecfd9ae3d8bd55b6997daf03727b28b91ba06d08734865158bed6f038a46f00a1da5424ce5fe6
+DIST xdebug-2.5.3.tgz 279085 BLAKE2B cbbfb15e92c3f80cda502340396a6137e2234442fd98bc3fe4b2e08e76cba6292fb5176992aadba7193308ec4c9ab32356922a4416a21b23603e9b48a0d73c06 SHA512 b301a5abb92e123bbe2b36f7838b56d370a0f2c0c4d3c350b5014f4b86d31daa66e9bff995eed67a570558f6a72ca46a097266e6ab94c413f1dcb99c0fbd4f22
+DIST xdebug-2.5.5.tgz 279491 BLAKE2B 2492911db7afca2bc96761788c4ec7eac92cb22a6d65b69070b74f702df2bae1ba7dff9f5edfe83542229dbb7ebb3850b6ed1cf19a5e5969413aac3f2d39fc73 SHA512 9faab421bd90c03734c047d8c6dcc021c8bc665eb36781c692f194d04c7dca24fe1eb920ca8dc407e5bf4ae0912c4b917587f940f34b07171a8881d4cf8695d1
+DIST xdebug-2.6.0.tgz 283644 BLAKE2B 1065585b3bdf07a7448e584dbd94b250d61247d577fe5a0c51fe9aad200ead766c140501ee9f2a6ec2a991896b9f542f911519af8c1351dbe80ac4857d4c8d34 SHA512 e81f771478eb45cdae5814037ac1b86bcb8c5616d22dcac436482c350187c53d3cc6d54be740a49dca6d38c58c086db6e4a68eb3004a0152d6215c97512538a2
+EBUILD xdebug-client-2.4.1.ebuild 590 BLAKE2B 61c014329a8817e0af4bf053b95040464ee779747a79960f9f912fc87010dddb4ce9859dd18d4d1040d5157ad26d684fc063fdb36bc56e0f69ec04bd281961ec SHA512 49462cfdf857ad66d962ed64f68017fee8b642bebfd33ad6cbe96beeea638a6805142164b452bcdf5862c792f44fa023d7babe6a1d975a9df4993f508502dcff
+EBUILD xdebug-client-2.5.0.ebuild 594 BLAKE2B bbbb12aefba3a1cf42aee60a06ccb5feb4eb5c3699745cf54cdda086ede46681dfeb3d1815f874e181e707b16a19d263c85a23f12270824c466770f728ae22e4 SHA512 45082c878e5adb1fa175021b17195101c5ee2aa7bff6d3bd4360dfe651c544c5afa5f608b5844c4ecf9b38e5ff9a789c9386217af526a1d5c2d71178e3377bb2
+EBUILD xdebug-client-2.5.3.ebuild 590 BLAKE2B 389fed0cf51727d612749239904af1a245bc46e5f40c6217b500133088019a6669718e9d87a63538d3fc60232c71f2f2579667c7b7d49cb12dba94d489b34be5 SHA512 31af43a9a78289e95185b71e58fa83b61ffda0f6bdf0c7c4597b307a65a1742eb0840904d8c02f2d1ea5997c50bac1cfb1d809880199efbff7f3ecbf765f4012
+EBUILD xdebug-client-2.5.5-r1.ebuild 613 BLAKE2B 8f768a6cb784e74dec4f686adebaa20ca718997a3a1c127c1c46e5c4a2014c5f26517b6bd74eb10a4b0547432286c74bf003f3e36430f54f2f9a6c1ebfba6cda SHA512 d0881929e891f0c0452780a0d84e572b67d85bee27e99789f7370be1e7458071f465df2a69b1d16922297adb99d1814fdefc29223246eb958547160736e2d7e9
+EBUILD xdebug-client-2.6.0.ebuild 613 BLAKE2B 0aaed511e7fe2bbad99be8adefc47ad3fc7df06528d5a65aca51a2aad881fc7a37b32799a21b91969e1e9d5cba925a8192155fae95d8084fe8946ac0c1544039 SHA512 30127a2016179cd5cf97fb3ec6252dbcbeebc436d97f9b5c7f5c43888e9caff3ea405a83713ff59c2a5079dda84ee9e3c4df85901b4393094f0c826478ae3845
+MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/xdebug-client/metadata.xml b/dev-php/xdebug-client/metadata.xml
new file mode 100644
index 000000000000..b86acf66c756
--- /dev/null
+++ b/dev-php/xdebug-client/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ <name>PHP</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/dev-php/xdebug-client/xdebug-client-2.4.1.ebuild b/dev-php/xdebug-client/xdebug-client-2.4.1.ebuild
new file mode 100644
index 000000000000..3728ad41804d
--- /dev/null
+++ b/dev-php/xdebug-client/xdebug-client-2.4.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KEYWORDS="amd64 ~hppa ppc ppc64 x86"
+
+MY_PV="${PV/_/}"
+MY_PV="${MY_PV/rc/RC}"
+
+DESCRIPTION="Xdebug client for the Common Debugger Protocol (DBGP)"
+HOMEPAGE="http://www.xdebug.org/"
+SRC_URI="http://pecl.php.net/get/xdebug-${MY_PV}.tgz"
+LICENSE="Xdebug"
+SLOT="0"
+IUSE="libedit"
+
+S="${WORKDIR}/xdebug-${MY_PV}/debugclient"
+
+DEPEND="libedit? ( dev-libs/libedit )"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+ econf $(use_with libedit)
+}
+
+src_install() {
+ newbin debugclient xdebug
+}
diff --git a/dev-php/xdebug-client/xdebug-client-2.5.0.ebuild b/dev-php/xdebug-client/xdebug-client-2.5.0.ebuild
new file mode 100644
index 000000000000..0251001539eb
--- /dev/null
+++ b/dev-php/xdebug-client/xdebug-client-2.5.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+
+MY_PV="${PV/_/}"
+MY_PV="${MY_PV/rc/RC}"
+
+DESCRIPTION="Xdebug client for the Common Debugger Protocol (DBGP)"
+HOMEPAGE="http://www.xdebug.org/"
+SRC_URI="http://pecl.php.net/get/xdebug-${MY_PV}.tgz"
+LICENSE="Xdebug"
+SLOT="0"
+IUSE="libedit"
+
+S="${WORKDIR}/xdebug-${MY_PV}/debugclient"
+
+DEPEND="libedit? ( dev-libs/libedit )"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+ econf $(use_with libedit)
+}
+
+src_install() {
+ newbin debugclient xdebug
+}
diff --git a/dev-php/xdebug-client/xdebug-client-2.5.3.ebuild b/dev-php/xdebug-client/xdebug-client-2.5.3.ebuild
new file mode 100644
index 000000000000..c41d444e4715
--- /dev/null
+++ b/dev-php/xdebug-client/xdebug-client-2.5.3.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KEYWORDS="amd64 ~hppa ppc ppc64 x86"
+
+MY_PV="${PV/_/}"
+MY_PV="${MY_PV/rc/RC}"
+
+DESCRIPTION="Xdebug client for the Common Debugger Protocol (DBGP)"
+HOMEPAGE="http://www.xdebug.org/"
+SRC_URI="http://pecl.php.net/get/xdebug-${MY_PV}.tgz"
+LICENSE="Xdebug"
+SLOT="0"
+IUSE="libedit"
+
+S="${WORKDIR}/xdebug-${MY_PV}/debugclient"
+
+DEPEND="libedit? ( dev-libs/libedit )"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+ econf $(use_with libedit)
+}
+
+src_install() {
+ newbin debugclient xdebug
+}
diff --git a/dev-php/xdebug-client/xdebug-client-2.5.5-r1.ebuild b/dev-php/xdebug-client/xdebug-client-2.5.5-r1.ebuild
new file mode 100644
index 000000000000..ce1e0563dc86
--- /dev/null
+++ b/dev-php/xdebug-client/xdebug-client-2.5.5-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+
+MY_PV="${PV/_/}"
+MY_PV="${MY_PV/rc/RC}"
+
+DESCRIPTION="Xdebug client for the Common Debugger Protocol (DBGP)"
+HOMEPAGE="http://www.xdebug.org/"
+SRC_URI="http://pecl.php.net/get/xdebug-${MY_PV}.tgz"
+LICENSE="Xdebug"
+SLOT="0"
+IUSE="libedit"
+
+S="${WORKDIR}/xdebug-${MY_PV}/debugclient"
+
+DEPEND="libedit? ( dev-libs/libedit ) net-libs/libnsl:0="
+RDEPEND="${DEPEND}"
+
+src_configure() {
+ econf $(use_with libedit)
+}
+
+src_install() {
+ newbin debugclient xdebug
+}
diff --git a/dev-php/xdebug-client/xdebug-client-2.6.0.ebuild b/dev-php/xdebug-client/xdebug-client-2.6.0.ebuild
new file mode 100644
index 000000000000..6956e42e79f5
--- /dev/null
+++ b/dev-php/xdebug-client/xdebug-client-2.6.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+
+MY_PV="${PV/_/}"
+MY_PV="${MY_PV/rc/RC}"
+
+DESCRIPTION="Xdebug client for the Common Debugger Protocol (DBGP)"
+HOMEPAGE="http://www.xdebug.org/"
+SRC_URI="http://pecl.php.net/get/xdebug-${MY_PV}.tgz"
+LICENSE="Xdebug"
+SLOT="0"
+IUSE="libedit"
+
+S="${WORKDIR}/xdebug-${MY_PV}/debugclient"
+
+DEPEND="libedit? ( dev-libs/libedit ) net-libs/libnsl:0="
+RDEPEND="${DEPEND}"
+
+src_configure() {
+ econf $(use_with libedit)
+}
+
+src_install() {
+ newbin debugclient xdebug
+}
diff --git a/dev-php/xdebug/Manifest b/dev-php/xdebug/Manifest
new file mode 100644
index 000000000000..649323f1a99e
--- /dev/null
+++ b/dev-php/xdebug/Manifest
@@ -0,0 +1,13 @@
+AUX 2.4.1-xdebug.ini 1285 BLAKE2B 830f55244b0ccece6f3123cef1489440372468aa3d4f02115e8695ff610505b91e36fb65e7f110b46e3fc5888d6c366eeaa5592dd7f40e2eb2133bb0711dd8aa SHA512 1eff8bc1e3cf9a3fae2ff2bc33e7ea47636e15496aa2a8efc039974fc2734632890d1da8bd6b07db6402c38c8e07631be38916f16a54d66068d0fad15d446bfc
+AUX 2.6.0-xdebug.ini 1623 BLAKE2B 6d8c3352dc55778e29cce92794ae36421a6e696244e3c7e1dd4e98d2ff0a6c86ce91e4e4ff2749cd58135e838ff61e2cad5bca8879caf9928d82e2f4bf17af80 SHA512 fe715f986fc5fbc0b92f8d708281feb5b9f6e0a054537ad7883c11acd035d0ddfc20812d64b35a616e0e8048b6332a097a0103329e2c96221571eeecbaaa963f
+DIST xdebug-2.4.1.tgz 265542 BLAKE2B 01526f01bc24f6b241c9647da100b3c080a93bcce4cc00f6a0311b15759457735f1465022874d673069afe6a9a51fe5a7d6a1a2bbf190200193496d640e4381d SHA512 64b345b4809fb0f020eb8fe7a0826056a64728ec9565bbb2d0e717ac7b3ca8aa0856b91c2ba47a7435b7500c5efa643682f245d6cd9d0a537f8bb9ab0d5cea3a
+DIST xdebug-2.5.0.tgz 267640 BLAKE2B beaa0ac97867a4d28f7daca3277f3c2071f2bc5cfa9302b64f8e02b65b2745340a689962d4f8e1668e3434ed271af741f8d47466f501e1d05c0e2240f0f39730 SHA512 75b1dbf32059eebb6ea3fb6ebb50ab26d73f8ce2964be1fec41ecfd9ae3d8bd55b6997daf03727b28b91ba06d08734865158bed6f038a46f00a1da5424ce5fe6
+DIST xdebug-2.5.3.tgz 279085 BLAKE2B cbbfb15e92c3f80cda502340396a6137e2234442fd98bc3fe4b2e08e76cba6292fb5176992aadba7193308ec4c9ab32356922a4416a21b23603e9b48a0d73c06 SHA512 b301a5abb92e123bbe2b36f7838b56d370a0f2c0c4d3c350b5014f4b86d31daa66e9bff995eed67a570558f6a72ca46a097266e6ab94c413f1dcb99c0fbd4f22
+DIST xdebug-2.5.5.tgz 279491 BLAKE2B 2492911db7afca2bc96761788c4ec7eac92cb22a6d65b69070b74f702df2bae1ba7dff9f5edfe83542229dbb7ebb3850b6ed1cf19a5e5969413aac3f2d39fc73 SHA512 9faab421bd90c03734c047d8c6dcc021c8bc665eb36781c692f194d04c7dca24fe1eb920ca8dc407e5bf4ae0912c4b917587f940f34b07171a8881d4cf8695d1
+DIST xdebug-2.6.0.tgz 283644 BLAKE2B 1065585b3bdf07a7448e584dbd94b250d61247d577fe5a0c51fe9aad200ead766c140501ee9f2a6ec2a991896b9f542f911519af8c1351dbe80ac4857d4c8d34 SHA512 e81f771478eb45cdae5814037ac1b86bcb8c5616d22dcac436482c350187c53d3cc6d54be740a49dca6d38c58c086db6e4a68eb3004a0152d6215c97512538a2
+EBUILD xdebug-2.4.1.ebuild 1006 BLAKE2B 157000b1544cf81f5f221d26b69b445aacb3fd963d58a1f0d0fac7d3b9f04b4fd8239419a8b8daeaac54d6484ad19539c2065427138a406ab199969795564870 SHA512 f8558d5c12d5a52c091fbe11751bbf84e147832a1c2c8acbe82d68a6f879bf74ca94302d41a50df27690579425d8795a694e1fe73bfbdf0caa15cf4c90e3dca3
+EBUILD xdebug-2.5.0.ebuild 1039 BLAKE2B 297525d73effe294aee72c9505876c5b2d59c54e8c2b290ecf40e836d72b3251398f5d1402cc7ed2f581ac91d2c42d2db748a760d54bdfd6b197ce0e354347d9 SHA512 605b9fd1101edcbb5270690e3e4339b815fefdf2a1291a21d1397c4d98c4884ff635bebb93729a039c6703cc20925e08184c45d5334efa403e67a421ba9c05b8
+EBUILD xdebug-2.5.3.ebuild 1035 BLAKE2B 33b476351fde796721bf602b127488496a65ad078cf2f6a2c49ba1d8f80252f08416b6c73c8424dd8a31d1ee4950dae9aa12c651c303db1c14a219c07ff25a96 SHA512 d6ba05f536ce9ab502ac4a0008b04544f37755b007a3c2efea9e75cc5e9d5b7f9c2f2bc58d76b682addef1681d747af8c6682cbf7073bee234c1571d99836081
+EBUILD xdebug-2.5.5.ebuild 1039 BLAKE2B 1e6a6b488a3e8041378d044646831021f047bbb3e923e8f5587540f35fb2234e5be4ff2017a2c293d1b3b2656d7161e1474daa724df5c0dcf1658ebe8686d38a SHA512 13d6f35f02f8869dec0c46283a8ca5c198d4d87d0be0e374c5f355c94f4e84f176713199733df72bb4eaf06a042c43c8037c2cb4a58eb621c9d14362185aa7f8
+EBUILD xdebug-2.6.0.ebuild 1039 BLAKE2B 4f5ec55ab03c1dd13a259f1bac5038594793cf8e62b620b3db8d153c445bfd678190321220565ba012d1a6c03ff93fc86216405cacf6ecd42bef790ad4196cf7 SHA512 afeda7e2133f7ada6c06743ae4839219c5afbc980c08f90ec718846c9e3a41fe026aeb176aa94ffd7d5c978f5255fcb1942fee9cec746eacf0ac7eaf80f6156b
+MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/xdebug/files/2.4.1-xdebug.ini b/dev-php/xdebug/files/2.4.1-xdebug.ini
new file mode 100644
index 000000000000..62042aee217b
--- /dev/null
+++ b/dev-php/xdebug/files/2.4.1-xdebug.ini
@@ -0,0 +1,46 @@
+xdebug.auto_trace="0"
+xdebug.trace_output_dir="/tmp"
+xdebug.trace_output_name="trace.%c"
+xdebug.trace_format="0"
+xdebug.trace_options="0"
+xdebug.collect_includes="1"
+xdebug.collect_params="0"
+xdebug.collect_return="0"
+xdebug.collect_vars="0"
+xdebug.default_enable="1"
+xdebug.extended_info="1"
+xdebug.manual_url="http://www.php.net"
+xdebug.max_nesting_level="256"
+xdebug.show_error_trace="0"
+xdebug.show_exception_trace="0"
+xdebug.show_local_vars="0"
+xdebug.show_mem_delta="0"
+xdebug.dump.COOKIE="NULL"
+xdebug.dump.ENV="NULL"
+xdebug.dump.FILES="NULL"
+xdebug.dump.GET="NULL"
+xdebug.dump.POST="NULL"
+xdebug.dump.REQUEST="NULL"
+xdebug.dump.SERVER="NULL"
+xdebug.dump.SESSION="NULL"
+xdebug.dump_globals="1"
+xdebug.dump_once="1"
+xdebug.dump_undefined="0"
+xdebug.overload_var_dump="2"
+xdebug.profiler_enable="0"
+xdebug.profiler_output_dir="/tmp"
+xdebug.profiler_output_name="cachegrind.out.%p"
+xdebug.profiler_enable_trigger="0"
+xdebug.profiler_append="0"
+xdebug.profiler_aggregate="0"
+xdebug.remote_enable="0"
+xdebug.remote_handler="dbgp"
+xdebug.remote_host="localhost"
+xdebug.remote_mode="req"
+xdebug.remote_port="9000"
+xdebug.remote_autostart="0"
+xdebug.remote_log=""
+xdebug.idekey=""
+xdebug.var_display_max_data="512"
+xdebug.var_display_max_depth="2"
+xdebug.var_display_max_children="128"
diff --git a/dev-php/xdebug/files/2.6.0-xdebug.ini b/dev-php/xdebug/files/2.6.0-xdebug.ini
new file mode 100644
index 000000000000..e37ada0ef8fe
--- /dev/null
+++ b/dev-php/xdebug/files/2.6.0-xdebug.ini
@@ -0,0 +1,54 @@
+;xdebug.auto_trace = 0
+;xdebug.cli_color = 0
+;xdebug.collect_assignments = 0
+;xdebug.collect_includes = 1
+;xdebug.collect_params = 0
+;xdebug.collect_return = 0
+;xdebug.collect_vars = 0
+;xdebug.coverage_enable = 1
+xdebug.default_enable = 0
+;xdebug.dump.* = Empty
+;xdebug.dump_globals = 1
+;xdebug.dump_once = 1
+;xdebug.dump_undefined = 0
+;xdebug.extended_info = 1
+;xdebug.file_link_format =
+;xdebug.force_display_errors = 0
+;xdebug.force_error_reporting = 0
+;xdebug.halt_level = 0
+;xdebug.idekey = *complex*
+;xdebug.manual_url = http://www.php.net
+;xdebug.max_nesting_level = 256
+;xdebug.max_stack_frames = -1
+;xdebug.overload_var_dump = 2
+;xdebug.profiler_aggregate = 0
+;xdebug.profiler_append = 0
+;xdebug.profiler_enable = 0
+;xdebug.profiler_enable_trigger = 0
+;xdebug.profiler_enable_trigger_value = ""
+;xdebug.profiler_output_dir = /tmp
+;xdebug.profiler_output_name = cachegrind.out.%p
+;xdebug.remote_addr_header = ""
+;xdebug.remote_autostart = 0
+;xdebug.remote_connect_back = 0
+;xdebug.remote_cookie_expire_time = 3600
+;xdebug.remote_enable = 0
+;xdebug.remote_handler = dbgp
+;xdebug.remote_host = localhost
+;xdebug.remote_log =
+;xdebug.remote_mode = req
+;xdebug.remote_port = 9000
+;xdebug.scream = 0
+;xdebug.show_error_trace = 0
+;xdebug.show_exception_trace = 0
+;xdebug.show_local_vars = 0
+;xdebug.show_mem_delta = 0
+;xdebug.trace_enable_trigger = 0
+;xdebug.trace_enable_trigger_value = ""
+;xdebug.trace_format = 0
+;xdebug.trace_options = 0
+;xdebug.trace_output_dir = /tmp
+;xdebug.trace_output_name = trace.%c
+;xdebug.var_display_max_children = 128
+;xdebug.var_display_max_data = 512
+;xdebug.var_display_max_depth = 3
diff --git a/dev-php/xdebug/metadata.xml b/dev-php/xdebug/metadata.xml
new file mode 100644
index 000000000000..b86acf66c756
--- /dev/null
+++ b/dev-php/xdebug/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ <name>PHP</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/dev-php/xdebug/xdebug-2.4.1.ebuild b/dev-php/xdebug/xdebug-2.4.1.ebuild
new file mode 100644
index 000000000000..322f4d397420
--- /dev/null
+++ b/dev-php/xdebug/xdebug-2.4.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PHP_EXT_NAME="xdebug"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="yes"
+PHP_EXT_INIFILE="2.4.1-xdebug.ini"
+
+USE_PHP="php7-0 php5-6"
+
+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="http://www.xdebug.org/"
+SRC_URI="http://pecl.php.net/get/${PN}-${MY_PV}.tgz"
+LICENSE="Xdebug"
+SLOT="0"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}
+ ~dev-php/xdebug-client-${PV}"
+DOCS=( README.rst CREDITS )
+
+pkg_postinst() {
+ ewarn "We have set xdebug.default_enable to 0 (off), as xdebug can be"
+ ewarn "installed as a dependency, and not all users will want xdebug to be"
+ ewarn "enabled by default. If you want to enable it, you should edit the"
+ ewarn "ini file and set xdebug.default_enable to 1. Alternatively you can"
+ ewarn "call xdebug_enable() in your code."
+}
diff --git a/dev-php/xdebug/xdebug-2.5.0.ebuild b/dev-php/xdebug/xdebug-2.5.0.ebuild
new file mode 100644
index 000000000000..6c9476032402
--- /dev/null
+++ b/dev-php/xdebug/xdebug-2.5.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PHP_EXT_NAME="xdebug"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="yes"
+PHP_EXT_INIFILE="2.4.1-xdebug.ini"
+
+USE_PHP="php7-1 php7-0 php5-6"
+
+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="http://www.xdebug.org/"
+SRC_URI="http://pecl.php.net/get/${PN}-${MY_PV}.tgz"
+LICENSE="Xdebug"
+SLOT="0"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}
+ ~dev-php/xdebug-client-${PV}"
+DOCS=( README.rst CREDITS )
+PHP_EXT_ECONF_ARGS=()
+
+pkg_postinst() {
+ ewarn "We have set xdebug.default_enable to 0 (off), as xdebug can be"
+ ewarn "installed as a dependency, and not all users will want xdebug to be"
+ ewarn "enabled by default. If you want to enable it, you should edit the"
+ ewarn "ini file and set xdebug.default_enable to 1. Alternatively you can"
+ ewarn "call xdebug_enable() in your code."
+}
diff --git a/dev-php/xdebug/xdebug-2.5.3.ebuild b/dev-php/xdebug/xdebug-2.5.3.ebuild
new file mode 100644
index 000000000000..e7772abc27d4
--- /dev/null
+++ b/dev-php/xdebug/xdebug-2.5.3.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PHP_EXT_NAME="xdebug"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="yes"
+PHP_EXT_INIFILE="2.4.1-xdebug.ini"
+
+USE_PHP="php7-1 php7-0 php5-6"
+
+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="http://www.xdebug.org/"
+SRC_URI="http://pecl.php.net/get/${PN}-${MY_PV}.tgz"
+LICENSE="Xdebug"
+SLOT="0"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}
+ ~dev-php/xdebug-client-${PV}"
+DOCS=( README.rst CREDITS )
+PHP_EXT_ECONF_ARGS=()
+
+pkg_postinst() {
+ ewarn "We have set xdebug.default_enable to 0 (off), as xdebug can be"
+ ewarn "installed as a dependency, and not all users will want xdebug to be"
+ ewarn "enabled by default. If you want to enable it, you should edit the"
+ ewarn "ini file and set xdebug.default_enable to 1. Alternatively you can"
+ ewarn "call xdebug_enable() in your code."
+}
diff --git a/dev-php/xdebug/xdebug-2.5.5.ebuild b/dev-php/xdebug/xdebug-2.5.5.ebuild
new file mode 100644
index 000000000000..2f3ece25477e
--- /dev/null
+++ b/dev-php/xdebug/xdebug-2.5.5.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PHP_EXT_NAME="xdebug"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="yes"
+PHP_EXT_INIFILE="2.4.1-xdebug.ini"
+
+USE_PHP="php7-1 php7-0 php5-6"
+
+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="http://www.xdebug.org/"
+SRC_URI="http://pecl.php.net/get/${PN}-${MY_PV}.tgz"
+LICENSE="Xdebug"
+SLOT="0"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}
+ ~dev-php/xdebug-client-${PV}"
+DOCS=( README.rst CREDITS )
+PHP_EXT_ECONF_ARGS=()
+
+pkg_postinst() {
+ ewarn "We have set xdebug.default_enable to 0 (off), as xdebug can be"
+ ewarn "installed as a dependency, and not all users will want xdebug to be"
+ ewarn "enabled by default. If you want to enable it, you should edit the"
+ ewarn "ini file and set xdebug.default_enable to 1. Alternatively you can"
+ ewarn "call xdebug_enable() in your code."
+}
diff --git a/dev-php/xdebug/xdebug-2.6.0.ebuild b/dev-php/xdebug/xdebug-2.6.0.ebuild
new file mode 100644
index 000000000000..c3c96b4ac598
--- /dev/null
+++ b/dev-php/xdebug/xdebug-2.6.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PHP_EXT_NAME="xdebug"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="yes"
+PHP_EXT_INIFILE="2.6.0-xdebug.ini"
+
+USE_PHP="php7-0 php7-1 php7-2"
+
+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="http://www.xdebug.org/"
+SRC_URI="http://pecl.php.net/get/${PN}-${MY_PV}.tgz"
+LICENSE="Xdebug"
+SLOT="0"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}
+ ~dev-php/xdebug-client-${PV}"
+DOCS=( README.rst CREDITS )
+PHP_EXT_ECONF_ARGS=()
+
+pkg_postinst() {
+ ewarn "We have set xdebug.default_enable to 0 (off), as xdebug can be"
+ ewarn "installed as a dependency, and not all users will want xdebug to be"
+ ewarn "enabled by default. If you want to enable it, you should edit the"
+ ewarn "ini file and set xdebug.default_enable to 1. Alternatively you can"
+ ewarn "call xdebug_enable() in your code."
+}
diff --git a/dev-php/xhprof-0.9.4_p20150226-r1 b/dev-php/xhprof-0.9.4_p20150226-r1
deleted file mode 100644
index cc61a2fa476b..000000000000
--- a/dev-php/xhprof-0.9.4_p20150226-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php5-6? ( dev-lang/php:5.6 )
-DESCRIPTION=A Hierarchical Profiler for PHP
-EAPI=6
-HOMEPAGE=http://pecl.php.net/package/xhprof
-IUSE=php_targets_php5-6
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=php_targets_php5-6? ( dev-lang/php:5.6 )
-REQUIRED_USE=|| ( php_targets_php5-6 )
-SLOT=0
-SRC_URI=https://github.com/phacility/xhprof/archive/ff8b3892d0cfc53e744631ff5c6b34f13421edce.tar.gz -> xhprof-0.9.4_p20150226.tar.gz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e php-ext-pecl-r3 a59741d3df8ea9f17afcdcfb7edaee6d php-ext-source-r3 63b281041baa106ff1ef59b602ca7e2a toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=3bfe0ede7862ed789679d35da6a1a186
diff --git a/dev-php/xhprof/Manifest b/dev-php/xhprof/Manifest
new file mode 100644
index 000000000000..2c7c47e75aac
--- /dev/null
+++ b/dev-php/xhprof/Manifest
@@ -0,0 +1,3 @@
+DIST xhprof-0.9.4_p20150226.tar.gz 855540 BLAKE2B efcf78cb3a5778e7c64543a41a2671fd928fe8f21d5a2a5b2a221ac6fa6855a84946128c93bd35a37c9362cc60c306835aed568eac43ece590ff0c6c94cbebb7 SHA512 6f0f4f76b793746cb37b623b891956c1abe7c08cb56fb0edfa31b7d7a59ccd49b8c3401f067a1f203e188843290afb9f9913729b59026b43e7cf026010ef7fb7
+EBUILD xhprof-0.9.4_p20150226-r1.ebuild 536 BLAKE2B 3f3ea40490e4d061c2b487784545455be40d56d95b895c341deb6228d941d4dee8acffb8e3ec04ed8a6d18ba35ff233367d86de5a03581499e660a94b38cf9c9 SHA512 9c7b305b09fa38791a308626dad24c96fa285db2bde157fd4fcfeaab4cf53b433ad87b05e3949d1d2ab633106b1bf6c2cb58978114e9d7b1d6c4d2538a9580f1
+MISC metadata.xml 426 BLAKE2B 9725546deb1835263eb2f7903b589076f2f6dec97cbe740a2f29e7ef0e9299a298851009a2e068659a6779ddf8d469fa4e01e262a97263bb03a03073e4081c82 SHA512 4900959bb60845c19e4cf92b87acf8cb6c132831d495964dfe2ef102898485ae432ea2c1a20c778227e48786e21db8fb4de5d8b07aa33fb193c8d58643a35316
diff --git a/dev-php/xhprof/metadata.xml b/dev-php/xhprof/metadata.xml
new file mode 100644
index 000000000000..ca9a89be41b4
--- /dev/null
+++ b/dev-php/xhprof/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>php-bugs@gentoo.org</email>
+ <name>PHP</name>
+ </maintainer>
+ <longdescription lang="en">
+XHProf is a function-level hierarchical profiler for PHP
+ </longdescription>
+ <upstream>
+ <remote-id type="github">phacility/xhprof</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-php/xhprof/xhprof-0.9.4_p20150226-r1.ebuild b/dev-php/xhprof/xhprof-0.9.4_p20150226-r1.ebuild
new file mode 100644
index 000000000000..3148aebdd7f5
--- /dev/null
+++ b/dev-php/xhprof/xhprof-0.9.4_p20150226-r1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+MY_PV="ff8b3892d0cfc53e744631ff5c6b34f13421edce"
+PHP_EXT_S="${WORKDIR}/${PN}-${MY_PV}/extension"
+PHP_EXT_ECONF_ARGS=""
+USE_PHP="php5-6"
+
+inherit php-ext-pecl-r3
+
+SRC_URI="https://github.com/phacility/xhprof/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+
+HOMEPAGE="http://pecl.php.net/package/xhprof"
+DESCRIPTION="A Hierarchical Profiler for PHP"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+S="${WORKDIR}"