diff options
Diffstat (limited to 'dev-php')
249 files changed, 3301 insertions, 1688 deletions
diff --git a/dev-php/File_Iterator/File_Iterator-1.3.4.ebuild b/dev-php/File_Iterator/File_Iterator-1.3.4.ebuild index 78a56a955c6..db40dc234cb 100644 --- a/dev-php/File_Iterator/File_Iterator-1.3.4.ebuild +++ b/dev-php/File_Iterator/File_Iterator-1.3.4.ebuild @@ -11,7 +11,7 @@ inherit php-pear-r2 DESCRIPTION="FilterIterator implementation that filters files based on a list of suffixes" LICENSE="BSD" SLOT="0" -KEYWORDS="amd64 hppa x86" +KEYWORDS="amd64 ~hppa x86" IUSE="" HOMEPAGE="https://github.com/sebastianbergmann/php-file-iterator https://phpunit.de" diff --git a/dev-php/File_Iterator/File_Iterator-1.4.2.ebuild b/dev-php/File_Iterator/File_Iterator-1.4.2.ebuild index 5a99e148780..70f553faf0c 100644 --- a/dev-php/File_Iterator/File_Iterator-1.4.2.ebuild +++ b/dev-php/File_Iterator/File_Iterator-1.4.2.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> $ LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86" IUSE="" S="${WORKDIR}/${MY_PN}-${PV}" diff --git a/dev-php/File_Iterator/File_Iterator-2.0.2-r1.ebuild b/dev-php/File_Iterator/File_Iterator-2.0.2-r1.ebuild index b2508d50cec..32b850fac5c 100644 --- a/dev-php/File_Iterator/File_Iterator-2.0.2-r1.ebuild +++ b/dev-php/File_Iterator/File_Iterator-2.0.2-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -12,7 +12,7 @@ SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> $ LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86" IUSE="" S="${WORKDIR}/${MY_PN}-${PV}" diff --git a/dev-php/File_Iterator/metadata.xml b/dev-php/File_Iterator/metadata.xml index 06b6c167184..acfdf8c42a7 100644 --- a/dev-php/File_Iterator/metadata.xml +++ b/dev-php/File_Iterator/metadata.xml @@ -5,6 +5,7 @@ <email>php-bugs@gentoo.org</email> <name>PHP</name> </maintainer> + <stabilize-allarches/> <upstream> <remote-id type="github">sebastianbergmann/php-file-iterator</remote-id> </upstream> diff --git a/dev-php/PEAR-Archive_Tar/Manifest b/dev-php/PEAR-Archive_Tar/Manifest index 4aeaf6a7af5..d639d34ab86 100644 --- a/dev-php/PEAR-Archive_Tar/Manifest +++ b/dev-php/PEAR-Archive_Tar/Manifest @@ -1 +1 @@ -DIST Archive_Tar-1.4.10.tgz 21481 BLAKE2B d6658f344baee4c70aedc7c8e59d8e4e481a5c2fbd72920d65943e2d9cf3a6d955a77c62c58fe3391a9250206f105d96b2cf186cefd13a261269d29b27722350 SHA512 265a00b0e71e718a0a0f1f5640b2a95c3b5f3a62235477a22ef762109cb2f6dbdaa0319f2f5aed5fdd9b4f52317bf761b3fcefd03a82c941e71e04c1a3e4d2a9 +DIST Archive_Tar-1.4.11.tgz 21556 BLAKE2B f7e450f4581400159099dba023192ec4026da8867c675119001085651c20315523a58180e0ccd4528e3b1764e222945055702e0fd8e42bb5976b891230351f29 SHA512 a67ff191eb1d814094fc752b58b5d4b4d3db0fd2476fce403f8e5cac49a35fd1219167817dc84d6f957af87d326435aef000e2e0b16357a0d051ab407b76d2cc diff --git a/dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.4.10.ebuild b/dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.4.11.ebuild index b4314c0f240..ef91adf2ead 100644 --- a/dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.4.10.ebuild +++ b/dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.4.11.ebuild @@ -11,7 +11,7 @@ HOMEPAGE="https://pear.php.net/package/Archive_Tar" SRC_URI="https://pear.php.net/get/${MY_P}.tgz" LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86" IUSE="" # bzip2 and zlib are needed for compressed tarballs, and there's one diff --git a/dev-php/PEAR-Archive_Tar/metadata.xml b/dev-php/PEAR-Archive_Tar/metadata.xml index 75a6ba44603..76c401f1f8c 100644 --- a/dev-php/PEAR-Archive_Tar/metadata.xml +++ b/dev-php/PEAR-Archive_Tar/metadata.xml @@ -8,4 +8,5 @@ <upstream> <remote-id type="pear">Archive_Tar</remote-id> </upstream> + <stabilize-allarches/> </pkgmetadata> diff --git a/dev-php/PEAR-Auth_SASL/PEAR-Auth_SASL-1.1.0.ebuild b/dev-php/PEAR-Auth_SASL/PEAR-Auth_SASL-1.1.0.ebuild index 57a5366aab6..86187b7c4bd 100644 --- 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 @@ -9,6 +9,6 @@ DESCRIPTION="Abstraction of various SASL mechanism responses" LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86" IUSE="" RDEPEND=">=dev-php/PEAR-PEAR-1.10.1" 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 index b8d1392509c..7d407a27e8b 100644 --- a/dev-php/PEAR-Cache/PEAR-Cache-1.5.6-r2.ebuild +++ b/dev-php/PEAR-Cache/PEAR-Cache-1.5.6-r2.ebuild @@ -9,7 +9,7 @@ DESCRIPTION="Framework for caching of arbitrary data" LICENSE="PHP-2.02" SLOT="0" -KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86" IUSE="" src_install() { 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 index 468533acd10..c74a1d4d90c 100644 --- 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 @@ -5,7 +5,7 @@ EAPI="6" inherit php-pear-r2 -KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86" +KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86" DESCRIPTION="Fast and safe little cache system" LICENSE="LGPL-2.1" SLOT="0" 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 index d3788c8cdeb..1b73820bc49 100644 --- 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 @@ -11,7 +11,7 @@ HOMEPAGE="https://pear.php.net/package/Console_CommandLine" SRC_URI="http://download.pear.php.net/package/${MY_P}.tgz" LICENSE="MIT" SLOT="0" -KEYWORDS="amd64 arm hppa ~ia64 ppc ppc64 sparc x86" +KEYWORDS="amd64 arm ~hppa ~ia64 ppc ppc64 sparc x86" IUSE="examples test" RESTRICT="!test? ( test )" 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 index 3a0c69449f4..70263d63bc9 100644 --- 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 @@ -11,7 +11,7 @@ HOMEPAGE="https://pear.php.net/package/Console_Getopt" SRC_URI="https://pear.php.net/get/${MY_P}.tgz" LICENSE="BSD-2" SLOT="0" -KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86" IUSE="" DEPEND="" 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 index 7f52dbd5d65..1eaaa206434 100644 --- 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 @@ -8,7 +8,7 @@ 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" +KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86" IUSE="" src_install() { diff --git a/dev-php/PEAR-Crypt_CHAP/PEAR-Crypt_CHAP-1.5.0-r3.ebuild b/dev-php/PEAR-Crypt_CHAP/PEAR-Crypt_CHAP-1.5.0-r3.ebuild index 316e144e79a..bf43b9f11c9 100644 --- a/dev-php/PEAR-Crypt_CHAP/PEAR-Crypt_CHAP-1.5.0-r3.ebuild +++ b/dev-php/PEAR-Crypt_CHAP/PEAR-Crypt_CHAP-1.5.0-r3.ebuild @@ -9,7 +9,7 @@ DESCRIPTION="Generating CHAP packets" LICENSE="BSD" SLOT="0" -KEYWORDS="amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86" IUSE="test" RESTRICT="!test? ( test )" # Crypt_CHAP_MSv1 needs mcrypt which is gone in 7.2+ 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 index 53f4edf909e..e0f4c627a40 100644 --- 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 @@ -12,7 +12,7 @@ HOMEPAGE="https://pear.php.net/package/Crypt_GPG" SRC_URI="http://download.pear.php.net/package/${MY_P}.tgz" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="amd64 arm hppa ~ia64 ppc ppc64 sparc x86" +KEYWORDS="amd64 arm ~hppa ~ia64 ppc ppc64 sparc x86" IUSE="test" RESTRICT="!test? ( test )" 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 index 39a7348a4e3..da09f3a0621 100644 --- a/dev-php/PEAR-DB/PEAR-DB-1.9.2-r1.ebuild +++ b/dev-php/PEAR-DB/PEAR-DB-1.9.2-r1.ebuild @@ -5,7 +5,7 @@ EAPI=6 inherit php-pear-r2 -KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86" DESCRIPTION="Database abstraction layer for PHP" LICENSE="PHP-3" 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 index 071bed4607e..d8fa915c73f 100644 --- 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 @@ -6,7 +6,7 @@ EAPI=6 PEAR_PV=${PV/_alpha/a} inherit php-pear-r2 -KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86" DESCRIPTION="Date and Time Zone classes" LICENSE="BSD" diff --git a/dev-php/PEAR-Exception/PEAR-Exception-1.0.0.ebuild b/dev-php/PEAR-Exception/PEAR-Exception-1.0.0.ebuild index efec088e7ab..a31247b3d96 100644 --- a/dev-php/PEAR-Exception/PEAR-Exception-1.0.0.ebuild +++ b/dev-php/PEAR-Exception/PEAR-Exception-1.0.0.ebuild @@ -11,7 +11,7 @@ HOMEPAGE="https://pear.php.net/package/PEAR_Exception" 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 sparc x86" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86" IUSE="test" RESTRICT="!test? ( test )" RDEPEND="dev-lang/php:* 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 index 04c7b149039..30b8acbb611 100644 --- a/dev-php/PEAR-File/PEAR-File-1.4.1-r1.ebuild +++ b/dev-php/PEAR-File/PEAR-File-1.4.1-r1.ebuild @@ -9,7 +9,7 @@ DESCRIPTION="Common file and directory routines" LICENSE="PHP-3" SLOT="0" -KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86" IUSE="test" RESTRICT="!test? ( test )" DEPEND="test? ( dev-php/PEAR-PEAR )" 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 index d0ca871cb2f..c765d5f4bcc 100644 --- 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 @@ -11,7 +11,7 @@ HOMEPAGE="https://pear.php.net/package/File_Find" 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" +KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86" IUSE="test" RESTRICT="!test? ( test )" 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 index f4911dcef80..56f2b8ecaaa 100644 --- 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 @@ -9,6 +9,6 @@ DESCRIPTION="GNU Gettext file parser" LICENSE="PHP-3" SLOT="0" -KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ppc64 ~s390 sparc x86" +KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86" IUSE="" PATCHES=( "${FILESDIR/File_Gettext-0.4.2-construct.patch}" ) 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 index fd84f17b12f..fbe7cee813a 100644 --- 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 @@ -8,7 +8,7 @@ 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 sparc x86" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86" IUSE="" src_install() { 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 index 1d9005db15d..fe556c1bc6d 100644 --- 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 @@ -9,7 +9,7 @@ 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" +KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86" src_install() { insinto /usr/share/php/HTML 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 index fbf07f50fd0..bbd41c5d71c 100644 --- 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 @@ -9,7 +9,7 @@ DESCRIPTION="Makes the design of HTML tables easy, flexible, reusable and effici LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86" +KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86" IUSE="test" RESTRICT="!test? ( test )" 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 index fd46f455f41..e4eb000d209 100644 --- 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 @@ -9,7 +9,7 @@ DESCRIPTION="Autofill a table with data" LICENSE="PHP-3" SLOT="0" -KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 ~sparc x86" +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" 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 index 9f308a78ce5..886594ab4ca 100644 --- 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 @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -8,7 +8,7 @@ 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" +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 )" 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 index 658dc509fdf..51686449f1a 100644 --- 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 @@ -8,7 +8,7 @@ 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" +KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86" IUSE="test" RESTRICT="!test? ( test )" 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 index 292a9fb2614..46f58bc9251 100644 --- a/dev-php/PEAR-HTTP/PEAR-HTTP-1.4.1-r3.ebuild +++ b/dev-php/PEAR-HTTP/PEAR-HTTP-1.4.1-r3.ebuild @@ -8,7 +8,7 @@ inherit php-pear-r2 eutils DESCRIPTION="Miscellaneous HTTP utilities" LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86" +KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86" IUSE="test" RESTRICT="!test? ( test )" DEPEND="test? ( dev-php/PEAR-PEAR )" 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 index 7efaf9fa5aa..0a9fee49142 100644 --- 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 @@ -9,7 +9,7 @@ DESCRIPTION="Provides an easy way to perform HTTP requests" LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~s390 sparc x86" +KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 sparc x86" IUSE="+curl +fileinfo +ssl test +zlib" RESTRICT="!test? ( test )" 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 index a745ff8c6f5..9e54051a68a 100644 --- 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 @@ -9,7 +9,7 @@ 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" +KEYWORDS="~alpha amd64 ~hppa ~ia64 ~sparc x86" IUSE="test" RESTRICT="!test? ( test )" RDEPEND="media-gfx/graphviz" 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 index b7a4107be23..d1c57691f82 100644 --- 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 @@ -8,7 +8,7 @@ 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" +KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86" IUSE="" src_install() { diff --git a/dev-php/PEAR-Log/PEAR-Log-1.13.1.ebuild b/dev-php/PEAR-Log/PEAR-Log-1.13.1.ebuild index 7f0a72dee5f..8c392374aaa 100644 --- a/dev-php/PEAR-Log/PEAR-Log-1.13.1.ebuild +++ b/dev-php/PEAR-Log/PEAR-Log-1.13.1.ebuild @@ -11,7 +11,7 @@ HOMEPAGE="https://pear.php.net/package/Log" SRC_URI="http://download.pear.php.net/package/${MY_P}.tgz" LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86" IUSE="examples test" RESTRICT="!test? ( test )" 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 index b8f5865dc85..cf8be255fb0 100644 --- a/dev-php/PEAR-MDB/PEAR-MDB-1.3.0-r2.ebuild +++ b/dev-php/PEAR-MDB/PEAR-MDB-1.3.0-r2.ebuild @@ -8,7 +8,7 @@ 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" +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-MDB2/PEAR-MDB2-2.5.0_beta5-r2.ebuild b/dev-php/PEAR-MDB2/PEAR-MDB2-2.5.0_beta5-r2.ebuild index a0a6739e7dc..346a5941924 100644 --- a/dev-php/PEAR-MDB2/PEAR-MDB2-2.5.0_beta5-r2.ebuild +++ b/dev-php/PEAR-MDB2/PEAR-MDB2-2.5.0_beta5-r2.ebuild @@ -10,7 +10,7 @@ inherit php-pear-r2 DESCRIPTION="Database Abstraction Layer" LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86" IUSE="mssql mysql mysqli oci8 oci8-instant-client postgres sqlite" RDEPEND=">=dev-php/PEAR-PEAR-1.9.1" 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 index 6c02e86f6c9..b89e7f68cc9 100644 --- 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 @@ -10,7 +10,7 @@ inherit php-pear-r2 DESCRIPTION="Database Abstraction Layer, mssql driver" LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 ~s390 sparc x86" +KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86" IUSE="" RDEPEND=">=dev-php/PEAR-MDB2-2.5.0_beta3 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 index 8fe922643f6..a1dc6b123e4 100644 --- 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 @@ -10,7 +10,7 @@ inherit php-pear-r2 DESCRIPTION="Database Abstraction Layer, mysqli driver" LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86" IUSE="" RDEPEND=">=dev-php/PEAR-MDB2-2.5.0_beta3 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 index 2dea3f0cbbf..bc482ddfa28 100644 --- 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 @@ -10,7 +10,7 @@ inherit php-pear-r2 DESCRIPTION="Database Abstraction Layer, pgsql driver" LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86" IUSE="" RDEPEND=">=dev-php/PEAR-MDB2-2.5.0_beta3 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 index 03f9c146fc0..e77d4fa1ba4 100644 --- a/dev-php/PEAR-Mail/PEAR-Mail-1.4.1-r1.ebuild +++ b/dev-php/PEAR-Mail/PEAR-Mail-1.4.1-r1.ebuild @@ -9,7 +9,7 @@ DESCRIPTION="Class that provides multiple interfaces for sending emails" LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86" IUSE="test" RESTRICT="!test? ( test )" diff --git a/dev-php/PEAR-Mail_Mime/PEAR-Mail_Mime-1.10.2-r1.ebuild b/dev-php/PEAR-Mail_Mime/PEAR-Mail_Mime-1.10.2-r1.ebuild index d3b8fe4bc6c..e22fdede48c 100644 --- 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 @@ -9,7 +9,7 @@ DESCRIPTION="Create and manipulate mime messages with PHP" LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86" IUSE="test" RESTRICT="!test? ( test )" DEPEND="test? ( dev-php/PEAR-PEAR )" 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 index cd7919d7c8b..8b1020cd58b 100644 --- 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 @@ -8,7 +8,7 @@ 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 sparc x86" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86" IUSE="test" RESTRICT="!test? ( test )" 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 index adfa2c53962..8a0462b278c 100644 --- 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 @@ -13,7 +13,7 @@ HOMEPAGE=" SRC_URI="http://download.pear.php.net/package/${MY_P}.tgz" LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86" +KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86" IUSE="" DEPEND="" RDEPEND="dev-lang/php:*" 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 index ac2c7ce25eb..b92cd6281b4 100644 --- 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 @@ -8,5 +8,5 @@ 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" +KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86" IUSE="" diff --git a/dev-php/PEAR-Net_DNS2/Manifest b/dev-php/PEAR-Net_DNS2/Manifest index 5d0145ba072..645cc43bf7c 100644 --- a/dev-php/PEAR-Net_DNS2/Manifest +++ b/dev-php/PEAR-Net_DNS2/Manifest @@ -1 +1,2 @@ DIST Net_DNS2-1.4.4.tgz 83242 BLAKE2B 107e57406fcc308e3f83c71df0425081ba3d6638f457877e5ed42bfea8abed65ee520e228a379b71cc1462960e995d9c6592ad03afad78b36191f03d1f1513d6 SHA512 fa9df14585b3e41b13f4b52521b8fc05b239c39bccd4baf776dc632913777962dc527b9ff5de2337c9c0d78c6908d555d14167991dfe368426aee57a415f7e78 +DIST Net_DNS2-1.5.0.tgz 81188 BLAKE2B 5cddc998a376cd79adaaaa1e8cd5198ed463563159d342916adb0c77546dbf4d07214a55ba71b8c0e375d47e4ba6e96a847bc71e7ddfead892dd2c57a010d40c SHA512 c0125c1c8bb7ce6256d0b57605de0adc3a2a706f4cc22624f0fac88629aa0f138cdb258742f2d2224893c565e2d7dde9f14f2a4dde86831b2e015473c28d5e4d diff --git a/dev-php/PEAR-Net_DNS2/PEAR-Net_DNS2-1.5.0.ebuild b/dev-php/PEAR-Net_DNS2/PEAR-Net_DNS2-1.5.0.ebuild new file mode 100644 index 00000000000..06359472272 --- /dev/null +++ b/dev-php/PEAR-Net_DNS2/PEAR-Net_DNS2-1.5.0.ebuild @@ -0,0 +1,16 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +inherit php-pear-r2 + +DESCRIPTION="Object-oriented PHP5 resolver library used to communicate with a DNS server" +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND="dev-php/PEAR-PEAR >=dev-lang/php-5.3:*[sockets]" + +DOCS=( README.md ) diff --git a/dev-php/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 index 777b6415f1b..dee9753aac7 100644 --- 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 @@ -11,7 +11,7 @@ HOMEPAGE="https://pear.php.net/package/Net_DNSBL" SRC_URI="http://download.pear.php.net/package/${MY_P}.tgz" LICENSE="PHP-3.01" SLOT="0" -KEYWORDS="~alpha amd64 hppa ~ia64 sparc x86" +KEYWORDS="~alpha amd64 ~hppa ~ia64 sparc x86" IUSE="examples" RDEPEND="dev-lang/php:* dev-php/PEAR-Cache_Lite 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 index bbce63ac621..60b4d96cea5 100644 --- 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 @@ -4,7 +4,7 @@ EAPI=6 MY_PN="${PN/PEAR-/}" -KEYWORDS="~alpha amd64 arm hppa ppc ppc64 sparc x86" +KEYWORDS="~alpha amd64 arm ~hppa ppc ppc64 sparc x86" DESCRIPTION="OO interface for searching and manipulating LDAP-entries" HOMEPAGE="https://pear.php.net/package/Net_LDAP2" SRC_URI="http://download.pear.php.net/package/${MY_PN}-${PV}.tgz" 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 index 9d057963b5f..898fd95bb07 100644 --- 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 @@ -9,7 +9,7 @@ DESCRIPTION="Provides a POP3 class to access POP3 server" LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 ~sparc x86" +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 )" 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 index 97205682dbd..14096f2f0e3 100644 --- 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 @@ -11,7 +11,7 @@ HOMEPAGE="https://pear.php.net/package/Net_SMTP" 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 sparc x86" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86" IUSE="examples sasl" DEPEND="" RDEPEND="dev-lang/php:* 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 index 8d21ec78bb5..cbabb2dfdd7 100644 --- 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 @@ -10,7 +10,7 @@ HOMEPAGE="https://github.com/roundcube/Net_Sieve" SRC_URI="https://github.com/roundcube/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86" IUSE="sasl" RDEPEND="dev-lang/php:* 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 index 413a9729286..ba5b36ad870 100644 --- 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 @@ -13,7 +13,7 @@ SRC_URI="https://github.com/pear/${MY_PN}/archive/v${PV}.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" +KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86" IUSE="doc examples" RDEPEND="dev-lang/php:*" 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 index 69bf4f9740f..b4991b9560d 100644 --- 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 @@ -8,7 +8,7 @@ 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 sparc x86" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86" IUSE="" DEPEND="" RDEPEND=">=dev-php/PEAR-PEAR-1.10.1" 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 index ceadbc03047..687a3239152 100644 --- 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 @@ -9,7 +9,7 @@ DESCRIPTION="Easy parsing of URLs" LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86" IUSE="" src_install() { 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 index 436e6b7af4c..e34a5782c9d 100644 --- 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 @@ -8,7 +8,7 @@ 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 sparc x86" +KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 sparc x86" IUSE="" DOCS=( docs/6470.php docs/example.php ) 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 index 4449b9ebd16..06455300ebb 100644 --- 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 @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -9,7 +9,7 @@ DESCRIPTION="Determines Web browser, version, and platform from an HTTP user age LICENSE="PHP-2.02" SLOT="0" -KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86" +KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86" IUSE="" src_install() { 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 index 17d5a9524b9..6694eafee62 100644 --- 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 @@ -11,7 +11,7 @@ HOMEPAGE="https://pear.php.net/package/Numbers_Words" 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" +KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86" IUSE="test" RESTRICT="!test? ( test )" 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 index 4f789d2d6c6..404cd3462a9 100644 --- a/dev-php/PEAR-OLE/PEAR-OLE-1.0.0_rc3.ebuild +++ b/dev-php/PEAR-OLE/PEAR-OLE-1.0.0_rc3.ebuild @@ -11,5 +11,5 @@ 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 sparc x86" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86" IUSE="" diff --git a/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.6.ebuild b/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.6.ebuild index 78dcbaeb649..1b52326be86 100644 --- a/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.6.ebuild +++ b/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.6.ebuild @@ -10,7 +10,7 @@ DESCRIPTION="PEAR Base System" HOMEPAGE="https://pear.php.net/package/PEAR" SRC_URI="https://pear.php.net/get/${MY_P}.tgz" LICENSE="MIT" -KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86" SLOT="0" IUSE="" diff --git a/dev-php/PEAR-Pager/PEAR-Pager-2.5.1.ebuild b/dev-php/PEAR-Pager/PEAR-Pager-2.5.1.ebuild index 3251c24833c..7e3fefadc4e 100644 --- a/dev-php/PEAR-Pager/PEAR-Pager-2.5.1.ebuild +++ b/dev-php/PEAR-Pager/PEAR-Pager-2.5.1.ebuild @@ -9,7 +9,7 @@ DESCRIPTION="Data paging class" LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86" +KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86" IUSE="" RDEPEND=">=dev-lang/php-5.6.0:*" 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 index 9aea64a1436..1554c67f387 100644 --- 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 @@ -8,7 +8,7 @@ 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 sparc x86" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86" RDEPEND=">=dev-lang/php-5.4:*[iconv] >=dev-php/PEAR-OLE-0.5-r1" IUSE="" 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 index 7a8320bb1a8..5e963f1c61d 100644 --- 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 @@ -11,7 +11,7 @@ HOMEPAGE="https://pear.php.net/package/Structures_Graph" SRC_URI="https://pear.php.net/get/${MY_P}.tgz" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86" IUSE="" DEPEND="" 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 index 84e432729ae..ee64b4e889d 100644 --- 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 @@ -11,7 +11,7 @@ HOMEPAGE="https://pear.php.net/package/System_Command" 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" +KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86" IUSE="examples" RDEPEND="dev-lang/php:* 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 index 716200a0a39..e86efe717a6 100644 --- 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 @@ -11,7 +11,7 @@ HOMEPAGE="https://pear.php.net/package/Text_Password" SRC_URI="http://download.pear.php.net/package/${MY_P}.tgz" LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 ~sparc x86" +KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 ~sparc x86" IUSE="test" RESTRICT="!test? ( test )" 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 index 24295e7cc65..edfbd30619e 100644 --- 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 @@ -8,7 +8,7 @@ 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" +KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86" IUSE="test" RESTRICT="!test? ( test )" # Pull from github as pear.php.net is not updated 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 index b1581cefac6..9949a081a0f 100644 --- a/dev-php/PEAR-Validate/PEAR-Validate-0.8.5-r1.ebuild +++ b/dev-php/PEAR-Validate/PEAR-Validate-0.8.5-r1.ebuild @@ -5,7 +5,7 @@ EAPI=6 inherit php-pear-r2 -KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ppc64 ~s390 sparc x86" +KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86" DESCRIPTION="Validation class" LICENSE="BSD" 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 index 51a979e0e4d..cb8300b5fce 100644 --- 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 @@ -9,7 +9,7 @@ DESCRIPTION="XML parsing class based on PHP's SAX parser" LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86" IUSE="" src_test() { 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 index 7065b7a8d22..482610a9282 100644 --- 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 @@ -13,7 +13,7 @@ HOMEPAGE="https://pear.php.net/package/XML_RSS" 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 sparc x86" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86" IUSE="" # Only needs PEAR_Exception (not in the tree), not all of PEAR. 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 index 149c678a967..b0d0747acc6 100644 --- 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 @@ -8,7 +8,7 @@ DESCRIPTION="Swiss-army knife for reading and writing XML files" LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86" IUSE="examples test" RESTRICT="!test? ( test )" 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 index cea5e82621d..3676080b9fd 100644 --- 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 @@ -11,7 +11,7 @@ HOMEPAGE="https://pear.php.net/package/XML_Util" SRC_URI="https://pear.php.net/get/${MY_P}.tgz" LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86" IUSE="examples" # PCRE is needed for a few calls to preg_replace and preg_match. diff --git a/dev-php/PHP_CodeCoverage/Manifest b/dev-php/PHP_CodeCoverage/Manifest index 10e664b7c52..01d5396e75e 100644 --- a/dev-php/PHP_CodeCoverage/Manifest +++ b/dev-php/PHP_CodeCoverage/Manifest @@ -1,2 +1,3 @@ DIST PHP_CodeCoverage-4.0.7.tar.gz 349906 BLAKE2B 2ba665efa2d20a5eb66c66375a095425057e883697dd1d3ba7214e56de29c96451516adb2843589e64732c994aac7289afa0e34a74d56ef9bc36f36e635eb944 SHA512 8418efa2585d05b3004ab50e7ba77513429d649f71fdb2479412424a0f40a698a962e1d87852db08fec8f92e569a9a5767dad66d5d64e072637dde33182e71e9 DIST PHP_CodeCoverage-7.0.10.tar.gz 237217 BLAKE2B bd2dc397c15a85ca020abf3d9a1dfb5f438020b577cded7942110dd8affa2d703ed40bf01ae68f38c6ae9383ba59bc9f7706af99596bce0b40cef6d2a7e92fb2 SHA512 37cda2d3687f62b5546372507954eeedd4da1c03fa9cab147b578d035046763799ca1535310ba458403094714060fe8f1327bed6951440392fee3df551be73b1 +DIST PHP_CodeCoverage-7.0.12.tar.gz 237382 BLAKE2B 3051e7e473506a66d7b4720083274f3b3a64b9f480bb1a95682608220d19be60810a899d974ea3189270c0751f8af058f2503ed83c61d92180cbb41708b07536 SHA512 b105672dc50952c3c606010389fd6fb8ebfcbb78d99d72f9a21a1eef045314b0803fdb689bba1314671d0eeab0e5ed00bf416b09ca45d291688f4c59748c2ed1 diff --git a/dev-php/PHP_CodeCoverage/PHP_CodeCoverage-4.0.7-r2.ebuild b/dev-php/PHP_CodeCoverage/PHP_CodeCoverage-4.0.7-r2.ebuild index 9dacbd149a2..946931da37b 100644 --- a/dev-php/PHP_CodeCoverage/PHP_CodeCoverage-4.0.7-r2.ebuild +++ b/dev-php/PHP_CodeCoverage/PHP_CodeCoverage-4.0.7-r2.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> $ LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86" IUSE="" S="${WORKDIR}/${MY_PN}-${PV}" diff --git a/dev-php/PHP_CodeCoverage/PHP_CodeCoverage-7.0.12.ebuild b/dev-php/PHP_CodeCoverage/PHP_CodeCoverage-7.0.12.ebuild new file mode 100644 index 00000000000..b4f5f302ad1 --- /dev/null +++ b/dev-php/PHP_CodeCoverage/PHP_CodeCoverage-7.0.12.ebuild @@ -0,0 +1,106 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +MY_PN="php-code-coverage" + +USE_PHP="php7-2 php7-3 php7-4" + +DESCRIPTION="Collection, processing, and rendering for PHP code coverage" +HOMEPAGE="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 sparc x86" +IUSE="test" +RESTRICT="!test? ( test )" + +CDEPEND="dev-php/fedora-autoloader + >=dev-php/File_Iterator-2.0.2 + >=dev-php/Text_Template-1.2.1 + >=dev-php/PHP_TokenStream-3.1.1 + >=dev-php/sebastian-environment-4.2.2 + >=dev-php/sebastian-version-2.0.1 + >=dev-php/sebastian-code-unit-reverse-lookup-1.0.1 + >=dev-php/theseer-tokenizer-1.1.3 + >=dev-lang/php-7.2:*[xml(-),xmlwriter(-)]" + +BDEPEND="dev-php/theseer-Autoload + test? ( + ${CDEPEND} + dev-php/phpunit + )" + +RDEPEND="${CDEPEND}" + +S="${WORKDIR}/${MY_PN}-${PV}" + +src_prepare() { + default + + phpab \ + --output src/autoload.php \ + --template fedora2 \ + --basedir src \ + src || die + + cat >> src/autoload.php <<EOF || die "failed to extend autoload.php" + +// Dependencies +\Fedora\Autoloader\Dependencies::required([ + '/usr/share/php/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', + '/usr/share/php/TheSeer/Tokenizer/autoload.php', +]); +EOF +} + +src_install() { + insinto /usr/share/php/PHP/CodeCoverage + doins -r src/* +} + +src_test() { + mkdir vendor || die + + phpab \ + --output vendor/autoload.php \ + --template fedora2 \ + --exclude 'tests/_files/Crash.php' \ + --exclude 'tests/_files/source*.php' \ + src \ + tests \ + || die + + cat >> vendor/autoload.php <<EOF || die "failed to extend autoload.php" + +// Dependencies +\Fedora\Autoloader\Dependencies::required([ + '/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', + '/usr/share/php/TheSeer/Tokenizer/autoload.php', +]); +EOF + + local target + for target in ${USE_PHP//-/.} ; do + if [[ -x /usr/bin/${target} ]] ; then + ${target} /usr/bin/phpunit -c phpunit.xml --no-coverage --verbose || die "tests using ${target} failed" + fi + done +} + +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/metadata.xml b/dev-php/PHP_CodeCoverage/metadata.xml index 32503e01851..cabad4a1dec 100644 --- a/dev-php/PHP_CodeCoverage/metadata.xml +++ b/dev-php/PHP_CodeCoverage/metadata.xml @@ -5,6 +5,7 @@ <email>php-bugs@gentoo.org</email> <name>PHP</name> </maintainer> + <stabilize-allarches/> <upstream> <remote-id type="github">sebastianbergmann/php-code-coverage</remote-id> </upstream> diff --git a/dev-php/PHP_Timer/PHP_Timer-1.0.5.ebuild b/dev-php/PHP_Timer/PHP_Timer-1.0.5.ebuild index e0d5a2764c1..6e31e37ca14 100644 --- a/dev-php/PHP_Timer/PHP_Timer-1.0.5.ebuild +++ b/dev-php/PHP_Timer/PHP_Timer-1.0.5.ebuild @@ -12,7 +12,7 @@ inherit php-pear-r2 DESCRIPTION="Utility class for timing" LICENSE="BSD" SLOT="0" -KEYWORDS="amd64 hppa x86" +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 index 66d7999f6a0..584ae19d7a7 100644 --- a/dev-php/PHP_Timer/PHP_Timer-1.0.9.ebuild +++ b/dev-php/PHP_Timer/PHP_Timer-1.0.9.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> $ LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86" IUSE="" S="${WORKDIR}/${MY_PN}-${PV}" diff --git a/dev-php/PHP_Timer/PHP_Timer-2.1.2-r1.ebuild b/dev-php/PHP_Timer/PHP_Timer-2.1.2-r1.ebuild index 73db2978201..5ce35bafda9 100644 --- a/dev-php/PHP_Timer/PHP_Timer-2.1.2-r1.ebuild +++ b/dev-php/PHP_Timer/PHP_Timer-2.1.2-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> $ LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86" IUSE="" S="${WORKDIR}/${MY_PN}-${PV}" diff --git a/dev-php/PHP_Timer/metadata.xml b/dev-php/PHP_Timer/metadata.xml index 2774b13055f..5de672a0bb8 100644 --- a/dev-php/PHP_Timer/metadata.xml +++ b/dev-php/PHP_Timer/metadata.xml @@ -5,6 +5,7 @@ <email>php-bugs@gentoo.org</email> <name>PHP</name> </maintainer> + <stabilize-allarches/> <upstream> <remote-id type="github">sebastianbergmann/php-timer</remote-id> </upstream> diff --git a/dev-php/PHP_TokenStream/PHP_TokenStream-1.4.11-r1.ebuild b/dev-php/PHP_TokenStream/PHP_TokenStream-1.4.11-r1.ebuild index ca56bfba3fb..931b95aed14 100644 --- a/dev-php/PHP_TokenStream/PHP_TokenStream-1.4.11-r1.ebuild +++ b/dev-php/PHP_TokenStream/PHP_TokenStream-1.4.11-r1.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> $ LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86" IUSE="" S="${WORKDIR}/${MY_PN}-${PV}" diff --git a/dev-php/PHP_TokenStream/PHP_TokenStream-3.1.1.ebuild b/dev-php/PHP_TokenStream/PHP_TokenStream-3.1.1.ebuild index 79236ade4a2..8988b643ece 100644 --- a/dev-php/PHP_TokenStream/PHP_TokenStream-3.1.1.ebuild +++ b/dev-php/PHP_TokenStream/PHP_TokenStream-3.1.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -12,7 +12,7 @@ SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> $ LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86" IUSE="test" S="${WORKDIR}/${MY_PN}-${PV}" diff --git a/dev-php/Text_Template/Text_Template-1.1.1.ebuild b/dev-php/Text_Template/Text_Template-1.1.1.ebuild index e12d9f8af66..cd6dc26dbfb 100644 --- a/dev-php/Text_Template/Text_Template-1.1.1.ebuild +++ b/dev-php/Text_Template/Text_Template-1.1.1.ebuild @@ -14,7 +14,7 @@ SRC_URI="http://${PHP_PEAR_URI}/get/${PEAR_P}.tgz" DESCRIPTION="Simple template engine" LICENSE="BSD" SLOT="0" -KEYWORDS="amd64 hppa x86" +KEYWORDS="amd64 ~hppa x86" IUSE="" DEPEND=">=dev-php/pear-1.9.4" diff --git a/dev-php/Text_Template/Text_Template-1.2.1.ebuild b/dev-php/Text_Template/Text_Template-1.2.1.ebuild index cceed487460..b54b1c849b3 100644 --- a/dev-php/Text_Template/Text_Template-1.2.1.ebuild +++ b/dev-php/Text_Template/Text_Template-1.2.1.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> $ LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86" IUSE="" S="${WORKDIR}/${MY_PN}-${PV}" diff --git a/dev-php/YAML/YAML-1.0.6-r3.ebuild b/dev-php/YAML/YAML-1.0.6-r3.ebuild index c52a33ba249..3af602bad51 100644 --- a/dev-php/YAML/YAML-1.0.6-r3.ebuild +++ b/dev-php/YAML/YAML-1.0.6-r3.ebuild @@ -15,7 +15,7 @@ SRC_URI="http://pear.symfony-project.com/get/${PEAR_P}.tgz" LICENSE="MIT" SLOT="0" -KEYWORDS="amd64 hppa x86" +KEYWORDS="amd64 ~hppa x86" IUSE="" src_install() { diff --git a/dev-php/adodb/adodb-5.20.14.ebuild b/dev-php/adodb/adodb-5.20.14.ebuild index 8e3d846c988..e7a970d073e 100644 --- a/dev-php/adodb/adodb-5.20.14.ebuild +++ b/dev-php/adodb/adodb-5.20.14.ebuild @@ -10,7 +10,7 @@ SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar. LICENSE="BSD LGPL-2.1+" SLOT="0" -KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 sparc x86" +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 diff --git a/dev-php/agavi/agavi-1.0.8.ebuild b/dev-php/agavi/agavi-1.0.8.ebuild index 3edb056ec78..3b7ac5c7ebe 100644 --- a/dev-php/agavi/agavi-1.0.8.ebuild +++ b/dev-php/agavi/agavi-1.0.8.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -11,7 +11,7 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="examples +executable iconv session soap xmlrpc" -RDEPEND="dev-lang/php[iconv?,session?,soap?,xml,xmlrpc?] +RDEPEND="dev-lang/php[iconv?,session?,soap?,xml,xmlrpc(-)?] executable? ( dev-php/phing )" DOCS=( diff --git a/dev-php/awl/awl-0.61.ebuild b/dev-php/awl/awl-0.61.ebuild index 7cdc7c288e2..4e25a5083da 100644 --- a/dev-php/awl/awl-0.61.ebuild +++ b/dev-php/awl/awl-0.61.ebuild @@ -13,7 +13,7 @@ KEYWORDS="~amd64 ~x86" IUSE="test" RESTRICT="!test? ( test )" -BDEPEND="test? ( <dev-php/phpunit-6 )" +BDEPEND="test? ( dev-php/phpunit )" RDEPEND="dev-lang/php:*[pdo,postgres,xml]" S="${WORKDIR}" @@ -23,7 +23,7 @@ src_compile() { } src_test() { - phpunit tests/ || die "test suite failed" + phpunit --do-not-cache-result tests/ || die "test suite failed" } src_install() { diff --git a/dev-php/doctrine-instantiator/doctrine-instantiator-1.0.5.ebuild b/dev-php/doctrine-instantiator/doctrine-instantiator-1.0.5.ebuild index db9de5fabfe..a23240d92e3 100644 --- a/dev-php/doctrine-instantiator/doctrine-instantiator-1.0.5.ebuild +++ b/dev-php/doctrine-instantiator/doctrine-instantiator-1.0.5.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/doctrine/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.g LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86" IUSE="" S="${WORKDIR}/${MY_PN}-${PV}" diff --git a/dev-php/doctrine-instantiator/doctrine-instantiator-1.3.1.ebuild b/dev-php/doctrine-instantiator/doctrine-instantiator-1.3.1.ebuild index 6b79666dab6..32e5559d854 100644 --- a/dev-php/doctrine-instantiator/doctrine-instantiator-1.3.1.ebuild +++ b/dev-php/doctrine-instantiator/doctrine-instantiator-1.3.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="https://github.com/doctrine/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.g LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86" IUSE="" S="${WORKDIR}/${MY_PN}-${PV}" diff --git a/dev-php/doctrine-instantiator/metadata.xml b/dev-php/doctrine-instantiator/metadata.xml index 7ddeb0b99ff..9e7a740add1 100644 --- a/dev-php/doctrine-instantiator/metadata.xml +++ b/dev-php/doctrine-instantiator/metadata.xml @@ -5,7 +5,8 @@ <email>php-bugs@gentoo.org</email> <name>PHP</name> </maintainer> + <stabilize-allarches/> <upstream> - <remote-id type="github">doctrine/</remote-id> + <remote-id type="github">doctrine/instantiator</remote-id> </upstream> </pkgmetadata> diff --git a/dev-php/doctrine/Manifest b/dev-php/doctrine/Manifest index 2d4a68146f6..c1149500eb9 100644 --- a/dev-php/doctrine/Manifest +++ b/dev-php/doctrine/Manifest @@ -1,4 +1,2 @@ -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 DIST doctrine-2.6.4.tar.gz 558995 BLAKE2B 789a9d3e5c53a19e9e9d6dc24680888e0703a51cf22df052604bdee0b5148edd5153a625528dc9cf7cea9e5b245c7c73153efc8a05e3f91150536c2d4bcc2243 SHA512 7f4ed67ff5a3921da5e630e51987ceb3f896824baa0db6065c1a17f0389c363c4ee149298335ce4eccce37dbb9e1572caa31196d0e67251a5ea72d449471eec6 diff --git a/dev-php/doctrine/doctrine-1.2.5.ebuild b/dev-php/doctrine/doctrine-1.2.5.ebuild deleted file mode 100644 index bf2faae0288..00000000000 --- a/dev-php/doctrine/doctrine-1.2.5.ebuild +++ /dev/null @@ -1,25 +0,0 @@ -# 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 deleted file mode 100644 index 5184f5a1812..00000000000 --- a/dev-php/doctrine/doctrine-2.4.6.ebuild +++ /dev/null @@ -1,24 +0,0 @@ -# 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/fedora-autoloader/fedora-autoloader-0.2.1.ebuild b/dev-php/fedora-autoloader/fedora-autoloader-0.2.1.ebuild index 1356394d53c..10f5e60589c 100644 --- a/dev-php/fedora-autoloader/fedora-autoloader-0.2.1.ebuild +++ b/dev-php/fedora-autoloader/fedora-autoloader-0.2.1.ebuild @@ -9,7 +9,7 @@ SRC_URI="https://github.com/php-fedora/autoloader/archive/${PV}.tar.gz -> ${P}.t LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86" IUSE="test" RESTRICT="!test? ( test )" diff --git a/dev-php/fedora-autoloader/fedora-autoloader-1.0.1.ebuild b/dev-php/fedora-autoloader/fedora-autoloader-1.0.1.ebuild index 144c288ef54..9e33ae0060b 100644 --- a/dev-php/fedora-autoloader/fedora-autoloader-1.0.1.ebuild +++ b/dev-php/fedora-autoloader/fedora-autoloader-1.0.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -9,7 +9,7 @@ SRC_URI="https://github.com/php-fedora/autoloader/archive/${PV}.tar.gz -> ${P}.t LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86" IUSE="test" diff --git a/dev-php/fedora-autoloader/metadata.xml b/dev-php/fedora-autoloader/metadata.xml index 551bb2bc4e8..0a1e7e2c667 100644 --- a/dev-php/fedora-autoloader/metadata.xml +++ b/dev-php/fedora-autoloader/metadata.xml @@ -16,6 +16,7 @@ Static PSR-4, PSR-0, and classmap autoloader. Includes loader for required and optional dependencies. </longdescription> + <stabilize-allarches/> <upstream> <remote-id type="github">php-fedora/autoloader</remote-id> </upstream> diff --git a/dev-php/geos-php/files/1.0.0/0001-fix-test-for-7.3-int-vs-integer.patch b/dev-php/geos-php/files/1.0.0/0001-fix-test-for-7.3-int-vs-integer.patch new file mode 100644 index 00000000000..e08f1b73905 --- /dev/null +++ b/dev-php/geos-php/files/1.0.0/0001-fix-test-for-7.3-int-vs-integer.patch @@ -0,0 +1,34 @@ +From d9eb2378092d39678d1e2cf834c555f83d85b1a1 Mon Sep 17 00:00:00 2001 +From: Remi Collet <remi@remirepo.net> +Date: Fri, 22 Jun 2018 11:43:23 +0200 +Subject: [PATCH 1/2] fix test for 7.3 (int vs integer) + +--- + tests/004_WKBWriter.phpt | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/tests/004_WKBWriter.phpt b/tests/004_WKBWriter.phpt +index d2b3c85..3a72e2d 100644 +--- a/tests/004_WKBWriter.phpt ++++ b/tests/004_WKBWriter.phpt +@@ -139,7 +139,7 @@ class WKBWriterTest extends GEOSTest + $writer->write(1); + $this->assertTrue(false); + } catch (ErrorException $e) { +- $this->assertContains('expects parameter 1 to be object, integer given', $e->getMessage()); ++ $this->assertContains('expects parameter 1 to be object, int', $e->getMessage()); + } + } + +@@ -151,7 +151,7 @@ class WKBWriterTest extends GEOSTest + $writer->writeHEX(1); + $this->assertTrue(false); + } catch (ErrorException $e) { +- $this->assertContains('expects parameter 1 to be object, integer given', $e->getMessage()); ++ $this->assertContains('expects parameter 1 to be object, int', $e->getMessage()); + } + } + } +-- +2.14.4 + diff --git a/dev-php/geos-php/files/1.0.0/0002-fix-error-message-with-php-7-Wformat-warnings-raised.patch b/dev-php/geos-php/files/1.0.0/0002-fix-error-message-with-php-7-Wformat-warnings-raised.patch new file mode 100644 index 00000000000..78509b76622 --- /dev/null +++ b/dev-php/geos-php/files/1.0.0/0002-fix-error-message-with-php-7-Wformat-warnings-raised.patch @@ -0,0 +1,37 @@ +From f881f614f11472090394538d4424f408cb61d581 Mon Sep 17 00:00:00 2001 +From: Remi Collet <remi@remirepo.net> +Date: Fri, 22 Jun 2018 11:44:27 +0200 +Subject: [PATCH 2/2] fix error message with php 7+ (-Wformat warnings raised + by 7.3) + +--- + geos.c | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/geos.c b/geos.c +index 2c81428..fc679e8 100755 +--- a/geos.c ++++ b/geos.c +@@ -189,11 +189,19 @@ getRelay(zval* val, zend_class_entry* ce) { + + if ( proxy->std.ce != ce ) { + php_error_docref(NULL TSRMLS_CC, E_ERROR, ++#if PHP_VERSION_ID >= 70000 ++ "Relay object is not an %s", ZSTR_VAL(ce->name)); ++#else + "Relay object is not an %s", ce->name); ++#endif + } + if ( ! proxy->relay ) { + php_error_docref(NULL TSRMLS_CC, E_ERROR, ++#if PHP_VERSION_ID >= 70000 ++ "Relay object for object of type %s is not set", ZSTR_VAL(ce->name)); ++#else + "Relay object for object of type %s is not set", ce->name); ++#endif + } + return proxy->relay; + } +-- +2.14.4 + diff --git a/dev-php/geos-php/files/1.0.0/0003-add-all-arginfo-and-fix-build-with-PHP-8-part2.patch b/dev-php/geos-php/files/1.0.0/0003-add-all-arginfo-and-fix-build-with-PHP-8-part2.patch new file mode 100644 index 00000000000..a1ab29fb4a7 --- /dev/null +++ b/dev-php/geos-php/files/1.0.0/0003-add-all-arginfo-and-fix-build-with-PHP-8-part2.patch @@ -0,0 +1,422 @@ +From bfef69aca744295719dc8f859005ff83e17ac48c Mon Sep 17 00:00:00 2001 +From: Remi Collet <remi@remirepo.net> +Date: Fri, 28 Aug 2020 15:21:36 +0200 +Subject: [PATCH] add all arginfo and fix build with PHP 8 + +--- + arginfo.h | 319 +++++++++++++++++++++++++++++++++++++++ + geos.c | 190 ++++++++++++----------- + php_geos.h | 9 ++ + tests/002_WKTWriter.phpt | 2 + + tests/003_WKTReader.phpt | 2 + + tests/004_WKBWriter.phpt | 6 +- + 6 files changed, 435 insertions(+), 93 deletions(-) + create mode 100644 arginfo.h + +diff --git a/geos.c b/geos.c +index fc679e8..ffa27b8 100755 +--- a/geos.c ++++ b/geos.c +@@ -32,6 +32,7 @@ + + /* Own stuff */ + #include "php_geos.h" ++#include "arginfo.h" + + static ZEND_DECLARE_MODULE_GLOBALS(geos); + static PHP_GINIT_FUNCTION(geos); +@@ -84,18 +85,23 @@ PHP_FUNCTION(GEOSRelateMatch); + + + static zend_function_entry geos_functions[] = { +- PHP_FE(GEOSVersion, NULL) +- PHP_FE(GEOSPolygonize, NULL) +- PHP_FE(GEOSLineMerge, NULL) ++ PHP_FE(GEOSVersion, arginfo_GEOSVersion) ++ PHP_FE(GEOSPolygonize, arginfo_GEOSPolygonize) ++ PHP_FE(GEOSLineMerge, arginfo_GEOSLineMerge) + + # ifdef HAVE_GEOS_SHARED_PATHS +- PHP_FE(GEOSSharedPaths, NULL) ++ PHP_FE(GEOSSharedPaths, arginfo_GEOSSharedPaths) + # endif + + # ifdef HAVE_GEOS_RELATE_PATTERN_MATCH +- PHP_FE(GEOSRelateMatch, NULL) ++ PHP_FE(GEOSRelateMatch, arginfo_GEOSRelateMatch) + # endif ++ ++#ifdef PHP_FE_END ++ PHP_FE_END ++#else + {NULL, NULL, NULL} ++#endif + }; + + zend_module_entry geos_module_entry = { +@@ -428,142 +434,142 @@ PHP_METHOD(Geometry, clipByRect); + #endif + + static zend_function_entry Geometry_methods[] = { +- PHP_ME(Geometry, __construct, NULL, 0) +- PHP_ME(Geometry, __toString, NULL, 0) +- PHP_ME(Geometry, project, NULL, 0) +- PHP_ME(Geometry, interpolate, NULL, 0) +- PHP_ME(Geometry, buffer, NULL, 0) ++ PHP_ME(Geometry, __construct, arginfo_Geometry_construct, 0) ++ PHP_ME(Geometry, __toString, arginfo_Geometry_toString, 0) ++ PHP_ME(Geometry, project, arginfo_Geometry_project, 0) ++ PHP_ME(Geometry, interpolate, arginfo_Geometry_interpolate, 0) ++ PHP_ME(Geometry, buffer, arginfo_Geometry_buffer, 0) + + # ifdef HAVE_GEOS_OFFSET_CURVE +- PHP_ME(Geometry, offsetCurve, NULL, 0) ++ PHP_ME(Geometry, offsetCurve, arginfo_Geometry_offsetCurve, 0) + # endif + +- PHP_ME(Geometry, envelope, NULL, 0) +- PHP_ME(Geometry, intersection, NULL, 0) +- PHP_ME(Geometry, convexHull, NULL, 0) +- PHP_ME(Geometry, difference, NULL, 0) +- PHP_ME(Geometry, symDifference, NULL, 0) +- PHP_ME(Geometry, boundary, NULL, 0) +- PHP_ME(Geometry, union, NULL, 0) +- PHP_ME(Geometry, pointOnSurface, NULL, 0) +- PHP_ME(Geometry, centroid, NULL, 0) +- PHP_ME(Geometry, relate, NULL, 0) ++ PHP_ME(Geometry, envelope, arginfo_Geometry_envelope, 0) ++ PHP_ME(Geometry, intersection, arginfo_Geometry_intersection, 0) ++ PHP_ME(Geometry, convexHull, arginfo_Geometry_convexHull, 0) ++ PHP_ME(Geometry, difference, arginfo_Geometry_difference, 0) ++ PHP_ME(Geometry, symDifference, arginfo_Geometry_symDifference, 0) ++ PHP_ME(Geometry, boundary, arginfo_Geometry_boundary, 0) ++ PHP_ME(Geometry, union, arginfo_Geometry_union, 0) ++ PHP_ME(Geometry, pointOnSurface, arginfo_Geometry_pointOnSurface, 0) ++ PHP_ME(Geometry, centroid, arginfo_Geometry_centroid, 0) ++ PHP_ME(Geometry, relate, arginfo_Geometry_relate, 0) + + # ifdef HAVE_GEOS_RELATE_BOUNDARY_NODE_RULE +- PHP_ME(Geometry, relateBoundaryNodeRule, NULL, 0) ++ PHP_ME(Geometry, relateBoundaryNodeRule, arginfo_Geometry_relateBoundaryNodeRule, 0) + # endif + +- PHP_ME(Geometry, simplify, NULL, 0) +- PHP_ME(Geometry, normalize, NULL, 0) ++ PHP_ME(Geometry, simplify, arginfo_Geometry_simplify, 0) ++ PHP_ME(Geometry, normalize, arginfo_Geometry_normalize, 0) + + # ifdef HAVE_GEOS_GEOM_SET_PRECISION +- PHP_ME(Geometry, setPrecision, NULL, 0) ++ PHP_ME(Geometry, setPrecision, arginfo_Geometry_setPrecision, 0) + # endif + + # if HAVE_GEOS_GEOM_GET_PRECISION +- PHP_ME(Geometry, getPrecision, NULL, 0) ++ PHP_ME(Geometry, getPrecision, arginfo_Geometry_getPrecision, 0) + # endif + + # ifdef HAVE_GEOS_GEOM_EXTRACT_UNIQUE_POINTS +- PHP_ME(Geometry, extractUniquePoints, NULL, 0) ++ PHP_ME(Geometry, extractUniquePoints, arginfo_Geometry_extractUniquePoints, 0) + # endif + +- PHP_ME(Geometry, disjoint, NULL, 0) +- PHP_ME(Geometry, touches, NULL, 0) +- PHP_ME(Geometry, intersects, NULL, 0) +- PHP_ME(Geometry, crosses, NULL, 0) +- PHP_ME(Geometry, within, NULL, 0) +- PHP_ME(Geometry, contains, NULL, 0) +- PHP_ME(Geometry, overlaps, NULL, 0) ++ PHP_ME(Geometry, disjoint, arginfo_Geometry_disjoint, 0) ++ PHP_ME(Geometry, touches, arginfo_Geometry_touches, 0) ++ PHP_ME(Geometry, intersects, arginfo_Geometry_intersects, 0) ++ PHP_ME(Geometry, crosses, arginfo_Geometry_crosses, 0) ++ PHP_ME(Geometry, within, arginfo_Geometry_within, 0) ++ PHP_ME(Geometry, contains, arginfo_Geometry_contains, 0) ++ PHP_ME(Geometry, overlaps, arginfo_Geometry_overlaps, 0) + + # ifdef HAVE_GEOS_COVERS +- PHP_ME(Geometry, covers, NULL, 0) ++ PHP_ME(Geometry, covers, arginfo_Geometry_covers, 0) + # endif + + # ifdef HAVE_GEOS_COVERED_BY +- PHP_ME(Geometry, coveredBy, NULL, 0) ++ PHP_ME(Geometry, coveredBy, arginfo_Geometry_coveredBy, 0) + # endif + +- PHP_ME(Geometry, equals, NULL, 0) +- PHP_ME(Geometry, equalsExact, NULL, 0) +- PHP_ME(Geometry, isEmpty, NULL, 0) ++ PHP_ME(Geometry, equals, arginfo_Geometry_equals, 0) ++ PHP_ME(Geometry, equalsExact, arginfo_Geometry_equalsExact, 0) ++ PHP_ME(Geometry, isEmpty, arginfo_Geometry_isEmpty, 0) + + # ifdef HAVE_GEOS_IS_VALID_DETAIL +- PHP_ME(Geometry, checkValidity, NULL, 0) ++ PHP_ME(Geometry, checkValidity, arginfo_Geometry_checkValidity, 0) + # endif + +- PHP_ME(Geometry, isSimple, NULL, 0) +- PHP_ME(Geometry, isRing, NULL, 0) +- PHP_ME(Geometry, hasZ, NULL, 0) ++ PHP_ME(Geometry, isSimple, arginfo_Geometry_isSimple, 0) ++ PHP_ME(Geometry, isRing, arginfo_Geometry_isRing, 0) ++ PHP_ME(Geometry, hasZ, arginfo_Geometry_hasZ, 0) + + # ifdef HAVE_GEOS_IS_CLOSED +- PHP_ME(Geometry, isClosed, NULL, 0) ++ PHP_ME(Geometry, isClosed, arginfo_Geometry_isClosed, 0) + # endif + +- PHP_ME(Geometry, typeName, NULL, 0) +- PHP_ME(Geometry, typeId, NULL, 0) +- PHP_ME(Geometry, getSRID, NULL, 0) +- PHP_ME(Geometry, setSRID, NULL, 0) +- PHP_ME(Geometry, numGeometries, NULL, 0) +- PHP_ME(Geometry, geometryN, NULL, 0) +- PHP_ME(Geometry, numInteriorRings, NULL, 0) ++ PHP_ME(Geometry, typeName, arginfo_Geometry_typeName, 0) ++ PHP_ME(Geometry, typeId, arginfo_Geometry_typeId, 0) ++ PHP_ME(Geometry, getSRID, arginfo_Geometry_getSRID, 0) ++ PHP_ME(Geometry, setSRID, arginfo_Geometry_setSRID, 0) ++ PHP_ME(Geometry, numGeometries, arginfo_Geometry_numGeometries, 0) ++ PHP_ME(Geometry, geometryN, arginfo_Geometry_geometryN, 0) ++ PHP_ME(Geometry, numInteriorRings, arginfo_Geometry_numInteriorRings, 0) + + # ifdef HAVE_GEOS_GEOM_GET_NUM_POINTS +- PHP_ME(Geometry, numPoints, NULL, 0) ++ PHP_ME(Geometry, numPoints, arginfo_Geometry_numPoints, 0) + # endif + + # ifdef HAVE_GEOS_GEOM_GET_X +- PHP_ME(Geometry, getX, NULL, 0) ++ PHP_ME(Geometry, getX, arginfo_Geometry_getX, 0) + # endif + + # ifdef HAVE_GEOS_GEOM_GET_Y +- PHP_ME(Geometry, getY, NULL, 0) ++ PHP_ME(Geometry, getY, arginfo_Geometry_getY, 0) + # endif + +- PHP_ME(Geometry, interiorRingN, NULL, 0) +- PHP_ME(Geometry, exteriorRing, NULL, 0) +- PHP_ME(Geometry, numCoordinates, NULL, 0) +- PHP_ME(Geometry, dimension, NULL, 0) ++ PHP_ME(Geometry, interiorRingN, arginfo_Geometry_interiorRingN, 0) ++ PHP_ME(Geometry, exteriorRing, arginfo_Geometry_exteriorRing, 0) ++ PHP_ME(Geometry, numCoordinates, arginfo_Geometry_numCoordinates, 0) ++ PHP_ME(Geometry, dimension, arginfo_Geometry_dimension, 0) + + # ifdef HAVE_GEOS_GEOM_GET_COORDINATE_DIMENSION +- PHP_ME(Geometry, coordinateDimension, NULL, 0) ++ PHP_ME(Geometry, coordinateDimension, arginfo_Geometry_coordinateDimension, 0) + # endif + + # ifdef HAVE_GEOS_GEOM_GET_POINT_N +- PHP_ME(Geometry, pointN, NULL, 0) ++ PHP_ME(Geometry, pointN, arginfo_Geometry_pointN, 0) + # endif + + # ifdef HAVE_GEOS_GEOM_GET_START_POINT +- PHP_ME(Geometry, startPoint, NULL, 0) ++ PHP_ME(Geometry, startPoint, arginfo_Geometry_startPoint, 0) + # endif + + # ifdef HAVE_GEOS_GEOM_GET_END_POINT +- PHP_ME(Geometry, endPoint, NULL, 0) ++ PHP_ME(Geometry, endPoint, arginfo_Geometry_endPoint, 0) + # endif + +- PHP_ME(Geometry, area, NULL, 0) +- PHP_ME(Geometry, length, NULL, 0) +- PHP_ME(Geometry, distance, NULL, 0) +- PHP_ME(Geometry, hausdorffDistance, NULL, 0) ++ PHP_ME(Geometry, area, arginfo_Geometry_area, 0) ++ PHP_ME(Geometry, length, arginfo_Geometry_length, 0) ++ PHP_ME(Geometry, distance, arginfo_Geometry_distance, 0) ++ PHP_ME(Geometry, hausdorffDistance, arginfo_Geometry_hausdorffDistance, 0) + + # if HAVE_GEOS_SNAP +- PHP_ME(Geometry, snapTo, NULL, 0) ++ PHP_ME(Geometry, snapTo, arginfo_Geometry_snapTo, 0) + # endif + + # ifdef HAVE_GEOS_NODE +- PHP_ME(Geometry, node, NULL, 0) ++ PHP_ME(Geometry, node, arginfo_Geometry_node, 0) + # endif + + # ifdef HAVE_GEOS_DELAUNAY_TRIANGULATION +- PHP_ME(Geometry, delaunayTriangulation, NULL, 0) ++ PHP_ME(Geometry, delaunayTriangulation, arginfo_Geometry_delaunayTriangulation, 0) + # endif + + # ifdef HAVE_GEOS_VORONOI_DIAGRAM +- PHP_ME(Geometry, voronoiDiagram, NULL, 0) ++ PHP_ME(Geometry, voronoiDiagram, arginfo_Geometry_voronoiDiagram, 0) + # endif + + # ifdef HAVE_GEOS_CLIP_BY_RECT +- PHP_ME(Geometry, clipByRect, NULL, 0) ++ PHP_ME(Geometry, clipByRect, arginfo_Geometry_clipByRect, 0) + # endif + + {NULL, NULL, NULL} +@@ -2347,8 +2353,8 @@ PHP_METHOD(WKTReader, __construct); + PHP_METHOD(WKTReader, read); + + static zend_function_entry WKTReader_methods[] = { +- PHP_ME(WKTReader, __construct, NULL, 0) +- PHP_ME(WKTReader, read, NULL, 0) ++ PHP_ME(WKTReader, __construct, arginfo_WKTReader_construct, 0) ++ PHP_ME(WKTReader, read, arginfo_WKTReader_read, 0) + {NULL, NULL, NULL} + }; + +@@ -2457,27 +2463,27 @@ PHP_METHOD(WKTWriter, setOld3D); + #endif + + static zend_function_entry WKTWriter_methods[] = { +- PHP_ME(WKTWriter, __construct, NULL, 0) +- PHP_ME(WKTWriter, write, NULL, 0) ++ PHP_ME(WKTWriter, __construct, arginfo_WKTWriter_construct, 0) ++ PHP_ME(WKTWriter, write, arginfo_WKTWriter_write, 0) + + # ifdef HAVE_GEOS_WKT_WRITER_SET_TRIM +- PHP_ME(WKTWriter, setTrim, NULL, 0) ++ PHP_ME(WKTWriter, setTrim, arginfo_WKTWriter_setTrim, 0) + # endif + + # ifdef HAVE_GEOS_WKT_WRITER_SET_ROUNDING_PRECISION +- PHP_ME(WKTWriter, setRoundingPrecision, NULL, 0) ++ PHP_ME(WKTWriter, setRoundingPrecision, arginfo_WKTWriter_setRoundingPrecision, 0) + # endif + + # ifdef HAVE_GEOS_WKT_WRITER_SET_OUTPUT_DIMENSION +- PHP_ME(WKTWriter, setOutputDimension, NULL, 0) ++ PHP_ME(WKTWriter, setOutputDimension, arginfo_WKTWriter_setOutputDimension, 0) + # endif + + # ifdef HAVE_GEOS_WKT_WRITER_GET_OUTPUT_DIMENSION +- PHP_ME(WKTWriter, getOutputDimension, NULL, 0) ++ PHP_ME(WKTWriter, getOutputDimension, arginfo_WKTWriter_getOutputDimension, 0) + # endif + + # ifdef HAVE_GEOS_WKT_WRITER_SET_OLD_3D +- PHP_ME(WKTWriter, setOld3D, NULL, 0) ++ PHP_ME(WKTWriter, setOld3D, arginfo_WKTWriter_setOld3D, 0) + # endif + + {NULL, NULL, NULL} +@@ -2665,15 +2671,15 @@ PHP_METHOD(WKBWriter, write); + PHP_METHOD(WKBWriter, writeHEX); + + static zend_function_entry WKBWriter_methods[] = { +- PHP_ME(WKBWriter, __construct, NULL, 0) +- PHP_ME(WKBWriter, getOutputDimension, NULL, 0) +- PHP_ME(WKBWriter, setOutputDimension, NULL, 0) +- PHP_ME(WKBWriter, getByteOrder, NULL, 0) +- PHP_ME(WKBWriter, setByteOrder, NULL, 0) +- PHP_ME(WKBWriter, getIncludeSRID, NULL, 0) +- PHP_ME(WKBWriter, setIncludeSRID, NULL, 0) +- PHP_ME(WKBWriter, write, NULL, 0) +- PHP_ME(WKBWriter, writeHEX, NULL, 0) ++ PHP_ME(WKBWriter, __construct, arginfo_WKBWriter_construct, 0) ++ PHP_ME(WKBWriter, getOutputDimension, arginfo_WKBWriter_getOutputDimension, 0) ++ PHP_ME(WKBWriter, setOutputDimension, arginfo_WKBWriter_setOutputDimension, 0) ++ PHP_ME(WKBWriter, getByteOrder, arginfo_WKBWriter_getByteOrder, 0) ++ PHP_ME(WKBWriter, setByteOrder, arginfo_WKBWriter_setByteOrder, 0) ++ PHP_ME(WKBWriter, getIncludeSRID, arginfo_WKBWriter_getIncludeSRID, 0) ++ PHP_ME(WKBWriter, setIncludeSRID, arginfo_WKBWriter_setIncludeSRID, 0) ++ PHP_ME(WKBWriter, write, arginfo_WKBWriter_write, 0) ++ PHP_ME(WKBWriter, writeHEX, arginfo_WKBWriter_writeHEX, 0) + {NULL, NULL, NULL} + }; + +@@ -2904,9 +2910,9 @@ PHP_METHOD(WKBReader, read); + PHP_METHOD(WKBReader, readHEX); + + static zend_function_entry WKBReader_methods[] = { +- PHP_ME(WKBReader, __construct, NULL, 0) +- PHP_ME(WKBReader, read, NULL, 0) +- PHP_ME(WKBReader, readHEX, NULL, 0) ++ PHP_ME(WKBReader, __construct, arginfo_WKBReader_construct, 0) ++ PHP_ME(WKBReader, read, arginfo_WKBReader_read, 0) ++ PHP_ME(WKBReader, readHEX, arginfo_WKBReader_readHEX, 0) + {NULL, NULL, NULL} + }; + +diff --git a/php_geos.h b/php_geos.h +index 5350541..0b8fdcb 100644 +--- a/php_geos.h ++++ b/php_geos.h +@@ -48,6 +48,15 @@ extern zend_module_entry geos_module_entry; + #define GEOS_G(v) (geos_globals.v) + #endif + ++/* for PHP 8 */ ++#ifndef TSRMLS_D ++#define TSRMLS_D void ++#define TSRMLS_DC ++#define TSRMLS_C ++#define TSRMLS_CC ++#define TSRMLS_FETCH() ++#endif ++ + ZEND_BEGIN_MODULE_GLOBALS(geos) + GEOSContextHandle_t handle; + ZEND_END_MODULE_GLOBALS(geos) +diff --git a/tests/002_WKTWriter.phpt b/tests/002_WKTWriter.phpt +index 6bb7253..3682a3a 100644 +--- a/tests/002_WKTWriter.phpt ++++ b/tests/002_WKTWriter.phpt +@@ -25,6 +25,8 @@ class WKTWriterTest extends GEOSTest + $this->assertTrue(FALSE); # this is just to fail if we get here + } catch (Exception $e) { + $this->assertContains('expects parameter 1', $e->getMessage()); ++ } catch (Error $e) { ++ $this->assertContains('Argument #1', $e->getMessage()); + } + + $g = $reader->read('POINT(6 7)'); +diff --git a/tests/003_WKTReader.phpt b/tests/003_WKTReader.phpt +index 7bcbf54..fbd4fb1 100644 +--- a/tests/003_WKTReader.phpt ++++ b/tests/003_WKTReader.phpt +@@ -99,6 +99,8 @@ class WKTReaderTest extends GEOSTest + } catch (Exception $e) { + $this->assertContains('expects exactly 1 parameter', + $e->getMessage()); ++ } catch (Error $e) { ++ $this->assertContains('expects exactly 1 parameter', $e->getMessage()); + } + } + } +diff --git a/tests/004_WKBWriter.phpt b/tests/004_WKBWriter.phpt +index 3a72e2d..3c13644 100644 +--- a/tests/004_WKBWriter.phpt ++++ b/tests/004_WKBWriter.phpt +@@ -140,6 +140,8 @@ class WKBWriterTest extends GEOSTest + $this->assertTrue(false); + } catch (ErrorException $e) { + $this->assertContains('expects parameter 1 to be object, int', $e->getMessage()); ++ } catch (Error $e) { ++ $this->assertContains('Argument #1', $e->getMessage()); + } + } + +@@ -152,7 +154,9 @@ class WKBWriterTest extends GEOSTest + $this->assertTrue(false); + } catch (ErrorException $e) { + $this->assertContains('expects parameter 1 to be object, int', $e->getMessage()); +- } ++ } catch (Error $e) { ++ $this->assertContains('Argument #1', $e->getMessage()); ++ } + } + } + +-- +2.25.4 + diff --git a/dev-php/geos-php/files/1.0.0/0003-add-all-arginfo-and-fix-build-with-PHP-8.patch b/dev-php/geos-php/files/1.0.0/0003-add-all-arginfo-and-fix-build-with-PHP-8.patch new file mode 100644 index 00000000000..7422a44203a --- /dev/null +++ b/dev-php/geos-php/files/1.0.0/0003-add-all-arginfo-and-fix-build-with-PHP-8.patch @@ -0,0 +1,341 @@ +From bfef69aca744295719dc8f859005ff83e17ac48c Mon Sep 17 00:00:00 2001 +From: Remi Collet <remi@remirepo.net> +Date: Fri, 28 Aug 2020 15:21:36 +0200 +Subject: [PATCH] add all arginfo and fix build with PHP 8 + +--- + arginfo.h | 319 +++++++++++++++++++++++++++++++++++++++ + geos.c | 190 ++++++++++++----------- + php_geos.h | 9 ++ + tests/002_WKTWriter.phpt | 2 + + tests/003_WKTReader.phpt | 2 + + tests/004_WKBWriter.phpt | 6 +- + 6 files changed, 435 insertions(+), 93 deletions(-) + create mode 100644 arginfo.h + +diff --git a/arginfo.h b/arginfo.h +new file mode 100644 +index 0000000..3bee988 +--- /dev/null ++++ b/arginfo.h +@@ -0,0 +1,319 @@ ++/* commonly used ones */ ++ ++ZEND_BEGIN_ARG_INFO_EX(arginfo_void, 0, 0, 0) ++ZEND_END_ARG_INFO() ++ ++ZEND_BEGIN_ARG_INFO_EX(arginfo_geom, 0, 0, 1) ++ ZEND_ARG_INFO(0, geom) ++ZEND_END_ARG_INFO() ++ ++ZEND_BEGIN_ARG_INFO_EX(arginfo_num, 0, 0, 1) ++ ZEND_ARG_INFO(0, num) ++ZEND_END_ARG_INFO() ++ ++/* function arginfo */ ++ ++#define arginfo_GEOSVersion arginfo_void ++ ++#define arginfo_GEOSPolygonize arginfo_geom ++#define arginfo_GEOSLineMerge arginfo_geom ++ ++#ifdef HAVE_GEOS_SHARED_PATHS ++ZEND_BEGIN_ARG_INFO_EX(arginfo_GEOSSharedPaths, 0, 0, 2) ++ ZEND_ARG_INFO(0, geom1) ++ ZEND_ARG_INFO(0, geom2) ++ZEND_END_ARG_INFO() ++#endif ++ ++#ifdef HAVE_GEOS_RELATE_PATTERN_MATCH ++ZEND_BEGIN_ARG_INFO_EX(arginfo_GEOSRelateMatch, 0, 0, 2) ++ ZEND_ARG_INFO(0, maxtric) ++ ZEND_ARG_INFO(0, pattern) ++ZEND_END_ARG_INFO() ++#endif ++ ++/* GEOSGeometry methods arginfo */ ++ ++#define arginfo_Geometry_construct arginfo_void ++ ++#define arginfo_Geometry_toString arginfo_void ++ ++ZEND_BEGIN_ARG_INFO_EX(arginfo_Geometry_project, 0, 0, 1) ++ ZEND_ARG_INFO(0, geom) ++ ZEND_ARG_INFO(0, normalized) ++ZEND_END_ARG_INFO() ++ ++ZEND_BEGIN_ARG_INFO_EX(arginfo_Geometry_interpolate, 0, 0, 1) ++ ZEND_ARG_INFO(0, dist) ++ ZEND_ARG_INFO(0, normalized) ++ZEND_END_ARG_INFO() ++ ++ZEND_BEGIN_ARG_INFO_EX(arginfo_Geometry_buffer, 0, 0, 1) ++ ZEND_ARG_INFO(0, dist) ++ ZEND_ARG_INFO(0, style) ++ZEND_END_ARG_INFO() ++ ++#ifdef HAVE_GEOS_OFFSET_CURVE ++#define arginfo_Geometry_offsetCurve arginfo_Geometry_buffer ++#endif ++ ++#define arginfo_Geometry_envelope arginfo_void ++ ++#define arginfo_Geometry_intersection arginfo_geom ++ ++#define arginfo_Geometry_convexHull arginfo_void ++ ++#define arginfo_Geometry_difference arginfo_geom ++ ++#define arginfo_Geometry_symDifference arginfo_geom ++ ++#define arginfo_Geometry_boundary arginfo_void ++ ++ZEND_BEGIN_ARG_INFO_EX(arginfo_Geometry_union, 0, 0, 0) ++ ZEND_ARG_INFO(0, geom) ++ZEND_END_ARG_INFO() ++ ++#define arginfo_Geometry_pointOnSurface arginfo_void ++ ++#define arginfo_Geometry_centroid arginfo_void ++ ++ZEND_BEGIN_ARG_INFO_EX(arginfo_Geometry_relate, 0, 0, 1) ++ ZEND_ARG_INFO(0, geom) ++ ZEND_ARG_INFO(0, pattern) ++ZEND_END_ARG_INFO() ++ ++#ifdef HAVE_GEOS_RELATE_BOUNDARY_NODE_RULE ++ZEND_BEGIN_ARG_INFO_EX(arginfo_Geometry_relateBoundaryNodeRule, 0, 0, 2) ++ ZEND_ARG_INFO(0, geom) ++ ZEND_ARG_INFO(0, rule) ++ZEND_END_ARG_INFO() ++#endif ++ ++ZEND_BEGIN_ARG_INFO_EX(arginfo_Geometry_simplify, 0, 0, 1) ++ ZEND_ARG_INFO(0, tolerance) ++ ZEND_ARG_INFO(0, preserveTopology) ++ZEND_END_ARG_INFO() ++ ++#define arginfo_Geometry_normalize arginfo_void ++ ++#ifdef HAVE_GEOS_GEOM_SET_PRECISION ++ZEND_BEGIN_ARG_INFO_EX(arginfo_Geometry_setPrecision, 0, 0, 1) ++ ZEND_ARG_INFO(0, gridsize) ++ ZEND_ARG_INFO(0, flags) ++ZEND_END_ARG_INFO() ++#endif ++ ++#ifdef HAVE_GEOS_GEOM_GET_PRECISION ++#define arginfo_Geometry_getPrecision arginfo_void ++#endif ++ ++#ifdef HAVE_GEOS_GEOM_EXTRACT_UNIQUE_POINTS ++#define arginfo_Geometry_extractUniquePoints arginfo_void ++#endif ++ ++#define arginfo_Geometry_disjoint arginfo_geom ++ ++#define arginfo_Geometry_touches arginfo_geom ++ ++#define arginfo_Geometry_intersects arginfo_geom ++ ++#define arginfo_Geometry_crosses arginfo_geom ++ ++#define arginfo_Geometry_within arginfo_geom ++ ++#define arginfo_Geometry_contains arginfo_geom ++ ++#define arginfo_Geometry_overlaps arginfo_geom ++ ++#ifdef HAVE_GEOS_COVERS ++#define arginfo_Geometry_covers arginfo_geom ++#endif ++ ++#ifdef HAVE_GEOS_COVERED_BY ++#define arginfo_Geometry_coveredBy arginfo_geom ++#endif ++ ++#define arginfo_Geometry_equals arginfo_geom ++ ++#define arginfo_Geometry_equalsExact arginfo_geom ++ ++#define arginfo_Geometry_isEmpty arginfo_void ++ ++#ifdef HAVE_GEOS_IS_VALID_DETAIL ++ZEND_BEGIN_ARG_INFO_EX(arginfo_Geometry_checkValidity, 0, 0, 0) ++ ZEND_ARG_INFO(0, flags) ++ZEND_END_ARG_INFO() ++#endif ++ ++#define arginfo_Geometry_isSimple arginfo_void ++ ++#define arginfo_Geometry_isRing arginfo_void ++ ++#define arginfo_Geometry_hasZ arginfo_void ++ ++ ++#ifdef HAVE_GEOS_IS_CLOSED ++#define arginfo_Geometry_isClosed arginfo_void ++#endif ++ ++#define arginfo_Geometry_typeName arginfo_void ++ ++#define arginfo_Geometry_typeId arginfo_void ++ ++#define arginfo_Geometry_getSRID arginfo_void ++ ++ZEND_BEGIN_ARG_INFO_EX(arginfo_Geometry_setSRID, 0, 0, 0) ++ ZEND_ARG_INFO(0, srid) ++ZEND_END_ARG_INFO() ++ ++#define arginfo_Geometry_numGeometries arginfo_void ++ ++#define arginfo_Geometry_geometryN arginfo_num ++ ++#define arginfo_Geometry_numInteriorRings arginfo_void ++ ++#ifdef HAVE_GEOS_GEOM_GET_NUM_POINTS ++#define arginfo_Geometry_numPoints arginfo_void ++#endif ++ ++#ifdef HAVE_GEOS_GEOM_GET_X ++#define arginfo_Geometry_getX arginfo_void ++#endif ++ ++#ifdef HAVE_GEOS_GEOM_GET_Y ++#define arginfo_Geometry_getY arginfo_void ++#endif ++ ++#define arginfo_Geometry_interiorRingN arginfo_num ++ ++#define arginfo_Geometry_exteriorRing arginfo_void ++ ++#define arginfo_Geometry_numCoordinates arginfo_void ++ ++#define arginfo_Geometry_dimension arginfo_void ++ ++#ifdef HAVE_GEOS_GEOM_GET_COORDINATE_DIMENSION ++#define arginfo_Geometry_coordinateDimension arginfo_void ++#endif ++ ++#ifdef HAVE_GEOS_GEOM_GET_POINT_N ++#define arginfo_Geometry_pointN arginfo_num ++#endif ++ ++#ifdef HAVE_GEOS_GEOM_GET_START_POINT ++#define arginfo_Geometry_startPoint arginfo_void ++#endif ++ ++#ifdef HAVE_GEOS_GEOM_GET_END_POINT ++#define arginfo_Geometry_endPoint arginfo_void ++#endif ++ ++#define arginfo_Geometry_area arginfo_void ++ ++#define arginfo_Geometry_length arginfo_void ++ ++#define arginfo_Geometry_distance arginfo_geom ++ ++#define arginfo_Geometry_hausdorffDistance arginfo_geom ++ ++#ifdef HAVE_GEOS_SNAP ++ZEND_BEGIN_ARG_INFO_EX(arginfo_Geometry_snapTo, 0, 0, 2) ++ ZEND_ARG_INFO(0, geom) ++ ZEND_ARG_INFO(0, tolerance) ++ZEND_END_ARG_INFO() ++#endif ++ ++#ifdef HAVE_GEOS_NODE ++#define arginfo_Geometry_node arginfo_void ++#endif ++ ++#ifdef HAVE_GEOS_DELAUNAY_TRIANGULATION ++ZEND_BEGIN_ARG_INFO_EX(arginfo_Geometry_delaunayTriangulation, 0, 0, 0) ++ ZEND_ARG_INFO(0, tolerance) ++ ZEND_ARG_INFO(0, edgeonly) ++ZEND_END_ARG_INFO() ++#endif ++ ++#ifdef HAVE_GEOS_VORONOI_DIAGRAM ++ZEND_BEGIN_ARG_INFO_EX(arginfo_Geometry_voronoiDiagram, 0, 0, 0) ++ ZEND_ARG_INFO(0, tolerance) ++ ZEND_ARG_INFO(0, edgeonly) ++ ZEND_ARG_INFO(0, extent) ++ZEND_END_ARG_INFO() ++#endif ++ ++#ifdef HAVE_GEOS_CLIP_BY_RECT ++ZEND_BEGIN_ARG_INFO_EX(arginfo_Geometry_clipByRect, 0, 0, 4) ++ ZEND_ARG_INFO(0, xmin) ++ ZEND_ARG_INFO(0, ymin) ++ ZEND_ARG_INFO(0, xmax) ++ ZEND_ARG_INFO(0, ymax) ++ZEND_END_ARG_INFO() ++#endif ++ ++/* GEOSWKBReader methods arginfo */ ++ ++#define arginfo_WKBReader_construct arginfo_void ++ ++ZEND_BEGIN_ARG_INFO_EX(arginfo_WKBReader_read, 0, 0, 1) ++ ZEND_ARG_INFO(0, wkb) ++ZEND_END_ARG_INFO() ++ ++#define arginfo_WKBReader_readHEX arginfo_WKBReader_read ++ ++/* GEOSWKTReader methods arginfo */ ++ ++#define arginfo_WKTReader_construct arginfo_void ++ ++ZEND_BEGIN_ARG_INFO_EX(arginfo_WKTReader_read, 0, 0, 1) ++ ZEND_ARG_INFO(0, wkt) ++ZEND_END_ARG_INFO() ++ ++/* GEOSWKTWriter methods arginfo */ ++ ++#define arginfo_WKTWriter_construct arginfo_void ++ ++#define arginfo_WKTWriter_write arginfo_geom ++ ++#ifdef HAVE_GEOS_WKT_WRITER_SET_TRIM ++#define arginfo_WKTWriter_setTrim arginfo_num ++#endif ++ ++#ifdef HAVE_GEOS_WKT_WRITER_SET_ROUNDING_PRECISION ++#define arginfo_WKTWriter_setRoundingPrecision arginfo_num ++#endif ++ ++#ifdef HAVE_GEOS_WKT_WRITER_SET_OUTPUT_DIMENSION ++#define arginfo_WKTWriter_setOutputDimension arginfo_num ++#endif ++ ++#ifdef HAVE_GEOS_WKT_WRITER_GET_OUTPUT_DIMENSION ++#define arginfo_WKTWriter_getOutputDimension arginfo_void ++#endif ++ ++#ifdef HAVE_GEOS_WKT_WRITER_SET_OLD_3D ++ZEND_BEGIN_ARG_INFO_EX(arginfo_WKTWriter_setOld3D, 0, 0, 1) ++ ZEND_ARG_INFO(0, bval) ++ZEND_END_ARG_INFO() ++#endif ++ ++/* GEOSWKTWriter methods arginfo */ ++ ++#define arginfo_WKBWriter_construct arginfo_void ++ ++#define arginfo_WKBWriter_getOutputDimension arginfo_void ++ ++#define arginfo_WKBWriter_setOutputDimension arginfo_num ++ ++#define arginfo_WKBWriter_getByteOrder arginfo_void ++ ++#define arginfo_WKBWriter_setByteOrder arginfo_num ++ ++#define arginfo_WKBWriter_setIncludeSRID arginfo_num ++ ++#define arginfo_WKBWriter_getIncludeSRID arginfo_void ++ ++#define arginfo_WKBWriter_write arginfo_geom ++ ++#define arginfo_WKBWriter_writeHEX arginfo_geom ++ + diff --git a/dev-php/geos-php/files/1.0.0/0004-fix-for-8.0.0RC1.patch b/dev-php/geos-php/files/1.0.0/0004-fix-for-8.0.0RC1.patch new file mode 100644 index 00000000000..97592903b6c --- /dev/null +++ b/dev-php/geos-php/files/1.0.0/0004-fix-for-8.0.0RC1.patch @@ -0,0 +1,25 @@ +From 37ede013e720aed2ab4e7ce33699a86dd0ef3730 Mon Sep 17 00:00:00 2001 +From: Remi Collet <remi@remirepo.net> +Date: Wed, 30 Sep 2020 09:17:54 +0200 +Subject: [PATCH 5/5] fix for 8.0.0RC1 + +--- + tests/003_WKTReader.phpt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tests/003_WKTReader.phpt b/tests/003_WKTReader.phpt +index fbd4fb1..e02d1c8 100644 +--- a/tests/003_WKTReader.phpt ++++ b/tests/003_WKTReader.phpt +@@ -100,7 +100,7 @@ class WKTReaderTest extends GEOSTest + $this->assertContains('expects exactly 1 parameter', + $e->getMessage()); + } catch (Error $e) { +- $this->assertContains('expects exactly 1 parameter', $e->getMessage()); ++ $this->assertContains('expects exactly 1', $e->getMessage()); + } + } + } +-- +2.25.4 + diff --git a/dev-php/geos-php/files/1.0.0/0005-fix-all-zend_parse_parameters-call-to-use-zend_long.patch b/dev-php/geos-php/files/1.0.0/0005-fix-all-zend_parse_parameters-call-to-use-zend_long.patch new file mode 100644 index 00000000000..14eae9d9079 --- /dev/null +++ b/dev-php/geos-php/files/1.0.0/0005-fix-all-zend_parse_parameters-call-to-use-zend_long.patch @@ -0,0 +1,123 @@ +From fcd7a35c1a9ca109fd50ee2660053423916b491b Mon Sep 17 00:00:00 2001 +From: Remi Collet <remi@remirepo.net> +Date: Fri, 28 Aug 2020 15:36:40 +0200 +Subject: [PATCH 2/2] fix all zend_parse_parameters call to use zend_long + +--- + geos.c | 23 ++++++++++++----------- + 1 file changed, 12 insertions(+), 11 deletions(-) + +diff --git a/geos.c b/geos.c +index ffa27b8..0437523 100755 +--- a/geos.c ++++ b/geos.c +@@ -78,6 +78,7 @@ PHP_FUNCTION(GEOSRelateMatch); + # define GEOS_PHP_ADD_ASSOC_ZVAL(a,k,v) add_assoc_zval((a), (k), (v)) + # define GEOS_PHP_HASH_GET_CUR_KEY(s,k,i) zend_hash_get_current_key((s), (k), (i), 0) + # define zend_string char ++# define zend_long long + # define ZSTR_VAL(x) (x) + # define GEOS_PHP_HASH_GET_CUR_DATA(h,d) zend_hash_get_current_data((h),(void**)&(d)) + # define GEOS_PHP_ZVAL zval ** +@@ -1281,7 +1282,7 @@ PHP_METHOD(Geometry, relateBoundaryNodeRule) + GEOSGeometry *other; + zval *zobj; + char* pat; +- long int bnr = GEOSRELATE_BNR_OGC; ++ zend_long bnr = GEOSRELATE_BNR_OGC; + char* retStr; + + this = (GEOSGeometry*)getRelay(getThis(), Geometry_ce_ptr); +@@ -1342,7 +1343,7 @@ PHP_METHOD(Geometry, setPrecision) + { + GEOSGeometry *this; + double gridSize; +- long int flags = 0; ++ zend_long flags = 0; + GEOSGeometry *ret; + + this = (GEOSGeometry*)getRelay(getThis(), Geometry_ce_ptr); +@@ -1756,7 +1757,7 @@ PHP_METHOD(Geometry, checkValidity) + zend_bool retBool; + char *reasonVal = NULL; + zval *locationVal = NULL; +- long int flags = 0; ++ zend_long flags = 0; + + this = (GEOSGeometry*)getRelay(getThis(), Geometry_ce_ptr); + +@@ -1929,7 +1930,7 @@ PHP_METHOD(Geometry, getSRID) + PHP_METHOD(Geometry, setSRID) + { + GEOSGeometry *geom; +- long int srid; ++ zend_long srid; + + geom = (GEOSGeometry*)getRelay(getThis(), Geometry_ce_ptr); + +@@ -1965,7 +1966,7 @@ PHP_METHOD(Geometry, geometryN) + GEOSGeometry *geom; + const GEOSGeometry *c; + GEOSGeometry *cc; +- long int num; ++ zend_long num; + + geom = (GEOSGeometry*)getRelay(getThis(), Geometry_ce_ptr); + +@@ -2064,7 +2065,7 @@ PHP_METHOD(Geometry, interiorRingN) + GEOSGeometry *geom; + const GEOSGeometry *c; + GEOSGeometry *cc; +- long int num; ++ zend_long num; + + geom = (GEOSGeometry*)getRelay(getThis(), Geometry_ce_ptr); + +@@ -2162,7 +2163,7 @@ PHP_METHOD(Geometry, pointN) + { + GEOSGeometry *geom; + GEOSGeometry *c; +- long int num; ++ zend_long num; + + geom = (GEOSGeometry*)getRelay(getThis(), Geometry_ce_ptr); + +@@ -2586,7 +2587,7 @@ PHP_METHOD(WKTWriter, setTrim) + PHP_METHOD(WKTWriter, setRoundingPrecision) + { + GEOSWKTWriter *writer; +- long int prec; ++ zend_long prec; + + writer = (GEOSWKTWriter*)getRelay(getThis(), WKTWriter_ce_ptr); + +@@ -2607,7 +2608,7 @@ PHP_METHOD(WKTWriter, setRoundingPrecision) + PHP_METHOD(WKTWriter, setOutputDimension) + { + GEOSWKTWriter *writer; +- long int dim; ++ zend_long dim; + + writer = (GEOSWKTWriter*)getRelay(getThis(), WKTWriter_ce_ptr); + +@@ -2752,7 +2753,7 @@ PHP_METHOD(WKBWriter, getOutputDimension) + PHP_METHOD(WKBWriter, setOutputDimension) + { + GEOSWKBWriter *writer; +- long int dim; ++ zend_long dim; + + writer = (GEOSWKBWriter*)getRelay(getThis(), WKBWriter_ce_ptr); + +@@ -2851,7 +2852,7 @@ PHP_METHOD(WKBWriter, getByteOrder) + PHP_METHOD(WKBWriter, setByteOrder) + { + GEOSWKBWriter *writer; +- long int dim; ++ zend_long dim; + + writer = (GEOSWKBWriter*)getRelay(getThis(), WKBWriter_ce_ptr); + +-- +2.25.4 + diff --git a/dev-php/geos-php/geos-php-1.0.0.ebuild b/dev-php/geos-php/geos-php-1.0.0-r1.ebuild index bcd0bc9fe03..e37462a2d19 100644 --- a/dev-php/geos-php/geos-php-1.0.0.ebuild +++ b/dev-php/geos-php/geos-php-1.0.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -6,7 +6,7 @@ PHP_EXT_NAME="geos" PHP_EXT_INI="yes" PHP_EXT_ZENDEXT="no" -USE_PHP="php5-6 php7-0 php7-1 php7-2 php7-3" +USE_PHP="php7-3 php7-4 php8-0" MY_PV="${PV/_/}" MY_PV="${MY_PV/rc/RC}" @@ -22,10 +22,15 @@ 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" -RESTRICT="!test? ( test )" RDEPEND="sci-libs/geos[-php(-)]" -DEPEND="sci-libs/geos[-php(-)] test? ( dev-php/phpunit )" +DEPEND="sci-libs/geos[-php(-)]" DOCS=( README.md CREDITS NEWS TODO ) +PATCHES=( "${FILESDIR}/${PV}" ) PHP_EXT_ECONF_ARGS=() + +src_prepare() { + # Test always fails with geos-3.8 or greater + rm "${S}/tests/001_Geometry.phpt" || die + php-ext-source-r3_src_prepare +} diff --git a/dev-php/igbinary/Manifest b/dev-php/igbinary/Manifest index efeea76c2b4..99d8c023c3d 100644 --- a/dev-php/igbinary/Manifest +++ b/dev-php/igbinary/Manifest @@ -1,2 +1,3 @@ DIST igbinary-3.1.5.tar.gz 216569 BLAKE2B 3aa453fc0669c331202f38d41a80fa34332033d272a7b6e523988923d84a1e93967e4d588ac32d4a2ac3ed5d0bc832bf0380293604f67350557628ecbcded91a SHA512 af0e473673e624635cad44a6f34aa2e4d655e8f2dc3df8a9e0cf9b241ef1f53c627edb508b5bb41c7f8925c2256a4a4d0b4c083227564212cb7747a810dfc83d DIST igbinary-3.1.6.tar.gz 220415 BLAKE2B 62bc77d5b3ecbccb9e928e30f33a598630d3ee9f394f4e78c0978b316d4dbc29656f98773e9ff6bd6b9cd4961f4e00c6c760b1a07234849736d4e0d9e3199d5b SHA512 55f7fd1a6e2a422cf04e944c4c15126167c4aab6d4f5f1e6af8be6c345ec6ff0c25d7ea8c023062bdd4882484cede155ea7a598666e4616985873a32a0a272d1 +DIST igbinary-3.2.1.tar.gz 227265 BLAKE2B 4eda60b49a2f1e3e822a0fbff8f23cd546517a51193f0f4f2d4646f99888552aad1877f80a67f0d655e0a51771c539efe5b0d8b5c8ce7d88c8403305dc7570df SHA512 fdab404eb6ab8e64c0d3b92c1c12e796a182a90084acc78a31a31dece62075d310d298c545d149d10b188f0467108a0429ee750747e073fa7fba752162b64eb4 diff --git a/dev-php/igbinary/igbinary-3.1.6-r1.ebuild b/dev-php/igbinary/igbinary-3.1.6-r1.ebuild new file mode 100644 index 00000000000..49b4f02bfb3 --- /dev/null +++ b/dev-php/igbinary/igbinary-3.1.6-r1.ebuild @@ -0,0 +1,26 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PHP_EXT_NAME="${PN}" +PHP_EXT_INI="yes" +PHP_EXT_ZENDEXT="no" +DOCS=( CREDITS NEWS README.md ) +PHP_EXT_ECONF_ARGS=( --enable-${PN} ) + +USE_PHP="php7-2 php7-3 php7-4 php8-0" + +inherit php-ext-source-r3 + +KEYWORDS="~amd64 ~arm ~arm64 ~x86" + +DESCRIPTION="A fast drop-in replacement for the standard PHP serialize" +HOMEPAGE="https://github.com/igbinary/igbinary" +SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +#IUSE="" + +#DEPEND="" +#RDEPEND="" diff --git a/dev-php/igbinary/igbinary-3.1.6.ebuild b/dev-php/igbinary/igbinary-3.1.6.ebuild index e50a7e5bec7..579c0d91867 100644 --- a/dev-php/igbinary/igbinary-3.1.6.ebuild +++ b/dev-php/igbinary/igbinary-3.1.6.ebuild @@ -12,7 +12,7 @@ USE_PHP="php7-1 php7-2 php7-3 php7-4" inherit php-ext-source-r3 -KEYWORDS="~amd64 ~arm ~arm64 ~x86" +KEYWORDS="amd64 arm arm64 x86" DESCRIPTION="A fast drop-in replacement for the standard PHP serialize" HOMEPAGE="https://github.com/igbinary/igbinary" diff --git a/dev-php/igbinary/igbinary-3.2.1.ebuild b/dev-php/igbinary/igbinary-3.2.1.ebuild new file mode 100644 index 00000000000..8dbeefb1a06 --- /dev/null +++ b/dev-php/igbinary/igbinary-3.2.1.ebuild @@ -0,0 +1,22 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PHP_EXT_NAME="${PN}" +PHP_EXT_INI="yes" +PHP_EXT_ZENDEXT="no" +DOCS=( CREDITS NEWS README.md ) +PHP_EXT_ECONF_ARGS=( --enable-${PN} ) + +USE_PHP="php7-3 php7-4 php8-0" + +inherit php-ext-source-r3 + +KEYWORDS="~amd64 ~arm ~arm64 ~x86" + +DESCRIPTION="A fast drop-in replacement for the standard PHP serialize" +HOMEPAGE="https://github.com/igbinary/igbinary" +SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" diff --git a/dev-php/jpgraph/jpgraph-4.0.2.ebuild b/dev-php/jpgraph/jpgraph-4.0.2.ebuild index f2141936daa..4a7a1f338b4 100644 --- a/dev-php/jpgraph/jpgraph-4.0.2.ebuild +++ b/dev-php/jpgraph/jpgraph-4.0.2.ebuild @@ -9,7 +9,7 @@ HOMEPAGE="http://jpgraph.net/" SRC_URI="https://dev.gentoo.org/~mjo/distfiles/${P}.tar.gz" LICENSE="QPL-1.0" SLOT="0" -KEYWORDS="~alpha amd64 hppa ppc sparc x86" +KEYWORDS="~alpha amd64 ~hppa ppc sparc x86" IUSE="truetype examples" DEPEND="" diff --git a/dev-php/jsonlint/jsonlint-1.8.2.ebuild b/dev-php/jsonlint/jsonlint-1.8.2.ebuild index aee6c195dba..222fedc3e9d 100644 --- a/dev-php/jsonlint/jsonlint-1.8.2.ebuild +++ b/dev-php/jsonlint/jsonlint-1.8.2.ebuild @@ -11,6 +11,7 @@ LICENSE="MIT" SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="test" +RESTRICT="!test? ( test )" RDEPEND=" dev-lang/php:* diff --git a/dev-php/myclabs-deepcopy/Manifest b/dev-php/myclabs-deepcopy/Manifest index 9a289591f76..e8f0bfcda22 100644 --- a/dev-php/myclabs-deepcopy/Manifest +++ b/dev-php/myclabs-deepcopy/Manifest @@ -1,3 +1,4 @@ +DIST myclabs-deepcopy-1.10.2.tar.gz 9770 BLAKE2B 17be538ad4916a96098dce908d569fdc9e7bf792a754e6e199f98f1a05855de5f8888712b5500a34b01107655a100daa44b82a7f49a6fa09d23319801dbb1f73 SHA512 8cdb0c96991817bba573c147bace161412bccbb1479f67441be709dedd06355b387bd0c39e699fb7b0f89b50b4c99e94187c1145193a1324a7ca6fa9dd0e33de 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 DIST myclabs-deepcopy-1.9.4.tar.gz 44812 BLAKE2B bdc273f55b082ccd728ce786bb573dec5e96427f1692e3f502e2ee7eddd804e9a1589efe1323e3961d2c4e2b210f597c1ba80bbd8fcedeca77a7440df8925fb1 SHA512 879ecc6409ecb21a90e87b8368f64fce57e692f0e2916fc341d55744c2663163d6bac70562c0d8a1a1a51a409121f5e5905979dbb9fd2842cda7f21cda33e50a diff --git a/dev-php/myclabs-deepcopy/metadata.xml b/dev-php/myclabs-deepcopy/metadata.xml index 1aeb42359b1..4398079e0ed 100644 --- a/dev-php/myclabs-deepcopy/metadata.xml +++ b/dev-php/myclabs-deepcopy/metadata.xml @@ -5,6 +5,7 @@ <email>php-bugs@gentoo.org</email> <name>PHP</name> </maintainer> + <stabilize-allarches/> <upstream> <remote-id type="github">myclabs/DeepCopy</remote-id> </upstream> diff --git a/dev-php/myclabs-deepcopy/myclabs-deepcopy-1.10.2.ebuild b/dev-php/myclabs-deepcopy/myclabs-deepcopy-1.10.2.ebuild new file mode 100644 index 00000000000..b178b2cb055 --- /dev/null +++ b/dev-php/myclabs-deepcopy/myclabs-deepcopy-1.10.2.ebuild @@ -0,0 +1,39 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +MY_PN="DeepCopy" + +DESCRIPTION="Create deep copies (clones) of your objects" +HOMEPAGE="https://github.com/myclabs/DeepCopy" +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 sparc x86" +IUSE="" + +BDEPEND="dev-php/theseer-Autoload" + +RDEPEND="dev-php/fedora-autoloader + >=dev-lang/php-7.1:*" + +S="${WORKDIR}/${MY_PN}-${PV}" + +src_prepare() { + default + + phpab \ + --output src/${MY_PN}/autoload.php \ + --template fedora2 \ + --basedir src/${MY_PN} \ + src || die +} + +src_install() { + insinto /usr/share/php/myclabs + doins -r src/* + + einstalldocs +} diff --git a/dev-php/myclabs-deepcopy/myclabs-deepcopy-1.6.0.ebuild b/dev-php/myclabs-deepcopy/myclabs-deepcopy-1.6.0.ebuild index f82af5c8af5..fa18a80f0e4 100644 --- a/dev-php/myclabs-deepcopy/myclabs-deepcopy-1.6.0.ebuild +++ b/dev-php/myclabs-deepcopy/myclabs-deepcopy-1.6.0.ebuild @@ -11,7 +11,7 @@ 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 sparc x86" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86" IUSE="" S="${WORKDIR}/${MY_PN}-${PV}" diff --git a/dev-php/pear/pear-1.10.1-r1.ebuild b/dev-php/pear/pear-1.10.1-r1.ebuild index 88fc33f6e0b..1f8d2b20214 100644 --- a/dev-php/pear/pear-1.10.1-r1.ebuild +++ b/dev-php/pear/pear-1.10.1-r1.ebuild @@ -3,7 +3,7 @@ EAPI=6 -KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86" DESCRIPTION="PEAR - PHP Extension and Application Repository" HOMEPAGE="https://pear.php.net/" diff --git a/dev-php/pecl-apcu/pecl-apcu-5.1.19.ebuild b/dev-php/pecl-apcu/pecl-apcu-5.1.19.ebuild index 2b180c6dc0d..374c3077b81 100644 --- a/dev-php/pecl-apcu/pecl-apcu-5.1.19.ebuild +++ b/dev-php/pecl-apcu/pecl-apcu-5.1.19.ebuild @@ -8,7 +8,7 @@ PHP_EXT_INI="yes" PHP_EXT_ZENDEXT="no" DOCS=( NOTICE README.md TECHNOTES.txt ) -USE_PHP="php7-1 php7-2 php7-3 php7-4" +USE_PHP="php7-2 php7-3 php7-4 php8-0" inherit php-ext-pecl-r3 diff --git a/dev-php/pecl-apcu_bc/pecl-apcu_bc-1.0.5.ebuild b/dev-php/pecl-apcu_bc/pecl-apcu_bc-1.0.5.ebuild index 79ea5781e4d..2ac07f3f2d2 100644 --- a/dev-php/pecl-apcu_bc/pecl-apcu_bc-1.0.5.ebuild +++ b/dev-php/pecl-apcu_bc/pecl-apcu_bc-1.0.5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -10,7 +10,7 @@ PHP_EXT_ZENDEXT="no" PHP_EXT_EXTRA_ECONF="" DOCS=( README.md ) -USE_PHP="php7-1 php7-2 php7-3 php7-4" +USE_PHP="php7-2 php7-3 php7-4" inherit php-ext-pecl-r3 multilib @@ -21,7 +21,7 @@ LICENSE="PHP-3.01" SLOT="0" IUSE="" -DEPEND=">=dev-php/pecl-apcu-5.1.18:7[php_targets_php7-1?,php_targets_php7-2?,php_targets_php7-3?,php_targets_php7-4?]" +DEPEND=">=dev-php/pecl-apcu-5.1.18:7[php_targets_php7-2(-)?,php_targets_php7-3(-)?,php_targets_php7-4(-)?]" RDEPEND="${DEPEND}" src_test() { diff --git a/dev-php/pecl-dbase/Manifest b/dev-php/pecl-dbase/Manifest index 4a0a8d238c6..0d3e3920193 100644 --- a/dev-php/pecl-dbase/Manifest +++ b/dev-php/pecl-dbase/Manifest @@ -1 +1,2 @@ DIST dbase-7.0.1.tgz 33588 BLAKE2B 50cc5b4e0096dbdd7067e9c05cb7b580ff5a9d548ec6acb8a777fa3ba62ac4fa06b30e040bdec2a77b87736cdd0684a662aab344db11806e6ca2c6824cee6908 SHA512 8aa743545e807773be6a3f74cd9ae686a982a5455e494ff2bc0e3fe6f1fdf25574702054253eaefc55a6e9529b3e70c8390a02bd317b74db17bfe6b7797d4ba2 +DIST dbase-7.1.0RC2.tgz 37029 BLAKE2B 93c011c428c4bc989481505fade25a6bd6f2841c32146b8efbaf67cbea4193b7362bf6dbb7dca382c607dd04f217f04dbdd529443e1b931f2149e7e32e30a6dd SHA512 dd3d0f67ffb1f8e8b7bd87f83f134d06cece225bcca52609e395771430d337632bbf1daff2a7db25dd163e3707db9ca2aaebace359c5f95a52debb1ceaefb379 diff --git a/dev-php/pecl-dbase/pecl-dbase-7.0.1.ebuild b/dev-php/pecl-dbase/pecl-dbase-7.0.1.ebuild index 43d998a62c3..e39dbd9f0ad 100644 --- a/dev-php/pecl-dbase/pecl-dbase-7.0.1.ebuild +++ b/dev-php/pecl-dbase/pecl-dbase-7.0.1.ebuild @@ -1,17 +1,12 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" -# 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 php7-3 php7-4" +USE_PHP="php7-2 php7-3 php7-4" 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 php7-3 php7-4" - KEYWORDS="~amd64 ~x86" DESCRIPTION="dBase database file access functions" @@ -20,25 +15,5 @@ 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 || use php_targets_php7-3 || use php_targets_php7-4 ; 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 || use php_targets_php7-3 || use php_targets_php7-4 ; 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 || use php_targets_php7-3 || use php_targets_php7-4 ; then - php-ext-pecl-r3_src_install - fi -} +RDEPEND="${DEPEND}" +PHP_EXT_ECONF_ARGS=( ) diff --git a/dev-php/pecl-dbase/pecl-dbase-7.1.0_rc2.ebuild b/dev-php/pecl-dbase/pecl-dbase-7.1.0_rc2.ebuild new file mode 100644 index 00000000000..86cf3a4e390 --- /dev/null +++ b/dev-php/pecl-dbase/pecl-dbase-7.1.0_rc2.ebuild @@ -0,0 +1,24 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +USE_PHP="php7-2 php7-3 php7-4 php8-0" + +MY_PV="${PV/_rc/RC}" +PHP_EXT_PECL_FILENAME="dbase-${MY_PV}.tgz" + +inherit php-ext-pecl-r3 + +KEYWORDS="~amd64 ~x86" + +DESCRIPTION="dBase database file access functions" +LICENSE="PHP-3.01" +SLOT="7" +IUSE="" + +DEPEND="" +RDEPEND="${DEPEND}" + +S="${WORKDIR}/${PHP_EXT_PECL_FILENAME%.tgz}" +PHP_EXT_S="${S}" diff --git a/dev-php/pecl-dio/Manifest b/dev-php/pecl-dio/Manifest index ba26a871bd8..e2cd6c2e2e7 100644 --- a/dev-php/pecl-dio/Manifest +++ b/dev-php/pecl-dio/Manifest @@ -1,2 +1 @@ -DIST dio-0.1.0.tgz 36960 BLAKE2B 0a2c1fd6289cc9606c44c81216ce8d0f63d4bbddfae554e65499f586f5aa17f419a048e97723ff365407260740d28e36ec5dae8a45e18422a7bd900ec88b60fd SHA512 6fca1c3f2d6247f5e0c52a27b49d80a6d13f9630772956ff7aa73ad45e445686502edd956346c43955cb2f858c0c0259af86c3f92b6f93309a2b90583ad8ea05 DIST dio-0.2.0.tgz 37328 BLAKE2B e7ad6be1a4c957c155753e834d79f51b985578a03781ddbc66f05961dc270d58b20abcc74c64a0e9744d5cfbb6e545c1a7ac2bc1d54009c74f26bf786587ef49 SHA512 172c2a2a84d348d684d84ca94f23b767952461ca848cd114e899ea3fd39503a35ac0624a2a774b9dc6fd2d463d3f6aa6937e780e2faa6a0955a8594aad27ec8b diff --git a/dev-php/pecl-dio/pecl-dio-0.1.0-r1.ebuild b/dev-php/pecl-dio/pecl-dio-0.2.0-r1.ebuild index 7d9f4db0e72..cb33182010a 100644 --- a/dev-php/pecl-dio/pecl-dio-0.1.0-r1.ebuild +++ b/dev-php/pecl-dio/pecl-dio-0.2.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -7,7 +7,7 @@ PHP_EXT_NAME="dio" PHP_EXT_INI="yes" PHP_EXT_ZENDEXT="no" -USE_PHP="php5-6 php7-1 php7-2 php7-3 php7-4" +USE_PHP="php7-3 php7-4 php8-0" MY_PV=${PV/_rc/RC} PHP_EXT_S="${WORKDIR}/${PN/pecl-/}-${MY_PV}" diff --git a/dev-php/pecl-dio/pecl-dio-0.2.0.ebuild b/dev-php/pecl-dio/pecl-dio-0.2.0.ebuild deleted file mode 100644 index 38453c8973f..00000000000 --- a/dev-php/pecl-dio/pecl-dio-0.2.0.ebuild +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -PHP_EXT_NAME="dio" -PHP_EXT_INI="yes" -PHP_EXT_ZENDEXT="no" - -USE_PHP="php5-6 php7-1 php7-2 php7-3 php7-4" - -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-geoip/files/php8-support-1.1.1.patch b/dev-php/pecl-geoip/files/php8-support-1.1.1.patch new file mode 100644 index 00000000000..50c53d1a94a --- /dev/null +++ b/dev-php/pecl-geoip/files/php8-support-1.1.1.patch @@ -0,0 +1,93 @@ +--- a/geoip.c 2020/10/30 12:04:28 351081 ++++ b/geoip.c 2020/10/30 12:51:07 351082 +@@ -34,41 +34,72 @@ + #include "ext/standard/info.h" + #include "php_geoip.h" + +- ++/* For PHP 8 */ ++#ifndef TSRMLS_CC ++#define TSRMLS_CC ++#endif + + ZEND_DECLARE_MODULE_GLOBALS(geoip) + ++ZEND_BEGIN_ARG_INFO_EX(arginfo_geoip_void, 0, 0, 0) ++ZEND_END_ARG_INFO() ++ ++ZEND_BEGIN_ARG_INFO_EX(arginfo_geoip_database_opt, 0, 0, 0) ++ ZEND_ARG_INFO(0, database) ++ZEND_END_ARG_INFO() ++ ++ZEND_BEGIN_ARG_INFO_EX(arginfo_geoip_database, 0, 0, 1) ++ ZEND_ARG_INFO(0, database) ++ZEND_END_ARG_INFO() ++ ++ZEND_BEGIN_ARG_INFO_EX(arginfo_geoip_host, 0, 0, 1) ++ ZEND_ARG_INFO(0, host) ++ZEND_END_ARG_INFO() ++ ++ZEND_BEGIN_ARG_INFO_EX(arginfo_geoip_region, 0, 0, 2) ++ ZEND_ARG_INFO(0, country_code) ++ ZEND_ARG_INFO(0, region_code) ++ZEND_END_ARG_INFO() ++ ++ZEND_BEGIN_ARG_INFO_EX(arginfo_geoip_directory, 0, 0, 1) ++ ZEND_ARG_INFO(0, directory) ++ZEND_END_ARG_INFO() ++ + static int le_geoip; + + /* {{{ */ + zend_function_entry geoip_functions[] = { +- PHP_FE(geoip_database_info, NULL) ++ PHP_FE(geoip_database_info, arginfo_geoip_database_opt) + #define GEOIPDEF(php_func, c_func, db_type) \ +- PHP_FE(php_func, NULL) ++ PHP_FE(php_func, arginfo_geoip_host) + #include "geoip.def" + #undef GEOIPDEF +- PHP_FE(geoip_continent_code_by_name, NULL) +- PHP_FE(geoip_org_by_name, NULL) +- PHP_FE(geoip_record_by_name, NULL) +- PHP_FE(geoip_id_by_name, NULL) +- PHP_FE(geoip_region_by_name, NULL) +- PHP_FE(geoip_isp_by_name, NULL) +- PHP_FE(geoip_db_avail, NULL) +- PHP_FE(geoip_db_get_all_info, NULL) +- PHP_FE(geoip_db_filename, NULL) ++ PHP_FE(geoip_continent_code_by_name, arginfo_geoip_host) ++ PHP_FE(geoip_org_by_name, arginfo_geoip_host) ++ PHP_FE(geoip_record_by_name, arginfo_geoip_host) ++ PHP_FE(geoip_id_by_name, arginfo_geoip_host) ++ PHP_FE(geoip_region_by_name, arginfo_geoip_host) ++ PHP_FE(geoip_isp_by_name, arginfo_geoip_host) ++ PHP_FE(geoip_db_avail, arginfo_geoip_database) ++ PHP_FE(geoip_db_get_all_info, arginfo_geoip_void) ++ PHP_FE(geoip_db_filename, arginfo_geoip_database) + #if LIBGEOIP_VERSION >= 1004001 +- PHP_FE(geoip_region_name_by_code, NULL) +- PHP_FE(geoip_time_zone_by_country_and_region, NULL) ++ PHP_FE(geoip_region_name_by_code, arginfo_geoip_region) ++ PHP_FE(geoip_time_zone_by_country_and_region, arginfo_geoip_region) + #endif + #ifdef HAVE_CUSTOM_DIRECTORY +- PHP_FE(geoip_setup_custom_directory, NULL) ++ PHP_FE(geoip_setup_custom_directory, arginfo_geoip_directory) + #endif +- PHP_FE(geoip_asnum_by_name, NULL) +- PHP_FE(geoip_domain_by_name, NULL) ++ PHP_FE(geoip_asnum_by_name, arginfo_geoip_host) ++ PHP_FE(geoip_domain_by_name, arginfo_geoip_host) + #if LIBGEOIP_VERSION >= 1004008 +- PHP_FE(geoip_netspeedcell_by_name, NULL) ++ PHP_FE(geoip_netspeedcell_by_name, arginfo_geoip_host) + #endif ++#ifdef PHP_FE_END ++ PHP_FE_END ++#else + {NULL, NULL, NULL} ++#endif + }; + /* }}} */ + 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 index 956d2192df6..9b8d00516a8 100644 --- a/dev-php/pecl-geoip/pecl-geoip-1.1.1-r4.ebuild +++ b/dev-php/pecl-geoip/pecl-geoip-1.1.1-r4.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # 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 php7-3 php7-4" +USE_PHP="php7-2 php7-3 php7-4" inherit php-ext-pecl-r3 diff --git a/dev-php/pecl-geoip/pecl-geoip-1.1.1-r5.ebuild b/dev-php/pecl-geoip/pecl-geoip-1.1.1-r5.ebuild new file mode 100644 index 00000000000..f5bbf1f2403 --- /dev/null +++ b/dev-php/pecl-geoip/pecl-geoip-1.1.1-r5.ebuild @@ -0,0 +1,25 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PHP_EXT_NAME="geoip" +DOCS="README ChangeLog" +USE_PHP="php7-2 php7-3 php7-4 php8-0" + +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" + "${FILESDIR}/php8-support-1.1.1.patch" +) diff --git a/dev-php/pecl-http/Manifest b/dev-php/pecl-http/Manifest index ae6d032c2f2..eb018948dc4 100644 --- a/dev-php/pecl-http/Manifest +++ b/dev-php/pecl-http/Manifest @@ -1,2 +1,3 @@ DIST pecl_http-3.2.1.tgz 221244 BLAKE2B b6581829fb8a800e24ccedd4d0f3efbaf558850bdc356d27a6e1d1097a8e2cfc61963a1daccd1d0f269a7cef5b243d45cdfaff5138321fe20df615dde44d19e3 SHA512 e67d4b32ba6f524e3fcf65f5497b94275e1a4a14fce97c57afe366369f368b3acdbedf364ed73cf983fb2c5f57f498adaa1100e7c936f11cbc5de1caedad7b51 DIST pecl_http-3.2.3.tgz 220204 BLAKE2B 2a712dc8f69a8a80f6f8c306883df580fdff4a0d4cb0ac06cc004f8622b30b8e2f5d373276381fd3ad67657a80cc929be81745f200a98b6ed5e475de5639dfc5 SHA512 e955e3246db9a9172081dd9a077154139c585bfce546e91839052bbab4d0db9d0695122574a66891ceba5c0b7e8a8f0768274e1516521ccb95cd19504dc13666 +DIST pecl_http-4.0.0beta1.tgz 219277 BLAKE2B 184ea0a92fc514f24fd31aaec7824ba80293a52d168d11b3b3a9cea410df1bc9a6a819c45f301b357a3d19246e3c36b56f238c264579509eadf00fb42ae32d91 SHA512 d3e487d10e18e8af1a750d171e4432dd30562e1fb8d8ae7cbb33a379e3d385d27a6ce1896ed8f727802eae1045505254cb68840395098310e22f6dc640c5c616 diff --git a/dev-php/pecl-http/pecl-http-3.2.3-r1.ebuild b/dev-php/pecl-http/pecl-http-3.2.3-r1.ebuild new file mode 100644 index 00000000000..209edf1ed14 --- /dev/null +++ b/dev-php/pecl-http/pecl-http-3.2.3-r1.ebuild @@ -0,0 +1,72 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +PHP_EXT_NAME="http" +PHP_EXT_PECL_PKG="pecl_http" +PHP_EXT_INI="yes" +PHP_EXT_ZENDEXT="no" +PHP_INI_NAME="50-http" + +USE_PHP="php7-2 php7-3 php7-4 php8-0" + +inherit php-ext-pecl-r3 + +USE_PHP="php7-2 php7-3 php7-4" + +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" + +COMMON_DEPEND="app-arch/brotli:= + dev-libs/libevent + dev-php/pecl-propro:7[php_targets_php7-2(-)?,php_targets_php7-3(-)?,php_targets_php7-4(-)?] + >=dev-php/pecl-raphf-2.0.1:7[php_targets_php7-2(-)?,php_targets_php7-3(-)?,php_targets_php7-4(-)?] + 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] ) +" +DEPEND=" + php_targets_php7-2? ( ${COMMON_DEPEND} dev-lang/php:7.2[hash,session,iconv] ) + php_targets_php7-3? ( ${COMMON_DEPEND} dev-lang/php:7.3[hash,session,iconv] ) + php_targets_php7-4? ( ${COMMON_DEPEND} dev-lang/php:7.4[session,iconv] )" +RDEPEND="${DEPEND} + php_targets_php8-0? ( dev-php/pecl-http:8[php_targets_php8-0(-)] )" + +PHP_EXT_ECONF_ARGS=( --with-http --without-http-shared-deps --without-http-libidn-dir ) + +src_prepare() { + if use php_targets_php7-2 || use php_targets_php7-3 || use php_targets_php7-4 ; then + php-ext-source-r3_src_prepare + else + default_src_prepare + fi +} + +src_install() { + if use php_targets_php7-2 || use php_targets_php7-3 || use php_targets_php7-4 ; 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 + SKIP_ONLINE_TESTS=yes NO_INTERACTION="yes" emake test + # Clean up testing links + rm modules/propro.so modules/raphf.so || die + done +} diff --git a/dev-php/pecl-http/pecl-http-4.0.0_beta1.ebuild b/dev-php/pecl-http/pecl-http-4.0.0_beta1.ebuild new file mode 100644 index 00000000000..af5bbf3e0b5 --- /dev/null +++ b/dev-php/pecl-http/pecl-http-4.0.0_beta1.ebuild @@ -0,0 +1,70 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +PHP_EXT_NAME="http" +PHP_EXT_PECL_PKG="pecl_http" +PHP_EXT_INI="yes" +PHP_EXT_ZENDEXT="no" +PHP_INI_NAME="50-http" + +USE_PHP="php7-2 php7-3 php7-4 php8-0" + +inherit php-ext-pecl-r3 + +USE_PHP="php8-0" + +KEYWORDS="~amd64 ~x86" + +DESCRIPTION="Extended HTTP Support for PHP" +LICENSE="BSD-2 MIT" +SLOT="8" +IUSE="ssl curl_ssl_gnutls curl_ssl_libressl curl_ssl_nss +curl_ssl_openssl" + +COMMON_DEPEND="app-arch/brotli:= + dev-libs/libevent + >=dev-php/pecl-raphf-2.0.1:7[php_targets_php8-0(-)?] + net-dns/libidn2 + sys-libs/zlib + ssl? ( net-misc/curl[ssl,curl_ssl_gnutls=,curl_ssl_libressl=,curl_ssl_nss=,curl_ssl_openssl=] ) + !ssl? ( net-misc/curl[-ssl] ) +" +DEPEND=" + php_targets_php8-0? ( ${COMMON_DEPEND} dev-lang/php:8.0[session,iconv] )" +RDEPEND="${DEPEND} + php_targets_php7-2? ( dev-php/pecl-http:7[php_targets_php7-2(-)] ) + php_targets_php7-3? ( dev-php/pecl-http:7[php_targets_php7-3(-)] ) + php_targets_php7-4? ( dev-php/pecl-http:7[php_targets_php7-4(-)] )" + +PHP_EXT_ECONF_ARGS=( --with-http --without-http-shared-deps --without-http-libidn-dir ) + +src_prepare() { + if use php_targets_php8-0 ; then + php-ext-source-r3_src_prepare + else + default_src_prepare + fi +} + +src_install() { + if use php_targets_php8-0 ; then + php-ext-pecl-r3_src_install + fi +} + +src_test() { + # Cannot use eclass function due to required modules + # All tests SKIP otherwise + for slot in $(php_get_slots); do + php_init_slot_env "${slot}" + # Link in required modules for testing + ln -s "${EXT_DIR}/raphf.so" "modules/raphf.so" || die + sed -i \ + 's/PHP_TEST_SHARED_EXTENSIONS)/PHP_TEST_SHARED_EXTENSIONS) -d extension=raphf/' \ + Makefile || die + SKIP_ONLINE_TESTS=yes NO_INTERACTION="yes" emake test + # Clean up testing links + rm modules/raphf.so || die + done +} diff --git a/dev-php/pecl-lzf/Manifest b/dev-php/pecl-lzf/Manifest index 2383f03c4d7..f9ab9348d2e 100644 --- a/dev-php/pecl-lzf/Manifest +++ b/dev-php/pecl-lzf/Manifest @@ -1,2 +1 @@ -DIST LZF-1.6.7.tgz 17999 BLAKE2B c7ee3049d7bcc862a400edf56e19745667052c32b2d3faaa26cb55f811e6721b7140446e676467fa5cee3ea87a751b6b0a2a9c6df203227d1bd29f31842e8514 SHA512 920a7d3bd0f0c9f1019a3180e38482ead24610a4a235d967d1f4010101e6f777a2450d517f2d3440edb45bb6a7f6d1012124b1b59aa7c34f9a17fdc93613acab DIST LZF-1.6.8.tgz 18071 BLAKE2B 83a12c44c02145baac75bc7b5172b09a6a15d4d02852f25d56ea97cf58a83709d59d56cb12be7df510fd687fd5ade760939527ee8151d3ecdb4407b7be2022e3 SHA512 c35543a40b2b44da4bd60e3142ba6ecf33e3460a8ea9f4f7fe6cdc4d728048593b33c423195d58707355975d655f614249642aff2d9b810af0e6a34d42fa1c43 diff --git a/dev-php/pecl-lzf/pecl-lzf-1.6.7.ebuild b/dev-php/pecl-lzf/pecl-lzf-1.6.7.ebuild deleted file mode 100644 index 192a06e95b0..00000000000 --- a/dev-php/pecl-lzf/pecl-lzf-1.6.7.ebuild +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PHP_EXT_NAME="lzf" -PHP_EXT_PECL_PKG="LZF" -PHP_EXT_INI="yes" -PHP_EXT_ZENDEXT="no" -USE_PHP="php5-6 php7-1 php7-2 php7-3 php7-4" - -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-lzf/pecl-lzf-1.6.8.ebuild b/dev-php/pecl-lzf/pecl-lzf-1.6.8-r1.ebuild index 15525c812da..2cce616bb3d 100644 --- a/dev-php/pecl-lzf/pecl-lzf-1.6.8.ebuild +++ b/dev-php/pecl-lzf/pecl-lzf-1.6.8-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -7,7 +7,7 @@ PHP_EXT_NAME="lzf" PHP_EXT_PECL_PKG="LZF" PHP_EXT_INI="yes" PHP_EXT_ZENDEXT="no" -USE_PHP="php5-6 php7-1 php7-2 php7-3 php7-4" +USE_PHP="php7-3 php7-4 php8-0" inherit php-ext-pecl-r3 diff --git a/dev-php/pecl-mailparse/pecl-mailparse-3.1.1.ebuild b/dev-php/pecl-mailparse/pecl-mailparse-3.1.1.ebuild index cb73196e10c..68fd925dfe8 100644 --- a/dev-php/pecl-mailparse/pecl-mailparse-3.1.1.ebuild +++ b/dev-php/pecl-mailparse/pecl-mailparse-3.1.1.ebuild @@ -8,7 +8,7 @@ PHP_EXT_NAME="mailparse" PHP_EXT_INI="yes" PHP_EXT_ZENDEXT="no" PHP_EXT_ECONF_ARGS="" -USE_PHP="php7-1 php7-2 php7-3 php7-4" +USE_PHP="php7-2 php7-3 php7-4 php8-0" PHP_EXT_NEEDED_USE="unicode" DOCS=( README.md ) @@ -20,9 +20,3 @@ DESCRIPTION="PHP extension for parsing and working with RFC822 and MIME complian LICENSE="PHP-3.01" SLOT="7" IUSE="" - -src_prepare() { - # Missing test source files in archive. Fixed upstream in next release. - rm tests/011.phpt tests/bug001.phpt || die - php-ext-source-r3_src_prepare -} diff --git a/dev-php/pecl-mcrypt/pecl-mcrypt-1.0.3.ebuild b/dev-php/pecl-mcrypt/pecl-mcrypt-1.0.3.ebuild index 540f56f2fa1..f2c29f73458 100644 --- a/dev-php/pecl-mcrypt/pecl-mcrypt-1.0.3.ebuild +++ b/dev-php/pecl-mcrypt/pecl-mcrypt-1.0.3.ebuild @@ -15,7 +15,7 @@ inherit php-ext-pecl-r3 DESCRIPTION="Bindings for the libmcrypt library" LICENSE="PHP-3.01" SLOT="0" -KEYWORDS="amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86" DEPEND="dev-libs/libmcrypt" RDEPEND="${DEPEND}" diff --git a/dev-php/pecl-memcached/Manifest b/dev-php/pecl-memcached/Manifest index 042f38e9b17..64f9f062d02 100644 --- a/dev-php/pecl-memcached/Manifest +++ b/dev-php/pecl-memcached/Manifest @@ -1,2 +1 @@ -DIST memcached-3.1.3.tgz 82673 BLAKE2B ccb9267cbd974337b7cd8836ab6e35c4fd9398d731dcd333bcb664b91037d1775651e6bb5d00b602767834681289064ede678ea2e6e3641631bba4990a380dee SHA512 9c09648c26011c5e749bee1a556c976e6e5e648dc65580e7caa296dab79e3764edf1408f96edcaca5efb0229320c86fcfa0422e55d486beb6466892f7e08c4a3 DIST memcached-3.1.5.tgz 83015 BLAKE2B 80f5cbed8e34f867962792d95d242015690f64ab3b462e09813a11b8b86234b0b05b0f6a78f7c6184482b66ba8015064b37f77bbb816a3aee2edd0ce97ab0cbc SHA512 87d5fd079fcaad81139785d6766da71b23a1a0fe907d4b22f3a787af148a20412c11df11c4d98c165241658baf0d87c8a6b29de15db07a0f9d1fabc8aec8f0e9 diff --git a/dev-php/pecl-memcached/pecl-memcached-3.1.3-r1.ebuild b/dev-php/pecl-memcached/pecl-memcached-3.1.3-r1.ebuild deleted file mode 100644 index 755ce7ed1ad..00000000000 --- a/dev-php/pecl-memcached/pecl-memcached-3.1.3-r1.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# 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-1 php7-2 php7-3" # Pretend to support all four targets... -inherit php-ext-pecl-r3 -USE_PHP="php7-1 php7-2 php7-3" # But only truly build for these three. - -DESCRIPTION="Interface PHP with memcached via libmemcached library" -LICENSE="PHP-3" -SLOT="7" -KEYWORDS="amd64 ~arm ~arm64 x86" -IUSE="igbinary json sasl +session test" -RESTRICT="!test? ( test )" - -COMMON_DEPEND=">=dev-libs/libmemcached-1.0.14[sasl?] - sys-libs/zlib -" - -RDEPEND=" - php_targets_php7-1? ( - ${COMMON_DEPEND} dev-lang/php:7.1[session?,json?] - igbinary? ( dev-php/igbinary[php_targets_php7-1(-)] ) - ) - php_targets_php7-2? ( - ${COMMON_DEPEND} dev-lang/php:7.2[session?,json?] - igbinary? ( dev-php/igbinary[php_targets_php7-2(-)] ) - ) - php_targets_php7-3? ( - ${COMMON_DEPEND} dev-lang/php:7.3[session?,json?] - igbinary? ( dev-php/igbinary[php_targets_php7-3(-)] ) - )" -DEPEND="${RDEPEND} test? ( net-misc/memcached )" -RDEPEND="${RDEPEND} php_targets_php5-6? ( dev-php/pecl-memcached:0[php_targets_php5-6(-)] )" - -src_prepare() { - if use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3 ; then - php-ext-source-r3_src_prepare - else - default_src_prepare - fi -} - -src_configure() { - local PHP_EXT_ECONF_ARGS="--enable-memcached - $(use_enable session memcached-session) - $(use_enable sasl memcached-sasl) - $(use_enable json memcached-json) - $(use_enable igbinary memcached-igbinary)" - - php-ext-source-r3_src_configure -} - -src_test() { - if use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3 ; then - local memcached_opts=( -d -P "${T}/memcached.pid" -p 11211 -l 127.0.0.1 ) - [[ ${EUID} == 0 ]] && memcached_opts+=( -u portage ) - memcached "${memcached_opts[@]}" || die "Can't start memcached test server" - - local exit_status - php-ext-source-r3_src_test - exit_status=$? - - kill "$(<"${T}/memcached.pid")" - return ${exit_status} - fi -} - -src_install() { - if use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3 ; then - php-ext-source-r3_src_install - fi -} diff --git a/dev-php/pecl-memcached/pecl-memcached-3.1.5-r1.ebuild b/dev-php/pecl-memcached/pecl-memcached-3.1.5-r1.ebuild index b96743374b3..281bbb0a15f 100644 --- a/dev-php/pecl-memcached/pecl-memcached-3.1.5-r1.ebuild +++ b/dev-php/pecl-memcached/pecl-memcached-3.1.5-r1.ebuild @@ -11,7 +11,7 @@ inherit php-ext-pecl-r3 DESCRIPTION="Interface PHP with memcached via libmemcached library" LICENSE="PHP-3.01" SLOT="7" -KEYWORDS="~amd64 ~arm ~arm64 ~x86" +KEYWORDS="amd64 arm arm64 x86" IUSE="igbinary json sasl +session test" RESTRICT="!test? ( test )" diff --git a/dev-php/pecl-oauth/pecl-oauth-2.0.7.ebuild b/dev-php/pecl-oauth/pecl-oauth-2.0.7.ebuild index 18221a56290..775332d83c5 100644 --- a/dev-php/pecl-oauth/pecl-oauth-2.0.7.ebuild +++ b/dev-php/pecl-oauth/pecl-oauth-2.0.7.ebuild @@ -6,7 +6,7 @@ PHP_EXT_NAME="oauth" PHP_EXT_INI="yes" PHP_EXT_ZENDEXT="no" -USE_PHP="php7-2 php7-3 php7-4" +USE_PHP="php7-2 php7-3 php7-4 php8-0" inherit php-ext-pecl-r3 @@ -17,12 +17,11 @@ LICENSE="BSD" SLOT="7" IUSE="+curl examples" -DEPEND="php_targets_php7-2? ( dev-lang/php:7.2[hash(-)] - dev-libs/libpcre:3= curl? ( net-misc/curl:0= ) ) - php_targets_php7-3? ( dev-lang/php:7.3[hash(-)] - dev-libs/libpcre:3= curl? ( net-misc/curl:0= ) ) - php_targets_php7-4? ( - dev-libs/libpcre:3= curl? ( net-misc/curl:0= ) ) +DEPEND=" + dev-libs/libpcre:3= + curl? ( net-misc/curl:0= ) + php_targets_php7-2? ( dev-lang/php:7.2[hash(-)] ) + php_targets_php7-3? ( dev-lang/php:7.3[hash(-)] ) " RDEPEND="${DEPEND}" 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-r3.ebuild index a18ff95d221..467867d6f62 100644 --- a/dev-php/pecl-radius/pecl-radius-1.4.0_beta1-r2.ebuild +++ b/dev-php/pecl-radius/pecl-radius-1.4.0_beta1-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -7,7 +7,7 @@ PHP_EXT_NAME="radius" PHP_EXT_INI="yes" PHP_EXT_ZENDEXT="no" -USE_PHP="php5-6 php7-1 php7-2 php7-3 php7-4" +USE_PHP="php7-2 php7-3 php7-4" PHP_EXT_PECL_FILENAME="${PN/pecl-/}-${PV/_beta/b}.tgz" PHP_EXT_S="${WORKDIR}/${PHP_EXT_PECL_FILENAME%.tgz}" @@ -18,14 +18,14 @@ KEYWORDS="~amd64 ~x86" DESCRIPTION="Provides support for RADIUS authentication (RFC 2865) and accounting (RFC 2866)" LICENSE="BSD" SLOT="0" -IUSE="examples" +IUSE="examples test" +RESTRICT="!test? ( test )" S="${PHP_EXT_S}" RDEPEND=" - php_targets_php5-6? ( dev-lang/php:5.6[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_php7-3? ( dev-lang/php:7.3[pcntl,sockets] ) - php_targets_php7-4? ( dev-lang/php:7.3[pcntl,sockets] ) + php_targets_php7-2? ( dev-lang/php:7.2[pcntl(-),sockets(-)] ) + php_targets_php7-3? ( dev-lang/php:7.3[pcntl(-),sockets(-)] ) + php_targets_php7-4? ( dev-lang/php:7.4[pcntl(-),sockets(-)] ) " +DEPEND="test? ( ${RDEPEND} )" diff --git a/dev-php/pecl-raphf/pecl-raphf-2.0.1-r1.ebuild b/dev-php/pecl-raphf/pecl-raphf-2.0.1-r1.ebuild new file mode 100644 index 00000000000..7c2efe5219c --- /dev/null +++ b/dev-php/pecl-raphf/pecl-raphf-2.0.1-r1.ebuild @@ -0,0 +1,21 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +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="php7-2 php7-3 php7-4 php8-0" + +inherit php-ext-pecl-r3 + +KEYWORDS="~amd64 ~x86" + +DESCRIPTION="A reusable, persistent handle and resource factory API" +LICENSE="BSD-2" +SLOT="7" +IUSE="" diff --git a/dev-php/pecl-redis/Manifest b/dev-php/pecl-redis/Manifest index 8c535e0f2cd..076440f978b 100644 --- a/dev-php/pecl-redis/Manifest +++ b/dev-php/pecl-redis/Manifest @@ -2,3 +2,4 @@ DIST redis-5.1.1.tgz 245205 BLAKE2B b7177be5282b081562a446b1b37c7b46ba0ef382e55f DIST redis-5.2.1.tgz 251570 BLAKE2B 297d6130469735a53f6dfb6ffea8c7c813363099eb76f25619f0cbb05cd06f5ecad9c0f30c370e33985523cf26488cf133aa0a48a99075bc6d5796309e3d914d SHA512 de90bf65cce0cb8c5ea28415e4f7bfff23c8bb3dc96ddca3158f94be2e4bd051e13ec3f34429b0e8ceb436096520e3998f544f377d5ef7d4d1df4edba7f66bc2 DIST redis-5.2.2.tgz 251629 BLAKE2B e6ca740412dd1ba4ee960e1c71b3f75ebb1a1e2605bc93159395c657ab61eda4c8222b6e890a447c06cd1ef016e061861ffc5d8a6fd6e7e324353a148b54c593 SHA512 0020c572bcd24cdb479046727fba2d30ca87c9a7111c51e5fe3be0b85459e3e7dfc8892b690650de0a7dc80c1a8921f9de45590f6e60257fbf0534729c6e6f4f DIST redis-5.3.1.tgz 264485 BLAKE2B 51f68841d51329cbbbd2012e539351b3220dc1361ae5a3782b6c3e9620ed14b9a0b9097a0d6ba6e2fa60e8a794fd2ea57fff871d2fceb7bcdb4a2ab4a6d8789f SHA512 dca62e0e87d22c25818f0eb84ec0a4ae8ab4c1a2de295b7d56d10548c95448637e1b1ca86c55adf0f801fe22bf3c05fad4ff58f3823e5d74c506d041b64f1d4a +DIST redis-5.3.2.tgz 266814 BLAKE2B 2be79d850e5958bcaf4fddcbdef0a402e62a522f260ae94c0fdc931a988e9b266c7a4e049b89b507a29a8e9085590e4077e336b85974d70a7cb9b3d6c806949d SHA512 95ce960b78cf94ecd212ec88914935167af37e4176d4b111dfc8c6f1a0846a34beba7f9f516cd7a5e1c9dda23f46cce44c99aaa5b42724c0c2a188b0698af414 diff --git a/dev-php/pecl-redis/pecl-redis-5.3.2.ebuild b/dev-php/pecl-redis/pecl-redis-5.3.2.ebuild new file mode 100644 index 00000000000..65762af9b8d --- /dev/null +++ b/dev-php/pecl-redis/pecl-redis-5.3.2.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PHP_EXT_NAME="redis" +USE_PHP="php7-2 php7-3 php7-4 php8-0" +PHP_EXT_NEEDED_USE="json(+)?,session?" +DOCS=( arrays.markdown cluster.markdown README.markdown CREDITS ) +MY_P="${PN/pecl-/}-${PV/_rc/RC}" +PHP_EXT_PECL_FILENAME="${MY_P}.tgz" +PHP_EXT_S="${WORKDIR}/${MY_P}" + +inherit php-ext-pecl-r3 + +DESCRIPTION="PHP extension for interfacing with Redis" +LICENSE="PHP-3.01" +SLOT="0" +KEYWORDS="~amd64 ~arm" +IUSE="igbinary +json lz4 +session zstd" + +DEPEND=" + igbinary? ( >=dev-php/igbinary-3.0.1-r1[php_targets_php7-2(-)?,php_targets_php7-3(-)?,php_targets_php7-4(-)?,php_targets_php8-0(-)?] ) + lz4? ( app-arch/lz4:= ) + zstd? ( app-arch/zstd:= ) +" +RDEPEND="${DEPEND} + !dev-php/pecl-redis:7" + +# The test suite requires network access. +RESTRICT=test + +S="${WORKDIR}/${MY_P}" + +src_configure() { + local PHP_EXT_ECONF_ARGS=( + --enable-redis + --disable-redis-lzf + --disable-redis-msgpack + $(use_enable igbinary redis-igbinary) + $(use_enable json redis-json) + $(use_enable lz4 redis-lz4) + $(use_with lz4 liblz4) + $(use_enable session redis-session) + $(use_enable zstd redis-zstd) + $(use_with zstd libzstd) + ) + php-ext-source-r3_src_configure +} + +src_test() { + local slot + for slot in $(php_get_slots); do + php_init_slot_env "${slot}" + # Run tests for Redis class + ${PHPCLI} -d extension=modules/redis.so \ + tests/TestRedis.php \ + --class Redis \ + --host ${PECL_REDIS_HOST} || die 'test suite failed' + done +} diff --git a/dev-php/pecl-rrd/files/2.0.1/0001-arginfo.patch b/dev-php/pecl-rrd/files/2.0.1/0001-arginfo.patch new file mode 100644 index 00000000000..28496fe19c9 --- /dev/null +++ b/dev-php/pecl-rrd/files/2.0.1/0001-arginfo.patch @@ -0,0 +1,81 @@ +--- a/rrd.c 2020/09/23 07:41:40 350617 ++++ b/rrd.c 2020/09/23 09:09:08 350618 +@@ -552,6 +552,9 @@ + ZEND_ARG_INFO(0, file) + ZEND_ARG_INFO(0, options) + ZEND_END_ARG_INFO() ++ ++ZEND_BEGIN_ARG_INFO(arginfo_rrd_void, 0) ++ZEND_END_ARG_INFO() + /* }}} */ + + /* {{{ */ +@@ -559,7 +562,7 @@ + PHP_FE(rrd_update, arginfo_rrd_update) + PHP_FE(rrd_create, arginfo_rrd_create) + PHP_FE(rrd_graph, arginfo_rrd_graph) +- PHP_FE(rrd_error, NULL) ++ PHP_FE(rrd_error, arginfo_rrd_void) + PHP_FE(rrd_fetch, arginfo_rrd_fetch) + PHP_FE(rrd_first, arginfo_rrd_first) + PHP_FE(rrd_info, arginfo_rrd_info) +@@ -569,9 +572,9 @@ + PHP_FE(rrd_tune, arginfo_rrd_tune) + PHP_FE(rrd_xport, arginfo_rrd_xport) + #ifdef HAVE_RRDC_DISCONNECT +- PHP_FE(rrdc_disconnect, NULL) ++ PHP_FE(rrdc_disconnect, arginfo_rrd_void) + #endif +- PHP_FE(rrd_version, NULL) ++ PHP_FE(rrd_version, arginfo_rrd_void) + PHP_FE_END + }; + /* }}} */ +--- a/rrd_create.c 2020/09/23 07:41:40 350617 ++++ b/rrd_create.c 2020/09/23 09:09:08 350618 +@@ -323,10 +323,13 @@ + ZEND_ARG_INFO(0, description) + ZEND_END_ARG_INFO() + ++ZEND_BEGIN_ARG_INFO_EX(arginfo_rrdcreator_void, 0, 0, 0) ++ZEND_END_ARG_INFO() ++ + /* class method table */ + static zend_function_entry rrd_create_methods[] = { + PHP_ME(RRDCreator, __construct, arginfo_rrdcreator_construct, ZEND_ACC_PUBLIC) +- PHP_ME(RRDCreator, save, NULL, ZEND_ACC_PUBLIC) ++ PHP_ME(RRDCreator, save, arginfo_rrdcreator_void, ZEND_ACC_PUBLIC) + PHP_ME(RRDCreator, addDataSource, arginfo_rrdcreator_description, ZEND_ACC_PUBLIC) + PHP_ME(RRDCreator, addArchive, arginfo_rrdcreator_description, ZEND_ACC_PUBLIC) + PHP_FE_END +--- a/rrd_graph.c 2020/09/23 07:41:40 350617 ++++ b/rrd_graph.c 2020/09/23 09:09:08 350618 +@@ -140,6 +140,7 @@ + array_init(&zv_argv); + + ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL(obj->zv_arr_options), num_key, zs_key, zv_option_val) { ++ (void)num_key; /* to avoid -Wunused-but-set-variable */ + smart_string option = {0}; /* one argument option */ + + /* option with string key means long option, hence they are used as +@@ -356,6 +357,9 @@ + /* }}} */ + + /* arguments */ ++ZEND_BEGIN_ARG_INFO_EX(arginfo_rrd_void, 0, 0, 0) ++ZEND_END_ARG_INFO() ++ + ZEND_BEGIN_ARG_INFO_EX(arginfo_rrd_path, 0, 0, 1) + ZEND_ARG_INFO(0, path) + ZEND_END_ARG_INFO() +@@ -367,8 +371,8 @@ + /* class method table */ + static zend_function_entry rrd_graph_methods[] = { + PHP_ME(RRDGraph, __construct, arginfo_rrd_path, ZEND_ACC_PUBLIC) +- PHP_ME(RRDGraph, save, NULL, ZEND_ACC_PUBLIC) +- PHP_ME(RRDGraph, saveVerbose, NULL, ZEND_ACC_PUBLIC) ++ PHP_ME(RRDGraph, save, arginfo_rrd_void, ZEND_ACC_PUBLIC) ++ PHP_ME(RRDGraph, saveVerbose, arginfo_rrd_void, ZEND_ACC_PUBLIC) + PHP_ME(RRDGraph, setOptions, arginfo_rrd_options, ZEND_ACC_PUBLIC) + PHP_FE_END + }; diff --git a/dev-php/pecl-rrd/files/2.0.1/0002-relax-float-test-result.patch b/dev-php/pecl-rrd/files/2.0.1/0002-relax-float-test-result.patch new file mode 100644 index 00000000000..b4a692fc3f5 --- /dev/null +++ b/dev-php/pecl-rrd/files/2.0.1/0002-relax-float-test-result.patch @@ -0,0 +1,132 @@ +--- a/tests/rrd_010.phpt 2020/09/23 07:41:40 350617 ++++ b/tests/rrd_010.phpt 2020/09/23 09:09:08 350618 +@@ -40,11 +40,11 @@ + [920805900]=> + float(0) + [920806200]=> +- float(0.033333333333333) ++ float(0.03333333333%s) + [920806500]=> +- float(0.033333333333333) ++ float(0.03333333333%s) + [920806800]=> +- float(0.033333333333333) ++ float(0.03333333333%s) + [920807100]=> + float(0.02) + [920807400]=> +@@ -52,20 +52,20 @@ + [920807700]=> + float(0.02) + [920808000]=> +- float(0.013333333333333) ++ float(0.01333333333%s) + [920808300]=> +- float(0.016666666666667) ++ float(0.01666666666%s) + } + ["speed2"]=> + array(13) { + [920804700]=> + float(NAN) + [920805000]=> +- float(0.056666666666667) ++ float(0.05666666666%s) + [920805300]=> + float(0.02) + [920805600]=> +- float(0.0033333333333333) ++ float(0.00333333333%s) + [920805900]=> + float(0) + [920806200]=> +@@ -73,7 +73,7 @@ + [920806500]=> + float(0) + [920806800]=> +- float(0.066666666666667) ++ float(0.06666666666%s) + [920807100]=> + float(0.02) + [920807400]=> +@@ -81,9 +81,9 @@ + [920807700]=> + float(0.02) + [920808000]=> +- float(0.013333333333333) ++ float(0.01333333333%s) + [920808300]=> +- float(0.016666666666667) ++ float(0.01666666666%s) + } + } +-} +\ No newline at end of file ++} +--- a/tests/rrd_012.phpt 2020/09/23 07:41:40 350617 ++++ b/tests/rrd_012.phpt 2020/09/23 09:09:08 350618 +@@ -69,7 +69,7 @@ + ["rra[1].xff"]=> + float(0.5) + ["rra[1].cdp_prep[0].value"]=> +- float(0.026666666666667) ++ float(0.02666666666%s) + ["rra[1].cdp_prep[0].unknown_datapoints"]=> + int(0) + } +--- a/tests/rrd_017.phpt 2020/09/23 07:41:40 350617 ++++ b/tests/rrd_017.phpt 2020/09/23 09:09:08 350618 +@@ -47,11 +47,11 @@ + [920805900]=> + float(0) + [920806200]=> +- float(0.033333333333333) ++ float(0.0333333333%s) + [920806500]=> +- float(0.033333333333333) ++ float(0.0333333333%s) + [920806800]=> +- float(0.033333333333333) ++ float(0.0333333333%s) + [920807100]=> + float(0.02) + [920807400]=> +@@ -59,9 +59,9 @@ + [920807700]=> + float(0.02) + [920808000]=> +- float(0.013333333333333) ++ float(0.0133333333%s) + [920808300]=> +- float(0.016666666666667) ++ float(0.0166666666%s) + } + } + [1]=> +@@ -81,11 +81,11 @@ + [920805900]=> + float(0) + [920806200]=> +- float(33.333333333333) ++ float(33.333333333%s) + [920806500]=> +- float(33.333333333333) ++ float(33.333333333%s) + [920806800]=> +- float(33.333333333333) ++ float(33.333333333%s) + [920807100]=> + float(20) + [920807400]=> +@@ -93,9 +93,9 @@ + [920807700]=> + float(20) + [920808000]=> +- float(13.333333333333) ++ float(13.333333333%s) + [920808300]=> +- float(16.666666666667) ++ float(16.666666666%s) + } + } + } 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 deleted file mode 100644 index 16e4bc48402..00000000000 --- a/dev-php/pecl-rrd/pecl-rrd-2.0.1-r3.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -# Define 5.6 here to have the {I,REQUIRED_}USE generated -USE_PHP="php5-6 php7-1 php7-2 php7-3 php7-4" - -inherit php-ext-pecl-r3 - -# But we really only build 7.0 -USE_PHP="php7-1 php7-2 php7-3 php7-4" - -DESCRIPTION="RRDtool bindings for PHP" -LICENSE="BSD" -SLOT="7" -KEYWORDS="~amd64 ~x86" - -DEPEND=" - php_targets_php7-1? ( net-analyzer/rrdtool[graph] ) - php_targets_php7-2? ( net-analyzer/rrdtool[graph] ) - php_targets_php7-3? ( net-analyzer/rrdtool[graph] ) - php_targets_php7-4? ( net-analyzer/rrdtool[graph] ) -" -RDEPEND="${DEPEND} php_targets_php5-6? ( ${CATEGORY}/${PN}:0 )" - -src_prepare() { - if use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3 || use php_targets_php7-4 ; then - php-ext-source-r3_src_prepare - else - default - fi -} - -src_configure() { - if use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3 || use php_targets_php7-3 || use php_targets_php7-4 ; then - local PHP_EXT_ECONF_ARGS=() - php-ext-source-r3_src_configure - fi -} - -src_install() { - if use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3 || use php_targets_php7-3 || use php_targets_php7-4 ; then - php-ext-pecl-r3_src_install - fi -} - -src_test() { - local slot - if use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3 || use php_targets_php7-3 || use php_targets_php7-4 ; 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-rrd/pecl-rrd-2.0.1-r4.ebuild b/dev-php/pecl-rrd/pecl-rrd-2.0.1-r4.ebuild new file mode 100644 index 00000000000..7652ef70213 --- /dev/null +++ b/dev-php/pecl-rrd/pecl-rrd-2.0.1-r4.ebuild @@ -0,0 +1,29 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +USE_PHP="php7-3 php7-4 php8-0" + +inherit php-ext-pecl-r3 + +DESCRIPTION="RRDtool bindings for PHP" +LICENSE="BSD" +SLOT="7" +KEYWORDS="~amd64 ~x86" + +DEPEND="net-analyzer/rrdtool[graph(-)]" +RDEPEND="${DEPEND}" + +PATCHES=( "${FILESDIR}/${PV}" ) +PHP_EXT_ECONF_ARGS=() + +src_test() { + local slot + for slot in $(php_get_slots); do + php_init_slot_env "${slot}" + # Prepare test data + emake -C tests/data all + NO_INTERACTION="yes" emake test + done +} diff --git a/dev-php/pecl-ssh2/Manifest b/dev-php/pecl-ssh2/Manifest index b87e771ebe2..9c1db73d692 100644 --- a/dev-php/pecl-ssh2/Manifest +++ b/dev-php/pecl-ssh2/Manifest @@ -1,2 +1,3 @@ +DIST pecl-ssh2-1.1.2-fix-php7-port.patch 27860 BLAKE2B 23054187608bdcf79f53ce638e37c646f44297aa7d1e8f7a7c85fd922977ab835b915d541fbae327a30d2e863b503ed4822a82c1b242346290ceb94d49c97020 SHA512 1c2ecc990323a77fb2b69be0d6649f96dd7ad2d06c62f4fcb79a9ef4f89e066d463301668a044d37d717c99837c5d7d3f621f61119543445bd05c3229d9270e9 DIST pecl-ssh2-1.2.tar.gz 32447 BLAKE2B 3a9d0f205097a381d07fb9dd5ab4dcb8e361f555dbc633abb8fa895c83024b70e85cd87602da1ceeb1018a7b07c474720b02810ef0689e9294fc33b129b6c738 SHA512 7b7d311cd5f88835e124d70a0295468f75d0fa6936a58808c936d1a185bb630b9e02c21f49b4bd777194a7b104aa3ff85c4fbf480f43d5906787e532ba2d3e04 DIST ssh2-1.1.2.tgz 32057 BLAKE2B 88ffb3fb608687a086bbe345677982e944210791acc100312ba56ac7c35188a52cde5529d78caf473d19710e9965fba853ea9ff046715413a0b488ae2d8b690c SHA512 36793191448745b8a9b3cc628fe9fb431480792c7a2ff0bf2eccd58cda1cf944933be1d301c455d4a6f3dabf7e04ffef248bc402a8ff99bfafcba0deddb25c36 diff --git a/dev-php/pecl-ssh2/files/pecl-ssh2-1.1.2-fix-php7-port.patch b/dev-php/pecl-ssh2/files/pecl-ssh2-1.1.2-fix-php7-port.patch deleted file mode 100644 index 9d4f9bd166e..00000000000 --- a/dev-php/pecl-ssh2/files/pecl-ssh2-1.1.2-fix-php7-port.patch +++ /dev/null @@ -1,746 +0,0 @@ -From 073067ba96ac99ed5696d27f13ca6c8124986e74 Mon Sep 17 00:00:00 2001 -From: Jan-E <github@ehrhardt.nl> -Date: Thu, 28 Jun 2018 08:43:48 +0200 -Subject: [PATCH] @dstogov Fixed PHP7 port. Restored commented reference - counting. - ---- - php_ssh2.h | 14 +++--- - ssh2.c | 26 +++++----- - ssh2_fopen_wrappers.c | 129 ++++++++++++++++++++++---------------------------- - ssh2_sftp.c | 59 ++++++++++------------- - 4 files changed, 102 insertions(+), 126 deletions(-) - -diff --git a/php_ssh2.h b/php_ssh2.h -index d010ff9..2bbaa26 100644 ---- a/php_ssh2.h -+++ b/php_ssh2.h -@@ -73,14 +73,14 @@ typedef struct _php_ssh2_sftp_data { - LIBSSH2_SESSION *session; - LIBSSH2_SFTP *sftp; - -- int session_rsrcid; -+ zend_resource *session_rsrc; - } php_ssh2_sftp_data; - - typedef struct _php_ssh2_listener_data { - LIBSSH2_SESSION *session; - LIBSSH2_LISTENER *listener; - -- int session_rsrcid; -+ zend_resource *session_rsrc; - } php_ssh2_listener_data; - - #include "libssh2_publickey.h" -@@ -89,7 +89,7 @@ typedef struct _php_ssh2_pkey_subsys_data { - LIBSSH2_SESSION *session; - LIBSSH2_PUBLICKEY *pkey; - -- int session_rsrcid; -+ zend_resource *session_rsrc; - } php_ssh2_pkey_subsys_data; - - #define SSH2_FETCH_NONAUTHENTICATED_SESSION(session, zsession) \ -@@ -118,8 +118,8 @@ typedef struct _php_ssh2_channel_data { - char is_blocking; - long timeout; - -- /* Resource ID */ -- int session_rsrcid; -+ /* Resource */ -+ zend_resource *session_rsrc; - - /* Allow one stream to be closed while the other is kept open */ - unsigned char *refcount; -@@ -151,8 +151,8 @@ PHP_FUNCTION(ssh2_sftp_realpath); - LIBSSH2_SESSION *php_ssh2_session_connect(char *host, int port, zval *methods, zval *callbacks); - void php_ssh2_sftp_dtor(zend_resource *rsrc); - php_url *php_ssh2_fopen_wraper_parse_path(const char *path, char *type, php_stream_context *context, -- LIBSSH2_SESSION **psession, int *presource_id, -- LIBSSH2_SFTP **psftp, int *psftp_rsrcid); -+ LIBSSH2_SESSION **psession, zend_resource **presource, -+ LIBSSH2_SFTP **psftp, zend_resource **psftp_rsrc); - - extern php_stream_ops php_ssh2_channel_stream_ops; - -diff --git a/ssh2.c b/ssh2.c -index e73867e..849766b 100644 ---- a/ssh2.c -+++ b/ssh2.c -@@ -772,9 +772,8 @@ PHP_FUNCTION(ssh2_forward_listen) - - data = emalloc(sizeof(php_ssh2_listener_data)); - data->session = session; -- data->session_rsrcid = Z_LVAL_P(zsession); -- //TODO Sean-Der -- //zend_list_addref(data->session_rsrcid); -+ data->session_rsrc = Z_RES_P(zsession); -+ Z_ADDREF_P(zsession); - data->listener = listener; - - RETURN_RES(zend_register_resource(data, le_ssh2_listener)); -@@ -810,7 +809,7 @@ PHP_FUNCTION(ssh2_forward_accept) - channel_data->channel = channel; - channel_data->streamid = 0; - channel_data->is_blocking = 0; -- channel_data->session_rsrcid = data->session_rsrcid; -+ channel_data->session_rsrc = data->session_rsrc; - channel_data->refcount = NULL; - - stream = php_stream_alloc(&php_ssh2_channel_stream_ops, channel_data, 0, "r+"); -@@ -820,8 +819,12 @@ PHP_FUNCTION(ssh2_forward_accept) - libssh2_channel_free(channel); - RETURN_FALSE; - } -- //TODO Sean-Der -- //zend_list_addref(channel_data->session_rsrcid); -+ -+#if PHP_VERSION_ID < 70300 -+ GC_REFCOUNT(channel_data->session_rsrc)++; -+#else -+ GC_ADDREF(channel_data->session_rsrc); -+#endif - - php_stream_to_zval(stream, return_value); - } -@@ -975,9 +978,8 @@ PHP_FUNCTION(ssh2_publickey_init) - - data = emalloc(sizeof(php_ssh2_pkey_subsys_data)); - data->session = session; -- data->session_rsrcid = Z_RES_P(zsession)->handle; -- //TODO Sean-Der -- //zend_list_addref(data->session_rsrcid); -+ data->session_rsrc = Z_RES_P(zsession); -+ Z_ADDREF_P(zsession); - data->pkey = pkey; - - RETURN_RES(zend_register_resource(data, le_ssh2_pkey_subsys)); -@@ -1280,8 +1282,7 @@ static void php_ssh2_listener_dtor(zend_resource *rsrc) - LIBSSH2_LISTENER *listener = data->listener; - - libssh2_channel_forward_cancel(listener); -- // TODO Sean-Der -- //zend_list_delete(data->session_rsrcid); -+ zend_list_delete(data->session_rsrc); - efree(data); - } - -@@ -1291,8 +1292,7 @@ static void php_ssh2_pkey_subsys_dtor(zend_resource *rsrc) - LIBSSH2_PUBLICKEY *pkey = data->pkey; - - libssh2_publickey_shutdown(pkey); -- // TODO Sean-Der -- //zend_list_delete(data->session_rsrcid); -+ zend_list_delete(data->session_rsrc); - efree(data); - } - -diff --git a/ssh2_fopen_wrappers.c b/ssh2_fopen_wrappers.c -index f2f3475..c4eb9dc 100644 ---- a/ssh2_fopen_wrappers.c -+++ b/ssh2_fopen_wrappers.c -@@ -47,11 +47,9 @@ static size_t php_ssh2_channel_stream_write(php_stream *stream, const char *buf, - php_ssh2_channel_data *abstract = (php_ssh2_channel_data*)stream->abstract; - size_t writestate; - LIBSSH2_SESSION *session; -- zval *zresource; - - libssh2_channel_set_blocking(abstract->channel, abstract->is_blocking); -- zresource = php_ssh2_zval_from_resource_handle(abstract->session_rsrcid); -- session = (LIBSSH2_SESSION *)zend_fetch_resource(Z_RES_P(zresource), PHP_SSH2_SESSION_RES_NAME, le_ssh2_session); -+ session = (LIBSSH2_SESSION *)zend_fetch_resource(abstract->session_rsrc, PHP_SSH2_SESSION_RES_NAME, le_ssh2_session); - - - -@@ -90,12 +88,10 @@ static size_t php_ssh2_channel_stream_read(php_stream *stream, char *buf, size_t - php_ssh2_channel_data *abstract = (php_ssh2_channel_data*)stream->abstract; - ssize_t readstate; - LIBSSH2_SESSION *session; -- zval *zresource; - - stream->eof = libssh2_channel_eof(abstract->channel); - libssh2_channel_set_blocking(abstract->channel, abstract->is_blocking); -- zresource = php_ssh2_zval_from_resource_handle(abstract->session_rsrcid); -- session = (LIBSSH2_SESSION *)zend_fetch_resource(Z_RES_P(zresource), PHP_SSH2_SESSION_RES_NAME, le_ssh2_session); -+ session = (LIBSSH2_SESSION *)zend_fetch_resource(abstract->session_rsrc, PHP_SSH2_SESSION_RES_NAME, le_ssh2_session); - - #ifdef PHP_SSH2_SESSION_TIMEOUT - if (abstract->is_blocking) { -@@ -137,8 +133,7 @@ static int php_ssh2_channel_stream_close(php_stream *stream, int close_handle) - } - libssh2_channel_eof(abstract->channel); - libssh2_channel_free(abstract->channel); -- //TODO Sean-Der -- //zend_list_delete(abstract->session_rsrcid); -+ zend_list_delete(abstract->session_rsrc); - } - efree(abstract); - -@@ -207,8 +202,8 @@ php_stream_ops php_ssh2_channel_stream_ops = { - * Parse an ssh2.*:// path - */ - php_url *php_ssh2_fopen_wraper_parse_path(const char *path, char *type, php_stream_context *context, -- LIBSSH2_SESSION **psession, int *presource_id, -- LIBSSH2_SFTP **psftp, int *psftp_rsrcid) -+ LIBSSH2_SESSION **psession, zend_resource **presource, -+ LIBSSH2_SFTP **psftp, zend_resource **psftp_rsrc) - { - php_ssh2_sftp_data *sftp_data = NULL; - LIBSSH2_SESSION *session; -@@ -283,11 +278,10 @@ php_url *php_ssh2_fopen_wraper_parse_path(const char *path, char *type, php_stre - sftp_data = (php_ssh2_sftp_data *)zend_fetch_resource(Z_RES_P(zresource), PHP_SSH2_SFTP_RES_NAME, le_ssh2_sftp); - if (sftp_data) { - /* Want the sftp layer */ -- //TODO Sean-Der -- //zend_list_addref(resource_id); -- *psftp_rsrcid = resource_id; -+ Z_ADDREF_P(zresource); -+ *psftp_rsrc = Z_RES_P(zresource); - *psftp = sftp_data->sftp; -- *presource_id = sftp_data->session_rsrcid; -+ *presource = sftp_data->session_rsrc; - *psession = sftp_data->session; - return resource; - } -@@ -305,18 +299,16 @@ php_url *php_ssh2_fopen_wraper_parse_path(const char *path, char *type, php_stre - sftp_data = emalloc(sizeof(php_ssh2_sftp_data)); - sftp_data->sftp = sftp; - sftp_data->session = session; -- sftp_data->session_rsrcid = resource_id; -- //TODO Sean-Der -- //zend_list_addref(resource_id); -- *psftp_rsrcid = zend_register_resource(sftp_data, le_ssh2_sftp)->handle; -+ sftp_data->session_rsrc = Z_RES_P(zresource); -+ Z_ADDREF_P(zresource); -+ *psftp_rsrc = zend_register_resource(sftp_data, le_ssh2_sftp); - *psftp = sftp; -- *presource_id = resource_id; -+ *presource = Z_RES_P(zresource); - *psession = session; - return resource; - } -- //TODO Sean-Der -- //zend_list_addref(resource_id); -- *presource_id = resource_id; -+ Z_ADDREF_P(zresource); -+ *presource = Z_RES_P(zresource); - *psession = session; - return resource; - } -@@ -330,9 +322,9 @@ php_url *php_ssh2_fopen_wraper_parse_path(const char *path, char *type, php_stre - sftp_data = (php_ssh2_sftp_data *)zend_fetch_resource(Z_RES_P(tmpzval), PHP_SSH2_SFTP_RES_NAME, le_ssh2_sftp); - if (sftp_data) { - Z_ADDREF_P(tmpzval); -- *psftp_rsrcid = Z_LVAL_P(tmpzval); -+ *psftp_rsrc = Z_RES_P(tmpzval); - *psftp = sftp_data->sftp; -- *presource_id = sftp_data->session_rsrcid; -+ *presource = sftp_data->session_rsrc; - *psession = sftp_data->session; - return resource; - } -@@ -354,17 +346,17 @@ php_url *php_ssh2_fopen_wraper_parse_path(const char *path, char *type, php_stre - sftp_data = emalloc(sizeof(php_ssh2_sftp_data)); - sftp_data->sftp = sftp; - sftp_data->session = session; -- sftp_data->session_rsrcid = Z_LVAL_P(tmpzval); -+ sftp_data->session_rsrc = Z_RES_P(tmpzval); - Z_ADDREF_P(tmpzval); -- *psftp_rsrcid = zend_register_resource(sftp_data, le_ssh2_sftp)->handle; -+ *psftp_rsrc = zend_register_resource(sftp_data, le_ssh2_sftp); - *psftp = sftp; -- *presource_id = Z_RES_P(tmpzval)->handle; -+ *presource = Z_RES_P(tmpzval); - *psession = session; - return resource; - } - Z_ADDREF_P(tmpzval); - *psession = session; -- *presource_id = Z_LVAL_P(tmpzval); -+ *presource = Z_RES_P(tmpzval); - return resource; - } - } -@@ -465,8 +457,7 @@ php_url *php_ssh2_fopen_wraper_parse_path(const char *path, char *type, php_stre - - /* Auth failure */ - php_url_free(resource); -- //TODO Sean-Der -- //zend_list_delete(Z_LVAL(zsession)); -+ zend_list_delete(Z_RES(zsession)); - return NULL; - - session_authed: -@@ -480,24 +471,22 @@ session_authed: - sftp = libssh2_sftp_init(session); - if (!sftp) { - php_url_free(resource); -- //TODO Sean-Der -- //zend_list_delete(Z_LVAL(zsession)); -+ zend_list_delete(Z_RES(zsession)); - return NULL; - } - - sftp_data = emalloc(sizeof(php_ssh2_sftp_data)); - sftp_data->session = session; - sftp_data->sftp = sftp; -- sftp_data->session_rsrcid = Z_LVAL(zsession); -+ sftp_data->session_rsrc = Z_RES(zsession); - - //TODO Sean-Der - //ZEND_REGISTER_RESOURCE(sftp_data, le_ssh2_sftp); -- *psftp_rsrcid = Z_LVAL(zsftp); -+ *psftp_rsrc = Z_RES(zsftp); - *psftp = sftp; - } - -- //TODO may be undefined -- *presource_id = Z_LVAL(zsession); -+ *presource = Z_RES(zsession); - *psession = session; - - return resource; -@@ -511,7 +500,7 @@ session_authed: - /* {{{ php_ssh2_shell_open - * Make a stream from a session - */ --static php_stream *php_ssh2_shell_open(LIBSSH2_SESSION *session, int resource_id, char *term, int term_len, zval *environment, long width, long height, long type) -+static php_stream *php_ssh2_shell_open(LIBSSH2_SESSION *session, zend_resource *resource, char *term, int term_len, zval *environment, long width, long height, long type) - { - LIBSSH2_CHANNEL *channel; - php_ssh2_channel_data *channel_data; -@@ -578,7 +567,7 @@ static php_stream *php_ssh2_shell_open(LIBSSH2_SESSION *session, int resource_id - channel_data->streamid = 0; - channel_data->is_blocking = 0; - channel_data->timeout = 0; -- channel_data->session_rsrcid = resource_id; -+ channel_data->session_rsrc = resource; - channel_data->refcount = NULL; - - stream = php_stream_alloc(&php_ssh2_channel_stream_ops, channel_data, 0, "r+"); -@@ -599,11 +588,12 @@ static php_stream *php_ssh2_fopen_wrapper_shell(php_stream_wrapper *wrapper, con - zend_long width = PHP_SSH2_DEFAULT_TERM_WIDTH; - zend_long height = PHP_SSH2_DEFAULT_TERM_HEIGHT; - zend_long type = PHP_SSH2_DEFAULT_TERM_UNIT; -- int resource_id = 0, terminal_len = sizeof(PHP_SSH2_DEFAULT_TERMINAL) - 1; -+ zend_resource *rsrc = NULL; -+ int terminal_len = sizeof(PHP_SSH2_DEFAULT_TERMINAL) - 1; - php_url *resource; - char *s; - -- resource = php_ssh2_fopen_wraper_parse_path(path, "shell", context, &session, &resource_id, NULL, NULL); -+ resource = php_ssh2_fopen_wraper_parse_path(path, "shell", context, &session, &rsrc, NULL, NULL); - if (!resource || !session) { - return NULL; - } -@@ -677,10 +667,9 @@ static php_stream *php_ssh2_fopen_wrapper_shell(php_stream_wrapper *wrapper, con - /* TODO: Accept resolution and environment vars as URL style parameters - * ssh2.shell://hostorresource/terminal/99x99c?envvar=envval&envvar=envval.... - */ -- stream = php_ssh2_shell_open(session, resource_id, terminal, terminal_len, environment, width, height, type); -+ stream = php_ssh2_shell_open(session, rsrc, terminal, terminal_len, environment, width, height, type); - if (!stream) { -- //TODO Sean-Der -- //zend_list_delete(resource_id); -+ zend_list_delete(rsrc); - } - php_url_free(resource); - -@@ -730,7 +719,7 @@ PHP_FUNCTION(ssh2_shell) - - SSH2_FETCH_AUTHENTICATED_SESSION(session, zsession); - -- stream = php_ssh2_shell_open(session, Z_RES_P(zsession)->handle, term, term_len, environment, width, height, type); -+ stream = php_ssh2_shell_open(session, Z_RES_P(zsession), term, term_len, environment, width, height, type); - if (!stream) { - RETURN_FALSE; - } -@@ -749,7 +738,7 @@ PHP_FUNCTION(ssh2_shell) - /* {{{ php_ssh2_exec_command - * Make a stream from a session - */ --static php_stream *php_ssh2_exec_command(LIBSSH2_SESSION *session, int resource_id, char *command, char *term, int term_len, zval *environment, long width, long height, long type) -+static php_stream *php_ssh2_exec_command(LIBSSH2_SESSION *session, zend_resource *rsrc, char *command, char *term, int term_len, zval *environment, long width, long height, long type) - { - LIBSSH2_CHANNEL *channel; - php_ssh2_channel_data *channel_data; -@@ -819,7 +808,7 @@ static php_stream *php_ssh2_exec_command(LIBSSH2_SESSION *session, int resource_ - channel_data->streamid = 0; - channel_data->is_blocking = 0; - channel_data->timeout = 0; -- channel_data->session_rsrcid = resource_id; -+ channel_data->session_rsrc = rsrc; - channel_data->refcount = NULL; - - stream = php_stream_alloc(&php_ssh2_channel_stream_ops, channel_data, 0, "r+"); -@@ -836,7 +825,7 @@ static php_stream *php_ssh2_fopen_wrapper_exec(php_stream_wrapper *wrapper, cons - LIBSSH2_SESSION *session = NULL; - php_stream *stream; - zval *tmpzval, *environment = NULL; -- int resource_id = 0; -+ zend_resource *rsrc = NULL; - php_url *resource; - char *terminal = NULL; - int terminal_len = 0; -@@ -844,14 +833,13 @@ static php_stream *php_ssh2_fopen_wrapper_exec(php_stream_wrapper *wrapper, cons - long height = PHP_SSH2_DEFAULT_TERM_HEIGHT; - long type = PHP_SSH2_DEFAULT_TERM_UNIT; - -- resource = php_ssh2_fopen_wraper_parse_path(path, "exec", context, &session, &resource_id, NULL, NULL); -+ resource = php_ssh2_fopen_wraper_parse_path(path, "exec", context, &session, &rsrc, NULL, NULL); - if (!resource || !session) { - return NULL; - } - if (!resource->path) { - php_url_free(resource); -- //TODO Sean-Der -- //zend_list_delete(resource_id); -+ zend_list_delete(rsrc); - return NULL; - } - -@@ -893,10 +881,9 @@ static php_stream *php_ssh2_fopen_wrapper_exec(php_stream_wrapper *wrapper, cons - zval_ptr_dtor(copyval); - } - -- stream = php_ssh2_exec_command(session, resource_id, SSH2_URL_STR(resource->path) + 1, terminal, terminal_len, environment, width, height, type); -+ stream = php_ssh2_exec_command(session, rsrc, SSH2_URL_STR(resource->path) + 1, terminal, terminal_len, environment, width, height, type); - if (!stream) { -- // TODO Sean-Der -- //zend_list_delete(resource_id); -+ zend_list_delete(rsrc); - } - php_url_free(resource); - -@@ -963,7 +950,7 @@ PHP_FUNCTION(ssh2_exec) - - SSH2_FETCH_AUTHENTICATED_SESSION(session, zsession); - -- stream = php_ssh2_exec_command(session, Z_RES_P(zsession)->handle, command, term, term_len, environment, width, height, type); -+ stream = php_ssh2_exec_command(session, Z_RES_P(zsession), command, term, term_len, environment, width, height, type); - if (!stream) { - RETURN_FALSE; - } -@@ -982,7 +969,7 @@ PHP_FUNCTION(ssh2_exec) - /* {{{ php_ssh2_scp_xfer - * Make a stream from a session - */ --static php_stream *php_ssh2_scp_xfer(LIBSSH2_SESSION *session, int resource_id, char *filename) -+static php_stream *php_ssh2_scp_xfer(LIBSSH2_SESSION *session, zend_resource *rsrc, char *filename) - { - LIBSSH2_CHANNEL *channel; - php_ssh2_channel_data *channel_data; -@@ -1002,7 +989,7 @@ static php_stream *php_ssh2_scp_xfer(LIBSSH2_SESSION *session, int resource_id, - channel_data->streamid = 0; - channel_data->is_blocking = 0; - channel_data->timeout = 0; -- channel_data->session_rsrcid = resource_id; -+ channel_data->session_rsrc = rsrc; - channel_data->refcount = NULL; - - stream = php_stream_alloc(&php_ssh2_channel_stream_ops, channel_data, 0, "r"); -@@ -1018,28 +1005,26 @@ static php_stream *php_ssh2_fopen_wrapper_scp(php_stream_wrapper *wrapper, const - { - LIBSSH2_SESSION *session = NULL; - php_stream *stream; -- int resource_id = 0; -+ zend_resource *rsrc = NULL; - php_url *resource; - - if (strchr(mode, '+') || strchr(mode, 'a') || strchr(mode, 'w')) { - return NULL; - } - -- resource = php_ssh2_fopen_wraper_parse_path(path, "scp", context, &session, &resource_id, NULL, NULL); -+ resource = php_ssh2_fopen_wraper_parse_path(path, "scp", context, &session, &rsrc, NULL, NULL); - if (!resource || !session) { - return NULL; - } - if (!resource->path) { - php_url_free(resource); -- //TODO Sean-Der -- //zend_list_delete(resource_id); -+ zend_list_delete(rsrc); - return NULL; - } - -- stream = php_ssh2_scp_xfer(session, resource_id, SSH2_URL_STR(resource->path)); -+ stream = php_ssh2_scp_xfer(session, rsrc, SSH2_URL_STR(resource->path)); - if (!stream) { -- //TODO Sean-Der -- //zend_list_delete(resource_id); -+ zend_list_delete(rsrc); - } - php_url_free(resource); - -@@ -1231,7 +1216,7 @@ PHP_FUNCTION(ssh2_scp_send) - /* {{{ php_ssh2_direct_tcpip - * Make a stream from a session - */ --static php_stream *php_ssh2_direct_tcpip(LIBSSH2_SESSION *session, int resource_id, char *host, int port) -+static php_stream *php_ssh2_direct_tcpip(LIBSSH2_SESSION *session, zend_resource *rsrc, char *host, int port) - { - LIBSSH2_CHANNEL *channel; - php_ssh2_channel_data *channel_data; -@@ -1251,7 +1236,7 @@ static php_stream *php_ssh2_direct_tcpip(LIBSSH2_SESSION *session, int resource_ - channel_data->streamid = 0; - channel_data->is_blocking = 0; - channel_data->timeout = 0; -- channel_data->session_rsrcid = resource_id; -+ channel_data->session_rsrc = rsrc; - channel_data->refcount = NULL; - - stream = php_stream_alloc(&php_ssh2_channel_stream_ops, channel_data, 0, "r+"); -@@ -1270,9 +1255,9 @@ static php_stream *php_ssh2_fopen_wrapper_tunnel(php_stream_wrapper *wrapper, co - php_url *resource; - char *host = NULL; - int port = 0; -- int resource_id = 0; -+ zend_resource *rsrc; - -- resource = php_ssh2_fopen_wraper_parse_path(path, "tunnel", context, &session, &resource_id, NULL, NULL); -+ resource = php_ssh2_fopen_wraper_parse_path(path, "tunnel", context, &session, &rsrc, NULL, NULL); - if (!resource || !session) { - return NULL; - } -@@ -1303,15 +1288,13 @@ static php_stream *php_ssh2_fopen_wrapper_tunnel(php_stream_wrapper *wrapper, co - if ((port <= 0) || (port > 65535) || !host || (strlen(host) == 0)) { - /* Invalid connection criteria */ - php_url_free(resource); -- //TODO Sean-Der -- //zend_list_delete(resource_id); -+ zend_list_delete(rsrc); - return NULL; - } - -- stream = php_ssh2_direct_tcpip(session, resource_id, host, port); -+ stream = php_ssh2_direct_tcpip(session, rsrc, host, port); - if (!stream) { -- // TODO Sean-Der -- //zend_list_delete(resource_id); -+ zend_list_delete(rsrc); - } - php_url_free(resource); - -@@ -1352,7 +1335,7 @@ PHP_FUNCTION(ssh2_tunnel) - - SSH2_FETCH_AUTHENTICATED_SESSION(session, zsession); - -- stream = php_ssh2_direct_tcpip(session, Z_RES_P(zsession)->handle, host, port); -+ stream = php_ssh2_direct_tcpip(session, Z_RES_P(zsession), host, port); - if (!stream) { - RETURN_FALSE; - } -diff --git a/ssh2_sftp.c b/ssh2_sftp.c -index 6332be8..256fc70 100644 ---- a/ssh2_sftp.c -+++ b/ssh2_sftp.c -@@ -40,8 +40,7 @@ void php_ssh2_sftp_dtor(zend_resource *rsrc) - - libssh2_sftp_shutdown(data->sftp); - -- // TODO Sean-Der -- //zend_list_delete(data->session_rsrcid); -+ zend_list_delete(data->session_rsrc); - - efree(data); - } -@@ -50,7 +49,7 @@ void php_ssh2_sftp_dtor(zend_resource *rsrc) - * SFTP File Ops * - ***************** */ - --inline unsigned long php_ssh2_parse_fopen_modes(char *openmode) { -+unsigned long php_ssh2_parse_fopen_modes(char *openmode) { - unsigned long flags = 0; - - if (strchr(openmode, 'a')) { -@@ -101,7 +100,7 @@ inline int php_ssh2_sftp_attr2ssb(php_stream_statbuf *ssb, LIBSSH2_SFTP_ATTRIBUT - typedef struct _php_ssh2_sftp_handle_data { - LIBSSH2_SFTP_HANDLE *handle; - -- long sftp_rsrcid; -+ zend_resource *sftp_rsrc; - } php_ssh2_sftp_handle_data; - - /* {{{ php_ssh2_sftp_stream_write -@@ -139,8 +138,7 @@ static int php_ssh2_sftp_stream_close(php_stream *stream, int close_handle) - php_ssh2_sftp_handle_data *data = (php_ssh2_sftp_handle_data*)stream->abstract; - - libssh2_sftp_close(data->handle); -- //TODO Sean-Der -- //zend_list_delete(data->sftp_rsrcid); -+ zend_list_delete(data->sftp_rsrc); - efree(data); - - return 0; -@@ -226,12 +224,12 @@ static php_stream *php_ssh2_sftp_stream_opener(php_stream_wrapper *wrapper, cons - LIBSSH2_SFTP *sftp = NULL; - LIBSSH2_SFTP_HANDLE *handle; - php_stream *stream; -- int resource_id = 0, sftp_rsrcid = 0; -+ zend_resource *rsrc = NULL, *sftp_rsrc = NULL; - php_url *resource; - unsigned long flags; - long perms = 0644; - -- resource = php_ssh2_fopen_wraper_parse_path(filename, "sftp", context, &session, &resource_id, &sftp, &sftp_rsrcid); -+ resource = php_ssh2_fopen_wraper_parse_path(filename, "sftp", context, &session, &rsrc, &sftp, &sftp_rsrc); - if (!resource || !session || !sftp) { - return NULL; - } -@@ -242,20 +240,18 @@ static php_stream *php_ssh2_sftp_stream_opener(php_stream_wrapper *wrapper, cons - if (!handle) { - php_error_docref(NULL, E_WARNING, "Unable to open %s on remote host", filename); - php_url_free(resource); -- //TODO Sean-Der -- //zend_list_delete(sftp_rsrcid); -+ zend_list_delete(sftp_rsrc); - return NULL; - } - - data = emalloc(sizeof(php_ssh2_sftp_handle_data)); - data->handle = handle; -- data->sftp_rsrcid = sftp_rsrcid; -+ data->sftp_rsrc = sftp_rsrc; - - stream = php_stream_alloc(&php_ssh2_sftp_stream_ops, data, 0, mode); - if (!stream) { - libssh2_sftp_close(handle); -- // TODO Sean-Der -- //zend_list_delete(sftp_rsrcid); -+ zend_list_delete(sftp_rsrc); - efree(data); - } - php_url_free(resource); -@@ -303,8 +299,7 @@ static int php_ssh2_sftp_dirstream_close(php_stream *stream, int close_handle) - php_ssh2_sftp_handle_data *data = (php_ssh2_sftp_handle_data*)stream->abstract; - - libssh2_sftp_close(data->handle); -- //TODO Sean_der -- //zend_list_delete(data->sftp_rsrcid); -+ zend_list_delete(data->sftp_rsrc); - efree(data); - - return 0; -@@ -333,10 +328,10 @@ static php_stream *php_ssh2_sftp_dirstream_opener(php_stream_wrapper *wrapper, c - LIBSSH2_SFTP *sftp = NULL; - LIBSSH2_SFTP_HANDLE *handle; - php_stream *stream; -- int resource_id = 0, sftp_rsrcid = 0; -+ zend_resource *rsrc = NULL, *sftp_rsrc = NULL; - php_url *resource; - -- resource = php_ssh2_fopen_wraper_parse_path(filename, "sftp", context, &session, &resource_id, &sftp, &sftp_rsrcid); -+ resource = php_ssh2_fopen_wraper_parse_path(filename, "sftp", context, &session, &rsrc, &sftp, &sftp_rsrc); - if (!resource || !session || !sftp) { - return NULL; - } -@@ -345,20 +340,18 @@ static php_stream *php_ssh2_sftp_dirstream_opener(php_stream_wrapper *wrapper, c - if (!handle) { - php_error_docref(NULL, E_WARNING, "Unable to open %s on remote host", filename); - php_url_free(resource); -- //TODO Sean-Der -- //zend_list_delete(sftp_rsrcid); -+ zend_list_delete(sftp_rsrc); - return NULL; - } - - data = emalloc(sizeof(php_ssh2_sftp_handle_data)); - data->handle = handle; -- data->sftp_rsrcid = sftp_rsrcid; -+ data->sftp_rsrc = sftp_rsrc; - - stream = php_stream_alloc(&php_ssh2_sftp_dirstream_ops, data, 0, mode); - if (!stream) { - libssh2_sftp_close(handle); -- //TODO Sean-Der -- //zend_list_delete(sftp_rsrcid); -+ zend_list_delete(sftp_rsrc); - efree(data); - } - php_url_free(resource); -@@ -378,10 +371,10 @@ static int php_ssh2_sftp_urlstat(php_stream_wrapper *wrapper, const char *url, i - LIBSSH2_SFTP_ATTRIBUTES attrs; - LIBSSH2_SESSION *session = NULL; - LIBSSH2_SFTP *sftp = NULL; -- int resource_id = 0, sftp_rsrcid = 0; -+ zend_resource *rsrc = NULL, *sftp_rsrc = NULL; - php_url *resource; - -- resource = php_ssh2_fopen_wraper_parse_path(url, "sftp", context, &session, &resource_id, &sftp, &sftp_rsrcid); -+ resource = php_ssh2_fopen_wraper_parse_path(url, "sftp", context, &session, &rsrc, &sftp, &sftp_rsrc); - if (!resource || !session || !sftp || !resource->path) { - return -1; - } -@@ -408,11 +401,11 @@ static int php_ssh2_sftp_unlink(php_stream_wrapper *wrapper, const char *url, in - { - LIBSSH2_SESSION *session = NULL; - LIBSSH2_SFTP *sftp = NULL; -- int resource_id = 0, sftp_rsrcid = 0; -+ zend_resource *rsrc = NULL, *sftp_rsrc = NULL; - php_url *resource; - int result; - -- resource = php_ssh2_fopen_wraper_parse_path(url, "sftp", context, &session, &resource_id, &sftp, &sftp_rsrcid); -+ resource = php_ssh2_fopen_wraper_parse_path(url, "sftp", context, &session, &rsrc, &sftp, &sftp_rsrc); - if (!resource || !session || !sftp || !resource->path) { - if (resource) { - php_url_free(resource); -@@ -436,7 +429,7 @@ static int php_ssh2_sftp_rename(php_stream_wrapper *wrapper, const char *url_fro - { - LIBSSH2_SESSION *session = NULL; - LIBSSH2_SFTP *sftp = NULL; -- int resource_id = 0, sftp_rsrcid = 0; -+ zend_resource *rsrc = NULL, *sftp_rsrc = NULL; - php_url *resource, *resource_to; - int result; - -@@ -453,7 +446,7 @@ static int php_ssh2_sftp_rename(php_stream_wrapper *wrapper, const char *url_fro - return 0; - } - -- resource = php_ssh2_fopen_wraper_parse_path(url_from, "sftp", context, &session, &resource_id, &sftp, &sftp_rsrcid); -+ resource = php_ssh2_fopen_wraper_parse_path(url_from, "sftp", context, &session, &rsrc, &sftp, &sftp_rsrc); - if (!resource || !session || !sftp || !resource->path) { - if (resource) { - php_url_free(resource); -@@ -479,11 +472,11 @@ static int php_ssh2_sftp_mkdir(php_stream_wrapper *wrapper, const char *url, int - { - LIBSSH2_SESSION *session = NULL; - LIBSSH2_SFTP *sftp = NULL; -- int resource_id = 0, sftp_rsrcid = 0; -+ zend_resource *rsrc = NULL, *sftp_rsrc = NULL; - php_url *resource; - int result; - -- resource = php_ssh2_fopen_wraper_parse_path(url, "sftp", context, &session, &resource_id, &sftp, &sftp_rsrcid); -+ resource = php_ssh2_fopen_wraper_parse_path(url, "sftp", context, &session, &rsrc, &sftp, &sftp_rsrc); - if (!resource || !session || !sftp || !resource->path) { - if (resource) { - php_url_free(resource); -@@ -515,11 +508,11 @@ static int php_ssh2_sftp_rmdir(php_stream_wrapper *wrapper, const char *url, int - { - LIBSSH2_SESSION *session = NULL; - LIBSSH2_SFTP *sftp = NULL; -- int resource_id = 0, sftp_rsrcid = 0; -+ zend_resource *rsrc = NULL, *sftp_rsrc = NULL; - php_url *resource; - int result; - -- resource = php_ssh2_fopen_wraper_parse_path(url, "sftp", context, &session, &resource_id, &sftp, &sftp_rsrcid); -+ resource = php_ssh2_fopen_wraper_parse_path(url, "sftp", context, &session, &rsrc, &sftp, &sftp_rsrc); - if (!resource || !session || !sftp || !resource->path) { - if (resource) { - php_url_free(resource); -@@ -591,7 +584,7 @@ PHP_FUNCTION(ssh2_sftp) - data = emalloc(sizeof(php_ssh2_sftp_data)); - data->session = session; - data->sftp = sftp; -- data->session_rsrcid = Z_RES_P(zsession)->handle; -+ data->session_rsrc = Z_RES_P(zsession); - Z_ADDREF_P(zsession); - - RETURN_RES(zend_register_resource(data, le_ssh2_sftp)); --- -2.1.4 - diff --git a/dev-php/pecl-ssh2/pecl-ssh2-1.1.2.ebuild b/dev-php/pecl-ssh2/pecl-ssh2-1.1.2.ebuild index 7001e2010d5..a27f6970b15 100644 --- a/dev-php/pecl-ssh2/pecl-ssh2-1.1.2.ebuild +++ b/dev-php/pecl-ssh2/pecl-ssh2-1.1.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -14,7 +14,8 @@ USE_PHP="php7-1 php7-2 php7-3" DESCRIPTION="PHP bindings for the libssh2 library" LICENSE="PHP-3.01" SLOT="7" -IUSE="" + +SRC_URI+=" https://dev.gentoo.org/~juippis/distfiles/tmp/pecl-ssh2-1.1.2-fix-php7-port.patch" KEYWORDS="amd64 x86" # Upstream notes say there are errors with gcrypt backend DEPEND=">=net-libs/libssh2-1.2[-gcrypt]" @@ -23,7 +24,7 @@ RDEPEND="${DEPEND} PATCHES=( "${FILESDIR}"/${P}-fix-php_url-fields-usage-for-php7-3.patch - "${FILESDIR}"/${P}-fix-php7-port.patch + "${DISTDIR}"/${P}-fix-php7-port.patch ) src_prepare() { diff --git a/dev-php/pecl-ssh2/pecl-ssh2-9999.ebuild b/dev-php/pecl-ssh2/pecl-ssh2-9999.ebuild index bbaca4c60d0..3d6ba5b1e14 100644 --- a/dev-php/pecl-ssh2/pecl-ssh2-9999.ebuild +++ b/dev-php/pecl-ssh2/pecl-ssh2-9999.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" PHP_EXT_NAME="ssh2" -USE_PHP="php7-2 php7-3 php7-4" +USE_PHP="php7-3 php7-4 php8-0" EGIT_REPO_URI="https://git.php.net/repository/pecl/networking/ssh2.git" inherit php-ext-source-r3 git-r3 diff --git a/dev-php/pecl-timezonedb/Manifest b/dev-php/pecl-timezonedb/Manifest index 6e305b0c2cc..b3702618eb5 100644 --- a/dev-php/pecl-timezonedb/Manifest +++ b/dev-php/pecl-timezonedb/Manifest @@ -1,2 +1 @@ -DIST timezonedb-2019.3.tgz 413166 BLAKE2B 99542a2c0dc50d96316dc14b22c8a2404db07a88d3f46050a954f10bfb501cd81fb7161805a91336075d607ac106208285e6d2281a9ed68b344fd4837fabcb49 SHA512 8342a0ed83a52ade0415430751d4efeaa84fb72e7da3aec8921338e9dfbf37ff1f098f6b6e1ed9c8f1c9c62017a0fe9c14f86a53be72f8b9f1ec137fa45d057d -DIST timezonedb-2020.1.tgz 413993 BLAKE2B 1f598269060c7f228d103549ac31429df3e31e68961fb41182101400c9f71ea8503cb11943732b49b749aa055e7eedfb4fd06e11cc11c1381bc69f294c3433b6 SHA512 31c38d5b25db921ec5be924ac85d9cf9dd2180c4e2d50e074a143dfdf9415a8c7579e96f7a768b305554bf1cb332b46f2c652fda7d2f1638502b995fc0679ca5 +DIST timezonedb-2020.4.tgz 414667 BLAKE2B 1a219a090ae33a9f3eef76ab52e2bafd453a1f1161bbeeb53ee995d090f3fdd03c7a658a93ade72e3e1ae61df9d646eaef85dd4cacb5cea45c00adcfac8d6651 SHA512 d5c41c76b4b0b033464a4f086072d061504fc439c910c47a7077a0586b308cc37a4202ff9f418a39cee63534d55136d15a173bb94923160c0fa16bb33ac89a09 diff --git a/dev-php/pecl-timezonedb/pecl-timezonedb-2019.3.ebuild b/dev-php/pecl-timezonedb/pecl-timezonedb-2019.3.ebuild deleted file mode 100644 index ce13c87b5e7..00000000000 --- a/dev-php/pecl-timezonedb/pecl-timezonedb-2019.3.ebuild +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -PHP_EXT_NAME="timezonedb" -PHP_EXT_INI="yes" -PHP_EXT_ZENDEXT="no" - -USE_PHP="php5-6 php7-1 php7-2 php7-3 php7-4" - -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 ~sparc ~x86" -IUSE="" -PHP_EXT_ECONF_ARGS="" diff --git a/dev-php/pecl-timezonedb/pecl-timezonedb-2020.1.ebuild b/dev-php/pecl-timezonedb/pecl-timezonedb-2020.4.ebuild index ce13c87b5e7..a390fa7584e 100644 --- a/dev-php/pecl-timezonedb/pecl-timezonedb-2020.1.ebuild +++ b/dev-php/pecl-timezonedb/pecl-timezonedb-2020.4.ebuild @@ -7,7 +7,7 @@ PHP_EXT_NAME="timezonedb" PHP_EXT_INI="yes" PHP_EXT_ZENDEXT="no" -USE_PHP="php5-6 php7-1 php7-2 php7-3 php7-4" +USE_PHP="php7-2 php7-3 php7-4 php8-0" inherit php-ext-pecl-r3 diff --git a/dev-php/pecl-translit/Manifest b/dev-php/pecl-translit/Manifest index e03c2164d65..15715b90d65 100644 --- a/dev-php/pecl-translit/Manifest +++ b/dev-php/pecl-translit/Manifest @@ -1 +1,2 @@ DIST pecl-translit-0.6.3.tar.gz 227419 BLAKE2B ebff291a00d61bb4f8e2c47e26baef4278f317be8acd7e5265d3056f8992e6b7e792718c86633277c4a0af5403e253b317241a71aba9b73079a8efb53389ab30 SHA512 5b5e3097a972e45424696abea4d4698fc6c7b6598f1a76754224a4b66776752a01b3bad52bc14afb8cc6e75d36c4558677e609a379898cdd91a5b0a652155cd1 +DIST pecl-translit-0.7.1.tar.gz 227287 BLAKE2B 4d9c9a74ec775d720bf4f2742460e7c96f52bac7b0ddec71622818d5e257bf468092b067ce33b335eee78ded8f2e74f0378acb22a18ef7a30db57a78d9215939 SHA512 62a2a26dbc01bd802c16ab0346d8c2a1960c1066b221bc05d609ca49fef26e9ffbbee9b685fbd82ca9b02be954fbd7f5eb2d9de307c746a792b8785f44e64d46 diff --git a/dev-php/pecl-translit/pecl-translit-0.7.1.ebuild b/dev-php/pecl-translit/pecl-translit-0.7.1.ebuild new file mode 100644 index 00000000000..5c7709ce8ef --- /dev/null +++ b/dev-php/pecl-translit/pecl-translit-0.7.1.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +PHP_EXT_NAME="translit" +PHP_EXT_INI="yes" +PHP_EXT_ZENDEXT="no" + +USE_PHP="php7-2 php7-3 php7-4 php8-0" +PHP_EXT_NAME="translit" + +inherit php-ext-source-r3 + +SRC_URI="https://github.com/derickr/${PN}/archive/${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 + done +} diff --git a/dev-php/pecl-uuid/pecl-uuid-1.2.0.ebuild b/dev-php/pecl-uuid/pecl-uuid-1.2.0.ebuild index f030569d725..65d0a5fb0ec 100644 --- a/dev-php/pecl-uuid/pecl-uuid-1.2.0.ebuild +++ b/dev-php/pecl-uuid/pecl-uuid-1.2.0.ebuild @@ -8,7 +8,7 @@ PHP_EXT_INIT="yes" PHP_EXT_ZENDEXT="no" DOCS=( CREDITS ) -USE_PHP="php7-1 php7-2 php7-3 php7-4" +USE_PHP="php7-2 php7-3 php7-4 php8-0" inherit php-ext-pecl-r3 diff --git a/dev-php/pecl-yaml/Manifest b/dev-php/pecl-yaml/Manifest index 1a6b1e831e0..246e3c9e72c 100644 --- a/dev-php/pecl-yaml/Manifest +++ b/dev-php/pecl-yaml/Manifest @@ -1,2 +1,2 @@ -DIST yaml-2.0.4.tgz 39071 BLAKE2B 3a5dba0f6a16087909f4673543d64946e5929a5ef4cc616df6a4225aa2d274b2b5492b00ab0e95ed93f808bc2a4dd0a2f6d60c8c2ded078af35c4499042488d6 SHA512 138e5b4566800fc7d624baf71bc585d6d432755046e598ae9f4099fa565727e04d79bb171289a53eb9e5daa416ffee1b0fb4967c84976ac6cd6fc01b0a05fbae -DIST yaml-2.1.0.tgz 39439 BLAKE2B 76cab7fe0c5cf4140b70dc86333a6a79c6f1684cef9e609b905d626e95cdf5542ef0a95a4e3b7e6b663adc81e240515c4d23b5f029c5519fa88e7178762171b9 SHA512 3731ca2b84e80599d7fae4f58efdd11e9920c672ea6e62ff6b0d57d721d3f6f12ca86efe88f63c324d4ad2b73d6947a21f6e5a47263538ca0d5e822b8fc7b8bd +DIST yaml-2.2.0.tgz 40716 BLAKE2B ef8e4082cf7aa3c6996d878f04b57438fc5fa4eb6672617685b3fd3ba535581329e8bb8d6b0644b97b2d64e951aea2d46d4e702acf02ac283d8e2b43fc82acba SHA512 3af6a0f2bcbab7d0ea21b81c2914a8c65393156b5a974448645ca079edbd616b5f46564e5f55a83d556f8e3fc38573a869f79c9eb3c2449e1c3d410ae32a6fb5 +DIST yaml-2.2.1.tgz 40977 BLAKE2B 110f77058ac2b1c26dcfb7df024bb37ee58c902fc2fe6ff1ba14d981a17591d6cfda157c79d8d991e8edda95818978b83a98ba7b873367788a64f6c1abd78196 SHA512 b171ca9ca108dc093fb0dda3bc9de821fdd8ddcf79d386baba02f367e331f42e6500f26e73577864cd5f8d12f8c9bfe01962fb8d1bb56fa26d6f0a1208ac5441 diff --git a/dev-php/pecl-yaml/pecl-yaml-2.0.4.ebuild b/dev-php/pecl-yaml/pecl-yaml-2.0.4.ebuild deleted file mode 100644 index 3a1a1abfdb9..00000000000 --- a/dev-php/pecl-yaml/pecl-yaml-2.0.4.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -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 php7-3 php7-4 php5-6" - -inherit php-ext-pecl-r3 - -S="${WORKDIR}/yaml-${MY_PV}" -PHP_EXT_S="${S}" -USE_PHP="php7-0 php7-1 php7-2 php7-3 php7-4" - -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 || use php_targets_php7-3 || use php_targets_php7-4 ; then - php-ext-source-r3_src_prepare - else - default_src_prepare - fi -} - -src_install() { - if use php_targets_php7-0 || use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3 || use php_targets_php7-4 ; then - php-ext-pecl-r3_src_install - fi -} diff --git a/dev-php/pecl-yaml/pecl-yaml-2.1.0.ebuild b/dev-php/pecl-yaml/pecl-yaml-2.1.0.ebuild deleted file mode 100644 index 75dd43747a8..00000000000 --- a/dev-php/pecl-yaml/pecl-yaml-2.1.0.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -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 php7-3 php7-4 php5-6" - -inherit php-ext-pecl-r3 - -S="${WORKDIR}/yaml-${MY_PV}" -PHP_EXT_S="${S}" -USE_PHP="php7-0 php7-1 php7-2 php7-3 php7-4" - -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 || use php_targets_php7-3 || use php_targets_php7-4 ; then - php-ext-source-r3_src_prepare - else - default_src_prepare - fi -} - -src_install() { - if use php_targets_php7-0 || use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3 || use php_targets_php7-4 ; then - php-ext-pecl-r3_src_install - fi -} diff --git a/dev-php/pecl-yaml/pecl-yaml-2.2.0.ebuild b/dev-php/pecl-yaml/pecl-yaml-2.2.0.ebuild new file mode 100644 index 00000000000..9a2570bbf2c --- /dev/null +++ b/dev-php/pecl-yaml/pecl-yaml-2.2.0.ebuild @@ -0,0 +1,29 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +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-2 php7-3 php7-4 php8-0" + +inherit php-ext-pecl-r3 + +S="${WORKDIR}/yaml-${MY_PV}" +PHP_EXT_S="${S}" + +KEYWORDS="~amd64 ~arm64 ~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_EXT_ECONF_ARGS=() diff --git a/dev-php/pecl-yaml/pecl-yaml-2.2.1.ebuild b/dev-php/pecl-yaml/pecl-yaml-2.2.1.ebuild new file mode 100644 index 00000000000..f05593acf49 --- /dev/null +++ b/dev-php/pecl-yaml/pecl-yaml-2.2.1.ebuild @@ -0,0 +1,29 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +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-3 php7-4 php8-0" + +inherit php-ext-pecl-r3 + +S="${WORKDIR}/yaml-${MY_PV}" +PHP_EXT_S="${S}" + +KEYWORDS="~amd64 ~arm64 ~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_EXT_ECONF_ARGS=() diff --git a/dev-php/pecl-yaz/files/1.2.3/0001-arginfo_php8-support.patch b/dev-php/pecl-yaz/files/1.2.3/0001-arginfo_php8-support.patch new file mode 100644 index 00000000000..8cc9929f06c --- /dev/null +++ b/dev-php/pecl-yaz/files/1.2.3/0001-arginfo_php8-support.patch @@ -0,0 +1,245 @@ +From e629fb640e11f2358c04fe72d50afbd0a004596c Mon Sep 17 00:00:00 2001 +From: Remi Collet <remi@remirepo.net> +Date: Wed, 23 Sep 2020 16:44:57 +0200 +Subject: [PATCH] add arginfo for all functions - drop support for PHP 4.x - + add compatibility with PHP 8 + +--- + .gitignore | 2 + + package.xml | 2 +- + php_yaz.c | 209 +++++++++++++++++++++++++++++++++++++++------------- + 3 files changed, 162 insertions(+), 51 deletions(-) + +diff --git a/php_yaz.c b/php_yaz.c +index e157815..64b5079 100644 +--- a/php_yaz.c ++++ b/php_yaz.c +@@ -18,6 +18,12 @@ + + #include "php_yaz.h" + ++/* for PHP 8+ */ ++#ifndef TSRMLS_CC ++#define TSRMLS_CC ++#define TSRMLS_DC ++#endif ++ + #ifndef YAZ_VERSIONL + #error YAZ version 3.0.2 or later must be used. + #elif YAZ_VERSIONL < 0x030020 +@@ -138,62 +144,165 @@ static int le_link; + ZEND_GET_MODULE(yaz) + #endif + +-#ifdef ZEND_BEGIN_ARG_INFO +- ZEND_BEGIN_ARG_INFO(first_argument_force_ref, 0) +- ZEND_ARG_PASS_INFO(1) +- ZEND_END_ARG_INFO(); ++ZEND_BEGIN_ARG_INFO_EX(arginfo_yaz_connect, 0, 0, 1) ++ ZEND_ARG_INFO(0, url) ++ ZEND_ARG_INFO(0, options) ++ZEND_END_ARG_INFO(); + +- ZEND_BEGIN_ARG_INFO(second_argument_force_ref, 0) +- ZEND_ARG_PASS_INFO(0) +- ZEND_ARG_PASS_INFO(1) +- ZEND_END_ARG_INFO(); +- +- ZEND_BEGIN_ARG_INFO(third_argument_force_ref, 0) +- ZEND_ARG_PASS_INFO(0) +- ZEND_ARG_PASS_INFO(0) +- ZEND_ARG_PASS_INFO(1) +- ZEND_END_ARG_INFO(); +-#else +-static unsigned char first_argument_force_ref[] = { +- 1, BYREF_FORCE }; +-static unsigned char second_argument_force_ref[] = { +- 2, BYREF_NONE, BYREF_FORCE }; +-static unsigned char third_argument_force_ref[] = { +- 3, BYREF_NONE, BYREF_NONE, BYREF_FORCE }; +-#endif ++ZEND_BEGIN_ARG_INFO_EX(arginfo_yaz_close, 0, 0, 1) ++ ZEND_ARG_INFO(0, id) ++ZEND_END_ARG_INFO(); ++ ++#define arginfo_yaz_present arginfo_yaz_close ++ ++#define arginfo_yaz_errno arginfo_yaz_close ++ ++#define arginfo_yaz_error arginfo_yaz_close ++ ++#define arginfo_yaz_addinfo arginfo_yaz_close ++ ++#define arginfo_yaz_es_result arginfo_yaz_close ++ ++ZEND_BEGIN_ARG_INFO_EX(arginfo_yaz_search, 0, 0, 3) ++ ZEND_ARG_INFO(0, id) ++ ZEND_ARG_INFO(0, type) ++ ZEND_ARG_INFO(0, query) ++ZEND_END_ARG_INFO(); ++ ++ZEND_BEGIN_ARG_INFO_EX(arginfo_yaz_wait, 0, 0, 0) ++ ZEND_ARG_INFO(1, options) ++ZEND_END_ARG_INFO(); ++ ++ZEND_BEGIN_ARG_INFO_EX(arginfo_yaz_hits, 0, 0, 1) ++ ZEND_ARG_INFO(0, id) ++ ZEND_ARG_INFO(1, searchresult) ++ ZEND_ARG_INFO(0, query) ++ZEND_END_ARG_INFO(); ++ ++ZEND_BEGIN_ARG_INFO_EX(arginfo_yaz_record, 0, 0, 3) ++ ZEND_ARG_INFO(0, id) ++ ZEND_ARG_INFO(0, pos) ++ ZEND_ARG_INFO(0, type) ++ZEND_END_ARG_INFO(); ++ ++ZEND_BEGIN_ARG_INFO_EX(arginfo_yaz_syntax, 0, 0, 2) ++ ZEND_ARG_INFO(0, id) ++ ZEND_ARG_INFO(0, syntax) ++ZEND_END_ARG_INFO(); ++ ++ZEND_BEGIN_ARG_INFO_EX(arginfo_yaz_element, 0, 0, 2) ++ ZEND_ARG_INFO(0, id) ++ ZEND_ARG_INFO(0, elementsetname) ++ZEND_END_ARG_INFO(); ++ ++ZEND_BEGIN_ARG_INFO_EX(arginfo_yaz_schema, 0, 0, 2) ++ ZEND_ARG_INFO(0, id) ++ ZEND_ARG_INFO(0, schema) ++ZEND_END_ARG_INFO(); ++ ++ZEND_BEGIN_ARG_INFO_EX(arginfo_yaz_set_option, 0, 0, 2) ++ ZEND_ARG_INFO(0, id) ++ ZEND_ARG_INFO(0, options_or_name) ++ ZEND_ARG_INFO(0, value) ++ZEND_END_ARG_INFO(); ++ ++ZEND_BEGIN_ARG_INFO_EX(arginfo_yaz_get_option, 0, 0, 2) ++ ZEND_ARG_INFO(0, id) ++ ZEND_ARG_INFO(0, name) ++ZEND_END_ARG_INFO(); ++ ++ZEND_BEGIN_ARG_INFO_EX(arginfo_yaz_range, 0, 0, 3) ++ ZEND_ARG_INFO(0, id) ++ ZEND_ARG_INFO(0, start) ++ ZEND_ARG_INFO(0, number) ++ZEND_END_ARG_INFO(); ++ ++ZEND_BEGIN_ARG_INFO_EX(arginfo_yaz_sort, 0, 0, 2) ++ ZEND_ARG_INFO(0, id) ++ ZEND_ARG_INFO(0, sortspec) ++ZEND_END_ARG_INFO(); ++ ++ZEND_BEGIN_ARG_INFO_EX(arginfo_yaz_itemorder, 0, 0, 2) ++ ZEND_ARG_INFO(0, id) ++ ZEND_ARG_INFO(0, package) ++ZEND_END_ARG_INFO(); ++ ++#define arginfo_yaz_ccl_conf arginfo_yaz_itemorder ++ ++#define arginfo_yaz_cql_conf arginfo_yaz_itemorder ++ ++ZEND_BEGIN_ARG_INFO_EX(arginfo_yaz_es, 0, 0, 3) ++ ZEND_ARG_INFO(0, id) ++ ZEND_ARG_INFO(0, type) ++ ZEND_ARG_INFO(0, package) ++ZEND_END_ARG_INFO(); ++ ++ZEND_BEGIN_ARG_INFO_EX(arginfo_yaz_scan, 0, 0, 3) ++ ZEND_ARG_INFO(0, id) ++ ZEND_ARG_INFO(0, type) ++ ZEND_ARG_INFO(0, query) ++ ZEND_ARG_INFO(0, flags) ++ZEND_END_ARG_INFO(); ++ ++ZEND_BEGIN_ARG_INFO_EX(arginfo_yaz_scan_result, 0, 0, 2) ++ ZEND_ARG_INFO(0, id) ++ ZEND_ARG_INFO(1, options) ++ZEND_END_ARG_INFO(); ++ ++ZEND_BEGIN_ARG_INFO_EX(arginfo_yaz_ccl_parse, 0, 0, 3) ++ ZEND_ARG_INFO(0, id) ++ ZEND_ARG_INFO(0, query) ++ ZEND_ARG_INFO(1, result) ++ZEND_END_ARG_INFO(); ++ ++ZEND_BEGIN_ARG_INFO_EX(arginfo_yaz_cql_parse, 0, 0, 4) ++ ZEND_ARG_INFO(0, id) ++ ZEND_ARG_INFO(0, cql) ++ ZEND_ARG_INFO(1, result) ++ ZEND_ARG_INFO(0, rev) ++ZEND_END_ARG_INFO(); ++ ++ZEND_BEGIN_ARG_INFO_EX(arginfo_databases, 0, 0, 2) ++ ZEND_ARG_INFO(0, id) ++ ZEND_ARG_INFO(0, package) ++ZEND_END_ARG_INFO(); + + + zend_function_entry yaz_functions [] = { +- PHP_FE(yaz_connect, NULL) +- PHP_FE(yaz_close, NULL) +- PHP_FE(yaz_search, NULL) +- PHP_FE(yaz_wait, first_argument_force_ref) +- PHP_FE(yaz_errno, NULL) +- PHP_FE(yaz_error, NULL) +- PHP_FE(yaz_addinfo, NULL) +- PHP_FE(yaz_hits, second_argument_force_ref) +- PHP_FE(yaz_record, NULL) +- PHP_FE(yaz_syntax, NULL) +- PHP_FE(yaz_element, NULL) +- PHP_FE(yaz_range, NULL) +- PHP_FE(yaz_itemorder, NULL) +- PHP_FE(yaz_es_result, NULL) +- PHP_FE(yaz_scan, NULL) +- PHP_FE(yaz_scan_result, second_argument_force_ref) +- PHP_FE(yaz_present, NULL) +- PHP_FE(yaz_ccl_conf, NULL) +- PHP_FE(yaz_ccl_parse, third_argument_force_ref) ++ PHP_FE(yaz_connect, arginfo_yaz_connect) ++ PHP_FE(yaz_close, arginfo_yaz_close) ++ PHP_FE(yaz_search, arginfo_yaz_search) ++ PHP_FE(yaz_wait, arginfo_yaz_wait) ++ PHP_FE(yaz_errno, arginfo_yaz_errno) ++ PHP_FE(yaz_error, arginfo_yaz_error) ++ PHP_FE(yaz_addinfo, arginfo_yaz_addinfo) ++ PHP_FE(yaz_hits, arginfo_yaz_hits) ++ PHP_FE(yaz_record, arginfo_yaz_record) ++ PHP_FE(yaz_syntax, arginfo_yaz_syntax) ++ PHP_FE(yaz_element, arginfo_yaz_element) ++ PHP_FE(yaz_range, arginfo_yaz_range) ++ PHP_FE(yaz_itemorder, arginfo_yaz_itemorder) ++ PHP_FE(yaz_es_result, arginfo_yaz_es_result) ++ PHP_FE(yaz_scan, arginfo_yaz_scan) ++ PHP_FE(yaz_scan_result, arginfo_yaz_scan_result) ++ PHP_FE(yaz_present, arginfo_yaz_present) ++ PHP_FE(yaz_ccl_conf, arginfo_yaz_ccl_conf) ++ PHP_FE(yaz_ccl_parse, arginfo_yaz_ccl_parse) + #if YAZ_VERSIONL >= 0x050100 +- PHP_FE(yaz_cql_parse, third_argument_force_ref) +- PHP_FE(yaz_cql_conf, NULL) +-#endif +- PHP_FE(yaz_database, NULL) +- PHP_FE(yaz_sort, NULL) +- PHP_FE(yaz_schema, NULL) +- PHP_FE(yaz_set_option, NULL) +- PHP_FE(yaz_get_option, NULL) +- PHP_FE(yaz_es, NULL) ++ PHP_FE(yaz_cql_parse, arginfo_yaz_cql_parse) ++ PHP_FE(yaz_cql_conf, arginfo_yaz_cql_conf) ++#endif ++ PHP_FE(yaz_database, arginfo_databases) ++ PHP_FE(yaz_sort, arginfo_yaz_sort) ++ PHP_FE(yaz_schema, arginfo_yaz_schema) ++ PHP_FE(yaz_set_option, arginfo_yaz_set_option) ++ PHP_FE(yaz_get_option, arginfo_yaz_get_option) ++ PHP_FE(yaz_es, arginfo_yaz_es) ++#ifdef PHP_FE_END ++ PHP_FE_END ++#else + {NULL, NULL, NULL} ++#endif + }; + + static void get_assoc(INTERNAL_FUNCTION_PARAMETERS, zval *id, Yaz_Association *assocp) diff --git a/dev-php/pecl-yaz/files/1.2.3/0002-arginfo-fixes.patch b/dev-php/pecl-yaz/files/1.2.3/0002-arginfo-fixes.patch new file mode 100644 index 00000000000..53cde0a9276 --- /dev/null +++ b/dev-php/pecl-yaz/files/1.2.3/0002-arginfo-fixes.patch @@ -0,0 +1,39 @@ +From 323962299bae3b2085dde44790785a39878f5f9a Mon Sep 17 00:00:00 2001 +From: Adam Dickmeiss <adam@indexdata.dk> +Date: Thu, 24 Sep 2020 19:45:58 +0200 +Subject: [PATCH] Fixes for arg info + +--- + php_yaz.c | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +diff --git a/php_yaz.c b/php_yaz.c +index 64b5079..de9693d 100644 +--- a/php_yaz.c ++++ b/php_yaz.c +@@ -176,7 +176,6 @@ ZEND_END_ARG_INFO(); + ZEND_BEGIN_ARG_INFO_EX(arginfo_yaz_hits, 0, 0, 1) + ZEND_ARG_INFO(0, id) + ZEND_ARG_INFO(1, searchresult) +- ZEND_ARG_INFO(0, query) + ZEND_END_ARG_INFO(); + + ZEND_BEGIN_ARG_INFO_EX(arginfo_yaz_record, 0, 0, 3) +@@ -244,7 +243,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_yaz_scan, 0, 0, 3) + ZEND_ARG_INFO(0, flags) + ZEND_END_ARG_INFO(); + +-ZEND_BEGIN_ARG_INFO_EX(arginfo_yaz_scan_result, 0, 0, 2) ++ZEND_BEGIN_ARG_INFO_EX(arginfo_yaz_scan_result, 0, 0, 1) + ZEND_ARG_INFO(0, id) + ZEND_ARG_INFO(1, options) + ZEND_END_ARG_INFO(); +@@ -264,7 +263,7 @@ ZEND_END_ARG_INFO(); + + ZEND_BEGIN_ARG_INFO_EX(arginfo_databases, 0, 0, 2) + ZEND_ARG_INFO(0, id) +- ZEND_ARG_INFO(0, package) ++ ZEND_ARG_INFO(0, databases) + ZEND_END_ARG_INFO(); + + diff --git a/dev-php/pecl-yaz/pecl-yaz-1.2.3-r1.ebuild b/dev-php/pecl-yaz/pecl-yaz-1.2.3-r1.ebuild new file mode 100644 index 00000000000..1b66eaf384c --- /dev/null +++ b/dev-php/pecl-yaz/pecl-yaz-1.2.3-r1.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PHP_EXT_NAME="yaz" +PHP_EXT_INI="yes" +PHP_EXT_ZENDEXT="no" +DOCS=( README ) + +USE_PHP="php7-3 php7-4 php8-0" + +inherit php-ext-pecl-r3 + +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86" + +DESCRIPTION="This extension implements a Z39.50 client for PHP using the YAZ toolkit" +LICENSE="BSD" +SLOT="0" +IUSE="" + +DEPEND=">=dev-libs/yaz-3.0.2:0=" +RDEPEND="${DEPEND}" + +# Needs network access +RESTRICT="test" + +PHP_EXT_ECONF_ARGS="--with-yaz=/usr" + +PATCHES=( "${FILESDIR}/${PV}" ) diff --git a/dev-php/pecl-yaz/pecl-yaz-1.2.3.ebuild b/dev-php/pecl-yaz/pecl-yaz-1.2.3.ebuild index 21295a2e6fa..3fcf919582e 100644 --- a/dev-php/pecl-yaz/pecl-yaz-1.2.3.ebuild +++ b/dev-php/pecl-yaz/pecl-yaz-1.2.3.ebuild @@ -12,7 +12,7 @@ USE_PHP="php5-6 php7-0 php7-1 php7-2 php7-3 php7-4" inherit php-ext-pecl-r3 -KEYWORDS="~alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86" DESCRIPTION="This extension implements a Z39.50 client for PHP using the YAZ toolkit" LICENSE="BSD" diff --git a/dev-php/pecl-zmq/metadata.xml b/dev-php/pecl-zmq/metadata.xml index 0a03180aed3..b86acf66c75 100644 --- a/dev-php/pecl-zmq/metadata.xml +++ b/dev-php/pecl-zmq/metadata.xml @@ -5,7 +5,4 @@ <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-r2.ebuild b/dev-php/pecl-zmq/pecl-zmq-1.1.3-r2.ebuild deleted file mode 100644 index 5e4b0582a2a..00000000000 --- a/dev-php/pecl-zmq/pecl-zmq-1.1.3-r2.ebuild +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -USE_PHP="php5-6 php7-0 php7-1 php7-2 php7-3 php7-4" - -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" - -PATCHES=( "${FILESDIR}"/${P}-php7-3-compatibility.patch ) - -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-1.1.3-r3.ebuild b/dev-php/pecl-zmq/pecl-zmq-1.1.3-r3.ebuild new file mode 100644 index 00000000000..d183c65cd90 --- /dev/null +++ b/dev-php/pecl-zmq/pecl-zmq-1.1.3-r3.ebuild @@ -0,0 +1,28 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +USE_PHP="php7-2 php7-3 php7-4" +inherit php-ext-pecl-r3 + +if [[ ${PV} == "9999" ]]; then + SRC_URI="" + EGIT_REPO_URI="https://github.com/mkoppanen/php-zmq.git" + EGIT_CHECKOUT_DIR="${PHP_EXT_S}" + + inherit git-r3 +else + KEYWORDS="~amd64 ~x86" +fi + +DESCRIPTION="PHP Bindings for ZeroMQ messaging" +LICENSE="BSD" +SLOT="0" +IUSE="" + +BDEPEND="virtual/pkgconfig" +DEPEND="net-libs/zeromq" +RDEPEND="net-libs/zeromq:=" + +PATCHES=( "${FILESDIR}"/${PN}-1.1.3-php7-3-compatibility.patch ) diff --git a/dev-php/pecl-zmq/pecl-zmq-9999.ebuild b/dev-php/pecl-zmq/pecl-zmq-9999.ebuild index 945516fcd0c..538ecc14c75 100644 --- a/dev-php/pecl-zmq/pecl-zmq-9999.ebuild +++ b/dev-php/pecl-zmq/pecl-zmq-9999.ebuild @@ -4,23 +4,23 @@ EAPI="7" USE_PHP="php7-2 php7-3 php7-4" +inherit php-ext-pecl-r3 -inherit php-ext-pecl-r3 git-r3 +if [[ ${PV} == "9999" ]]; then + SRC_URI="" + EGIT_REPO_URI="https://github.com/mkoppanen/php-zmq.git" + EGIT_CHECKOUT_DIR="${PHP_EXT_S}" -KEYWORDS="" + inherit git-r3 +else + KEYWORDS="~amd64 ~x86" +fi DESCRIPTION="PHP Bindings for ZeroMQ messaging" LICENSE="BSD" SLOT="0" -IUSE="czmq" +IUSE="" -RDEPEND="net-libs/zeromq czmq? ( net-libs/czmq:= )" -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 -} +BDEPEND="virtual/pkgconfig" +DEPEND="net-libs/zeromq" +RDEPEND="net-libs/zeromq:=" diff --git a/dev-php/phar-io-manifest/metadata.xml b/dev-php/phar-io-manifest/metadata.xml index 622fae9de47..6d8979386a5 100644 --- a/dev-php/phar-io-manifest/metadata.xml +++ b/dev-php/phar-io-manifest/metadata.xml @@ -5,6 +5,7 @@ <email>php-bugs@gentoo.org</email> <name>PHP</name> </maintainer> + <stabilize-allarches/> <upstream> <remote-id type="github">phar-io/manifest</remote-id> </upstream> diff --git a/dev-php/phar-io-manifest/phar-io-manifest-1.0.3.ebuild b/dev-php/phar-io-manifest/phar-io-manifest-1.0.3.ebuild index 53576524a25..22306e0b6d7 100644 --- a/dev-php/phar-io-manifest/phar-io-manifest-1.0.3.ebuild +++ b/dev-php/phar-io-manifest/phar-io-manifest-1.0.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -9,7 +9,7 @@ SRC_URI="https://github.com/phar-io/manifest/archive/${PV}.tar.gz -> ${P}.tar.gz LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86" IUSE="examples" S="${WORKDIR}/manifest-${PV}" diff --git a/dev-php/phar-io-version/metadata.xml b/dev-php/phar-io-version/metadata.xml index 49b1640723c..6c3ddbcee7c 100644 --- a/dev-php/phar-io-version/metadata.xml +++ b/dev-php/phar-io-version/metadata.xml @@ -5,6 +5,7 @@ <email>php-bugs@gentoo.org</email> <name>PHP</name> </maintainer> + <stabilize-allarches/> <upstream> <remote-id type="github">phar-io/version</remote-id> </upstream> diff --git a/dev-php/phar-io-version/phar-io-version-2.0.1.ebuild b/dev-php/phar-io-version/phar-io-version-2.0.1.ebuild index 1ddbd002159..122d7410f89 100644 --- a/dev-php/phar-io-version/phar-io-version-2.0.1.ebuild +++ b/dev-php/phar-io-version/phar-io-version-2.0.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -9,7 +9,7 @@ SRC_URI="https://github.com/phar-io/version/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86" IUSE="" S="${WORKDIR}/version-${PV}" diff --git a/dev-php/php-redmine-api/php-redmine-api-1.5.16.ebuild b/dev-php/php-redmine-api/php-redmine-api-1.5.16.ebuild index 74bf4b9df94..a49c9672f80 100644 --- a/dev-php/php-redmine-api/php-redmine-api-1.5.16.ebuild +++ b/dev-php/php-redmine-api/php-redmine-api-1.5.16.ebuild @@ -13,7 +13,7 @@ KEYWORDS="~amd64 ~x86" IUSE="test" RESTRICT="!test? ( test )" -RDEPEND="dev-lang/php:*[curl,json,simplexml]" +RDEPEND="dev-lang/php:*[curl,json(+),simplexml]" BDEPEND="test? ( ${RDEPEND} <dev-php/phpunit-6 )" src_install() { 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 index 0a816cb06bb..770222f7cad 100644 --- 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 @@ -13,7 +13,7 @@ KEYWORDS="amd64 x86" IUSE="test" RESTRICT="!test? ( test )" -RDEPEND="dev-lang/php:*[curl,json,simplexml]" +RDEPEND="dev-lang/php:*[curl,json(+),simplexml]" DEPEND="test? ( ${RDEPEND} <dev-php/phpunit-6 )" src_install() { 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 index df7fc22e980..f2aa1de51a0 100644 --- a/dev-php/phpdocumentor-reflection-common/phpdocumentor-reflection-common-1.0.ebuild +++ b/dev-php/phpdocumentor-reflection-common/phpdocumentor-reflection-common-1.0.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://github.com/${MY_VENDOR}/${MY_PN}/archive/${PV}.tar.gz -> ${P}.t LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86" IUSE="" S="${WORKDIR}/${MY_PN}-${PV}" 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 index bade1b51f23..e444d50c097 100644 --- 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 @@ -12,7 +12,7 @@ SRC_URI="https://github.com/${MY_VENDOR}/${MY_PN}/archive/${PV}.tar.gz -> ${P}.t LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86" IUSE="" S="${WORKDIR}/${MY_PN}-${PV}" 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 index 7cbd16a1c11..43ea54707d9 100644 --- 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 @@ -12,7 +12,7 @@ SRC_URI="https://github.com/${MY_VENDOR}/${MY_PN}/archive/${PV}.tar.gz -> ${P}.t LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86" IUSE="" S="${WORKDIR}/${MY_PN}-${PV}" diff --git a/dev-php/phpspec-prophecy/metadata.xml b/dev-php/phpspec-prophecy/metadata.xml index d8cce3e6219..b76362a66e7 100644 --- a/dev-php/phpspec-prophecy/metadata.xml +++ b/dev-php/phpspec-prophecy/metadata.xml @@ -5,6 +5,7 @@ <email>php-bugs@gentoo.org</email> <name>PHP</name> </maintainer> + <stabilize-allarches/> <upstream> <remote-id type="github">phpspec/prophecy</remote-id> </upstream> diff --git a/dev-php/phpspec-prophecy/phpspec-prophecy-1.10.3-r1.ebuild b/dev-php/phpspec-prophecy/phpspec-prophecy-1.10.3-r1.ebuild index 3dad3fd76a4..0b396d498f7 100644 --- a/dev-php/phpspec-prophecy/phpspec-prophecy-1.10.3-r1.ebuild +++ b/dev-php/phpspec-prophecy/phpspec-prophecy-1.10.3-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -12,7 +12,7 @@ SRC_URI="https://github.com/${MY_VENDOR}/${MY_PN}/archive/v${PV}.tar.gz -> ${P}. LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86" IUSE="" S="${WORKDIR}/prophecy-${PV}" diff --git a/dev-php/phpspec-prophecy/phpspec-prophecy-1.7.0.ebuild b/dev-php/phpspec-prophecy/phpspec-prophecy-1.7.0.ebuild index e4e8addb9b6..2a7be15445c 100644 --- a/dev-php/phpspec-prophecy/phpspec-prophecy-1.7.0.ebuild +++ b/dev-php/phpspec-prophecy/phpspec-prophecy-1.7.0.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://github.com/${MY_VENDOR}/${MY_PN}/archive/v${PV}.tar.gz -> ${P}. LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86" IUSE="" S="${WORKDIR}/${MY_PN}-${PV}" 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 index e409f8167f0..e54d3abab3f 100644 --- 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 @@ -9,7 +9,7 @@ SRC_URI="https://github.com/sebastianbergmann/${PN}/archive/${PV}.tar.gz -> ${P} LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86" IUSE="" RDEPEND="dev-php/fedora-autoloader diff --git a/dev-php/phpunit/Manifest b/dev-php/phpunit/Manifest index f525c5b1a4b..7115dcf2cc0 100644 --- a/dev-php/phpunit/Manifest +++ b/dev-php/phpunit/Manifest @@ -1,2 +1,2 @@ DIST phpunit-5.7.15.tar.gz 205474 BLAKE2B 0220edd59fc3f191b7621f275d3e4ee8f8bf514f74533d99bfb925e11cc54a235fb292ffd1bb54f6bec1e038c06e35a0dc43c1227618590f99e7e85638a7de28 SHA512 6a836e1ad1656fd1d1c5a58ced3c1826b4decc01798b6a804b487c9b4e094ec32f6eb8a84058e268eade62a2fe19d7bd1e760b8b9433299d9fe9c09afdf2bdd3 -DIST phpunit-8.5.5.tar.gz 158108 BLAKE2B ecdc339aa501d6f56eb13a26dae290a60609a8804c4160e339ac6900df70647fa3bba1e4a2fa9fb01b0363d0afa57b3e05305d7d055ac8ec03519c503ac3791e SHA512 22209ec189af58e490c688fe7e72c3388dabb497daa4d8c73f7c84036e39b4ae36d89f72b65c67f46487c8bc96f0c0e6760a3d44a3107c5a27eef52f764dd738 +DIST phpunit-8.5.11.tar.gz 159302 BLAKE2B fdf156842b3607f4cbd26194efd7eb7cb204fb1d1d078c0c6bd3bb68e520e5d748767f8aab64b7c9bf313161e3d84e08d415fbf0408c26541ec1f70cfe7af8bd SHA512 3e9db4a1d6c5bea3546b24bd837479a0114a9200f96034aabc96933dfb42c1237b03f7118f19eeb1216e32f2034c1ec8c632d20ecacbe70d3660fbbfd167ac79 diff --git a/dev-php/phpunit/files/autoload-8.5.0.php b/dev-php/phpunit/files/autoload-8.5.0.php deleted file mode 100644 index 179ff7f276c..00000000000 --- a/dev-php/phpunit/files/autoload-8.5.0.php +++ /dev/null @@ -1,254 +0,0 @@ -<?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( -[ -'phpunit\\exception' => '/Exception.php', -'phpunit\\framework\\assert' => '/Framework/Assert.php', -'phpunit\\framework\\assertionfailederror' => '/Framework/Exception/AssertionFailedError.php', -'phpunit\\framework\\codecoverageexception' => '/Framework/Exception/CodeCoverageException.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\\constraint' => '/Framework/Constraint/Constraint.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\\exceptionmessageregularexpression' => '/Framework/Constraint/ExceptionMessageRegularExpression.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\\jsonmatcheserrormessageprovider' => '/Framework/Constraint/JsonMatchesErrorMessageProvider.php', -'phpunit\\framework\\constraint\\lessthan' => '/Framework/Constraint/LessThan.php', -'phpunit\\framework\\constraint\\logicaland' => '/Framework/Constraint/LogicalAnd.php', -'phpunit\\framework\\constraint\\logicalnot' => '/Framework/Constraint/LogicalNot.php', -'phpunit\\framework\\constraint\\logicalor' => '/Framework/Constraint/LogicalOr.php', -'phpunit\\framework\\constraint\\logicalxor' => '/Framework/Constraint/LogicalXor.php', -'phpunit\\framework\\constraint\\objecthasattribute' => '/Framework/Constraint/ObjectHasAttribute.php', -'phpunit\\framework\\constraint\\regularexpression' => '/Framework/Constraint/RegularExpression.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\\stringmatchesformatdescription' => '/Framework/Constraint/StringMatchesFormatDescription.php', -'phpunit\\framework\\constraint\\stringstartswith' => '/Framework/Constraint/StringStartsWith.php', -'phpunit\\framework\\constraint\\traversablecontains' => '/Framework/Constraint/TraversableContains.php', -'phpunit\\framework\\constraint\\traversablecontainsequal' => '/Framework/Constraint/TraversableContainsEqual.php', -'phpunit\\framework\\constraint\\traversablecontainsidentical' => '/Framework/Constraint/TraversableContainsIdentical.php', -'phpunit\\framework\\constraint\\traversablecontainsonly' => '/Framework/Constraint/TraversableContainsOnly.php', -'phpunit\\framework\\coveredcodenotexecutedexception' => '/Framework/Exception/CoveredCodeNotExecutedException.php', -'phpunit\\framework\\dataprovidertestsuite' => '/Framework/DataProviderTestSuite.php', -'phpunit\\framework\\error\\deprecated' => '/Framework/Error/Deprecated.php', -'phpunit\\framework\\error\\error' => '/Framework/Error/Error.php', -'phpunit\\framework\\error\\notice' => '/Framework/Error/Notice.php', -'phpunit\\framework\\error\\warning' => '/Framework/Error/Warning.php', -'phpunit\\framework\\exception' => '/Framework/Exception/Exception.php', -'phpunit\\framework\\exceptionwrapper' => '/Framework/ExceptionWrapper.php', -'phpunit\\framework\\expectationfailedexception' => '/Framework/Exception/ExpectationFailedException.php', -'phpunit\\framework\\incompletetest' => '/Framework/IncompleteTest.php', -'phpunit\\framework\\incompletetestcase' => '/Framework/IncompleteTestCase.php', -'phpunit\\framework\\incompletetesterror' => '/Framework/Exception/IncompleteTestError.php', -'phpunit\\framework\\invalidargumentexception' => '/Framework/Exception/InvalidArgumentException.php', -'phpunit\\framework\\invalidcoverstargetexception' => '/Framework/Exception/InvalidCoversTargetException.php', -'phpunit\\framework\\invaliddataproviderexception' => '/Framework/Exception/InvalidDataProviderException.php', -'phpunit\\framework\\invalidparametergroupexception' => '/Framework/InvalidParameterGroupException.php', -'phpunit\\framework\\missingcoversannotationexception' => '/Framework/Exception/MissingCoversAnnotationException.php', -'phpunit\\framework\\mockobject\\api' => '/Framework/MockObject/Api/Api.php', -'phpunit\\framework\\mockobject\\badmethodcallexception' => '/Framework/MockObject/Exception/BadMethodCallException.php', -'phpunit\\framework\\mockobject\\builder\\identity' => '/Framework/MockObject/Builder/Identity.php', -'phpunit\\framework\\mockobject\\builder\\invocationmocker' => '/Framework/MockObject/Builder/InvocationMocker.php', -'phpunit\\framework\\mockobject\\builder\\invocationstubber' => '/Framework/MockObject/Builder/InvocationStubber.php', -'phpunit\\framework\\mockobject\\builder\\match' => '/Framework/MockObject/Builder/Match.php', -'phpunit\\framework\\mockobject\\builder\\methodnamematch' => '/Framework/MockObject/Builder/MethodNameMatch.php', -'phpunit\\framework\\mockobject\\builder\\parametersmatch' => '/Framework/MockObject/Builder/ParametersMatch.php', -'phpunit\\framework\\mockobject\\builder\\stub' => '/Framework/MockObject/Builder/Stub.php', -'phpunit\\framework\\mockobject\\configurablemethod' => '/Framework/MockObject/ConfigurableMethod.php', -'phpunit\\framework\\mockobject\\configurablemethodsalreadyinitializedexception' => '/Framework/MockObject/Exception/ConfigurableMethodsAlreadyInitializedException.php', -'phpunit\\framework\\mockobject\\exception' => '/Framework/MockObject/Exception/Exception.php', -'phpunit\\framework\\mockobject\\generator' => '/Framework/MockObject/Generator.php', -'phpunit\\framework\\mockobject\\incompatiblereturnvalueexception' => '/Framework/MockObject/Exception/IncompatibleReturnValueException.php', -'phpunit\\framework\\mockobject\\invocation' => '/Framework/MockObject/Invocation.php', -'phpunit\\framework\\mockobject\\invocationhandler' => '/Framework/MockObject/InvocationHandler.php', -'phpunit\\framework\\mockobject\\matcher' => '/Framework/MockObject/Matcher.php', -'phpunit\\framework\\mockobject\\method' => '/Framework/MockObject/Api/Method.php', -'phpunit\\framework\\mockobject\\methodnameconstraint' => '/Framework/MockObject/MethodNameConstraint.php', -'phpunit\\framework\\mockobject\\mockbuilder' => '/Framework/MockObject/MockBuilder.php', -'phpunit\\framework\\mockobject\\mockclass' => '/Framework/MockObject/MockClass.php', -'phpunit\\framework\\mockobject\\mockmethod' => '/Framework/MockObject/MockMethod.php', -'phpunit\\framework\\mockobject\\mockmethodset' => '/Framework/MockObject/MockMethodSet.php', -'phpunit\\framework\\mockobject\\mockobject' => '/Framework/MockObject/MockObject.php', -'phpunit\\framework\\mockobject\\mocktrait' => '/Framework/MockObject/MockTrait.php', -'phpunit\\framework\\mockobject\\mocktype' => '/Framework/MockObject/MockType.php', -'phpunit\\framework\\mockobject\\mockedclonemethod' => '/Framework/MockObject/Api/MockedCloneMethod.php', -'phpunit\\framework\\mockobject\\rule\\anyinvokedcount' => '/Framework/MockObject/Rule/AnyInvokedCount.php', -'phpunit\\framework\\mockobject\\rule\\anyparameters' => '/Framework/MockObject/Rule/AnyParameters.php', -'phpunit\\framework\\mockobject\\rule\\consecutiveparameters' => '/Framework/MockObject/Rule/ConsecutiveParameters.php', -'phpunit\\framework\\mockobject\\rule\\invocationorder' => '/Framework/MockObject/Rule/InvocationOrder.php', -'phpunit\\framework\\mockobject\\rule\\invokedatindex' => '/Framework/MockObject/Rule/InvokedAtIndex.php', -'phpunit\\framework\\mockobject\\rule\\invokedatleastcount' => '/Framework/MockObject/Rule/InvokedAtLeastCount.php', -'phpunit\\framework\\mockobject\\rule\\invokedatleastonce' => '/Framework/MockObject/Rule/InvokedAtLeastOnce.php', -'phpunit\\framework\\mockobject\\rule\\invokedatmostcount' => '/Framework/MockObject/Rule/InvokedAtMostCount.php', -'phpunit\\framework\\mockobject\\rule\\invokedcount' => '/Framework/MockObject/Rule/InvokedCount.php', -'phpunit\\framework\\mockobject\\rule\\methodname' => '/Framework/MockObject/Rule/MethodName.php', -'phpunit\\framework\\mockobject\\rule\\parameters' => '/Framework/MockObject/Rule/Parameters.php', -'phpunit\\framework\\mockobject\\rule\\parametersrule' => '/Framework/MockObject/Rule/ParametersRule.php', -'phpunit\\framework\\mockobject\\runtimedxception' => '/Framework/MockObject/Exception/RuntimeException.php', -'phpunit\\framework\\mockobject\\stub' => '/Framework/MockObject/Stub.php', -'phpunit\\framework\\mockobject\\stub\\consecutivecalls' => '/Framework/MockObject/Stub/ConsecutiveCalls.php', -'phpunit\\framework\\mockobject\\stub\\exception' => '/Framework/MockObject/Stub/Exception.php', -'phpunit\\framework\\mockobject\\stub\\returnargument' => '/Framework/MockObject/Stub/ReturnArgument.php', -'phpunit\\framework\\mockobject\\stub\\returncallback' => '/Framework/MockObject/Stub/ReturnCallback.php', -'phpunit\\framework\\mockobject\\stub\\returnreference' => '/Framework/MockObject/Stub/ReturnReference.php', -'phpunit\\framework\\mockobject\\stub\\returnself' => '/Framework/MockObject/Stub/ReturnSelf.php', -'phpunit\\framework\\mockobject\\stub\\returnstub' => '/Framework/MockObject/Stub/ReturnStub.php', -'phpunit\\framework\\mockobject\\stub\\returnvaluemap' => '/Framework/MockObject/Stub/ReturnValueMap.php', -'phpunit\\framework\\mockobject\\stub\\stub' => '/Framework/MockObject/Stub/Stub.php', -'phpunit\\framework\\mockobject\\unmockedclonemethod' => '/Framework/MockObject/Api/UnmockedCloneMethod.php', -'phpunit\\framework\\mockobject\\verifiable' => '/Framework/MockObject/Verifiable.php', -'phpunit\\framework\\nochildtestsuiteexception' => '/Framework/Exception/NoChildTestSuiteException.php', -'phpunit\\framework\\outputerror' => '/Framework/Exception/OutputError.php', -'phpunit\\framework\\phptassertionfailederror' => '/Framework/Exception/PHPTAssertionFailedError.php', -'phpunit\\framework\\riskytesterror' => '/Framework/Exception/RiskyTestError.php', -'phpunit\\framework\\selfdescribing' => '/Framework/SelfDescribing.php', -'phpunit\\framework\\skippedtest' => '/Framework/SkippedTest.php', -'phpunit\\framework\\skippedtestcase' => '/Framework/SkippedTestCase.php', -'phpunit\\framework\\skippedtesterror' => '/Framework/Exception/SkippedTestError.php', -'phpunit\\framework\\skippedtestsuiteerror' => '/Framework/Exception/SkippedTestSuiteError.php', -'phpunit\\framework\\syntheticerror' => '/Framework/Exception/SyntheticError.php', -'phpunit\\framework\\syntheticskippederror' => '/Framework/Exception/SyntheticSkippedError.php', -'phpunit\\framework\\test' => '/Framework/Test.php', -'phpunit\\framework\\testbuilder' => '/Framework/TestBuilder.php', -'phpunit\\framework\\testcase' => '/Framework/TestCase.php', -'phpunit\\framework\\testfailure' => '/Framework/TestFailure.php', -'phpunit\\framework\\testlistener' => '/Framework/TestListener.php', -'phpunit\\framework\\testlistenerdefaultimplementation' => '/Framework/TestListenerDefaultImplementation.php', -'phpunit\\framework\\testresult' => '/Framework/TestResult.php', -'phpunit\\framework\\testsuite' => '/Framework/TestSuite.php', -'phpunit\\framework\\testsuiteiterator' => '/Framework/TestSuiteIterator.php', -'phpunit\\framework\\unintentionallycoveredcodeerror' => '/Framework/Exception/UnintentionallyCoveredCodeError.php', -'phpunit\\framework\\warning' => '/Framework/Exception/Warning.php', -'phpunit\\framework\\warningTestCase' => '/Framework/WarningTestCase.php', -'phpunit\\runner\\afterincompletetesthook' => '/Runner/Hook/AfterIncompleteTestHook.php', -'phpunit\\runner\\afterlasttesthook' => '/Runner/Hook/AfterLastTestHook.php', -'phpunit\\runner\\afterriskytesthook' => '/Runner/Hook/AfterRiskyTestHook.php', -'phpunit\\runner\\afterskippedtesthook' => '/Runner/Hook/AfterSkippedTestHook.php', -'phpunit\\runner\\aftersuccessfultesthook' => '/Runner/Hook/AfterSuccessfulTestHook.php', -'phpunit\\runner\\aftertesterrorhook' => '/Runner/Hook/AfterTestErrorHook.php', -'phpunit\\runner\\aftertestfailurehook' => '/Runner/Hook/AfterTestFailureHook.php', -'phpunit\\runner\\aftertesthook' => '/Runner/Hook/AfterTestHook.php', -'phpunit\\runner\\aftertestwarninghook' => '/Runner/Hook/AfterTestWarningHook.php', -'phpunit\\runner\\basetestrunner' => '/Runner/BaseTestRunner.php', -'phpunit\\runner\\beforefirsttesthHook' => '/Runner/Hook/BeforeFirstTestHook.php', -'phpunit\\runner\\beforetesthook' => '/Runner/Hook/BeforeTestHook.php', -'phpunit\\runner\\defaulttestresultcache' => '/Runner/DefaultTestResultCache.php', -'phpunit\\runner\\exception' => '/Runner/Exception.php', -'phpunit\\runner\\filter\\excludegroupfilteriterator' => '/Runner/Filter/ExcludeGroupFilterIterator.php', -'phpunit\\runner\\filter\\factory' => '/Runner/Filter/Factory.php', -'phpunit\\runner\\filter\\groupfilteriterator' => '/Runner/Filter/GroupFilterIterator.php', -'phpunit\\runner\\filter\\includegroupfilteriterator' => '/Runner/Filter/IncludeGroupFilterIterator.php', -'phpunit\\runner\\filter\\namefilteriterator' => '/Runner/Filter/NameFilterIterator.php', -'phpunit\\runner\\hook' => '/Runner/Hook/Hook.php', -'phpunit\\runner\\nulltestresultcache' => '/Runner/NullTestResultCache.php', -'phpunit\\runner\\phpttestcase' => '/Runner/PhptTestCase.php', -'phpunit\\runner\\resultcacheextension' => '/Runner/ResultCacheExtension.php', -'phpunit\\runner\\standardtestsuiteloader' => '/Runner/StandardTestSuiteLoader.php', -'phpunit\\runner\\testhook' => '/Runner/Hook/TestHook.php', -'phpunit\\runner\\testlisteneradapter' => '/Runner/Hook/TestListenerAdapter.php', -'phpunit\\runner\\testresultcache' => '/Runner/TestResultCache.php', -'phpunit\\runner\\testsuiteloader' => '/Runner/TestSuiteLoader.php', -'phpunit\\runner\\testsuitesorter' => '/Runner/TestSuiteSorter.php', -'phpunit\\runner\\version' => '/Runner/Version.php', -'phpunit\\textui\\command' => '/TextUI/Command.php', -'phpunit\\textui\\exception' => '/TextUI/Exception.php', -'phpunit\\textui\\help' => '/TextUI/Help.php', -'phpunit\\textui\\resultprinter' => '/TextUI/ResultPrinter.php', -'phpunit\\textui\\testrunner' => '/TextUI/TestRunner.php', -'phpunit\\util\\annotation\\docblock' => '/Util/Annotation/DocBlock.php', -'phpunit\\util\\annotation\\registry' => '/Util/Annotation/Registry.php', -'phpunit\\util\\blacklist' => '/Util/Blacklist.php', -'phpunit\\util\\color' => '/Util/Color.php', -'phpunit\\util\\configuration' => '/Util/Configuration.php', -'phpunit\\util\\configurationgenerator' => '/Util/ConfigurationGenerator.php', -'phpunit\\util\\errorhandler' => '/Util/ErrorHandler.php', -'phpunit\\util\\exception' => '/Util/Exception.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\\invaliddatasetexception' => '/Util/InvalidDataSetException.php', -'phpunit\\util\\json' => '/Util/Json.php', -'phpunit\\util\\log\\junit' => '/Util/Log/JUnit.php', -'phpunit\\util\\log\\teamcity' => '/Util/Log/TeamCity.php', -'phpunit\\util\\php\\abstractphpprocess' => '/Util/PHP/AbstractPhpProcess.php', -'phpunit\\util\\php\\defaultphpprocess' => '/Util/PHP/DefaultPhpProcess.php', -'phpunit\\util\\php\\windowsphpprocess' => '/Util/PHP/WindowsPhpProcess.php', -'phpunit\\util\\printer' => '/Util/Printer.php', -'phpunit\\util\\regularexpression' => '/Util/RegularExpression.php', -'phpunit\\util\\test' => '/Util/Test.php', -'phpunit\\util\\testdox\\clitestdoxprinter' => '/Util/TestDox/CliTestDoxPrinter.php', -'phpunit\\util\\testdox\\htmlresultprinter' => '/Util/TestDox/HtmlResultPrinter.php', -'phpunit\\util\\testdox\\nameprettifier' => '/Util/TestDox/NamePrettifier.php', -'phpunit\\util\\testdox\\resultprinter' => '/Util/TestDox/ResultPrinter.php', -'phpunit\\util\\testdox\\testdoxprinter' => '/Util/TestDox/TestDoxPrinter.php', -'phpunit\\util\\testdox\\textresultprinter' => '/Util/TestDox/TextResultPrinter.php', -'phpunit\\util\\testdox\\xmlresultprinter' => '/Util/TestDox/XmlResultPrinter.php', -'phpunit\\util\\texttestlistrenderer' => '/Util/TextTestListRenderer.php', -'phpunit\\util\\type' => '/Util/Type.php', -'phpunit\\util\\xdebugfilterscriptgenerator' => '/Util/XdebugFilterScriptGenerator.php', -'phpunit\\util\\xml' => '/Util/Xml.php', -'phpunit\\util\\xmltestlistrenderer' => '/Util/XmlTestListRenderer.php', -], - "${include_dir}/PHPUnit" -); - -// Dependencies -\Fedora\Autoloader\Dependencies::required([ - "${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}/SebastianBergmann/Type/autoload.php", - "${include_dir}/SebastianBergmann/Version/autoload.php", - "${include_dir}/Symfony/Component/Yaml/autoload.php", - "${include_dir}/Text/Template/autoload.php", - "${include_dir}/myclabs/DeepCopy/autoload.php", - "${include_dir}/phpspec/Prophecy/autoload.php", - "${include_dir}/Doctrine/Instantiator/autoload.php", - "${include_dir}/PharIo/Manifest/autoload.php", - "${include_dir}/PharIo/Version/autoload.php", -]); - diff --git a/dev-php/phpunit/metadata.xml b/dev-php/phpunit/metadata.xml index 44a54c50110..74464b97d41 100644 --- a/dev-php/phpunit/metadata.xml +++ b/dev-php/phpunit/metadata.xml @@ -5,6 +5,7 @@ <email>php-bugs@gentoo.org</email> <name>PHP</name> </maintainer> + <stabilize-allarches/> <upstream> <remote-id type="github">sebastianbergmann/phpunit</remote-id> </upstream> diff --git a/dev-php/phpunit/phpunit-5.7.15-r3.ebuild b/dev-php/phpunit/phpunit-5.7.15-r3.ebuild index b5d7ddf00b8..601e1c9086e 100644 --- a/dev-php/phpunit/phpunit-5.7.15-r3.ebuild +++ b/dev-php/phpunit/phpunit-5.7.15-r3.ebuild @@ -9,7 +9,7 @@ SRC_URI="https://github.com/sebastianbergmann/${PN}/archive/${PV}.tar.gz -> ${P} LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86" IUSE="" RDEPEND="dev-php/fedora-autoloader diff --git a/dev-php/phpunit/phpunit-8.5.11.ebuild b/dev-php/phpunit/phpunit-8.5.11.ebuild new file mode 100644 index 00000000000..5d87e351797 --- /dev/null +++ b/dev-php/phpunit/phpunit-8.5.11.ebuild @@ -0,0 +1,96 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DESCRIPTION="A PHP Unit Testing framework" +HOMEPAGE="https://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 sparc x86" + +BDEPEND="dev-php/theseer-Autoload" + +RDEPEND="dev-php/fedora-autoloader + >=dev-php/File_Iterator-2.0.2 + >=dev-php/Text_Template-1.2.1 + >=dev-php/PHP_CodeCoverage-7.0.12 + >=dev-php/PHP_Timer-2.1.2 + >=dev-php/doctrine-instantiator-1.3.1 + >=dev-php/myclabs-deepcopy-1.10.0 + >=dev-php/phar-io-manifest-1.0.3 + >=dev-php/phar-io-version-2.0.1 + >=dev-php/phpspec-prophecy-1.10.3 + >=dev-php/sebastian-comparator-3.0.2 + >=dev-php/sebastian-diff-3.0.2 + >=dev-php/sebastian-environment-4.2.3 + >=dev-php/sebastian-exporter-3.1.2 + >=dev-php/sebastian-global-state-3.0.0 + >=dev-php/sebastian-object-enumerator-3.0.3 + >=dev-php/sebastian-resource-operations-2.0.1 + >=dev-php/sebastian-type-1.1.3 + >=dev-php/sebastian-version-2.0.1 + || ( + dev-lang/php:7.4[cli(-),json(-),unicode(-),xml(-),xmlwriter(-)] + dev-lang/php:7.3[cli(-),json(-),unicode(-),xml(-),xmlwriter(-)] + dev-lang/php:7.2[cli(-),json(-),unicode(-),xml(-),xmlwriter(-)] + ) + !dev-php/phpunit-mock-objects +" + +src_prepare() { + default + + mkdir src/vendor || die + + phpab \ + --output src/vendor/autoload.php \ + --template fedora2 \ + --basedir src/vendor \ + src || die + + cat >> src/vendor/autoload.php <<EOF || die "failed to extend autoload.php" + +// Dependencies +\Fedora\Autoloader\Dependencies::required([ + __DIR__ . '/../../File/Iterator/autoload.php', + __DIR__ . '/../../Text/Template/autoload.php', + __DIR__ . '/../../PHP/CodeCoverage/autoload.php', + __DIR__ . '/../../PHP/Timer/autoload.php', + __DIR__ . '/../../phpspec/Prophecy/autoload.php', + __DIR__ . '/../../SebastianBergmann/Diff/autoload.php', // Before comparator which may load v2 + __DIR__ . '/../../SebastianBergmann/Comparator/autoload.php', + __DIR__ . '/../../SebastianBergmann/Environment/autoload.php', + __DIR__ . '/../../SebastianBergmann/Exporter/autoload.php', + __DIR__ . '/../../SebastianBergmann/GlobalState/autoload.php', + __DIR__ . '/../../SebastianBergmann/ObjectEnumerator/autoload.php', + __DIR__ . '/../../SebastianBergmann/ResourceOperations/autoload.php', + __DIR__ . '/../../SebastianBergmann/Type/autoload.php', + __DIR__ . '/../../SebastianBergmann/Version/autoload.php', + __DIR__ . '/../../Doctrine/Instantiator/autoload.php', + __DIR__ . '/../../myclabs/DeepCopy/autoload.php', + __DIR__ . '/../../PharIo/Manifest/autoload.php', + __DIR__ . '/../../PharIo/Version/autoload.php', +]); +EOF +} + +src_install() { + insinto /usr/share/php/PHPUnit + doins -r src/* + + # referenced by PHPUnit/Util/Configuration.php + insinto /usr/share/php/ + doins phpunit.xsd + + 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/phpunit/phpunit-8.5.5.ebuild b/dev-php/phpunit/phpunit-8.5.5.ebuild deleted file mode 100644 index 3632144aa1d..00000000000 --- a/dev-php/phpunit/phpunit-8.5.5.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="A PHP Unit Testing framework" -HOMEPAGE="https://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 ~sparc ~x86" -IUSE="" - -RDEPEND="dev-php/fedora-autoloader - >=dev-php/File_Iterator-2.0.2 - <dev-php/File_Iterator-3.0 - >=dev-php/Text_Template-1.2.1 - <dev-php/Text_Template-2.0 - >=dev-php/PHP_CodeCoverage-7.0.7 - <dev-php/PHP_CodeCoverage-8.0 - >=dev-php/PHP_Timer-2.1.2 - <dev-php/PHP_Timer-3.0 - >=dev-php/doctrine-instantiator-1.2 - <dev-php/doctrine-instantiator-2.0 - >=dev-php/myclabs-deepcopy-1.9.1 - <dev-php/myclabs-deepcopy-2.0 - >=dev-php/phar-io-manifest-1.0.3 - <dev-php/phar-io-manifest-2.0 - >=dev-php/phar-io-version-2.0.1 - <dev-php/phar-io-version-3.0 - >=dev-php/phpspec-prophecy-1.8.1 - <dev-php/phpspec-prophecy-2.0 - >=dev-php/sebastian-comparator-3.0.2 - <dev-php/sebastian-comparator-4.0 - >=dev-php/sebastian-diff-3.0.2 - <dev-php/sebastian-diff-4.0 - >=dev-php/sebastian-environment-4.2.2 - <dev-php/sebastian-environment-5.0 - >=dev-php/sebastian-exporter-3.1.1 - <dev-php/sebastian-exporter-4.0 - >=dev-php/sebastian-global-state-3.0 - <dev-php/sebastian-global-state-4.0 - >=dev-php/sebastian-object-enumerator-3.0.3 - <dev-php/sebastian-object-enumerator-4.0 - >=dev-php/sebastian-resource-operations-2.0.1 - <dev-php/sebastian-resource-operations-3.0 - <dev-php/sebastian-type-2.0 - <dev-php/sebastian-version-3.0 - >=dev-lang/php-7.2:*[cli(-),json(-),unicode(-),xml(-),xmlwriter(-)] - !dev-php/phpunit-mock-objects -" - -src_install() { - insinto /usr/share/php/PHPUnit - doins -r src/* - insinto /usr/share/php/PHPUnit/vendor - newins "${FILESDIR}/autoload-8.5.0.php" autoload.php - exeinto /usr/share/php/PHPUnit - doexe phpunit - dosym ../share/php/PHPUnit/phpunit /usr/bin/phpunit - insinto /usr/share/php - doins phpunit.xsd -} - -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/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 index fe3fe4c5731..1488738b635 100644 --- 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 @@ -11,7 +11,7 @@ SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> $ LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86" IUSE="" S="${WORKDIR}/${MY_PN}-${PV}" diff --git a/dev-php/sebastian-comparator/metadata.xml b/dev-php/sebastian-comparator/metadata.xml index f5ad6af5af2..607692ad79b 100644 --- a/dev-php/sebastian-comparator/metadata.xml +++ b/dev-php/sebastian-comparator/metadata.xml @@ -5,7 +5,8 @@ <email>php-bugs@gentoo.org</email> <name>PHP</name> </maintainer> + <stabilize-allarches/> <upstream> - <remote-id type="github">sebastianbergmann/</remote-id> + <remote-id type="github">sebastianbergmann/comparator</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 index b7d54c4f9eb..87983369a3c 100644 --- a/dev-php/sebastian-comparator/sebastian-comparator-1.2.4.ebuild +++ b/dev-php/sebastian-comparator/sebastian-comparator-1.2.4.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> $ LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86" IUSE="" S="${WORKDIR}/${MY_PN}-${PV}" diff --git a/dev-php/sebastian-comparator/sebastian-comparator-3.0.2.ebuild b/dev-php/sebastian-comparator/sebastian-comparator-3.0.2.ebuild index 6a72c10c4c3..1967df75968 100644 --- a/dev-php/sebastian-comparator/sebastian-comparator-3.0.2.ebuild +++ b/dev-php/sebastian-comparator/sebastian-comparator-3.0.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> $ LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86" IUSE="" S="${WORKDIR}/${MY_PN}-${PV}" diff --git a/dev-php/sebastian-diff/metadata.xml b/dev-php/sebastian-diff/metadata.xml index 352667478b8..cea1ce8254e 100644 --- a/dev-php/sebastian-diff/metadata.xml +++ b/dev-php/sebastian-diff/metadata.xml @@ -5,6 +5,7 @@ <email>php-bugs@gentoo.org</email> <name>PHP</name> </maintainer> + <stabilize-allarches/> <upstream> <remote-id type="github">sebastianbergmann/diff</remote-id> </upstream> 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 index af5f88ca992..a91aa10b3ce 100644 --- a/dev-php/sebastian-diff/sebastian-diff-1.4.1-r1.ebuild +++ b/dev-php/sebastian-diff/sebastian-diff-1.4.1-r1.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> $ LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86" IUSE="" S="${WORKDIR}/${MY_PN}-${PV}" diff --git a/dev-php/sebastian-diff/sebastian-diff-3.0.2.ebuild b/dev-php/sebastian-diff/sebastian-diff-3.0.2.ebuild index 50d48dc717e..5fa9f76c31c 100644 --- a/dev-php/sebastian-diff/sebastian-diff-3.0.2.ebuild +++ b/dev-php/sebastian-diff/sebastian-diff-3.0.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> $ LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86" IUSE="" S="${WORKDIR}/${MY_PN}-${PV}" diff --git a/dev-php/sebastian-environment/metadata.xml b/dev-php/sebastian-environment/metadata.xml index f5ad6af5af2..4e30d328d8e 100644 --- a/dev-php/sebastian-environment/metadata.xml +++ b/dev-php/sebastian-environment/metadata.xml @@ -5,7 +5,8 @@ <email>php-bugs@gentoo.org</email> <name>PHP</name> </maintainer> + <stabilize-allarches/> <upstream> - <remote-id type="github">sebastianbergmann/</remote-id> + <remote-id type="github">sebastianbergmann/environment</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 index a3609d1ece9..cbe1d4def8e 100644 --- a/dev-php/sebastian-environment/sebastian-environment-2.0.0.ebuild +++ b/dev-php/sebastian-environment/sebastian-environment-2.0.0.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> $ LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86" IUSE="" S="${WORKDIR}/${MY_PN}-${PV}" diff --git a/dev-php/sebastian-environment/sebastian-environment-4.2.3.ebuild b/dev-php/sebastian-environment/sebastian-environment-4.2.3.ebuild index e9350c66506..3813f97d805 100644 --- a/dev-php/sebastian-environment/sebastian-environment-4.2.3.ebuild +++ b/dev-php/sebastian-environment/sebastian-environment-4.2.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> $ LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86" IUSE="" S="${WORKDIR}/${MY_PN}-${PV}" diff --git a/dev-php/sebastian-exporter/metadata.xml b/dev-php/sebastian-exporter/metadata.xml index f5ad6af5af2..55f315d88b2 100644 --- a/dev-php/sebastian-exporter/metadata.xml +++ b/dev-php/sebastian-exporter/metadata.xml @@ -5,7 +5,8 @@ <email>php-bugs@gentoo.org</email> <name>PHP</name> </maintainer> + <stabilize-allarches/> <upstream> - <remote-id type="github">sebastianbergmann/</remote-id> + <remote-id type="github">sebastianbergmann/exporter</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 index fed44830adf..c009cfcb320 100644 --- a/dev-php/sebastian-exporter/sebastian-exporter-2.0.0.ebuild +++ b/dev-php/sebastian-exporter/sebastian-exporter-2.0.0.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> $ LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86" IUSE="" S="${WORKDIR}/${MY_PN}-${PV}" diff --git a/dev-php/sebastian-exporter/sebastian-exporter-3.1.2.ebuild b/dev-php/sebastian-exporter/sebastian-exporter-3.1.2.ebuild index 05fd48dc1ca..7de2b3bc07d 100644 --- a/dev-php/sebastian-exporter/sebastian-exporter-3.1.2.ebuild +++ b/dev-php/sebastian-exporter/sebastian-exporter-3.1.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> $ LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86" IUSE="" S="${WORKDIR}/${MY_PN}-${PV}" diff --git a/dev-php/sebastian-global-state/metadata.xml b/dev-php/sebastian-global-state/metadata.xml index f5ad6af5af2..35f3da7eb09 100644 --- a/dev-php/sebastian-global-state/metadata.xml +++ b/dev-php/sebastian-global-state/metadata.xml @@ -5,7 +5,8 @@ <email>php-bugs@gentoo.org</email> <name>PHP</name> </maintainer> + <stabilize-allarches/> <upstream> - <remote-id type="github">sebastianbergmann/</remote-id> + <remote-id type="github">sebastianbergmann/global-state</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 index 100d9e83a7c..256ac1e6d49 100644 --- 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 @@ -11,7 +11,7 @@ SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> $ LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86" IUSE="" S="${WORKDIR}/${MY_PN}-${PV}" diff --git a/dev-php/sebastian-global-state/sebastian-global-state-3.0.0.ebuild b/dev-php/sebastian-global-state/sebastian-global-state-3.0.0.ebuild index f2aaba7905c..70730172261 100644 --- a/dev-php/sebastian-global-state/sebastian-global-state-3.0.0.ebuild +++ b/dev-php/sebastian-global-state/sebastian-global-state-3.0.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> $ LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86" IUSE="" S="${WORKDIR}/${MY_PN}-${PV}" diff --git a/dev-php/sebastian-object-enumerator/metadata.xml b/dev-php/sebastian-object-enumerator/metadata.xml index f5ad6af5af2..a2011f31835 100644 --- a/dev-php/sebastian-object-enumerator/metadata.xml +++ b/dev-php/sebastian-object-enumerator/metadata.xml @@ -5,7 +5,8 @@ <email>php-bugs@gentoo.org</email> <name>PHP</name> </maintainer> + <stabilize-allarches/> <upstream> - <remote-id type="github">sebastianbergmann/</remote-id> + <remote-id type="github">sebastianbergmann/object-enumerator</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 index 3a50601608a..99e54f1f8ba 100644 --- 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 @@ -11,7 +11,7 @@ SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> $ LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86" IUSE="" S="${WORKDIR}/${MY_PN}-${PV}" diff --git a/dev-php/sebastian-object-enumerator/sebastian-object-enumerator-3.0.3.ebuild b/dev-php/sebastian-object-enumerator/sebastian-object-enumerator-3.0.3.ebuild index c0b63b0beb3..90dcda08ea7 100644 --- a/dev-php/sebastian-object-enumerator/sebastian-object-enumerator-3.0.3.ebuild +++ b/dev-php/sebastian-object-enumerator/sebastian-object-enumerator-3.0.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> $ LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86" IUSE="" S="${WORKDIR}/${MY_PN}-${PV}" diff --git a/dev-php/sebastian-object-reflector/metadata.xml b/dev-php/sebastian-object-reflector/metadata.xml index 145e45a7391..3a587854421 100644 --- a/dev-php/sebastian-object-reflector/metadata.xml +++ b/dev-php/sebastian-object-reflector/metadata.xml @@ -5,6 +5,7 @@ <email>php-bugs@gentoo.org</email> <name>PHP</name> </maintainer> + <stabilize-allarches/> <upstream> <remote-id type="github">sebastianbergmann/version</remote-id> </upstream> diff --git a/dev-php/sebastian-object-reflector/sebastian-object-reflector-1.1.1.ebuild b/dev-php/sebastian-object-reflector/sebastian-object-reflector-1.1.1.ebuild index 56dd2650e47..fc8ff64226f 100644 --- a/dev-php/sebastian-object-reflector/sebastian-object-reflector-1.1.1.ebuild +++ b/dev-php/sebastian-object-reflector/sebastian-object-reflector-1.1.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> $ LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86" IUSE="" S="${WORKDIR}/${MY_PN}-${PV}" diff --git a/dev-php/sebastian-recursion-context/metadata.xml b/dev-php/sebastian-recursion-context/metadata.xml index f5ad6af5af2..86013f0ac3b 100644 --- a/dev-php/sebastian-recursion-context/metadata.xml +++ b/dev-php/sebastian-recursion-context/metadata.xml @@ -5,7 +5,8 @@ <email>php-bugs@gentoo.org</email> <name>PHP</name> </maintainer> + <stabilize-allarches/> <upstream> - <remote-id type="github">sebastianbergmann/</remote-id> + <remote-id type="github">sebastianbergmann/recursion-context</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 index 940e38fd87d..7aeb39d9e64 100644 --- 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 @@ -11,7 +11,7 @@ SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> $ LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86" IUSE="" S="${WORKDIR}/${MY_PN}-${PV}" diff --git a/dev-php/sebastian-recursion-context/sebastian-recursion-context-3.0.0.ebuild b/dev-php/sebastian-recursion-context/sebastian-recursion-context-3.0.0.ebuild index 830d7827501..fc0a0fd747d 100644 --- a/dev-php/sebastian-recursion-context/sebastian-recursion-context-3.0.0.ebuild +++ b/dev-php/sebastian-recursion-context/sebastian-recursion-context-3.0.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> $ LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86" IUSE="" S="${WORKDIR}/${MY_PN}-${PV}" diff --git a/dev-php/sebastian-resource-operations/metadata.xml b/dev-php/sebastian-resource-operations/metadata.xml index f5ad6af5af2..01f9ba8700c 100644 --- a/dev-php/sebastian-resource-operations/metadata.xml +++ b/dev-php/sebastian-resource-operations/metadata.xml @@ -5,7 +5,8 @@ <email>php-bugs@gentoo.org</email> <name>PHP</name> </maintainer> + <stabilize-allarches/> <upstream> - <remote-id type="github">sebastianbergmann/</remote-id> + <remote-id type="github">sebastianbergmann/resource-operations</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 index f0216f9ebff..df963717269 100644 --- 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 @@ -11,7 +11,7 @@ SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> $ LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86" IUSE="" S="${WORKDIR}/${MY_PN}-${PV}" diff --git a/dev-php/sebastian-resource-operations/sebastian-resource-operations-2.0.1.ebuild b/dev-php/sebastian-resource-operations/sebastian-resource-operations-2.0.1.ebuild index 678588caefb..e79868e3a85 100644 --- a/dev-php/sebastian-resource-operations/sebastian-resource-operations-2.0.1.ebuild +++ b/dev-php/sebastian-resource-operations/sebastian-resource-operations-2.0.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> $ LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86" IUSE="" S="${WORKDIR}/${MY_PN}-${PV}" diff --git a/dev-php/sebastian-type/metadata.xml b/dev-php/sebastian-type/metadata.xml index 59391408bb9..326e8c45cbc 100644 --- a/dev-php/sebastian-type/metadata.xml +++ b/dev-php/sebastian-type/metadata.xml @@ -5,6 +5,7 @@ <email>php-bugs@gentoo.org</email> <name>PHP</name> </maintainer> + <stabilize-allarches/> <upstream> <remote-id type="github">sebastianbergmann/type</remote-id> </upstream> diff --git a/dev-php/sebastian-type/sebastian-type-1.1.3.ebuild b/dev-php/sebastian-type/sebastian-type-1.1.3.ebuild index f3e2397ed3a..4de31893593 100644 --- a/dev-php/sebastian-type/sebastian-type-1.1.3.ebuild +++ b/dev-php/sebastian-type/sebastian-type-1.1.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> $ LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86" IUSE="" S="${WORKDIR}/${MY_PN}-${PV}" diff --git a/dev-php/sebastian-version/sebastian-version-2.0.1.ebuild b/dev-php/sebastian-version/sebastian-version-2.0.1.ebuild index 81d4571947e..5e8a7430255 100644 --- a/dev-php/sebastian-version/sebastian-version-2.0.1.ebuild +++ b/dev-php/sebastian-version/sebastian-version-2.0.1.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> $ LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86" IUSE="" S="${WORKDIR}/${MY_PN}-${PV}" diff --git a/dev-php/smarty/Manifest b/dev-php/smarty/Manifest index 8a87b2c4360..97154d28eb5 100644 --- a/dev-php/smarty/Manifest +++ b/dev-php/smarty/Manifest @@ -1,2 +1,3 @@ DIST manual-en.3.1.14.zip 408414 BLAKE2B 03d4e7a386eb3bd5b19e5c555ec34b86812838a5b5fac8ec0ab9701fba89a5867714da57d950f68224a89bbe2267c18d638ee850681860de309c74bbfb3d0a0b SHA512 d384e3856b45ed3f992f3732a5465120abe9fb947cdf13ff67a9c4264f72987d24885ee61cd7309b728e64cdfe4f34c3e7f757096d35de56d962f3b78def9e58 DIST smarty-3.1.33.tar.gz 249999 BLAKE2B 1e174b190238c8b20d5dae9c0c9fdf264c4716ba850599a2a028fe6c307eb3d9d2611e3b928efb9471e051496e4e31502458cd7a71a9318e012d5af7eca2c50e SHA512 443473cf12c7e053744daef7a70d4172979d760278aa1593216d0b70f0c12ca2b48eb79486a1c10a1cf2264da671804b94ee9d538b9013ff0bdc42e28639ca5d +DIST smarty-3.1.36.tar.gz 264169 BLAKE2B 56c1f361b5aa1fedca13546c717b85f6b54555761f45ba60959358433638714ec5136ad7b506696be3fa96fef14a29fb584e490e7a627ba9a1fd7d65e05cac42 SHA512 242014d4b39d162683bece8e8e29f1913f902c334a6ee0a4c84c1cfb7e06d1e0d7990b63833c8ffa7c4604306b5159caf00bcf2a4c0b6b379bf26768da75148d diff --git a/dev-php/smarty/smarty-3.1.33.ebuild b/dev-php/smarty/smarty-3.1.33.ebuild index 17f7e078559..838dc8fab1c 100644 --- a/dev-php/smarty/smarty-3.1.33.ebuild +++ b/dev-php/smarty/smarty-3.1.33.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://github.com/smarty-php/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g LICENSE="LGPL-3" SLOT="0" -KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86" +KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86" IUSE="doc" BDEPEND="doc? ( app-arch/unzip )" diff --git a/dev-php/smarty/smarty-3.1.36.ebuild b/dev-php/smarty/smarty-3.1.36.ebuild new file mode 100644 index 00000000000..358ecbf11f6 --- /dev/null +++ b/dev-php/smarty/smarty-3.1.36.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +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" + +BDEPEND="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/swoole/Manifest b/dev-php/swoole/Manifest index d7f433f861c..64550949ad5 100644 --- a/dev-php/swoole/Manifest +++ b/dev-php/swoole/Manifest @@ -4,3 +4,4 @@ DIST swoole-4.4.14.tgz 1440095 BLAKE2B 8a893604a84f750b95bb63a3c6ce9869a80a700b5 DIST swoole-4.4.15.tgz 1454897 BLAKE2B 38f804e5f2f41ba2bc32ac2e6fd7be3e03f7a361487d7dad41bdc2ee3f2489d41824f60a841de1e3dea0cbf105d11dc1b5c2225ae49a02155604bc09c990ed61 SHA512 5ad797b38a20cfa17b0aa1fc5ab4f6446b84debb38babc05630e07833895401c778f1c6cf9eb32d7204b02c0e170ba6e613f356a054baa29ac511c19ce59620f DIST swoole-4.4.16.tgz 1457270 BLAKE2B 4b65270aa1014ea68cadae8eb021d37498dc3fe0bf2d681c95bf7113928138bc26ab73f3be91185eb5ecebcb4940906814913c7908c87592aafd33fbc1820bf7 SHA512 7be4705967ed6b7a955f679f8c39585d34dc8c87ba608ac3ae2b0fc3cae9513d9639c8e9aac4278ce85acc215b500044626aab9b2aac725c9ffaef72dfb02dd7 DIST swoole-4.4.19.tgz 1469420 BLAKE2B 0240b5fbd6a4625d426d0c960859b8215122fff10be9e70823eb32f196d3ec075a952dc133258b04c323439de982079f5acbab9039958c457aa18f1687118ce3 SHA512 be4671da9fdbf65daf6364e5eaca9b25fd3557bec848a04b636ace48c896d4dbf08f6e877d6166571aa966732a70037bf2d4ba2f302696dd2b1371e2de993106 +DIST swoole-4.5.9.tgz 1552445 BLAKE2B 602ce65f7b59a3c199d7718aeb941d1ebde7d59096335992c2278f7e330f7b48554a8418cc4014f6fcf47af92d315368a16c572055b1fd9575608c2559ed3107 SHA512 9154a2874480218aa3c8935979267efb92a3d5a4f1ba7dc071bf4c2b169d69e31a6ad7412785d00543dc5827ce2d6c5999b6cabea2089818f3f57acc26bcb31f diff --git a/dev-php/swoole/swoole-4.5.9.ebuild b/dev-php/swoole/swoole-4.5.9.ebuild new file mode 100644 index 00000000000..721b5a84f00 --- /dev/null +++ b/dev-php/swoole/swoole-4.5.9.ebuild @@ -0,0 +1,68 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +PHP_EXT_NAME="swoole" +PHP_EXT_INI="yes" +PHP_EXT_ZENDEXT="no" +PHP_EXT_SAPIS="cli" +PHP_EXT_NEEDED_USE="cli,sockets?" +DOCS=( README.md ) + +USE_PHP="php7-2 php7-3 php7-4 php8-0" + +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" +# Tests can hang. Disable until this no longer happens +RESTRICT="test" + +DEPEND=" + app-arch/brotli:0= + dev-libs/libpcre + sys-libs/zlib:0= + ssl? ( + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:0= ) + ) + mysql? ( + php_targets_php7-2? ( dev-lang/php:7.2[mysql,mysqli(+)] ) + php_targets_php7-3? ( dev-lang/php:7.3[mysql,mysqli(+)] ) + php_targets_php7-4? ( dev-lang/php:7.4[mysql,mysqli(+)] ) + php_targets_php8-0? ( dev-lang/php:8.0[mysql,mysqli(+)] ) + ) +" + +RDEPEND="${DEPEND}" + +IUSE="debug http2 libressl mysql sockets ssl" + +src_configure() { + # JEMalloc not included as it refuses to find a ${EROOT}/usr/includes/jemalloc subdirectory + local PHP_EXT_ECONF_ARGS=( + --enable-swoole + $(use_enable debug) + $(use_enable http2) + $(use_enable mysql mysqlnd) + $(use_enable ssl openssl) + $(use_with ssl openssl-dir "${EROOT}/usr") + $(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}" + [[ -f tests/template.phpt ]] && rm tests/template.phpt + SKIP_ONLINE_TESTS="yes" NO_INTERACTION="yes" emake test + done +} diff --git a/dev-php/symfony-yaml/symfony-yaml-2.1.0.ebuild b/dev-php/symfony-yaml/symfony-yaml-2.1.0.ebuild index cb87bb539e1..d0cd3eafe32 100644 --- a/dev-php/symfony-yaml/symfony-yaml-2.1.0.ebuild +++ b/dev-php/symfony-yaml/symfony-yaml-2.1.0.ebuild @@ -9,7 +9,7 @@ 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 sparc x86" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86" IUSE="test" RESTRICT="test" diff --git a/dev-php/theseer-Autoload/Manifest b/dev-php/theseer-Autoload/Manifest new file mode 100644 index 00000000000..8317998a990 --- /dev/null +++ b/dev-php/theseer-Autoload/Manifest @@ -0,0 +1 @@ +DIST theseer-Autoload-1.26.0.tar.gz 43119 BLAKE2B 7b2413bc2fb281472cee03010c175aae1c8304ab0629c31f09e11497bd6f46d58bae8625da610f5a513b19fc8aafc45c35be7271ba13188466f576e7b4a7392f SHA512 c8fcb3ad39c140517d695c44e6dea3797ea0135ff64246478e55cbf167e4b9fbb3e5027732c201f66b404039a313952c7125f13fdeb1cd96633dbccfdda6f143 diff --git a/dev-php/theseer-Autoload/files/autoload.php.tpl b/dev-php/theseer-Autoload/files/autoload.php.tpl new file mode 100644 index 00000000000..cb88eb77c45 --- /dev/null +++ b/dev-php/theseer-Autoload/files/autoload.php.tpl @@ -0,0 +1,26 @@ +<?php + +require_once 'TheSeer/DirectoryScanner/autoload.php'; +require_once 'ezc/Base/autoload.php'; +require_once 'ezc/ConsoleTools/autoload.php'; + +// @codingStandardsIgnoreFile +// @codeCoverageIgnoreStart +// this is an autogenerated file - do not edit +spl_autoload_register( + function($class) { + static $classes = null; + if ($classes === null) { + $classes = array( + ___CLASSLIST___ + ); + } + $cn = strtolower($class); + if (isset($classes[$cn])) { + require ___BASEDIR___$classes[$cn]; + } + }, + true, + false +); +// @codeCoverageIgnoreEnd diff --git a/dev-php/theseer-Autoload/files/fedora.php.tpl b/dev-php/theseer-Autoload/files/fedora.php.tpl new file mode 100644 index 00000000000..d05f2723189 --- /dev/null +++ b/dev-php/theseer-Autoload/files/fedora.php.tpl @@ -0,0 +1,12 @@ +<?php +// @codingStandardsIgnoreFile +// @codeCoverageIgnoreStart +require_once '/usr/share/php/Fedora/Autoloader'.'/autoload.php'; + +\Fedora\Autoloader\Autoload::addClassMap( + array( + ___CLASSLIST___, + ), + __DIR__ +); +// @codeCoverageIgnoreEnd diff --git a/dev-php/theseer-Autoload/files/fedora2.php.tpl b/dev-php/theseer-Autoload/files/fedora2.php.tpl new file mode 100644 index 00000000000..b337b9646b3 --- /dev/null +++ b/dev-php/theseer-Autoload/files/fedora2.php.tpl @@ -0,0 +1,12 @@ +<?php +// @codingStandardsIgnoreFile +// @codeCoverageIgnoreStart +require_once 'Fedora/Autoloader'.'/autoload.php'; + +\Fedora\Autoloader\Autoload::addClassMap( + array( + ___CLASSLIST___, + ), + __DIR__ +); +// @codeCoverageIgnoreEnd diff --git a/dev-php/theseer-Autoload/files/theseer-Autoload-1.26.0-autoload.php.patch b/dev-php/theseer-Autoload/files/theseer-Autoload-1.26.0-autoload.php.patch new file mode 100644 index 00000000000..d85409d4712 --- /dev/null +++ b/dev-php/theseer-Autoload/files/theseer-Autoload-1.26.0-autoload.php.patch @@ -0,0 +1,12 @@ +--- a/composer/bin/phpab ++++ b/composer/bin/phpab +@@ -56,7 +56,7 @@ foreach ($files as $file) { + } + } + +-require __DIR__ . '/../../src/autoload.php'; ++require 'TheSeer/Autoload/autoload.php'; + + $factory = new \TheSeer\Autoload\Factory(); + $factory->getCLI()->run(); + diff --git a/dev-php/theseer-Autoload/metadata.xml b/dev-php/theseer-Autoload/metadata.xml new file mode 100644 index 00000000000..b5b10907e1e --- /dev/null +++ b/dev-php/theseer-Autoload/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> + <stabilize-allarches/> + <upstream> + <remote-id type="github">theseer/Autoload</remote-id> + </upstream> +</pkgmetadata> diff --git a/dev-php/theseer-Autoload/theseer-Autoload-1.26.0.ebuild b/dev-php/theseer-Autoload/theseer-Autoload-1.26.0.ebuild new file mode 100644 index 00000000000..aea089e67f8 --- /dev/null +++ b/dev-php/theseer-Autoload/theseer-Autoload-1.26.0.ebuild @@ -0,0 +1,82 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +MY_PN="Autoload" + +DESCRIPTION="PHP Autoload Builder" +HOMEPAGE="https://github.com/theseer/Autoload" +SRC_URI="https://github.com/theseer/${MY_PN}/archive/1.26.0.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86" +IUSE="test" +RESTRICT="!test? ( test )" + +CDEPEND="dev-lang/php:* + >=dev-php/theseer-DirectoryScanner-1.3 + <dev-php/theseer-DirectoryScanner-2 + >=dev-php/zetacomponents-Base-1.8 + <dev-php/zetacomponents-Base-2 + >=dev-php/zetacomponents-ConsoleTools-1.7.1 + <dev-php/zetacomponents-ConsoleTools-2" + +BDEPEND="${CDEPEND} + test? ( + >=dev-php/phpunit-8 + <dev-php/phpunit-9 + )" + +RDEPEND="${CDEPEND}" + +PATCHES=( "${FILESDIR}"/${PN}-1.26.0-autoload.php.patch ) + +S="${WORKDIR}/${MY_PN}-${PV}" + +src_prepare() { + default + + # Set version + sed -i \ + -e "s/%development%/${PV}/" \ + phpab.php \ + composer/bin/phpab \ + || die + + cp --target-directory src/templates/ci \ + "${FILESDIR}"/fedora.php.tpl \ + "${FILESDIR}"/fedora2.php.tpl \ + || die + + # Mimick layout to bootstrap phpab + mkdir --parents \ + vendor/theseer/directoryscanner \ + vendor/zetacomponents/base \ + vendor/zetacomponents/console-tools \ + || die + + ln -s /usr/share/php/TheSeer/DirectoryScanner vendor/theseer/directoryscanner/src || die + ln -s /usr/share/php/ezc/Base vendor/zetacomponents/base/src || die + ln -s /usr/share/php/ezc/ConsoleTools vendor/zetacomponents/console-tools/src || die + + ./phpab.php \ + --output src/autoload.php \ + --template "${FILESDIR}"/autoload.php.tpl \ + --basedir src \ + src || die +} + +src_test() { + phpunit --no-coverage --verbose || die "Unit testing failed!" +} + +src_install() { + insinto /usr/share/php/TheSeer/${MY_PN} + doins -r src/* + + dobin "${S}"/composer/bin/phpab + + einstalldocs +} diff --git a/dev-php/theseer-DirectoryScanner/Manifest b/dev-php/theseer-DirectoryScanner/Manifest new file mode 100644 index 00000000000..8ff466068a0 --- /dev/null +++ b/dev-php/theseer-DirectoryScanner/Manifest @@ -0,0 +1 @@ +DIST theseer-DirectoryScanner-1.3.2.tar.gz 9262 BLAKE2B 5b16781d9ccd030ea779b286b9d22c528468db52e39c6761e91e0f9f83d4a50e1775382eca4eea0f027cc508f7dd35e416664451f83bdfae8607cf074e5ed9cb SHA512 720db8baa40983918e5c0d7cfac194e26d877becf6e55868ca21c1ab0a4366b86a8aad2c700e38a6360e280d372db0f1be6c80dbb81d279c277bf9f56a6cbadf diff --git a/dev-php/theseer-DirectoryScanner/metadata.xml b/dev-php/theseer-DirectoryScanner/metadata.xml new file mode 100644 index 00000000000..39ec8ddf167 --- /dev/null +++ b/dev-php/theseer-DirectoryScanner/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> + <stabilize-allarches/> + <upstream> + <remote-id type="github">theseer/DirectoryScanner</remote-id> + </upstream> +</pkgmetadata> diff --git a/dev-php/theseer-DirectoryScanner/theseer-DirectoryScanner-1.3.2.ebuild b/dev-php/theseer-DirectoryScanner/theseer-DirectoryScanner-1.3.2.ebuild new file mode 100644 index 00000000000..6fc0f450ae6 --- /dev/null +++ b/dev-php/theseer-DirectoryScanner/theseer-DirectoryScanner-1.3.2.ebuild @@ -0,0 +1,25 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +MY_PN="DirectoryScanner" + +DESCRIPTION="A recursive directory scanner and filter" +HOMEPAGE="https://github.com/theseer/DirectoryScanner" +SRC_URI="https://github.com/theseer/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86" + +RDEPEND="dev-lang/php:*" + +S="${WORKDIR}/${MY_PN}-${PV}" + +src_install() { + insinto /usr/share/php/TheSeer/${MY_PN} + doins -r src/* + + einstalldocs +} diff --git a/dev-php/theseer-tokenizer/Manifest b/dev-php/theseer-tokenizer/Manifest index e15e922ad4c..eb773bbb1aa 100644 --- a/dev-php/theseer-tokenizer/Manifest +++ b/dev-php/theseer-tokenizer/Manifest @@ -1,2 +1,3 @@ DIST theseer-tokenizer-1.1.0.tar.gz 10163 BLAKE2B b2360f901d60f784db2045912707a8e293a55967d60d4e72168a1c4b0c9a2d5bdb739fbed9bfec02075476e7bf6762eb1cc7e36870b84fcc341b609527579ca2 SHA512 8b500565dc0d6c8513db3aa72a7ee1fa04510a712ce9b0977feccddc6b2dae53825e39182d43508e196f326776115789e81697116418f6f9f63d08f0c05d0543 DIST theseer-tokenizer-1.1.3.tar.gz 10553 BLAKE2B 4bed1623abe110cec432a97fbd28752618420a188b450c935c77b5771d6986be9a51c8f100fd81a89d892b0c1e2b46b0124e3c35e3cbe2138eee2d520c74933a SHA512 e29fd41b311bac8021f4c0593d79a9c1bde4b6ccf4774e94d27a0e8a97bac3844109f9312c4aab6e239365630394b602b56a084c291dc13fb439dc8ac22944e3 +DIST theseer-tokenizer-1.2.0.tar.gz 7156 BLAKE2B 61474e3ebed5262b4d250f0057fbe68df6b2b2d6026cba28efbfc35c865bc9491e3b3f7871591a7aa52383c3bb748cf5dfb95f36d680bdbb9755b585b5b8f4f8 SHA512 e0deeffc151a1831cc7226037c75b534aa0d28d9639de45a1f0a6f5865d3df3cfbd7225e075b094603d512b0beb449e91205f40366ef1c7c865c8994e0710ff7 diff --git a/dev-php/theseer-tokenizer/metadata.xml b/dev-php/theseer-tokenizer/metadata.xml index ba2f818dd93..5e2f8abe6e8 100644 --- a/dev-php/theseer-tokenizer/metadata.xml +++ b/dev-php/theseer-tokenizer/metadata.xml @@ -5,6 +5,7 @@ <email>php-bugs@gentoo.org</email> <name>PHP</name> </maintainer> + <stabilize-allarches/> <upstream> <remote-id type="github">theseer/tokenizer</remote-id> </upstream> diff --git a/dev-php/theseer-tokenizer/theseer-tokenizer-1.2.0.ebuild b/dev-php/theseer-tokenizer/theseer-tokenizer-1.2.0.ebuild new file mode 100644 index 00000000000..9fe1250bc9a --- /dev/null +++ b/dev-php/theseer-tokenizer/theseer-tokenizer-1.2.0.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DESCRIPTION="Convert tokenized PHP source code into XML and other formats" +HOMEPAGE="https://github.com/theseer/tokenizer" +SRC_URI="https://github.com/theseer/tokenizer/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86" +IUSE="test" +RESTRICT="!test? ( test )" + +CDEPEND="dev-lang/php:* + dev-php/fedora-autoloader" + +BDEPEND="dev-php/theseer-Autoload" + +RDEPEND="${CDEPEND}" + +S="${WORKDIR}/tokenizer-${PV}" + +src_prepare() { + default + + phpab \ + --output src/autoload.php \ + --template fedora2 \ + --basedir src \ + src || die +} + +src_install() { + insinto /usr/share/php/TheSeer/Tokenizer + doins -r src/* + + einstalldocs +} diff --git a/dev-php/webmozart-assert/webmozart-assert-1.2.0.ebuild b/dev-php/webmozart-assert/webmozart-assert-1.2.0.ebuild index 2aa48ea7b94..a570a508a6a 100644 --- a/dev-php/webmozart-assert/webmozart-assert-1.2.0.ebuild +++ b/dev-php/webmozart-assert/webmozart-assert-1.2.0.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/webmozart/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar. LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86" IUSE="" S="${WORKDIR}/${MY_PN}-${PV}" diff --git a/dev-php/xdebug-client/xdebug-client-2.9.8.ebuild b/dev-php/xdebug-client/xdebug-client-2.9.8.ebuild index ad1c2866a29..36607c13f71 100644 --- a/dev-php/xdebug-client/xdebug-client-2.9.8.ebuild +++ b/dev-php/xdebug-client/xdebug-client-2.9.8.ebuild @@ -9,7 +9,7 @@ MY_PN="xdebug" MY_PV="${PV/_/}" MY_PV="${MY_PV/rc/RC}" -inherit autotools +inherit autotools toolchain-funcs DESCRIPTION="Xdebug client for the Common Debugger Protocol (DBGP)" HOMEPAGE="https://xdebug.org/" @@ -32,6 +32,7 @@ src_prepare() { } src_configure() { + tc-export CC LD econf $(use_with libedit) } diff --git a/dev-php/xdebug/Manifest b/dev-php/xdebug/Manifest index 65cb9595e14..4e8a20cd5a8 100644 --- a/dev-php/xdebug/Manifest +++ b/dev-php/xdebug/Manifest @@ -3,3 +3,5 @@ DIST xdebug-2.9.5.tar.gz 434947 BLAKE2B 08fd7cc92880c9b00180d495341fc7e54998cf3c DIST xdebug-2.9.6.tar.gz 436208 BLAKE2B 00cfb42c41bfb44f285b97779d6ba625641fc34494465e9e791ab5458c6a608e432df0ad45c561df2f8c9aba04ab34b3a98bb5e6bfb92ace39a3ad4145f3514a SHA512 13ed07a1489ba7bc0b4e85bf56306c733e7894cea8cb442649635196606b12d92e5618ab2485e7cde4aaee2ac6752993aecd933c24fd64b5113ef619339403d2 DIST xdebug-2.9.7.tar.gz 437517 BLAKE2B 6d3cb615b6b75354e5dc993a2de9f90b5865ee1a98935c084a9d7a4e1d03cceb71278b06da1d5e47f2b4105937f6d24cb8d767c7179fa55798e61a599e173c13 SHA512 ec23f7b5b2e2b109a753e12f1cb01377db52716600fbb31ca5b9a749e9d98e0eb60942b272c25a42efcb56add016310c79eda2c7385a3e0fc18e563f2f486d1e DIST xdebug-2.9.8.tar.gz 438295 BLAKE2B 8645052faceb354817ddb448f46af5b849507d31255b43ac59bcef4ece7837ef835ae2ad624ed8a95f8f98d552ef0e7195a4ade7df9176bc300d855a0156f405 SHA512 c431d51a0d9c5ac1c7fc529c2819db480cbfff6f65c35c3c0dbef4e78427aa28ede164f397f92c409e58e386a6be34ecd2ded0ee35e01df1cbf92a49fd2f2aab +DIST xdebug-3.0.1.tar.gz 432140 BLAKE2B f326de9a24c7c766b0f49213625ab7c455f7fd564af1848f2acb728fe513457140ee9669a05ddf83fd4ca07ecd591896d06bd570b60319178b484eaa7664cf88 SHA512 c50dea2abcad9c7e78ad7b7600a71c1bf0543c5fa31280a41c2acad2423bb6af8160e9d6b1e653f350f20660cfb2d8e4de07ae8f1181a465cc858dec13331c67 +DIST xdebug-3.0.2.tar.gz 435761 BLAKE2B 0476d29b3a960d83fd0818098a3d076f48f4d67057a2b6ec79571b011a9f364b18d3319771ad18e7145aa0f0f45fab7ed13d814b863731abe1721aafa8b59408 SHA512 723e00885a49a5626870cc4cb0f7fd49a3173c8d4e9b4022009430fdeaa1b152828de18e6e7fa709be8bb11989c89dc2d9940de9cc3d592174b5dafbc3d2c52d diff --git a/dev-php/xdebug/files/3.0-xdebug.ini b/dev-php/xdebug/files/3.0-xdebug.ini new file mode 100644 index 00000000000..ed95a1214d9 --- /dev/null +++ b/dev-php/xdebug/files/3.0-xdebug.ini @@ -0,0 +1,41 @@ +;xdebug.cli_color = 0 +;xdebug.client_discovery_header = +;xdebug.client_host = localhost +;xdebug.client_port = 9003 +;xdebug.collect_params = 0 +;xdebug.collect_return = 0 +;xdebug.connect_timeout_ms = 200 +;xdebug.discover_client_host = 0 +;xdebug.dump.* = Empty +;xdebug.dump_globals = 1 +;xdebug.dump_once = 1 +;xdebug.dump_undefined = 0 +;xdebug.file_link_format = +;xdebug.filename_format = ...%s%n +;xdebug.force_display_errors = 0 +;xdebug.force_error_reporting = 0 +;xdebug.gc_stats_output_name = gcstats.%p +;xdebug.halt_level = 0 +;xdebug.idekey = *complex* +;xdebug.log = +;xdebug.log_level = 7 +;xdebug.max_nesting_level = 256 +;xdebug.max_stack_frames = -1 +xdebug.mode=off +;xdebug.output_dir = /tmp +;xdebug.profiler_append = 0 +;xdebug.profiler_output_name = cachegrind.out.%p +;xdebug.scream = 0 +;xdebug.show_error_trace = 0 +;xdebug.show_exception_trace = 0 +;xdebug.show_local_vars = 0 +;xdebug.start_upon_error = default +;xdebug.start_with_request = default +;xdebug.trace_format = 0 +;xdebug.trace_options = 0 +;xdebug.trace_output_dir = /tmp +;xdebug.trace_output_name = trace.%c +;xdebug.trigger_value = "" +;xdebug.var_display_max_children = 128 +;xdebug.var_display_max_data = 512 +;xdebug.var_display_max_depth = 3 diff --git a/dev-php/xdebug/xdebug-3.0.1.ebuild b/dev-php/xdebug/xdebug-3.0.1.ebuild new file mode 100644 index 00000000000..26eee1e3503 --- /dev/null +++ b/dev-php/xdebug/xdebug-3.0.1.ebuild @@ -0,0 +1,57 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" +PHP_EXT_NAME="xdebug" +PHP_EXT_INI="yes" +PHP_EXT_ZENDEXT="yes" +PHP_EXT_INIFILE="3.0-xdebug.ini" + +USE_PHP="php7-2 php7-3 php7-4 php8-0" + +MY_PV="${PV/_/}" +MY_PV="${MY_PV/rc/RC}" + +S="${WORKDIR}/${PN}-${MY_PV}" + +inherit php-ext-source-r3 + +KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86" + +DESCRIPTION="A PHP debugging and profiling extension" +HOMEPAGE="https://xdebug.org/" +# Using tarball from GitHub for tests +#SRC_URI="https://pecl.php.net/get/${PN}-${MY_PV}.tgz" +SRC_URI="https://github.com/xdebug/xdebug/archive/${MY_PV}.tar.gz -> ${P}.tar.gz" +LICENSE="Xdebug" +SLOT="0" +IUSE="" + +# Tests are known to fail +RESTRICT="test" + +DEPEND="" +RDEPEND="${DEPEND}" +DOCS=( README.rst CREDITS ) +PHP_EXT_ECONF_ARGS=() + +src_test() { + local slot + for slot in $(php_get_slots); do + php_init_slot_env "${slot}" + TEST_PHP_EXECUTABLE="${PHPCLI}" \ + TEST_PHP_CGI_EXECUTABLE="${PHPCGI}" \ + TEST_PHPDBG_EXECUTABLE="${PHPCLI}dbg" \ + "${PHPCLI}" run-xdebug-tests.php + done +} + +pkg_postinst() { + ewarn "We have set xdebug.mode to off, as xdebug can be" + ewarn "installed as a dependency, and not all users will want xdebug to be" + ewarn "enabled by default. If you want to enable it, you should edit the" + ewarn "ini file and set xdebug.mode to one or more modes e.g. develop,debug,trace" + elog "" + elog "The 3.0 major release changes many options." + elog "Review https://xdebug.org/docs/upgrade_guide for differences from 2.x" +} diff --git a/dev-php/xdebug/xdebug-3.0.2.ebuild b/dev-php/xdebug/xdebug-3.0.2.ebuild new file mode 100644 index 00000000000..5c7410f4c1a --- /dev/null +++ b/dev-php/xdebug/xdebug-3.0.2.ebuild @@ -0,0 +1,57 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" +PHP_EXT_NAME="xdebug" +PHP_EXT_INI="yes" +PHP_EXT_ZENDEXT="yes" +PHP_EXT_INIFILE="3.0-xdebug.ini" + +USE_PHP="php7-3 php7-4 php8-0" + +MY_PV="${PV/_/}" +MY_PV="${MY_PV/rc/RC}" + +S="${WORKDIR}/${PN}-${MY_PV}" + +inherit php-ext-source-r3 + +KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86" + +DESCRIPTION="A PHP debugging and profiling extension" +HOMEPAGE="https://xdebug.org/" +# Using tarball from GitHub for tests +#SRC_URI="https://pecl.php.net/get/${PN}-${MY_PV}.tgz" +SRC_URI="https://github.com/xdebug/xdebug/archive/${MY_PV}.tar.gz -> ${P}.tar.gz" +LICENSE="Xdebug" +SLOT="0" +IUSE="" + +# Tests are known to fail +RESTRICT="test" + +DEPEND="" +RDEPEND="${DEPEND}" +DOCS=( README.rst CREDITS ) +PHP_EXT_ECONF_ARGS=() + +src_test() { + local slot + for slot in $(php_get_slots); do + php_init_slot_env "${slot}" + TEST_PHP_EXECUTABLE="${PHPCLI}" \ + TEST_PHP_CGI_EXECUTABLE="${PHPCGI}" \ + TEST_PHPDBG_EXECUTABLE="${PHPCLI}dbg" \ + "${PHPCLI}" run-xdebug-tests.php + done +} + +pkg_postinst() { + ewarn "We have set xdebug.mode to off, as xdebug can be" + ewarn "installed as a dependency, and not all users will want xdebug to be" + ewarn "enabled by default. If you want to enable it, you should edit the" + ewarn "ini file and set xdebug.mode to one or more modes e.g. develop,debug,trace" + elog "" + elog "The 3.0 major release changes many options." + elog "Review https://xdebug.org/docs/upgrade_guide for differences from 2.x" +} diff --git a/dev-php/xhprof/Manifest b/dev-php/xhprof/Manifest index 28f5f886a5a..9b12b022e21 100644 --- a/dev-php/xhprof/Manifest +++ b/dev-php/xhprof/Manifest @@ -1,2 +1,2 @@ -DIST xhprof-0.9.10.tar.gz 850440 BLAKE2B f277c4e798c63337d7319ece9e5405fe2aa87677b146bd0a3c73079cda70b005b8a97647a4bfee66e8263eb413b60d685f617d1f8faefe3aff01c5eb5cbcd364 SHA512 f078c7d025d4712858f55a6a212f888cdb67f862c912639db4bd50b9d601e824c7a0bf9e0f9d1b04673230c7a04d9e00fff42f729055677db021ee47e7128088 DIST xhprof-2.1.4.tgz 841444 BLAKE2B 33be85d55f2636af5664aeb017ccaab6ad03962d44b3143c0eb9d9f9cc0fa74048fbca6beae89d02ed47db8ffe1ea77df1f6a41aa62fbc90fea2c52c467a422d SHA512 8777d29c16bce9e7698cf37c7dd631e951a018fa63ab5a4ab0df8e7621643e7fb905cd9bc189b238d76e32408a43f522bbab455caab6b89f7b6c26590b2733a3 +DIST xhprof-2.2.3.tgz 842543 BLAKE2B 5940a5ed8edc334ae2dc09d4621ed7fb4b8b56de6f07dc49e4a84ced33689f242f11ac89dced670f7b54d35fe8c9840fea09e55340174c399fae263760ca35ac SHA512 000468a7fa2a0af25004f0ffd59a8ab111a5cfa4cff275291fcbc54d3283fbf4a904b4aaeb38c2a8c7c81924bc31d9328ccf9fb7de24e20c224e014ed942efaf diff --git a/dev-php/xhprof/xhprof-0.9.10.ebuild b/dev-php/xhprof/xhprof-2.2.3.ebuild index 340be6e1183..1d609078c8c 100644 --- a/dev-php/xhprof/xhprof-0.9.10.ebuild +++ b/dev-php/xhprof/xhprof-2.2.3.ebuild @@ -1,17 +1,14 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI="7" -MY_PV="dab44f76da5c8a0d4f1339f7d2ea2bc42408e8e9" -PHP_EXT_S="${WORKDIR}/${PN}-${MY_PV}/extension" +PHP_EXT_S="${S}/extension" PHP_EXT_ECONF_ARGS="" -USE_PHP="php7-2 php7-3" +USE_PHP="php7-2 php7-3 php7-4 php8-0" inherit php-ext-pecl-r3 -SRC_URI="https://github.com/phacility/xhprof/archive/${MY_PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" HOMEPAGE="https://pecl.php.net/package/xhprof" @@ -19,5 +16,3 @@ DESCRIPTION="A Hierarchical Profiler for PHP" LICENSE="Apache-2.0" SLOT="0" IUSE="" - -S="${WORKDIR}" diff --git a/dev-php/zetacomponents-Base/Manifest b/dev-php/zetacomponents-Base/Manifest new file mode 100644 index 00000000000..d2b1d99d329 --- /dev/null +++ b/dev-php/zetacomponents-Base/Manifest @@ -0,0 +1 @@ +DIST zetacomponents-Base-1.9.1.tar.gz 252350 BLAKE2B cc0d82a107fc1190b57b03ce3a594d9ffa5b3a2627cf30d7d31a1018005a8400917cf7bbd1dfeb23f46d118ae56083e147d148b3bbdba5dfea8fde0a8bcf0c46 SHA512 dd56f123c8ed3b8c0116b878120ba7763e402b8364ba404305a9ab483b1c5a341df994517f160c8a959005ab9b75a5a7af74d08b367daa3fd8f852ba4ede5e05 diff --git a/dev-php/zetacomponents-Base/files/autoload.php b/dev-php/zetacomponents-Base/files/autoload.php new file mode 100644 index 00000000000..17bec81a6d2 --- /dev/null +++ b/dev-php/zetacomponents-Base/files/autoload.php @@ -0,0 +1,53 @@ +<?php +// @codingStandardsIgnoreFile +// @codeCoverageIgnoreStart +// this is an autogenerated file - do not edit +spl_autoload_register( + function($class) { + static $classes = null; + if ($classes === null) { + $classes = array( + 'ezcbase' => '/base.php', + 'ezcbaseautoloadexception' => '/exceptions/autoload.php', + 'ezcbaseautoloadoptions' => '/options/autoload.php', + 'ezcbaseconfigurationinitializer' => '/interfaces/configuration_initializer.php', + 'ezcbasedoubleclassrepositoryprefixexception' => '/exceptions/double_class_repository_prefix.php', + 'ezcbaseexception' => '/exceptions/exception.php', + 'ezcbaseexportable' => '/interfaces/exportable.php', + 'ezcbaseextensionnotfoundexception' => '/exceptions/extension_not_found.php', + 'ezcbasefeatures' => '/features.php', + 'ezcbasefile' => '/file.php', + 'ezcbasefileexception' => '/exceptions/file_exception.php', + 'ezcbasefilefindcontext' => '/structs/file_find_context.php', + 'ezcbasefileioexception' => '/exceptions/file_io.php', + 'ezcbasefilenotfoundexception' => '/exceptions/file_not_found.php', + 'ezcbasefilepermissionexception' => '/exceptions/file_permission.php', + 'ezcbasefunctionalitynotsupportedexception' => '/exceptions/functionality_not_supported.php', + 'ezcbaseinit' => '/init.php', + 'ezcbaseinitcallbackconfiguredexception' => '/exceptions/init_callback_configured.php', + 'ezcbaseinitinvalidcallbackclassexception' => '/exceptions/invalid_callback_class.php', + 'ezcbaseinvalidparentclassexception' => '/exceptions/invalid_parent_class.php', + 'ezcbasemetadata' => '/metadata.php', + 'ezcbasemetadatapearreader' => '/metadata/pear.php', + 'ezcbasemetadatatarballreader' => '/metadata/tarball.php', + 'ezcbaseoptions' => '/options.php', + 'ezcbasepersistable' => '/interfaces/persistable.php', + 'ezcbasepropertynotfoundexception' => '/exceptions/property_not_found.php', + 'ezcbasepropertypermissionexception' => '/exceptions/property_permission.php', + 'ezcbaserepositorydirectory' => '/structs/repository_directory.php', + 'ezcbasesettingnotfoundexception' => '/exceptions/setting_not_found.php', + 'ezcbasesettingvalueexception' => '/exceptions/setting_value.php', + 'ezcbasestruct' => '/struct.php', + 'ezcbasevalueexception' => '/exceptions/value.php', + 'ezcbasewhateverexception' => '/exceptions/whatever.php' + ); + } + $cn = strtolower($class); + if (isset($classes[$cn])) { + require __DIR__ . $classes[$cn]; + } + }, + true, + false +); +// @codeCoverageIgnoreEnd diff --git a/dev-php/zetacomponents-Base/metadata.xml b/dev-php/zetacomponents-Base/metadata.xml new file mode 100644 index 00000000000..ebb455ac49d --- /dev/null +++ b/dev-php/zetacomponents-Base/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> + <stabilize-allarches/> + <upstream> + <remote-id type="github">zetacomponents/Base</remote-id> + </upstream> +</pkgmetadata> diff --git a/dev-php/zetacomponents-Base/zetacomponents-Base-1.9.1.ebuild b/dev-php/zetacomponents-Base/zetacomponents-Base-1.9.1.ebuild new file mode 100644 index 00000000000..70ba281e31d --- /dev/null +++ b/dev-php/zetacomponents-Base/zetacomponents-Base-1.9.1.ebuild @@ -0,0 +1,26 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +MY_PN="Base" + +DESCRIPTION="Base package for any Zeta component" +HOMEPAGE="https://github.com/zetacomponents/Base" +SRC_URI="https://github.com/zetacomponents/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86" + +RDEPEND="dev-lang/php:*" + +S="${WORKDIR}/${MY_PN}-${PV}" + +src_install() { + insinto /usr/share/php/ezc/${MY_PN} + doins -r src/* + doins "${FILESDIR}"/autoload.php + + einstalldocs +} diff --git a/dev-php/zetacomponents-ConsoleTools/Manifest b/dev-php/zetacomponents-ConsoleTools/Manifest new file mode 100644 index 00000000000..d3ad8f4bf6f --- /dev/null +++ b/dev-php/zetacomponents-ConsoleTools/Manifest @@ -0,0 +1 @@ +DIST zetacomponents-ConsoleTools-1.7.2.tar.gz 932028 BLAKE2B 18469bb11af5f4facf7892df765c9511c699c2f362872da7db13dee3a380286a306809c90f28ad4bc4cfcfa99135e7d35b659a242f507afb91b84fee17d16f4a SHA512 871c9a6827c3cc77275b538dc09d21135affe1f06364e83a7a27b7a9eff4537b509e72fffe3d5f6b1ebb0086d489df2b29af276bdbc0276f163b1f9168f82253 diff --git a/dev-php/zetacomponents-ConsoleTools/files/autoload.php b/dev-php/zetacomponents-ConsoleTools/files/autoload.php new file mode 100644 index 00000000000..b2139b5f618 --- /dev/null +++ b/dev-php/zetacomponents-ConsoleTools/files/autoload.php @@ -0,0 +1,82 @@ +<?php +// @codingStandardsIgnoreFile +// @codeCoverageIgnoreStart +// this is an autogenerated file - do not edit +spl_autoload_register( + function($class) { + static $classes = null; + if ($classes === null) { + $classes = array( + 'ezcconsoleargument' => '/input/argument.php', + 'ezcconsoleargumentalreadyregisteredexception' => '/exceptions/argument_already_registered.php', + 'ezcconsoleargumentexception' => '/exceptions/argument.php', + 'ezcconsoleargumentmandatoryviolationexception' => '/exceptions/argument_mandatory_violation.php', + 'ezcconsolearguments' => '/input/arguments.php', + 'ezcconsoleargumenttypeviolationexception' => '/exceptions/argument_type_violation.php', + 'ezcconsoledialog' => '/interfaces/dialog.php', + 'ezcconsoledialogabortexception' => '/exceptions/dialog_abort.php', + 'ezcconsoledialogoptions' => '/options/dialog.php', + 'ezcconsoledialogvalidator' => '/interfaces/dialog_validator.php', + 'ezcconsoledialogviewer' => '/dialog_viewer.php', + 'ezcconsoleexception' => '/exceptions/exception.php', + 'ezcconsoleinput' => '/input.php', + 'ezcconsoleinputhelpgenerator' => '/interfaces/input_help_generator.php', + 'ezcconsoleinputstandardhelpgenerator' => '/input/help_generators/standard.php', + 'ezcconsoleinputvalidator' => '/interfaces/input_validator.php', + 'ezcconsoleinvalidoptionnameexception' => '/exceptions/invalid_option_name.php', + 'ezcconsoleinvalidoutputtargetexception' => '/exceptions/invalid_output_target.php', + 'ezcconsolemenudialog' => '/dialog/menu_dialog.php', + 'ezcconsolemenudialogdefaultvalidator' => '/dialog/validators/menu_dialog_default.php', + 'ezcconsolemenudialogoptions' => '/options/menu_dialog.php', + 'ezcconsolemenudialogvalidator' => '/interfaces/menu_dialog_validator.php', + 'ezcconsolenopositionstoredexception' => '/exceptions/no_position_stored.php', + 'ezcconsolenovaliddialogresultexception' => '/exceptions/no_valid_dialog_result.php', + 'ezcconsoleoption' => '/input/option.php', + 'ezcconsoleoptionalreadyregisteredexception' => '/exceptions/option_already_registered.php', + 'ezcconsoleoptionargumentsviolationexception' => '/exceptions/option_arguments_violation.php', + 'ezcconsoleoptiondependencyviolationexception' => '/exceptions/option_dependency_violation.php', + 'ezcconsoleoptionexception' => '/exceptions/option.php', + 'ezcconsoleoptionexclusionviolationexception' => '/exceptions/option_exclusion_violation.php', + 'ezcconsoleoptionmandatoryviolationexception' => '/exceptions/option_mandatory_violation.php', + 'ezcconsoleoptionmissingvalueexception' => '/exceptions/option_missing_value.php', + 'ezcconsoleoptionnoaliasexception' => '/exceptions/option_no_alias.php', + 'ezcconsoleoptionnotexistsexception' => '/exceptions/option_not_exists.php', + 'ezcconsoleoptionrule' => '/structs/option_rule.php', + 'ezcconsoleoptionstringnotwellformedexception' => '/exceptions/option_string_not_wellformed.php', + 'ezcconsoleoptiontoomanyvaluesexception' => '/exceptions/option_too_many_values.php', + 'ezcconsoleoptiontypeviolationexception' => '/exceptions/option_type_violation.php', + 'ezcconsoleoutput' => '/output.php', + 'ezcconsoleoutputformat' => '/structs/output_format.php', + 'ezcconsoleoutputformats' => '/structs/output_formats.php', + 'ezcconsoleoutputoptions' => '/options/output.php', + 'ezcconsoleprogressbar' => '/progressbar.php', + 'ezcconsoleprogressbaroptions' => '/options/progressbar.php', + 'ezcconsoleprogressmonitor' => '/progressmonitor.php', + 'ezcconsoleprogressmonitoroptions' => '/options/progressmonitor.php', + 'ezcconsolequestiondialog' => '/dialog/question_dialog.php', + 'ezcconsolequestiondialogcollectionvalidator' => '/dialog/validators/question_dialog_collection.php', + 'ezcconsolequestiondialogmappingvalidator' => '/dialog/validators/question_dialog_mapping.php', + 'ezcconsolequestiondialogoptions' => '/options/question_dialog.php', + 'ezcconsolequestiondialogregexvalidator' => '/dialog/validators/question_dialog_regex.php', + 'ezcconsolequestiondialogtypevalidator' => '/dialog/validators/question_dialog_type.php', + 'ezcconsolequestiondialogvalidator' => '/interfaces/question_dialog_validator.php', + 'ezcconsolestandardinputvalidator' => '/input/validators/standard.php', + 'ezcconsolestatusbar' => '/statusbar.php', + 'ezcconsolestatusbaroptions' => '/options/statusbar.php', + 'ezcconsolestringtool' => '/tools/string.php', + 'ezcconsoletable' => '/table.php', + 'ezcconsoletablecell' => '/table/cell.php', + 'ezcconsoletableoptions' => '/options/table.php', + 'ezcconsoletablerow' => '/table/row.php', + 'ezcconsoletoomanyargumentsexception' => '/exceptions/argument_too_many.php' + ); + } + $cn = strtolower($class); + if (isset($classes[$cn])) { + require __DIR__ . $classes[$cn]; + } + }, + true, + false +); +// @codeCoverageIgnoreEnd diff --git a/dev-php/zetacomponents-ConsoleTools/metadata.xml b/dev-php/zetacomponents-ConsoleTools/metadata.xml new file mode 100644 index 00000000000..c6624274a36 --- /dev/null +++ b/dev-php/zetacomponents-ConsoleTools/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> + <stabilize-allarches/> + <upstream> + <remote-id type="github">zetacomponents/ConsoleTools</remote-id> + </upstream> +</pkgmetadata> diff --git a/dev-php/zetacomponents-ConsoleTools/zetacomponents-ConsoleTools-1.7.2.ebuild b/dev-php/zetacomponents-ConsoleTools/zetacomponents-ConsoleTools-1.7.2.ebuild new file mode 100644 index 00000000000..1c8239d7c0b --- /dev/null +++ b/dev-php/zetacomponents-ConsoleTools/zetacomponents-ConsoleTools-1.7.2.ebuild @@ -0,0 +1,26 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +MY_PN="ConsoleTools" + +DESCRIPTION="A set of classes to do different actions with the console" +HOMEPAGE="https://github.com/zetacomponents/ConsoleTools" +SRC_URI="https://github.com/zetacomponents/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86" + +RDEPEND="dev-lang/php:*" + +S="${WORKDIR}/${MY_PN}-${PV}" + +src_install() { + insinto /usr/share/php/ezc/${MY_PN} + doins -r src/* + doins "${FILESDIR}"/autoload.php + + einstalldocs +} |