diff options
Diffstat (limited to 'dev-php')
837 files changed, 3875 insertions, 12803 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 deleted file mode 100644 index db40dc234cb3..000000000000 --- a/dev-php/File_Iterator/File_Iterator-1.3.4.ebuild +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PHP_PEAR_DOMAIN="pear.phpunit.de" -PHP_PEAR_CHANNEL="${FILESDIR}/channel.xml" -PHP_PEAR_PKG_NAME="File_Iterator" -inherit php-pear-r2 - -DESCRIPTION="FilterIterator implementation that filters files based on a list of suffixes" -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 ~hppa x86" -IUSE="" -HOMEPAGE="https://github.com/sebastianbergmann/php-file-iterator - https://phpunit.de" -SRC_URI="http://${PHP_PEAR_URI}/get/${PEAR_P}.tgz" -DOCS=( ChangeLog.markdown README.markdown ) diff --git a/dev-php/File_Iterator/File_Iterator-1.4.2.ebuild b/dev-php/File_Iterator/File_Iterator-1.4.2.ebuild deleted file mode 100644 index 70f553faf0cb..000000000000 --- a/dev-php/File_Iterator/File_Iterator-1.4.2.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -MY_PN="php-file-iterator" - -DESCRIPTION="FilterIterator implementation that filters files based on criteria" -HOMEPAGE="https://github.com/sebastianbergmann/php-file-iterator - https://phpunit.de" -SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86" -IUSE="" - -S="${WORKDIR}/${MY_PN}-${PV}" - -RDEPEND="dev-php/fedora-autoloader - >=dev-lang/php-5.6:*" - -src_install() { - insinto /usr/share/php/File/Iterator - doins -r src/* - doins "${FILESDIR}/autoload.php" -} - -pkg_postinst() { - ewarn "This library now loads via /usr/share/php/File/Iterator/autoload.php" - ewarn "Please update any scripts to require the autoloader" -} diff --git a/dev-php/File_Iterator/File_Iterator-1.4.3.ebuild b/dev-php/File_Iterator/File_Iterator-1.4.3.ebuild deleted file mode 100644 index 9068f6072639..000000000000 --- a/dev-php/File_Iterator/File_Iterator-1.4.3.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -MY_PN="php-file-iterator" - -DESCRIPTION="FilterIterator implementation that filters files based on criteria" -HOMEPAGE="https://github.com/sebastianbergmann/php-file-iterator - https://phpunit.de" -SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86" -IUSE="" - -S="${WORKDIR}/${MY_PN}-${PV}" - -RDEPEND="dev-php/fedora-autoloader - >=dev-lang/php-5.6:*" - -src_install() { - insinto /usr/share/php/File/Iterator - doins -r src/* - doins "${FILESDIR}/autoload.php" -} - -pkg_postinst() { - ewarn "This library now loads via /usr/share/php/File/Iterator/autoload.php" - ewarn "Please update any scripts to require the autoloader" -} diff --git a/dev-php/File_Iterator/File_Iterator-2.0.2.ebuild b/dev-php/File_Iterator/File_Iterator-2.0.2.ebuild deleted file mode 100644 index 95a6e0b5b8e7..000000000000 --- a/dev-php/File_Iterator/File_Iterator-2.0.2.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -MY_PN="php-file-iterator" - -DESCRIPTION="FilterIterator implementation that filters files based on criteria" -HOMEPAGE="https://github.com/sebastianbergmann/php-file-iterator - https://phpunit.de" -SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86" -IUSE="" - -S="${WORKDIR}/${MY_PN}-${PV}" - -RDEPEND="dev-php/fedora-autoloader - >=dev-lang/php-7.1:*" - -src_install() { - insinto /usr/share/php/File/Iterator - doins -r src/* - doins "${FILESDIR}/autoload.php" -} - -pkg_postinst() { - ewarn "This library now loads via /usr/share/php/File/Iterator/autoload.php" - ewarn "Please update any scripts to require the autoloader" -} diff --git a/dev-php/File_Iterator/File_Iterator-2.0.2-r1.ebuild b/dev-php/File_Iterator/File_Iterator-3.0.6.ebuild index 32b850fac5c7..5c34aee98921 100644 --- a/dev-php/File_Iterator/File_Iterator-2.0.2-r1.ebuild +++ b/dev-php/File_Iterator/File_Iterator-3.0.6.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 MY_PN="php-file-iterator" @@ -12,13 +12,13 @@ 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="amd64 arm ~hppa ppc ppc64 ~s390 sparc x86" IUSE="" S="${WORKDIR}/${MY_PN}-${PV}" RDEPEND="dev-php/fedora-autoloader - >=dev-lang/php-7.1:*" + >=dev-lang/php-7.3:*" src_install() { insinto /usr/share/php/File/Iterator diff --git a/dev-php/File_Iterator/Manifest b/dev-php/File_Iterator/Manifest index 8095864454b0..2023ea1fd9bb 100644 --- a/dev-php/File_Iterator/Manifest +++ b/dev-php/File_Iterator/Manifest @@ -1,4 +1 @@ -DIST File_Iterator-1.3.4.tgz 5199 BLAKE2B 75da70ad638230dd231947e3af26c2570eff367328d2e541fb1228ba531c0f249c931a9185f977dce9e17846e1e9b8b1f9f8d21219291e637b2eaf7805dcf360 SHA512 7117e0e56a9bc533d9f93556366a8026d1e5a9a3894c05551adef6c1e6cd556c1ebf6b96bd98279cb92077b3d8f8d7b7e42f446b39895850e573d0ec511392be -DIST File_Iterator-1.4.2.tar.gz 4141 BLAKE2B 4c8d9847fa198d444571acdf777020b76e87e09506038c7d7ce732b97c149149bcf22dc25d0af36f041b7930673b05f940df8211c29829e0fed2b3dcfae0ba05 SHA512 295943681853c858e3e1c336c030338c61a74169bd2a619da6fca8c43611e587c6f626fa92799d614bcb0a1f86bbb39895b20f2a389107cedb9660a7e792a243 -DIST File_Iterator-1.4.3.tar.gz 4140 BLAKE2B 89274c6f9b561dbc732d0b81f06b7c34d267ea31d1deb5977eaa16852d87442183221ed6789fd5e09b80ef96811df2ff8ef5da5c764703f5e7a2d5289f582527 SHA512 cea906d6028d9c2dbbb5486198adbecbca87f8b4dcbe12f72b9732ac29cf8eb868a23af7a5bcf2de55e0040a077ab55b016e773d5145f987f7e3f9671ad3ea28 -DIST File_Iterator-2.0.2.tar.gz 7239 BLAKE2B af2cc29d087bd597b10fd1d22a35c906deca70eb79bbcbb52ca3d8c408cbe8887233b69ba7f9c37fe639ff7d544d1109609a0b2e59c5f49bb286aee3e3f3f2d1 SHA512 2f1acee0358e03bd831d0228dfd2fc65848f7105e0dabb6cf81890d8549e3f39037a01bed2357316a27bb863955c1f51d56770c0ea733f5389d8e47f30050687 +DIST File_Iterator-3.0.6.tar.gz 5204 BLAKE2B 61123678e440f8aa68b2821e976bf615ea0e70157fc596fc566b7f28daae9419be8f75df13ec8e218200cdfecea146285995e6f1d3936a58593d6f64f38c0bdc SHA512 cc0faf12e443c9b9b6577dcc5b5f51184f0fecde010aadbcf47ce638d1d1135a5ba731221e8637791e94018458baed315112cd20fc86ded6485b59a7801f6d7d diff --git a/dev-php/File_Iterator/files/autoload.php b/dev-php/File_Iterator/files/autoload.php deleted file mode 100644 index 71372f0a8bbe..000000000000 --- a/dev-php/File_Iterator/files/autoload.php +++ /dev/null @@ -1,15 +0,0 @@ -<?php -/* Autoloader for dev-php/File_Iterator */ - -if (!class_exists('Fedora\\Autoloader\\Autoload', false)) { - require_once '/usr/share/php/Fedora/Autoloader/autoload.php'; -} - -\Fedora\Autoloader\Autoload::addClassMap( - array( - 'file_iterator' => '/Iterator.php', - 'file_iterator_facade' => '/Facade.php', - 'file_iterator_factory' => '/Factory.php', - ), - __DIR__ -); diff --git a/dev-php/File_Iterator/files/channel.xml b/dev-php/File_Iterator/files/channel.xml deleted file mode 100644 index 91bb6786f543..000000000000 --- a/dev-php/File_Iterator/files/channel.xml +++ /dev/null @@ -1,16 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" ?> -<channel version="1.0" xmlns="http://pear.php.net/channel-1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://pear.php.net/channel-1.0 http://pear.php.net/dtd/channel-1.0.xsd"> - <name>pear.phpunit.de</name> - <summary>PHPUnit PEAR Channel</summary> - <suggestedalias>phpunit</suggestedalias> - <servers> - <primary> - <rest> - <baseurl type="REST1.0">http://pear.phpunit.de/rest/</baseurl> - <baseurl type="REST1.1">http://pear.phpunit.de/rest/</baseurl> - <baseurl type="REST1.2">http://pear.phpunit.de/rest/</baseurl> - <baseurl type="REST1.3">http://pear.phpunit.de/rest/</baseurl> - </rest> - </primary> - </servers> -</channel>
\ No newline at end of file diff --git a/dev-php/File_Iterator/metadata.xml b/dev-php/File_Iterator/metadata.xml index acfdf8c42a73..51580992e25a 100644 --- a/dev-php/File_Iterator/metadata.xml +++ b/dev-php/File_Iterator/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> diff --git a/dev-php/PEAR-Archive_Tar/Manifest b/dev-php/PEAR-Archive_Tar/Manifest index d3c5bcbc1814..dba96eb21fc6 100644 --- a/dev-php/PEAR-Archive_Tar/Manifest +++ b/dev-php/PEAR-Archive_Tar/Manifest @@ -1,2 +1 @@ -DIST Archive_Tar-1.4.12.tgz 21665 BLAKE2B fc4d2d5128bfc02da5f7e2465834e2ff14554188ede7899856f200935a850c35bb74e6fcca5c4c4ae641a575725a3edba2878376a587304f133c8f16e1ee9336 SHA512 9f2e6ca4628ba4ec95a324c4a706b2d01d2323b5e5e77f1cc7425784d1a35d139b1604bffca10af8b04c4cc875cb6b1f40715a00208cd042aba37f089a586497 -DIST Archive_Tar-1.4.13.tgz 21836 BLAKE2B b150c7493995c889bd91d24fb7bc5374be6ae157e27522a0d1e5b8fa994a09fdd7a03288263d0931f1d46da3e1b37c80e67cee07d5f54f501531b2adb7f4bb8a SHA512 3ee3dd8c8c8af018eb6c6d32409f2867c49f5a8ef21efecd8fb0a36207ca211eb49aaef02806b2df35aa6613d5dd69c8d81c72f97d4297dee3f732a9ab6ff9a7 +DIST Archive_Tar-1.4.14.tgz 21992 BLAKE2B e483ee9943c955dd6834538de70e8d6821b9abb250fca752e01fec7a62c28f59f65a6afe66adb804565c1f79cfc679fd72a32d0311f231dee424199b2600bb73 SHA512 a0277086221acf0cd01ec342af5afd62f01055a8b3bb4942d7a96d3517cce466a0c8a086411671a18d0f7a0a5e4187a76bad0d5c410c93fefe8cc58992327789 diff --git a/dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.4.13.ebuild b/dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.4.13.ebuild deleted file mode 100644 index 02c0db09b3a8..000000000000 --- a/dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.4.13.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -MY_PN="${PN/PEAR-/}" -MY_P="${MY_PN}-${PV}" - -DESCRIPTION="Tar file management class" -HOMEPAGE="https://pear.php.net/package/Archive_Tar" -SRC_URI="https://pear.php.net/get/${MY_P}.tgz" -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86" -IUSE="" - -# bzip2 and zlib are needed for compressed tarballs, and there's one -# call to preg_match to test paths against a pattern of files and -# directories that will be ignored. -RDEPEND="dev-lang/php:*[bzip2,pcre(+),zlib]" -PDEPEND="dev-php/PEAR-PEAR" -DEPEND="" - -S="${WORKDIR}/${MY_P}" - -src_install() { - insinto /usr/share/php - doins -r Archive - - dodoc docs/* - - insinto /usr/share/php/.packagexml - newins "${WORKDIR}/package.xml" "${MY_P}.xml" -} - -pkg_postinst() { - # It is not critical to complete so only warn on failure - if [[ -f "${EROOT}/usr/share/php/.packagexml/${MY_P}.xml" && \ - -x "${EROOT}/usr/bin/peardev" ]] ; then - "${EROOT}/usr/bin/peardev" install -nrO --force \ - "${EROOT}/usr/share/php/.packagexml/${MY_P}.xml" 2> /dev/null \ - || ewarn "Failed to insert package into local PEAR database" - fi -} - -pkg_postrm() { - if [[ -x "${EROOT}/usr/bin/peardev" ]]; then - "${EROOT}/usr/bin/peardev" uninstall -nrO "pear.php.net/${MY_PN}" - fi -} diff --git a/dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.4.12.ebuild b/dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.4.14.ebuild index 09a18646d8e6..6445632cd4f3 100644 --- a/dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.4.12.ebuild +++ b/dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.4.14.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -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 ppc ppc64 ~s390 sparc x86" IUSE="" # bzip2 and zlib are needed for compressed tarballs, and there's one diff --git a/dev-php/PEAR-Archive_Tar/metadata.xml b/dev-php/PEAR-Archive_Tar/metadata.xml index 76c401f1f8cd..f68a465a15d4 100644 --- a/dev-php/PEAR-Archive_Tar/metadata.xml +++ b/dev-php/PEAR-Archive_Tar/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> diff --git a/dev-php/PEAR-Auth_SASL/PEAR-Auth_SASL-1.1.0.ebuild b/dev-php/PEAR-Auth_SASL/PEAR-Auth_SASL-1.1.0.ebuild index 86187b7c4bd3..11a528a53e17 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 @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -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="amd64 arm ~hppa ppc ppc64 ~s390 sparc x86" IUSE="" RDEPEND=">=dev-php/PEAR-PEAR-1.10.1" diff --git a/dev-php/PEAR-Auth_SASL/metadata.xml b/dev-php/PEAR-Auth_SASL/metadata.xml index 60c5dab7b70e..1f8ef726ccd6 100644 --- a/dev-php/PEAR-Auth_SASL/metadata.xml +++ b/dev-php/PEAR-Auth_SASL/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> diff --git a/dev-php/PEAR-Cache/PEAR-Cache-1.5.6-r2.ebuild b/dev-php/PEAR-Cache/PEAR-Cache-1.5.6-r2.ebuild index 7d407a27e8b0..bddcbe68a9e5 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 @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -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="amd64 arm ~hppa ppc ppc64 ~s390 sparc x86" IUSE="" src_install() { diff --git a/dev-php/PEAR-Cache/metadata.xml b/dev-php/PEAR-Cache/metadata.xml index aca42932b833..77793b997e9e 100644 --- a/dev-php/PEAR-Cache/metadata.xml +++ b/dev-php/PEAR-Cache/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> diff --git a/dev-php/PEAR-Cache_Lite/Manifest b/dev-php/PEAR-Cache_Lite/Manifest index 107fa5095c68..4b5786eac5de 100644 --- a/dev-php/PEAR-Cache_Lite/Manifest +++ b/dev-php/PEAR-Cache_Lite/Manifest @@ -1,2 +1 @@ -DIST Cache_Lite-1.8.2.tgz 33873 BLAKE2B 0b5a21550fe6eb33242e97b135a7e2532fb0a3a047dfb3e858bf6a6bdc21e991007e4787764561baa9a165fdebd159caa33c14c822a29374be4081d07a63c858 SHA512 dfb3c2dadd0ca60cc62ad71fd6fc51c0665901b4370207dfeb1f0f56e9db4fb24724d22f2939f67d8aa044e1b465483c40ec34fb3bcc5e12031d4dd1e05953b4 DIST Cache_Lite-1.8.3.tgz 34036 BLAKE2B ca0b404371d370c7aeda2c83805d9f0c7c864063ffe597a277f123fd1de991e0e1c15e134ffa674bd387cc1d3cbb09eed047c7f10b8fbc755c0c8749483b2d01 SHA512 700376dd33afd0b1ed812d0d3dbdc14ad5523b3b181ac64ef0d56b62040c3d7bc9f234b3dae8013876a902f21da8dc92b1de41cea11aa428036bcc6e96166e65 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 deleted file mode 100644 index c74a1d4d90cc..000000000000 --- a/dev-php/PEAR-Cache_Lite/PEAR-Cache_Lite-1.8.2.ebuild +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -inherit php-pear-r2 - -KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86" -DESCRIPTION="Fast and safe little cache system" -LICENSE="LGPL-2.1" -SLOT="0" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND=">=dev-php/PEAR-PEAR-1.10.1" -DEPEND="test? ( ${RDEPEND} )" -DOCS=( README.md TODO docs/technical docs/examples ) - -src_test() { - peardev run-tests -r || die -} diff --git a/dev-php/PEAR-Cache_Lite/PEAR-Cache_Lite-1.8.3.ebuild b/dev-php/PEAR-Cache_Lite/PEAR-Cache_Lite-1.8.3.ebuild index 8e86b80d4732..fd784a172962 100644 --- a/dev-php/PEAR-Cache_Lite/PEAR-Cache_Lite-1.8.3.ebuild +++ b/dev-php/PEAR-Cache_Lite/PEAR-Cache_Lite-1.8.3.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" inherit php-pear-r2 -KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="amd64 ~hppa ppc ppc64 sparc x86" DESCRIPTION="Fast and safe little cache system" LICENSE="LGPL-2.1" SLOT="0" diff --git a/dev-php/PEAR-Cache_Lite/metadata.xml b/dev-php/PEAR-Cache_Lite/metadata.xml index b86acf66c756..3b1963efeb6f 100644 --- a/dev-php/PEAR-Cache_Lite/metadata.xml +++ b/dev-php/PEAR-Cache_Lite/metadata.xml @@ -1,8 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> <name>PHP</name> </maintainer> + <stabilize-allarches/> </pkgmetadata> 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 1b73820bc490..acd273489017 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 @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -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 ppc ppc64 sparc x86" IUSE="examples test" RESTRICT="!test? ( test )" diff --git a/dev-php/PEAR-Console_CommandLine/metadata.xml b/dev-php/PEAR-Console_CommandLine/metadata.xml index e0533582c0e0..ef95d9c7ac13 100644 --- a/dev-php/PEAR-Console_CommandLine/metadata.xml +++ b/dev-php/PEAR-Console_CommandLine/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> diff --git a/dev-php/PEAR-Console_Getargs/PEAR-Console_Getargs-1.4.0.ebuild b/dev-php/PEAR-Console_Getargs/PEAR-Console_Getargs-1.4.0.ebuild index 5a186bc0478f..ad54581bb38c 100644 --- a/dev-php/PEAR-Console_Getargs/PEAR-Console_Getargs-1.4.0.ebuild +++ b/dev-php/PEAR-Console_Getargs/PEAR-Console_Getargs-1.4.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="6" @@ -9,7 +9,7 @@ DESCRIPTION="A command-line arguments parser" LICENSE="PHP-3" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86" IUSE="test" RESTRICT="!test? ( test )" diff --git a/dev-php/PEAR-Console_Getargs/metadata.xml b/dev-php/PEAR-Console_Getargs/metadata.xml index b86acf66c756..222c77f3742a 100644 --- a/dev-php/PEAR-Console_Getargs/metadata.xml +++ b/dev-php/PEAR-Console_Getargs/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> diff --git a/dev-php/PEAR-Console_Getopt/PEAR-Console_Getopt-1.4.3.ebuild b/dev-php/PEAR-Console_Getopt/PEAR-Console_Getopt-1.4.3.ebuild index 382f3c45799a..4628401364f2 100644 --- a/dev-php/PEAR-Console_Getopt/PEAR-Console_Getopt-1.4.3.ebuild +++ b/dev-php/PEAR-Console_Getopt/PEAR-Console_Getopt-1.4.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -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 ppc ppc64 ~s390 sparc x86" IUSE="" DEPEND="" diff --git a/dev-php/PEAR-Console_Getopt/metadata.xml b/dev-php/PEAR-Console_Getopt/metadata.xml index 1f65fc978455..0df589258df6 100644 --- a/dev-php/PEAR-Console_Getopt/metadata.xml +++ b/dev-php/PEAR-Console_Getopt/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> diff --git a/dev-php/PEAR-Console_Table/Manifest b/dev-php/PEAR-Console_Table/Manifest index 86e0192a2d93..a7a8a24e306c 100644 --- a/dev-php/PEAR-Console_Table/Manifest +++ b/dev-php/PEAR-Console_Table/Manifest @@ -1,2 +1 @@ -DIST Console_Table-1.3.0.tgz 11391 BLAKE2B 25cbb72f2fa23026320840eb3e3b85f08dfc6a90ae9a613ec3e7251b407fc971c0a8aad3ac6bccbb9cd99066aca30249373539b8758fed58b0d1fc53898fc71b SHA512 83227ce8e55ae38cdf91b7097879a3406898064d1c047c5a94c6cadc46cbeeea51c43d135e6aadfbdb38fa080a1b27a1d4cea1c36ff9eb3e14dc4b04de334c11 DIST Console_Table-1.3.1.tgz 11492 BLAKE2B bff94b2ae1b6d23eaf9a60deee4e78ee3467eff9d53c1d6ac8330347647b54700d4b3cf30be84c071afc34a4517b3135f6b18011418ea5dfc0e2841da1a30874 SHA512 abac68c20bb670b29f405625edff0330ce5af51763a50ee7482c3ab9d39c7335134d77c0f1a94ce4914c2f454d493a685841e07628eb2aa58cc66617521b6a65 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 deleted file mode 100644 index 1eaaa2064341..000000000000 --- a/dev-php/PEAR-Console_Table/PEAR-Console_Table-1.3.0-r1.ebuild +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit php-pear-r2 - -DESCRIPTION="Class that makes it easy to build console style tables" -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86" -IUSE="" - -src_install() { - insinto /usr/share/php/Console - doins Table.php - php-pear-r2_install_packagexml -} diff --git a/dev-php/PEAR-Console_Table/PEAR-Console_Table-1.3.1.ebuild b/dev-php/PEAR-Console_Table/PEAR-Console_Table-1.3.1.ebuild index fe0e497cf0c0..ab638bb85e46 100644 --- a/dev-php/PEAR-Console_Table/PEAR-Console_Table-1.3.1.ebuild +++ b/dev-php/PEAR-Console_Table/PEAR-Console_Table-1.3.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -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="amd64 ~hppa ppc ppc64 sparc x86" IUSE="test" RESTRICT="!test? ( test )" BDEPEND="test? ( dev-php/pear )" diff --git a/dev-php/PEAR-Console_Table/metadata.xml b/dev-php/PEAR-Console_Table/metadata.xml index 15baf4c385c2..610d5fd374ac 100644 --- a/dev-php/PEAR-Console_Table/metadata.xml +++ b/dev-php/PEAR-Console_Table/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> diff --git a/dev-php/PEAR-Crypt_CHAP/PEAR-Crypt_CHAP-1.5.0-r3.ebuild b/dev-php/PEAR-Crypt_CHAP/PEAR-Crypt_CHAP-1.5.0-r3.ebuild index bf43b9f11c90..4f3fdbf0148a 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 @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -9,7 +9,7 @@ DESCRIPTION="Generating CHAP packets" LICENSE="BSD" SLOT="0" -KEYWORDS="amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86" +KEYWORDS="amd64 ~arm ~hppa ~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_CHAP/metadata.xml b/dev-php/PEAR-Crypt_CHAP/metadata.xml index b86acf66c756..222c77f3742a 100644 --- a/dev-php/PEAR-Crypt_CHAP/metadata.xml +++ b/dev-php/PEAR-Crypt_CHAP/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> diff --git a/dev-php/PEAR-Crypt_GPG/Manifest b/dev-php/PEAR-Crypt_GPG/Manifest index a4fbd22ca525..7209c7c0e908 100644 --- a/dev-php/PEAR-Crypt_GPG/Manifest +++ b/dev-php/PEAR-Crypt_GPG/Manifest @@ -1,4 +1 @@ -DIST Crypt_GPG-1.6.2.tgz 346709 BLAKE2B abced2fe8c909f06690c38884506ce03df4c5ef3ef460aafce65ea9405c6974f8af320fd5a07a7967b45421a9a67aa27026c28ef7eb1402ffefba527007a33ae SHA512 9d954d96b4e461c75f79ce9bc701d062e3f19671690228e6e0ce5265733ac1de9c06520f9f750348f3c37f01ccb79720574b2d2f371e69c8a25ae6e1bc18aabd -DIST Crypt_GPG-1.6.3.tgz 346999 BLAKE2B 8402ef382a6393972a3fda7370fbd37dec19d0ebabb6b316d35783538dbc01746476977d7dc3da487876201cd678964d9572dc67a43911319b1b614004a3c909 SHA512 f1ad2560a43a1e8f5a33269bc4ae4067e19e5325fdbd8d2fc55f6cb8aad89258df45fbecedd93a21749f33024c819f07399580b1a4760f5740f26043109dc396 -DIST Crypt_GPG-1.6.4.tgz 346390 BLAKE2B 22e9e9d893f96bb3c3dc538b168a35366d2b699e92bf832370223879e90e8018cfd3b736e099807fdcc897b7569a40af66e72f011eaeb7400477053b7838409d SHA512 3eee39702abe97fc322e5976ebe8a7f7ba07bc950d22aa6636cadf38b0bd9c6c6316d7be35f21a8d0e8dfdb66a76db33121edb34736869d31ae89b03468cf470 -DIST Crypt_GPG-1.6.5.tgz 346966 BLAKE2B 5ca074b57c44d99159409b1c7ce0adcf672b59882f6f2dddf864df692243457ccd69c8018b5031dc6ab0ea0e88dba0586b8842992184be65c72100d3f34904c1 SHA512 86feeff3e698c8ce133b0481ca96a000f00801f52c128dc8cb4cfec37040494c1e7176138e9988ebf0e85206c5fe3b51f939b4d7ca6decc16a787be4f4e8f261 +DIST Crypt_GPG-1.6.7.tgz 343957 BLAKE2B c95346005fdd36bd97e2a0e6cd42c5a2898fb59f0a4a3d3b09bd99a409bd9c998b267ffd84ab28148e17c3f7e78e094393c3b077998b05dc2d7ddcb0ab81394b SHA512 dd629271ebbcb98df5d31313c1a6911b62964046c758e00b55377170653e9880d2edc7d0b953fd6ae441d74238c4a8e1008bf6a9195a19ff463bcc82665f14e8 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 deleted file mode 100644 index e0f4c627a409..000000000000 --- a/dev-php/PEAR-Crypt_GPG/PEAR-Crypt_GPG-1.6.2.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -MY_PN="${PN/PEAR-/}" -MY_PV="${PV/_/}" -MY_P="${MY_PN}-${MY_PV}" - -DESCRIPTION="PHP interface to the GNU Privacy Guard (GnuPG)" -HOMEPAGE="https://pear.php.net/package/Crypt_GPG" -SRC_URI="http://download.pear.php.net/package/${MY_P}.tgz" -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="amd64 arm ~hppa ~ia64 ppc ppc64 sparc x86" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND="app-crypt/gnupg - dev-lang/php:*[posix,unicode] - dev-php/PEAR-Console_CommandLine - dev-php/PEAR-Exception" -DEPEND="test? ( ${RDEPEND} <dev-php/phpunit-6 )" - -S="${WORKDIR}/${MY_P}" - -PATCHES=( "${FILESDIR}/fix-unit-tests-with-new-gpg.patch" ) - -src_prepare() { - default - sed -i "s|@bin-dir@|${EPREFIX}/usr/bin|" Crypt/GPG/Engine.php || die - sed -i "s|@package-name@|${MY_PN}|" Crypt/GPG/PinEntry.php || die - sed -i "s|@data-dir@|${EPREFIX}/usr/share|" Crypt/GPG/PinEntry.php || die -} - -src_install() { - dodoc README.md - dobin scripts/crypt-gpg-pinentry - - insinto "/usr/share/${MY_PN}" - doins -r data - - insinto /usr/share/php - doins -r Crypt -} - -src_test() { - phpunit tests/ || die "test suite failed" -} diff --git a/dev-php/PEAR-Crypt_GPG/PEAR-Crypt_GPG-1.6.3.ebuild b/dev-php/PEAR-Crypt_GPG/PEAR-Crypt_GPG-1.6.3.ebuild deleted file mode 100644 index e0cea4ce1b04..000000000000 --- a/dev-php/PEAR-Crypt_GPG/PEAR-Crypt_GPG-1.6.3.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -MY_PN="${PN/PEAR-/}" -MY_PV="${PV/_/}" -MY_P="${MY_PN}-${MY_PV}" - -DESCRIPTION="PHP interface to the GNU Privacy Guard (GnuPG)" -HOMEPAGE="https://pear.php.net/package/Crypt_GPG" -SRC_URI="http://download.pear.php.net/package/${MY_P}.tgz" -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND="app-crypt/gnupg - dev-lang/php:*[posix,unicode] - dev-php/PEAR-Console_CommandLine - dev-php/PEAR-Exception" -BDEPEND="test? ( ${RDEPEND} <dev-php/phpunit-6 )" - -S="${WORKDIR}/${MY_P}" - -src_prepare() { - default - sed -i "s|@bin-dir@|${EPREFIX}/usr/bin|" Crypt/GPG/Engine.php || die - sed -i "s|@package-name@|${MY_PN}|" Crypt/GPG/PinEntry.php || die - sed -i "s|@data-dir@|${EPREFIX}/usr/share|" Crypt/GPG/PinEntry.php || die -} - -src_install() { - dodoc README.md - dobin scripts/crypt-gpg-pinentry - - insinto "/usr/share/${MY_PN}" - doins -r data - - insinto /usr/share/php - doins -r Crypt -} - -src_test() { - phpunit tests/ || die "test suite failed" -} diff --git a/dev-php/PEAR-Crypt_GPG/PEAR-Crypt_GPG-1.6.5.ebuild b/dev-php/PEAR-Crypt_GPG/PEAR-Crypt_GPG-1.6.5.ebuild deleted file mode 100644 index 2574cb9fb2d9..000000000000 --- a/dev-php/PEAR-Crypt_GPG/PEAR-Crypt_GPG-1.6.5.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -MY_PN="${PN/PEAR-/}" -MY_PV="${PV/_/}" -MY_P="${MY_PN}-${MY_PV}" - -DESCRIPTION="PHP interface to the GNU Privacy Guard (GnuPG)" -HOMEPAGE="https://pear.php.net/package/Crypt_GPG" -SRC_URI="http://download.pear.php.net/package/${MY_P}.tgz" -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND="app-crypt/gnupg - dev-lang/php:*[posix,unicode] - dev-php/PEAR-Console_CommandLine - dev-php/PEAR-Exception" -BDEPEND="test? ( ${RDEPEND} <dev-php/phpunit-9 )" - -PATCHES=( "${FILESDIR}/1.6.4-fix-tests.patch" ) - -S="${WORKDIR}/${MY_P}" - -src_prepare() { - default - - sed -i "s|@bin-dir@|${EPREFIX}/usr/bin|" Crypt/GPG/Engine.php || die - sed -i "s|@package-name@|${MY_PN}|" Crypt/GPG/PinEntry.php || die - sed -i "s|@data-dir@|${EPREFIX}/usr/share|" Crypt/GPG/PinEntry.php || die -} - -src_test() { - local -x GNUPGHOME="${HOME}" - phpunit --verbose tests/ || die "test suite failed" -} - -src_install() { - dodoc README.md - dobin scripts/crypt-gpg-pinentry - - insinto "/usr/share/${MY_PN}" - doins -r data - - insinto /usr/share/php - doins -r Crypt -} diff --git a/dev-php/PEAR-Crypt_GPG/PEAR-Crypt_GPG-1.6.4.ebuild b/dev-php/PEAR-Crypt_GPG/PEAR-Crypt_GPG-1.6.7.ebuild index 720a949b0606..21359273df54 100644 --- a/dev-php/PEAR-Crypt_GPG/PEAR-Crypt_GPG-1.6.4.ebuild +++ b/dev-php/PEAR-Crypt_GPG/PEAR-Crypt_GPG-1.6.7.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 MY_PN="${PN/PEAR-/}" MY_PV="${PV/_/}" @@ -12,27 +12,31 @@ 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 ppc ppc64 sparc x86" IUSE="test" RESTRICT="!test? ( test )" RDEPEND="app-crypt/gnupg - dev-lang/php:*[posix,unicode] + dev-lang/php:*[posix(-),unicode(-)] dev-php/PEAR-Console_CommandLine dev-php/PEAR-Exception" BDEPEND="test? ( ${RDEPEND} <dev-php/phpunit-9 )" -PATCHES=( "${FILESDIR}/1.6.4-fix-tests.patch" ) - S="${WORKDIR}/${MY_P}" src_prepare() { default + sed -i "s|@bin-dir@|${EPREFIX}/usr/bin|" Crypt/GPG/Engine.php || die sed -i "s|@package-name@|${MY_PN}|" Crypt/GPG/PinEntry.php || die sed -i "s|@data-dir@|${EPREFIX}/usr/share|" Crypt/GPG/PinEntry.php || die } +src_test() { + local -x GNUPGHOME="${T}" + phpunit --verbose --do-not-cache-result tests/ || die "test suite failed" +} + src_install() { dodoc README.md dobin scripts/crypt-gpg-pinentry @@ -43,7 +47,3 @@ src_install() { insinto /usr/share/php doins -r Crypt } - -src_test() { - phpunit tests/ || die "test suite failed" -} diff --git a/dev-php/PEAR-Crypt_GPG/files/1.6.4-fix-tests.patch b/dev-php/PEAR-Crypt_GPG/files/1.6.4-fix-tests.patch deleted file mode 100644 index e4fb835cc34f..000000000000 --- a/dev-php/PEAR-Crypt_GPG/files/1.6.4-fix-tests.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff -uarN a/tests/ImportKeyTest.php b/tests/ImportKeyTest.php ---- a/tests/ImportKeyTest.php 2020-03-22 08:00:23.000000000 -0400 -+++ b/tests/ImportKeyTest.php 2021-02-02 14:45:16.561963089 -0500 -@@ -60,7 +60,7 @@ - // set up - // {{{ setUp() - -- public function setUp() -+ public function setUp() :void - { - parent::setUp(); - -diff -uarN a/tests/KeyGeneratorTest.php b/tests/KeyGeneratorTest.php ---- a/tests/KeyGeneratorTest.php 2020-03-22 08:00:23.000000000 -0400 -+++ b/tests/KeyGeneratorTest.php 2021-02-02 14:42:07.117718685 -0500 -@@ -174,7 +174,7 @@ - // }}} - // {{{ setUp() - -- public function setUp() -+ public function setUp() :void - { - parent::setUp(); - $this->generator = new Crypt_GPG_KeyGenerator($this->getOptions()); -diff -uarN a/tests/TestCase.php b/tests/TestCase.php ---- a/tests/TestCase.php 2020-03-22 08:00:23.000000000 -0400 -+++ b/tests/TestCase.php 2021-02-02 14:42:36.978387716 -0500 -@@ -119,7 +119,7 @@ - // set up - // {{{ setUp() - -- public function setUp() -+ public function setUp() :void - { - // load test configuration file if it exists - $configFilename = __DIR__ . '/config.php'; -@@ -567,7 +567,7 @@ - // }}} - // {{{ tearDown() - -- public function tearDown() -+ public function tearDown() :void - { - unset($this->gpg); - diff --git a/dev-php/PEAR-Crypt_GPG/files/fix-unit-tests-with-new-gpg.patch b/dev-php/PEAR-Crypt_GPG/files/fix-unit-tests-with-new-gpg.patch deleted file mode 100644 index 8e49a2f263fb..000000000000 --- a/dev-php/PEAR-Crypt_GPG/files/fix-unit-tests-with-new-gpg.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 14a884dd5127141929ef7a58185c298e92602c40 Mon Sep 17 00:00:00 2001 -From: Aleksander Machniak <machniak@kolabsys.com> -Date: Sat, 16 Sep 2017 13:05:37 +0200 -Subject: [PATCH] Fix Bug #21242: PHPUnit tests fail sometimes while deleting - S.gpg-agent.extra - ---- - tests/TestCase.php | 20 ++++++++++++++------ - 1 file changed, 14 insertions(+), 6 deletions(-) - -diff --git a/tests/TestCase.php b/tests/TestCase.php -index b91ea7d..1ad8028 100644 ---- a/tests/TestCase.php -+++ b/tests/TestCase.php -@@ -583,7 +583,10 @@ private function _tearDownKeyring() - $iterator = new DirectoryIterator($dirname); - foreach ($iterator as $file) { - if (!$file->isDot()) { -- unlink($dirname . '/' . $file->getFilename()); -+ $filename = $dirname . '/' . $file->getFilename(); -+ if (file_exists($filename)) { -+ unlink($filename); -+ } - } - } - rmdir($dirname); -@@ -595,7 +598,10 @@ private function _tearDownKeyring() - - foreach ($iterator as $file) { - if (!$file->isDot()) { -- unlink($homedir . '/' . $file->getFilename()); -+ $filename = $homedir . '/' . $file->getFilename(); -+ if (file_exists($filename)) { -+ unlink($filename); -+ } - } - } - -@@ -614,10 +620,12 @@ private function _tearDownTempdir() - foreach ($iterator as $file) { - if (!$file->isDot()) { - $filename = $this->getTempFilename($file->getFilename()); -- if (is_dir($filename)) { -- rmdir($filename); -- } else { -- unlink($filename); -+ if (file_exists($filename)) { -+ if (is_dir($filename)) { -+ rmdir($filename); -+ } else { -+ unlink($filename); -+ } - } - } - } diff --git a/dev-php/PEAR-Crypt_GPG/metadata.xml b/dev-php/PEAR-Crypt_GPG/metadata.xml index 6d24d2bc5e13..67029d93f300 100644 --- a/dev-php/PEAR-Crypt_GPG/metadata.xml +++ b/dev-php/PEAR-Crypt_GPG/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> diff --git a/dev-php/PEAR-Crypt_HMAC/PEAR-Crypt_HMAC-1.0.1-r2.ebuild b/dev-php/PEAR-Crypt_HMAC/PEAR-Crypt_HMAC-1.0.1-r2.ebuild index 4b3cd7392992..13b7859c5574 100644 --- a/dev-php/PEAR-Crypt_HMAC/PEAR-Crypt_HMAC-1.0.1-r2.ebuild +++ b/dev-php/PEAR-Crypt_HMAC/PEAR-Crypt_HMAC-1.0.1-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -8,7 +8,7 @@ inherit php-pear-r2 DESCRIPTION="Calculates RFC 2104 compliant hashes" LICENSE="PHP-3" SLOT="0" -KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86" IUSE="test" RESTRICT="!test? ( test )" DEPEND="test? ( dev-php/PEAR-PEAR )" diff --git a/dev-php/PEAR-Crypt_HMAC/metadata.xml b/dev-php/PEAR-Crypt_HMAC/metadata.xml index b86acf66c756..222c77f3742a 100644 --- a/dev-php/PEAR-Crypt_HMAC/metadata.xml +++ b/dev-php/PEAR-Crypt_HMAC/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> diff --git a/dev-php/PEAR-Crypt_HMAC2/metadata.xml b/dev-php/PEAR-Crypt_HMAC2/metadata.xml index b86acf66c756..222c77f3742a 100644 --- a/dev-php/PEAR-Crypt_HMAC2/metadata.xml +++ b/dev-php/PEAR-Crypt_HMAC2/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> diff --git a/dev-php/PEAR-DB/Manifest b/dev-php/PEAR-DB/Manifest index b36141385aa0..503657997852 100644 --- a/dev-php/PEAR-DB/Manifest +++ b/dev-php/PEAR-DB/Manifest @@ -1,3 +1 @@ -DIST DB-1.10.0.tgz 132485 BLAKE2B 10ddf37984f33effb913c9e307b8543af56e344863fea8fde01cfd4684b829353f0799dff6413cffff711418bf7e8cb7f5855bf6f312d41d92db55d363784796 SHA512 01855d0e26b4463fac1f3f9c84c7f3fed62c9087cdd95843340f6250fbd63f4d33f7e958d3f3895f9c2fa568015e86e660393a578c764fa0d39b36a6394dc48a -DIST DB-1.9.2.tgz 133795 BLAKE2B 8b37b010145efd10a2b551392988a810c35b9a8c794eb0e162056fcded104276b19e97afb91149f1814f9f838a0db579a76578fb80d96d0574e5b7714d77aa91 SHA512 126bbbb847a24c20731f1e5f4a549e9d7e0651a760f10c49cfc7550f80dd8b05f3560bc80110bcaab9e79dcbb714c6113948f14a727f7f4087a23178b3db0afa -DIST DB-1.9.3.tgz 132290 BLAKE2B 8970697ac66bc9fe7f8c374431c59627133401e5b591fb3fc95ffc3a6ebb8cfe7e93982178e092eefc79d91657992eb539fc7211a237e3fe7407c75c7013831f SHA512 3fe98f97307818f65c0eaf291169fd13533a4d484d34d7fa7aa82580f6ec3d89b984292f173da2cf896f5f15531db9bde2be981e5a7679cc00c48aa2f9cc1142 +DIST DB-1.11.0.tgz 132549 BLAKE2B 0925a551bbda04dd71a1d2ffaf462485a92b62a7f141a5f097614dde8a8c8d6098705116a6f7c0b3bdd62547ad5962381ef15fee3057ba054cead8998306232c SHA512 88488874ee1cb6ff228199106702b1992eab4c7dce44984639951c0693e37ace115214973ef9cbd79959f0602b58cce8a254b47e32dc3d44171d0d7bf78db825 diff --git a/dev-php/PEAR-DB/PEAR-DB-1.10.0.ebuild b/dev-php/PEAR-DB/PEAR-DB-1.11.0.ebuild index f30eacc52464..9934410bd566 100644 --- a/dev-php/PEAR-DB/PEAR-DB-1.10.0.ebuild +++ b/dev-php/PEAR-DB/PEAR-DB-1.11.0.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 inherit php-pear-r2 -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86" +KEYWORDS="amd64 arm ~hppa ppc ppc64 ~s390 sparc x86" DESCRIPTION="Database abstraction layer for PHP" LICENSE="PHP-3" 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 deleted file mode 100644 index da09f3a06217..000000000000 --- a/dev-php/PEAR-DB/PEAR-DB-1.9.2-r1.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit php-pear-r2 - -KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86" - -DESCRIPTION="Database abstraction layer for PHP" -LICENSE="PHP-3" -SLOT="0" -IUSE="test" -RESTRICT="!test? ( test )" -DEPEND="test? ( dev-php/PEAR-PEAR )" - -DOCS=( doc/TESTERS doc/IDEAS doc/MAINTAINERS doc/STATUS ) - -src_test() { - # Requires the "pear" executable from dev-php/PEAR-PEAR, and also - # a working version of the cli SAPI eselected. - pear run-tests tests || die - - # The command succeeds regardless of whether or not the test suite - # passed, but this file is only written when there was a failure. - [[ -f run-tests.log ]] && die "test suite failed" -} diff --git a/dev-php/PEAR-DB/PEAR-DB-1.9.3.ebuild b/dev-php/PEAR-DB/PEAR-DB-1.9.3.ebuild deleted file mode 100644 index 4ffad08d1fe3..000000000000 --- a/dev-php/PEAR-DB/PEAR-DB-1.9.3.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit php-pear-r2 - -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86" - -DESCRIPTION="Database abstraction layer for PHP" -LICENSE="PHP-3" -SLOT="0" -IUSE="test" -RESTRICT="!test? ( test )" -DEPEND="test? ( dev-php/PEAR-PEAR )" - -DOCS=( doc/TESTERS doc/IDEAS doc/MAINTAINERS doc/STATUS ) - -src_test() { - # Requires the "pear" executable from dev-php/PEAR-PEAR, and also - # a working version of the cli SAPI eselected. - pear run-tests tests || die - - # The command succeeds regardless of whether or not the test suite - # passed, but this file is only written when there was a failure. - [[ -f run-tests.log ]] && die "test suite failed" -} diff --git a/dev-php/PEAR-DB/metadata.xml b/dev-php/PEAR-DB/metadata.xml index b86acf66c756..2d616c75d831 100644 --- a/dev-php/PEAR-DB/metadata.xml +++ b/dev-php/PEAR-DB/metadata.xml @@ -1,8 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> <name>PHP</name> </maintainer> + <upstream> + <remote-id type="github">pear/DB</remote-id> + <remote-id type="pear">DB</remote-id> + </upstream> + <stabilize-allarches/> </pkgmetadata> diff --git a/dev-php/PEAR-DB_DataObject/PEAR-DB_DataObject-1.11.5-r1.ebuild b/dev-php/PEAR-DB_DataObject/PEAR-DB_DataObject-1.11.5-r1.ebuild index aa8425ee51f0..c3e2a21298e2 100644 --- a/dev-php/PEAR-DB_DataObject/PEAR-DB_DataObject-1.11.5-r1.ebuild +++ b/dev-php/PEAR-DB_DataObject/PEAR-DB_DataObject-1.11.5-r1.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 inherit php-pear-r2 -KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86" DESCRIPTION="SQL builder and data modeling layer" LICENSE="PHP-3.01" diff --git a/dev-php/PEAR-DB_DataObject/metadata.xml b/dev-php/PEAR-DB_DataObject/metadata.xml index b86acf66c756..222c77f3742a 100644 --- a/dev-php/PEAR-DB_DataObject/metadata.xml +++ b/dev-php/PEAR-DB_DataObject/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> diff --git a/dev-php/PEAR-Date/PEAR-Date-1.5.0_alpha4-r1.ebuild b/dev-php/PEAR-Date/PEAR-Date-1.5.0_alpha4-r1.ebuild index d8fa915c73f3..defdf0af5354 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 @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -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="amd64 arm ~hppa ppc ppc64 ~s390 sparc x86" DESCRIPTION="Date and Time Zone classes" LICENSE="BSD" diff --git a/dev-php/PEAR-Date/metadata.xml b/dev-php/PEAR-Date/metadata.xml index b86acf66c756..222c77f3742a 100644 --- a/dev-php/PEAR-Date/metadata.xml +++ b/dev-php/PEAR-Date/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> diff --git a/dev-php/PEAR-Exception/Manifest b/dev-php/PEAR-Exception/Manifest index b1265e4460fe..8700aff21566 100644 --- a/dev-php/PEAR-Exception/Manifest +++ b/dev-php/PEAR-Exception/Manifest @@ -1,2 +1 @@ -DIST PEAR_Exception-1.0.0.tgz 5270 BLAKE2B f6f6874083fcef2453e1d07e1ee3e900e4f7d18eca8e9a9eda9891492dd3fc1e31eb13944031e82044f976f1070463a3b099a8223d2dabb2da109bb123997f5a SHA512 f2078186fdad6c6ca59ac462a24f7f9689bea08d30f786acb7779d52cd433e490c752ba0a263067d869151b0c051cded327cb3477a039c5de68c854bff002b58 DIST PEAR_Exception-1.0.2.tgz 5458 BLAKE2B f6e7bc452729ec4419650a0fbd6ef091dd5ec1b91804e1b59c598e44d3c04bf043084e385daa56fd1f6c012090010490922627a465061fe57ef9d74a49960e91 SHA512 80022c03bb665307a9feea88312301c86c903c5b8737559f59fc0028a08976976dd21e19a7dc805c27ec41f90ebd310012cd56ba2c2c006cf0df7cea69323a91 diff --git a/dev-php/PEAR-Exception/PEAR-Exception-1.0.0.ebuild b/dev-php/PEAR-Exception/PEAR-Exception-1.0.0.ebuild deleted file mode 100644 index a31247b3d963..000000000000 --- a/dev-php/PEAR-Exception/PEAR-Exception-1.0.0.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -MY_PN="${PN/-/_}" -MY_P="${MY_PN}-${PV}" - -DESCRIPTION="The PEAR Exception base class" -HOMEPAGE="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" -IUSE="test" -RESTRICT="!test? ( test )" -RDEPEND="dev-lang/php:* - !<=dev-php/PEAR-PEAR-1.10.3-r1" -DEPEND="test? ( ${RDEPEND} dev-php/phpunit )" -S="${WORKDIR}/${MY_P}" - -src_install() { - insinto /usr/share/php - doins -r PEAR -} - -src_test() { - phpunit tests || die "test suite failed" -} diff --git a/dev-php/PEAR-Exception/PEAR-Exception-1.0.2.ebuild b/dev-php/PEAR-Exception/PEAR-Exception-1.0.2.ebuild index 2a4a155c793d..65d7a63bef39 100644 --- a/dev-php/PEAR-Exception/PEAR-Exception-1.0.2.ebuild +++ b/dev-php/PEAR-Exception/PEAR-Exception-1.0.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -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 ppc ppc64 ~s390 sparc x86" IUSE="test" RESTRICT="!test? ( test )" RDEPEND="dev-lang/php:* diff --git a/dev-php/PEAR-Exception/metadata.xml b/dev-php/PEAR-Exception/metadata.xml index 0d4a6d80c8fa..e29745256072 100644 --- a/dev-php/PEAR-Exception/metadata.xml +++ b/dev-php/PEAR-Exception/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> diff --git a/dev-php/PEAR-File/PEAR-File-1.4.1-r1.ebuild b/dev-php/PEAR-File/PEAR-File-1.4.1-r1.ebuild index 30b8acbb6114..fcb9bcb3cc2b 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 @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -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="amd64 arm ~hppa ppc ppc64 ~s390 sparc x86" IUSE="test" RESTRICT="!test? ( test )" DEPEND="test? ( dev-php/PEAR-PEAR )" diff --git a/dev-php/PEAR-File/metadata.xml b/dev-php/PEAR-File/metadata.xml index aca42932b833..77793b997e9e 100644 --- a/dev-php/PEAR-File/metadata.xml +++ b/dev-php/PEAR-File/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> diff --git a/dev-php/PEAR-File_Archive/PEAR-File_Archive-1.5.5-r1.ebuild b/dev-php/PEAR-File_Archive/PEAR-File_Archive-1.5.5-r1.ebuild index 029d427fb5f5..40ffe7b45d13 100644 --- a/dev-php/PEAR-File_Archive/PEAR-File_Archive-1.5.5-r1.ebuild +++ b/dev-php/PEAR-File_Archive/PEAR-File_Archive-1.5.5-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -11,7 +11,7 @@ HOMEPAGE="https://pear.php.net/package/File_Archive" SRC_URI="http://download.pear.php.net/package/${MY_P}.tgz" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86" IUSE="minimal" RDEPEND="dev-lang/php[bzip2,zlib] diff --git a/dev-php/PEAR-File_Archive/metadata.xml b/dev-php/PEAR-File_Archive/metadata.xml index dad5f85241bc..b4d16dbd9a7b 100644 --- a/dev-php/PEAR-File_Archive/metadata.xml +++ b/dev-php/PEAR-File_Archive/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> diff --git a/dev-php/PEAR-File_Find/PEAR-File_Find-1.3.3.ebuild b/dev-php/PEAR-File_Find/PEAR-File_Find-1.3.3.ebuild index c765d5f4bcc0..aabe1137ca4b 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 @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -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="amd64 ~hppa ppc ppc64 sparc x86" IUSE="test" RESTRICT="!test? ( test )" diff --git a/dev-php/PEAR-File_Find/metadata.xml b/dev-php/PEAR-File_Find/metadata.xml index 5d3d9ddeb2db..00c5a562b643 100644 --- a/dev-php/PEAR-File_Find/metadata.xml +++ b/dev-php/PEAR-File_Find/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> diff --git a/dev-php/PEAR-File_Fortune/PEAR-File_Fortune-1.0.0-r1.ebuild b/dev-php/PEAR-File_Fortune/PEAR-File_Fortune-1.0.0-r1.ebuild index 21dbe5d6c163..18f9b9ed2f96 100644 --- a/dev-php/PEAR-File_Fortune/PEAR-File_Fortune-1.0.0-r1.ebuild +++ b/dev-php/PEAR-File_Fortune/PEAR-File_Fortune-1.0.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -9,7 +9,7 @@ DESCRIPTION="Interface for reading from and writing to fortune files" LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86" IUSE="test" RESTRICT="!test? ( test )" diff --git a/dev-php/PEAR-File_Fortune/metadata.xml b/dev-php/PEAR-File_Fortune/metadata.xml index aca42932b833..77793b997e9e 100644 --- a/dev-php/PEAR-File_Fortune/metadata.xml +++ b/dev-php/PEAR-File_Fortune/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> diff --git a/dev-php/PEAR-File_Gettext/PEAR-File_Gettext-0.4.2-r1.ebuild b/dev-php/PEAR-File_Gettext/PEAR-File_Gettext-0.4.2-r1.ebuild index 56f2b8ecaaa3..f11e09056895 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 @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -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="amd64 ~arm ~hppa ppc ppc64 ~s390 sparc x86" IUSE="" PATCHES=( "${FILESDIR/File_Gettext-0.4.2-construct.patch}" ) diff --git a/dev-php/PEAR-File_Gettext/metadata.xml b/dev-php/PEAR-File_Gettext/metadata.xml index b86acf66c756..222c77f3742a 100644 --- a/dev-php/PEAR-File_Gettext/metadata.xml +++ b/dev-php/PEAR-File_Gettext/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> diff --git a/dev-php/PEAR-File_SMBPasswd/PEAR-File_SMBPasswd-1.0.3-r1.ebuild b/dev-php/PEAR-File_SMBPasswd/PEAR-File_SMBPasswd-1.0.3-r1.ebuild index 71ede40c90f9..ea9c0e138b33 100644 --- a/dev-php/PEAR-File_SMBPasswd/PEAR-File_SMBPasswd-1.0.3-r1.ebuild +++ b/dev-php/PEAR-File_SMBPasswd/PEAR-File_SMBPasswd-1.0.3-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -7,7 +7,7 @@ inherit php-pear-r2 DESCRIPTION="Class for managing SAMBA style password files" LICENSE="BSD" SLOT="0" -KEYWORDS="amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86" IUSE="" RDEPEND=">=dev-lang/php-5.3:* >=dev-php/PEAR-Crypt_CHAP-1.0.0" diff --git a/dev-php/PEAR-File_SMBPasswd/metadata.xml b/dev-php/PEAR-File_SMBPasswd/metadata.xml index b86acf66c756..222c77f3742a 100644 --- a/dev-php/PEAR-File_SMBPasswd/metadata.xml +++ b/dev-php/PEAR-File_SMBPasswd/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> diff --git a/dev-php/PEAR-HTML_AJAX/metadata.xml b/dev-php/PEAR-HTML_AJAX/metadata.xml index d7eb71f3cb2e..e126c564f436 100644 --- a/dev-php/PEAR-HTML_AJAX/metadata.xml +++ b/dev-php/PEAR-HTML_AJAX/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> diff --git a/dev-php/PEAR-HTML_CSS/metadata.xml b/dev-php/PEAR-HTML_CSS/metadata.xml index b86acf66c756..222c77f3742a 100644 --- a/dev-php/PEAR-HTML_CSS/metadata.xml +++ b/dev-php/PEAR-HTML_CSS/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> diff --git a/dev-php/PEAR-HTML_Common/PEAR-HTML_Common-1.2.5-r1.ebuild b/dev-php/PEAR-HTML_Common/PEAR-HTML_Common-1.2.5-r1.ebuild index fbe7cee813a5..43514caa660d 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 @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -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="amd64 arm ~hppa ppc ppc64 ~s390 sparc x86" IUSE="" src_install() { diff --git a/dev-php/PEAR-HTML_Common/metadata.xml b/dev-php/PEAR-HTML_Common/metadata.xml index aca42932b833..77793b997e9e 100644 --- a/dev-php/PEAR-HTML_Common/metadata.xml +++ b/dev-php/PEAR-HTML_Common/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> diff --git a/dev-php/PEAR-HTML_Common2/Manifest b/dev-php/PEAR-HTML_Common2/Manifest index 37964d9cd5e3..c5f485c523f2 100644 --- a/dev-php/PEAR-HTML_Common2/Manifest +++ b/dev-php/PEAR-HTML_Common2/Manifest @@ -1,2 +1,2 @@ -DIST HTML_Common2-2.1.2.tgz 8579 BLAKE2B 43d71ca1010e3cb4d73f25417b601872485f9c8990cb3117d112a84f2eca67437687d423146c1f67f8053116d4aef04b4859982805c7009047a682385878dc8e SHA512 f6082e44578dfa063f4f1a896ea477c485122e3d2cc89764c16ee76c3153d60276cbc290b4f3b8c18536aaeffb6797b9c56b8b0f2ffe1ef953fe02a5fb32b864 DIST HTML_Common2-2.2.0.tgz 8884 BLAKE2B fc0c7d3573e8da0ec315dff4a59e54187cc9e378f2d576f30af7faaa8fce033a62aaed239d9613ff591e6c11b71f44cf78a35a4998abe9adb9550c7509e907df SHA512 7ebee98688a58484b92a50abd632ef21b166f9e20a47025e3e47af60b8dbb6108f3ceb5603b64602fee2275c2398fdd1831cfa3d2c151f266f2a7961823751d3 +DIST HTML_Common2-2.3.0.tgz 9085 BLAKE2B 577f83d110196c6edb0056f4e352fe3dbca3ec49d9b3fd6821f75b7b846f35bf6082c7a96962cedc891dab927e00b5987e57394f42f0401ba317b1496104f4f9 SHA512 b8d7a288d842a07de34a7a6b94ed9ac311a1fb3928a099f583a1d9ab6ce8514f938f7c8425cfa179647cdd5ecd514ed71ea2bb2ec968f49e27879dee7937b1a9 diff --git a/dev-php/PEAR-HTML_Common2/PEAR-HTML_Common2-2.2.0.ebuild b/dev-php/PEAR-HTML_Common2/PEAR-HTML_Common2-2.2.0.ebuild index 2601d0f9ce89..e7cb6516c669 100644 --- a/dev-php/PEAR-HTML_Common2/PEAR-HTML_Common2-2.2.0.ebuild +++ b/dev-php/PEAR-HTML_Common2/PEAR-HTML_Common2-2.2.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -8,7 +8,7 @@ inherit php-pear-r2 DESCRIPTION="Abstract base class for HTML classes (PHP5 port of PEAR-HTML_Common package)" LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86" +KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86" #IUSE="test" #RESTRICT="!test? ( test )" # Tests fail with current phpunit diff --git a/dev-php/PEAR-HTML_Common2/PEAR-HTML_Common2-2.1.2.ebuild b/dev-php/PEAR-HTML_Common2/PEAR-HTML_Common2-2.3.0.ebuild index 821e6e7c7feb..ab0a59951f18 100644 --- a/dev-php/PEAR-HTML_Common2/PEAR-HTML_Common2-2.1.2.ebuild +++ b/dev-php/PEAR-HTML_Common2/PEAR-HTML_Common2-2.3.0.ebuild @@ -1,17 +1,19 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit php-pear-r2 DESCRIPTION="Abstract base class for HTML classes (PHP5 port of PEAR-HTML_Common package)" LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86" -IUSE="test" -RESTRICT="!test? ( test )" -DEPEND="test? ( dev-php/phpunit )" +KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86" +#IUSE="test" +#RESTRICT="!test? ( test )" +# Tests fail with current phpunit +RESTRICT="test" +#BDEPEND="test? ( dev-php/phpunit )" src_test() { phpunit tests/AllTests.php || die diff --git a/dev-php/PEAR-HTML_Common2/metadata.xml b/dev-php/PEAR-HTML_Common2/metadata.xml index aca42932b833..77793b997e9e 100644 --- a/dev-php/PEAR-HTML_Common2/metadata.xml +++ b/dev-php/PEAR-HTML_Common2/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> diff --git a/dev-php/PEAR-HTML_Javascript/PEAR-HTML_Javascript-1.1.2-r1.ebuild b/dev-php/PEAR-HTML_Javascript/PEAR-HTML_Javascript-1.1.2-r1.ebuild index fe556c1bc6d5..ab8ec04a6b0d 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 @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -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="amd64 ~hppa ppc ppc64 sparc x86" src_install() { insinto /usr/share/php/HTML diff --git a/dev-php/PEAR-HTML_Javascript/metadata.xml b/dev-php/PEAR-HTML_Javascript/metadata.xml index 4787860c3221..b030959da397 100644 --- a/dev-php/PEAR-HTML_Javascript/metadata.xml +++ b/dev-php/PEAR-HTML_Javascript/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> diff --git a/dev-php/PEAR-HTML_QuickForm2/Manifest b/dev-php/PEAR-HTML_QuickForm2/Manifest index 6f8847807d2d..e7e485ceb2a9 100644 --- a/dev-php/PEAR-HTML_QuickForm2/Manifest +++ b/dev-php/PEAR-HTML_QuickForm2/Manifest @@ -1,3 +1,2 @@ -DIST HTML_QuickForm2-2.0.2.tgz 179063 BLAKE2B f1309099d481417cb906a0dbae39264e7e5b90c1a91b959fd33afea2ef35fb84f767301f225bd939bf36ced397b0ef81f615195b2426d8b3428cb64bc6d007dd SHA512 37988f09837286343069be5d249476e7fcb08d937f391bc2f6868a5fdaa31ddb1cced60b909ad690283ae65f48148f7928bebefa483f553d1a6bb3a51fbb0d03 -DIST HTML_QuickForm2-2.1.0.tgz 177215 BLAKE2B f80483bad59d7f860455123084ea37fc5180a1f86231ab74c61e278c6f5b4a71f80c9f3ae5457fcadc107b2554000b51e6dd4acacc8db5123ca6492fcf9505c4 SHA512 260cd07e7d95674d3f5090e54a33bb3e5a77063d3d2c84dc885bc67739dc29b23d7f6d45319b8b1d3f5729ec13c8c6206d06f91378635ba74e11468f609aba45 DIST HTML_QuickForm2-2.2.0.tgz 176246 BLAKE2B d89dfa7853a6f17442a921623b16cee40895ee563306b8ab9b56de40da8dc7d0eeb3f8487ed3b8a94a29d24df7248cca4674abe6a65a56fa9b4644695fafb7ed SHA512 a26af29c9cad13ae1289593443c476cc23ce87fcb204ee45f946f0d5eedc74b6bfea5c4caeaa3fe6d2259196dc1d9a04c7dd626d2f1758ec065908aeef6b60d2 +DIST HTML_QuickForm2-2.2.2.tgz 177684 BLAKE2B 0a57218d7d2e137023d39aeead96952951ed686113afc609d8273ba7f66f80efb9ff4221f874f9386d75ffaa7f63605d8ca851b8dc12552e74307f4e521e85eb SHA512 d6e6df8537ce0cbadeea2807cf71d59f0af8b48ff86393ca8aaf3534e7dacce4cd25aded399dbb1201aa1744c6fc3feb7d6f211c8ab0a984dea9e530d45e05be diff --git a/dev-php/PEAR-HTML_QuickForm2/PEAR-HTML_QuickForm2-2.0.2-r1.ebuild b/dev-php/PEAR-HTML_QuickForm2/PEAR-HTML_QuickForm2-2.0.2-r1.ebuild deleted file mode 100644 index 1fbe4adaf476..000000000000 --- a/dev-php/PEAR-HTML_QuickForm2/PEAR-HTML_QuickForm2-2.0.2-r1.ebuild +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit php-pear-r2 - -DESCRIPTION="Creating, validating, processing HTML forms methods (PHP5 optimize)" -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" -IUSE="examples" - -DEPEND=">=dev-lang/php-5.2.0:*" -RDEPEND="${DEPEND} - >=dev-php/PEAR-HTML_Common2-2.0.0" - -src_install() { - HTML_DOCS=( data/quickform.css data/js ) - use examples && HTML_DOCS+=( docs/examples ) - php-pear-r2_src_install -} diff --git a/dev-php/PEAR-HTML_QuickForm2/PEAR-HTML_QuickForm2-2.2.0.ebuild b/dev-php/PEAR-HTML_QuickForm2/PEAR-HTML_QuickForm2-2.2.0.ebuild index ebf13a668e09..39fefeda7920 100644 --- a/dev-php/PEAR-HTML_QuickForm2/PEAR-HTML_QuickForm2-2.2.0.ebuild +++ b/dev-php/PEAR-HTML_QuickForm2/PEAR-HTML_QuickForm2-2.2.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -8,7 +8,7 @@ inherit php-pear-r2 DESCRIPTION="Creating, validating, processing HTML forms methods (PHP5 optimize)" LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86" IUSE="examples" DEPEND=">=dev-lang/php-5.2.0:*" diff --git a/dev-php/PEAR-HTML_QuickForm2/PEAR-HTML_QuickForm2-2.1.0.ebuild b/dev-php/PEAR-HTML_QuickForm2/PEAR-HTML_QuickForm2-2.2.2.ebuild index 6ed791780ee4..3b449f10c4d5 100644 --- a/dev-php/PEAR-HTML_QuickForm2/PEAR-HTML_QuickForm2-2.1.0.ebuild +++ b/dev-php/PEAR-HTML_QuickForm2/PEAR-HTML_QuickForm2-2.2.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -8,12 +8,12 @@ inherit php-pear-r2 DESCRIPTION="Creating, validating, processing HTML forms methods (PHP5 optimize)" LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86" IUSE="examples" -DEPEND=">=dev-lang/php-5.2.0:*" +DEPEND=">=dev-lang/php-5.4.0:*" RDEPEND="${DEPEND} - >=dev-php/PEAR-HTML_Common2-2.1.0" + >=dev-php/PEAR-HTML_Common2-2.2.0" src_install() { HTML_DOCS=( data/quickform.css data/js ) diff --git a/dev-php/PEAR-HTML_QuickForm2/metadata.xml b/dev-php/PEAR-HTML_QuickForm2/metadata.xml index aca42932b833..77793b997e9e 100644 --- a/dev-php/PEAR-HTML_QuickForm2/metadata.xml +++ b/dev-php/PEAR-HTML_QuickForm2/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> diff --git a/dev-php/PEAR-HTML_Table/PEAR-HTML_Table-1.8.4-r1.ebuild b/dev-php/PEAR-HTML_Table/PEAR-HTML_Table-1.8.4-r1.ebuild index bbd41c5d71cb..3039fb0da308 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 @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -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="amd64 ~hppa ppc ppc64 sparc x86" IUSE="test" RESTRICT="!test? ( test )" diff --git a/dev-php/PEAR-HTML_Table/metadata.xml b/dev-php/PEAR-HTML_Table/metadata.xml index aca42932b833..77793b997e9e 100644 --- a/dev-php/PEAR-HTML_Table/metadata.xml +++ b/dev-php/PEAR-HTML_Table/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> diff --git a/dev-php/PEAR-HTML_Table_Matrix/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 e4eb000d209b..0adba7956613 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 @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -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="amd64 ~hppa 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_Table_Matrix/metadata.xml b/dev-php/PEAR-HTML_Table_Matrix/metadata.xml index aca42932b833..77793b997e9e 100644 --- a/dev-php/PEAR-HTML_Table_Matrix/metadata.xml +++ b/dev-php/PEAR-HTML_Table_Matrix/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> diff --git a/dev-php/PEAR-HTML_Template_Flexy/PEAR-HTML_Template_Flexy-1.3.13.ebuild b/dev-php/PEAR-HTML_Template_Flexy/PEAR-HTML_Template_Flexy-1.3.13.ebuild index 886594ab4ca6..b488a4bd268b 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-2019 Gentoo Authors +# Copyright 1999-2023 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="amd64 ~hppa 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_Flexy/metadata.xml b/dev-php/PEAR-HTML_Template_Flexy/metadata.xml index 177eaaa943d0..74106ec2e497 100644 --- a/dev-php/PEAR-HTML_Template_Flexy/metadata.xml +++ b/dev-php/PEAR-HTML_Template_Flexy/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> diff --git a/dev-php/PEAR-HTML_Template_Sigma/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 51686449f1a6..aa685f6b9df3 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 @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2023 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 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="amd64 ~hppa ppc ppc64 sparc x86" IUSE="test" RESTRICT="!test? ( test )" diff --git a/dev-php/PEAR-HTML_Template_Sigma/metadata.xml b/dev-php/PEAR-HTML_Template_Sigma/metadata.xml index aca42932b833..77793b997e9e 100644 --- a/dev-php/PEAR-HTML_Template_Sigma/metadata.xml +++ b/dev-php/PEAR-HTML_Template_Sigma/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> diff --git a/dev-php/PEAR-HTTP/PEAR-HTTP-1.4.1-r3.ebuild b/dev-php/PEAR-HTTP/PEAR-HTTP-1.4.1-r3.ebuild index dcceae27dd56..4e1633649e35 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 @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -8,7 +8,7 @@ inherit php-pear-r2 edos2unix DESCRIPTION="Miscellaneous HTTP utilities" LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86" +KEYWORDS="amd64 ~hppa ppc ppc64 sparc x86" IUSE="test" RESTRICT="!test? ( test )" DEPEND="test? ( dev-php/PEAR-PEAR )" diff --git a/dev-php/PEAR-HTTP/metadata.xml b/dev-php/PEAR-HTTP/metadata.xml index aca42932b833..77793b997e9e 100644 --- a/dev-php/PEAR-HTTP/metadata.xml +++ b/dev-php/PEAR-HTTP/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> diff --git a/dev-php/PEAR-HTTP_Header/metadata.xml b/dev-php/PEAR-HTTP_Header/metadata.xml index da7866059839..67ab349fc657 100644 --- a/dev-php/PEAR-HTTP_Header/metadata.xml +++ b/dev-php/PEAR-HTTP_Header/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> diff --git a/dev-php/PEAR-HTTP_Request2/Manifest b/dev-php/PEAR-HTTP_Request2/Manifest index c40fe496848a..94e4ce0bb853 100644 --- a/dev-php/PEAR-HTTP_Request2/Manifest +++ b/dev-php/PEAR-HTTP_Request2/Manifest @@ -1,3 +1,2 @@ -DIST HTTP_Request2-2.3.0.tgz 119717 BLAKE2B f12972b2423258016f4f4ef8888b5aa1d56bb47146cc6e21f74edfd2e3cd8ae69a1830b4a203990e1346554f2a6e9538e8d5feae27cceadc8465b018dd34ff37 SHA512 52fc2768f3c5afe6fd4505d427255e467b5b7cac8a4116cbabc3f1c0ffe6f1bd061a9c9b31de2ebbd4a7844ae73085ab0d52adf905dce28eb31197117657d77b -DIST HTTP_Request2-2.4.1.tgz 125380 BLAKE2B 0037938211432be52af8851b015f8c8ef73225fbbc1727e6e647d2e9632fa471a73ae14c4f8c0ea636fb97339dfd53da91bd391543bc855dc9a123ca7a707965 SHA512 9a65aee4c4f724a84815d683522225d36a8e30fc1f5dbbe6b4681ec264b4fb711573bd6d2ec6ddc228c9e259ffbeeb6816aadba155530e969c7bfac4e0617e2b -DIST HTTP_Request2-2.4.2.tgz 125530 BLAKE2B 3e614e45e40b075930781b9e3cc0ed657f10056aa40bce28910ae9499e9db39a6f36410f632254061a002818343b4454639f4b48f23687e0db665b204275ad0c SHA512 c122df64f3f87d562fd4f818b3f02f7639dc907f724d034c420ddeabc5295d0a94d77221287349bcb7a790a97cf7c9b078d9a8086a476789eae906c6e124c910 +DIST HTTP_Request2-2.5.0.tgz 126988 BLAKE2B 5d1f4f2e3e9b800377c14688529ea322084f126c388f675b5d33ae99ba9d3a10e5da0e30d92984f1ba40e92da908917362e459f7b8415e61a85ad797ca38411f SHA512 a333109077758c0899e74e1037484e749825c87f182e2388bb9a0a7e0a881b1f1aec7b9f7a327ff428e32f874df263e7b4b7714be4d8f86cac9370f31aff2d0f +DIST HTTP_Request2-2.5.1.tgz 127089 BLAKE2B 826dd551bd281f1be8f83cc272c25dcd8ad661a61c997c875c78ac4dceb377fb4af84a61cf30d8af4ed666fc0c46dcf95b74cb793c50f5d2e753523cd1431477 SHA512 a877dc7499d11619b978283c818bd3a541ea249a6556fb56254d843a54d058452f2f3526d1af689d8e7399d858879af34af4c1721ef3e19c6abf3f761771ca0f diff --git a/dev-php/PEAR-HTTP_Request2/PEAR-HTTP_Request2-2.4.1.ebuild b/dev-php/PEAR-HTTP_Request2/PEAR-HTTP_Request2-2.4.1.ebuild deleted file mode 100644 index b1f6817200a1..000000000000 --- a/dev-php/PEAR-HTTP_Request2/PEAR-HTTP_Request2-2.4.1.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit php-pear-r2 - -DESCRIPTION="Provides an easy way to perform HTTP requests" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86" -IUSE="+curl +fileinfo +ssl test +zlib" -RESTRICT="!test? ( test )" - -RDEPEND="dev-lang/php:*[curl?,fileinfo?,ssl?,zlib?] ->=dev-php/PEAR-Net_URL2-2.2.0" -DEPEND="test? ( ${RDEPEND} dev-php/phpunit )" - -src_prepare() { - sed -i "s~@data_dir@~${EPREFIX}/usr/share/php/data~" HTTP/Request2/CookieJar.php || die - default -} - -src_test() { - phpunit tests || die -} - -src_install() { - php-pear-r2_src_install - insinto "/usr/share/php/data/${PHP_PEAR_PKG_NAME}" - doins data/* -} diff --git a/dev-php/PEAR-HTTP_Request2/PEAR-HTTP_Request2-2.4.2.ebuild b/dev-php/PEAR-HTTP_Request2/PEAR-HTTP_Request2-2.5.0.ebuild index b1f6817200a1..aab82cf63ce5 100644 --- a/dev-php/PEAR-HTTP_Request2/PEAR-HTTP_Request2-2.4.2.ebuild +++ b/dev-php/PEAR-HTTP_Request2/PEAR-HTTP_Request2-2.5.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -9,9 +9,12 @@ 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="amd64 ~arm ~hppa ~ppc ~ppc64 ~s390 sparc x86" IUSE="+curl +fileinfo +ssl test +zlib" -RESTRICT="!test? ( test )" + +# We don't have Yoast\PHPUnitPolyfills in Gentoo +# and we would need to patch sources to find it +RESTRICT="test" RDEPEND="dev-lang/php:*[curl?,fileinfo?,ssl?,zlib?] >=dev-php/PEAR-Net_URL2-2.2.0" 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.5.1.ebuild index 0a9fee491427..b21a037dd6ed 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.5.1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 inherit php-pear-r2 @@ -9,9 +9,12 @@ 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="amd64 ~arm ~hppa ~ppc ~ppc64 ~s390 sparc x86" IUSE="+curl +fileinfo +ssl test +zlib" -RESTRICT="!test? ( test )" + +# We don't have Yoast\PHPUnitPolyfills in Gentoo +# and we would need to patch sources to find it +RESTRICT="test" RDEPEND="dev-lang/php:*[curl?,fileinfo?,ssl?,zlib?] >=dev-php/PEAR-Net_URL2-2.2.0" diff --git a/dev-php/PEAR-HTTP_Request2/metadata.xml b/dev-php/PEAR-HTTP_Request2/metadata.xml index 50c6da14210c..606b8473e0e8 100644 --- a/dev-php/PEAR-HTTP_Request2/metadata.xml +++ b/dev-php/PEAR-HTTP_Request2/metadata.xml @@ -1,14 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> <name>PHP</name> </maintainer> <use> - <flag name="curl">Force dev-lang/php to be compiled with curl extension</flag> - <flag name="fileinfo">Force dev-lang/php to be compiled with fileinfo extension</flag> - <flag name="ssl">Force dev-lang/php to be compiled with ssl extension</flag> - <flag name="zlib">Force dev-lang/php to be compiled with zlib extension</flag> + <flag name="curl">Force <pkg>dev-lang/php</pkg> to be compiled with curl extension</flag> + <flag name="fileinfo">Force <pkg>dev-lang/php</pkg> to be compiled with fileinfo extension</flag> + <flag name="ssl">Force <pkg>dev-lang/php</pkg> to be compiled with ssl extension</flag> + <flag name="zlib">Force <pkg>dev-lang/php</pkg> to be compiled with zlib extension</flag> </use> + <stabilize-allarches/> </pkgmetadata> diff --git a/dev-php/PEAR-HTTP_Session2/metadata.xml b/dev-php/PEAR-HTTP_Session2/metadata.xml index aca42932b833..77793b997e9e 100644 --- a/dev-php/PEAR-HTTP_Session2/metadata.xml +++ b/dev-php/PEAR-HTTP_Session2/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> diff --git a/dev-php/PEAR-Image_Color2/metadata.xml b/dev-php/PEAR-Image_Color2/metadata.xml index b86acf66c756..222c77f3742a 100644 --- a/dev-php/PEAR-Image_Color2/metadata.xml +++ b/dev-php/PEAR-Image_Color2/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> diff --git a/dev-php/PEAR-Image_GraphViz/PEAR-Image_GraphViz-1.3.0_p20151104.ebuild b/dev-php/PEAR-Image_GraphViz/PEAR-Image_GraphViz-1.3.0_p20151104.ebuild index 9e54051a68a0..a7c53943be47 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 @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -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="amd64 ~hppa ~sparc x86" IUSE="test" RESTRICT="!test? ( test )" RDEPEND="media-gfx/graphviz" diff --git a/dev-php/PEAR-Image_GraphViz/metadata.xml b/dev-php/PEAR-Image_GraphViz/metadata.xml index b86acf66c756..222c77f3742a 100644 --- a/dev-php/PEAR-Image_GraphViz/metadata.xml +++ b/dev-php/PEAR-Image_GraphViz/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> diff --git a/dev-php/PEAR-Image_IPTC/PEAR-Image_IPTC-1.0.2-r2.ebuild b/dev-php/PEAR-Image_IPTC/PEAR-Image_IPTC-1.0.2-r2.ebuild index d1c57691f825..6a65a4e5c66f 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 @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -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="amd64 ~hppa ppc ppc64 sparc x86" IUSE="" src_install() { diff --git a/dev-php/PEAR-Image_IPTC/metadata.xml b/dev-php/PEAR-Image_IPTC/metadata.xml index aca42932b833..77793b997e9e 100644 --- a/dev-php/PEAR-Image_IPTC/metadata.xml +++ b/dev-php/PEAR-Image_IPTC/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> diff --git a/dev-php/PEAR-Image_Text/metadata.xml b/dev-php/PEAR-Image_Text/metadata.xml index b86acf66c756..222c77f3742a 100644 --- a/dev-php/PEAR-Image_Text/metadata.xml +++ b/dev-php/PEAR-Image_Text/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> diff --git a/dev-php/PEAR-Log/Manifest b/dev-php/PEAR-Log/Manifest index ee627883a70d..fe8d57fb0201 100644 --- a/dev-php/PEAR-Log/Manifest +++ b/dev-php/PEAR-Log/Manifest @@ -1,3 +1 @@ -DIST Log-1.13.1.tgz 46764 BLAKE2B dc0f4605ed801818ddf070ec3beb6818af1630d99bec721cd3f487e709f87bd4a1628a05854c48fe9775aab546bdce4618061ef37674aa9921f536deccc6a080 SHA512 246510b7dbff4dc9f9cdd951d76baf2dd377e30ffde6d38cadac10091dcb92f8095406edb6d8a87ebe2330d514ce99f355f84ebfe57cd8a3f3babc316995148a -DIST Log-1.13.2.tgz 46801 BLAKE2B 529677ed8a840742840a8ebeb5f5c7d4e8a8af257f9c3b1cb9ff990e42e760e0040f7df8d94794f40ec5654cf33e1909b7b48ca3f656d2a2bc0310c6705d6c24 SHA512 a4adaf7ee2af600a6c14ed398159c61a7df73b2c6be928f0ea6bbaf90d4b0e866e5a169953fa7819e293cd5cb29c6aca762ced79f3619dfbb38af1ea8731b1c4 DIST Log-1.13.3.tgz 46815 BLAKE2B 139cc96e475bce1e1e34672c97060d8c2f77767d290641936ec9b28502fbf74ae2fcbb06c51bb991b413dfb8b59ae365f608f5db0687342fd2f4033a77d097f1 SHA512 76baf5f6c800252d30403f64f3390291193c208789e1a3b88b945bf4a28defcd465fe2313ec83487f0be95ba2a99ca75d41f4bfb01f83b84b50fdcdb68e901d4 diff --git a/dev-php/PEAR-Log/PEAR-Log-1.13.1.ebuild b/dev-php/PEAR-Log/PEAR-Log-1.13.1.ebuild deleted file mode 100644 index 8c392374aaa7..000000000000 --- a/dev-php/PEAR-Log/PEAR-Log-1.13.1.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -MY_PN="${PN/PEAR-/}" -MY_P="${MY_PN}-${PV}" - -DESCRIPTION="The Log framework provides an abstracted logging system" -HOMEPAGE="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" -IUSE="examples test" -RESTRICT="!test? ( test )" - -# The DB, Mail, and MDB2 dependencies are technically optional, but -# automagic. To avoid surprises, we require them unconditionally. -RDEPEND="dev-lang/php:* - dev-php/PEAR-PEAR - dev-php/PEAR-DB - dev-php/PEAR-Mail - dev-php/PEAR-MDB2" -DEPEND="test? ( ${RDEPEND} )" - -S="${WORKDIR}/${MY_P}" - -src_install() { - dodoc docs/guide.txt misc/log.sql - use examples && dodoc -r examples - - # I don't like installing "Log.php" right at the top-level, but any - # packages depending on us will expect to find it there and not as - # e.g. Log/Log.php. - insinto "/usr/share/php/" - doins Log.php - doins -r Log -} - -src_test() { - # Requires the "pear" executable from dev-php/PEAR-PEAR. - pear run-tests tests || die - - # The command succeeds regardless of whether or not the test suite - # passed, but this file is only written when there was a failure. - [[ -f run-tests.log ]] && die "test suite failed" -} diff --git a/dev-php/PEAR-Log/PEAR-Log-1.13.2.ebuild b/dev-php/PEAR-Log/PEAR-Log-1.13.2.ebuild deleted file mode 100644 index 384c2311aa5c..000000000000 --- a/dev-php/PEAR-Log/PEAR-Log-1.13.2.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -MY_PN="${PN/PEAR-/}" -MY_P="${MY_PN}-${PV}" - -DESCRIPTION="The Log framework provides an abstracted logging system" -HOMEPAGE="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" -IUSE="examples test" -RESTRICT="!test? ( test )" - -# The DB, Mail, and MDB2 dependencies are technically optional, but -# automagic. To avoid surprises, we require them unconditionally. -RDEPEND="dev-lang/php:* - dev-php/PEAR-PEAR - dev-php/PEAR-DB - dev-php/PEAR-Mail - dev-php/PEAR-MDB2" -DEPEND="test? ( ${RDEPEND} )" - -S="${WORKDIR}/${MY_P}" - -src_install() { - dodoc docs/guide.txt misc/log.sql - use examples && dodoc -r examples - - # I don't like installing "Log.php" right at the top-level, but any - # packages depending on us will expect to find it there and not as - # e.g. Log/Log.php. - insinto "/usr/share/php/" - doins Log.php - doins -r Log -} - -src_test() { - # Requires the "pear" executable from dev-php/PEAR-PEAR. - pear run-tests tests || die - - # The command succeeds regardless of whether or not the test suite - # passed, but this file is only written when there was a failure. - [[ -f run-tests.log ]] && die "test suite failed" -} diff --git a/dev-php/PEAR-Log/PEAR-Log-1.13.3.ebuild b/dev-php/PEAR-Log/PEAR-Log-1.13.3.ebuild index 2c518ff5dabf..effb2c96bafe 100644 --- a/dev-php/PEAR-Log/PEAR-Log-1.13.3.ebuild +++ b/dev-php/PEAR-Log/PEAR-Log-1.13.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -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="amd64 arm ~hppa ppc ppc64 ~s390 sparc x86" IUSE="examples test" RESTRICT="!test? ( test )" diff --git a/dev-php/PEAR-Log/metadata.xml b/dev-php/PEAR-Log/metadata.xml index 0b9fa8b836f2..abe2aab8f350 100644 --- a/dev-php/PEAR-Log/metadata.xml +++ b/dev-php/PEAR-Log/metadata.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> <name>PHP</name> </maintainer> + <stabilize-allarches/> <upstream> <remote-id type="pear">Log</remote-id> </upstream> 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 cf8be255fb01..14558c99c55c 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 @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -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="amd64 ~hppa ppc ppc64 sparc x86" IUSE="" RDEPEND="dev-php/PEAR-XML_Parser" HTML_DOCS=( doc/xml_schema.xsl doc/skeleton.php doc/xml_schema_documentation.html doc/tutorial.html doc/datatypes.html doc/Modules_Manager_skeleton.php ) diff --git a/dev-php/PEAR-MDB/metadata.xml b/dev-php/PEAR-MDB/metadata.xml index aca42932b833..77793b997e9e 100644 --- a/dev-php/PEAR-MDB/metadata.xml +++ b/dev-php/PEAR-MDB/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> diff --git a/dev-php/PEAR-MDB2/PEAR-MDB2-2.5.0_beta5-r2.ebuild b/dev-php/PEAR-MDB2/PEAR-MDB2-2.5.0_beta5-r2.ebuild index 346a59419248..c823c66c430a 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 @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -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 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/PEAR-MDB2-2.5.0_beta5-r3.ebuild b/dev-php/PEAR-MDB2/PEAR-MDB2-2.5.0_beta5-r3.ebuild new file mode 100644 index 000000000000..43edc74a8488 --- /dev/null +++ b/dev-php/PEAR-MDB2/PEAR-MDB2-2.5.0_beta5-r3.ebuild @@ -0,0 +1,24 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PEAR_PV=${PV/_beta/b} + +inherit php-pear-r2 + +DESCRIPTION="Database Abstraction Layer" +LICENSE="BSD" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86" +IUSE="mssql mysql mysqli postgres sqlite" + +RDEPEND="dev-php/PEAR-PEAR" + +PDEPEND="mssql? ( dev-php/PEAR-MDB2_Driver_mssql ) + mysql? ( dev-php/PEAR-MDB2_Driver_mysqli ) + mysqli? ( dev-php/PEAR-MDB2_Driver_mysqli ) + postgres? ( dev-php/PEAR-MDB2_Driver_pgsql )" + +DOCS=( docs/{CONTRIBUTORS,MAINTAINERS,README,STATUS,TODO} ) +HTML_DOCS=( docs/datatypes.html ) diff --git a/dev-php/PEAR-MDB2/metadata.xml b/dev-php/PEAR-MDB2/metadata.xml index d6eee2d3d100..b62c78e02785 100644 --- a/dev-php/PEAR-MDB2/metadata.xml +++ b/dev-php/PEAR-MDB2/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> diff --git a/dev-php/PEAR-MDB2_Driver_mssql/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 b89e7f68cc99..54b615639fcf 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 @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -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 ppc ppc64 ~s390 sparc x86" IUSE="" RDEPEND=">=dev-php/PEAR-MDB2-2.5.0_beta3 diff --git a/dev-php/PEAR-MDB2_Driver_mssql/metadata.xml b/dev-php/PEAR-MDB2_Driver_mssql/metadata.xml index bfa764ce1662..57efc5c0cf1b 100644 --- a/dev-php/PEAR-MDB2_Driver_mssql/metadata.xml +++ b/dev-php/PEAR-MDB2_Driver_mssql/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> diff --git a/dev-php/PEAR-MDB2_Driver_mysqli/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 a1dc6b123e46..97cface34131 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 @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -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 ppc ppc64 ~s390 sparc x86" IUSE="" RDEPEND=">=dev-php/PEAR-MDB2-2.5.0_beta3 diff --git a/dev-php/PEAR-MDB2_Driver_mysqli/metadata.xml b/dev-php/PEAR-MDB2_Driver_mysqli/metadata.xml index 9fdf27a5ba30..e24d7383a76a 100644 --- a/dev-php/PEAR-MDB2_Driver_mysqli/metadata.xml +++ b/dev-php/PEAR-MDB2_Driver_mysqli/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> diff --git a/dev-php/PEAR-MDB2_Driver_oci8/metadata.xml b/dev-php/PEAR-MDB2_Driver_oci8/metadata.xml index 68a347a1a1c6..6788cd5c06cc 100644 --- a/dev-php/PEAR-MDB2_Driver_oci8/metadata.xml +++ b/dev-php/PEAR-MDB2_Driver_oci8/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> diff --git a/dev-php/PEAR-MDB2_Driver_pgsql/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 bc482ddfa28a..ef95981fbe60 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 @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -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 ppc ppc64 ~s390 sparc x86" IUSE="" RDEPEND=">=dev-php/PEAR-MDB2-2.5.0_beta3 diff --git a/dev-php/PEAR-MDB2_Driver_pgsql/metadata.xml b/dev-php/PEAR-MDB2_Driver_pgsql/metadata.xml index ad62d2e06153..6dad849108cc 100644 --- a/dev-php/PEAR-MDB2_Driver_pgsql/metadata.xml +++ b/dev-php/PEAR-MDB2_Driver_pgsql/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> diff --git a/dev-php/PEAR-MIME_Type/PEAR-MIME_Type-1.4.1.ebuild b/dev-php/PEAR-MIME_Type/PEAR-MIME_Type-1.4.1.ebuild index 98f24243bb9a..cb33552511ee 100644 --- a/dev-php/PEAR-MIME_Type/PEAR-MIME_Type-1.4.1.ebuild +++ b/dev-php/PEAR-MIME_Type/PEAR-MIME_Type-1.4.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -8,7 +8,7 @@ SRC_URI="https://pear.php.net/get/${P#PEAR-}.tgz" DESCRIPTION="Utility class for dealing with MIME types" LICENSE="LGPL-3" SLOT="0" -KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 ~sparc x86" +KEYWORDS="amd64 ~hppa ppc ppc64 ~sparc x86" IUSE="" RDEPEND=">=dev-lang/php-5.4:* >=dev-php/pear-1.9 diff --git a/dev-php/PEAR-MIME_Type/metadata.xml b/dev-php/PEAR-MIME_Type/metadata.xml index dbd2241364cd..6d6f8377940a 100644 --- a/dev-php/PEAR-MIME_Type/metadata.xml +++ b/dev-php/PEAR-MIME_Type/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> diff --git a/dev-php/PEAR-Mail/Manifest b/dev-php/PEAR-Mail/Manifest index 49efc8d48e61..796d8c6be6e3 100644 --- a/dev-php/PEAR-Mail/Manifest +++ b/dev-php/PEAR-Mail/Manifest @@ -1 +1 @@ -DIST Mail-1.4.1.tgz 21756 BLAKE2B 247df343a7b09760501918681cadc3a649ff9f2bd9974aa714a3661e64af6f1503edeb8ef0030f0ce113c43467cada3e7d62c6a60e751b5c8e6980c14f97fdbb SHA512 851fa64bcf042fba58a70833c12ec5d7af6382e14e6157eeeb5be51b22cdfa5677c5d1eeba8c1f9eef6d55c2d732a4d5d6ea28c726aef232b233c170f7b82307 +DIST Mail-1.5.0.tgz 23221 BLAKE2B fad07a2cbf2188f6f0dea3705ca5bd72d05505e2a9968f2b43c94045027e2506941e17854ef13cf65bc2ff99218e3663b0859e93563036bcbefa7911cc4f2b84 SHA512 07462b920a879182cb06576c6c91a52d1c0411afcefe9d701ae57633eb28cc0f08f163e9b808c00c38cfd7e886fc17ac4e7151dfda5905396b7819b365afa919 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 deleted file mode 100644 index e77d4fa1ba4f..000000000000 --- a/dev-php/PEAR-Mail/PEAR-Mail-1.4.1-r1.ebuild +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit php-pear-r2 - -DESCRIPTION="Class that provides multiple interfaces for sending emails" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND=">=dev-php/PEAR-Net_SMTP-1.4.1" -DEPEND="test? ( ${RDEPEND} dev-php/PEAR-PEAR )" - -src_test() { - peardev run-tests tests || die -} diff --git a/dev-php/PEAR-Mail/PEAR-Mail-1.5.0.ebuild b/dev-php/PEAR-Mail/PEAR-Mail-1.5.0.ebuild new file mode 100644 index 000000000000..7537e9aec3fc --- /dev/null +++ b/dev-php/PEAR-Mail/PEAR-Mail-1.5.0.ebuild @@ -0,0 +1,27 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit php-pear-r2 edos2unix + +DESCRIPTION="Class that provides multiple interfaces for sending emails" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 arm ~hppa ppc ppc64 ~s390 sparc x86" +IUSE="test" +RESTRICT="!test? ( test )" + +RDEPEND=">=dev-php/PEAR-Net_SMTP-1.4.1" +BDEPEND="test? ( ${RDEPEND} dev-php/PEAR-PEAR )" + +src_prepare() { + # test files are DOS line-endings and default patch strips without this line + patch -p1 --binary < "${FILESDIR}/PEAR-Mail-1.5.0-fix-tests.patch" + default +} + +src_test() { + peardev run-tests tests || die +} diff --git a/dev-php/PEAR-Mail/files/PEAR-Mail-1.5.0-fix-tests.patch b/dev-php/PEAR-Mail/files/PEAR-Mail-1.5.0-fix-tests.patch new file mode 100644 index 000000000000..121d2299206e --- /dev/null +++ b/dev-php/PEAR-Mail/files/PEAR-Mail-1.5.0-fix-tests.patch @@ -0,0 +1,74 @@ +diff --git a/tests/9137.phpt b/tests/9137.phpt
+index ba54c05..2e4c0a5 100644
+--- a/tests/9137.phpt
++++ b/tests/9137.phpt
+@@ -18,7 +18,8 @@ for ($i = 0; $i < count($addresses); $i++) {
+ $address = "\"" . addslashes($addresses[$i]['name']) . "\" ".
+ "<".$addresses[$i]['email'].">";
+
+- $parsedAddresses = Mail_RFC822::parseAddressList($address);
++ $parser = new Mail_RFC822();
++ $parsedAddresses = $parser->parseAddressList($address);
+ if (is_a($parsedAddresses, 'PEAR_Error')) {
+ echo $address." :: Failed to validate\n";
+ } else {
+diff --git a/tests/9137_2.phpt b/tests/9137_2.phpt
+index cc9dcbc..9c3c32d 100644
+--- a/tests/9137_2.phpt
++++ b/tests/9137_2.phpt
+@@ -18,7 +18,8 @@ $addresses = array(
+ for ($i = 0; $i < count($addresses); $i++) {
+ // construct the address
+ $address = $addresses[$i]['raw'];
+- $parsedAddresses = Mail_RFC822::parseAddressList($address);
++ $parser = new Mail_RFC822();
++ $parsedAddresses = $parser->parseAddressList($address);
+ if (PEAR::isError($parsedAddresses)) {
+ echo $address." :: Failed to validate\n";
+ } else {
+diff --git a/tests/bug17178.phpt b/tests/bug17178.phpt
+index 4572dda..425f329 100644
+--- a/tests/bug17178.phpt
++++ b/tests/bug17178.phpt
+@@ -4,7 +4,8 @@ Mail_RFC822::parseAddressList does not accept RFC-valid group syntax
+ <?php
+ require "Mail/RFC822.php";
+
+-var_dump(Mail_RFC822::parseAddressList("empty-group:;","invalid",false,false));
++$parser = new Mail_RFC822();
++var_dump($parser->parseAddressList("empty-group:;","invalid",false,false));
+
+ --EXPECT--
+ array(0) {
+diff --git a/tests/bug17317.phpt b/tests/bug17317.phpt
+index 331e803..045a939 100644
+--- a/tests/bug17317.phpt
++++ b/tests/bug17317.phpt
+@@ -4,9 +4,10 @@ Mail_RFC822::parseAddressList invalid periods in mail address
+ <?php
+ require "Mail/RFC822.php";
+
+-$result[] = Mail_RFC822::parseAddressList('.name@example.com');
+-$result[] = Mail_RFC822::parseAddressList('name.@example.com');
+-$result[] = Mail_RFC822::parseAddressList('name..name@example.com');
++$parser = new Mail_RFC822();
++$result[] = $parser->parseAddressList('.name@example.com');
++$result[] = $parser->parseAddressList('name.@example.com');
++$result[] = $parser->parseAddressList('name..name@example.com');
+
+ foreach ($result as $r) {
+ if (is_a($r, 'PEAR_Error')) {
+diff --git a/tests/validateQuotedString.phpt b/tests/validateQuotedString.phpt
+index 8b892bd..e0adb79 100644
+--- a/tests/validateQuotedString.phpt
++++ b/tests/validateQuotedString.phpt
+@@ -5,7 +5,8 @@ Mail_RFC822::parseAddressList simple tests
+ require_once 'Mail/RFC822.php';
+ $address_string = '"Joe Doe \(from Somewhere\)" <doe@example.com>, postmaster@example.com, root';
+
+-$address_array = Mail_RFC822::parseAddressList($address_string, "example.com");
++$parser = new Mail_RFC822();
++$address_array = $parser->parseAddressList($address_string, "example.com");
+
+ foreach ($address_array as $val) {
+ echo "mailbox : " . $val->mailbox . "\n";
diff --git a/dev-php/PEAR-Mail/metadata.xml b/dev-php/PEAR-Mail/metadata.xml index d44800881814..4e7922456651 100644 --- a/dev-php/PEAR-Mail/metadata.xml +++ b/dev-php/PEAR-Mail/metadata.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> <name>PHP</name> </maintainer> + <stabilize-allarches/> <upstream> <remote-id type="pear">Mail</remote-id> </upstream> diff --git a/dev-php/PEAR-Mail_Mime/Manifest b/dev-php/PEAR-Mail_Mime/Manifest index ab92da22637a..fab2f696e5db 100644 --- a/dev-php/PEAR-Mail_Mime/Manifest +++ b/dev-php/PEAR-Mail_Mime/Manifest @@ -1,7 +1 @@ -DIST Mail_Mime-1.10.10.tgz 40520 BLAKE2B a552ee3e374e7af078ea1a266793aa88b74cd98a630eeced9ef0525ada9dacd645b9182da91cf39b09e9824672478bc0bfc1d3370bf6d839cf11bd67a3e96cdc SHA512 0d1bd45424ee560961a827bdcc1c93516c6cd7987745a4571224aa42b7cc22c284931ff9c56c7df1371ae1d763449e04da5d4ccf0cc6ad00306c436fc81ae2e6 -DIST Mail_Mime-1.10.2.tgz 36501 BLAKE2B 59e900b99061e84d307eb46d295f843404ae06b01936cec4ed610c298b6f7e8fcee15098fa6d935696122311eae2dbf733611410b2249f2535673a3031011fa3 SHA512 4e3b2a2adc58d8b4f16f56509c9f22638dc37aedf1bec60871706390198198be6ed6dccae8c250eb33de3a441aeb122097ffaddbc49191745f0f09693ec6612b -DIST Mail_Mime-1.10.4.tgz 36909 BLAKE2B 101d050d96b717ad970a6f8c170ba8ea7d94252274f0b006a266a5ef4ac9d49fb350d3bf120ce645e5a54af1f0ad0ab664c828abfa8a4a96170e7204c73dfd82 SHA512 6e58e1078292cf43605313e2402b60deb97be0b56c8eb5dbbb501cf92ca836ca4bdbc9e1ab878c89f8e59941962a91b73dd917c8e678f0944f271e5537f065e5 -DIST Mail_Mime-1.10.6.tgz 38355 BLAKE2B d12b0496122c67236090db84710aa1fa660570d82952f037ddeb795ac3184a427965e12b21a6dcd6bfaea692299fb6e610822a364470c444455369f96dbbe972 SHA512 223e4a3a3ab52497d7cee551108642aa8c90328cd5d28ec0f215e16e0f2066fbaa3e4d51e62080d322846f8410c2e4641cd7c743e736062b6f8215e637877518 -DIST Mail_Mime-1.10.7.tgz 38445 BLAKE2B 4e990a9a704aa8fd918dcbcd271946cd5a76c55783cfa207a9a8d171c1e0d407e19e2a30ce46689c8afddeee0037082d77ecbc0e3fb0b4e94f82a2b242ef22c6 SHA512 b3ac0076d3519c14f0331b73940a4fa47cfeb1d2c31d5a5ffa820042fc9b56a8b4d479f349dbe213164c157d5c56caaf0b4f70ef422cc3eba40443433c813d60 -DIST Mail_Mime-1.10.8.tgz 38783 BLAKE2B 5a9410dd0778bbd765a6c6f2e7880d2e7951d131c3e2195a840e0b31579fc2c8b722db434d3d104fa3d178e7033cb08d9ac15a9ebfa38911566d5e52a2ddbae8 SHA512 3f32b894ded49fc848650d684d98c9db6394074491a0ef92ed97be01f35ad01aab96845d4bc590034767fcc92631fdf475db3d0c926a000ad7879d6a9ac824b5 -DIST Mail_Mime-1.10.9.tgz 38928 BLAKE2B aa55b61b6b683db8a8ec26c896f38b5c62376a39488dbfb5d56bca3b199086d3057533072fe2070859f12052207fde1f0bcad86b97830e66fef95f5b69381fb7 SHA512 aefaf0501c3876750b567a4d4c4edfb629b51f2a2bcf104705cf938611334bfb587a0cac270eed52c111819dd018199a3907916060b9b9fdbddf5ba143d71061 +DIST Mail_Mime-1.10.11.tgz 40930 BLAKE2B e02f5f8fc43949a32edf4a8fc835e4a6b4f44b509f3066b35ca0822a4cc723eb5fba860161a88d10d788811e5ef34d72e845fbf9b2768a83d87bc95445e8a967 SHA512 405873f92542f6f6d4433959ed3c741d64afe70852ddc9582d995485f327f662bccc82af0dfef3ccca61ec6497d67ea8f9d04d95f25443c57e3a319f96f7ac30 diff --git a/dev-php/PEAR-Mail_Mime/PEAR-Mail_Mime-1.10.10.ebuild b/dev-php/PEAR-Mail_Mime/PEAR-Mail_Mime-1.10.10.ebuild deleted file mode 100644 index eb4747a42cf2..000000000000 --- a/dev-php/PEAR-Mail_Mime/PEAR-Mail_Mime-1.10.10.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -inherit php-pear-r2 - -DESCRIPTION="Create and manipulate mime messages with PHP" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86" -IUSE="test" - -RESTRICT="!test? ( test )" - -DEPEND="test? ( dev-php/PEAR-PEAR )" - -src_test() { - # Requires the "pear" executable from dev-php/PEAR-PEAR. - pear run-tests tests || die - - # The command succeeds regardless of whether or not the test suite - # passed, but this file is only written when there was a failure. - [[ -f run-tests.log ]] && die "test suite failed" -} diff --git a/dev-php/PEAR-Mail_Mime/PEAR-Mail_Mime-1.10.6.ebuild b/dev-php/PEAR-Mail_Mime/PEAR-Mail_Mime-1.10.11.ebuild index a88d469a1fcd..c0cfd3db00a5 100644 --- a/dev-php/PEAR-Mail_Mime/PEAR-Mail_Mime-1.10.6.ebuild +++ b/dev-php/PEAR-Mail_Mime/PEAR-Mail_Mime-1.10.11.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -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="amd64 arm ~hppa 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 deleted file mode 100644 index e22fdede48c0..000000000000 --- a/dev-php/PEAR-Mail_Mime/PEAR-Mail_Mime-1.10.2-r1.ebuild +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit php-pear-r2 - -DESCRIPTION="Create and manipulate mime messages with PHP" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86" -IUSE="test" -RESTRICT="!test? ( test )" -DEPEND="test? ( dev-php/PEAR-PEAR )" - -src_test() { - # Requires the "pear" executable from dev-php/PEAR-PEAR. - pear run-tests tests || die - - # The command succeeds regardless of whether or not the test suite - # passed, but this file is only written when there was a failure. - [[ -f run-tests.log ]] && die "test suite failed" -} diff --git a/dev-php/PEAR-Mail_Mime/PEAR-Mail_Mime-1.10.4.ebuild b/dev-php/PEAR-Mail_Mime/PEAR-Mail_Mime-1.10.4.ebuild deleted file mode 100644 index a88d469a1fcd..000000000000 --- a/dev-php/PEAR-Mail_Mime/PEAR-Mail_Mime-1.10.4.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -inherit php-pear-r2 - -DESCRIPTION="Create and manipulate mime messages with PHP" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86" -IUSE="test" - -RESTRICT="!test? ( test )" - -DEPEND="test? ( dev-php/PEAR-PEAR )" - -src_test() { - # Requires the "pear" executable from dev-php/PEAR-PEAR. - pear run-tests tests || die - - # The command succeeds regardless of whether or not the test suite - # passed, but this file is only written when there was a failure. - [[ -f run-tests.log ]] && die "test suite failed" -} diff --git a/dev-php/PEAR-Mail_Mime/PEAR-Mail_Mime-1.10.7.ebuild b/dev-php/PEAR-Mail_Mime/PEAR-Mail_Mime-1.10.7.ebuild deleted file mode 100644 index a88d469a1fcd..000000000000 --- a/dev-php/PEAR-Mail_Mime/PEAR-Mail_Mime-1.10.7.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -inherit php-pear-r2 - -DESCRIPTION="Create and manipulate mime messages with PHP" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86" -IUSE="test" - -RESTRICT="!test? ( test )" - -DEPEND="test? ( dev-php/PEAR-PEAR )" - -src_test() { - # Requires the "pear" executable from dev-php/PEAR-PEAR. - pear run-tests tests || die - - # The command succeeds regardless of whether or not the test suite - # passed, but this file is only written when there was a failure. - [[ -f run-tests.log ]] && die "test suite failed" -} diff --git a/dev-php/PEAR-Mail_Mime/PEAR-Mail_Mime-1.10.8.ebuild b/dev-php/PEAR-Mail_Mime/PEAR-Mail_Mime-1.10.8.ebuild deleted file mode 100644 index a88d469a1fcd..000000000000 --- a/dev-php/PEAR-Mail_Mime/PEAR-Mail_Mime-1.10.8.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -inherit php-pear-r2 - -DESCRIPTION="Create and manipulate mime messages with PHP" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86" -IUSE="test" - -RESTRICT="!test? ( test )" - -DEPEND="test? ( dev-php/PEAR-PEAR )" - -src_test() { - # Requires the "pear" executable from dev-php/PEAR-PEAR. - pear run-tests tests || die - - # The command succeeds regardless of whether or not the test suite - # passed, but this file is only written when there was a failure. - [[ -f run-tests.log ]] && die "test suite failed" -} diff --git a/dev-php/PEAR-Mail_Mime/PEAR-Mail_Mime-1.10.9.ebuild b/dev-php/PEAR-Mail_Mime/PEAR-Mail_Mime-1.10.9.ebuild deleted file mode 100644 index a88d469a1fcd..000000000000 --- a/dev-php/PEAR-Mail_Mime/PEAR-Mail_Mime-1.10.9.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -inherit php-pear-r2 - -DESCRIPTION="Create and manipulate mime messages with PHP" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86" -IUSE="test" - -RESTRICT="!test? ( test )" - -DEPEND="test? ( dev-php/PEAR-PEAR )" - -src_test() { - # Requires the "pear" executable from dev-php/PEAR-PEAR. - pear run-tests tests || die - - # The command succeeds regardless of whether or not the test suite - # passed, but this file is only written when there was a failure. - [[ -f run-tests.log ]] && die "test suite failed" -} diff --git a/dev-php/PEAR-Mail_Mime/metadata.xml b/dev-php/PEAR-Mail_Mime/metadata.xml index 16ca6ff90970..5f468b1f635e 100644 --- a/dev-php/PEAR-Mail_Mime/metadata.xml +++ b/dev-php/PEAR-Mail_Mime/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> @@ -9,4 +9,5 @@ <email>mjo@gentoo.org</email> <name>Michael Orlitzky</name> </maintainer> + <stabilize-allarches/> </pkgmetadata> diff --git a/dev-php/PEAR-Mail_mimeDecode/PEAR-Mail_mimeDecode-1.5.6-r2.ebuild b/dev-php/PEAR-Mail_mimeDecode/PEAR-Mail_mimeDecode-1.5.6-r3.ebuild index 8b1020cd58be..14fa0772a681 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-r3.ebuild @@ -1,20 +1,24 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 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="amd64 arm ~hppa ppc ppc64 ~s390 sparc x86" IUSE="test" RESTRICT="!test? ( test )" RDEPEND=">=dev-php/PEAR-Mail_Mime-1.5.2" DEPEND="test? ( ${RDEPEND} dev-php/PEAR-PEAR )" +PATCHES=( + "${FILESDIR}/PEAR-Mail_mimeDecode-1.5.6-r3-php8_compat.patch" +) + src_test() { pear run-tests tests || die } diff --git a/dev-php/PEAR-Mail_mimeDecode/files/PEAR-Mail_mimeDecode-1.5.6-r3-php8_compat.patch b/dev-php/PEAR-Mail_mimeDecode/files/PEAR-Mail_mimeDecode-1.5.6-r3-php8_compat.patch new file mode 100644 index 000000000000..e167af7f6a33 --- /dev/null +++ b/dev-php/PEAR-Mail_mimeDecode/files/PEAR-Mail_mimeDecode-1.5.6-r3-php8_compat.patch @@ -0,0 +1,12 @@ +https://pear.php.net/bugs/bug.php?id=23775 +--- a/Mail/mimeDecode.php ++++ b/Mail/mimeDecode.php +@@ -834,7 +834,7 @@ + + // Replace encoded characters + +- $cb = create_function('$matches', ' return chr(hexdec($matches[0]));'); ++ $cb = function($matches) { return chr(hexdec($matches[0])); }; + + $input = preg_replace_callback( '/=([a-f0-9]{2})/i', $cb, $input); + diff --git a/dev-php/PEAR-Mail_mimeDecode/metadata.xml b/dev-php/PEAR-Mail_mimeDecode/metadata.xml index fc41100f6739..6f1279cd96c2 100644 --- a/dev-php/PEAR-Mail_mimeDecode/metadata.xml +++ b/dev-php/PEAR-Mail_mimeDecode/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> diff --git a/dev-php/PEAR-Math_BigInteger/PEAR-Math_BigInteger-1.0.3-r1.ebuild b/dev-php/PEAR-Math_BigInteger/PEAR-Math_BigInteger-1.0.3-r1.ebuild index 8a0462b278c6..02ab2682f829 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 @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -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="amd64 ~hppa ppc ppc64 sparc x86" IUSE="" DEPEND="" RDEPEND="dev-lang/php:*" diff --git a/dev-php/PEAR-Math_BigInteger/metadata.xml b/dev-php/PEAR-Math_BigInteger/metadata.xml index dc55a2b192a1..e19e626a5475 100644 --- a/dev-php/PEAR-Math_BigInteger/metadata.xml +++ b/dev-php/PEAR-Math_BigInteger/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> diff --git a/dev-php/PEAR-Net_DNS/PEAR-Net_DNS-1.0.7-r1.ebuild b/dev-php/PEAR-Net_DNS/PEAR-Net_DNS-1.0.7-r1.ebuild index b92cd6281b4f..054473672607 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 @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -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="amd64 ~hppa ppc ppc64 sparc x86" IUSE="" diff --git a/dev-php/PEAR-Net_DNS/metadata.xml b/dev-php/PEAR-Net_DNS/metadata.xml index aca42932b833..77793b997e9e 100644 --- a/dev-php/PEAR-Net_DNS/metadata.xml +++ b/dev-php/PEAR-Net_DNS/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> diff --git a/dev-php/PEAR-Net_DNS2/Manifest b/dev-php/PEAR-Net_DNS2/Manifest index 645cc43bf7c4..365a33eb38c5 100644 --- a/dev-php/PEAR-Net_DNS2/Manifest +++ b/dev-php/PEAR-Net_DNS2/Manifest @@ -1,2 +1 @@ -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.4.4.ebuild b/dev-php/PEAR-Net_DNS2/PEAR-Net_DNS2-1.4.4.ebuild deleted file mode 100644 index a4f4682ca495..000000000000 --- a/dev-php/PEAR-Net_DNS2/PEAR-Net_DNS2-1.4.4.ebuild +++ /dev/null @@ -1,16 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -inherit php-pear-r2 - -DESCRIPTION="Object-oriented PHP5 resolver library used to communicate with a DNS server" -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND="dev-php/PEAR-PEAR >=dev-lang/php-5.3:*[sockets]" - -DOCS=( README.md ) diff --git a/dev-php/PEAR-Net_DNS2/metadata.xml b/dev-php/PEAR-Net_DNS2/metadata.xml index 115a72bf6b04..86a5931329f6 100644 --- a/dev-php/PEAR-Net_DNS2/metadata.xml +++ b/dev-php/PEAR-Net_DNS2/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> diff --git a/dev-php/PEAR-Net_DNSBL/PEAR-Net_DNSBL-1.3.7-r1.ebuild b/dev-php/PEAR-Net_DNSBL/PEAR-Net_DNSBL-1.3.7-r1.ebuild index dee9753aac7f..a341327cf4d3 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 @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -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="amd64 ~hppa sparc x86" IUSE="examples" RDEPEND="dev-lang/php:* dev-php/PEAR-Cache_Lite diff --git a/dev-php/PEAR-Net_DNSBL/metadata.xml b/dev-php/PEAR-Net_DNSBL/metadata.xml index d1b90bd1a469..03c37ad58871 100644 --- a/dev-php/PEAR-Net_DNSBL/metadata.xml +++ b/dev-php/PEAR-Net_DNSBL/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> diff --git a/dev-php/PEAR-Net_IDNA2/metadata.xml b/dev-php/PEAR-Net_IDNA2/metadata.xml index f268bf668c36..d2379f4337a2 100644 --- a/dev-php/PEAR-Net_IDNA2/metadata.xml +++ b/dev-php/PEAR-Net_IDNA2/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> diff --git a/dev-php/PEAR-Net_IPv4/Manifest b/dev-php/PEAR-Net_IPv4/Manifest index d81abbd04a36..11c3b81b22f5 100644 --- a/dev-php/PEAR-Net_IPv4/Manifest +++ b/dev-php/PEAR-Net_IPv4/Manifest @@ -1,2 +1 @@ -DIST Net_IPv4-1.3.4.tgz 5981 BLAKE2B 5002a06d30443cf809346351a6c57c1faf1be0e6531fc0c7609ad6a9575122c53fa1c3f2e6614b77401adcfcdc604ee6b8ce5538d92aa8f42e8bf709899a0cba SHA512 6b172e3d998232d53e56c2760282346e98307aefd47d5801a3803c3f55d5df3de26fe466d2594081a46f55bc59e1d040d8727b47cd9bcab1b132a31b4982bba1 DIST Net_IPv4-1.3.5.tgz 6346 BLAKE2B a12592f262b2784dc5ffb04ab693f44d514a45a16b98bc2f9f7258669684f565f60127a156e5a319e76a2e426523f2a969335cb06dfd0de534584c03d45c262f SHA512 6ed6c550217b70091c9d006519dd5731be46b02540867c1733d0c142f6e56712eb545bf5b1713e49fea3c5af8a81db86b9c9669ac2ca6eff0b95e52e29a853ed diff --git a/dev-php/PEAR-Net_IPv4/PEAR-Net_IPv4-1.3.4-r1.ebuild b/dev-php/PEAR-Net_IPv4/PEAR-Net_IPv4-1.3.4-r1.ebuild deleted file mode 100644 index 1552ee3c9303..000000000000 --- a/dev-php/PEAR-Net_IPv4/PEAR-Net_IPv4-1.3.4-r1.ebuild +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit php-pear-r2 - -DESCRIPTION="PEAR class for IP v4 calculations" - -LICENSE="PHP-3.01" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" - -PATCHES=( "${FILESDIR}/remove_globals.patch" ) diff --git a/dev-php/PEAR-Net_IPv4/PEAR-Net_IPv4-1.3.5.ebuild b/dev-php/PEAR-Net_IPv4/PEAR-Net_IPv4-1.3.5.ebuild index e7dcbc24d680..415d5812a17f 100644 --- a/dev-php/PEAR-Net_IPv4/PEAR-Net_IPv4-1.3.5.ebuild +++ b/dev-php/PEAR-Net_IPv4/PEAR-Net_IPv4-1.3.5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -9,5 +9,5 @@ DESCRIPTION="PEAR class for IP v4 calculations" LICENSE="PHP-3.01" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="" diff --git a/dev-php/PEAR-Net_IPv4/files/remove_globals.patch b/dev-php/PEAR-Net_IPv4/files/remove_globals.patch deleted file mode 100644 index 2403deb0b4af..000000000000 --- a/dev-php/PEAR-Net_IPv4/files/remove_globals.patch +++ /dev/null @@ -1,96 +0,0 @@ -diff -aurN a/Net/IPv4.php b/Net/IPv4.php ---- a/Net/IPv4.php 2010-09-08 06:31:50.000000000 -0400 -+++ b/Net/IPv4.php 2017-08-04 14:57:52.872878217 -0400 -@@ -32,7 +32,37 @@ - *
- * @global array $GLOBALS['Net_IPv4_Netmask_Map']
- */
--$GLOBALS['Net_IPv4_Netmask_Map'] = array(
-+$GLOBALS['Net_IPv4_Netmask_Map'] = Net_IPv4::$Net_IPv4_Netmask_Map;
-+// }}}
-+// {{{ Net_IPv4
-+
-+/**
-+* Class to provide IPv4 calculations
-+*
-+* Provides methods for validating IP addresses, calculating netmasks,
-+* broadcast addresses, network addresses, conversion routines, etc.
-+*
-+* @category Net
-+* @package Net_IPv4
-+* @author Eric Kilfoil <edk@ypass.net>
-+* @author Marco Kaiser <bate@php.net>
-+* @author Florian Anderiasch <fa@php.net>
-+* @copyright 1997-2005 The PHP Group
-+* @license http://www.php.net/license/3_01.txt PHP License 3.01
-+* @version CVS: @package_version@
-+* @link http://pear.php.net/package/Net_IPv4
-+* @access public
-+*/
-+class Net_IPv4
-+{
-+ // {{{ properties
-+ var $ip = "";
-+ var $bitmask = false;
-+ var $netmask = "";
-+ var $network = "";
-+ var $broadcast = "";
-+ var $long = 0;
-+public static $Net_IPv4_Netmask_Map = array(
- 0 => "0.0.0.0",
- 1 => "128.0.0.0",
- 2 => "192.0.0.0",
-@@ -67,35 +97,6 @@ - 31 => "255.255.255.254",
- 32 => "255.255.255.255"
- );
--// }}}
--// {{{ Net_IPv4
--
--/**
--* Class to provide IPv4 calculations
--*
--* Provides methods for validating IP addresses, calculating netmasks,
--* broadcast addresses, network addresses, conversion routines, etc.
--*
--* @category Net
--* @package Net_IPv4
--* @author Eric Kilfoil <edk@ypass.net>
--* @author Marco Kaiser <bate@php.net>
--* @author Florian Anderiasch <fa@php.net>
--* @copyright 1997-2005 The PHP Group
--* @license http://www.php.net/license/3_01.txt PHP License 3.01
--* @version CVS: @package_version@
--* @link http://pear.php.net/package/Net_IPv4
--* @access public
--*/
--class Net_IPv4
--{
-- // {{{ properties
-- var $ip = "";
-- var $bitmask = false;
-- var $netmask = "";
-- var $network = "";
-- var $broadcast = "";
-- var $long = 0;
-
- // }}}
- // {{{ validateIP()
-@@ -154,7 +155,7 @@ - */
- function validateNetmask($netmask)
- {
-- if (! in_array($netmask, $GLOBALS['Net_IPv4_Netmask_Map'])) {
-+ if (! in_array($netmask, self::$Net_IPv4_Netmask_Map)) {
- return false;
- }
- return true;
-@@ -264,7 +265,7 @@ - */
- function calculate()
- {
-- $validNM = $GLOBALS['Net_IPv4_Netmask_Map'];
-+ $validNM = self::$Net_IPv4_Netmask_Map;
-
- if (! is_a($this, "net_ipv4")) {
- $myself = new Net_IPv4;
diff --git a/dev-php/PEAR-Net_IPv4/metadata.xml b/dev-php/PEAR-Net_IPv4/metadata.xml index aca42932b833..6841fa89bee8 100644 --- a/dev-php/PEAR-Net_IPv4/metadata.xml +++ b/dev-php/PEAR-Net_IPv4/metadata.xml @@ -1,8 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> <name>PHP</name> </maintainer> +<stabilize-allarches/> </pkgmetadata> diff --git a/dev-php/PEAR-Net_IPv6/metadata.xml b/dev-php/PEAR-Net_IPv6/metadata.xml index 40bf307f7a83..04d86b41f0c4 100644 --- a/dev-php/PEAR-Net_IPv6/metadata.xml +++ b/dev-php/PEAR-Net_IPv6/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> diff --git a/dev-php/PEAR-Net_LDAP2/PEAR-Net_LDAP2-2.2.0-r1.ebuild b/dev-php/PEAR-Net_LDAP2/PEAR-Net_LDAP2-2.2.0-r1.ebuild index 60b4d96cea54..0068263764b2 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 @@ -1,10 +1,10 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 MY_PN="${PN/PEAR-/}" -KEYWORDS="~alpha amd64 arm ~hppa ppc ppc64 sparc x86" +KEYWORDS="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_LDAP2/metadata.xml b/dev-php/PEAR-Net_LDAP2/metadata.xml index 63daabb13569..7ae408574ad3 100644 --- a/dev-php/PEAR-Net_LDAP2/metadata.xml +++ b/dev-php/PEAR-Net_LDAP2/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> diff --git a/dev-php/PEAR-Net_POP3/PEAR-Net_POP3-1.3.8-r1.ebuild b/dev-php/PEAR-Net_POP3/PEAR-Net_POP3-1.3.8-r1.ebuild index 898fd95bb079..7517c016e50c 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 @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -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="amd64 ~hppa 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_POP3/metadata.xml b/dev-php/PEAR-Net_POP3/metadata.xml index aca42932b833..77793b997e9e 100644 --- a/dev-php/PEAR-Net_POP3/metadata.xml +++ b/dev-php/PEAR-Net_POP3/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> diff --git a/dev-php/PEAR-Net_Ping/PEAR-Net_Ping-2.4.5-r2.ebuild b/dev-php/PEAR-Net_Ping/PEAR-Net_Ping-2.4.5-r2.ebuild index d86b0d0c8a0e..5cabcc5cda8c 100644 --- a/dev-php/PEAR-Net_Ping/PEAR-Net_Ping-2.4.5-r2.ebuild +++ b/dev-php/PEAR-Net_Ping/PEAR-Net_Ping-2.4.5-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -11,7 +11,7 @@ HOMEPAGE="https://pear.php.net/package/Net_Ping" 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="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86" IUSE="examples" RDEPEND="dev-lang/php:* diff --git a/dev-php/PEAR-Net_Ping/metadata.xml b/dev-php/PEAR-Net_Ping/metadata.xml index 89cc6c090db5..fc8c03c9aa10 100644 --- a/dev-php/PEAR-Net_Ping/metadata.xml +++ b/dev-php/PEAR-Net_Ping/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> diff --git a/dev-php/PEAR-Net_SMTP/Manifest b/dev-php/PEAR-Net_SMTP/Manifest index 27fdaf641c7e..addb182d3212 100644 --- a/dev-php/PEAR-Net_SMTP/Manifest +++ b/dev-php/PEAR-Net_SMTP/Manifest @@ -1,7 +1 @@ DIST Net_SMTP-1.10.0.tgz 15350 BLAKE2B 9603188e5e70aac98135a7ab0248ccff2ebc1cbc2757ce65870228217936acd34249385bea352a3c5f64637ed82621fa17ee717f76d23c586140884d670dcff7 SHA512 4a742ea4521d6ee4889db365691cb3cd8299b9946618e7a80a10d025c4c3f68a91274829fc48ed9d095632e282b32b6e5fede633a5d48e2d995ce48b3893b218 -DIST Net_SMTP-1.7.2.tgz 14795 BLAKE2B e7be5c595e5eb9cd98c0cb82899545b02399ce3aedd35e419a451ad1aa3f4c3c36a10c212508795bc39a044c99206db5ad700f6e7c110eec3b68cb623af4e457 SHA512 06ab00a033709c5f4adc01fabe100ee0033b07e1c5633f995a672bf463484622a5bd976ada9932ee741ff593d739bd1172566f0a8446060bbccde71ea5b0160d -DIST Net_SMTP-1.7.3.tgz 14855 BLAKE2B b6891196a6871adc3936c89507e3aef1f7d9af045acab09aba5f145a9d1e1da5cee2608873f7a42ebc1d00f99ec733823afe94e15c283245ed1bc035858d94a7 SHA512 b1c2be95c50151e91c2dcc7b9d98233504cc2389c01e4e42e752cba606355da616e570ca86042b68498aad63aaad14ea048b0a0e4e2baa802dc58c440eb60f15 -DIST Net_SMTP-1.8.1.tgz 14931 BLAKE2B 9194e46d1987e48f58c3b851bf6921b4308d39d17b7ca028a4a58a6583171dbe31020477cd7f808ac72ffae81f315e3b416cd5f52e898e0d12cc802af5dbcaa7 SHA512 ba3b68e35d95cc41ef33105402348a322e54c6335d819d1a6e1264f25bc30def4485d0da34901ca203ccd591aeddffbe75b5acb11fb7415a1a13668198aa9942 -DIST Net_SMTP-1.9.0.tgz 15135 BLAKE2B 9413daf3741a0dd50e19cff89f501c57f442fda38b69c8dad860ba257ff7333fa4f50e2530d86599d4f38c6e3dbc67d7a401fe8be3bf85266c76701038f63247 SHA512 fb28bbf07e54d71d1a82d59b137e4905c77b5600c10cf7760890ec708fc9e6df9d47715cf6808569f88603fac80c1cfdd7c4f3893efe7ac7aecaac47ba849ec2 -DIST Net_SMTP-1.9.1.tgz 15146 BLAKE2B 1bc1a837cc658f68b5ff866758d624f4d916e1b97166b0fe1b3257200ab3fbc76c52fa567eb064f82e4dbed38ec1e2364962bf2c4cf7d60c3c6f2a0a45a0ecc6 SHA512 6426ef18203b93960bd85d346622fdb6a76cb3f2182ae6c7ab21c9cfddaf779a7fdd02b0ac5425443265b522147f54ca9ef8ff7eef4a17428c7c664d8dab5993 -DIST Net_SMTP-1.9.2.tgz 15132 BLAKE2B e7d3d23431303a016d802340857ca13beb8863e9ba7612070487eeb3fa458a283bfa66155cc445e9aa3ae53b285eeb8fe8f203db0f98a4b8963b1cf3e266712b SHA512 9477926946591443d2120d1289fe01706d2fcdbfb84f46fab68d8b6313d1bda3f8d272580c3aa51cbd2a98728e7eeba93299c2069df6c130c70dafc280226556 diff --git a/dev-php/PEAR-Net_SMTP/PEAR-Net_SMTP-1.10.0.ebuild b/dev-php/PEAR-Net_SMTP/PEAR-Net_SMTP-1.10.0.ebuild index dc271c8d2314..5667753d0d7d 100644 --- a/dev-php/PEAR-Net_SMTP/PEAR-Net_SMTP-1.10.0.ebuild +++ b/dev-php/PEAR-Net_SMTP/PEAR-Net_SMTP-1.10.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -12,7 +12,7 @@ DESCRIPTION="A PHP implementation of the SMTP protocol" HOMEPAGE="https://pear.php.net/package/Net_SMTP" LICENSE="BSD-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86" +KEYWORDS="amd64 arm ~hppa ppc ppc64 ~s390 sparc x86" IUSE="examples sasl test" DEPEND="" RDEPEND="dev-lang/php:* 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 deleted file mode 100644 index 14096f2f0e34..000000000000 --- a/dev-php/PEAR-Net_SMTP/PEAR-Net_SMTP-1.7.2-r3.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -MY_PN="${PN/PEAR-/}" -MY_P="${MY_PN}-${PV}" - -DESCRIPTION="A PHP implementation of the SMTP protocol" -HOMEPAGE="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" -IUSE="examples sasl" -DEPEND="" -RDEPEND="dev-lang/php:* - dev-php/PEAR-Net_Socket - dev-php/PEAR-PEAR - sasl? ( dev-php/PEAR-Auth_SASL )" - -S="${WORKDIR}/${MY_P}" - -src_install() { - dodoc docs/guide.txt - use examples && dodoc -r examples - - insinto /usr/share/php - doins -r Net -} diff --git a/dev-php/PEAR-Net_SMTP/PEAR-Net_SMTP-1.7.3.ebuild b/dev-php/PEAR-Net_SMTP/PEAR-Net_SMTP-1.7.3.ebuild deleted file mode 100644 index ba2d4e8a2dea..000000000000 --- a/dev-php/PEAR-Net_SMTP/PEAR-Net_SMTP-1.7.3.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -MY_PN="${PN/PEAR-/}" -MY_P="${MY_PN}-${PV}" - -DESCRIPTION="A PHP implementation of the SMTP protocol" -HOMEPAGE="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" -IUSE="examples sasl" -DEPEND="" -RDEPEND="dev-lang/php:* - dev-php/PEAR-Net_Socket - dev-php/PEAR-PEAR - sasl? ( dev-php/PEAR-Auth_SASL )" - -S="${WORKDIR}/${MY_P}" - -src_install() { - dodoc docs/guide.txt - use examples && dodoc -r examples - - insinto /usr/share/php - doins -r Net -} diff --git a/dev-php/PEAR-Net_SMTP/PEAR-Net_SMTP-1.8.1.ebuild b/dev-php/PEAR-Net_SMTP/PEAR-Net_SMTP-1.8.1.ebuild deleted file mode 100644 index 56fe101e706d..000000000000 --- a/dev-php/PEAR-Net_SMTP/PEAR-Net_SMTP-1.8.1.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit php-pear-r2 - -MY_PN="${PN/PEAR-/}" -MY_P="${MY_PN}-${PV}" - -DESCRIPTION="A PHP implementation of the SMTP protocol" -HOMEPAGE="https://pear.php.net/package/Net_SMTP" -LICENSE="BSD-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86" -IUSE="examples sasl" -DEPEND="" -RDEPEND="dev-lang/php:* - dev-php/PEAR-Net_Socket - dev-php/PEAR-PEAR - sasl? ( dev-php/PEAR-Auth_SASL )" - -S="${WORKDIR}/${MY_P}" - -src_install() { - DOCS=( docs/guide.txt ) - use examples && HTML_DOCS=( examples ) - php-pear-r2_src_install -} diff --git a/dev-php/PEAR-Net_SMTP/PEAR-Net_SMTP-1.9.0.ebuild b/dev-php/PEAR-Net_SMTP/PEAR-Net_SMTP-1.9.0.ebuild deleted file mode 100644 index 56fe101e706d..000000000000 --- a/dev-php/PEAR-Net_SMTP/PEAR-Net_SMTP-1.9.0.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit php-pear-r2 - -MY_PN="${PN/PEAR-/}" -MY_P="${MY_PN}-${PV}" - -DESCRIPTION="A PHP implementation of the SMTP protocol" -HOMEPAGE="https://pear.php.net/package/Net_SMTP" -LICENSE="BSD-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86" -IUSE="examples sasl" -DEPEND="" -RDEPEND="dev-lang/php:* - dev-php/PEAR-Net_Socket - dev-php/PEAR-PEAR - sasl? ( dev-php/PEAR-Auth_SASL )" - -S="${WORKDIR}/${MY_P}" - -src_install() { - DOCS=( docs/guide.txt ) - use examples && HTML_DOCS=( examples ) - php-pear-r2_src_install -} diff --git a/dev-php/PEAR-Net_SMTP/PEAR-Net_SMTP-1.9.1.ebuild b/dev-php/PEAR-Net_SMTP/PEAR-Net_SMTP-1.9.1.ebuild deleted file mode 100644 index 56fe101e706d..000000000000 --- a/dev-php/PEAR-Net_SMTP/PEAR-Net_SMTP-1.9.1.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit php-pear-r2 - -MY_PN="${PN/PEAR-/}" -MY_P="${MY_PN}-${PV}" - -DESCRIPTION="A PHP implementation of the SMTP protocol" -HOMEPAGE="https://pear.php.net/package/Net_SMTP" -LICENSE="BSD-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86" -IUSE="examples sasl" -DEPEND="" -RDEPEND="dev-lang/php:* - dev-php/PEAR-Net_Socket - dev-php/PEAR-PEAR - sasl? ( dev-php/PEAR-Auth_SASL )" - -S="${WORKDIR}/${MY_P}" - -src_install() { - DOCS=( docs/guide.txt ) - use examples && HTML_DOCS=( examples ) - php-pear-r2_src_install -} diff --git a/dev-php/PEAR-Net_SMTP/PEAR-Net_SMTP-1.9.2.ebuild b/dev-php/PEAR-Net_SMTP/PEAR-Net_SMTP-1.9.2.ebuild deleted file mode 100644 index 979882cf6f57..000000000000 --- a/dev-php/PEAR-Net_SMTP/PEAR-Net_SMTP-1.9.2.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit php-pear-r2 - -MY_PN="${PN/PEAR-/}" -MY_P="${MY_PN}-${PV}" - -DESCRIPTION="A PHP implementation of the SMTP protocol" -HOMEPAGE="https://pear.php.net/package/Net_SMTP" -LICENSE="BSD-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86" -IUSE="examples sasl test" -DEPEND="" -RDEPEND="dev-lang/php:* - dev-php/PEAR-Net_Socket - dev-php/PEAR-PEAR - sasl? ( dev-php/PEAR-Auth_SASL )" -BDEPEND="test? ( ${RDEPEND} )" -RESTRICT="!test? ( test )" - -S="${WORKDIR}/${MY_P}" - -src_install() { - use examples && HTML_DOCS=( examples ) - php-pear-r2_src_install -} - -src_test() { - pear run-tests tests || die -} diff --git a/dev-php/PEAR-Net_SMTP/metadata.xml b/dev-php/PEAR-Net_SMTP/metadata.xml index dfe1c134cec2..8c8d10200a65 100644 --- a/dev-php/PEAR-Net_SMTP/metadata.xml +++ b/dev-php/PEAR-Net_SMTP/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> diff --git a/dev-php/PEAR-Net_Sieve/Manifest b/dev-php/PEAR-Net_Sieve/Manifest index 0e5ca8850625..1758b629f479 100644 --- a/dev-php/PEAR-Net_Sieve/Manifest +++ b/dev-php/PEAR-Net_Sieve/Manifest @@ -1,2 +1 @@ -DIST PEAR-Net_Sieve-1.5.2.tar.gz 16332 BLAKE2B 24d385225fbf3c4bf5612927826ced468ccb5addeac9cd49c6fb617304fa77f4a44a11e3adf09173f65315d8a0755e44e93d0a7ae1c60f1a954849bee2380053 SHA512 672d2f6f4c3241f748fbdebd804f2186dd2a5f8b7be6a75cb9187ed16e61502e4a338bfaa1815190b74ab534cb7277b534b0542309098797fcb63582dc81bdbe -DIST PEAR-Net_Sieve-1.5.4.tar.gz 16306 BLAKE2B 6ecd4ef669211b01089f29c48735b7259c392510f09df9aa0f1126fef8e3ebbf83803ab47bdd37c9b798a2add4c3d19e1a04960290a202070e17ee1f8041d02d SHA512 c981ba421946cc1eb1f2101cf25cbfbbcf56b74f92a8a257b19a8b43fb04ad2d8c9d93a2f44903589bb6014c53cc6ae96c44b1c31c389510439f1f2da57b3353 +DIST Net_Sieve-1.4.6.tgz 16556 BLAKE2B fd83f934f1b6bce9459113036a04bf9a59695789f5e3f2308ecd382af8d129ae95a1da73c49b41de83c078551f143c7546f531bb3ba975bfe73eae8b5572de1c SHA512 8d10c00336fd9a8f3a6e4da2e549112bb8d16f96f4bba7854cb9a95d2385b50f88e2c10b2d75e90913dbe927925ac40e0b2e4536fe1b8aa44bc5e31db0f28851 diff --git a/dev-php/PEAR-Net_Sieve/PEAR-Net_Sieve-1.4.6.ebuild b/dev-php/PEAR-Net_Sieve/PEAR-Net_Sieve-1.4.6.ebuild new file mode 100644 index 000000000000..4c20b8271af7 --- /dev/null +++ b/dev-php/PEAR-Net_Sieve/PEAR-Net_Sieve-1.4.6.ebuild @@ -0,0 +1,21 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit php-pear-r2 + +DESCRIPTION="An API for talking to sieve (RFC 3028) servers" +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 arm ~hppa ppc ppc64 ~s390 sparc x86" +IUSE="sasl" + +RDEPEND="dev-php/PEAR-Net_Socket + sasl? ( dev-php/PEAR-Auth_SASL )" + +src_install() { + insinto /usr/share/php/Net + doins Sieve.php + php-pear-r2_install_packagexml +} 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 deleted file mode 100644 index cbabb2dfdd7c..000000000000 --- a/dev-php/PEAR-Net_Sieve/PEAR-Net_Sieve-1.5.2-r1.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -MY_PN="${PN/PEAR-/}" - -DESCRIPTION="An API for talking to sieve (RFC 3028) servers" -HOMEPAGE="https://github.com/roundcube/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" -IUSE="sasl" - -RDEPEND="dev-lang/php:* - dev-php/PEAR-PEAR - dev-php/PEAR-Net_Socket - sasl? ( dev-php/PEAR-Auth_SASL )" - -S="${WORKDIR}/${MY_PN}-${PV}" - -src_install() { - # Install into "Net" for backwards compatibility (that's where PEAR - # used to put things). - insinto /usr/share/php/Net - doins Sieve.php -} diff --git a/dev-php/PEAR-Net_Sieve/PEAR-Net_Sieve-1.5.4.ebuild b/dev-php/PEAR-Net_Sieve/PEAR-Net_Sieve-1.5.4.ebuild deleted file mode 100644 index 42e647387538..000000000000 --- a/dev-php/PEAR-Net_Sieve/PEAR-Net_Sieve-1.5.4.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -MY_PN="${PN/PEAR-/}" - -DESCRIPTION="An API for talking to sieve (RFC 3028) servers" -HOMEPAGE="https://github.com/roundcube/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" -IUSE="sasl" - -RDEPEND="dev-lang/php:* - dev-php/PEAR-PEAR - dev-php/PEAR-Net_Socket - sasl? ( dev-php/PEAR-Auth_SASL )" - -S="${WORKDIR}/${MY_PN}-${PV}" - -src_install() { - # Install into "Net" for backwards compatibility (that's where PEAR - # used to put things). - insinto /usr/share/php/Net - doins Sieve.php -} diff --git a/dev-php/PEAR-Net_Sieve/metadata.xml b/dev-php/PEAR-Net_Sieve/metadata.xml index 75b702d088df..c78a0694b683 100644 --- a/dev-php/PEAR-Net_Sieve/metadata.xml +++ b/dev-php/PEAR-Net_Sieve/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> diff --git a/dev-php/PEAR-Net_SmartIRC/Manifest b/dev-php/PEAR-Net_SmartIRC/Manifest index 430c52434bc0..a17c3b298a05 100644 --- a/dev-php/PEAR-Net_SmartIRC/Manifest +++ b/dev-php/PEAR-Net_SmartIRC/Manifest @@ -1,4 +1 @@ -DIST Net_SmartIRC-1.1.10.tar.gz 927009 BLAKE2B b410a0b4a02e60e27860f9c6b0ab8fecf4874273601694ad61dcf88a2e916aee20d1858cf951fffb229f4eac0c0ddda55530bb6840da3c7b741cf9ee3971f7b2 SHA512 16ad30d358af99f40c53a75cf5f1c944a3e68f4c1cffd586acd61ceed280d5d1fcd4f4d5e88db55f1f66c37c5b7f37aec2f45a26dc6b98860eacb42c9f3fbea5 -DIST Net_SmartIRC-1.1.12.tgz 166039 BLAKE2B 43aec437de08d6e0dd651b810b21b5fed5587e2e7e154fe4f078cc618ee501c3d962b824931558458895541ddc9dc46ec3b1f0356aac5b052dd63b498018bb47 SHA512 2da5f0f9ea9167dfd1490fb6ba1e97416c78389924f390030ba71ea28dc5b667451223daa7e3878cbae607159054d656534ff646636f8f5294eb0bda1b17074c -DIST Net_SmartIRC-1.1.13.tgz 166028 BLAKE2B 7e2b91dc01febe561c3ce55901f999f84f87fdbe20b5a1560a060125de4ae7d9869141cc0b2bcd9dfd0479a3a0a2d3c9d0f2719f70edc122df70f181d788f73b SHA512 d8f5a4f38b0aa830a84c9433deaf16b936f79e30bd9588cb0225ec20698af3d334fd1fdb320c64d1a72b0d206ae794b9e4135f1053855f586155694f6342cb0b DIST Net_SmartIRC-1.1.14.tgz 166115 BLAKE2B bacd23296dea25bc898ce3ba67d89949a3ad34675000bde9fe78371a7d97596272708f114b7980c3754cb862be68b84dcb0e8df10374cb560180d50c3bf61f49 SHA512 35cf0714a695e1b40e0db1f4d20c0ea4d431940e1e5894899db0bd13137e90c790067d266dc43f1ccc2921ad1f48cc70aa448225acac4358c8eb839f755717a0 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 deleted file mode 100644 index ba5b36ad870c..000000000000 --- a/dev-php/PEAR-Net_SmartIRC/PEAR-Net_SmartIRC-1.1.10-r1.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -MY_PN="${PN/PEAR-/}" -MY_P="${MY_PN}-${PV}" - -HOMEPAGE="https://pear.php.net/package/Net_SmartIRC" -# The PEAR tarball is missing some docs as of v1.10.0. -SRC_URI="https://github.com/pear/${MY_PN}/archive/v${PV}.tar.gz - -> ${MY_P}.tar.gz" -DESCRIPTION="PHP class to communicate with IRC networks" -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86" -IUSE="doc examples" - -RDEPEND="dev-lang/php:*" - -S="${WORKDIR}/${MY_P}" - -src_install() { - dodoc CREDITS FEATURES docs/HOWTO README.md TODO - use examples && dodoc -r docs/examples - - if use doc; then - dodoc docs/DOCUMENTATION - dodoc -r docs/HTML - fi - - insinto /usr/share/php - doins -r Net -} diff --git a/dev-php/PEAR-Net_SmartIRC/PEAR-Net_SmartIRC-1.1.12.ebuild b/dev-php/PEAR-Net_SmartIRC/PEAR-Net_SmartIRC-1.1.12.ebuild deleted file mode 100644 index 41aa7dab2408..000000000000 --- a/dev-php/PEAR-Net_SmartIRC/PEAR-Net_SmartIRC-1.1.12.ebuild +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit php-pear-r2 - -DESCRIPTION="PHP class to communicate with IRC networks" -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" -IUSE="doc examples" -DOCS=( CREDITS FEATURES docs/HOWTO README.md ) - -src_install() { - local HTML_DOCS=( ) - use examples && HTML_DOCS+=( docs/examples/ ) - - if use doc; then - DOCS+=( docs/DOCUMENTATION ) - HTML_DOCS+=( docs/HTML/* ) - fi - php-pear-r2_src_install -} diff --git a/dev-php/PEAR-Net_SmartIRC/PEAR-Net_SmartIRC-1.1.13.ebuild b/dev-php/PEAR-Net_SmartIRC/PEAR-Net_SmartIRC-1.1.13.ebuild deleted file mode 100644 index 59e964213993..000000000000 --- a/dev-php/PEAR-Net_SmartIRC/PEAR-Net_SmartIRC-1.1.13.ebuild +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit php-pear-r2 - -DESCRIPTION="PHP class to communicate with IRC networks" -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" -IUSE="doc examples" -DOCS=( CREDITS FEATURES docs/HOWTO README.md ) - -src_install() { - local HTML_DOCS=( ) - use examples && HTML_DOCS+=( docs/examples/ ) - - if use doc; then - DOCS+=( docs/DOCUMENTATION ) - HTML_DOCS+=( docs/HTML/* ) - fi - php-pear-r2_src_install -} diff --git a/dev-php/PEAR-Net_SmartIRC/PEAR-Net_SmartIRC-1.1.14.ebuild b/dev-php/PEAR-Net_SmartIRC/PEAR-Net_SmartIRC-1.1.14.ebuild index c6e49dbd4c32..ded5a5643b6d 100644 --- a/dev-php/PEAR-Net_SmartIRC/PEAR-Net_SmartIRC-1.1.14.ebuild +++ b/dev-php/PEAR-Net_SmartIRC/PEAR-Net_SmartIRC-1.1.14.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -8,7 +8,7 @@ inherit php-pear-r2 DESCRIPTION="PHP class to communicate with IRC networks" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="amd64 ~hppa ppc ppc64 sparc x86" IUSE="doc examples" DOCS=( CREDITS FEATURES docs/HOWTO README.md ) diff --git a/dev-php/PEAR-Net_SmartIRC/metadata.xml b/dev-php/PEAR-Net_SmartIRC/metadata.xml index 341edc04699b..350320c75780 100644 --- a/dev-php/PEAR-Net_SmartIRC/metadata.xml +++ b/dev-php/PEAR-Net_SmartIRC/metadata.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> <name>PHP</name> </maintainer> + <stabilize-allarches/> <upstream> <remote-id type="github">pear/Net_SmartIRC</remote-id> <remote-id type="pear">Net_SmartIRC</remote-id> 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 b4991b9560d6..9c8eb5b82876 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 @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -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="amd64 arm ~hppa ppc ppc64 ~s390 sparc x86" IUSE="" DEPEND="" RDEPEND=">=dev-php/PEAR-PEAR-1.10.1" diff --git a/dev-php/PEAR-Net_Socket/metadata.xml b/dev-php/PEAR-Net_Socket/metadata.xml index 0f52819d348d..3a1d20c4707f 100644 --- a/dev-php/PEAR-Net_Socket/metadata.xml +++ b/dev-php/PEAR-Net_Socket/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> diff --git a/dev-php/PEAR-Net_Traceroute/metadata.xml b/dev-php/PEAR-Net_Traceroute/metadata.xml index aca42932b833..77793b997e9e 100644 --- a/dev-php/PEAR-Net_Traceroute/metadata.xml +++ b/dev-php/PEAR-Net_Traceroute/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> diff --git a/dev-php/PEAR-Net_URL/PEAR-Net_URL-1.0.15-r1.ebuild b/dev-php/PEAR-Net_URL/PEAR-Net_URL-1.0.15-r1.ebuild index 687a32391527..219a6862b8d6 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 @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -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="amd64 arm ~hppa ppc ppc64 ~s390 sparc x86" IUSE="" src_install() { diff --git a/dev-php/PEAR-Net_URL/metadata.xml b/dev-php/PEAR-Net_URL/metadata.xml index aca42932b833..77793b997e9e 100644 --- a/dev-php/PEAR-Net_URL/metadata.xml +++ b/dev-php/PEAR-Net_URL/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> diff --git a/dev-php/PEAR-Net_URL2/PEAR-Net_URL2-2.2.1-r2.ebuild b/dev-php/PEAR-Net_URL2/PEAR-Net_URL2-2.2.1-r2.ebuild index e34a5782c9de..00ec4551d185 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 @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -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="amd64 ~arm ~hppa ~ppc ~ppc64 ~s390 sparc x86" IUSE="" DOCS=( docs/6470.php docs/example.php ) diff --git a/dev-php/PEAR-Net_URL2/metadata.xml b/dev-php/PEAR-Net_URL2/metadata.xml index 85371818ed52..3de98f2658fe 100644 --- a/dev-php/PEAR-Net_URL2/metadata.xml +++ b/dev-php/PEAR-Net_URL2/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> diff --git a/dev-php/PEAR-Net_UserAgent_Detect/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 06455300ebb7..2f44752f5655 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-2019 Gentoo Authors +# Copyright 1999-2023 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="amd64 ~hppa ppc ppc64 sparc x86" IUSE="" src_install() { diff --git a/dev-php/PEAR-Net_UserAgent_Detect/metadata.xml b/dev-php/PEAR-Net_UserAgent_Detect/metadata.xml index aca42932b833..77793b997e9e 100644 --- a/dev-php/PEAR-Net_UserAgent_Detect/metadata.xml +++ b/dev-php/PEAR-Net_UserAgent_Detect/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> diff --git a/dev-php/PEAR-Numbers_Words/Manifest b/dev-php/PEAR-Numbers_Words/Manifest index 6c3b2da71bb2..9c1ff9de79dc 100644 --- a/dev-php/PEAR-Numbers_Words/Manifest +++ b/dev-php/PEAR-Numbers_Words/Manifest @@ -1,2 +1 @@ -DIST Numbers_Words-0.18.1.tgz 72925 BLAKE2B 2dd624fe4ede72c00f68f259c0271ca405e76bab6b43d85024cfa70b74e50e9ac5fbccd7e770c90ac4bcc5eabbdc33ccc9bc6b691e0da2b9a05ee5a141a0d8ac SHA512 b6063db873d65bc872ea64e6ae4282da9b36aa15ac336a5b443e4bc3cc7ad49538327bb56d0b70a482c82dfa1d732426f9cc45453d4d13a25a840871e1f6fb2c DIST Numbers_Words-0.18.2.tgz 73113 BLAKE2B e64fd1fcd8017b1768bc0e8918a79a91b83711433d0a29d36b145fdc07cee8cc3149a31d8e3739bd59ee57a821aafd8532fd8a54684da7e2395463662b733335 SHA512 cc719ea47e7da365959a02106d80aabe2ed079064128af1a61c0c53ed44726e7169de5c9d8dd28cbf917e025841e9aa07b4b8c9313a788b0a92eab32a4edb37c 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 deleted file mode 100644 index 6694eafee62e..000000000000 --- a/dev-php/PEAR-Numbers_Words/PEAR-Numbers_Words-0.18.1-r1.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -MY_PN="${PN/PEAR-/}" -MY_P="${MY_PN}-${PV}" - -DESCRIPTION="Provides methods for spelling numerals in words" -HOMEPAGE="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" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND="dev-lang/php:* - dev-php/PEAR-Math_BigInteger" -DEPEND="test? ( ${RDEPEND} dev-php/phpunit )" - -S="${WORKDIR}/${MY_P}" - -src_install() { - insinto /usr/share/php/ - doins -r Numbers - - dodoc ChangeLog README -} - -src_test() { - phpunit tests || die 'test suite failed' -} diff --git a/dev-php/PEAR-Numbers_Words/PEAR-Numbers_Words-0.18.2.ebuild b/dev-php/PEAR-Numbers_Words/PEAR-Numbers_Words-0.18.2.ebuild index 53a6fc6a398b..5dee464aeff9 100644 --- a/dev-php/PEAR-Numbers_Words/PEAR-Numbers_Words-0.18.2.ebuild +++ b/dev-php/PEAR-Numbers_Words/PEAR-Numbers_Words-0.18.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -9,7 +9,7 @@ DESCRIPTION="Provides methods for spelling numerals in words" HOMEPAGE="https://pear.php.net/package/Numbers_Words" LICENSE="PHP-3.01" SLOT="0" -KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="amd64 ~hppa ppc ppc64 sparc x86" IUSE="test" RESTRICT="!test? ( test )" diff --git a/dev-php/PEAR-Numbers_Words/metadata.xml b/dev-php/PEAR-Numbers_Words/metadata.xml index d2c15155b757..7a8d11726956 100644 --- a/dev-php/PEAR-Numbers_Words/metadata.xml +++ b/dev-php/PEAR-Numbers_Words/metadata.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> <name>PHP</name> </maintainer> + <stabilize-allarches/> <upstream> <remote-id type="github">pear/Numbers_Words</remote-id> <remote-id type="pear">Numbers_Words</remote-id> 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 404cd3462a95..79771a84e08a 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 @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -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="amd64 arm ~hppa ppc ppc64 ~s390 sparc x86" IUSE="" diff --git a/dev-php/PEAR-OLE/metadata.xml b/dev-php/PEAR-OLE/metadata.xml index bae519a4738e..2d76cf770abf 100644 --- a/dev-php/PEAR-OLE/metadata.xml +++ b/dev-php/PEAR-OLE/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> diff --git a/dev-php/PEAR-PEAR/Manifest b/dev-php/PEAR-PEAR/Manifest index e94b02351ee7..746d767db396 100644 --- a/dev-php/PEAR-PEAR/Manifest +++ b/dev-php/PEAR-PEAR/Manifest @@ -1 +1,2 @@ DIST PEAR-1.10.12.tgz 293220 BLAKE2B fb25123852a60e4bd2c041d1fb58174b3053b24ff8ec19b44efe02aee041bbed102b14b270dc1c9764150eea7c85862ad78adefdc1d789540da18ec0f3aeae68 SHA512 1ce478800a150d7906f8aa4fa4371d3d190fa2af44691c9aa193babfe76f1b031b493f48df15b93e93dd5518a6d62ba6a7d5b1799b62d5a968f7a84f3677b971 +DIST PEAR-1.10.13.tgz 293384 BLAKE2B 0adbf707d71cfd584b1338e906fbd38de038292a91153547ed87bdea4c0a7c9ee2ca01c25c91cf8246b8fba88b71126fa8b76ed7059b4338d5bbc65c3d53ce78 SHA512 2a08134365b7bd92840880a23149ef457b0a3a04b78dc71f5db475911b49def58d8cb825332151df8d3eb5941b54157ae80879f36fc8de59037f301fc0565740 diff --git a/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.12.ebuild b/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.12.ebuild index fe194d02e2c5..daf87504825e 100644 --- a/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.12.ebuild +++ b/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.12.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -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 ppc ppc64 ~s390 sparc x86" SLOT="0" IUSE="" diff --git a/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.13.ebuild b/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.13.ebuild new file mode 100644 index 000000000000..daf87504825e --- /dev/null +++ b/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.13.ebuild @@ -0,0 +1,177 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +MY_PN="${PN/PEAR-/}" +MY_P="${MY_PN}-${PV}" + +DESCRIPTION="PEAR Base System" +HOMEPAGE="https://pear.php.net/package/PEAR" +SRC_URI="https://pear.php.net/get/${MY_P}.tgz" +LICENSE="MIT" +KEYWORDS="~alpha amd64 arm ~hppa ppc ppc64 ~s390 sparc x86" +SLOT="0" +IUSE="" + +DEPEND="" +RDEPEND="dev-lang/php:*[cli(-),xml(-),zlib(-)] + >=dev-php/PEAR-Archive_Tar-1.4.9 + >=dev-php/PEAR-Console_Getopt-1.4.1 + dev-php/PEAR-Exception + >=dev-php/PEAR-Structures_Graph-1.1.0 + >=dev-php/PEAR-XML_Util-1.4.0" + +S="${WORKDIR}/${MY_P}" + +PATCHES=( "${FILESDIR}/gentoo-libtool-mismatch-fix-v2.patch" ) + +pkg_setup() { + [[ -z "${PEAR_CACHEDIR}" ]] && PEAR_CACHEDIR="${EPREFIX}/var/cache/pear" + [[ -z "${PEAR_DOWNLOADDIR}" ]] && PEAR_DOWNLOADDIR="${EPREFIX}/var/tmp/pear" + [[ -z "${PEAR_TEMPDIR}" ]] && PEAR_TEMPDIR="${EPREFIX}/tmp" + + elog + elog "cache_dir is set to: ${PEAR_CACHEDIR}" + elog "download_dir is set to: ${PEAR_DOWNLOADDIR}" + elog "temp_dir is set to: ${PEAR_TEMPDIR}" + elog + elog "If you want to change the above values, you need to set" + elog "PEAR_CACHEDIR, PEAR_DOWNLOADDIR and PEAR_TEMPDIR variable(s)" + elog "accordingly in /etc/portage/make.conf and re-emerge ${PN}." + elog +} + +src_prepare() { + default + # Exception.php is part of dev-php/PEAR-Exception. + rm PEAR/Exception.php || die "failed to remove PEAR/Exception.php" +} + +src_install() { + insinto /usr/share/php + doins -r PEAR/ + doins -r OS/ + doins PEAR.php System.php + doins scripts/pearcmd.php + doins scripts/peclcmd.php + + newbin scripts/pear.sh pear + newbin scripts/peardev.sh peardev + newbin scripts/pecl.sh pecl + + # adjust some scripts for current version + [[ -z "${PEAR}" ]] && PEAR="${PV}" + for i in pearcmd.php peclcmd.php ; do + sed "s:@pear_version@:${PEAR}:g" -i "${D}/usr/share/php/${i}" \ + || die "failed to sed pear_version" + done + + for i in pear peardev pecl ; do + sed "s:@bin_dir@:${EPREFIX}/usr/bin:g" -i "${D}/usr/bin/${i}" \ + || die "failed to sed @bin_dir@ in ${i}" + sed "s:@php_dir@:${EPREFIX}/usr/share/php:g" -i "${D}/usr/bin/${i}" \ + || die "failed to sed @php_dir@ in ${i}" + done + + sed "s:-d output_buffering=1:-d output_buffering=1 -d memory_limit=32M:g" \ + -i "${D}/usr/bin/pear" \ + || die "failed to set PHP ini values in pear executable" + + sed "s:@package_version@:${PEAR}:g" \ + -i "${D}/usr/share/php/PEAR/Command/Package.php" \ + || die "failed to sed @package_version@" + + sed "s:@PEAR-VER@:${PEAR}:g" \ + -i "${D}/usr/share/php/PEAR/Dependency2.php" \ + || die "failed to sed @PEAR-VER@ in Dependency2.php" + + sed "s:@PEAR-VER@:${PEAR}:g" \ + -i "${D}/usr/share/php/PEAR/PackageFile/Parser/v1.php" \ + || die "failed to sed @PEAR-VER@ in v1.php" + + sed "s:@PEAR-VER@:${PEAR}:g" \ + -i "${D}/usr/share/php/PEAR/PackageFile/Parser/v2.php" \ + || die "failed to sed @PEAR-VER@ in v2.php" + + # finalize install + insinto /etc + newins "${FILESDIR}"/pear.conf-r2 pear.conf + + sed "s|s:PHPCLILEN:\"PHPCLI\"|s:${#PHPCLI}:\"${PHPCLI}\"|g" \ + -i "${D}/etc/pear.conf" \ + || die "failed to sed PHPCLILEN in pear.conf" + + sed "s|s:CACHEDIRLEN:\"CACHEDIR\"|s:${#PEAR_CACHEDIR}:\"${PEAR_CACHEDIR}\"|g" \ + -i "${D}/etc/pear.conf" \ + || die "failed to sed CACHEDIRLEN in pear.conf" + + sed "s|s:DOWNLOADDIRLEN:\"DOWNLOADDIR\"|s:${#PEAR_DOWNLOADDIR}:\"${PEAR_DOWNLOADDIR}\"|g" \ + -i "${D}/etc/pear.conf" \ + || die "failed to sed DOWNLOADDIRLEN in pear.conf" + + sed "s|s:TEMPDIRLEN:\"TEMPDIR\"|s:${#PEAR_TEMPDIR}:\"${PEAR_TEMPDIR}\"|g" \ + -i "${D}/etc/pear.conf" \ + || die "failed to sed TEMPDIRLEN in pear.conf" + + # Change the paths for eprefix! + sed "s|s:19:\"/usr/share/php/docs\"|s:$(( ${#EPREFIX}+19 )):\"${EPREFIX}/usr/share/php/docs\"|g" \ + -i "${D}/etc/pear.conf" \ + || die "failed to sed the docs path (prefix) in pear.conf" + + sed "s|s:19:\"/usr/share/php/data\"|s:$(( ${#EPREFIX}+19 )):\"${EPREFIX}/usr/share/php/data\"|g" \ + -i "${D}/etc/pear.conf" \ + || die "failed to sed the data path (prefix) in pear.conf" + + sed "s|s:20:\"/usr/share/php/tests\"|s:$(( ${#EPREFIX}+20 )):\"${EPREFIX}/usr/share/php/tests\"|g" \ + -i "${D}/etc/pear.conf" \ + || die "failed to sed the tests path (prefix) in pear.conf" + + sed "s|s:14:\"/usr/share/php\"|s:$(( ${#EPREFIX}+14 )):\"${EPREFIX}/usr/share/php\"|g" \ + -i "${D}/etc/pear.conf" \ + || die "failed to sed the PHP include path (prefix) in pear.conf" + + sed "s|s:8:\"/usr/bin\"|s:$(( ${#EPREFIX}+8 )):\"${EPREFIX}/usr/bin\"|g" \ + -i "${D}/etc/pear.conf" \ + || die "failed to sed the bin path (prefix) in pear.conf" + + [[ "${PEAR_TEMPDIR}" != "/tmp" ]] && keepdir "${PEAR_TEMPDIR#${EPREFIX}}" + keepdir "${PEAR_CACHEDIR#${EPREFIX}}" + diropts -m1777 + keepdir "${PEAR_DOWNLOADDIR#${EPREFIX}}" + + insinto /usr/share/php/.packagexml + newins "${WORKDIR}/package.xml" "${MY_P}.xml" +} + +pkg_config() { + # Update PEAR/PECL channels as needed, add new ones to the list if needed + elog "Updating PEAR/PECL channels" + local pearchans="pear.php.net pecl.php.net pear.symfony-project.com" + + for chan in ${pearchans} ; do + # The first command may fail if, for example, the channels have + # already been initialized. + pear channel-discover ${chan} + pear channel-update ${chan} || die "failed to update channels: ${chan}" + done +} + +pkg_postinst() { + pear clear-cache || die "failed to clear PEAR cache" + + elog "Run 'emerge --config =${PF}' to automatically update the PEAR/PECL channels while online." + + # Register the package from the package.xml file + # It is not critical to complete so only warn on failure + if [[ -f "${EROOT}/usr/share/php/.packagexml/${MY_P}.xml" ]] ; then + "${EROOT}/usr/bin/peardev" install -nrO --force \ + "${EROOT}/usr/share/php/.packagexml/${MY_P}.xml" 2> /dev/null \ + || ewarn "Failed to insert package into local PEAR database" + fi +} + +pkg_prerm() { + # Uninstall known dependency + "${EROOT}/usr/bin/peardev" uninstall -nrO "pear.php.net/PEAR" +} diff --git a/dev-php/PEAR-PEAR/metadata.xml b/dev-php/PEAR-PEAR/metadata.xml index ad42cd86df78..bd0c90eab0e2 100644 --- a/dev-php/PEAR-PEAR/metadata.xml +++ b/dev-php/PEAR-PEAR/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> diff --git a/dev-php/PEAR-PEAR_PackageFileManager/Manifest b/dev-php/PEAR-PEAR_PackageFileManager/Manifest deleted file mode 100644 index 59c8d7242045..000000000000 --- a/dev-php/PEAR-PEAR_PackageFileManager/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST PEAR_PackageFileManager-1.7.2.tgz 38104 BLAKE2B 126578a570db3e92b8c3b3d04588a77e81b14ed6b6c40e9a6c90739d2ae86bfaad8cac2b5ece4deaea9ea1e356d2645997402200236e394f68c0dc5fa9eaafe5 SHA512 4a0a201fea221a8e2d21199f99d4f145e39f42344a0057f32bfefd96aa2635e12ea75ee6b6ac64c52a8d35be5e2a65fa5399b3195592dea9ba10191c45fc0056 diff --git a/dev-php/PEAR-PEAR_PackageFileManager/PEAR-PEAR_PackageFileManager-1.7.2-r2.ebuild b/dev-php/PEAR-PEAR_PackageFileManager/PEAR-PEAR_PackageFileManager-1.7.2-r2.ebuild deleted file mode 100644 index b0973dc62119..000000000000 --- a/dev-php/PEAR-PEAR_PackageFileManager/PEAR-PEAR_PackageFileManager-1.7.2-r2.ebuild +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit php-pear-r2 - -DESCRIPTION="Updates an existing package.xml file with a new filelist and changelog" -LICENSE="PHP-3.01" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND=">=dev-lang/php-5.3:* - >=dev-php/PEAR-PEAR-1.10.1 - dev-php/PEAR-PEAR_PackageFileManager2 - dev-php/PEAR-PEAR_PackageFileManager_Plugins" diff --git a/dev-php/PEAR-PEAR_PackageFileManager/metadata.xml b/dev-php/PEAR-PEAR_PackageFileManager/metadata.xml deleted file mode 100644 index fab171dfd1f8..000000000000 --- a/dev-php/PEAR-PEAR_PackageFileManager/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>php-bugs@gentoo.org</email> - <name>PHP</name> - </maintainer> - <upstream> - <remote-id type="pear">PEAR_PackageFileManager</remote-id> - </upstream> -</pkgmetadata> diff --git a/dev-php/PEAR-PEAR_PackageFileManager2/Manifest b/dev-php/PEAR-PEAR_PackageFileManager2/Manifest deleted file mode 100644 index 77afeab4fa9d..000000000000 --- a/dev-php/PEAR-PEAR_PackageFileManager2/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST PEAR_PackageFileManager2-1.0.4.tgz 43365 BLAKE2B 5eae7eb6f2ae91487ab83dc048ff2fa4c63a4f8208e88e0897340ef63aded28b355f22aec8e12e4da918ed1f24434c6269b53f4755ec80cf4edf7a240e03e545 SHA512 2748ebb21158521a74246ea410f9a30ae6d4b41e88aba543888238c5fc53060e6cf5c537cb95f595147690a2cbdfaaa34a6b3280924ee153cd3d47f2deb3a636 diff --git a/dev-php/PEAR-PEAR_PackageFileManager2/PEAR-PEAR_PackageFileManager2-1.0.4-r2.ebuild b/dev-php/PEAR-PEAR_PackageFileManager2/PEAR-PEAR_PackageFileManager2-1.0.4-r2.ebuild deleted file mode 100644 index e896e2b1d697..000000000000 --- a/dev-php/PEAR-PEAR_PackageFileManager2/PEAR-PEAR_PackageFileManager2-1.0.4-r2.ebuild +++ /dev/null @@ -1,16 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit php-pear-r2 - -DESCRIPTION="Updates an existing package.xml file with a new filelist and changelog" -LICENSE="PHP-3.01" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND=">=dev-lang/php-5.3:* - >=dev-php/PEAR-PEAR-1.10.1 - dev-php/PEAR-PEAR_PackageFileManager_Plugins" diff --git a/dev-php/PEAR-PEAR_PackageFileManager2/metadata.xml b/dev-php/PEAR-PEAR_PackageFileManager2/metadata.xml deleted file mode 100644 index b809fc597ff9..000000000000 --- a/dev-php/PEAR-PEAR_PackageFileManager2/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>php-bugs@gentoo.org</email> - <name>PHP</name> - </maintainer> - <upstream> - <remote-id type="pear">PEAR_PackageFileManager2</remote-id> - </upstream> -</pkgmetadata> diff --git a/dev-php/PEAR-PEAR_PackageFileManager_Plugins/Manifest b/dev-php/PEAR-PEAR_PackageFileManager_Plugins/Manifest deleted file mode 100644 index a0aedcd5587c..000000000000 --- a/dev-php/PEAR-PEAR_PackageFileManager_Plugins/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST PEAR_PackageFileManager_Plugins-1.0.4.tgz 20967 BLAKE2B 5f883e117af879c67badb5c9c8b11e1211b3f9ee3b0516d43ca489ea05d6d4678281062a1a75da15e2158583169e7c31ca900bdea83137d991ed7dd923abb2e6 SHA512 7461ba3dc6f51263383136041d217e2d0d7607c5ef9f8766e08466118f2c869a037622750dd7bdcbbf2a114efde096b3192bbf5229f62ea42adfe83d36451fa0 diff --git a/dev-php/PEAR-PEAR_PackageFileManager_Plugins/PEAR-PEAR_PackageFileManager_Plugins-1.0.4-r1.ebuild b/dev-php/PEAR-PEAR_PackageFileManager_Plugins/PEAR-PEAR_PackageFileManager_Plugins-1.0.4-r1.ebuild deleted file mode 100644 index 021965393c4f..000000000000 --- a/dev-php/PEAR-PEAR_PackageFileManager_Plugins/PEAR-PEAR_PackageFileManager_Plugins-1.0.4-r1.ebuild +++ /dev/null @@ -1,16 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit php-pear-r2 - -DESCRIPTION="Various methods to check files to update an existing package.xml file" -LICENSE="BSD-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND=">=dev-php/PEAR-PEAR-1.10.1 - >=dev-php/PEAR-XML_Serializer-0.19.0 - >=dev-lang/php-5.3:*[xml,simplexml]" diff --git a/dev-php/PEAR-PEAR_PackageFileManager_Plugins/metadata.xml b/dev-php/PEAR-PEAR_PackageFileManager_Plugins/metadata.xml deleted file mode 100644 index d9b3b31f5004..000000000000 --- a/dev-php/PEAR-PEAR_PackageFileManager_Plugins/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>php-bugs@gentoo.org</email> - <name>PHP</name> - </maintainer> - <upstream> - <remote-id type="pear">PEAR_PackageFileManager_Plugins</remote-id> - </upstream> -</pkgmetadata> diff --git a/dev-php/PEAR-PHP_Beautifier/metadata.xml b/dev-php/PEAR-PHP_Beautifier/metadata.xml index 9321b4869241..b7ebf25c8498 100644 --- a/dev-php/PEAR-PHP_Beautifier/metadata.xml +++ b/dev-php/PEAR-PHP_Beautifier/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> diff --git a/dev-php/PEAR-PHP_Debug/metadata.xml b/dev-php/PEAR-PHP_Debug/metadata.xml index b86acf66c756..222c77f3742a 100644 --- a/dev-php/PEAR-PHP_Debug/metadata.xml +++ b/dev-php/PEAR-PHP_Debug/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> diff --git a/dev-php/PEAR-Pager/PEAR-Pager-2.5.1.ebuild b/dev-php/PEAR-Pager/PEAR-Pager-2.5.1.ebuild index 7e3fefadc4ea..2d8816999d59 100644 --- a/dev-php/PEAR-Pager/PEAR-Pager-2.5.1.ebuild +++ b/dev-php/PEAR-Pager/PEAR-Pager-2.5.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -9,7 +9,7 @@ DESCRIPTION="Data paging class" LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86" +KEYWORDS="amd64 ~hppa ppc ppc64 sparc x86" IUSE="" RDEPEND=">=dev-lang/php-5.6.0:*" diff --git a/dev-php/PEAR-Pager/metadata.xml b/dev-php/PEAR-Pager/metadata.xml index 3562bff75a4d..e47097b57107 100644 --- a/dev-php/PEAR-Pager/metadata.xml +++ b/dev-php/PEAR-Pager/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> diff --git a/dev-php/PEAR-Services_JSON/PEAR-Services_JSON-1.0.3-r1.ebuild b/dev-php/PEAR-Services_JSON/PEAR-Services_JSON-1.0.3-r1.ebuild index 9e52d443b4b0..654fbdc327d3 100644 --- a/dev-php/PEAR-Services_JSON/PEAR-Services_JSON-1.0.3-r1.ebuild +++ b/dev-php/PEAR-Services_JSON/PEAR-Services_JSON-1.0.3-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -9,7 +9,7 @@ IUSE="" DESCRIPTION="PHP implementaion of json_encode/decode" LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86" PATCHES=( "${FILESDIR}/JSON-1.0.3-upstream-typo.patch" "${FILESDIR}/JSON-1.0.3-constructor.patch" ) src_install() { diff --git a/dev-php/PEAR-Services_JSON/metadata.xml b/dev-php/PEAR-Services_JSON/metadata.xml index aca42932b833..77793b997e9e 100644 --- a/dev-php/PEAR-Services_JSON/metadata.xml +++ b/dev-php/PEAR-Services_JSON/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> diff --git a/dev-php/PEAR-Services_TinyURL/metadata.xml b/dev-php/PEAR-Services_TinyURL/metadata.xml index aca42932b833..77793b997e9e 100644 --- a/dev-php/PEAR-Services_TinyURL/metadata.xml +++ b/dev-php/PEAR-Services_TinyURL/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> diff --git a/dev-php/PEAR-Services_W3C_CSSValidator/metadata.xml b/dev-php/PEAR-Services_W3C_CSSValidator/metadata.xml index eb024985cc14..4825b35a864e 100644 --- a/dev-php/PEAR-Services_W3C_CSSValidator/metadata.xml +++ b/dev-php/PEAR-Services_W3C_CSSValidator/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> diff --git a/dev-php/PEAR-Spreadsheet_Excel_Writer/PEAR-Spreadsheet_Excel_Writer-0.9.4.ebuild b/dev-php/PEAR-Spreadsheet_Excel_Writer/PEAR-Spreadsheet_Excel_Writer-0.9.4.ebuild index 1554c67f387b..f22d34052153 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 @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -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="amd64 arm ~hppa 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-Spreadsheet_Excel_Writer/metadata.xml b/dev-php/PEAR-Spreadsheet_Excel_Writer/metadata.xml index aca42932b833..77793b997e9e 100644 --- a/dev-php/PEAR-Spreadsheet_Excel_Writer/metadata.xml +++ b/dev-php/PEAR-Spreadsheet_Excel_Writer/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> diff --git a/dev-php/PEAR-Structures_Graph/PEAR-Structures_Graph-1.1.1-r1.ebuild b/dev-php/PEAR-Structures_Graph/PEAR-Structures_Graph-1.1.1-r1.ebuild index 5e963f1c61dc..915c5346e406 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 @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -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 ppc ppc64 ~s390 sparc x86" IUSE="" DEPEND="" diff --git a/dev-php/PEAR-Structures_Graph/metadata.xml b/dev-php/PEAR-Structures_Graph/metadata.xml index 2b74bd726af2..9472561552eb 100644 --- a/dev-php/PEAR-Structures_Graph/metadata.xml +++ b/dev-php/PEAR-Structures_Graph/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> diff --git a/dev-php/PEAR-System_Command/PEAR-System_Command-1.0.8-r1.ebuild b/dev-php/PEAR-System_Command/PEAR-System_Command-1.0.8-r1.ebuild index ee64b4e889d0..036a130f68e6 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 @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -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="amd64 ~hppa ppc ppc64 sparc x86" IUSE="examples" RDEPEND="dev-lang/php:* diff --git a/dev-php/PEAR-System_Command/metadata.xml b/dev-php/PEAR-System_Command/metadata.xml index ec63f2f5e427..f71d72ea7eca 100644 --- a/dev-php/PEAR-System_Command/metadata.xml +++ b/dev-php/PEAR-System_Command/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> diff --git a/dev-php/PEAR-Text_CAPTCHA/metadata.xml b/dev-php/PEAR-Text_CAPTCHA/metadata.xml index c0702f18b969..04e7e4d0db71 100644 --- a/dev-php/PEAR-Text_CAPTCHA/metadata.xml +++ b/dev-php/PEAR-Text_CAPTCHA/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> diff --git a/dev-php/PEAR-Text_CAPTCHA_Numeral/metadata.xml b/dev-php/PEAR-Text_CAPTCHA_Numeral/metadata.xml index b86acf66c756..222c77f3742a 100644 --- a/dev-php/PEAR-Text_CAPTCHA_Numeral/metadata.xml +++ b/dev-php/PEAR-Text_CAPTCHA_Numeral/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> diff --git a/dev-php/PEAR-Text_Figlet/metadata.xml b/dev-php/PEAR-Text_Figlet/metadata.xml index 422fb9a63b17..4bee62ba3ab5 100644 --- a/dev-php/PEAR-Text_Figlet/metadata.xml +++ b/dev-php/PEAR-Text_Figlet/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> diff --git a/dev-php/PEAR-Text_Highlighter/metadata.xml b/dev-php/PEAR-Text_Highlighter/metadata.xml index ed8567959038..9a8d08177ca0 100644 --- a/dev-php/PEAR-Text_Highlighter/metadata.xml +++ b/dev-php/PEAR-Text_Highlighter/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> diff --git a/dev-php/PEAR-Text_Password/PEAR-Text_Password-1.2.1.ebuild b/dev-php/PEAR-Text_Password/PEAR-Text_Password-1.2.1.ebuild index e86efe717a6c..f8570efb83f9 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 @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -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="amd64 ~hppa ppc ppc64 ~sparc x86" IUSE="test" RESTRICT="!test? ( test )" diff --git a/dev-php/PEAR-Text_Password/metadata.xml b/dev-php/PEAR-Text_Password/metadata.xml index bea5e06ee13b..126a19ab5d0c 100644 --- a/dev-php/PEAR-Text_Password/metadata.xml +++ b/dev-php/PEAR-Text_Password/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> diff --git a/dev-php/PEAR-Text_Wiki/Manifest b/dev-php/PEAR-Text_Wiki/Manifest index 807d3834b393..5a9e7c506ccd 100644 --- a/dev-php/PEAR-Text_Wiki/Manifest +++ b/dev-php/PEAR-Text_Wiki/Manifest @@ -1,2 +1 @@ -DIST Text_Wiki-1.2.2_p20170904.tar.gz 86810 BLAKE2B 3277fbfae5683c147c1537a7f789b8b9500bfa39014832ed08d91028882813f60727f9ff503d38dde5f017fd5f1ec69d61775a14094b0d267a1b0019f10090c8 SHA512 8e731a6cc9ec0e964d86de5eb96f285155f61d21e229499132f5b06ef8ff520658a42c9c6fb60d73b9bc8828ec9b616bc11e4f04bdd6e74836d52fc53a92dd71 DIST Text_Wiki-1.2.3.tgz 89906 BLAKE2B 8db39418478085bebbbb32f8d80fbf9f6b9058adf9071f7f7493a4e493fbd088e231759752ddc41aad6c58b1ddab953111df006f901545c896e266b75dc70f26 SHA512 619f5323648b1344c572a1aa03626dc00a4dd9f201814fee5a3b962f69085943a1c7d1ef06e7c0cc4be7628bc76889972f1750aa9f7f67348381df1af4a4bd73 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 deleted file mode 100644 index edfbd30619ed..000000000000 --- a/dev-php/PEAR-Text_Wiki/PEAR-Text_Wiki-1.2.2_p20170904.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit php-pear-r2 vcs-snapshot - -DESCRIPTION="Abstracts parsing and rendering rules for Wiki markup in structured plain text" -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86" -IUSE="test" -RESTRICT="!test? ( test )" -# Pull from github as pear.php.net is not updated -SRC_URI="https://github.com/pear/${PHP_PEAR_PKG_NAME}/archive/32fd5f483f34645f4efd96d385d8950ea26d4a2a.tar.gz -> ${PEAR_P}.tar.gz" - -DEPEND="test? ( dev-php/phpunit dev-php/PEAR-PEAR )" - -src_test() { - peardev run-tests tests || die - phpunit tests/*.php || die -} - -src_install() { - php-pear-r2_src_install - insinto /usr/share/php/.packagexml - newins package.xml "${PEAR_P}.xml" -} diff --git a/dev-php/PEAR-Text_Wiki/PEAR-Text_Wiki-1.2.3.ebuild b/dev-php/PEAR-Text_Wiki/PEAR-Text_Wiki-1.2.3.ebuild index 71ce9d98ae0f..b85721dc6576 100644 --- a/dev-php/PEAR-Text_Wiki/PEAR-Text_Wiki-1.2.3.ebuild +++ b/dev-php/PEAR-Text_Wiki/PEAR-Text_Wiki-1.2.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -8,7 +8,7 @@ inherit php-pear-r2 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="amd64 ~hppa ppc ppc64 sparc x86" IUSE="test" RESTRICT="!test? ( test )" diff --git a/dev-php/PEAR-Text_Wiki/metadata.xml b/dev-php/PEAR-Text_Wiki/metadata.xml index 96c2f7441792..0386b719da9a 100644 --- a/dev-php/PEAR-Text_Wiki/metadata.xml +++ b/dev-php/PEAR-Text_Wiki/metadata.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> <name>PHP</name> </maintainer> + <stabilize-allarches/> <upstream> <remote-id type="github">pear/archive</remote-id> </upstream> diff --git a/dev-php/PEAR-Text_Wiki_BBCode/PEAR-Text_Wiki_BBCode-0.0.4-r3.ebuild b/dev-php/PEAR-Text_Wiki_BBCode/PEAR-Text_Wiki_BBCode-0.0.4-r3.ebuild index 25a06efaece6..586850bad1c2 100644 --- a/dev-php/PEAR-Text_Wiki_BBCode/PEAR-Text_Wiki_BBCode-0.0.4-r3.ebuild +++ b/dev-php/PEAR-Text_Wiki_BBCode/PEAR-Text_Wiki_BBCode-0.0.4-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -9,7 +9,7 @@ DESCRIPTION="BBCode parser for Text_Wiki" LICENSE="LGPL-2.1 PHP-3" SLOT="0" -KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86" IUSE="" DEPEND="" RDEPEND=">=dev-php/PEAR-Text_Wiki-1.0.3" diff --git a/dev-php/PEAR-Text_Wiki_BBCode/metadata.xml b/dev-php/PEAR-Text_Wiki_BBCode/metadata.xml index aca42932b833..77793b997e9e 100644 --- a/dev-php/PEAR-Text_Wiki_BBCode/metadata.xml +++ b/dev-php/PEAR-Text_Wiki_BBCode/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> diff --git a/dev-php/PEAR-Text_Wiki_Mediawiki/PEAR-Text_Wiki_Mediawiki-0.2.0_p20140604.ebuild b/dev-php/PEAR-Text_Wiki_Mediawiki/PEAR-Text_Wiki_Mediawiki-0.2.0_p20140604.ebuild index ef46c5c3e253..f4995d05f317 100644 --- a/dev-php/PEAR-Text_Wiki_Mediawiki/PEAR-Text_Wiki_Mediawiki-0.2.0_p20140604.ebuild +++ b/dev-php/PEAR-Text_Wiki_Mediawiki/PEAR-Text_Wiki_Mediawiki-0.2.0_p20140604.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -9,7 +9,7 @@ SRC_URI="https://github.com/pear/Text_Wiki_Mediawiki/archive/11a902741d3f8cc6010 DESCRIPTION="Mediawiki parser for Text_Wiki" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86" IUSE="test" RESTRICT="!test? ( test )" RDEPEND=">=dev-php/PEAR-Text_Wiki-1.2.2_p20170904" diff --git a/dev-php/PEAR-Text_Wiki_Mediawiki/metadata.xml b/dev-php/PEAR-Text_Wiki_Mediawiki/metadata.xml index aca42932b833..77793b997e9e 100644 --- a/dev-php/PEAR-Text_Wiki_Mediawiki/metadata.xml +++ b/dev-php/PEAR-Text_Wiki_Mediawiki/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> diff --git a/dev-php/PEAR-Validate/Manifest b/dev-php/PEAR-Validate/Manifest index ca62b7680cf4..60effe7697df 100644 --- a/dev-php/PEAR-Validate/Manifest +++ b/dev-php/PEAR-Validate/Manifest @@ -1 +1 @@ -DIST Validate-0.8.5.tgz 21668 BLAKE2B 5f1897f9a796bab047beb7bdcf79726f58f069874cb1d08a17078c8d974bed626b3e37dd792e8b941fd0115d9060986278d459037580adedf6088ef51d5f2c13 SHA512 4e2e330b0a74a24d18af262ef42d872ab9eb2386e11c5647d898c60e11a29d06c97c0295cdf0999c3a4805f3f1efae2949c54520da50cf6adfcc5a6c4f6e1b63 +DIST Validate-0.8.6.tgz 21840 BLAKE2B 32b41534da0ec39ff425725a85c46e2043262160c630b03368036071871f3f6b86ffc648b62f103101e0d513505d51bacbfb8469d709f4cab6195680fa9cb666 SHA512 75627eb4d0a7622c17477670bf484384c0e5f8286832e0c357bf24a573256e9e70f84c8b818a4c7fb90ca2215a386d27ccd0cd5ee1e92dc4cbdd174290d136de diff --git a/dev-php/PEAR-Validate/PEAR-Validate-0.8.5-r1.ebuild b/dev-php/PEAR-Validate/PEAR-Validate-0.8.6.ebuild index 9949a081a0f2..69ac1bf80769 100644 --- a/dev-php/PEAR-Validate/PEAR-Validate-0.8.5-r1.ebuild +++ b/dev-php/PEAR-Validate/PEAR-Validate-0.8.6.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit php-pear-r2 -KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86" +KEYWORDS="amd64 ~arm ~hppa ppc ppc64 ~s390 sparc x86" DESCRIPTION="Validation class" LICENSE="BSD" @@ -15,7 +15,7 @@ RESTRICT="!test? ( test )" DEPEND="test? ( dev-php/PEAR-PEAR dev-php/PEAR-Date )" RDEPEND="!minimal? ( dev-php/PEAR-Date )" -PATCHES=( "${FILESDIR}/0.8.5-fix-test-php7.patch" ) +#PATCHES=( "${FILESDIR}/0.8.5-fix-test-php7.patch" ) HTML_DOCS=( docs/Example_Locale.php docs/sample_multiple.php ) src_test() { diff --git a/dev-php/PEAR-Validate/metadata.xml b/dev-php/PEAR-Validate/metadata.xml index b86acf66c756..666e6402df14 100644 --- a/dev-php/PEAR-Validate/metadata.xml +++ b/dev-php/PEAR-Validate/metadata.xml @@ -1,8 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> <name>PHP</name> </maintainer> + <stabilize-allarches /> </pkgmetadata> diff --git a/dev-php/PEAR-Var_Dump/PEAR-Var_Dump-1.0.4-r3.ebuild b/dev-php/PEAR-Var_Dump/PEAR-Var_Dump-1.0.4-r3.ebuild index 707cff167f52..33ffd58b29e8 100644 --- a/dev-php/PEAR-Var_Dump/PEAR-Var_Dump-1.0.4-r3.ebuild +++ b/dev-php/PEAR-Var_Dump/PEAR-Var_Dump-1.0.4-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -8,7 +8,7 @@ inherit php-pear-r2 DESCRIPTION="Dump structured information about a variable" LICENSE="PHP-3.01" SLOT="0" -KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86" IUSE="examples test" DEPEND="test? ( dev-php/PEAR-PEAR )" diff --git a/dev-php/PEAR-Var_Dump/metadata.xml b/dev-php/PEAR-Var_Dump/metadata.xml index eeacdbbaf53c..6ead3b8b703f 100644 --- a/dev-php/PEAR-Var_Dump/metadata.xml +++ b/dev-php/PEAR-Var_Dump/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> diff --git a/dev-php/PEAR-VersionControl_SVN/Manifest b/dev-php/PEAR-VersionControl_SVN/Manifest deleted file mode 100644 index 056a281c1db4..000000000000 --- a/dev-php/PEAR-VersionControl_SVN/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST PEAR-VersionControl_SVN-0.5.2_p20180314.tar.gz 36697 BLAKE2B 998e9c08d19284de2bd723fff07bc4c319ed65b12baad012f5f8e6b283060cd25cdefa5141e71f8368555d963e7ab1eec7b8e41d38cbd9a89dbd6977f72b5102 SHA512 aaba6fcd65d3906c9d98085b109d1357578be7557a9ac5b5997ae9a9896cb0970f3bf707246e5afc68dfbb8268a8fad36265b484220387b56e8de85e390db82a -DIST VersionControl_SVN-0.5.2.tgz 31356 BLAKE2B d59971b0677d3e88b47f1fb249c6ba6971db7b868e390589705058fa0cc19a3b4e7a2da38db78b37a9fa7b8f9233297a4fb5376b1b225c8e93f41bbe65c99007 SHA512 09aaab0461a52fe87e5723472b9978c8f928a4741e11a69672ae1350ecdf90b287d951b8343b5fbfbc1d7cd449055cb249f229a1e943cdcd807e9b36e0a48b86 diff --git a/dev-php/PEAR-VersionControl_SVN/PEAR-VersionControl_SVN-0.5.2-r1.ebuild b/dev-php/PEAR-VersionControl_SVN/PEAR-VersionControl_SVN-0.5.2-r1.ebuild deleted file mode 100644 index 7fea8919316e..000000000000 --- a/dev-php/PEAR-VersionControl_SVN/PEAR-VersionControl_SVN-0.5.2-r1.ebuild +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit php-pear-r2 - -DESCRIPTION="Simple OO wrapper interface for the Subversion command-line client" -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" -IUSE="" -RDEPEND="" - -src_prepare() { - einfo "Patching SVN.php and SVN/Command.php to use proper paths by default" - sed -i -e 's:/usr/local:/usr:g' VersionControl/SVN.php || die "sed failed" - sed -i -e 's:/usr/local:/usr:g' VersionControl/SVN/Command.php || die "sed failed" - default -} diff --git a/dev-php/PEAR-VersionControl_SVN/PEAR-VersionControl_SVN-0.5.2_p20180314.ebuild b/dev-php/PEAR-VersionControl_SVN/PEAR-VersionControl_SVN-0.5.2_p20180314.ebuild deleted file mode 100644 index d1a06c8cfbfd..000000000000 --- a/dev-php/PEAR-VersionControl_SVN/PEAR-VersionControl_SVN-0.5.2_p20180314.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit php-pear-r2 vcs-snapshot - -DESCRIPTION="Simple OO wrapper interface for the Subversion command-line client" -SRC_URI="https://github.com/pear/VersionControl_SVN/archive/6c9580df92f0cc77a6eb6fcc216c56913bf308e7.tar.gz -> ${P}.tar.gz" -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" -IUSE="test" -RESTRICT="!test? ( test )" -RDEPEND="" -DEPEND="test? ( dev-vcs/subversion <dev-php/phpunit-6 )" -S="${WORKDIR}/PEAR-${PHP_PEAR_PKG_NAME}-${PV}" - -src_prepare() { - einfo "Patching SVN.php and SVN/Command.php to use proper paths by default" - sed -i -e 's:/usr/local:/usr:g' VersionControl/SVN.php || die "sed failed" - sed -i -e 's:/usr/local:/usr:g' VersionControl/SVN/Command.php || die "sed failed" - sed -i 's/ +%d / %i /' tests/resetxml_19910.phpt || die - default -} - -src_test() { - phpunit tests || die "Tests failed" -} diff --git a/dev-php/PEAR-VersionControl_SVN/metadata.xml b/dev-php/PEAR-VersionControl_SVN/metadata.xml deleted file mode 100644 index aca42932b833..000000000000 --- a/dev-php/PEAR-VersionControl_SVN/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<maintainer type="project"> - <email>php-bugs@gentoo.org</email> - <name>PHP</name> -</maintainer> -</pkgmetadata> diff --git a/dev-php/PEAR-XML_Parser/Manifest b/dev-php/PEAR-XML_Parser/Manifest index ab8e0fe0cf58..2c469207592e 100644 --- a/dev-php/PEAR-XML_Parser/Manifest +++ b/dev-php/PEAR-XML_Parser/Manifest @@ -1,2 +1 @@ -DIST XML_Parser-1.3.7.tgz 13339 BLAKE2B 10cc89dbf4f6c4b28fea73cc45757e71a897b01fd21a3d2711fef5eb0cd33e1fdeda143ce88dd425fdea9802a02f3d7e352ec17295b88d8cfae87af6a342f622 SHA512 b4e6c76962eb47f15096e7d77658cf41ca372a9389967e5204e865b253da4f4e248e7b893aa4c6624bb1178e3985667d018849df6d9a07aa6b9a707c743fe64b DIST XML_Parser-1.3.8.tgz 13534 BLAKE2B c0227d48b43b9b0fec3251c81e56017344101b4a2dc9a5eb85310d1130148a1d7e365b3b6e3f4fcab03aeac1f702f81f22d45c4db67ff515836ef8a173cd7d4c SHA512 f840acf2e068d642177d37958487021b5bf57cd33048738f2f18fa35d83dfe428ce327900a9a141c2a184e4dbdddc9e8eefaf87604131f516f016aee30aad603 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 deleted file mode 100644 index cb8300b5fce6..000000000000 --- a/dev-php/PEAR-XML_Parser/PEAR-XML_Parser-1.3.7-r1.ebuild +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit php-pear-r2 - -DESCRIPTION="XML parsing class based on PHP's SAX parser" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86" -IUSE="" - -src_test() { - peardev run-tests -r || die -} diff --git a/dev-php/PEAR-XML_Parser/PEAR-XML_Parser-1.3.8-r1.ebuild b/dev-php/PEAR-XML_Parser/PEAR-XML_Parser-1.3.8-r1.ebuild new file mode 100644 index 000000000000..2e8cd48df274 --- /dev/null +++ b/dev-php/PEAR-XML_Parser/PEAR-XML_Parser-1.3.8-r1.ebuild @@ -0,0 +1,29 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit php-pear-r2 + +DESCRIPTION="XML parsing class based on PHP's SAX parser" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 arm ~hppa ppc ppc64 ~s390 sparc x86" +IUSE="" +# This is to match patch compatibility +RDEPEND="!<dev-php/PEAR-XML_RSS-1.1.0-r2" + +PATCHES=( "${FILESDIR}/XML_Parser-1.3.8-php8.patch" ) + +src_test() { + peardev run-tests -r || die +} + +pkg_postinst() { + php-pear-r2_pkg_postinst + elog 'This version includes a PHP 8 compatibilty patch for startHandler' + elog 'which removes the pass-by-reference off of $attribs (third parameter).' + elog 'This could break old scripts with recent versions until that override also' + elog 'removes the pass-by-reference.' +} diff --git a/dev-php/PEAR-XML_Parser/PEAR-XML_Parser-1.3.8.ebuild b/dev-php/PEAR-XML_Parser/PEAR-XML_Parser-1.3.8.ebuild deleted file mode 100644 index 0ed52ec9f9b8..000000000000 --- a/dev-php/PEAR-XML_Parser/PEAR-XML_Parser-1.3.8.ebuild +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit php-pear-r2 - -DESCRIPTION="XML parsing class based on PHP's SAX parser" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86" -IUSE="" - -src_test() { - peardev run-tests -r || die -} diff --git a/dev-php/PEAR-XML_Parser/files/XML_Parser-1.3.8-php8.patch b/dev-php/PEAR-XML_Parser/files/XML_Parser-1.3.8-php8.patch new file mode 100644 index 000000000000..8115fd8d7297 --- /dev/null +++ b/dev-php/PEAR-XML_Parser/files/XML_Parser-1.3.8-php8.patch @@ -0,0 +1,66 @@ +diff -aruN a/XML/Parser.php b/XML/Parser.php +--- a/XML/Parser.php 2022-01-10 11:32:08.624378884 -0500 ++++ b/XML/Parser.php 2022-01-10 11:47:09.581396869 -0500 +@@ -651,12 +651,12 @@ + * + * @param mixed $xp ?? + * @param mixed $elem ?? +- * @param mixed &$attribs ?? ++ * @param mixed $attribs ?? + * + * @return null + * @abstract + */ +- function startHandler($xp, $elem, &$attribs) ++ function startHandler($xp, $elem, $attribs) + { + return null; + } +diff -aruN a/tests/001.phpt b/tests/001.phpt +--- a/tests/001.phpt 2019-04-10 14:18:52.000000000 -0400 ++++ b/tests/001.phpt 2022-01-10 11:46:50.341458673 -0500 +@@ -13,10 +13,10 @@ + require_once "XML/Parser.php"; + + class __TestParser1 extends XML_Parser { +- function startHandler($xp, $element, &$attribs) { ++ function startHandler($xp, $element, $attribs) { + print "<$element"; + reset($attribs); +- while (list($key, $val) = each($attribs)) { ++ foreach ($attribs as $key => $val) { + $enc = htmlentities($val); + print " $key=\"$enc\""; + } +diff -aruN /tests/002.phpt /tests/002.phpt +--- a/tests/002.phpt 2019-04-10 14:18:52.000000000 -0400 ++++ b/tests/002.phpt 2022-01-10 11:46:58.281433169 -0500 +@@ -13,10 +13,10 @@ + require_once "XML/Parser.php"; + + class __TestParser2 extends XML_Parser { +- function startHandler($xp, $element, &$attribs) { ++ function startHandler($xp, $element, $attribs) { + print "<$element"; + reset($attribs); +- while (list($key, $val) = each($attribs)) { ++ foreach ($attribs as $key => $val) { + $enc = htmlentities($val); + print " $key=\"$enc\""; + } +diff -aruN /tests/003.phpt /tests/003.phpt +--- a/tests/003.phpt 2019-04-10 14:18:52.000000000 -0400 ++++ b/tests/003.phpt 2022-01-10 11:41:03.402573127 -0500 +@@ -13,10 +13,10 @@ + require_once "XML/Parser.php"; + + class __TestParser3 extends XML_Parser { +- function startHandler($xp, $element, &$attribs) { ++ function startHandler($xp, $element, $attribs) { + print "<$element"; + reset($attribs); +- while (list($key, $val) = each($attribs)) { ++ foreach ($attribs as $key => $val) { + $enc = htmlentities($val); + print " $key=\"$enc\""; + } diff --git a/dev-php/PEAR-XML_Parser/metadata.xml b/dev-php/PEAR-XML_Parser/metadata.xml index aca42932b833..6841fa89bee8 100644 --- a/dev-php/PEAR-XML_Parser/metadata.xml +++ b/dev-php/PEAR-XML_Parser/metadata.xml @@ -1,8 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> <name>PHP</name> </maintainer> +<stabilize-allarches/> </pkgmetadata> diff --git a/dev-php/PEAR-XML_RSS/Manifest b/dev-php/PEAR-XML_RSS/Manifest index cb7ff93ab91a..b7255163d08b 100644 --- a/dev-php/PEAR-XML_RSS/Manifest +++ b/dev-php/PEAR-XML_RSS/Manifest @@ -1,2 +1 @@ DIST XML_RSS-1.1.0.tgz 8178 BLAKE2B da290ea2e656372478435451b5043f3254e1a06423495c62c753b636208ece31e5b9aebe59a9b84254aac70d2088b4c35f78b763b6045d29c467ff0989bbc6fa SHA512 947b040ec71728328bad0130da874132c12e8c14a37f57b0ebc4e9db26aed49d0f9702e20ae401bd92782e1895de71dbd5daf09adebec0eaf268c77dfe183c24 -DIST XML_RSS-1.1.0a1.tgz 6717 BLAKE2B f38aaa6981d94668031272cd48f5648ce9fec499fde4627b6291d1a9c0dea4db72779e3ce7a089be9ee5d23ad56d05c6bd3ffce031b9ef3f4fac5360c3da4420 SHA512 e88c7618cad60a775c07ac26aedf05b7ce7ab3c9f012f3e638031b3567227db237ee2e1238fa051f9f415388a5d7c131af02b8200e08c01a9078654ea5877ce8 diff --git a/dev-php/PEAR-XML_RSS/PEAR-XML_RSS-1.1.0-r2.ebuild b/dev-php/PEAR-XML_RSS/PEAR-XML_RSS-1.1.0-r2.ebuild new file mode 100644 index 000000000000..f2afaad14a78 --- /dev/null +++ b/dev-php/PEAR-XML_RSS/PEAR-XML_RSS-1.1.0-r2.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit php-pear-r2 + +DESCRIPTION="PHP parser for RDF and RSS documents" +LICENSE="PHP-3.01" +SLOT="0" +KEYWORDS="amd64 arm ~hppa ppc ppc64 ~s390 sparc x86" +IUSE="test" +RESTRICT="!test? ( test )" + +RDEPEND=">=dev-php/PEAR-XML_Parser-1.3.8-r1" +BDEPEND="test? ( ${RDEPEND} dev-php/phpunit )" + +PATCHES=( "${FILESDIR}/XML_RSS-1.1.0-php8.patch" ) + +src_prepare() { + default + sed -i \ + -e 's/_Framework_/\\Framework\\/' \ + -e 's/_TextUI_/\\TextUI\\/' \ + tests/*.php +} + +src_test() { + phpunit --bootstrap "${S}/XML/RSS.php" \ + --cache-result-file="${T}/test-results.cache" tests || die +} diff --git a/dev-php/PEAR-XML_RSS/PEAR-XML_RSS-1.1.0.ebuild b/dev-php/PEAR-XML_RSS/PEAR-XML_RSS-1.1.0.ebuild deleted file mode 100644 index f564a5c6a962..000000000000 --- a/dev-php/PEAR-XML_RSS/PEAR-XML_RSS-1.1.0.ebuild +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit php-pear-r2 - -DESCRIPTION="PHP parser for RDF and RSS documents" -LICENSE="PHP-3.01" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86" -IUSE="" - -# Only needs PEAR_Exception (not in the tree), not all of PEAR. -# This can be made into an || dependency if we add PEAR_Exception. -RDEPEND=">=dev-php/PEAR-PEAR-1.10.1 - dev-php/PEAR-XML_Parser" diff --git a/dev-php/PEAR-XML_RSS/PEAR-XML_RSS-1.1.0_alpha1.ebuild b/dev-php/PEAR-XML_RSS/PEAR-XML_RSS-1.1.0_alpha1.ebuild deleted file mode 100644 index 482610a92823..000000000000 --- a/dev-php/PEAR-XML_RSS/PEAR-XML_RSS-1.1.0_alpha1.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -MY_PN="${PN/PEAR-/}" -MY_PV="${PV/_/}" -MY_PV="${MY_PV/alpha/a}" -MY_P="${MY_PN}-${MY_PV}" - -DESCRIPTION="PHP parser for RDF and RSS documents" -HOMEPAGE="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" -IUSE="" - -# Only needs PEAR_Exception (not in the tree), not all of PEAR. -# This can be made into an || dependency if we add PEAR_Exception. -RDEPEND="dev-lang/php:* - dev-php/PEAR-PEAR - dev-php/PEAR-XML_Parser" - -S="${WORKDIR}/${MY_P}" - -src_install() { - insinto /usr/share/php - doins -r XML -} diff --git a/dev-php/PEAR-XML_RSS/files/XML_RSS-1.1.0-php8.patch b/dev-php/PEAR-XML_RSS/files/XML_RSS-1.1.0-php8.patch new file mode 100644 index 000000000000..b78765cb80ea --- /dev/null +++ b/dev-php/PEAR-XML_RSS/files/XML_RSS-1.1.0-php8.patch @@ -0,0 +1,12 @@ +diff -aurN a/XML/RSS.php b/XML/RSS.php +--- a/XML/RSS.php 2017-03-07 14:16:38.000000000 -0500 ++++ b/XML/RSS.php 2022-01-11 09:09:34.745242886 -0500 +@@ -202,7 +202,7 @@ + * @return void + * @access private + */ +- function startHandler($parser, $element, &$attribs) ++ function startHandler($parser, $element, $attribs) + { + if (substr($element, 0, 4) == "RSS:") { + $element = substr($element, 4); diff --git a/dev-php/PEAR-XML_RSS/metadata.xml b/dev-php/PEAR-XML_RSS/metadata.xml index 8539c587325f..728e8459a9fe 100644 --- a/dev-php/PEAR-XML_RSS/metadata.xml +++ b/dev-php/PEAR-XML_RSS/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> @@ -9,4 +9,5 @@ <remote-id type="github">pear/XML_RSS</remote-id> <remote-id type="pear">XML_RSS</remote-id> </upstream> + <stabilize-allarches/> </pkgmetadata> 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 b0d0747acc6c..1ee1ada99738 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 @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="6" @@ -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="amd64 arm ~hppa ppc ppc64 ~s390 sparc x86" IUSE="examples test" RESTRICT="!test? ( test )" diff --git a/dev-php/PEAR-XML_Serializer/metadata.xml b/dev-php/PEAR-XML_Serializer/metadata.xml index 4954ffe101ae..2fd4163055d5 100644 --- a/dev-php/PEAR-XML_Serializer/metadata.xml +++ b/dev-php/PEAR-XML_Serializer/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> diff --git a/dev-php/PEAR-XML_Util/PEAR-XML_Util-1.4.5.ebuild b/dev-php/PEAR-XML_Util/PEAR-XML_Util-1.4.5.ebuild index ebef85243b86..52c96d38d4c3 100644 --- a/dev-php/PEAR-XML_Util/PEAR-XML_Util-1.4.5.ebuild +++ b/dev-php/PEAR-XML_Util/PEAR-XML_Util-1.4.5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -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 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/PEAR-XML_Util/metadata.xml b/dev-php/PEAR-XML_Util/metadata.xml index 4a974d8a4708..569d21508998 100644 --- a/dev-php/PEAR-XML_Util/metadata.xml +++ b/dev-php/PEAR-XML_Util/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> diff --git a/dev-php/PHPMailer/Manifest b/dev-php/PHPMailer/Manifest index de4c646f8b9a..0ca8829c661a 100644 --- a/dev-php/PHPMailer/Manifest +++ b/dev-php/PHPMailer/Manifest @@ -1,2 +1,2 @@ -DIST PHPMailer-6.4.1.tar.gz 98058 BLAKE2B 88b11e096be6a81591b2c68efb1fdc9a5ff0c384508939545c333f940a60949acb34db000ccd3ae9dbc4c5609f6d20006b7d08ad61bb96edf1d7f11b8091c236 SHA512 c702e53afec4a4c9cdb8757928883fcfd6ed5f2babc03466ca2a698e4e4535014407be5618e6dbcd69135f36f6f723fdee266f70fa6546563949d785f5db4f51 DIST PHPMailer-6.5.0.tar.gz 99073 BLAKE2B dcb917233da29ab45305f7cf0405f9bb384bd4f98f062a74d94a168868d0cd92017e555bf8e7139130dd669e0a04917e3789c548b5165112d591aa403bfd56b8 SHA512 0632ec8b80c30393b00aebbadde7dd032eb2553232a100a74d69b6ed6465adf1eb3a4acca0aaf040665a978e7507aee9350b092336056ccb5306fbaea4640376 +DIST PHPMailer-6.6.4.tar.gz 102883 BLAKE2B d05eca221b3058e6632ab47c3d93d5f5cc76333351c75af537642a7850c5fb77c825e53a77321e4a63d7b06e41afb468e4dd5fe2f9b5f045ae8ed6f8543ef2ac SHA512 94ef038b59f8cf840205993d994070228a4237a19c153a0a9486e68a0289468cd882b2450482bdafb15f163c526c723dff3903919de872c6888b49273b718e87 diff --git a/dev-php/PHPMailer/PHPMailer-6.4.1.ebuild b/dev-php/PHPMailer/PHPMailer-6.6.4.ebuild index 48dc349297f3..ec7c08d4385e 100644 --- a/dev-php/PHPMailer/PHPMailer-6.4.1.ebuild +++ b/dev-php/PHPMailer/PHPMailer-6.6.4.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 DESCRIPTION="Full-featured email creation and transfer class for PHP" HOMEPAGE="https://github.com/PHPMailer/PHPMailer" @@ -13,7 +13,7 @@ KEYWORDS="~amd64 ~x86" # To help out the Composer children, the tests and examples are missing # from the release tarballs. -IUSE="doc idn ssl" +IUSE="idn ssl" # The ctype and filter extensions get used unconditionally, with no # fallback and no "extension missing" exception. All of the other @@ -33,28 +33,6 @@ RDEPEND=" idn? ( dev-lang/php:*[ctype,filter,intl,unicode] ) !idn? ( dev-lang/php:*[ctype,filter] ) )" -BDEPEND="doc? ( dev-php/phpDocumentor )" - -src_prepare() { - default - - # OAuth.php relies on a (now non-nonexistent) autoloader. We remove - # it early so that we don't generate documentation for it later on. - rm src/OAuth.php || die 'failed to remove src/OAuth.php' -} - -src_compile() { - if use doc; then - phpdoc --filename="src/*.php" \ - --target="./html" \ - --cache-folder="${T}" \ - --title="${PN}" \ - --sourcecode \ - --force \ - --progressbar \ - || die "failed to generate API documentation" - fi -} src_install() { # The PHPMailer class loads its language files @@ -63,7 +41,6 @@ src_install() { doins -r language src dodoc README.md SECURITY.md - use doc && dodoc -r html/* } pkg_postinst() { diff --git a/dev-php/PHPMailer/metadata.xml b/dev-php/PHPMailer/metadata.xml index a670ac4443f8..5b9df5c68615 100644 --- a/dev-php/PHPMailer/metadata.xml +++ b/dev-php/PHPMailer/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>mjo@gentoo.org</email> diff --git a/dev-php/PHP_CodeCoverage/Manifest b/dev-php/PHP_CodeCoverage/Manifest deleted file mode 100644 index c948a9548c59..000000000000 --- a/dev-php/PHP_CodeCoverage/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -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-7.0.10-r1.ebuild b/dev-php/PHP_CodeCoverage/PHP_CodeCoverage-7.0.10-r1.ebuild deleted file mode 100644 index ea217df911c2..000000000000 --- a/dev-php/PHP_CodeCoverage/PHP_CodeCoverage-7.0.10-r1.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# 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" -MY_PN="php-code-coverage" - -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" - -S="${WORKDIR}/${MY_PN}-${PV}" - -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_TokenStream-3.1.1 - <dev-php/PHP_TokenStream-4.0 - >=dev-php/sebastian-environment-4.2.2 - <dev-php/sebastian-environment-5.0 - >=dev-php/sebastian-version-2.0.1 - <dev-php/sebastian-version-3.0 - dev-php/sebastian-code-unit-reverse-lookup - <dev-php/sebastian-code-unit-reverse-lookup-2.0 - >=dev-php/theseer-tokenizer-1.1.3 - <dev-php/theseer-tokenizer-2.0 - || ( - dev-lang/php:7.2[xml(-),xmlwriter(-)] - dev-lang/php:7.3[xml(-),xmlwriter(-)] - dev-lang/php:7.4[xml(-),xmlwriter(-)] - )" -BDEPEND="test? ( ${RDEPEND} dev-php/phpunit )" -# Test currently do not work. Cannot find TestCase.php -RESTRICT="test" - -src_install() { - insinto /usr/share/php/PHP/CodeCoverage - doins -r src/* - newins "${FILESDIR}/autoload-7.0.10.php" autoload.php -} - -src_test() { - mkdir vendor || die - cp "${FILESDIR}/autoload-7.0.10.php" vendor/autoload.php || die - sed -i 's~__DIR__~__DIR__."/../src"~' vendor/autoload.php || die - ln -s ../tests/TestCase.php src/TestCase.php || die - for target in ${USE_PHP//-/.} ; do - if [ -x /usr/bin/$target ] ; then - ${target} /usr/bin/phpunit -c phpunit.xml || die - fi - done - rm src/TestCase.php || die -} - -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/PHP_CodeCoverage-7.0.12.ebuild b/dev-php/PHP_CodeCoverage/PHP_CodeCoverage-7.0.12.ebuild deleted file mode 100644 index b4f5f302ad17..000000000000 --- a/dev-php/PHP_CodeCoverage/PHP_CodeCoverage-7.0.12.ebuild +++ /dev/null @@ -1,106 +0,0 @@ -# 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/files/autoload-7.0.10.php b/dev-php/PHP_CodeCoverage/files/autoload-7.0.10.php deleted file mode 100644 index 5d67fe9248a5..000000000000 --- a/dev-php/PHP_CodeCoverage/files/autoload-7.0.10.php +++ /dev/null @@ -1,17 +0,0 @@ -<?php -/* Autoloader for dev-php/PHP_CodeCoverage */ - -if (!class_exists('Fedora\\Autoloader\\Autoload', false)) { - require_once '/usr/share/php/Fedora/Autoloader/autoload.php'; -} - -\Fedora\Autoloader\Autoload::addPsr4('SebastianBergmann\\CodeCoverage\\', __DIR__); - -\Fedora\Autoloader\Dependencies::required(array( - '/usr/share/php/File/Iterator/autoload.php', - '/usr/share/php/PHP/Token/autoload.php', - '/usr/share/php/SebastianBergmann/Version/autoload.php', - '/usr/share/php/SebastianBergmann/Environment/autoload.php', - '/usr/share/php/SebastianBergmann/CodeUnitReverseLookup/autoload.php', - '/usr/share/php/Text/Template/autoload.php', -)); diff --git a/dev-php/PHP_CodeCoverage/metadata.xml b/dev-php/PHP_CodeCoverage/metadata.xml deleted file mode 100644 index e257fd4519cc..000000000000 --- a/dev-php/PHP_CodeCoverage/metadata.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?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">sebastianbergmann/php-code-coverage</remote-id> - </upstream> -</pkgmetadata> diff --git a/dev-php/PHP_CodeSniffer/Manifest b/dev-php/PHP_CodeSniffer/Manifest index 43cfbe9df06a..b999f67fb969 100644 --- a/dev-php/PHP_CodeSniffer/Manifest +++ b/dev-php/PHP_CodeSniffer/Manifest @@ -2,3 +2,4 @@ DIST PHP_CodeSniffer-3.5.4.tgz 697668 BLAKE2B f5915bcb73c0db0d8dcab3eda5ab647268 DIST PHP_CodeSniffer-3.5.6.tgz 706080 BLAKE2B 1d9d097e7c60f520973a0dff16e6b31c9e259599ded3f58ac6dda2f10419969b03c18d1ce7c38f19a0f3474b0d5cf4afc5abb889f820da0d5d9e8f0574a0a354 SHA512 392c162cc8cb8d8fe455990d7f358cc59f486d8083387dc3bf60af6ca7aa0e75b72ed337f624b08948d8060cc96bd2d03373b7508fb9179da6a4e6b83adf06a7 DIST PHP_CodeSniffer-3.5.8.tgz 716472 BLAKE2B e56efedc07a9db63eb2f135d9fef69bf055cef09c23dd9cd1e0efeed865d559b428e9aec06393b1ec1f58d32add92b2773c3d9ce33377f2441de0145560045a8 SHA512 69ef3d86520f541f492c955bd8158664c78aac6ecd4550f2b996f59d882d91f1bec81da9bbd106edc35c4f1a4c260ef2d9a56ec257fc0b4044047b902403065e DIST PHP_CodeSniffer-3.6.0.tgz 762998 BLAKE2B f83626a2a64dbb5c7ae2545368f1efdf74d87630720efe7466d9adfd6591cbcc95f2b74a17f54a935377519c6d909ba17f4056fff6d8f3870cefe782f32675dd SHA512 09c98ac460c6dc70637d2f4d81a1e46bdf742ee14d0b56032e8dbcaf7a0ff03f3fdb1abdf8144f664a33298cf397c732ba62027bcee41f1f4f740d12fa29f6a8 +DIST PHP_CodeSniffer-3.6.1.tgz 773181 BLAKE2B a85a0008fe9788bb48723fdd6a62d646a70bb342099693299def9320ca12971c48d8bc698e001f3249e8bb94963735c57529fe2d3101d53ded5ffd0946e07d4f SHA512 4992a460494cf58e5731e10df216204842168465731c0d002b7913fbaa85370f01077f70c96b4390158fbcf52ee021650ab6f13609ea3133370b89f34c73343c diff --git a/dev-php/PHP_CodeSniffer/PHP_CodeSniffer-3.6.1.ebuild b/dev-php/PHP_CodeSniffer/PHP_CodeSniffer-3.6.1.ebuild new file mode 100644 index 000000000000..f15c9ff98ca6 --- /dev/null +++ b/dev-php/PHP_CodeSniffer/PHP_CodeSniffer-3.6.1.ebuild @@ -0,0 +1,55 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="Detect violations of PHP code standards" +HOMEPAGE="https://github.com/squizlabs/PHP_CodeSniffer" + +# The test suite isn't part of the Github tarball at the moment. Keep an +# eye on https://github.com/squizlabs/PHP_CodeSniffer/issues/548 +SRC_URI="http://download.pear.php.net/package/${P}.tgz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="test" +RESTRICT="!test? ( test )" + +RDEPEND="dev-lang/php:*[cli(-),tokenizer(-),xmlwriter(-)]" +DEPEND="test? ( + ${RDEPEND} + <dev-php/phpunit-6 + )" + +DOCS=( CONTRIBUTING.md README.md ) + +src_prepare() { + sed -i "s~@data_dir@~${EPREFIX}/usr/share/php/data~" src/Config.php || die + default +} + +src_test() { + # The test suite will fail if date.timezone isn't set in php.ini. + phpunit -d date.timezone=UTC tests/AllTests.php \ + || die "test suite failed" +} + +src_install() { + local MY_PN="PHP/CodeSniffer" script + # The PEAR eclass would install everything into the wrong location. + insinto "/usr/share/php/${MY_PN}" + doins -r src autoload.php + + insinto "/usr/share/php/data/${MY_PN}" + doins CodeSniffer.conf.dist + # These load code via relative paths, so they have to be symlinked + # and not dobin'd. + exeinto "/usr/share/php/${MY_PN}/bin" + for script in phpcbf phpcs; do + doexe "bin/${script}" + dosym "../share/php/${MY_PN}/bin/${script}" "/usr/bin/${script}" + done + + einstalldocs +} diff --git a/dev-php/PHP_CodeSniffer/metadata.xml b/dev-php/PHP_CodeSniffer/metadata.xml index 2cc51883b469..ac54412ed8d6 100644 --- a/dev-php/PHP_CodeSniffer/metadata.xml +++ b/dev-php/PHP_CodeSniffer/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> diff --git a/dev-php/PHP_Timer/Manifest b/dev-php/PHP_Timer/Manifest index d99a7462f4c6..29415f02a66d 100644 --- a/dev-php/PHP_Timer/Manifest +++ b/dev-php/PHP_Timer/Manifest @@ -1,3 +1,2 @@ -DIST PHP_Timer-1.0.5.tgz 3597 BLAKE2B cf82c3ff61a1f96a94a5d3743270be3262bc2ea28d7d71cd1c93a07c7bec950597c4da5d6dd23e4b58b8aad7c2e3bdb7aea07d761ef096e898088ca2296b43cf SHA512 da030dec608d1f8d447da6ce40e995ca818064e3a4b2f2eca1819a77a12875843a25bba1ffd253043ef3ac62a6dc1a16c5e7ba9b792b99b54d0713090478be84 -DIST PHP_Timer-1.0.9.tar.gz 3740 BLAKE2B d551fd676046e6bb653fb9a9bde7a976b9b2081d26caee23177b899fa01e11ae1fb2183234ab43745798c058222574b1523064cc07d25485315eef9090f892a5 SHA512 96db90cf2af18fabcf44bdd4dbb5d298402ed2c8e49f3033fd1b89b3aa8c880d9f8677897d4d542a0db6348bdd9c697042deb0b6e26242adebfde1bcdb4bc559 DIST PHP_Timer-2.1.2.tar.gz 7090 BLAKE2B c99dd69433b3579e9ed81f06188cac280b6ac383bce12acd9c6a00b5a6d6017a94c427692b639ad1516c1faebec8e160b7cd5c7e5e96043dd3dcb6d283d2095b SHA512 199175e048560756867180cd99a3ca1766431d14091f1448cd8011df5f7824504a6c586ef15d9e53374bdb9dbd1731c05b44509e59d92d725908ec2c46d7d576 +DIST PHP_Timer-5.0.3.tar.gz 5363 BLAKE2B b63d438eab1dd5d872a1a632f1861d216dbdd7ab073a8fa36bad7f93134fd0c98ef7eb049189aeb6373b60eba592cc5add0044ac577d0b9728f3f78156dae914 SHA512 e1642cd0d247a49981f142b6975339c4abaf26cf4847783f309a0a15ba7a55520c7d1e11a87ea9b923337a9972f4dc95ee11121484a75c9c7a20882f664e8ba5 diff --git a/dev-php/PHP_Timer/PHP_Timer-1.0.5.ebuild b/dev-php/PHP_Timer/PHP_Timer-1.0.5.ebuild deleted file mode 100644 index 6e31e37ca148..000000000000 --- a/dev-php/PHP_Timer/PHP_Timer-1.0.5.ebuild +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PHP_PEAR_CHANNEL="${FILESDIR}/channel.xml" -PHP_PEAR_DOMAIN="pear.phpunit.de" -PHP_PEAR_PKG_NAME="PHP_Timer" - -inherit php-pear-r2 - -DESCRIPTION="Utility class for timing" -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 ~hppa x86" -IUSE="" -HOMEPAGE="http://pear.phpunit.de/" -SRC_URI="http://${PHP_PEAR_URI}/get/${PEAR_P}.tgz" diff --git a/dev-php/PHP_Timer/PHP_Timer-2.1.2-r1.ebuild b/dev-php/PHP_Timer/PHP_Timer-2.1.2-r1.ebuild index 5ce35bafda96..d3658cbe57e6 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-2021 Gentoo Authors +# Copyright 1999-2023 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="amd64 arm ~hppa ppc ppc64 ~s390 sparc x86" IUSE="" S="${WORKDIR}/${MY_PN}-${PV}" diff --git a/dev-php/PHP_Timer/PHP_Timer-1.0.9.ebuild b/dev-php/PHP_Timer/PHP_Timer-5.0.3.ebuild index 584ae19d7a7f..b5dffe98df99 100644 --- a/dev-php/PHP_Timer/PHP_Timer-1.0.9.ebuild +++ b/dev-php/PHP_Timer/PHP_Timer-5.0.3.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 MY_PN="php-timer" @@ -11,18 +11,18 @@ 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="~amd64 ~arm ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86" IUSE="" S="${WORKDIR}/${MY_PN}-${PV}" RDEPEND="dev-php/fedora-autoloader - >=dev-lang/php-5.6:*" + >=dev-lang/php-7.3:*" src_install() { insinto /usr/share/php/PHP/Timer - doins -r src/Timer.php - doins "${FILESDIR}/autoload.php" + doins -r src/* + newins "${FILESDIR}/autoload-5.0.3.php" autoload.php } pkg_postinst() { diff --git a/dev-php/PHP_Timer/files/autoload-5.0.3.php b/dev-php/PHP_Timer/files/autoload-5.0.3.php new file mode 100644 index 000000000000..45b65b6045e8 --- /dev/null +++ b/dev-php/PHP_Timer/files/autoload-5.0.3.php @@ -0,0 +1,18 @@ +<?php +/* Autoloader for dev-php/PHP_Timer */ + +if (!class_exists('Fedora\\Autoloader\\Autoload', false)) { + require_once '/usr/share/php/Fedora/Autoloader/autoload.php'; +} + +\Fedora\Autoloader\Autoload::addClassMap( + [ + 'sebastianbergmann\timer\duration' => '/Duration.php', + 'sebastianbergmann\timer\exception' => '/exceptions/Exception.php', + 'sebastianbergmann\timer\noactivetimerexception' => '/exceptions/NoActiveTimerException.php', + 'sebastianbergmann\timer\resourceusageformatter' => '/ResourceUsageFormatter.php', + 'sebastianbergmann\timer\timer' => '/Timer.php', + 'sebastianbergmann\timer\timesincestartofrequestnotavailableexception' => '/exceptions/TimeSinceStartOfRequestNotAvailableException.php', + ], + __DIR__ +); diff --git a/dev-php/PHP_Timer/files/autoload.php b/dev-php/PHP_Timer/files/autoload.php deleted file mode 100644 index bb0974e087d6..000000000000 --- a/dev-php/PHP_Timer/files/autoload.php +++ /dev/null @@ -1,13 +0,0 @@ -<?php -/* Autoloader for dev-php/PHP_Timer */ - -if (!class_exists('Fedora\\Autoloader\\Autoload', false)) { - require_once '/usr/share/php/Fedora/Autoloader/autoload.php'; -} - -\Fedora\Autoloader\Autoload::addClassMap( - array( - 'php_timer' => '/Timer.php', - ), - __DIR__ -); diff --git a/dev-php/PHP_Timer/files/channel.xml b/dev-php/PHP_Timer/files/channel.xml deleted file mode 100644 index 91bb6786f543..000000000000 --- a/dev-php/PHP_Timer/files/channel.xml +++ /dev/null @@ -1,16 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" ?> -<channel version="1.0" xmlns="http://pear.php.net/channel-1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://pear.php.net/channel-1.0 http://pear.php.net/dtd/channel-1.0.xsd"> - <name>pear.phpunit.de</name> - <summary>PHPUnit PEAR Channel</summary> - <suggestedalias>phpunit</suggestedalias> - <servers> - <primary> - <rest> - <baseurl type="REST1.0">http://pear.phpunit.de/rest/</baseurl> - <baseurl type="REST1.1">http://pear.phpunit.de/rest/</baseurl> - <baseurl type="REST1.2">http://pear.phpunit.de/rest/</baseurl> - <baseurl type="REST1.3">http://pear.phpunit.de/rest/</baseurl> - </rest> - </primary> - </servers> -</channel>
\ No newline at end of file diff --git a/dev-php/PHP_Timer/metadata.xml b/dev-php/PHP_Timer/metadata.xml index 92e5cab77515..6a8916ce0954 100644 --- a/dev-php/PHP_Timer/metadata.xml +++ b/dev-php/PHP_Timer/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> diff --git a/dev-php/PHP_TokenStream/Manifest b/dev-php/PHP_TokenStream/Manifest deleted file mode 100644 index 7dac5c3741ca..000000000000 --- a/dev-php/PHP_TokenStream/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST PHP_TokenStream-3.1.1.tar.gz 14275 BLAKE2B 5300768f79cba17a08f55a58a05744eef55df00fc0f0144612bddd3ba5d0494fe19bd5b74d56b57d345f5d98b63033aa05e6d157c0979be163e51dc7cc5ad19f SHA512 3a1e36d13b8d77d6fe7d1617fc43a8d59b68af6ee6182afdecf5c970c844f7cb63f3056ce7f6aaae17237b948c5ff9862438d823c2eda179e24c1bb4fc4f4e02 diff --git a/dev-php/PHP_TokenStream/PHP_TokenStream-3.1.1.ebuild b/dev-php/PHP_TokenStream/PHP_TokenStream-3.1.1.ebuild deleted file mode 100644 index 8988b643ece8..000000000000 --- a/dev-php/PHP_TokenStream/PHP_TokenStream-3.1.1.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -USE_PHP="php7-2 php7-3 php7-4" -MY_PN="php-token-stream" - -DESCRIPTION="Wrapper around PHP's tokenizer extension" -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" - -S="${WORKDIR}/${MY_PN}-${PV}" - -RDEPEND="dev-php/fedora-autoloader - || ( - dev-lang/php:7.2[tokenizer(-)] - dev-lang/php:7.3[tokenizer(-)] - dev-lang/php:7.4[tokenizer(-)] - )" -BDEPEND="test? ( ${RDEPEND} dev-php/phpunit )" -RESTRICT="!test? ( test )" - -src_prepare() { - sed -i -e 's/setUp()/setUp():void/' tests/Token/*.php || die - default -} - -src_install() { - insinto /usr/share/php/PHP/Token - doins -r src/* - newins "${FILESDIR}/autoload-3.1.1.php" autoload.php -} - -src_test() { - mkdir vendor || die - cp "${FILESDIR}/autoload-3.1.1.php" vendor/autoload.php || die - sed -i 's~__DIR__~__DIR__."/../src"~' vendor/autoload.php || die - for target in ${USE_PHP//-/.} ; do - if [ -x /usr/bin/$target ] ; then - ${target} /usr/bin/phpunit -c phpunit.xml || die - fi - done -} - -pkg_postinst() { - ewarn "This library now loads via /usr/share/php/PHP/Token/autoload.php" - ewarn "Please update any scripts to require the autoloader" -} diff --git a/dev-php/PHP_TokenStream/files/autoload-3.1.1.php b/dev-php/PHP_TokenStream/files/autoload-3.1.1.php deleted file mode 100644 index 4e385c87ec24..000000000000 --- a/dev-php/PHP_TokenStream/files/autoload-3.1.1.php +++ /dev/null @@ -1,47 +0,0 @@ -<?php -/* Autoloader for dev-php/PHP_TokenStream */ - -if (!class_exists('Fedora\\Autoloader\\Autoload', false)) { - require_once '/usr/share/php/Fedora/Autoloader/autoload.php'; -} - -\Fedora\Autoloader\Autoload::addClassMap( - [ - 'php_token' => '/Token.php', - 'php_tokenwithscope' => '/Token.php', - 'php_tokenwithscopeandvisibility' => '/Token.php', - 'php_token_open_tag' => '/Token.php', - 'php_token_util' => '/Token/Util.php', - 'php_token_stream' => '/Token/Stream.php', - 'php_token_stream_cachingfactory' => '/Token/Stream/CachingFactory.php', - ], - __DIR__ -); -$_gentooFedAutoload = function() { -$_fedAutoLoadtokens = []; -$_fedAutoLoadtokenSubClasses = ['includes','function','interface','abstract','ampersand','and_equal', -'array','array_cast','as','at','backtick','bad_character','boolean_and','boolean_or','boolean_cast', -'break','caret','case','catch','character','class','class_c','class_name_constant','clone','close_bracket', -'close_curly','close_square','close_tag','colon','comma','comment','concat_equal','const','constant_encapsed_string', -'continue','curly_open','dec','declare','default','div','div_equal','dnumber','do','doc_comment','dollar', -'dollar_open_curly_braces','dot','double_arrow','double_cast','double_colon','double_quotes','echo','else', -'elseif','empty','encapsed_and_whitespace','enddeclare','endfor','endforeach','endif','endswitch','endwhile', -'end_heredoc','equal','eval','exclamation_mark','exit','extends','file','final','for','foreach','func_c','global', -'gt','if','implements','inc','include','include_once','inline_html','instanceof','int_cast','isset','is_equal', -'is_greater_or_equal','is_identical','is_not_equal','is_not_identical','is_smaller_or_equal','line','list', -'lnumber','logical_and','logical_or','logical_xor','lt','method_c','minus','minus_equal','mod_equal','mult', -'mult_equal','new','num_string','object_cast','object_operator','open_bracket','open_curly','open_square', -'open_tag','open_tag_with_echo','or_equal','paamayim_nekudotayim','percent','pipe','plus','plus_equal','print', -'private','protected','public','question_mark','require','require_once','return','semicolon','sl','sl_equal', -'sr','sr_equal','start_heredoc','static','string','string_cast','string_varname','switch','throw','tilde', -'try','unset','unset_cast','use','use_function','var','variable','while','whitespace','xor_equal','halt_compiler', -'dir','goto','namespace','ns_c','ns_separator','callable','insteadof','trait','trait_c','finally','yield', -'ellipsis','pow','pow_equal','coalesce','spaceship','yield_from','coalesce_equal','fn' -]; -foreach($_fedAutoLoadtokenSubClasses as $_fedAutoLoadi) - $_fedAutoLoadtokens["php_token_{$_fedAutoLoadi}"] = '/Token.php'; -\Fedora\Autoloader\Autoload::addClassMap($_fedAutoLoadtokens, __DIR__); -}; -$_gentooFedAutoload(); -unset ($_gentooFedAutoload); - diff --git a/dev-php/PHP_TokenStream/metadata.xml b/dev-php/PHP_TokenStream/metadata.xml deleted file mode 100644 index c227741f682a..000000000000 --- a/dev-php/PHP_TokenStream/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>php-bugs@gentoo.org</email> - <name>PHP</name> - </maintainer> - <upstream> - <remote-id type="github">sebastianbergmann/php-token-stream</remote-id> - </upstream> -</pkgmetadata> diff --git a/dev-php/SabreAMF/metadata.xml b/dev-php/SabreAMF/metadata.xml index 77ac9767605d..c3a2620ec7ae 100644 --- a/dev-php/SabreAMF/metadata.xml +++ b/dev-php/SabreAMF/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> diff --git a/dev-php/Text_Template/Manifest b/dev-php/Text_Template/Manifest index 5559be549989..554e7fb82f7b 100644 --- a/dev-php/Text_Template/Manifest +++ b/dev-php/Text_Template/Manifest @@ -1,2 +1,2 @@ -DIST Text_Template-1.1.1.tgz 3444 BLAKE2B 7b063aefa5d1cd8b8faf4f68c12552a50eac8d2bb0007ccde632c88325974c32734cbd76d922e0132acdf9e6cb157eb229bf7edcf2697d7f1cfc789b3f33529e SHA512 0eaf43ab8c0810f63d81ddaf62a5e81b2e244161fe79fe09bec05ef732ee07012a1c6c3711885a118cf38334131c57ac1d326e0a711eb3e6d3099c5475f80e7f DIST Text_Template-1.2.1.tar.gz 2561 BLAKE2B 24871781f622fbd35cc0f524a092eaed2de0988137a52f05a559e89bcdc9248807a677b164f5ef9a246848709d3bd3ae0c4cd5e738fe6cd42ff0a2ea8aba577c SHA512 d8277f24782d0897b26d2e4922c2658047c484cb86f477916d6ad6dad3e5150bfa0a1ad38c79463a3fde97702bc65edb207a481b6f6cd8346c5fcc33b4cff8ca +DIST Text_Template-2.0.4.tar.gz 3391 BLAKE2B 717547f81637272194cd93e881b51cf49f95aa4f9768cd836ad1867c5ede06991da91dc0915575c53eb0cf8a26f72cf9c2e77be4ffb755fd8d608df14e713820 SHA512 84a6b64f2ba8b89a461a44dd85b3706e210ca1bda90e7bb290ef9bd3c975378c114a44ab8442fc98994473df87d6d7e0d1a70f63878f815d3709224447a032d1 diff --git a/dev-php/Text_Template/Text_Template-1.1.1.ebuild b/dev-php/Text_Template/Text_Template-1.1.1.ebuild deleted file mode 100644 index cd6dc26dbfbd..000000000000 --- a/dev-php/Text_Template/Text_Template-1.1.1.ebuild +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PHP_PEAR_CHANNEL="${FILESDIR}/channel.xml" -PHP_PEAR_DOMAIN="pear.phpunit.de" -PHP_PEAR_PKG_NAME="Text_Template" - -inherit php-pear-r2 - -HOMEPAGE="http://pear.phpunit.de" -SRC_URI="http://${PHP_PEAR_URI}/get/${PEAR_P}.tgz" -DESCRIPTION="Simple template engine" -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 ~hppa x86" -IUSE="" - -DEPEND=">=dev-php/pear-1.9.4" -DOCS=( README.markdown ChangeLog.markdown ) diff --git a/dev-php/Text_Template/Text_Template-1.2.1.ebuild b/dev-php/Text_Template/Text_Template-1.2.1.ebuild index b54b1c849b39..3690b0157e44 100644 --- a/dev-php/Text_Template/Text_Template-1.2.1.ebuild +++ b/dev-php/Text_Template/Text_Template-1.2.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -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="amd64 arm ~hppa ppc ppc64 ~s390 sparc x86" IUSE="" S="${WORKDIR}/${MY_PN}-${PV}" diff --git a/dev-php/Text_Template/Text_Template-2.0.4.ebuild b/dev-php/Text_Template/Text_Template-2.0.4.ebuild new file mode 100644 index 000000000000..e3f1b1c85e5b --- /dev/null +++ b/dev-php/Text_Template/Text_Template-2.0.4.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MY_PN="php-text-template" + +DESCRIPTION="A simple template engine" +HOMEPAGE="https://phpunit.de" +SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 arm ~hppa ppc ppc64 ~s390 sparc x86" +IUSE="" + +S="${WORKDIR}/${MY_PN}-${PV}" + +RDEPEND="dev-php/fedora-autoloader + >=dev-lang/php-7.3:*" + +src_install() { + insinto /usr/share/php/Text/Template + doins -r src/* + newins "${FILESDIR}/autoload-2.0.4.php" autoload.php +} + +pkg_postinst() { + ewarn "This library now loads via /usr/share/php/Text/Template/autoload.php" + ewarn "Please update any scripts to require the autoloader" +} diff --git a/dev-php/Text_Template/files/autoload-2.0.4.php b/dev-php/Text_Template/files/autoload-2.0.4.php new file mode 100644 index 000000000000..3ca8a33da12e --- /dev/null +++ b/dev-php/Text_Template/files/autoload-2.0.4.php @@ -0,0 +1,16 @@ +<?php +/* Autoloader for dev-php/Text_Template */ + +if (!class_exists('Fedora\\Autoloader\\Autoload', false)) { + require_once '/usr/share/php/Fedora/Autoloader/autoload.php'; +} + +\Fedora\Autoloader\Autoload::addClassMap( + array( + 'sebastianbergmann\\template' => '/Template.php', + 'sebastianbergmann\\template\\exception' => '/exceptions/Exception.php', + 'sebastianbergmann\\template\\invalidargumentexception' => '/exceptions/InvalidArgumentException.php', + 'sebastianbergmann\\template\\runtimeexception' => '/exceptions/RuntimeException.php', + ), + __DIR__ +); diff --git a/dev-php/Text_Template/files/channel.xml b/dev-php/Text_Template/files/channel.xml deleted file mode 100644 index 91bb6786f543..000000000000 --- a/dev-php/Text_Template/files/channel.xml +++ /dev/null @@ -1,16 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" ?> -<channel version="1.0" xmlns="http://pear.php.net/channel-1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://pear.php.net/channel-1.0 http://pear.php.net/dtd/channel-1.0.xsd"> - <name>pear.phpunit.de</name> - <summary>PHPUnit PEAR Channel</summary> - <suggestedalias>phpunit</suggestedalias> - <servers> - <primary> - <rest> - <baseurl type="REST1.0">http://pear.phpunit.de/rest/</baseurl> - <baseurl type="REST1.1">http://pear.phpunit.de/rest/</baseurl> - <baseurl type="REST1.2">http://pear.phpunit.de/rest/</baseurl> - <baseurl type="REST1.3">http://pear.phpunit.de/rest/</baseurl> - </rest> - </primary> - </servers> -</channel>
\ No newline at end of file diff --git a/dev-php/Text_Template/metadata.xml b/dev-php/Text_Template/metadata.xml index 601a1f87ce47..37b21fe7db8e 100644 --- a/dev-php/Text_Template/metadata.xml +++ b/dev-php/Text_Template/metadata.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> <name>PHP</name> </maintainer> + <stabilize-allarches/> <upstream> <remote-id type="github">sebastianbergmann/php-text-template</remote-id> </upstream> diff --git a/dev-php/YAML/metadata.xml b/dev-php/YAML/metadata.xml index 034baa38a6ed..ad845d99d581 100644 --- a/dev-php/YAML/metadata.xml +++ b/dev-php/YAML/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> diff --git a/dev-php/adodb/Manifest b/dev-php/adodb/Manifest index c55bc9321fb1..3bfbc96143ef 100644 --- a/dev-php/adodb/Manifest +++ b/dev-php/adodb/Manifest @@ -1,4 +1,2 @@ -DIST adodb-5.20.14.tar.gz 465896 BLAKE2B acd8494141584b0c02c2e30aa59b3916ae811b8095ca724d22f44ed2cb1456b8e8afc7ff9af41e7476f4a93809e762c44a175fd3775b69654107813342b3a47a SHA512 fa9b764742f3edf15e79da7a34ca52b19f51454fa20bc963cce963cdd40f7e78671e993cd672a21e9917aa2440c63601fbf768b5259dccb64b458a5be6f4b0eb -DIST adodb-5.20.18.tar.gz 467003 BLAKE2B ea0b007359a4fdada0fface3d5af82c335f2e7efeacdbb66be37914d76bff2783b58b2318531c527d13c3c358800803385c660c8f9372cf4a49269ed7e0c7d51 SHA512 09b04987e20a674a202be3889523b3bada578ea01f07830fed15afafb046687004b4e305a6abf2af795a7b0e3563f6e8afec5b0189f21e5c74b5e84bfbee1cd9 -DIST adodb-5.20.20.tar.gz 469337 BLAKE2B cffe367e498978b095e28bab565c8af7e02769e4c76977fae7d807c6326d9b4679e319fa84debc9b250d0548e7dcac2e078b4968160490831e2390ce86fbe229 SHA512 2578a594bf9f1b33b5a78bd3e52b9fb73d0457b021a2bca6b5f8d311c0ecb347968a928a1dabd2c8806972dda6ec535fec94d6f792b6f5398aeff587321e5113 -DIST adodb-5.21.0.tar.gz 437724 BLAKE2B addd14c45ec3e1a3fcda63065ccbf06a6627fcf498a3aecc609c7763627915904c241bcb2db1c3aa31ba228b35d788885fd09311e2353f7490e31cee070f607e SHA512 305b5395e4d47d86bbb689818fee44a2b970d081e9ab527f7d0b010b5ae1159eac32c125d5b303569afa2a4360e160c37e17ff7c5adb7566175f9f131393643c +DIST adodb-5.22.2.tar.gz 443988 BLAKE2B 1166c7b53a5ff39afe8d0a77cf56d2682e7f68d8f52f12ed9bf2519f4a15c626e26b590c7df3066f65bf6bbb7458be502d5a9e9b1ed2663286c51761fd58784c SHA512 50c2784f92e9ac372b34ed32d41efe82341dad09f269603359c50a30c9c301b7e65b2dfa75ae02cc7f12437ef57d8a9575e5a36e68d5b6e225fa1073ead3e339 +DIST adodb-5.22.7.tar.gz 447580 BLAKE2B 1d8e6518155585f7e82f697e463832c4d798dce0bc59fb4a068aef7430945fe7cbfb7112b150f36fc91fb9555189276032da420bec68a71c6438c1d513dd3594 SHA512 731e5def40699bc445b9ef44585b7db6f890d977aaafaac58ea1fcfadd9d89d00871a279549f6e8ff683fe56f7061d78cdc2457e99ed0636a8497cae44bddc99 diff --git a/dev-php/adodb/adodb-5.20.14.ebuild b/dev-php/adodb/adodb-5.20.14.ebuild deleted file mode 100644 index e7a970d073ef..000000000000 --- a/dev-php/adodb/adodb-5.20.14.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -MY_PN="ADOdb" -DESCRIPTION="Database abstraction layer for PHP" -HOMEPAGE="https://github.com/ADOdb" -SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD LGPL-2.1+" -SLOT="0" -KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 sparc x86" -IUSE="" - -# If you want to be picky, we should require that PHP be built with at -# least one database driver enabled; otherwise adodb isn't going to be -# able to do anything. But, the database USE flags for dev-lang/php are -# a mess. What we would *like* to do is have a set of USE flags for -# adodb that then propagate to PHP itself... for example, adodb[mysql] -# could require php[mysql]. To do that would require that we duplicate -# the database USE flag mess for adodb -- not desirable. Instead we punt -# and let the user install adodb unconditionally. If he doesn't have -# database support in PHP, it just won't work. -RDEPEND="dev-lang/php:*" - -S="${WORKDIR}/${MY_PN}-${PV}" - -src_install() { - DOCS="README.md docs/changelog*.md xmlschema*.dtd session/*.sql" - DOCS+=" session/*.txt session/*.xml pear/auth_adodb_example.php" - DOCS+=" pear/readme.Auth.txt" - - dodoc $DOCS - rm -f $DOCS || die "failed to remove docs before installation" - - insinto "/usr/share/php/${PN}" - doins *.php - doins -r contrib datadict drivers lang pear perf replicate session xsl -} diff --git a/dev-php/adodb/adodb-5.20.18.ebuild b/dev-php/adodb/adodb-5.20.18.ebuild deleted file mode 100644 index a1cd6765bdcf..000000000000 --- a/dev-php/adodb/adodb-5.20.18.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -MY_PN="ADOdb" -DESCRIPTION="Database abstraction layer for PHP" -HOMEPAGE="https://github.com/ADOdb" -SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD LGPL-2.1+" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" -IUSE="" - -# If you want to be picky, we should require that PHP be built with at -# least one database driver enabled; otherwise adodb isn't going to be -# able to do anything. But, the database USE flags for dev-lang/php are -# a mess. What we would *like* to do is have a set of USE flags for -# adodb that then propagate to PHP itself... for example, adodb[mysql] -# could require php[mysql]. To do that would require that we duplicate -# the database USE flag mess for adodb -- not desirable. Instead we punt -# and let the user install adodb unconditionally. If he doesn't have -# database support in PHP, it just won't work. -RDEPEND="dev-lang/php:*" - -S="${WORKDIR}/${MY_PN}-${PV}" - -src_install() { - DOCS="README.md docs/changelog*.md xmlschema*.dtd session/*.sql" - DOCS+=" session/*.txt session/*.xml pear/auth_adodb_example.php" - DOCS+=" pear/readme.Auth.txt" - - dodoc $DOCS - rm -f $DOCS || die "failed to remove docs before installation" - - insinto "/usr/share/php/${PN}" - doins *.php - doins -r contrib datadict drivers lang pear perf replicate session xsl -} diff --git a/dev-php/adodb/adodb-5.21.0.ebuild b/dev-php/adodb/adodb-5.22.2.ebuild index b7a894acbd32..c97bda0f4f5d 100644 --- a/dev-php/adodb/adodb-5.21.0.ebuild +++ b/dev-php/adodb/adodb-5.22.2.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 MY_PN="ADOdb" DESCRIPTION="Database abstraction layer for PHP" @@ -10,8 +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" -IUSE="" +KEYWORDS="~alpha amd64 arm ~hppa ppc ppc64 sparc x86" # If you want to be picky, we should require that PHP be built with at # least one database driver enabled; otherwise adodb isn't going to be @@ -31,8 +30,8 @@ src_install() { DOCS+=" session/*.txt session/*.xml pear/auth_adodb_example.php" DOCS+=" pear/readme.Auth.txt" - dodoc $DOCS - rm -f $DOCS || die "failed to remove docs before installation" + dodoc ${DOCS} + rm -f ${DOCS} || die "failed to remove docs before installation" insinto "/usr/share/php/${PN}" doins *.php diff --git a/dev-php/adodb/adodb-5.20.20.ebuild b/dev-php/adodb/adodb-5.22.7.ebuild index 7ed5d8ba45b8..4fc23d6e1658 100644 --- a/dev-php/adodb/adodb-5.20.20.ebuild +++ b/dev-php/adodb/adodb-5.22.7.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 MY_PN="ADOdb" DESCRIPTION="Database abstraction layer for PHP" @@ -10,8 +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" -IUSE="" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86" # If you want to be picky, we should require that PHP be built with at # least one database driver enabled; otherwise adodb isn't going to be @@ -31,10 +30,10 @@ src_install() { DOCS+=" session/*.txt session/*.xml pear/auth_adodb_example.php" DOCS+=" pear/readme.Auth.txt" - dodoc $DOCS - rm -f $DOCS || die "failed to remove docs before installation" + dodoc ${DOCS} + rm -f ${DOCS} || die "failed to remove docs before installation" insinto "/usr/share/php/${PN}" doins *.php - doins -r contrib datadict drivers lang pear perf replicate session xsl + doins -r datadict drivers lang pear perf session xsl } diff --git a/dev-php/adodb/metadata.xml b/dev-php/adodb/metadata.xml index db62b9a48986..8abdc5150a6b 100644 --- a/dev-php/adodb/metadata.xml +++ b/dev-php/adodb/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> diff --git a/dev-php/agavi/Manifest b/dev-php/agavi/Manifest deleted file mode 100644 index d7850dcb01a2..000000000000 --- a/dev-php/agavi/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST agavi-1.0.8.tgz 2074126 BLAKE2B b38ff9f15e877604376c6704f007044ed4907df9dcd303646e85d54e98ae65f8f2182841001414ee9326e92515cabb0839f150544e8121c1f87ebf79e6dd4a41 SHA512 9e75ef0be455e329db8b2389d7fd7a7acb25d04dda6c31dea15496dc4e24ab17cf0e44e199d0c2a9fb11987331d582cf0c700adee815cac7276c32643b9183ee diff --git a/dev-php/agavi/agavi-1.0.8.ebuild b/dev-php/agavi/agavi-1.0.8.ebuild deleted file mode 100644 index 3b7ac5c7ebea..000000000000 --- a/dev-php/agavi/agavi-1.0.8.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="PHP MVC application framework" -HOMEPAGE="http://www.agavi.org/" -SRC_URI="http://www.agavi.org/download/${PV}.tgz -> ${P}.tgz" -LICENSE="BSD LGPL-2.1+ icu unicode public-domain" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="examples +executable iconv session soap xmlrpc" - -RDEPEND="dev-lang/php[iconv?,session?,soap?,xml,xmlrpc(-)?] - executable? ( dev-php/phing )" - -DOCS=( - API_CHANGELOG - CHANGELOG - CHANGELOG-0.9 - CHANGELOG-0.10 - CHANGELOG-0.11 - CONTRIBUTING.md - README.md - RELEASE_NOTES - RELEASE_NOTES-0.9 - RELEASE_NOTES-0.10 - RELEASE_NOTES-0.11 - UPGRADING -) - -src_install() { - einstalldocs - use executable && newbin "${FILESDIR}/${PN}-executable" "${PN}" - use examples && dodoc -r samples - - insinto "/usr/share/php/${PN}" - doins -r src/* -} diff --git a/dev-php/agavi/files/agavi-executable b/dev-php/agavi/files/agavi-executable deleted file mode 100644 index 06405d6ca2e7..000000000000 --- a/dev-php/agavi/files/agavi-executable +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh -# -# A (heavily) modified version of the agavi-dist script shipped with -# the Agavi package. -# - -# Set this to the path to the Agavi installation's source directory. This is -# the directory that contains the `agavi.php' file. -AGAVI_SOURCE_DIRECTORY="/usr/share/php/agavi" - -php -d memory_limit=2G \ - -f "${AGAVI_SOURCE_DIRECTORY}/build/agavi/script/agavi.php" \ - -- \ - --agavi-source-directory "${AGAVI_SOURCE_DIRECTORY}" "$@" diff --git a/dev-php/agavi/metadata.xml b/dev-php/agavi/metadata.xml deleted file mode 100644 index fb37a3a38209..000000000000 --- a/dev-php/agavi/metadata.xml +++ /dev/null @@ -1,18 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>php-bugs@gentoo.org</email> - <name>PHP</name> - </maintainer> - <use> - <flag name="executable"> - Install the "agavi" executable used to manage projects. This - requires <pkg>dev-php/phing</pkg>, and may be omitted if you are - (for example) deploying an existing site to a production server. - </flag> - </use> - <upstream> - <remote-id type="github">agavi/agavi</remote-id> - </upstream> -</pkgmetadata> diff --git a/dev-php/awl/Manifest b/dev-php/awl/Manifest index c2787cf36249..2b7933776c0c 100644 --- a/dev-php/awl/Manifest +++ b/dev-php/awl/Manifest @@ -1,2 +1,2 @@ -DIST awl-0.61.tar.xz 124340 BLAKE2B af5d9c063280c93deb55929acf4826b6ba003676a15fcda48019a2a7788d8913d20a05c4aae98f2345d931b8f593bd32622a033fe421b55d0c687b10c7e1be05 SHA512 3492512ec04e523a30562d49aac1be617a2cee80fa363b0fbf13b25b44818a4c85af018193f79a6442419b1f7022cd7ec417e3c34641eb8096750441dcbd22bc -DIST awl-0.62.tar.xz 126492 BLAKE2B f7077106c9bc527371aef9edbb34d5e9ff251c2439059449dd8c93b548f16b79b06875e71d36faafa2a206c74391ffef978254b5ec131761550be2e0d6a7d6c1 SHA512 b6676c4bf3998ea0448aa9dba31a02fd950a07639cafb3f46482bd38235d39edeb1ab481d657d200332828777ca27df17ecf354d5721347481c0c24f04451c6d +DIST awl-0.63.tar.xz 126608 BLAKE2B feb785d6a97f1cb477cd6609495e44481563c575a5b4818d70f191df153f43360685aa86063ec59649ad4d0a0e1ef2bc9e9734a668f30bb46b7f8013c8a10369 SHA512 bf21303a5676e32874594bfe463c20be2653fc29c9aaa7586d31704c4504f5d9e6ad1e2ba103515af61ffa7d43776bfb45fea9b4752efb6441f888908f42452b +DIST awl-0.64.tar.xz 127412 BLAKE2B f045c017a07ebdef629e3a373cf540f866d935fed493382c27c1413fd66f1d103ee715b48fa3111e13c06cd34e7a3fc5c9a845b80fc93ed8971a55fd8a011dcd SHA512 3738e422b78b1904eb3e5f6b47c5a3e9fc5c2bfef644c84285da0ff242c560ec12651c8231c8f2aa324108ef2450af955b938f44ce3d54f280da6936cfc9889e diff --git a/dev-php/awl/awl-0.62.ebuild b/dev-php/awl/awl-0.63.ebuild index e4baa58f0208..819627d4818f 100644 --- a/dev-php/awl/awl-0.62.ebuild +++ b/dev-php/awl/awl-0.63.ebuild @@ -1,13 +1,13 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 DESCRIPTION="Andrew McMillan's Web Libraries" HOMEPAGE="https://gitlab.com/davical-project/awl" SRC_URI="https://www.davical.org/downloads/${PN}_${PV}.orig.tar.xz -> ${P}.tar.xz" -USE_PHP="php7.3 php7.4 php8.0" +USE_PHP="php8.0 php8.1" LICENSE="GPL-2 GPL-2+ GPL-3+ LGPL-2+ LGPL-3+" SLOT="0" diff --git a/dev-php/awl/awl-0.61.ebuild b/dev-php/awl/awl-0.64.ebuild index 4e25a5083da7..731942cc9202 100644 --- a/dev-php/awl/awl-0.61.ebuild +++ b/dev-php/awl/awl-0.64.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 DESCRIPTION="Andrew McMillan's Web Libraries" HOMEPAGE="https://gitlab.com/davical-project/awl" @@ -10,22 +10,17 @@ SRC_URI="https://www.davical.org/downloads/${PN}_${PV}.orig.tar.xz -> ${P}.tar.x LICENSE="GPL-2 GPL-2+ GPL-3+ LGPL-2+ LGPL-3+" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="test" -RESTRICT="!test? ( test )" -BDEPEND="test? ( dev-php/phpunit )" -RDEPEND="dev-lang/php:*[pdo,postgres,xml]" +RDEPEND="dev-lang/php:*[pdo,xml]" S="${WORKDIR}" +PATCHES=( "${FILESDIR}/${P}-php8.x-compat.patch" ) + src_compile() { : } -src_test() { - phpunit --do-not-cache-result tests/ || die "test suite failed" -} - src_install() { einstalldocs insinto /usr/share/php/${PN} diff --git a/dev-php/awl/files/awl-0.64-php8.x-compat.patch b/dev-php/awl/files/awl-0.64-php8.x-compat.patch new file mode 100644 index 000000000000..dd64c7b0bf14 --- /dev/null +++ b/dev-php/awl/files/awl-0.64-php8.x-compat.patch @@ -0,0 +1,463 @@ +From d3759db21195b1e49e171f83f9685bd3b650569a Mon Sep 17 00:00:00 2001 +From: Florian Schlichting <fsfs@debian.org> +Date: Thu, 23 Mar 2023 22:19:06 +0100 +Subject: [PATCH 01/16] use array_merge instead of "+" to concatenate arrays + +I noticed this when looking for other occurrences of davical#288 + +It likely has no consequences as we're never calling GetElements() with +a second argument... +--- + inc/XMLElement.php | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/inc/XMLElement.php b/inc/XMLElement.php +index 08d6cbd..d36bf52 100644 +--- a/inc/XMLElement.php ++++ b/inc/XMLElement.php +@@ -157,7 +157,7 @@ class XMLElement { + $elements[] = $v; + } + if ( $recursive ) { +- $elements = $elements + $v->GetElements($tag,true); ++ $elements = array_merge( $elements, $v->GetElements($tag,true) ); + } + } + } +-- +2.43.2 + +From ff437d2ad1f3e947012a4deedaf79d4f39476fb7 Mon Sep 17 00:00:00 2001 +From: Matthew Hunt <matt@catalyst.net.nz> +Date: Fri, 9 Jun 2023 12:50:25 +1200 +Subject: [PATCH 02/16] Fix for some deprecations and warnings in PHP8.1 + +--- + inc/AuthPlugins.php | 2 +- + inc/AwlDBDialect.php | 10 ++++++---- + inc/AwlQuery.php | 2 +- + inc/PgQuery.php | 12 ++++++------ + 4 files changed, 14 insertions(+), 12 deletions(-) + +diff --git a/inc/AuthPlugins.php b/inc/AuthPlugins.php +index 1b05487..d9fa3dd 100644 +--- a/inc/AuthPlugins.php ++++ b/inc/AuthPlugins.php +@@ -37,7 +37,7 @@ require_once('DataUpdate.php'); + function auth_other_awl( $username, $password ) { + global $c; + +- $authconn = pg_Connect($c->authenticate_hook['config']['connection']); ++ $authconn = pg_connect($c->authenticate_hook['config']['connection']); + if ( ! $authconn ) { + echo <<<EOERRMSG + <html><head><title>Database Connection Failure</title></head><body> +diff --git a/inc/AwlDBDialect.php b/inc/AwlDBDialect.php +index fac5a23..f2c5b95 100644 +--- a/inc/AwlDBDialect.php ++++ b/inc/AwlDBDialect.php +@@ -82,7 +82,7 @@ class AwlDBDialect { + * + * The database will be opened. + * +- * @param string $connection_string The PDO connection string, in all it's glory ++ * @param string $connection_string The PDO connection string, in all its glory + * @param string $dbuser The database username to connect as + * @param string $dbpass The database password to connect with + * @param array $options An array of driver options +@@ -165,10 +165,12 @@ class AwlDBDialect { + + switch ( $this->dialect ) { + case 'pgsql': +- list( $schema, $table ) = explode('.', $tablename_string, 2); +- if ( empty($table) ) { ++ $schema = null; ++ $table = null; ++ if ( strpos($tablename_string, '.') ) { ++ list( $schema, $table ) = explode('.', $tablename_string, 2); ++ } else { + $table = $tablename_string; +- $schema = null; + } + + $sql = 'SELECT f.attname AS fieldname, t.typname AS typename, f.atttypmod AS precision FROM pg_attribute f'; +diff --git a/inc/AwlQuery.php b/inc/AwlQuery.php +index 1547cb7..586b389 100644 +--- a/inc/AwlQuery.php ++++ b/inc/AwlQuery.php +@@ -162,7 +162,7 @@ class AwlQuery + protected $rownum = null; + + /** +- * number of rows from pg_numrows - use accessor to get value ++ * number of rows from pg_num_rows - use accessor to get value + * @var int + */ + protected $rows; +diff --git a/inc/PgQuery.php b/inc/PgQuery.php +index 0d2f199..69454d3 100644 +--- a/inc/PgQuery.php ++++ b/inc/PgQuery.php +@@ -33,7 +33,7 @@ + */ + + +-if ( ! function_exists('pg_Connect') ) { ++if ( ! function_exists('pg_connect') ) { + echo <<<EOERRMSG + <html> + <head> +@@ -70,7 +70,7 @@ function connect_configured_database() { + if ( isset($c->pg_connect) && is_array($c->pg_connect) ) { + foreach( $c->pg_connect AS $k => $v ) { + if ( !$dbconn ) { +- if ( $dbconn = ((isset($c->use_persistent) && $c->use_persistent) ? pg_pConnect($v) : pg_Connect($v) ) ) break; ++ if ( $dbconn = ((isset($c->use_persistent) && $c->use_persistent) ? pg_pconnect($v) : pg_connect($v) ) ) break; + } + } + } +@@ -327,7 +327,7 @@ class PgQuery + * @access public + */ + /** +- * number of rows from pg_numrows - for fetching result ++ * number of rows from pg_num_rows - for fetching result + * should be read-only + * @var int + */ +@@ -492,7 +492,7 @@ class PgQuery + + $t1 = microtime(); // get start time + $this->result = @pg_exec( $this->connection, $this->querystring ); // execute the query +- $this->rows = ($this->result ? pg_numrows($this->result) : -1); // number of rows returned ++ $this->rows = ($this->result ? pg_num_rows($this->result) : -1); // number of rows returned + $t2 = microtime(); // get end time + $i_took = duration( $t1, $t2 ); // calculate difference + $c->total_query_time += $i_took; +@@ -500,7 +500,7 @@ class PgQuery + + if ( !$this->result ) { + // query simply failed +- $this->errorstring = @pg_errormessage(); // returns database error message ++ $this->errorstring = @pg_last_error(); // returns database error message + $this->_log_error( $this->location, 'QF', $this->querystring, $line, $file ); + $this->_log_error( $this->location, 'QF', $this->errorstring, $line, $file ); + } +@@ -637,7 +637,7 @@ class PgQuery + $display_value = $row[1]; + if ( isset($translate) ) $display_value = translate( $display_value ); + if ( isset($maxwidth) ) $display_value = substr( $display_value, 0, $maxwidth); +- $nextrow = "<option value=\"".htmlspecialchars($row[0])."\"$selected>".htmlspecialchars($display_value)."</option>"; ++ $nextrow = "<option value=\"".htmlspecialchars($row[0])."\"$selected>".htmlspecialchars($display_value ?? '')."</option>"; + $result .= $nextrow; + } + } +-- +2.43.2 + +From 44e2ee89e5aa4994878520fe5b0e5d1f30205f7c Mon Sep 17 00:00:00 2001 +From: Andrew Ruthven <andrew@etc.gen.nz> +Date: Sun, 25 Feb 2024 14:25:28 +1300 +Subject: [PATCH 08/16] Explicitly declare all class properties + +PHP 8.2.0 has deprecated dynamic creation of properties. + +This kind of warning message is displayed: + +Deprecated: Creation of dynamic property DAViCalSession::$login_failed is + deprecated in /usr/share/awl/inc/Session.php on line 153 +--- + inc/MenuSet.php | 6 ++++ + inc/Session.php | 81 +++++++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 87 insertions(+) + +diff --git a/inc/MenuSet.php b/inc/MenuSet.php +index 2da1ced..2d26bff 100644 +--- a/inc/MenuSet.php ++++ b/inc/MenuSet.php +@@ -65,6 +65,12 @@ class MenuOption { + var $submenu_set; + /**#@-*/ + ++ /** ++ * MenuSet attributes ++ * @var array ++ */ ++ var $attributes; ++ + /** + * A reference to this menu option itself + * @var reference +diff --git a/inc/Session.php b/inc/Session.php +index 5d55f9d..29cfde9 100644 +--- a/inc/Session.php ++++ b/inc/Session.php +@@ -63,6 +63,12 @@ class Session + */ + var $roles; + var $cause = ''; ++ ++ /** ++ * Session start times for confirmation emails ++ * @var array ++ var $session_start; ++ + /**#@-*/ + + /**#@+ +@@ -113,6 +119,55 @@ class Session + */ + var $just_logged_in = false; + ++ /** ++ * The date and time that the user's email address was confirmed. ++ * @var string ++ */ ++ var $email_ok; ++ ++ /** ++ * The date and time that the user joined (account created). ++ * @var string ++ */ ++ var $joined; ++ ++ /** ++ * The date and time that the user's record was last updated. ++ * @var string ++ */ ++ var $updated; ++ ++ /** ++ * The date and time that the user was last used (not used?). ++ * @var string ++ */ ++ var $last_used; ++ ++ /** ++ * The user's password. ++ * @var string ++ */ ++ var $password; ++ ++ /** ++ * The user's config_data. I don't know what type this should be as I can't ++ * see any examples of it being used. ++ * @var string ++ */ ++ var $config_data; ++ ++ /** ++ * The user's data format type. ++ * @var string ++ */ ++ var $date_format_type; ++ ++ /** ++ * The user's locale. ++ * @var string ++ */ ++ var $locale; ++ + /** + * The date and time that the user logged on during their last session. + * @var string +@@ -125,6 +180,32 @@ class Session + * @var string + */ + var $last_session_end; ++ ++ /** ++ * The date and time that the users session start. ++ * @var string ++ */ ++ var $session_start; ++ ++ /** ++ * Session config. I don't know what type this should be as I can't see any ++ * examples of it being used. ++ * @var string ++ */ ++ var $session_config; ++ ++ /** ++ * The date and time that the users session ends. ++ * @var string ++ */ ++ var $session_end; ++ ++ /** ++ * Flag to indicate if login failed. ++ * @var boolean ++ */ ++ var $login_failed = false; ++ + /**#@-*/ + + /** +-- +2.43.2 + +From 45b796e24bc21ba83332aff9f6af7a0108d906b0 Mon Sep 17 00:00:00 2001 +From: Andrew Ruthven <andrew@etc.gen.nz> +Date: Sun, 25 Feb 2024 23:47:43 +1300 +Subject: [PATCH 10/16] Explicitly declare all class properties (more) + +--- + inc/Session.php | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +diff --git a/inc/Session.php b/inc/Session.php +index 29cfde9..a064209 100644 +--- a/inc/Session.php ++++ b/inc/Session.php +@@ -119,6 +119,12 @@ class Session + */ + var $just_logged_in = false; + ++ /** ++ * Is the user active (aka enabled)? ++ * @var boolean ++ */ ++ var $active; ++ + /** + * The date and time that the user's email address was confirmed. + * @var string +@@ -200,6 +206,12 @@ class Session + */ + var $session_end; + ++ /** ++ * Current session key ++ * @var string ++ */ ++ var $session_key; ++ + /** + * Flag to indicate if login failed. + * @var boolean +-- +2.43.2 + +From b879addd766ab2a54aa92d58c48c26a985c89690 Mon Sep 17 00:00:00 2001 +From: Andrew Ruthven <andrew@etc.gen.nz> +Date: Wed, 28 Feb 2024 00:57:59 +1300 +Subject: [PATCH 11/16] Ensure we pass a string to htmlspecialchars() + +PHP 8.1 deprecated passing null into many functions. This fixes these errors: + +Deprecated: htmlspecialchars(): Passing null to parameter #1 ($string) of + type string is deprecated in /usr/share/awl/inc/classEditor.php on line 626 +--- + inc/classEditor.php | 29 ++++++++++++++++++++++++----- + 1 file changed, 24 insertions(+), 5 deletions(-) + +diff --git a/inc/classEditor.php b/inc/classEditor.php +index afdd534..36703cd 100644 +--- a/inc/classEditor.php ++++ b/inc/classEditor.php +@@ -621,28 +621,47 @@ class Editor + } + } + return $field->RenderLabel('<input type="hidden" value="off" name="'.$field_name.'"><input class="entry" type="checkbox" value="on" name="'.$field_name.'"'.$checked.$attributes.'>' ); ++ + case "input": + $size = (isset($part3) ? $part3 : 6); +- return "<input class=\"entry\" value=\"".htmlspecialchars($field_value)."\" name=\"$field_name\" size=\"$size\"$attributes>"; ++ return "<input class=\"entry\" value=\"" ++ . (isset($field_value) ? htmlspecialchars($field_value) : '') ++ . "\" name=\"$field_name\" size=\"$size\"$attributes>"; ++ + case "file": + $size = (isset($part3) ? $part3 : 30); +- return "<input type=\"file\" class=\"entry\" value=\"".htmlspecialchars($field_value)."\" name=\"$field_name\" size=\"$size\"$attributes>"; ++ return "<input type=\"file\" class=\"entry\" value=\"" ++ . (isset($field_value) ? htmlspecialchars($field_value) : '') ++ . "\" name=\"$field_name\" size=\"$size\"$attributes>"; ++ + case "money": + $size = (isset($part3) ? $part3 : 8); +- return "<input class=\"money\" value=\"".htmlspecialchars(sprintf("%0.2lf",$field_value))."\" name=\"$field_name\" size=\"$size\"$attributes>"; ++ return "<input class=\"money\" value=\"" ++ . (isset($field_value) ? htmlspecialchars(sprintf("%0.2lf",$field_value)) : '') ++ . "\" name=\"$field_name\" size=\"$size\"$attributes>"; ++ + case "date": + $size = (isset($part3) ? $part3 : 10); +- return "<input class=\"date\" value=\"".htmlspecialchars($field_value)."\" name=\"$field_name\" size=\"$size\"$attributes>"; ++ return "<input class=\"date\" value=\"" ++ . (isset($field_value) ? htmlspecialchars($field_value) : '') ++ . "\" name=\"$field_name\" size=\"$size\"$attributes>"; ++ + case "textarea": + list( $cols, $rows ) = explode( 'x', $part3); +- return "<textarea class=\"entry\" name=\"$field_name\" rows=\"$rows\" cols=\"$cols\"$attributes>".htmlspecialchars($field_value)."</textarea>"; ++ return "<textarea class=\"entry\" name=\"$field_name\" rows=\"$rows\" cols=\"$cols\"$attributes>" ++ . (isset($field_value) ? htmlspecialchars($field_value) : '') ++ . "</textarea>"; ++ + case "hidden": + return sprintf( "<input type=\"hidden\" value=\"%s\" name=\"$field_name\">", htmlspecialchars($field_value) ); ++ + case "password": + return sprintf( "<input type=\"password\" value=\"%s\" name=\"$field_name\" size=\"10\">", htmlspecialchars($part3) ); ++ + case "encval": + case "enc": + return htmlspecialchars($field_value); ++ + case "submit": + $action = ( $this->RecordAvailable ? 'update' : 'insert' ); + return sprintf('<input type="hidden" name="_editor_action[%s]" value="%s"><input type="submit" class="submit" name="%s" value="%s">', +-- +2.43.2 + +From 27b37d1eba82c3f9abbc4505179d06abce0fa0d3 Mon Sep 17 00:00:00 2001 +From: Andrew Ruthven <andrew@etc.gen.nz> +Date: Wed, 28 Feb 2024 01:03:36 +1300 +Subject: [PATCH 12/16] Remove a PHP 7ism + +--- + inc/PgQuery.php | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/inc/PgQuery.php b/inc/PgQuery.php +index 69454d3..f2ba9c3 100644 +--- a/inc/PgQuery.php ++++ b/inc/PgQuery.php +@@ -637,7 +637,7 @@ class PgQuery + $display_value = $row[1]; + if ( isset($translate) ) $display_value = translate( $display_value ); + if ( isset($maxwidth) ) $display_value = substr( $display_value, 0, $maxwidth); +- $nextrow = "<option value=\"".htmlspecialchars($row[0])."\"$selected>".htmlspecialchars($display_value ?? '')."</option>"; ++ $nextrow = "<option value=\"".htmlspecialchars($row[0])."\"$selected>" . (isset($display_value) ? htmlspecialchars($display_value) : '') . "</option>"; + $result .= $nextrow; + } + } +-- +2.43.2 + +From 33678418692ab1d82ff4ab064e64d1d7064ec10a Mon Sep 17 00:00:00 2001 +From: Andrew Ruthven <andrew@etc.gen.nz> +Date: Wed, 28 Feb 2024 08:14:16 +1300 +Subject: [PATCH 13/16] Explicitly declare all class properties (more) + +--- + inc/classBrowser.php | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/inc/classBrowser.php b/inc/classBrowser.php +index f169c72..850006a 100644 +--- a/inc/classBrowser.php ++++ b/inc/classBrowser.php +@@ -209,6 +209,7 @@ class Browser + var $match_function; + var $DivOpen; + var $DivClose; ++ var $current_row; + + /** + * The Browser class constructor +-- +2.43.2 + diff --git a/dev-php/awl/metadata.xml b/dev-php/awl/metadata.xml index 067f0aa933fd..8ac470277525 100644 --- a/dev-php/awl/metadata.xml +++ b/dev-php/awl/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person" proxied="yes"> <email>till2.schaefer@uni-dortmund.de</email> @@ -17,4 +17,7 @@ <email>mjo@gentoo.org</email> <name>Michael Orlitzky</name> </maintainer> + <upstream> + <remote-id type="gitlab">davical-project/awl</remote-id> + </upstream> </pkgmetadata> diff --git a/dev-php/ca-bundle/Manifest b/dev-php/ca-bundle/Manifest index 869046bf79dd..5d86eb1229e4 100644 --- a/dev-php/ca-bundle/Manifest +++ b/dev-php/ca-bundle/Manifest @@ -1 +1,3 @@ DIST ca-bundle-1.1.3.tar.gz 126613 BLAKE2B 6b1013c2544f8795a4d054c6807cc2a2c51d03547f0d404def311d7edde9891f27ca1a249bef90e10f129a85f0dea489e1fc933b4c5f3bd8213c3428dba588d2 SHA512 b3e1f6bc9196b6c70476a7b656fb3dc4d398cd033d223b436d50676f228b62b561075787df36b880b7b4eb7de677da19d3e597752f88f279279b8569cc865a5f +DIST ca-bundle-1.2.11.tar.gz 124268 BLAKE2B 537128647522c00a8ab3d445bfcc27648c4257a9f9ed82d489e4a2324d3123db86c1eba311b723f1bfcb6271223c7c36ad43863b5fd7c3f18ce0c92e7e064555 SHA512 96cbeb00a6770ada746288e01359bf2865cf8bbf80bca64d666b6c18b7103185b18a4c343bd170495576d871b37c5b59f334124f827658b6065462f7946554ff +DIST ca-bundle-1.3.1.tar.gz 127597 BLAKE2B e3f19e3a9e8285b9dcbfe1b488566392424249f0a366696f895761edfcfb597ece06ef0c87380b44083dcf5f598000a83ed9fefec20b58336f47277a205e2467 SHA512 12a5a83f3783491086614e79517e945892a3cb1230705650e12a3f9863bbeec628b8bea228f5d12d23c790a3b912c88536182c059108acb6860e2ceabae8c7c6 diff --git a/dev-php/ca-bundle/ca-bundle-1.2.11.ebuild b/dev-php/ca-bundle/ca-bundle-1.2.11.ebuild new file mode 100644 index 000000000000..d430bcbd1dd5 --- /dev/null +++ b/dev-php/ca-bundle/ca-bundle-1.2.11.ebuild @@ -0,0 +1,22 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="Find the system CA bundle or fall back to the Mozilla one" +HOMEPAGE="https://github.com/composer/ca-bundle" +SRC_URI="https://github.com/composer/ca-bundle/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="amd64 x86" + +RDEPEND=" + dev-lang/php:* + dev-php/fedora-autoloader" + +src_install() { + insinto /usr/share/php/Composer/CaBundle + doins src/CaBundle.php "${FILESDIR}/autoload.php" + dodoc README.md +} diff --git a/dev-php/ca-bundle/ca-bundle-1.3.1.ebuild b/dev-php/ca-bundle/ca-bundle-1.3.1.ebuild new file mode 100644 index 000000000000..9c2a7ab6efa0 --- /dev/null +++ b/dev-php/ca-bundle/ca-bundle-1.3.1.ebuild @@ -0,0 +1,22 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="Find the system CA bundle or fall back to the Mozilla one" +HOMEPAGE="https://github.com/composer/ca-bundle" +SRC_URI="https://github.com/composer/ca-bundle/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="amd64 ~arm64 x86" + +RDEPEND=" + dev-lang/php:* + dev-php/fedora-autoloader" + +src_install() { + insinto /usr/share/php/Composer/CaBundle + doins src/CaBundle.php "${FILESDIR}/autoload.php" + dodoc README.md +} diff --git a/dev-php/ca-bundle/metadata.xml b/dev-php/ca-bundle/metadata.xml index c95ddcd36f8d..3ee827c63210 100644 --- a/dev-php/ca-bundle/metadata.xml +++ b/dev-php/ca-bundle/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person" proxied="yes"> <email>guillaumeseren@gmail.com</email> @@ -15,7 +15,7 @@ <longdescription> Small utility library that lets you find a path to the system CA bundle, and includes a fallback to the Mozilla CA bundle. - Originally written as part of dev-php/composer, now extracted and + Originally written as part of <pkg>dev-php/composer</pkg>, now extracted and made available as a stand-alone library. </longdescription> <upstream> diff --git a/dev-php/cli-prompt/Manifest b/dev-php/cli-prompt/Manifest index cf275cec7fdb..d7c3596a6cb6 100644 --- a/dev-php/cli-prompt/Manifest +++ b/dev-php/cli-prompt/Manifest @@ -1,2 +1 @@ -DIST cli-prompt-1.0.0.tar.gz 7538 BLAKE2B 650bb080c77471515d9baf31d1c5ea13fbfb4a9100e607e2f9c372c8c2ba0f6eac2d67ea0d2327bf30d1cbfaa65a8feb7e999b3a0b130f54e48c85ed8236cbe4 SHA512 5a1f6f999976f3b01d857890b5a06cfed377597397266b44d4aba324bedc2b9f73db5dc184ab40ee6632b43c80da99f5641366903bbc7bb7e18409cb367c8461 -DIST cli-prompt-1.0.3.tar.gz 7563 BLAKE2B 5f4ba04f3ed1e98b30c5ce840fdb0189422b6c83e6df82b3a617eb120b4dadc840287b3ee559b6605f1b2a9eb873abbc446a9ed3ec1dfeba1158a7a27ebee951 SHA512 e7e7bb0ae5173b784ab7dac4453b23d039abb68c11b21bfd3756f7f37da413744dcd76d8f8769ace023f91f0f2a8f78421d432bf96fe0781c05a9584b0f0f64d +DIST cli-prompt-1.0.4.tar.gz 8481 BLAKE2B 0ece875068c8731df28a5098f8de10ffb91849c293682f1098167a609a5c66a08310e8eb26b606cf9407a8d71738851e89dfc3854a8485e1ad1f28c29159a5c4 SHA512 b71c60f6d45c7eaa9c985bb20f6007fd48f5667510a54cc35286f6fd9cba277da4537052550501e1738e7e66e89341ba99cfc40ea7c0c82d8b3d63c03f855c4a diff --git a/dev-php/cli-prompt/cli-prompt-1.0.3.ebuild b/dev-php/cli-prompt/cli-prompt-1.0.4.ebuild index 5a3a63f745e2..b8798f413e98 100644 --- a/dev-php/cli-prompt/cli-prompt-1.0.3.ebuild +++ b/dev-php/cli-prompt/cli-prompt-1.0.4.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 DESCRIPTION="Allows you to prompt for user input on the command line" HOMEPAGE="https://github.com/Seldaek/cli-prompt" diff --git a/dev-php/cli-prompt/metadata.xml b/dev-php/cli-prompt/metadata.xml index 681ed26c3908..2dbbca79baa7 100644 --- a/dev-php/cli-prompt/metadata.xml +++ b/dev-php/cli-prompt/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person" proxied="yes"> <email>guillaumeseren@gmail.com</email> diff --git a/dev-php/composer/Manifest b/dev-php/composer/Manifest index 1f6ba91a4c1b..469dac5c757d 100644 --- a/dev-php/composer/Manifest +++ b/dev-php/composer/Manifest @@ -1,6 +1 @@ -DIST composer-1.10.22.tar.gz 429521 BLAKE2B da7a340b63fd2540886e0fe9252a115bffdfdddfb9cc5063b296fa4026275390641a761260597f9f4421bfcde62c5f8c9fd4757e41a8278ff0063f905d3a5b50 SHA512 e1a9e22d3e0673a0bbdbc4a97a330e15ce2b6b9e81a6bfc97a6d5918713d02fc414a36393e8760830418d9bde0664cbbcd8e454d6c6be14db585565a3eeb452b -DIST composer-2.0.13.tar.gz 497819 BLAKE2B ab51556ff65b0c2822d5419bb6dde2c775c91ed210af6ab84f272db0ea823866d75090173663d517cd36163bbe04ce06f597c670fce45b595716baaf05253d8e SHA512 b16425e0553f69c23e636cc51711e2e433125ac55a29d21c66eead4b40080379449868810e9b443996e3959feae2be6ed9c9a100bc5e3f84d210654dd160887f -DIST composer-2.0.14.tar.gz 498661 BLAKE2B 0b454ed6a00b5cab169a4ff82e9a3d7ceb0d885bd1fe8f70ed495bc28e13a93f477c24df7d9510d0611941addc894d914b6856ef823762f0aeb596fef9332526 SHA512 7eb87f8454d38a091bf97ad470c41f6d1b82bc153618312093935d2b7b5890bf3d1eba25f9bd8e46c5f8ae462729e85ea19eb03184a4484332694a6369a82917 -DIST composer-2.1.1.tar.gz 513391 BLAKE2B 9177eb7d1acfb3557dde0382e0d0b6fd367a16f4c2de30739c40a1fae396e7f188173c5ef9356c6f55922457ea52c7c3e19e9040c37e86fdb4575016aac07808 SHA512 22105ab3f831ab89cf80e247c6e6f6263f3116a24394b9367b7e7c1e1aebfdcf9bb833add4763c34c621714dd8f22c87327ccf6c8eeef113f753ba800a111a5c -DIST composer-2.1.2.tar.gz 513790 BLAKE2B cc1c807ae4d69537541acf3ec384dbad64bf3196067c5ad016b03903e9b47460a6757c0fe692600f3042650c030b323f0a0b5ef4c3933049899843cbdc8266dc SHA512 1835daeb943af2ff58e5f5b3966b59356c14ac740689779c05fa0021174a7d0ac2a45aae7f54fade0695ca7eedf59f7ac4c9c14ae4aa1e4a5fbfb1650aae8ca9 -DIST composer-2.1.3.tar.gz 514147 BLAKE2B 3abf64aceea5b95b72419b60fc74d23e42c652036690c2e31b4250eb4a0e3607a1b4080745642fb085be75dd1174073164f9a8a1422745b4bff5887df694fd99 SHA512 d3214f39651e323b419979ed150d5239f992a6b643048a73a777ece0a1b3d5e3dc2c58a5084b3e825834acc258c18947b0c6461c47960a10552617c8f541df86 +DIST composer-2.1.12.tar.gz 535017 BLAKE2B 1eb0f7266f81efacbb0a9607828ebd8baf7147a161c478c75968ac02b5e32688601a8be53ef03f66162847b3e2f15b47398f6f57b7e3d9da7743d34c1a19cd7c SHA512 5848a686568cf2bf587b4f4c21fc095b2e6578c2a4897329411e473ce6250e6304726a47078f70f19fb168359fb991109ec975241b868f8b71dcf30c32a888c5 diff --git a/dev-php/composer/composer-1.10.22.ebuild b/dev-php/composer/composer-1.10.22.ebuild deleted file mode 100644 index d8c51c550e91..000000000000 --- a/dev-php/composer/composer-1.10.22.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="Dependency Manager for PHP" -HOMEPAGE="https://github.com/composer/composer" -SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND=" - dev-lang/php:*[curl] - >=dev-php/ca-bundle-1.1.3 - >=dev-php/psr-log-1.1.0 - dev-php/fedora-autoloader - >=dev-php/json-schema-5.2.10 - >=dev-php/jsonlint-1.7.1 - >=dev-php/phar-utils-1.0.1 - >=dev-php/semver-1.4.2 - >=dev-php/spdx-licenses-1.5.0 - >=dev-php/symfony-console-2.8.48 - >=dev-php/symfony-filesystem-2.8.48 - >=dev-php/symfony-finder-2.8.49 - >=dev-php/symfony-process-2.8.48 - >=dev-php/xdebug-handler-1.3.1" - -src_install() { - insinto "/usr/share/${PN}" - - # Composer expects the LICENSE file to be there, and the - # easiest thing to do is to give it what it wants. - doins -r src res LICENSE - - insinto "/usr/share/${PN}/vendor" - newins "${FILESDIR}"/autoload-r1.php autoload.php - - exeinto "/usr/share/${PN}/bin" - doexe "bin/${PN}" - dosym "../share/${PN}/bin/${PN}" "/usr/bin/${PN}" - - dodoc CHANGELOG.md README.md doc/*.md - dodoc -r doc/articles doc/faqs -} diff --git a/dev-php/composer/composer-2.0.13.ebuild b/dev-php/composer/composer-2.0.13.ebuild deleted file mode 100644 index 24fa78b2de66..000000000000 --- a/dev-php/composer/composer-2.0.13.ebuild +++ /dev/null @@ -1,80 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -DESCRIPTION="Dependency Manager for PHP" -HOMEPAGE="https://github.com/composer/composer" -SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 x86" - -BDEPEND="dev-php/theseer-Autoload" - -RDEPEND="dev-lang/php:*[curl] - >=dev-php/ca-bundle-1.0 - dev-php/fedora-autoloader - >=dev-php/jsonlint-1.4 - >=dev-php/json-schema-5.2.10 - >=dev-php/metadata-minifier-1.0 - >=dev-php/phar-utils-1.0 - >=dev-php/psr-log-1.0 - >=dev-php/reactphp-promise-2.7 - >=dev-php/semver-3.0 - >=dev-php/spdx-licenses-1.2 - >=dev-php/symfony-console-2.8.52 - >=dev-php/symfony-filesystem-2.8.52 - >=dev-php/symfony-finder-2.8.52 - >=dev-php/symfony-process-2.8.52 - >=dev-php/xdebug-handler-1.1" - -src_prepare() { - default - - mkdir vendor || die - - phpab \ - --output vendor/autoload.php \ - --template "${FILESDIR}"/autoload.php.tpl \ - --basedir src \ - src \ - || die - - cat >> vendor/autoload.php <<EOF || die "failed to extend autoload.php" - -// Dependencies -\Fedora\Autoloader\Dependencies::required([ - '/usr/share/php/Composer/CaBundle/autoload.php', - '/usr/share/php/Composer/MetadataMinifier/autoload.php', - '/usr/share/php/Composer/Semver/autoload.php', - '/usr/share/php/Composer/Spdx/autoload.php', - '/usr/share/php/Composer/XdebugHandler/autoload.php', - '/usr/share/php/JsonSchema/autoload.php', - '/usr/share/php/Psr/Log/autoload.php', - '/usr/share/php/Seld/JsonLint/autoload.php', - '/usr/share/php/Seld/PharUtils/autoload.php', - '/usr/share/php/Symfony/Component/Console/autoload.php', - '/usr/share/php/Symfony/Component/Filesystem/autoload.php', - '/usr/share/php/Symfony/Component/Finder/autoload.php', - '/usr/share/php/Symfony/Component/Process/autoload.php', - '/usr/share/php/React/Promise/autoload.php' -]); -EOF -} - -src_install() { - insinto "/usr/share/${PN}" - - # Composer expects the LICENSE file to be there, and the - # easiest thing to do is to give it what it wants. - doins -r LICENSE res src vendor - - exeinto "/usr/share/${PN}/bin" - doexe "bin/${PN}" - dosym "../share/${PN}/bin/${PN}" "/usr/bin/${PN}" - - dodoc CHANGELOG.md README.md doc/*.md - dodoc -r doc/articles doc/faqs -} diff --git a/dev-php/composer/composer-2.0.14.ebuild b/dev-php/composer/composer-2.0.14.ebuild deleted file mode 100644 index a86e72a98bc0..000000000000 --- a/dev-php/composer/composer-2.0.14.ebuild +++ /dev/null @@ -1,80 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -DESCRIPTION="Dependency Manager for PHP" -HOMEPAGE="https://github.com/composer/composer" -SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -BDEPEND="dev-php/theseer-Autoload" - -RDEPEND="dev-lang/php:*[curl] - >=dev-php/ca-bundle-1.0 - dev-php/fedora-autoloader - >=dev-php/jsonlint-1.4 - >=dev-php/json-schema-5.2.10 - >=dev-php/metadata-minifier-1.0 - >=dev-php/phar-utils-1.0 - >=dev-php/psr-log-1.0 - >=dev-php/reactphp-promise-2.7 - >=dev-php/semver-3.0 - >=dev-php/spdx-licenses-1.2 - >=dev-php/symfony-console-2.8.52 - >=dev-php/symfony-filesystem-2.8.52 - >=dev-php/symfony-finder-2.8.52 - >=dev-php/symfony-process-2.8.52 - >=dev-php/xdebug-handler-2" - -src_prepare() { - default - - mkdir vendor || die - - phpab \ - --output vendor/autoload.php \ - --template "${FILESDIR}"/autoload.php.tpl \ - --basedir src \ - src \ - || die - - cat >> vendor/autoload.php <<EOF || die "failed to extend autoload.php" - -// Dependencies -\Fedora\Autoloader\Dependencies::required([ - '/usr/share/php/Composer/CaBundle/autoload.php', - '/usr/share/php/Composer/MetadataMinifier/autoload.php', - '/usr/share/php/Composer/Semver/autoload.php', - '/usr/share/php/Composer/Spdx/autoload.php', - '/usr/share/php/Composer/XdebugHandler/autoload.php', - '/usr/share/php/JsonSchema/autoload.php', - '/usr/share/php/Psr/Log/autoload.php', - '/usr/share/php/Seld/JsonLint/autoload.php', - '/usr/share/php/Seld/PharUtils/autoload.php', - '/usr/share/php/Symfony/Component/Console/autoload.php', - '/usr/share/php/Symfony/Component/Filesystem/autoload.php', - '/usr/share/php/Symfony/Component/Finder/autoload.php', - '/usr/share/php/Symfony/Component/Process/autoload.php', - '/usr/share/php/React/Promise/autoload.php' -]); -EOF -} - -src_install() { - insinto "/usr/share/${PN}" - - # Composer expects the LICENSE file to be there, and the - # easiest thing to do is to give it what it wants. - doins -r LICENSE res src vendor - - exeinto "/usr/share/${PN}/bin" - doexe "bin/${PN}" - dosym "../share/${PN}/bin/${PN}" "/usr/bin/${PN}" - - dodoc CHANGELOG.md README.md doc/*.md - dodoc -r doc/articles doc/faqs -} diff --git a/dev-php/composer/composer-2.1.1.ebuild b/dev-php/composer/composer-2.1.12.ebuild index a86e72a98bc0..83641942e9e8 100644 --- a/dev-php/composer/composer-2.1.1.ebuild +++ b/dev-php/composer/composer-2.1.12.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="7" +EAPI="8" DESCRIPTION="Dependency Manager for PHP" HOMEPAGE="https://github.com/composer/composer" @@ -9,7 +9,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 ~arm64 x86" BDEPEND="dev-php/theseer-Autoload" @@ -17,7 +17,7 @@ RDEPEND="dev-lang/php:*[curl] >=dev-php/ca-bundle-1.0 dev-php/fedora-autoloader >=dev-php/jsonlint-1.4 - >=dev-php/json-schema-5.2.10 + >=dev-php/json-schema-5.2.11 >=dev-php/metadata-minifier-1.0 >=dev-php/phar-utils-1.0 >=dev-php/psr-log-1.0 diff --git a/dev-php/composer/composer-2.1.2.ebuild b/dev-php/composer/composer-2.1.2.ebuild deleted file mode 100644 index a86e72a98bc0..000000000000 --- a/dev-php/composer/composer-2.1.2.ebuild +++ /dev/null @@ -1,80 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -DESCRIPTION="Dependency Manager for PHP" -HOMEPAGE="https://github.com/composer/composer" -SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -BDEPEND="dev-php/theseer-Autoload" - -RDEPEND="dev-lang/php:*[curl] - >=dev-php/ca-bundle-1.0 - dev-php/fedora-autoloader - >=dev-php/jsonlint-1.4 - >=dev-php/json-schema-5.2.10 - >=dev-php/metadata-minifier-1.0 - >=dev-php/phar-utils-1.0 - >=dev-php/psr-log-1.0 - >=dev-php/reactphp-promise-2.7 - >=dev-php/semver-3.0 - >=dev-php/spdx-licenses-1.2 - >=dev-php/symfony-console-2.8.52 - >=dev-php/symfony-filesystem-2.8.52 - >=dev-php/symfony-finder-2.8.52 - >=dev-php/symfony-process-2.8.52 - >=dev-php/xdebug-handler-2" - -src_prepare() { - default - - mkdir vendor || die - - phpab \ - --output vendor/autoload.php \ - --template "${FILESDIR}"/autoload.php.tpl \ - --basedir src \ - src \ - || die - - cat >> vendor/autoload.php <<EOF || die "failed to extend autoload.php" - -// Dependencies -\Fedora\Autoloader\Dependencies::required([ - '/usr/share/php/Composer/CaBundle/autoload.php', - '/usr/share/php/Composer/MetadataMinifier/autoload.php', - '/usr/share/php/Composer/Semver/autoload.php', - '/usr/share/php/Composer/Spdx/autoload.php', - '/usr/share/php/Composer/XdebugHandler/autoload.php', - '/usr/share/php/JsonSchema/autoload.php', - '/usr/share/php/Psr/Log/autoload.php', - '/usr/share/php/Seld/JsonLint/autoload.php', - '/usr/share/php/Seld/PharUtils/autoload.php', - '/usr/share/php/Symfony/Component/Console/autoload.php', - '/usr/share/php/Symfony/Component/Filesystem/autoload.php', - '/usr/share/php/Symfony/Component/Finder/autoload.php', - '/usr/share/php/Symfony/Component/Process/autoload.php', - '/usr/share/php/React/Promise/autoload.php' -]); -EOF -} - -src_install() { - insinto "/usr/share/${PN}" - - # Composer expects the LICENSE file to be there, and the - # easiest thing to do is to give it what it wants. - doins -r LICENSE res src vendor - - exeinto "/usr/share/${PN}/bin" - doexe "bin/${PN}" - dosym "../share/${PN}/bin/${PN}" "/usr/bin/${PN}" - - dodoc CHANGELOG.md README.md doc/*.md - dodoc -r doc/articles doc/faqs -} diff --git a/dev-php/composer/composer-2.1.3.ebuild b/dev-php/composer/composer-2.1.3.ebuild deleted file mode 100644 index a86e72a98bc0..000000000000 --- a/dev-php/composer/composer-2.1.3.ebuild +++ /dev/null @@ -1,80 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -DESCRIPTION="Dependency Manager for PHP" -HOMEPAGE="https://github.com/composer/composer" -SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -BDEPEND="dev-php/theseer-Autoload" - -RDEPEND="dev-lang/php:*[curl] - >=dev-php/ca-bundle-1.0 - dev-php/fedora-autoloader - >=dev-php/jsonlint-1.4 - >=dev-php/json-schema-5.2.10 - >=dev-php/metadata-minifier-1.0 - >=dev-php/phar-utils-1.0 - >=dev-php/psr-log-1.0 - >=dev-php/reactphp-promise-2.7 - >=dev-php/semver-3.0 - >=dev-php/spdx-licenses-1.2 - >=dev-php/symfony-console-2.8.52 - >=dev-php/symfony-filesystem-2.8.52 - >=dev-php/symfony-finder-2.8.52 - >=dev-php/symfony-process-2.8.52 - >=dev-php/xdebug-handler-2" - -src_prepare() { - default - - mkdir vendor || die - - phpab \ - --output vendor/autoload.php \ - --template "${FILESDIR}"/autoload.php.tpl \ - --basedir src \ - src \ - || die - - cat >> vendor/autoload.php <<EOF || die "failed to extend autoload.php" - -// Dependencies -\Fedora\Autoloader\Dependencies::required([ - '/usr/share/php/Composer/CaBundle/autoload.php', - '/usr/share/php/Composer/MetadataMinifier/autoload.php', - '/usr/share/php/Composer/Semver/autoload.php', - '/usr/share/php/Composer/Spdx/autoload.php', - '/usr/share/php/Composer/XdebugHandler/autoload.php', - '/usr/share/php/JsonSchema/autoload.php', - '/usr/share/php/Psr/Log/autoload.php', - '/usr/share/php/Seld/JsonLint/autoload.php', - '/usr/share/php/Seld/PharUtils/autoload.php', - '/usr/share/php/Symfony/Component/Console/autoload.php', - '/usr/share/php/Symfony/Component/Filesystem/autoload.php', - '/usr/share/php/Symfony/Component/Finder/autoload.php', - '/usr/share/php/Symfony/Component/Process/autoload.php', - '/usr/share/php/React/Promise/autoload.php' -]); -EOF -} - -src_install() { - insinto "/usr/share/${PN}" - - # Composer expects the LICENSE file to be there, and the - # easiest thing to do is to give it what it wants. - doins -r LICENSE res src vendor - - exeinto "/usr/share/${PN}/bin" - doexe "bin/${PN}" - dosym "../share/${PN}/bin/${PN}" "/usr/bin/${PN}" - - dodoc CHANGELOG.md README.md doc/*.md - dodoc -r doc/articles doc/faqs -} diff --git a/dev-php/composer/files/autoload-r1.php b/dev-php/composer/files/autoload-r1.php deleted file mode 100644 index bece97f17ce0..000000000000 --- a/dev-php/composer/files/autoload-r1.php +++ /dev/null @@ -1,28 +0,0 @@ -<?php -/* Autoloader for composer and its dependencies */ - -$vendorDir = '/usr/share/php'; -if (!class_exists('Fedora\\Autoloader\\Autoload', false)) { - require_once '/usr/share/php/Fedora/Autoloader/autoload.php'; -} - -\Fedora\Autoloader\Autoload::addPsr4( - 'Composer\\', - __DIR__ . '/../src/Composer' -); - -// Dependencies -\Fedora\Autoloader\Dependencies::required(array( - $vendorDir . '/JsonSchema/autoload.php', - $vendorDir . '/Composer/CaBundle/autoload.php', - $vendorDir . '/Composer/Semver/autoload.php', - $vendorDir . '/Composer/Spdx/autoload.php', - $vendorDir . '/Composer/XdebugHandler/autoload.php', - $vendorDir . '/Seld/JsonLint/autoload.php', - $vendorDir . '/Symfony/Component/Console/autoload.php', - $vendorDir . '/Symfony/Component/Finder/autoload.php', - $vendorDir . '/Symfony/Component/Process/autoload.php', - $vendorDir . '/Symfony/Component/Filesystem/autoload.php', - $vendorDir . '/Seld/PharUtils/autoload.php', - $vendorDir . '/Psr/Log/autoload.php', -)); diff --git a/dev-php/composer/metadata.xml b/dev-php/composer/metadata.xml index 1cb173ff9a86..129c05e88ac9 100644 --- a/dev-php/composer/metadata.xml +++ b/dev-php/composer/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person" proxied="yes"> <email>guillaumeseren@gmail.com</email> diff --git a/dev-php/cphplib/cphplib-0.51-r1.ebuild b/dev-php/cphplib/cphplib-0.51-r1.ebuild deleted file mode 100644 index c79a4a612094..000000000000 --- a/dev-php/cphplib/cphplib-0.51-r1.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -KEYWORDS="~amd64 ~x86" - -DESCRIPTION="Cute PHP Library (cphplib)" -HOMEPAGE="http://cphplib.sourceforge.net/" -SRC_URI="mirror://sourceforge/cphplib/${P}.tar.bz2" -LICENSE="LGPL-2.1" -SLOT="0" -IUSE="doc" - -DEPEND=">=dev-php/PEAR-DB-1.7.6-r1" -RDEPEND="${DEPEND}" -PATCHES=( "${FILESDIR}/constructor.patch" ) - -src_install() { - local DOCS=( ChangeLog README TODO ) - local -a HTML_DOCS - insinto "/usr/share/php/${PN}" - doins -r i18n cphplib_formular.inc cphplib.inc - use doc && HTML_DOCS=( doc/packages.html doc/blank.html - doc/classtrees_cphplib.html doc/index.html doc/cphplib/ - doc/errors.html doc/__filesource/ doc/elementindex.html - doc/li_cphplib.html doc/elementindex_cphplib.html doc/media/ ) - einstalldocs -} diff --git a/dev-php/cphplib/cphplib-0.51-r2.ebuild b/dev-php/cphplib/cphplib-0.51-r2.ebuild new file mode 100644 index 000000000000..d40c6df8da76 --- /dev/null +++ b/dev-php/cphplib/cphplib-0.51-r2.ebuild @@ -0,0 +1,26 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="Cute PHP Library (cphplib)" +HOMEPAGE="http://cphplib.sourceforge.net/" +SRC_URI="https://download.sourceforge.net/cphplib/${P}.tar.bz2" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +DEPEND="dev-php/PEAR-DB" +RDEPEND="${DEPEND}" + +PATCHES=( "${FILESDIR}/${PN}-0.51-constructor.patch" ) + +src_install() { + insinto "/usr/share/php/cphplib" + doins -r i18n cphplib_formular.inc cphplib.inc + + docinto html + dodoc -r doc/. + einstalldocs +} diff --git a/dev-php/cphplib/files/constructor.patch b/dev-php/cphplib/files/cphplib-0.51-constructor.patch index 1ab88d212c1f..1ab88d212c1f 100644 --- a/dev-php/cphplib/files/constructor.patch +++ b/dev-php/cphplib/files/cphplib-0.51-constructor.patch diff --git a/dev-php/cphplib/metadata.xml b/dev-php/cphplib/metadata.xml index ed619841de95..86a21b212527 100644 --- a/dev-php/cphplib/metadata.xml +++ b/dev-php/cphplib/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> diff --git a/dev-php/doctrine-instantiator/Manifest b/dev-php/doctrine-instantiator/Manifest index 222c3c026cde..11ef90f21fab 100644 --- a/dev-php/doctrine-instantiator/Manifest +++ b/dev-php/doctrine-instantiator/Manifest @@ -1,5 +1 @@ -DIST doctrine-instantiator-1.0.5.tar.gz 10202 BLAKE2B 77ab3fba96672f6aa2826002510c99c21beccdc09e92dbc2c09426f8fc47590554ef5d32b6bec92ea2dc2ab1c61a178c280ab01090b3aafc14a10a4b4fec3628 SHA512 78b00b2550b47772b5825fbde59729e0613a90c1d9dacf1b7b7d13ccb5bbd8534af7e732dcc1b5b6f9bbafa2f9c3e7418e184851ab0f3a37c0c945b5eed1e229 -DIST doctrine-instantiator-1.1.0.tar.gz 5343 BLAKE2B 73f737f19c8ae7a3fa9a7dcaa760246da6d688e28f15be0c40e031be8147887885bba2ec0a7770ead7de7b718247108b41b4c1d08712137c9c06911bde263176 SHA512 7f59dd7f80df02fd1e46f4b0ecd8488022b34933effddfc40d3424b279a35928adfc0fb7567172149338a8d4273b24305eaa46fc51aa0af45a7b230646354f09 -DIST doctrine-instantiator-1.3.0.tar.gz 6299 BLAKE2B 6eb41562f52965381a780243475bda73a921d44784a66cf23816dd228efe4299d225f0cd52a4625a3516d8ae22b7f691a2724b477b944211e8d1ffd2c4c90540 SHA512 989b14bb28f75d091243dd5833a0a7c91889b45a1fcafb425b38de223485aae4470e1f1877b024ca58c5cf3539f8b39ef337166dbbd664bede7a5f3adde623a9 -DIST doctrine-instantiator-1.3.1.tar.gz 6328 BLAKE2B 1854e188cb39131a7ad02698d8a43c2eb84f7ec0239c04f973a7e66913664d49d4e89a09c1ec74b07ef87ecdf3dadb3c61140dcc3727556c44d65d8c022cc821 SHA512 eb5de9d38d45de3306d5481a747ae8164199aff222a52ce9d0fb2c2d18a082c7cf48ea3d670ff81d63c5fe8c2a855c583168a3d810ee9d4bb48d23505aaa80c3 DIST doctrine-instantiator-1.4.0.tar.gz 7760 BLAKE2B 2e2f4822d0509dcfbe87036107643338eb7b740cd257150c3e6e5149aeb543e2283b3616ef261d048f2e5800c869a5be0db0192e135e944d5c03c2bea1422316 SHA512 f760d1717683bb3f3bacf2a8da31aa842bb623bc7fe2bcd9dcaab71389546da6f4f50a4e35e483857ac32f9a0d58493e74d0459d5bc49595a47f4523da086aca diff --git a/dev-php/doctrine-instantiator/doctrine-instantiator-1.0.5.ebuild b/dev-php/doctrine-instantiator/doctrine-instantiator-1.0.5.ebuild deleted file mode 100644 index a23240d92e3d..000000000000 --- a/dev-php/doctrine-instantiator/doctrine-instantiator-1.0.5.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -MY_PN="${PN/doctrine-//}" - -DESCRIPTION="Utility to instantiate objects in PHP without invoking their constructors" -HOMEPAGE="https://github.com/doctrine/instantiator" -SRC_URI="https://github.com/doctrine/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86" -IUSE="" - -S="${WORKDIR}/${MY_PN}-${PV}" - -RDEPEND="dev-php/fedora-autoloader - >=dev-lang/php-5.6:*" - -src_install() { - insinto /usr/share/php/ - doins -r src/* - insinto /usr/share/php/Doctrine/Instantiator - doins "${FILESDIR}/autoload.php" -} diff --git a/dev-php/doctrine-instantiator/doctrine-instantiator-1.1.0.ebuild b/dev-php/doctrine-instantiator/doctrine-instantiator-1.1.0.ebuild deleted file mode 100644 index 9801eecf5b4f..000000000000 --- a/dev-php/doctrine-instantiator/doctrine-instantiator-1.1.0.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -MY_PN="${PN/doctrine-//}" - -DESCRIPTION="Utility to instantiate objects in PHP without invoking their constructors" -HOMEPAGE="https://github.com/doctrine/instantiator" -SRC_URI="https://github.com/doctrine/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86" -IUSE="" - -S="${WORKDIR}/${MY_PN}-${PV}" - -RDEPEND="dev-php/fedora-autoloader - >=dev-lang/php-7.1:*" - -src_install() { - insinto /usr/share/php/ - doins -r src/* - insinto /usr/share/php/Doctrine/Instantiator - doins "${FILESDIR}/autoload.php" -} diff --git a/dev-php/doctrine-instantiator/doctrine-instantiator-1.3.0.ebuild b/dev-php/doctrine-instantiator/doctrine-instantiator-1.3.0.ebuild deleted file mode 100644 index 6b79666dab62..000000000000 --- a/dev-php/doctrine-instantiator/doctrine-instantiator-1.3.0.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -MY_PN="${PN/doctrine-//}" - -DESCRIPTION="Utility to instantiate objects in PHP without invoking their constructors" -HOMEPAGE="https://github.com/doctrine/instantiator" -SRC_URI="https://github.com/doctrine/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86" -IUSE="" - -S="${WORKDIR}/${MY_PN}-${PV}" - -RDEPEND="dev-php/fedora-autoloader - >=dev-lang/php-7.1:*" - -src_install() { - insinto /usr/share/php/ - doins -r src/* - insinto /usr/share/php/Doctrine/Instantiator - doins "${FILESDIR}/autoload.php" -} diff --git a/dev-php/doctrine-instantiator/doctrine-instantiator-1.3.1.ebuild b/dev-php/doctrine-instantiator/doctrine-instantiator-1.3.1.ebuild deleted file mode 100644 index 32e5559d8548..000000000000 --- a/dev-php/doctrine-instantiator/doctrine-instantiator-1.3.1.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -MY_PN="${PN/doctrine-//}" - -DESCRIPTION="Utility to instantiate objects in PHP without invoking their constructors" -HOMEPAGE="https://github.com/doctrine/instantiator" -SRC_URI="https://github.com/doctrine/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86" -IUSE="" - -S="${WORKDIR}/${MY_PN}-${PV}" - -RDEPEND="dev-php/fedora-autoloader - >=dev-lang/php-7.1:*" - -src_install() { - insinto /usr/share/php/ - doins -r src/* - insinto /usr/share/php/Doctrine/Instantiator - doins "${FILESDIR}/autoload.php" -} diff --git a/dev-php/doctrine-instantiator/doctrine-instantiator-1.4.0.ebuild b/dev-php/doctrine-instantiator/doctrine-instantiator-1.4.0.ebuild index 2024f91b3039..e57f85dec827 100644 --- a/dev-php/doctrine-instantiator/doctrine-instantiator-1.4.0.ebuild +++ b/dev-php/doctrine-instantiator/doctrine-instantiator-1.4.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 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="amd64 arm ~hppa ppc ppc64 ~s390 sparc x86" IUSE="" BDEPEND="dev-php/theseer-Autoload" diff --git a/dev-php/doctrine-instantiator/files/autoload.php b/dev-php/doctrine-instantiator/files/autoload.php deleted file mode 100644 index 978f45e6a24a..000000000000 --- a/dev-php/doctrine-instantiator/files/autoload.php +++ /dev/null @@ -1,8 +0,0 @@ -<?php -/* Autoloader for dev-php/doctrine-instantiator */ - -if (!class_exists('Fedora\\Autoloader\\Autoload', false)) { - require_once '/usr/share/php/Fedora/Autoloader/autoload.php'; -} - -Fedora\Autoloader\Autoload::addPsr4('Doctrine\\Instantiator\\', __DIR__); diff --git a/dev-php/doctrine-instantiator/metadata.xml b/dev-php/doctrine-instantiator/metadata.xml index 75fefe8c5c64..57e43c1d0f55 100644 --- a/dev-php/doctrine-instantiator/metadata.xml +++ b/dev-php/doctrine-instantiator/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> diff --git a/dev-php/doctrine/Manifest b/dev-php/doctrine/Manifest index c1149500eb90..d99d744b0833 100644 --- a/dev-php/doctrine/Manifest +++ b/dev-php/doctrine/Manifest @@ -1,2 +1 @@ -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-2.6.1.ebuild b/dev-php/doctrine/doctrine-2.6.1.ebuild deleted file mode 100644 index edd7e6575055..000000000000 --- a/dev-php/doctrine/doctrine-2.6.1.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -MY_P="${PN}2-${PV}" -DESCRIPTION="An object relational mapper for PHP" -HOMEPAGE="https://www.doctrine-project.org/" -SRC_URI="https://github.com/${PN}/${PN}2/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="2" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND=">=dev-lang/php-7.1:*[cli,pdo]" -DEPEND="" - -S="${WORKDIR}/${MY_P}" - -src_install() { - insinto /usr/share/php - doins -r lib/Doctrine - insinto /usr/share/php/Doctrine - exeinto /usr/share/php/Doctrine - doins bin/doctrine.php - doexe bin/doctrine - dosym ../share/php/Doctrine/doctrine /usr/bin/doctrine -} diff --git a/dev-php/doctrine/metadata.xml b/dev-php/doctrine/metadata.xml index 938c67e8b180..5bc3fb21cbc5 100644 --- a/dev-php/doctrine/metadata.xml +++ b/dev-php/doctrine/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> diff --git a/dev-php/fedora-autoloader/fedora-autoloader-1.0.1.ebuild b/dev-php/fedora-autoloader/fedora-autoloader-1.0.1.ebuild index 9e33ae0060b2..025b6ef72301 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-2021 Gentoo Authors +# Copyright 1999-2024 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="amd64 arm ~arm64 ~hppa ppc ppc64 ~s390 sparc x86" IUSE="test" diff --git a/dev-php/fedora-autoloader/metadata.xml b/dev-php/fedora-autoloader/metadata.xml index abb6b8880a1a..565cdde98c8f 100644 --- a/dev-php/fedora-autoloader/metadata.xml +++ b/dev-php/fedora-autoloader/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person" proxied="yes"> <email>guillaumeseren@gmail.com</email> diff --git a/dev-php/geos-php/Manifest b/dev-php/geos-php/Manifest index 87ff289e412d..4aeef013a477 100644 --- a/dev-php/geos-php/Manifest +++ b/dev-php/geos-php/Manifest @@ -1 +1 @@ -DIST geos-php-1.0.0.tar.gz 40870 BLAKE2B c6d526470bdb7e4aecce6ce5f2132f90a6c40e5a2b3a8169bbb7ae101394340aad8a23309130c7f1421e19162b5559f9e87e58fb704e91b1fc03b612543551e8 SHA512 4ceb9e1152d0b534bc3a5e372be0b98770b1883ec4dda1177c9399d95d947b9feee412accf003d27b55b1a901c90259a9b38792b453dac11cb8af26af3cd91ec +DIST geos-php-1.0.0_p20220909.tar.gz 43257 BLAKE2B b1ee853e6d09f2bcc2bc32ad5eea29c3cb35d742d3037f836c575099de0b806519dc23a1fc9c322d377eb39c4b935029b47043c3ee5ab232537196686c627feb SHA512 4beae67902eaf1201d997db4ccf8e332e98699da031377878e0e144ae2f488bdf00b4a4d58b87082140ee18a4c04211f61de029fd523db90531245a450839001 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 deleted file mode 100644 index e08f1b739051..000000000000 --- a/dev-php/geos-php/files/1.0.0/0001-fix-test-for-7.3-int-vs-integer.patch +++ /dev/null @@ -1,34 +0,0 @@ -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 deleted file mode 100644 index 78509b766224..000000000000 --- a/dev-php/geos-php/files/1.0.0/0002-fix-error-message-with-php-7-Wformat-warnings-raised.patch +++ /dev/null @@ -1,37 +0,0 @@ -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 deleted file mode 100644 index a1ab29fb4a70..000000000000 --- a/dev-php/geos-php/files/1.0.0/0003-add-all-arginfo-and-fix-build-with-PHP-8-part2.patch +++ /dev/null @@ -1,422 +0,0 @@ -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 deleted file mode 100644 index 7422a44203a4..000000000000 --- a/dev-php/geos-php/files/1.0.0/0003-add-all-arginfo-and-fix-build-with-PHP-8.patch +++ /dev/null @@ -1,341 +0,0 @@ -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 deleted file mode 100644 index 97592903b6cc..000000000000 --- a/dev-php/geos-php/files/1.0.0/0004-fix-for-8.0.0RC1.patch +++ /dev/null @@ -1,25 +0,0 @@ -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 deleted file mode 100644 index 14eae9d90790..000000000000 --- a/dev-php/geos-php/files/1.0.0/0005-fix-all-zend_parse_parameters-call-to-use-zend_long.patch +++ /dev/null @@ -1,123 +0,0 @@ -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-r1.ebuild b/dev-php/geos-php/geos-php-1.0.0_p20220909.ebuild index e37462a2d190..b97d44bc5278 100644 --- a/dev-php/geos-php/geos-php-1.0.0-r1.ebuild +++ b/dev-php/geos-php/geos-php-1.0.0_p20220909.ebuild @@ -1,32 +1,28 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="7" +EAPI="8" PHP_EXT_NAME="geos" PHP_EXT_INI="yes" PHP_EXT_ZENDEXT="no" -USE_PHP="php7-3 php7-4 php8-0" - -MY_PV="${PV/_/}" -MY_PV="${MY_PV/rc/RC}" +USE_PHP="php8-1 php8-2" S="${WORKDIR}/php-geos" inherit php-ext-source-r3 KEYWORDS="~amd64 ~x86" - +SNAPSHOT="ee5ca8f3739a4e3c1cdeb0abf4f1a47d9ca751a5" DESCRIPTION="A PHP interface to GEOS - Geometry Engine, Open Source" -HOMEPAGE="https://trac.osgeo.org/geos" -SRC_URI="https://git.osgeo.org/gitea/geos/php-geos/archive/${PV}.tar.gz -> ${P}.tar.gz" +HOMEPAGE="https://libgeos.org/" +SRC_URI="https://git.osgeo.org/gitea/geos/php-geos/archive/${SNAPSHOT}.tar.gz -> ${P}.tar.gz" LICENSE="LGPL-2.1" SLOT="0" RDEPEND="sci-libs/geos[-php(-)]" DEPEND="sci-libs/geos[-php(-)]" DOCS=( README.md CREDITS NEWS TODO ) -PATCHES=( "${FILESDIR}/${PV}" ) PHP_EXT_ECONF_ARGS=() src_prepare() { diff --git a/dev-php/geos-php/metadata.xml b/dev-php/geos-php/metadata.xml index b86acf66c756..222c77f3742a 100644 --- a/dev-php/geos-php/metadata.xml +++ b/dev-php/geos-php/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> diff --git a/dev-php/igbinary/Manifest b/dev-php/igbinary/Manifest index cfd326d3bf5b..cd55d0d6d327 100644 --- a/dev-php/igbinary/Manifest +++ b/dev-php/igbinary/Manifest @@ -1,5 +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 -DIST igbinary-3.2.2.tar.gz 242955 BLAKE2B 479f1b79c84b3979659a1d596f78345e6c75e9444971b547e8f1a3fe9b4aec3ba321d7a325b734f069fb1d4cb0b5c4ea5ae6586d5e50026698dc6aaa2e972bbd SHA512 d9fd460e6d62c8ca86de0e99681714ae45b2f7c66ff76279cd376582f9e8e932e8fa0ee37c25fde82390643a543fefc3ba5cbf181d5ffa31a3ab8301c092e0ff -DIST igbinary-3.2.3.tar.gz 244497 BLAKE2B d3a19d6c6fd55d7baca9e5aa819f4a96ffe16a22c2db7e76e2b2b99946fa7e451ab1677dbc364fbdf223df25bc2069669d0f4b1f07fa89f0842d7dadad2682da SHA512 13bafdb15ee2f9b3b5fea5ca27fef6207466243b42676abc35cc2877935846cc97633725c50665f799627a1bfd31980881da3261acf91d4503a30a5ab99e72cf +DIST igbinary-3.2.15.tar.gz 255185 BLAKE2B affe47386e65576ee44fc7616a3c1c923a5af4b50308caa02f6c75ea9a2ba483ab90a9c656f5631fb5bee7360a1505525dfadb4083e668b58d149dfc7379bd4e SHA512 285adae14c3104c4c53eec7b7e9b96e097096a06e2517ac554a4ecf5066f9b75318b6e29486cc41aa89a21ef46980285d1fa0d09a1f2b750253951c6d0480869 +DIST igbinary-3.2.7.tar.gz 248481 BLAKE2B 40936fb78b9f01d717daac78f8b707f902d78714e5202fbb1344042c2d30a3b723f9c5b6fd982f7a5002aab65e414ba7f9bda354fec4db82ba3f03fc09663a43 SHA512 1bdb60fa4ac76ef405b55b4a7e7f07c73ccc945a3fad8635934cf83a05ae554ac1a0b64c4b55229f0bd2a3269189d3266a492b064a0338fdb2bf4dfe5c3733e4 +DIST igbinary-3.2.9.tar.gz 251747 BLAKE2B d44711ffc195572a83a000f225776191e7b421e4be3065a668287f356d46fd11536af0a0969a0fc219c38d027f13aec16cfe41f15ea778ef087f7082daa9b8dc SHA512 2789f8517aaefa4e4e736592944361e8bad1ce50687aed161bb4e17bcdfbfec2320df8069c7b39704fa96c614727bd66fb65185b15f72f8c96bb5fda88f2e66f diff --git a/dev-php/igbinary/igbinary-3.1.5.ebuild b/dev-php/igbinary/igbinary-3.1.5.ebuild deleted file mode 100644 index e56a7b7ca346..000000000000 --- a/dev-php/igbinary/igbinary-3.1.5.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PHP_EXT_NAME="${PN}" -PHP_EXT_INI="yes" -PHP_EXT_ZENDEXT="no" -DOCS=( CREDITS NEWS README.md ) -PHP_EXT_ECONF_ARGS=( --enable-${PN} ) - -USE_PHP="php7-1 php7-2 php7-3 php7-4" - -inherit php-ext-source-r3 - -KEYWORDS="amd64 ~arm ~arm64 x86" - -DESCRIPTION="A fast drop-in replacement for the standard PHP serialize" -HOMEPAGE="https://github.com/igbinary/igbinary" -SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -#IUSE="" - -#DEPEND="" -#RDEPEND="" diff --git a/dev-php/igbinary/igbinary-3.1.6-r1.ebuild b/dev-php/igbinary/igbinary-3.1.6-r1.ebuild deleted file mode 100644 index 49b4f02bfb38..000000000000 --- a/dev-php/igbinary/igbinary-3.1.6-r1.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PHP_EXT_NAME="${PN}" -PHP_EXT_INI="yes" -PHP_EXT_ZENDEXT="no" -DOCS=( CREDITS NEWS README.md ) -PHP_EXT_ECONF_ARGS=( --enable-${PN} ) - -USE_PHP="php7-2 php7-3 php7-4 php8-0" - -inherit php-ext-source-r3 - -KEYWORDS="~amd64 ~arm ~arm64 ~x86" - -DESCRIPTION="A fast drop-in replacement for the standard PHP serialize" -HOMEPAGE="https://github.com/igbinary/igbinary" -SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -#IUSE="" - -#DEPEND="" -#RDEPEND="" diff --git a/dev-php/igbinary/igbinary-3.2.1.ebuild b/dev-php/igbinary/igbinary-3.2.1.ebuild deleted file mode 100644 index 8dbeefb1a06f..000000000000 --- a/dev-php/igbinary/igbinary-3.2.1.ebuild +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PHP_EXT_NAME="${PN}" -PHP_EXT_INI="yes" -PHP_EXT_ZENDEXT="no" -DOCS=( CREDITS NEWS README.md ) -PHP_EXT_ECONF_ARGS=( --enable-${PN} ) - -USE_PHP="php7-3 php7-4 php8-0" - -inherit php-ext-source-r3 - -KEYWORDS="~amd64 ~arm ~arm64 ~x86" - -DESCRIPTION="A fast drop-in replacement for the standard PHP serialize" -HOMEPAGE="https://github.com/igbinary/igbinary" -SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" diff --git a/dev-php/igbinary/igbinary-3.2.3.ebuild b/dev-php/igbinary/igbinary-3.2.15.ebuild index a4b536d340b9..59415aba3a05 100644 --- a/dev-php/igbinary/igbinary-3.2.3.ebuild +++ b/dev-php/igbinary/igbinary-3.2.15.ebuild @@ -1,22 +1,20 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 -PHP_EXT_NAME="${PN}" +EAPI=8 + +PHP_EXT_ECONF_ARGS=( --enable-${PN} ) PHP_EXT_INI="yes" +PHP_EXT_NAME="${PN}" PHP_EXT_ZENDEXT="no" -DOCS=( CREDITS NEWS README.md ) -PHP_EXT_ECONF_ARGS=( --enable-${PN} ) - -USE_PHP="php7-3 php7-4 php8-0" +USE_PHP="php8-1 php8-2 php8-3" 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" +KEYWORDS="amd64 ~arm ~arm64 ~x86" diff --git a/dev-php/igbinary/igbinary-3.1.6.ebuild b/dev-php/igbinary/igbinary-3.2.7.ebuild index 579c0d91867e..ae157e8ec5a3 100644 --- a/dev-php/igbinary/igbinary-3.1.6.ebuild +++ b/dev-php/igbinary/igbinary-3.2.7.ebuild @@ -1,14 +1,14 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 PHP_EXT_NAME="${PN}" PHP_EXT_INI="yes" PHP_EXT_ZENDEXT="no" DOCS=( CREDITS NEWS README.md ) PHP_EXT_ECONF_ARGS=( --enable-${PN} ) -USE_PHP="php7-1 php7-2 php7-3 php7-4" +USE_PHP="php8-1" inherit php-ext-source-r3 @@ -20,7 +20,3 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="BSD" SLOT="0" -#IUSE="" - -#DEPEND="" -#RDEPEND="" diff --git a/dev-php/igbinary/igbinary-3.2.2.ebuild b/dev-php/igbinary/igbinary-3.2.9.ebuild index a4b536d340b9..4e1211e63ed7 100644 --- a/dev-php/igbinary/igbinary-3.2.2.ebuild +++ b/dev-php/igbinary/igbinary-3.2.9.ebuild @@ -1,22 +1,20 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 -PHP_EXT_NAME="${PN}" +EAPI=8 + +PHP_EXT_ECONF_ARGS=( --enable-${PN} ) PHP_EXT_INI="yes" +PHP_EXT_NAME="${PN}" PHP_EXT_ZENDEXT="no" -DOCS=( CREDITS NEWS README.md ) -PHP_EXT_ECONF_ARGS=( --enable-${PN} ) - -USE_PHP="php7-3 php7-4 php8-0" +USE_PHP="php8-1 php8-2" 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" +KEYWORDS="amd64 arm arm64 x86" diff --git a/dev-php/igbinary/metadata.xml b/dev-php/igbinary/metadata.xml index aa78522f3ec0..7aef975ec07d 100644 --- a/dev-php/igbinary/metadata.xml +++ b/dev-php/igbinary/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> diff --git a/dev-php/jpgraph/Manifest b/dev-php/jpgraph/Manifest index f234700eea72..1cca75dfc431 100644 --- a/dev-php/jpgraph/Manifest +++ b/dev-php/jpgraph/Manifest @@ -1,2 +1 @@ -DIST jpgraph-4.0.2.tar.gz 13298314 BLAKE2B 46506f5a3f331157329c92f61f4843faa7d0774fbdb0cafe58a5609d1c9e9c2f73d4634ffd09cad3c874a45b2ac8658271a343b5e0dfb673f810bf7af6083189 SHA512 db1877c09c13a26d24ef7df4aae50799f55c6d72ca0cdb0b8d8c05928c1bc860f8a86eb52a5fb05bdc1c07574931825baa2989f006e9a4cc57e60913e8b67a3e -DIST jpgraph-4.2.0.tar.gz 13298982 BLAKE2B b5fab9754239f78fbdfebd84872b824400d27fce89a80d82028d2521f7d64ada79efe4eb9c5460f56d882e827f5930eb10a57c3b41a81865dd618b9baf628cf9 SHA512 f0f164663f2e0fca5b827d89c57aaa144765a987ca4ebb82f18102f8cb80057c7f7639b8faae5d6d6ce459257bdfa609d2df6ffe648a7334c58c87ddfe86c334 +DIST jpgraph-4.3.5.tar.gz 13293351 BLAKE2B 246d2446b02b0f01fd8e3960d645897c21604c726541177aa5573620b63ab9a1f5d5318309e1c3ffd159257f02c0d1c7a7b8b563758abeea18161327a4939668 SHA512 7e826147f8f551171463d15add17f65587e879d6e666fcec9872367b7bdea77b2b1fd6b0af03984680d23dfe7c1e21b4f5d2cfd9a45a60c52b62812a5c1ab7ac diff --git a/dev-php/jpgraph/files/gentoo_ttf_dir.patch b/dev-php/jpgraph/files/gentoo_ttf_dir-4.3.5.patch index a10479b3f673..ba4e37c98fba 100644 --- a/dev-php/jpgraph/files/gentoo_ttf_dir.patch +++ b/dev-php/jpgraph/files/gentoo_ttf_dir-4.3.5.patch @@ -21,7 +21,7 @@ index ea16c1e..98cbdc7 100755 // //------------------------------------------------------------------------ // define('CACHE_DIR','/tmp/jpgraph_cache/'); --// define('TTF_DIR','/usr/share/fonts/TrueType/'); +- define('TTF_DIR','/usr/share/fonts/truetype/msttcorefonts/'); +define('TTF_DIR','/usr/share/fonts/corefonts/'); // define('MBTTF_DIR','/usr/share/fonts/TrueType/'); diff --git a/dev-php/jpgraph/jpgraph-4.0.2.ebuild b/dev-php/jpgraph/jpgraph-4.0.2.ebuild deleted file mode 100644 index 4a7a1f338b46..000000000000 --- a/dev-php/jpgraph/jpgraph-4.0.2.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="Object-oriented graphing library for PHP" -HOMEPAGE="http://jpgraph.net/" -# Upstream didn't have a stable download URL when this was packaged. -SRC_URI="https://dev.gentoo.org/~mjo/distfiles/${P}.tar.gz" -LICENSE="QPL-1.0" -SLOT="0" -KEYWORDS="~alpha amd64 ~hppa ppc sparc x86" -IUSE="truetype examples" - -DEPEND="" -RDEPEND="truetype? ( media-fonts/corefonts ) - dev-lang/php[gd,truetype?]" - -src_prepare() { - default - - # The DejaVu fonts are now bundled with the library and don't need - # to be found in TTF_DIR. Since most of the fonts supported by - # JpGraph are corefonts, we point the sole TTF_DIR towards them for - # maximum impact. Why not apply the patch unconditionally? We want - # to avoid a situation where TTF fonts appear to work, but then - # break without warning when the user e.g. removes corefonts. By - # applying the patch conditionally, we ensure a dependency on - # media-fonts/corefonts before anything will work. - use truetype && eapply "${FILESDIR}/gentoo_ttf_dir.patch" - - # Some of the documentation and examples are shipped in the "src" - # directory. We want them outside of that tree so that we can simply - # call doins recursively on "src". First, rename the existing "docs" - # directory which contains the HTML manual and class reference. - mv docs html || die 'failed to rename "docs" directory' - mv src/README ./ || die 'failed to relocate the README' - mv src/Examples ./examples || die 'failed to relocate the examples' - - # These are present (duplicated) in the other Examples directory, - # and don't work anyway. - rm -r src/barcode || die 'failed to remove some barcode examples' - - # We'll also want to install the config file to /etc, since it may - # need to be edited by the user. - mv src/jpg-config.inc.php ./ || die 'failed to relocate the config file' - rm src/jpg-config.inc.php.orig || die 'failed to remove original config file' -} - -src_install() { - dodoc README - dodoc -r html - use examples && dodoc -r examples - - insinto "/usr/share/php/${PN}" - doins -r src/* - - insinto /etc - doins jpg-config.inc.php - # Create a symlink for the config file, because the library will only - # look for it in its own source tree (not in /etc where we've put it). - dosym ../../../../etc/jpg-config.inc.php "/usr/share/php/${PN}/jpg-config.inc.php" -} diff --git a/dev-php/jpgraph/jpgraph-4.2.0.ebuild b/dev-php/jpgraph/jpgraph-4.3.5.ebuild index b7565d393188..76e4ea880fec 100644 --- a/dev-php/jpgraph/jpgraph-4.2.0.ebuild +++ b/dev-php/jpgraph/jpgraph-4.3.5.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 DESCRIPTION="Object-oriented graphing library for PHP" HOMEPAGE="http://jpgraph.net/" @@ -9,7 +9,7 @@ HOMEPAGE="http://jpgraph.net/" SRC_URI="https://dev.gentoo.org/~grknight/distfiles/${P}.tar.gz" LICENSE="QPL-1.0" SLOT="0" -KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86" +KEYWORDS="amd64 ~hppa ppc sparc x86" IUSE="truetype examples" DEPEND="" @@ -27,7 +27,7 @@ src_prepare() { # break without warning when the user e.g. removes corefonts. By # applying the patch conditionally, we ensure a dependency on # media-fonts/corefonts before anything will work. - use truetype && eapply "${FILESDIR}/gentoo_ttf_dir.patch" + use truetype && eapply "${FILESDIR}/gentoo_ttf_dir-4.3.5.patch" # Some of the documentation and examples are shipped in the "src" # directory. We want them outside of that tree so that we can simply @@ -44,7 +44,6 @@ src_prepare() { # We'll also want to install the config file to /etc, since it may # need to be edited by the user. mv src/jpg-config.inc.php ./ || die 'failed to relocate the config file' - rm src/jpg-config.inc.php.orig || die 'failed to remove original config file' } src_install() { diff --git a/dev-php/jpgraph/metadata.xml b/dev-php/jpgraph/metadata.xml index b86acf66c756..666e6402df14 100644 --- a/dev-php/jpgraph/metadata.xml +++ b/dev-php/jpgraph/metadata.xml @@ -1,8 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> <name>PHP</name> </maintainer> + <stabilize-allarches /> </pkgmetadata> diff --git a/dev-php/json-schema/Manifest b/dev-php/json-schema/Manifest index d1c08a6e21a0..c8b024583548 100644 --- a/dev-php/json-schema/Manifest +++ b/dev-php/json-schema/Manifest @@ -1 +1,2 @@ DIST json-schema-5.2.10.tar.gz 31261 BLAKE2B 2f2e3f562552105e924aa3e4408e50c6e42171cb8440ca8009166d956dcb9d4d6a3903c3b7e62bcfa228069c1e17f4faeab56e56ff935fd59fe251d27d12ab3a SHA512 b6d31b5478b93ef7dea741307648734d4d93aa4c0518b0037e81f5411810ea0570a046adb314cbee3f06da4cc9e654c419ff0be75b6ad0f5d3770c03be5707c8 +DIST json-schema-5.2.11.tar.gz 31273 BLAKE2B 7b5309c772816de08a6a3b600cef1291385357879cfb1e48f548ca2cb666fc87454064d090d4ab662d7937f0bec99bc4f0f304876dd2482896aa5bf41b2ed85e SHA512 1b1981dd12fd8642c26d3be75b40111320f89b6a917dabad087ff40d3baea78304e5611cf2b931e6f8e48f5ee4d14fcbe18c68ba76a90b59702783aea5d63477 diff --git a/dev-php/json-schema/json-schema-5.2.11.ebuild b/dev-php/json-schema/json-schema-5.2.11.ebuild new file mode 100644 index 000000000000..960e3c8a93da --- /dev/null +++ b/dev-php/json-schema/json-schema-5.2.11.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DESCRIPTION="PHP implementation of JSON schema" +HOMEPAGE="https://github.com/justinrainbow/json-schema" +SRC_URI="https://github.com/justinrainbow/json-schema/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="amd64 ~arm64 x86" +IUSE="test" +# Tests are not in the release tarball +RESTRICT="test" + +RDEPEND=" + dev-lang/php:* + dev-php/fedora-autoloader" +DEPEND=" + test? ( + ${RDEPEND} + dev-php/phpunit )" + +src_prepare() { + default + if use test; then + cp "${FILESDIR}"/autoload.php "${S}"/autoload-test.php || die + fi +} + +src_install() { + insinto "/usr/share/php/JsonSchema" + doins -r src/JsonSchema/. "${FILESDIR}"/autoload.php + dodoc README.md +} + +src_test() { + phpunit --bootstrap "${S}"/autoload-test.php || die "test suite failed" +} diff --git a/dev-php/json-schema/metadata.xml b/dev-php/json-schema/metadata.xml index a7c4a1c3879c..f9f1da4f17f5 100644 --- a/dev-php/json-schema/metadata.xml +++ b/dev-php/json-schema/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person" proxied="yes"> <email>guillaumeseren@gmail.com</email> diff --git a/dev-php/jsonlint/jsonlint-1.8.3-r1.ebuild b/dev-php/jsonlint/jsonlint-1.8.3-r1.ebuild index 55d83a4e8228..ca9fd6316146 100644 --- a/dev-php/jsonlint/jsonlint-1.8.3-r1.ebuild +++ b/dev-php/jsonlint/jsonlint-1.8.3-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -9,7 +9,7 @@ SRC_URI="https://github.com/Seldaek/jsonlint/archive/${PV}.tar.gz -> ${P}.tar.gz LICENSE="MIT" SLOT="0" -KEYWORDS="amd64 x86" +KEYWORDS="amd64 ~arm64 x86" IUSE="" BDEPEND="dev-php/theseer-Autoload" diff --git a/dev-php/jsonlint/metadata.xml b/dev-php/jsonlint/metadata.xml index 99bc258e7da3..bcfe56f9986c 100644 --- a/dev-php/jsonlint/metadata.xml +++ b/dev-php/jsonlint/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person" proxied="yes"> <email>guillaumeseren@gmail.com</email> diff --git a/dev-php/libchart/Manifest b/dev-php/libchart/Manifest deleted file mode 100644 index d8299b8d133b..000000000000 --- a/dev-php/libchart/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST libchart-1.3.tar.gz 106204 BLAKE2B 55e133ad55b54377211cf165ac77a545ba770942f383c3839ce1eacf82afaf831ec80711375a4ff4a7be55f1e4270fb886dafae2a21b1a041c5da5384e4aee93 SHA512 5d2a0b014546487029f552f225fa83de856210a997e69bb5b129e99790f5acfdcfff904077126c42f82974d10f81e7e0342991221af5f108902b2792df24d586 diff --git a/dev-php/libchart/libchart-1.3.ebuild b/dev-php/libchart/libchart-1.3.ebuild deleted file mode 100644 index b2e443283bed..000000000000 --- a/dev-php/libchart/libchart-1.3.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="Easy-to-use chart creation library for PHP" -HOMEPAGE="https://naku.dohcrew.com/libchart https://github.com/naku/libchart" -SRC_URI="https://github.com/naku/${PN}/releases/download/release/${PV}/${P}.tar.gz" - -LICENSE="GPL-3 BitstreamVera" -KEYWORDS="~amd64 ~x86" -SLOT=0 -IUSE="examples" - -DEPEND="" -RDEPEND="dev-lang/php:*[gd,truetype]" - -S="${WORKDIR}/${PN}" - -src_install() { - dodoc "${PN}"/{ChangeLog,README} - - if use examples ; then - # PHP won't run a compressed example... - docompress -x "/usr/share/doc/${PF}/demo" - dodoc -r demo/ - fi - - insinto "/usr/share/php/${PN}" - doins -r "${PN}"/{classes,fonts,images} -} diff --git a/dev-php/libchart/metadata.xml b/dev-php/libchart/metadata.xml deleted file mode 100644 index fb6b9991bc6b..000000000000 --- a/dev-php/libchart/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>php-bugs@gentoo.org</email> - <name>PHP</name> - </maintainer> - <upstream> - <remote-id type="github">naku/libchart</remote-id> - </upstream> -</pkgmetadata> diff --git a/dev-php/libvirt-php/Manifest b/dev-php/libvirt-php/Manifest index 22401cf67144..5d5bfed32d86 100644 --- a/dev-php/libvirt-php/Manifest +++ b/dev-php/libvirt-php/Manifest @@ -1,2 +1,3 @@ -DIST libvirt-php-0.5.4.tar.gz 780793 BLAKE2B 8bb4577c26cc0ef8f2a0ae813ade7f5fdea9a2a7d70c97cab1033fde21d9a1c27b8c2ad7a8284096e143e955202bb564767b4d7e1a4bb9e15993895adc119288 SHA512 b5b204549e6810668203d1df8404a5cb71f646ae7e01ea223c6e9b9eec9b1f6500cc5bb4559859959d821a213ff992f22a97e4b683da2c683be3732710943487 -DIST libvirt-php-0.5.5.tar.gz 761250 BLAKE2B 9899d2f0e5ea387333decce5071afc81d4160d54ef570dcbe04422dc3e93479ee57520f9bf33a0275ee86cd4b1c87e5a3f7d5118e0cd87658faed44d2ccd4807 SHA512 2ea263561a0bf5d155314e06dcf3c3b5c278640bc5edfa674cdd777cb6d0810bda0492c6cf77a02bc88fb6aa99b0ff1f0cbaeea87ff2e45bff9b5774a2507684 +DIST libvirt-php-0.5.6.tar.xz 386372 BLAKE2B 30d6a1c8dd18a4bd9d46e9c20551978fa0c20f2d671a359fdbf86def5166df7f882e65c509087efe0acef7d0dc468b3eb520689f9e7ba552e966809c8f647390 SHA512 5d1b3a2afc697051a5a0d4750ce4d02b31f482b1c17ef2cf4a593b705de438d8ccb4b1543ce6b2520b450734b3634e64ccf9200227f5681cbd2daad5a9f5ee9c +DIST libvirt-php-0.5.7.tar.xz 389380 BLAKE2B c8189ffdeb29a056ef959624cd46a18ce7e4e00df6a42bfb3d6349ee8aa3865a4d66b82aed9ee4f68aa7f9761adb8eb8b62bd15d7c6e8e17c187ae44eba71a86 SHA512 ecc640ce2c936f59824212eca36bbe3ae13c560854e0d86da9f1d4d02373751f974b374915ded57d74636c0443c09c895857e8701204fbf49c402c1f315ae0b7 +DIST libvirt-php-0.5.8.tar.xz 392316 BLAKE2B 5c1746512a405aaa32840b47f867804d854006a3ed38db168b8a60b8a6d5c4c454b5070c71a7dce8669377842c8063b78bb1894c7a69a8ff439b770f3867a3d2 SHA512 efff730f101a2b4210d720bf1e9a7bb86b41caaf45de31241be05a64ea71b8bca52c73b23a39137d5849ac9f4d2d309acb72111e3e64f0b47211991e4a6a2d9a diff --git a/dev-php/libvirt-php/libvirt-php-0.5.4-r1.ebuild b/dev-php/libvirt-php/libvirt-php-0.5.6.ebuild index cc5be73d2db7..5229d5609e03 100644 --- a/dev-php/libvirt-php/libvirt-php-0.5.4-r1.ebuild +++ b/dev-php/libvirt-php/libvirt-php-0.5.6.ebuild @@ -1,18 +1,18 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="7" +EAPI="8" PHP_EXT_NAME="libvirt-php" PHP_EXT_SKIP_PHPIZE="yes" -USE_PHP="php5-6 php7-0 php7-1 php7-2 php7-3" +USE_PHP="php8-1" PHP_EXT_ECONF_ARGS=() inherit php-ext-source-r3 autotools DESCRIPTION="PHP bindings for libvirt" HOMEPAGE="http://libvirt.org/php/" -SRC_URI="http://libvirt.org/sources/php/${P}.tar.gz" +SRC_URI="http://libvirt.org/sources/php/${P}.tar.xz" LICENSE="LGPL-2.1" SLOT="0" @@ -26,9 +26,7 @@ DEPEND="${RDEPEND} virtual/pkgconfig doc? ( app-text/xhtml1 )" -RESTRICT="test" -# ChangeLog and NEWS are empty files -DOCS=( AUTHORS README ) +DOCS=( ChangeLog NEWS README ) # Remove the insane check for pecl-imagick which is only used in examples # and is not called upon in any build PATCHES=( "${FILESDIR}/remove-imagick-check.patch" ) @@ -38,7 +36,7 @@ src_unpack() { # create the default modules directory to be able # to use the php-ext-source-r3 eclass to configure/build - ln -s src "${S}/modules" + ln -s src "${S}/modules" || die } src_prepare() { @@ -67,3 +65,10 @@ src_install() { dodoc -r docs/* fi } + +src_test() { + for slot in $(php_get_slots); do + php_init_slot_env ${slot} + default + done +} diff --git a/dev-php/libvirt-php/libvirt-php-0.5.5-r1.ebuild b/dev-php/libvirt-php/libvirt-php-0.5.7.ebuild index 093337c9e3c3..ef78286658a8 100644 --- a/dev-php/libvirt-php/libvirt-php-0.5.5-r1.ebuild +++ b/dev-php/libvirt-php/libvirt-php-0.5.7.ebuild @@ -1,18 +1,18 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="7" +EAPI="8" PHP_EXT_NAME="libvirt-php" PHP_EXT_SKIP_PHPIZE="yes" -USE_PHP="php5-6 php7-0 php7-1 php7-2 php7-3" +USE_PHP="php8-1" PHP_EXT_ECONF_ARGS=() -inherit php-ext-source-r3 autotools flag-o-matic +inherit php-ext-source-r3 autotools DESCRIPTION="PHP bindings for libvirt" HOMEPAGE="http://libvirt.org/php/" -SRC_URI="http://libvirt.org/sources/php/${P}.tar.gz" +SRC_URI="http://libvirt.org/sources/php/${P}.tar.xz" LICENSE="LGPL-2.1" SLOT="0" @@ -26,19 +26,14 @@ DEPEND="${RDEPEND} virtual/pkgconfig doc? ( app-text/xhtml1 )" -RESTRICT="test" -# ChangeLog and NEWS are empty files -DOCS=( AUTHORS README ) -# Remove the insane check for pecl-imagick which is only used in examples -# and is not called upon in any build -PATCHES=( "${FILESDIR}/remove-imagick-check.patch" ) +DOCS=( ChangeLog NEWS README ) src_unpack() { default # create the default modules directory to be able # to use the php-ext-source-r3 eclass to configure/build - ln -s src "${S}/modules" + ln -s src "${S}/modules" || die } src_prepare() { @@ -51,11 +46,6 @@ src_prepare() { done } -src_configure() { - append-cflags -fcommon - php-ext-source-r3_src_configure -} - src_install() { local slot for slot in $(php_get_slots); do @@ -72,3 +62,10 @@ src_install() { dodoc -r docs/* fi } + +src_test() { + for slot in $(php_get_slots); do + php_init_slot_env ${slot} + default + done +} diff --git a/dev-php/libvirt-php/libvirt-php-0.5.8.ebuild b/dev-php/libvirt-php/libvirt-php-0.5.8.ebuild new file mode 100644 index 000000000000..5f7d2c0938b2 --- /dev/null +++ b/dev-php/libvirt-php/libvirt-php-0.5.8.ebuild @@ -0,0 +1,71 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="8" + +PHP_EXT_NAME="libvirt-php" +PHP_EXT_SKIP_PHPIZE="yes" +USE_PHP="php8-1 php8-2 php8-3" +PHP_EXT_ECONF_ARGS=() + +inherit php-ext-source-r3 autotools + +DESCRIPTION="PHP bindings for libvirt" +HOMEPAGE="http://libvirt.org/php/" +SRC_URI="http://libvirt.org/sources/php/${P}.tar.xz" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~amd64" +IUSE="doc" + +RDEPEND="app-emulation/libvirt + dev-libs/libxml2" +DEPEND="${RDEPEND} + dev-libs/libxslt + virtual/pkgconfig + doc? ( app-text/xhtml1 )" + +DOCS=( ChangeLog NEWS README ) + +src_unpack() { + default + + # create the default modules directory to be able + # to use the php-ext-source-r3 eclass to configure/build + ln -s src "${S}/modules" || die +} + +src_prepare() { + php-ext-source-r3_src_prepare + + local slot + for slot in $(php_get_slots); do + php_init_slot_env "${slot}" + eautoreconf + done +} + +src_install() { + local slot + for slot in $(php_get_slots); do + php_init_slot_env ${slot} + insinto "${EXT_DIR}" + doins "src/.libs/${PHP_EXT_NAME}.so" + done + + php-ext-source-r3_createinifiles + einstalldocs + + if use doc ; then + docinto html + dodoc -r docs/* + fi +} + +src_test() { + for slot in $(php_get_slots); do + php_init_slot_env ${slot} + default + done +} diff --git a/dev-php/libvirt-php/libvirt-php-9999.ebuild b/dev-php/libvirt-php/libvirt-php-9999.ebuild index 0d75a2ce62a7..198557063654 100644 --- a/dev-php/libvirt-php/libvirt-php-9999.ebuild +++ b/dev-php/libvirt-php/libvirt-php-9999.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="7" +EAPI="8" PHP_EXT_NAME="libvirt-php" PHP_EXT_SKIP_PHPIZE="yes" -USE_PHP="php7-3 php7-4" +USE_PHP="php8-1" PHP_EXT_ECONF_ARGS=() inherit php-ext-source-r3 git-r3 autotools @@ -27,9 +27,6 @@ DEPEND="${RDEPEND} doc? ( app-text/xhtml1 )" DOCS=( ChangeLog NEWS README ) -# Remove the insane check for pecl-imagick which is only used in examples -# and is not called upon in any build -PATCHES=( "${FILESDIR}/remove-imagick-check.patch" ) src_unpack() { git-r3_src_unpack diff --git a/dev-php/libvirt-php/metadata.xml b/dev-php/libvirt-php/metadata.xml index 5fb3e7c1f33e..51ec912fb58a 100644 --- a/dev-php/libvirt-php/metadata.xml +++ b/dev-php/libvirt-php/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>virtualization@gentoo.org</email> @@ -9,4 +9,7 @@ <email>php-bugs@gentoo.org</email> <name>PHP</name> </maintainer> + <upstream> + <remote-id type="gitlab">libvirt/libvirt-php</remote-id> + </upstream> </pkgmetadata> diff --git a/dev-php/maxmind-db-reader/Manifest b/dev-php/maxmind-db-reader/Manifest index d1eea850d39e..43c368c693c9 100644 --- a/dev-php/maxmind-db-reader/Manifest +++ b/dev-php/maxmind-db-reader/Manifest @@ -1 +1 @@ -DIST MaxMind-DB-Reader-php-1.6.0.tar.gz 20898 BLAKE2B cf6922bbd5b2c76fcb9b7a97299f0a73232686bf8facce39355f8a4cc55e98a4d8e64a51eae8427b5f14d6905d4cd85956effa5299cc493bd63708cf52ab30d0 SHA512 e8c0ccf2cfcedf7527b4e3f858d2ed0e70add60692fff4a65f08e5cb885516b7c2a3ceaa3c21713369cd8ffca2b671d764063236de1d729cfc5173f7d5dd4607 +DIST MaxMind-DB-Reader-php-1.11.1.tar.gz 23346 BLAKE2B ad783bbca018befa0f4c6f282bb440baf70ad2c91da0af8fb799ae727a5fc7f9acc1f004972ccc8f358272be2d9fbe4233b0d3526347db175ccc5eb140d139d3 SHA512 86b5cf523d0036a55e79f0721b7df923236146e0d29a9dc37affd61a4ba4bc0587a724aef0654239d009bb85eae4be6e42c2d63a5d2edf682fa90abdfbd234f0 diff --git a/dev-php/maxmind-db-reader/maxmind-db-reader-1.6.0.ebuild b/dev-php/maxmind-db-reader/maxmind-db-reader-1.11.1.ebuild index aaa418f47bf0..4486a2880177 100644 --- a/dev-php/maxmind-db-reader/maxmind-db-reader-1.6.0.ebuild +++ b/dev-php/maxmind-db-reader/maxmind-db-reader-1.11.1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="7" +EAPI="8" MY_PN="MaxMind-DB-Reader-php" MY_P="${MY_PN}-${PV}" @@ -10,7 +10,7 @@ PHP_EXT_S="${S}/ext" PHP_EXT_NAME="maxminddb" PHP_EXT_OPTIONAL_USE="extension" -USE_PHP="php7-2 php7-3 php7-4" +USE_PHP="php8-1 php8-2 php8-3" inherit php-ext-source-r3 @@ -20,7 +20,7 @@ SRC_URI="https://github.com/maxmind/${MY_PN}/archive/v${PV}.tar.gz -> ${MY_P}.ta LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~amd64" +KEYWORDS="~amd64 ~x86" IUSE="extension test" RESTRICT="!test? ( test )" diff --git a/dev-php/maxmind-db-reader/metadata.xml b/dev-php/maxmind-db-reader/metadata.xml index 329d808d30df..f74314c43c0c 100644 --- a/dev-php/maxmind-db-reader/metadata.xml +++ b/dev-php/maxmind-db-reader/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> diff --git a/dev-php/metadata-minifier/metadata-minifier-1.0.0.ebuild b/dev-php/metadata-minifier/metadata-minifier-1.0.0.ebuild index 9327082fb5f8..8a8e6e90f2f1 100644 --- a/dev-php/metadata-minifier/metadata-minifier-1.0.0.ebuild +++ b/dev-php/metadata-minifier/metadata-minifier-1.0.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -9,7 +9,7 @@ SRC_URI="https://github.com/composer/metadata-minifier/archive/${PV}.tar.gz -> $ LICENSE="MIT" SLOT="0" -KEYWORDS="amd64 x86" +KEYWORDS="amd64 ~arm64 x86" BDEPEND="dev-php/theseer-Autoload" diff --git a/dev-php/metadata-minifier/metadata.xml b/dev-php/metadata-minifier/metadata.xml index ce3c65e2b568..dcc8f0b4c363 100644 --- a/dev-php/metadata-minifier/metadata.xml +++ b/dev-php/metadata-minifier/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> diff --git a/dev-php/metadata.xml b/dev-php/metadata.xml index 6ef3359ac60f..c394a45191bf 100644 --- a/dev-php/metadata.xml +++ b/dev-php/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE catmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <catmetadata> <longdescription lang="en"> The dev-php category contains libraries and utilities relevant to the diff --git a/dev-php/mmslib/metadata.xml b/dev-php/mmslib/metadata.xml index b86acf66c756..222c77f3742a 100644 --- a/dev-php/mmslib/metadata.xml +++ b/dev-php/mmslib/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> diff --git a/dev-php/mmslib/mmslib-0.97-r1.ebuild b/dev-php/mmslib/mmslib-0.97-r1.ebuild new file mode 100644 index 000000000000..ce52f868bffc --- /dev/null +++ b/dev-php/mmslib/mmslib-0.97-r1.ebuild @@ -0,0 +1,23 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="Encoding, decoding, and sending of MMS:es" +HOMEPAGE="https://www.hellkvist.org/software/#MMSLIB" +SRC_URI="https://www.hellkvist.org/software/mmslib/${P}.tar.gz" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="examples" + +RDEPEND="dev-lang/php:*" + +src_install() { + insinto "/usr/share/php/mmslib" + doins mmslib.php + + einstalldocs + use examples && dodoc -r samples content +} diff --git a/dev-php/mmslib/mmslib-0.97.ebuild b/dev-php/mmslib/mmslib-0.97.ebuild deleted file mode 100644 index a622ac5b7a3b..000000000000 --- a/dev-php/mmslib/mmslib-0.97.ebuild +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="library for encoding, decoding, and sending MMSes" -HOMEPAGE="http://www.hellkvist.org/software/#MMSLIB" -SRC_URI="http://www.hellkvist.org/software/mmslib/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="examples" - -DEPEND="" -RDEPEND="dev-lang/php:*" - -src_install() { - insinto "/usr/share/php/${PN}" - doins mmslib.php - - dodoc README - use examples && dodoc -r samples content -} diff --git a/dev-php/mockery/Manifest b/dev-php/mockery/Manifest deleted file mode 100644 index 76238ea2211c..000000000000 --- a/dev-php/mockery/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST Mockery-0.9.0.tgz 30330 BLAKE2B 6b5493ee84da2f1bd43aafa4df1555577771782740061480f047af6fd262d716ec03c025716215e37638826f14721414ad31ac527354e2a4b0b5cb691f120cf3 SHA512 744f7727395feb1009ae879dd9f336a314c70d96e848efe19c399d3abee42950606352a0781a1664178f77485933491928a1bddbcdb86a5092d69434868eee1c diff --git a/dev-php/mockery/files/channel.xml b/dev-php/mockery/files/channel.xml deleted file mode 100644 index b9fe38d87b18..000000000000 --- a/dev-php/mockery/files/channel.xml +++ /dev/null @@ -1,16 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" ?> -<channel version="1.0" xmlns="http://pear.php.net/channel-1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://pear.php.net/channel-1.0 http://pear.php.net/dtd/channel-1.0.xsd"> - <name>pear.survivethedeepend.com</name> - <summary>Survive The Deep End PEAR Channel</summary> - <suggestedalias>deepend</suggestedalias> - <servers> - <primary> - <rest> - <baseurl type="REST1.0">http://pear.survivethedeepend.com/rest/</baseurl> - <baseurl type="REST1.1">http://pear.survivethedeepend.com/rest/</baseurl> - <baseurl type="REST1.2">http://pear.survivethedeepend.com/rest/</baseurl> - <baseurl type="REST1.3">http://pear.survivethedeepend.com/rest/</baseurl> - </rest> - </primary> - </servers> -</channel>
\ No newline at end of file diff --git a/dev-php/mockery/metadata.xml b/dev-php/mockery/metadata.xml deleted file mode 100644 index 03bef7dd7fdf..000000000000 --- a/dev-php/mockery/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>php-bugs@gentoo.org</email> - <name>PHP</name> - </maintainer> - <upstream> - <remote-id type="github">padraic/mockery</remote-id> - </upstream> -</pkgmetadata> diff --git a/dev-php/mockery/mockery-0.9.0-r1.ebuild b/dev-php/mockery/mockery-0.9.0-r1.ebuild deleted file mode 100644 index 72490762ba9e..000000000000 --- a/dev-php/mockery/mockery-0.9.0-r1.ebuild +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PHP_PEAR_CHANNEL="${FILESDIR}/channel.xml" -PHP_PEAR_PKG_NAME="Mockery" -PHP_PEAR_DOMAIN="pear.survivethedeepend.com" -inherit php-pear-r2 - -DESCRIPTION="Simple yet flexible PHP mock object framework for use in unit testing" -HOMEPAGE="https://github.com/padraic/mockery" -SRC_URI="http://${PHP_PEAR_URI}/get/${PEAR_P}.tgz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND="" -RDEPEND="" diff --git a/dev-php/myclabs-deepcopy/Manifest b/dev-php/myclabs-deepcopy/Manifest index e8f0bfcda228..ca0b0588fe6e 100644 --- a/dev-php/myclabs-deepcopy/Manifest +++ b/dev-php/myclabs-deepcopy/Manifest @@ -1,4 +1 @@ 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 96b9e4bda654..bdecf9f175f6 100644 --- a/dev-php/myclabs-deepcopy/metadata.xml +++ b/dev-php/myclabs-deepcopy/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> diff --git a/dev-php/myclabs-deepcopy/myclabs-deepcopy-1.10.2.ebuild b/dev-php/myclabs-deepcopy/myclabs-deepcopy-1.10.2.ebuild index b178b2cb055d..a47ab2bf99a9 100644 --- a/dev-php/myclabs-deepcopy/myclabs-deepcopy-1.10.2.ebuild +++ b/dev-php/myclabs-deepcopy/myclabs-deepcopy-1.10.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -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="amd64 arm ~hppa ppc ppc64 ~s390 sparc x86" IUSE="" BDEPEND="dev-php/theseer-Autoload" diff --git a/dev-php/myclabs-deepcopy/myclabs-deepcopy-1.6.0.ebuild b/dev-php/myclabs-deepcopy/myclabs-deepcopy-1.6.0.ebuild deleted file mode 100644 index fa18a80f0e42..000000000000 --- a/dev-php/myclabs-deepcopy/myclabs-deepcopy-1.6.0.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -MY_PN="DeepCopy" - -DESCRIPTION="Create deep copies (clones) of your objects" -HOMEPAGE="https://github.com/myclabs/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="" - -S="${WORKDIR}/${MY_PN}-${PV}" - -RDEPEND="dev-php/fedora-autoloader - >=dev-lang/php-5.6:*" - -src_install() { - insinto /usr/share/php/myclabs - doins -r src/* - insinto /usr/share/php/myclabs/DeepCopy - doins "${FILESDIR}/autoload.php" -} diff --git a/dev-php/myclabs-deepcopy/myclabs-deepcopy-1.6.1.ebuild b/dev-php/myclabs-deepcopy/myclabs-deepcopy-1.6.1.ebuild deleted file mode 100644 index f8f0d622d18f..000000000000 --- a/dev-php/myclabs-deepcopy/myclabs-deepcopy-1.6.1.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -MY_PN="DeepCopy" - -DESCRIPTION="Create deep copies (clones) of your objects" -HOMEPAGE="https://github.com/myclabs/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="" - -S="${WORKDIR}/${MY_PN}-${PV}" - -RDEPEND="dev-php/fedora-autoloader - >=dev-lang/php-5.6:*" - -src_install() { - insinto /usr/share/php/myclabs - doins -r src/* - insinto /usr/share/php/myclabs/DeepCopy - doins "${FILESDIR}/autoload.php" -} diff --git a/dev-php/myclabs-deepcopy/myclabs-deepcopy-1.9.4.ebuild b/dev-php/myclabs-deepcopy/myclabs-deepcopy-1.9.4.ebuild deleted file mode 100644 index 85a4c29148a5..000000000000 --- a/dev-php/myclabs-deepcopy/myclabs-deepcopy-1.9.4.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2020 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="" - -S="${WORKDIR}/${MY_PN}-${PV}" - -RDEPEND="dev-php/fedora-autoloader - >=dev-lang/php-7.1:*" - -src_install() { - insinto /usr/share/php/myclabs - doins -r src/* - insinto /usr/share/php/myclabs/DeepCopy - doins "${FILESDIR}/autoload.php" -} diff --git a/dev-php/nikic-php-parser/Manifest b/dev-php/nikic-php-parser/Manifest new file mode 100644 index 000000000000..0241d5a5919f --- /dev/null +++ b/dev-php/nikic-php-parser/Manifest @@ -0,0 +1 @@ +DIST nikic-php-parser-4.13.2.tar.gz 153762 BLAKE2B 065c5c494f78c2369a6d5ed2613de768eb58d2984abf2c91fb924071dc89f0c1c660cf06c444670d925d4db050880faa916759587db809b2ea519f4b1f0556da SHA512 9097c05694f983c5cd80919ac81a1eb0052e4b63c4c5b680578c576b04f1637fcccf6d93b918725b0b650a2e331d3121c80bd3d3e4c09e7ceed42fd23af7735c diff --git a/dev-php/myclabs-deepcopy/files/autoload.php b/dev-php/nikic-php-parser/files/autoload.php index 0d5d92673b36..76352b3bf039 100644 --- a/dev-php/myclabs-deepcopy/files/autoload.php +++ b/dev-php/nikic-php-parser/files/autoload.php @@ -1,8 +1,8 @@ <?php -/* Autoloader for dev-php/myclabs-deepcopy */ +/* Autoloader for dev-php/nikic-PHP-Parser */ if (!class_exists('Fedora\\Autoloader\\Autoload', false)) { require_once '/usr/share/php/Fedora/Autoloader/autoload.php'; } -Fedora\Autoloader\Autoload::addPsr4('DeepCopy\\', __DIR__); +Fedora\Autoloader\Autoload::addPsr4('PhpParser\\', __DIR__); diff --git a/dev-php/phpspec-prophecy/metadata.xml b/dev-php/nikic-php-parser/metadata.xml index 4e057ba93af9..24d84f3f64d5 100644 --- a/dev-php/phpspec-prophecy/metadata.xml +++ b/dev-php/nikic-php-parser/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> @@ -7,6 +7,6 @@ </maintainer> <stabilize-allarches/> <upstream> - <remote-id type="github">phpspec/prophecy</remote-id> + <remote-id type="github">nikic/PHP-Parser</remote-id> </upstream> </pkgmetadata> diff --git a/dev-php/nikic-php-parser/nikic-php-parser-4.13.2.ebuild b/dev-php/nikic-php-parser/nikic-php-parser-4.13.2.ebuild new file mode 100644 index 000000000000..751e4d9c2faf --- /dev/null +++ b/dev-php/nikic-php-parser/nikic-php-parser-4.13.2.ebuild @@ -0,0 +1,27 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MY_PN="PHP-Parser" + +DESCRIPTION="PHP 5.2 to PHP 8.0 parser written in PHP" +HOMEPAGE="https://github.com/nikic/PHP-Parser" +SRC_URI="https://github.com/nikic/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86" +IUSE="" + +S="${WORKDIR}/${MY_PN}-${PV}" + +RDEPEND="dev-php/fedora-autoloader + >=dev-lang/php-7.1:*[tokenizer(-)]" + +src_install() { + insinto /usr/share/php/nikic + doins -r lib/* + insinto /usr/share/php/nikic/PhpParser/ + doins "${FILESDIR}/autoload.php" +} diff --git a/dev-php/onphp/Manifest b/dev-php/onphp/Manifest deleted file mode 100644 index 186e3fa6ff3a..000000000000 --- a/dev-php/onphp/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST onphp-1.0.11_pre20141124.tar.gz 457828 BLAKE2B 6273483660e25d6b1e2420cab62d151ada9bb97bc7edbcd45075cd60224bf71150c834b7f7bc2677727790f6b876e67858329e7d2912b06d29ddf1900e2c0913 SHA512 d943a787d352f25f9f2fd0eadbae64a71d1fe7f6e56e98f82c803c2da53332ba659a0cc907849ec824a7d9639cde794bd84d5df82a9b724bf1c78da92a396b56 -DIST onphp-api-1.0.10.tar.bz2 35427359 BLAKE2B ed4c339d789698551f93dcf20ae8aee906f39f6d356b34b9760e17398f4163b530100c2169923fd9b1bbd1d35cdaa5a9209239fa8cb893f4a327deb4dda8562a SHA512 4acdb9c804fd2bb7cfbefd22efcb0956972b2b94679627352169948a0fb23f97deca2f7aa77690cf3a5b6614299c0d9515802d9321cfa680e9a4a06d0533d4e5 diff --git a/dev-php/onphp/metadata.xml b/dev-php/onphp/metadata.xml deleted file mode 100644 index b86acf66c756..000000000000 --- a/dev-php/onphp/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>php-bugs@gentoo.org</email> - <name>PHP</name> - </maintainer> -</pkgmetadata> diff --git a/dev-php/onphp/onphp-1.0.11_pre20141124.ebuild b/dev-php/onphp/onphp-1.0.11_pre20141124.ebuild deleted file mode 100644 index 7c375a214679..000000000000 --- a/dev-php/onphp/onphp-1.0.11_pre20141124.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit vcs-snapshot - -KEYWORDS="~amd64 ~x86" - -DESCRIPTION="onPHP is the LGPL'ed multi-purpose object-oriented PHP framework" -HOMEPAGE="https://github.com/onPHP/onphp-framework/" -SRC_URI="https://github.com/onPHP/onphp-framework/archive/706ddd5a2a33bd65a13c4e3ec8c46c5ce700133c.tar.gz -> ${P}.tar.gz - doc? ( http://onphp.org/download/${PN}-api-1.0.10.tar.bz2 ) -" -LICENSE="LGPL-2" -SLOT="0" -IUSE="doc" - -DEPEND="" -RDEPEND="dev-lang/php:*" - -src_install() { - rm doc/LICENSE || die - dodoc $(find doc -maxdepth 1 -type f -print) - if use doc ; then - local HTML_DOCS=( "${WORKDIR}/${PN}-api-1.0.10/" ) - einstalldocs - fi - insinto "/usr/share/php/${PN}" - doins global.inc.php.tpl - doins -r core main meta -} diff --git a/dev-php/pear/metadata.xml b/dev-php/pear/metadata.xml index eba2ca288cb5..3b1963efeb6f 100644 --- a/dev-php/pear/metadata.xml +++ b/dev-php/pear/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> diff --git a/dev-php/pear/pear-1.10.3.ebuild b/dev-php/pear/pear-1.10.3.ebuild index b6581c586165..d68f724acf82 100644 --- a/dev-php/pear/pear-1.10.3.ebuild +++ b/dev-php/pear/pear-1.10.3.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86" +KEYWORDS="~alpha amd64 arm ~hppa ppc ppc64 ~s390 sparc x86" DESCRIPTION="PEAR - PHP Extension and Application Repository" HOMEPAGE="https://pear.php.net/" diff --git a/dev-php/pecl-amqp/Manifest b/dev-php/pecl-amqp/Manifest index 4db152d83dcc..792277fe5c9f 100644 --- a/dev-php/pecl-amqp/Manifest +++ b/dev-php/pecl-amqp/Manifest @@ -1,2 +1 @@ -DIST amqp-1.10.2.tgz 107350 BLAKE2B dd32873d5288ced2ef2c05e6b131f35c31a3514a98d5d3cb8784a989ca1d8637c5ddc7ffa2d73f5bfc2daa4fe718ecf1f08c7ceae64d2e613ef430d18161393b SHA512 a17176bcc02d35a9686d3ca120cca98d808b2a896733f41a28b5d29d43127a0a45b012bc6566de3604f41b8bcc453408a37a8254bcf47e940ebe12bb6f4d4265 -DIST amqp-1.11.0beta.tgz 108054 BLAKE2B 821359d165f4152e423164692b7f7faf367ae33674fd9dd08e4fa91e7b0f33924a81c81e54153e4bcd76336059691751d331059e6f61b34612aea68b4571d6b4 SHA512 e2625cf5e4f1614911d824aa8ab40600502847847808104f101fa409ad0a5df3007594e8a012620bb3ae26632fe20068905100cc2dac35973f9b8e5457d41768 +DIST amqp-1.11.0.tgz 108493 BLAKE2B 5d06ee39f9fef03652ee668695378e30df8c01c57c4ce724b2934bf0754d2a2a9c5998d599a34b2782b5395a5a4bcb69925f6d578ff160dfe7407e7916d468ba SHA512 0f0220fc2f1f9109640e096ab38a4bb06b2569a336b83f527d18dae2b8c21efaf383dade807ee5bb3dbf4447bc3548c15f38ac18155762fe7920ef8939bc0321 diff --git a/dev-php/pecl-amqp/metadata.xml b/dev-php/pecl-amqp/metadata.xml index b86acf66c756..222c77f3742a 100644 --- a/dev-php/pecl-amqp/metadata.xml +++ b/dev-php/pecl-amqp/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> diff --git a/dev-php/pecl-amqp/pecl-amqp-1.10.2.ebuild b/dev-php/pecl-amqp/pecl-amqp-1.11.0.ebuild index 8726588b40f0..e34a9c823086 100644 --- a/dev-php/pecl-amqp/pecl-amqp-1.10.2.ebuild +++ b/dev-php/pecl-amqp/pecl-amqp-1.11.0.ebuild @@ -1,9 +1,10 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="7" +EAPI="8" -USE_PHP="php7-1 php7-2 php7-3 php7-4" +USE_PHP="php8-1 php8-2" +MY_P="${PN/pecl-/}-${PV/_rc/RC}" inherit php-ext-pecl-r3 @@ -19,6 +20,6 @@ IUSE="" RESTRICT="test" BDEPEND="virtual/pkgconfig" -RDEPEND=">=net-libs/rabbitmq-c-0.5.2:=[ssl]" +RDEPEND=">=net-libs/rabbitmq-c-0.7.1:=[ssl(-)]" DEPEND="${RDEPEND}" PHP_EXT_ECONF_ARGS=() diff --git a/dev-php/pecl-amqp/pecl-amqp-1.11.0_beta.ebuild b/dev-php/pecl-amqp/pecl-amqp-1.11.0_beta.ebuild deleted file mode 100644 index df5e0bbb8681..000000000000 --- a/dev-php/pecl-amqp/pecl-amqp-1.11.0_beta.ebuild +++ /dev/null @@ -1,24 +0,0 @@ -# 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 - -KEYWORDS="~amd64 ~x86" - -DESCRIPTION="PHP Bindings for AMQP 0-9-1 compatible brokers" -LICENSE="PHP-3.01" -SLOT="0" -IUSE="" - -# Tests require running rabbitmq-server on localhost which requires epmd -# which only accepts /var/run/epmd.pid as pidfile. -RESTRICT="test" - -BDEPEND="virtual/pkgconfig" -RDEPEND=">=net-libs/rabbitmq-c-0.5.2:=[ssl]" -DEPEND="${RDEPEND}" -PHP_EXT_ECONF_ARGS=() diff --git a/dev-php/pecl-apcu/Manifest b/dev-php/pecl-apcu/Manifest index fdb813bf4adf..1f341f75ed2f 100644 --- a/dev-php/pecl-apcu/Manifest +++ b/dev-php/pecl-apcu/Manifest @@ -1,2 +1,3 @@ -DIST apcu-5.1.19.tgz 96583 BLAKE2B 330c08a4e557691d0b402111877b3caf56b211256db17cce52a76aeefce7237505eca4ecd71f3770ef3c405182a1604a92cc458cb9bca435b42370fe917e21a7 SHA512 45077e3bd0eac207539e2eafe21968c71f49b8c8920168dbafa87961b041f1d348b6bf1c130104744bc541e1f690854f0a29062e9520db81c04edeee3ef2ed99 -DIST apcu-5.1.20.tgz 96727 BLAKE2B b8223856e0aaa52f90dffa674bbd9b047caa8c91d81b637eafc2f59fbbfdfe0d6ce30e990a87cb4833e895fcfd944f7d57eb6f7356b3e2361d6be5a535bb3a63 SHA512 3e10b7e5dc7481b1250610ef83954875f427b9114d6b232bad9064fc33d8c8906bcc317f94a6cfc9f76c720fa06a44270d259cf2ceef6c1ec9dcadc49254ee1b +DIST apcu-5.1.21.tgz 92516 BLAKE2B 32d73b89bde9ef4eb01c9ad766930e87300b86776c95929607a8aaefba5043e3a7947d064416ac083ff38876fdb41bb03dab1552ac000082e54f809269b4c925 SHA512 a6ffe8349760d27cde0d86017a59a68e9639bf385e606622d807094f4e5fb305bb25b9ce00077d0856f4d223d44329f7a6314c229b62c78d8e2b085593c92bb3 +DIST apcu-5.1.22.tgz 93926 BLAKE2B abc3b27c4224da14b6438df9243f6b7b8245102f7eee0208daf1317bead5463d8f454e33536b8c949a2825140487faf9bb79745180a26e1f0015494e0986acb9 SHA512 8f2f4292679bc359ea680ecaf397d69de32bf67d57d719a4839a026ab1b96d5ec4725e92c5c0d1972a117a7cd3d3c456a1f4ec03192fda4657e685de60b9e93e +DIST apcu-5.1.23.tgz 90897 BLAKE2B 634366b99c993298c8720840d06ff3aed30bfb3f09fd7b63f4736766f4ac1b983f24317f161bf7dd1b3ab79053c905cc9136e8141468174177d2a05b94719590 SHA512 89e9f10f5d8d1a9503132e80140680be2a10d96f957f69b2f77cc1c496d15cc26dfe4c0368ebe46c72c68d1b4a794d3ddc95942b02d3ba5e8c971b09969058d8 diff --git a/dev-php/pecl-apcu/metadata.xml b/dev-php/pecl-apcu/metadata.xml index 6344b62d774f..f7a831c66d81 100644 --- a/dev-php/pecl-apcu/metadata.xml +++ b/dev-php/pecl-apcu/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> diff --git a/dev-php/pecl-apcu/pecl-apcu-5.1.19.ebuild b/dev-php/pecl-apcu/pecl-apcu-5.1.21.ebuild index 777b8df0cd0c..81f933acaf14 100644 --- a/dev-php/pecl-apcu/pecl-apcu-5.1.19.ebuild +++ b/dev-php/pecl-apcu/pecl-apcu-5.1.21.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -8,11 +8,11 @@ PHP_EXT_INI="yes" PHP_EXT_ZENDEXT="no" DOCS=( NOTICE README.md TECHNOTES.txt ) -USE_PHP="php7-2 php7-3 php7-4 php8-0" +USE_PHP="php8-1" inherit php-ext-pecl-r3 -KEYWORDS="amd64 arm64 x86" +KEYWORDS="amd64 ~arm arm64 x86" DESCRIPTION="Stripped down version of APC supporting only user cache" LICENSE="PHP-3.01" @@ -29,15 +29,6 @@ IUSE="+mmap ${LUSE/lock-pthreadrw/+lock-pthreadrw}" REQUIRED_USE="^^ ( $LUSE )" -src_prepare() { - php-ext-source-r3_src_prepare - # Remove broken tests from php 7.4 due to trivial output differences - if use php_targets_php7-4 ; then - php_init_slot_env "php7.4" - rm "${PHP_EXT_S}"/tests/apc_entry_00{2,3}.phpt || die - fi -} - src_configure() { local PHP_EXT_ECONF_ARGS=( --enable-apcu @@ -60,8 +51,4 @@ src_install() { pkg_postinst() { elog "The apc.php file shipped with this release of pecl-apcu was" elog "installed to ${EPREFIX}/usr/share/php7/apcu/." - elog - elog "If you depend on the apc_* functions," - elog "please install dev-php/pecl-apcu_bc as this extension no longer" - elog "provides backwards compatibility." } diff --git a/dev-php/pecl-apcu/pecl-apcu-5.1.20.ebuild b/dev-php/pecl-apcu/pecl-apcu-5.1.22.ebuild index 210505694b1c..bb44b8a9fa82 100644 --- a/dev-php/pecl-apcu/pecl-apcu-5.1.20.ebuild +++ b/dev-php/pecl-apcu/pecl-apcu-5.1.22.ebuild @@ -1,42 +1,30 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PHP_EXT_NAME="apcu" PHP_EXT_INI="yes" +PHP_EXT_NAME="apcu" PHP_EXT_ZENDEXT="no" -DOCS=( NOTICE README.md TECHNOTES.txt ) - -USE_PHP="php7-2 php7-3 php7-4 php8-0" +USE_PHP="php8-1 php8-2" inherit php-ext-pecl-r3 -KEYWORDS="~amd64 ~arm ~arm64 ~x86" - DESCRIPTION="Stripped down version of APC supporting only user cache" + LICENSE="PHP-3.01" SLOT="7" +KEYWORDS="amd64 ~arm ~arm64 ~x86" LOCKS="pthreadmutex pthreadrw spinlock semaphore" - LUSE="" for l in ${LOCKS}; do LUSE+="lock-${l} " done - IUSE="+mmap ${LUSE/lock-pthreadrw/+lock-pthreadrw}" - REQUIRED_USE="^^ ( $LUSE )" -src_prepare() { - php-ext-source-r3_src_prepare - # Remove broken tests from php 7.4 due to trivial output differences - if use php_targets_php7-4 ; then - php_init_slot_env "php7.4" - rm "${PHP_EXT_S}"/tests/apc_entry_00{2,3}.phpt || die - fi -} +DOCS=( NOTICE README.md TECHNOTES.txt ) src_configure() { local PHP_EXT_ECONF_ARGS=( @@ -44,6 +32,7 @@ src_configure() { $(use_enable mmap apcu-mmap) $(use_enable lock-spinlock apcu-spinlocks) ) + # Broken upstream autoconf test disables if present at all use lock-pthreadrw || PHP_EXT_ECONF_ARGS+=( --disable-apcu-rwlocks ) @@ -58,10 +47,6 @@ src_install() { } pkg_postinst() { - elog "The apc.php file shipped with this release of pecl-apcu was" - elog "installed to ${EPREFIX}/usr/share/php7/apcu/." - elog - elog "If you depend on the apc_* functions," - elog "please install dev-php/pecl-apcu_bc as this extension no longer" - elog "provides backwards compatibility." + elog "The apc.php file shipped with this release of pecl-apcu" + elog "was installed to ${EPREFIX}/usr/share/php7/apcu/." } diff --git a/dev-php/pecl-apcu/pecl-apcu-5.1.23-r1.ebuild b/dev-php/pecl-apcu/pecl-apcu-5.1.23-r1.ebuild new file mode 100644 index 000000000000..82e0d0a1108e --- /dev/null +++ b/dev-php/pecl-apcu/pecl-apcu-5.1.23-r1.ebuild @@ -0,0 +1,52 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PHP_EXT_INI="yes" +PHP_EXT_NAME="apcu" +PHP_EXT_ZENDEXT="no" +USE_PHP="php8-1 php8-2 php8-3" + +inherit php-ext-pecl-r3 + +DESCRIPTION="Stripped down version of APC supporting only user cache" + +LICENSE="PHP-3.01" +SLOT="7" +KEYWORDS="amd64 ~arm ~arm64 ~x86" + +LOCKS="pthreadmutex pthreadrw spinlock semaphore" +LUSE="" +for l in ${LOCKS}; do + LUSE+="lock-${l} " +done +IUSE="+mmap ${LUSE/lock-pthreadrw/+lock-pthreadrw}" +REQUIRED_USE="^^ ( $LUSE )" + +DOCS=( NOTICE README.md TECHNOTES.txt ) + +src_configure() { + local PHP_EXT_ECONF_ARGS=( + --enable-apcu + $(use_enable mmap apcu-mmap) + $(use_enable lock-spinlock apcu-spinlocks) + ) + + # Broken upstream autoconf test disables if present at all + use lock-pthreadrw || PHP_EXT_ECONF_ARGS+=( --disable-apcu-rwlocks ) + + php-ext-source-r3_src_configure +} + +src_install() { + php-ext-pecl-r3_src_install + + insinto /usr/share/php8/apcu + doins apc.php +} + +pkg_postinst() { + elog "The apc.php file shipped with this release of pecl-apcu" + elog "was installed to ${EPREFIX}/usr/share/php8/apcu/." +} diff --git a/dev-php/pecl-apcu_bc/Manifest b/dev-php/pecl-apcu_bc/Manifest deleted file mode 100644 index c73d9fc2e92e..000000000000 --- a/dev-php/pecl-apcu_bc/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST apcu_bc-1.0.5.tgz 7415 BLAKE2B d86c5a4949239d9196b4bfc22c19f97ff66b47ec87962540295a0d9f08c72c0f1213439dd6c4006355a73c7fa3dbdcc51e9f897b289f134116d33d9eb2c67cb7 SHA512 60ee1540c31873d7963fd8efa6293006eae19cb6c7815cea1f3b50b197a982840472a1e632cc7af5666f6af5522008bec30e48cd764920240a6c5a0d0eb0e6e0 diff --git a/dev-php/pecl-apcu_bc/metadata.xml b/dev-php/pecl-apcu_bc/metadata.xml deleted file mode 100644 index b86acf66c756..000000000000 --- a/dev-php/pecl-apcu_bc/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>php-bugs@gentoo.org</email> - <name>PHP</name> - </maintainer> -</pkgmetadata> diff --git a/dev-php/pecl-apcu_bc/pecl-apcu_bc-1.0.5.ebuild b/dev-php/pecl-apcu_bc/pecl-apcu_bc-1.0.5.ebuild deleted file mode 100644 index cf85dc9a5be8..000000000000 --- a/dev-php/pecl-apcu_bc/pecl-apcu_bc-1.0.5.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -PHP_INI_NAME="bc_apc" -PHP_EXT_NAME="apc" -PHP_EXT_INI="yes" -PHP_EXT_ZENDEXT="no" -PHP_EXT_EXTRA_ECONF="" -DOCS=( README.md ) - -USE_PHP="php7-2 php7-3 php7-4" - -inherit php-ext-pecl-r3 multilib - -KEYWORDS="amd64 x86" - -DESCRIPTION="Provides APC backwards compatibility functions via APCu" -LICENSE="PHP-3.01" -SLOT="0" -IUSE="" - -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() { - # This fixed version is necessary to have apcu load - # from the install before the tested apc. - # It is intentional to specify phpoptions twice. - # This mimics the Makefile. - local slot phpoptions - for slot in $(php_get_slots); do - php_init_slot_env "${slot}" - ln -s "${EXT_DIR}/apcu$(get_libname)" \ - "modules/" || die - phpoptions=( -n -d extension_dir="${PHP_EXT_S}/modules" - -d extension=apcu$(get_libname) - -d extension=apc$(get_libname) ) - NO_INTERACTION="yes" TEST_PHP_EXECUTABLE="${PHPCLI}" \ - "${PHPCLI}" "${phpoptions[@]}" \ - run-tests.php "${phpoptions[@]}" || die - done -} diff --git a/dev-php/pecl-crack/Manifest b/dev-php/pecl-crack/Manifest deleted file mode 100644 index f8ff5a2a592d..000000000000 --- a/dev-php/pecl-crack/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST crack-0.4.tgz 25524 BLAKE2B 99e2289413a672d4dc3d8f9d70866efb499902a0d27379ac7b59d2873013c918d535851d8c3dbf2592596d6483f2abafe2f7bbd31fff40ce9827c7a97e16b8bc SHA512 0dec64d1ce859bb3d7e2b834e4bcc4ef8c6f3e88e5b61884e40dddc366a992a7c85bfad4227224d4401aad7f26843678709f29acd2dcc75563658040b8067d7f diff --git a/dev-php/pecl-crack/files/0.4-php7.patch b/dev-php/pecl-crack/files/0.4-php7.patch deleted file mode 100644 index 5a00c9121810..000000000000 --- a/dev-php/pecl-crack/files/0.4-php7.patch +++ /dev/null @@ -1,356 +0,0 @@ ---- a/crack.c 2016-12-19 16:04:09.244782234 -0500 -+++ b/crack.c 2016-12-20 09:20:11.903140742 -0500 -@@ -36,13 +36,31 @@ - /* True global resources - no need for thread safety here */ - static int le_crack; - -+ZEND_BEGIN_ARG_INFO_EX(crack_opendict_args, 0, ZEND_RETURN_VALUE, 1) -+ ZEND_ARG_INFO(0, dictionary) -+ZEND_END_ARG_INFO() -+ -+ZEND_BEGIN_ARG_INFO_EX(crack_closedict_args, 0, ZEND_RETURN_VALUE, 0) -+ ZEND_ARG_INFO(0, dictionary) -+ZEND_END_ARG_INFO() -+ -+ZEND_BEGIN_ARG_INFO_EX(crack_check_args, 0, ZEND_RETURN_VALUE, 1) -+ ZEND_ARG_INFO(0, password) -+ ZEND_ARG_INFO(0, username) -+ ZEND_ARG_INFO(0, gecos) -+ ZEND_ARG_INFO(0, dictionary) -+ZEND_END_ARG_INFO() -+ -+ZEND_BEGIN_ARG_INFO_EX(crack_getlastmessage_args, 0, ZEND_RETURN_VALUE, 0) -+ZEND_END_ARG_INFO() -+ - /* {{{ crack_functions[] - */ - zend_function_entry crack_functions[] = { -- PHP_FE(crack_opendict, NULL) -- PHP_FE(crack_closedict, NULL) -- PHP_FE(crack_check, NULL) -- PHP_FE(crack_getlastmessage, NULL) -+ ZEND_FE(crack_opendict, crack_opendict_args) -+ ZEND_FE(crack_closedict, crack_closedict_args) -+ ZEND_FE(crack_check, crack_check_args) -+ ZEND_FE(crack_getlastmessage, crack_getlastmessage_args) - {NULL, NULL, NULL} - }; - /* }}} */ -@@ -55,7 +73,7 @@ - #endif - "crack", - crack_functions, -- PHP_MINIT(crack), -+ PHP_MINIT(crack), - PHP_MSHUTDOWN(crack), - PHP_RINIT(crack), - PHP_RSHUTDOWN(crack), -@@ -84,7 +102,11 @@ - static void php_crack_init_globals(zend_crack_globals *crack_globals) - { - crack_globals->last_message = NULL; -+#if PHP_VERSION_ID >= 70000 -+ crack_globals->default_dict = NULL; -+#else - crack_globals->default_dict = -1; -+#endif - } - /* }}} */ - -@@ -95,7 +117,7 @@ - char *filename; - int filename_len; - int result = SUCCESS; -- -+ - #if PHP_VERSION_ID < 50400 - if (PG(safe_mode)) { - filename_len = strlen(path) + 10; -@@ -103,7 +125,7 @@ - if (NULL == filename) { - return FAILURE; - } -- -+ - memset(filename, '\0', filename_len); - strcpy(filename, path); - strcat(filename, ".pwd"); -@@ -111,7 +133,7 @@ - efree(filename); - return FAILURE; - } -- -+ - memset(filename, '\0', filename_len); - strcpy(filename, path); - strcat(filename, ".pwi"); -@@ -119,7 +141,7 @@ - efree(filename); - return FAILURE; - } -- -+ - memset(filename, '\0', filename_len); - strcpy(filename, path); - strcat(filename, ".hwm"); -@@ -129,39 +151,64 @@ - } - } - #endif -- -+ - if (php_check_open_basedir(path TSRMLS_CC)) { - return FAILURE; - } -- -+ - return SUCCESS; - } - /* }}} */ - - /* {{{ php_crack_set_default_dict - */ -+#if PHP_VERSION_ID >= 70000 -+static void php_crack_set_default_dict(zend_resource *id) -+{ -+ if (CRACKG(default_dict) != NULL) { -+ zend_list_close(CRACKG(default_dict)); -+ } -+ -+ CRACKG(default_dict) = id; -+ id->gc.refcount++; -+} -+#else - static void php_crack_set_default_dict(int id TSRMLS_DC) - { - if (CRACKG(default_dict) != -1) { - zend_list_delete(CRACKG(default_dict)); - } -- -+ - CRACKG(default_dict) = id; - zend_list_addref(id); - } -+#endif - /* }}} */ - - /* {{{ php_crack_get_default_dict - */ -+#if PHP_VERSION_ID >= 70000 -+static zend_resource * php_crack_get_default_dict(INTERNAL_FUNCTION_PARAMETERS) -+#else - static int php_crack_get_default_dict(INTERNAL_FUNCTION_PARAMETERS) -+#endif - { -+#if PHP_VERSION_ID >= 70000 -+ if ((NULL == CRACKG(default_dict)) && (NULL != CRACKG(default_dictionary))) { -+#else - if ((-1 == CRACKG(default_dict)) && (NULL != CRACKG(default_dictionary))) { -+#endif - CRACKLIB_PWDICT *pwdict; - printf("trying to open: %s\n", CRACKG(default_dictionary)); - pwdict = cracklib_pw_open(CRACKG(default_dictionary), "r"); - if (NULL != pwdict) { -+#if PHP_VERSION_ID >= 70000 -+ ZVAL_RES(return_value, zend_register_resource(pwdict, le_crack)); -+ php_crack_set_default_dict(Z_RES_P(return_value)); -+#else - ZEND_REGISTER_RESOURCE(return_value, pwdict, le_crack); - php_crack_set_default_dict(Z_LVAL_P(return_value) TSRMLS_CC); -+#endif - } - } - -@@ -171,7 +218,11 @@ - - /* {{{ php_crack_module_dtor - */ -+#if PHP_VERSION_ID >= 70000 -+static void php_crack_module_dtor(zend_resource *rsrc) -+#else - static void php_crack_module_dtor(zend_rsrc_list_entry *rsrc TSRMLS_DC) -+#endif - { - CRACKLIB_PWDICT *pwdict = (CRACKLIB_PWDICT *) rsrc->ptr; - -@@ -191,7 +242,9 @@ - - REGISTER_INI_ENTRIES(); - le_crack = zend_register_list_destructors_ex(php_crack_module_dtor, NULL, "crack dictionary", module_number); -+#if PHP_VERSION_ID < 70000 - Z_TYPE(crack_module_entry) = type; -+#endif - - return SUCCESS; - } -@@ -210,7 +263,11 @@ - PHP_RINIT_FUNCTION(crack) - { - CRACKG(last_message) = NULL; -+#if PHP_VERSION_ID >= 70000 -+ CRACKG(default_dict) = NULL; -+#else - CRACKG(default_dict) = -1; -+#endif - - return SUCCESS; - } -@@ -245,7 +302,7 @@ - PHP_FUNCTION(crack_opendict) - { - char *path; -- int path_len; -+ size_t path_len; - CRACKLIB_PWDICT *pwdict; - - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &path, &path_len) == FAILURE) { -@@ -265,9 +322,14 @@ - #endif - RETURN_FALSE; - } -- -+ -+#if PHP_VERSION_ID >= 70000 -+ RETURN_RES(zend_register_resource(pwdict, le_crack)); -+ php_crack_set_default_dict(Z_RES_P(return_value)); -+#else - ZEND_REGISTER_RESOURCE(return_value, pwdict, le_crack); - php_crack_set_default_dict(Z_LVAL_P(return_value) TSRMLS_CC); -+#endif - } - /* }}} */ - -@@ -276,7 +338,11 @@ - PHP_FUNCTION(crack_closedict) - { - zval *dictionary = NULL; -+#if PHP_VERSION_ID >= 70000 -+ zend_resource *id; -+#else - int id = -1; -+#endif - CRACKLIB_PWDICT *pwdict; - - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|r", &dictionary)) { -@@ -285,7 +351,11 @@ - - if (NULL == dictionary) { - id = php_crack_get_default_dict(INTERNAL_FUNCTION_PARAM_PASSTHRU); -+#if PHP_VERSION_ID >= 70000 -+ if (id == NULL) { -+#else - if (id == -1) { -+#endif - #if ZEND_MODULE_API_NO >= 20021010 - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not open default crack dicionary"); - #else -@@ -294,8 +364,21 @@ - RETURN_FALSE; - } - } -+#if PHP_VERSION_ID >= 70000 -+ if((pwdict = (CRACKLIB_PWDICT *)zend_fetch_resource(Z_RES_P(dictionary), "crack dictionary", le_crack)) == NULL) -+ { -+ RETURN_FALSE; -+ } -+ if (NULL == dictionary) { -+ zend_list_close(CRACKG(default_dict)); -+ CRACKG(default_dict) = NULL; -+ } -+ else { -+ zend_list_close(Z_RES_P(dictionary)); -+ } -+#else - ZEND_FETCH_RESOURCE(pwdict, CRACKLIB_PWDICT *, &dictionary, id, "crack dictionary", le_crack); -- -+ - if (NULL == dictionary) { - zend_list_delete(CRACKG(default_dict)); - CRACKG(default_dict) = -1; -@@ -303,7 +386,7 @@ - else { - zend_list_delete(Z_RESVAL_P(dictionary)); - } -- -+#endif - RETURN_TRUE; - } - /* }}} */ -@@ -314,14 +397,18 @@ - { - zval *dictionary = NULL; - char *password = NULL; -- int password_len; -+ size_t password_len; - char *username = NULL; -- int username_len; -+ size_t username_len; - char *gecos = NULL; -- int gecos_len; -+ size_t gecos_len; - char *message; - CRACKLIB_PWDICT *pwdict; -+#if PHP_VERSION_ID >= 70000 -+ zend_resource *crack_res; -+#else - int id = -1; -+#endif - - if (NULL != CRACKG(last_message)) { - efree(CRACKG(last_message)); -@@ -335,6 +422,21 @@ - } - - if (NULL == dictionary) { -+#if PHP_VERSION_ID >= 70000 -+ crack_res = php_crack_get_default_dict(INTERNAL_FUNCTION_PARAM_PASSTHRU); -+ if (crack_res == NULL || crack_res->ptr == NULL) { -+ php_error(E_WARNING, "Could not open default crack dicionary"); -+ RETURN_FALSE; -+ } -+ -+ } -+ else { -+ if((pwdict = (CRACKLIB_PWDICT *)zend_fetch_resource(Z_RES_P(dictionary), "crack dictionary", le_crack)) == NULL) { -+ php_error(E_WARNING, "Could not open crack dicionary resource"); -+ RETURN_FALSE; -+ } -+ } -+#else - id = php_crack_get_default_dict(INTERNAL_FUNCTION_PARAM_PASSTHRU); - if (id == -1) { - #if ZEND_MODULE_API_NO >= 20021010 -@@ -346,6 +448,7 @@ - } - } - ZEND_FETCH_RESOURCE(pwdict, CRACKLIB_PWDICT *, &dictionary, id, "crack dictionary", le_crack); -+#endif - - message = cracklib_fascist_look_ex(pwdict, password, username, gecos); - -@@ -377,7 +480,11 @@ - RETURN_FALSE; - } - -+#if PHP_VERSION_ID >= 70000 -+ RETURN_STRING(CRACKG(last_message)); -+#else - RETURN_STRING(CRACKG(last_message), 1); -+#endif - } - /* }}} */ - ---- a/php_crack.h 2005-09-21 05:00:06.000000000 -0400 -+++ b/php_crack.h 2016-12-19 16:51:22.449321851 -0500 -@@ -52,7 +52,11 @@ - ZEND_BEGIN_MODULE_GLOBALS(crack) - char *default_dictionary; - char *last_message; -+#if PHP_VERSION_ID >= 70000 -+ zend_resource *default_dict; -+#else - int default_dict; -+#endif - ZEND_END_MODULE_GLOBALS(crack) - - #ifdef ZTS diff --git a/dev-php/pecl-crack/files/0.4-php8.patch b/dev-php/pecl-crack/files/0.4-php8.patch deleted file mode 100644 index ce5f36f11738..000000000000 --- a/dev-php/pecl-crack/files/0.4-php8.patch +++ /dev/null @@ -1,394 +0,0 @@ -diff -aurN a/crack.c b/crack.c ---- a/crack.c 2021-04-15 13:57:12.174874906 -0400 -+++ b/crack.c 2021-04-15 14:10:21.203314001 -0400 -@@ -68,9 +68,7 @@ - /* {{{ crack_module_entry - */ - zend_module_entry crack_module_entry = { --#if ZEND_MODULE_API_NO >= 20010901 - STANDARD_MODULE_HEADER, --#endif - "crack", - crack_functions, - PHP_MINIT(crack), -@@ -78,9 +76,7 @@ - PHP_RINIT(crack), - PHP_RSHUTDOWN(crack), - PHP_MINFO(crack), --#if ZEND_MODULE_API_NO >= 20010901 -- "0.3", --#endif -+ "0.4", - STANDARD_MODULE_PROPERTIES, - }; - /* }}} */ -@@ -102,57 +98,19 @@ - static void php_crack_init_globals(zend_crack_globals *crack_globals) - { - crack_globals->last_message = NULL; --#if PHP_VERSION_ID >= 70000 - crack_globals->default_dict = NULL; --#else -- crack_globals->default_dict = -1; --#endif - } - /* }}} */ - - /* {{{ php_crack_checkpath - */ --static int php_crack_checkpath(char* path TSRMLS_DC) -+static int php_crack_checkpath(char* path) - { - char *filename; - int filename_len; - int result = SUCCESS; - --#if PHP_VERSION_ID < 50400 -- if (PG(safe_mode)) { -- filename_len = strlen(path) + 10; -- filename = (char *) emalloc(filename_len); -- if (NULL == filename) { -- return FAILURE; -- } -- -- memset(filename, '\0', filename_len); -- strcpy(filename, path); -- strcat(filename, ".pwd"); -- if (!php_checkuid(filename, "r", CHECKUID_CHECK_FILE_AND_DIR)) { -- efree(filename); -- return FAILURE; -- } -- -- memset(filename, '\0', filename_len); -- strcpy(filename, path); -- strcat(filename, ".pwi"); -- if (!php_checkuid(filename, "r", CHECKUID_CHECK_FILE_AND_DIR)) { -- efree(filename); -- return FAILURE; -- } -- -- memset(filename, '\0', filename_len); -- strcpy(filename, path); -- strcat(filename, ".hwm"); -- if (!php_checkuid(filename, "r", CHECKUID_CHECK_FILE_AND_DIR)) { -- efree(filename); -- return FAILURE; -- } -- } --#endif -- -- if (php_check_open_basedir(path TSRMLS_CC)) { -+ if (php_check_open_basedir(path)) { - return FAILURE; - } - -@@ -162,7 +120,6 @@ - - /* {{{ php_crack_set_default_dict - */ --#if PHP_VERSION_ID >= 70000 - static void php_crack_set_default_dict(zend_resource *id) - { - if (CRACKG(default_dict) != NULL) { -@@ -172,60 +129,32 @@ - CRACKG(default_dict) = id; - id->gc.refcount++; - } --#else --static void php_crack_set_default_dict(int id TSRMLS_DC) --{ -- if (CRACKG(default_dict) != -1) { -- zend_list_delete(CRACKG(default_dict)); -- } -- -- CRACKG(default_dict) = id; -- zend_list_addref(id); --} --#endif - /* }}} */ - - /* {{{ php_crack_get_default_dict - */ --#if PHP_VERSION_ID >= 70000 - static zend_resource * php_crack_get_default_dict(INTERNAL_FUNCTION_PARAMETERS) --#else --static int php_crack_get_default_dict(INTERNAL_FUNCTION_PARAMETERS) --#endif - { --#if PHP_VERSION_ID >= 70000 - if ((NULL == CRACKG(default_dict)) && (NULL != CRACKG(default_dictionary))) { --#else -- if ((-1 == CRACKG(default_dict)) && (NULL != CRACKG(default_dictionary))) { --#endif - CRACKLIB_PWDICT *pwdict; - printf("trying to open: %s\n", CRACKG(default_dictionary)); - pwdict = cracklib_pw_open(CRACKG(default_dictionary), "r"); - if (NULL != pwdict) { --#if PHP_VERSION_ID >= 70000 - ZVAL_RES(return_value, zend_register_resource(pwdict, le_crack)); - php_crack_set_default_dict(Z_RES_P(return_value)); --#else -- ZEND_REGISTER_RESOURCE(return_value, pwdict, le_crack); -- php_crack_set_default_dict(Z_LVAL_P(return_value) TSRMLS_CC); --#endif - } - } -- -+ - return CRACKG(default_dict); - } - /* }}} */ - - /* {{{ php_crack_module_dtor - */ --#if PHP_VERSION_ID >= 70000 - static void php_crack_module_dtor(zend_resource *rsrc) --#else --static void php_crack_module_dtor(zend_rsrc_list_entry *rsrc TSRMLS_DC) --#endif - { - CRACKLIB_PWDICT *pwdict = (CRACKLIB_PWDICT *) rsrc->ptr; -- -+ - if (pwdict != NULL) { - cracklib_pw_close(pwdict); - } -@@ -239,13 +168,10 @@ - #ifdef ZTS - ZEND_INIT_MODULE_GLOBALS(crack, php_crack_init_globals, NULL); - #endif -- -+ - REGISTER_INI_ENTRIES(); - le_crack = zend_register_list_destructors_ex(php_crack_module_dtor, NULL, "crack dictionary", module_number); --#if PHP_VERSION_ID < 70000 -- Z_TYPE(crack_module_entry) = type; --#endif -- -+ - return SUCCESS; - } - -@@ -263,12 +189,8 @@ - PHP_RINIT_FUNCTION(crack) - { - CRACKG(last_message) = NULL; --#if PHP_VERSION_ID >= 70000 - CRACKG(default_dict) = NULL; --#else -- CRACKG(default_dict) = -1; --#endif -- -+ - return SUCCESS; - } - /* }}} */ -@@ -280,7 +202,7 @@ - if (NULL != CRACKG(last_message)) { - efree(CRACKG(last_message)); - } -- -+ - return SUCCESS; - } - /* }}} */ -@@ -292,7 +214,7 @@ - php_info_print_table_start(); - php_info_print_table_header(2, "crack support", "enabled"); - php_info_print_table_end(); -- -+ - DISPLAY_INI_ENTRIES(); - } - /* }}} */ -@@ -304,32 +226,23 @@ - char *path; - size_t path_len; - CRACKLIB_PWDICT *pwdict; -- -- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &path, &path_len) == FAILURE) { -+ -+ if (zend_parse_parameters(ZEND_NUM_ARGS(), "s", &path, &path_len) == FAILURE) { - RETURN_FALSE; - } -- -- if (php_crack_checkpath(path TSRMLS_CC) == FAILURE) { -+ -+ if (php_crack_checkpath(path) == FAILURE) { - RETURN_FALSE; - } -- -+ - pwdict = cracklib_pw_open(path, "r"); - if (NULL == pwdict) { --#if ZEND_MODULE_API_NO >= 20021010 -- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not open crack dictionary: %s", path); --#else -- php_error(E_WARNING, "Could not open crack dictionary: %s", path); --#endif -+ php_error_docref(NULL, E_WARNING, "Could not open crack dictionary: %s", path); - RETURN_FALSE; - } - --#if PHP_VERSION_ID >= 70000 - RETURN_RES(zend_register_resource(pwdict, le_crack)); - php_crack_set_default_dict(Z_RES_P(return_value)); --#else -- ZEND_REGISTER_RESOURCE(return_value, pwdict, le_crack); -- php_crack_set_default_dict(Z_LVAL_P(return_value) TSRMLS_CC); --#endif - } - /* }}} */ - -@@ -338,33 +251,20 @@ - PHP_FUNCTION(crack_closedict) - { - zval *dictionary = NULL; --#if PHP_VERSION_ID >= 70000 - zend_resource *id; --#else -- int id = -1; --#endif - CRACKLIB_PWDICT *pwdict; -- -- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|r", &dictionary)) { -+ -+ if (zend_parse_parameters(ZEND_NUM_ARGS(), "|r", &dictionary)) { - RETURN_FALSE; - } -- -+ - if (NULL == dictionary) { - id = php_crack_get_default_dict(INTERNAL_FUNCTION_PARAM_PASSTHRU); --#if PHP_VERSION_ID >= 70000 - if (id == NULL) { --#else -- if (id == -1) { --#endif --#if ZEND_MODULE_API_NO >= 20021010 -- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not open default crack dicionary"); --#else -- php_error(E_WARNING, "Could not open default crack dicionary"); --#endif -+ php_error_docref(NULL, E_WARNING, "Could not open default crack dicionary"); - RETURN_FALSE; - } - } --#if PHP_VERSION_ID >= 70000 - if((pwdict = (CRACKLIB_PWDICT *)zend_fetch_resource(Z_RES_P(dictionary), "crack dictionary", le_crack)) == NULL) - { - RETURN_FALSE; -@@ -376,17 +276,6 @@ - else { - zend_list_close(Z_RES_P(dictionary)); - } --#else -- ZEND_FETCH_RESOURCE(pwdict, CRACKLIB_PWDICT *, &dictionary, id, "crack dictionary", le_crack); -- -- if (NULL == dictionary) { -- zend_list_delete(CRACKG(default_dict)); -- CRACKG(default_dict) = -1; -- } -- else { -- zend_list_delete(Z_RESVAL_P(dictionary)); -- } --#endif - RETURN_TRUE; - } - /* }}} */ -@@ -404,25 +293,20 @@ - size_t gecos_len; - char *message; - CRACKLIB_PWDICT *pwdict; --#if PHP_VERSION_ID >= 70000 - zend_resource *crack_res; --#else -- int id = -1; --#endif -- -+ - if (NULL != CRACKG(last_message)) { - efree(CRACKG(last_message)); - CRACKG(last_message) = NULL; - } -- -- if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS() TSRMLS_CC, "rs", &dictionary, &password, &password_len) == FAILURE) { -- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|ssr", &password, &password_len, &username, &username_len, &gecos, &gecos_len, &dictionary) == FAILURE) { -+ -+ if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS(), "rs", &dictionary, &password, &password_len) == FAILURE) { -+ if (zend_parse_parameters(ZEND_NUM_ARGS(), "s|ssr", &password, &password_len, &username, &username_len, &gecos, &gecos_len, &dictionary) == FAILURE) { - RETURN_FALSE; - } - } -- -+ - if (NULL == dictionary) { --#if PHP_VERSION_ID >= 70000 - crack_res = php_crack_get_default_dict(INTERNAL_FUNCTION_PARAM_PASSTHRU); - if (crack_res == NULL || crack_res->ptr == NULL) { - php_error(E_WARNING, "Could not open default crack dicionary"); -@@ -436,22 +320,9 @@ - RETURN_FALSE; - } - } --#else -- id = php_crack_get_default_dict(INTERNAL_FUNCTION_PARAM_PASSTHRU); -- if (id == -1) { --#if ZEND_MODULE_API_NO >= 20021010 -- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not open default crack dicionary"); --#else -- php_error(E_WARNING, "Could not open default crack dicionary"); --#endif -- RETURN_FALSE; -- } -- } -- ZEND_FETCH_RESOURCE(pwdict, CRACKLIB_PWDICT *, &dictionary, id, "crack dictionary", le_crack); --#endif -- -+ - message = cracklib_fascist_look_ex(pwdict, password, username, gecos); -- -+ - if (NULL == message) { - CRACKG(last_message) = estrdup("strong password"); - RETURN_TRUE; -@@ -470,21 +341,13 @@ - if (ZEND_NUM_ARGS() != 0) { - WRONG_PARAM_COUNT; - } -- -+ - if (NULL == CRACKG(last_message)) { --#if ZEND_MODULE_API_NO >= 20021010 -- php_error_docref(NULL TSRMLS_CC, E_WARNING, "No obscure checks in this session"); --#else -- php_error(E_WARNING, "No obscure checks in this session"); --#endif -+ php_error_docref(NULL, E_WARNING, "No obscure checks in this session"); - RETURN_FALSE; - } -- --#if PHP_VERSION_ID >= 70000 -+ - RETURN_STRING(CRACKG(last_message)); --#else -- RETURN_STRING(CRACKG(last_message), 1); --#endif - } - /* }}} */ - -diff -aurN a/php_crack.h b/php_crack.h ---- a/php_crack.h 2021-04-15 13:57:12.174874906 -0400 -+++ b/php_crack.h 2021-04-15 14:10:28.853298881 -0400 -@@ -52,11 +52,7 @@ - ZEND_BEGIN_MODULE_GLOBALS(crack) - char *default_dictionary; - char *last_message; --#if PHP_VERSION_ID >= 70000 - zend_resource *default_dict; --#else -- int default_dict; --#endif - ZEND_END_MODULE_GLOBALS(crack) - - #ifdef ZTS diff --git a/dev-php/pecl-crack/files/fix-pecl-bug-5765.patch b/dev-php/pecl-crack/files/fix-pecl-bug-5765.patch deleted file mode 100644 index c180d5310b1b..000000000000 --- a/dev-php/pecl-crack/files/fix-pecl-bug-5765.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- crack-0.4/libcrack/src/cracklib.h 2005-09-21 11:00:06.000000000 +0200 -+++ crack-0.4-new/libcrack/src/cracklib.h 2006-10-08 20:44:00.618783250 +0200 -@@ -46,7 +46,7 @@ - - typedef unsigned char int8; - typedef unsigned short int int16; --typedef unsigned long int int32; -+typedef unsigned int int32; - - #ifndef NUMWORDS - # define NUMWORDS 16 diff --git a/dev-php/pecl-crack/files/fix-php-5-4-support.patch b/dev-php/pecl-crack/files/fix-php-5-4-support.patch deleted file mode 100644 index 7fddadfabbbd..000000000000 --- a/dev-php/pecl-crack/files/fix-php-5-4-support.patch +++ /dev/null @@ -1,30 +0,0 @@ -Gentoo bug: 423869 -Thanks to hanno - ---- a/crack.c 2008/07/17 10:02:47 262854 -+++ b/crack.c 2012/06/07 16:13:34 326013 -@@ -38,7 +38,7 @@ - - /* {{{ crack_functions[] - */ --function_entry crack_functions[] = { -+zend_function_entry crack_functions[] = { - PHP_FE(crack_opendict, NULL) - PHP_FE(crack_closedict, NULL) - PHP_FE(crack_check, NULL) -@@ -94,6 +94,7 @@ - int filename_len; - int result = SUCCESS; - -+#if PHP_VERSION_ID < 50400 - if (PG(safe_mode)) { - filename_len = strlen(path) + 10; - filename = (char *) emalloc(filename_len); -@@ -125,6 +126,7 @@ - return FAILURE; - } - } -+#endif - - if (php_check_open_basedir(path TSRMLS_CC)) { - return FAILURE; diff --git a/dev-php/pecl-crack/pecl-crack-0.4-r7.ebuild b/dev-php/pecl-crack/pecl-crack-0.4-r7.ebuild deleted file mode 100644 index 9001623cd8a7..000000000000 --- a/dev-php/pecl-crack/pecl-crack-0.4-r7.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -PHP_EXT_NAME="crack" -PHP_EXT_INI="yes" -PHP_EXT_ZENDEXT="no" -PHP_EXT_EXTRA_ECONF="" -DOCS=( EXPERIMENTAL ) - -USE_PHP="php5-6 php7-0 php7-1 php7-2 php7-3 php7-4" - -inherit php-ext-pecl-r3 - -KEYWORDS="amd64 ppc ppc64 x86" - -DESCRIPTION="PHP interface to the cracklib libraries" -LICENSE="PHP-3 CRACKLIB" -SLOT="0" -IUSE="" - -# Patch for http://pecl.php.net/bugs/bug.php?id=5765 -PATCHES=( - "${FILESDIR}/fix-php-5-4-support.patch" - "${FILESDIR}/fix-pecl-bug-5765.patch" - "${FILESDIR}/${PV}-php7.patch" -) diff --git a/dev-php/pecl-crack/pecl-crack-0.4-r8.ebuild b/dev-php/pecl-crack/pecl-crack-0.4-r8.ebuild deleted file mode 100644 index def1519d1013..000000000000 --- a/dev-php/pecl-crack/pecl-crack-0.4-r8.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -PHP_EXT_NAME="crack" -PHP_EXT_INI="yes" -PHP_EXT_ZENDEXT="no" -PHP_EXT_EXTRA_ECONF="" -DOCS=( EXPERIMENTAL ) - -USE_PHP="php7-3 php7-4 php8-0" - -inherit php-ext-pecl-r3 - -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" - -DESCRIPTION="PHP interface to the cracklib libraries" -LICENSE="PHP-3 CRACKLIB" -SLOT="0" -IUSE="" - -# Patch for http://pecl.php.net/bugs/bug.php?id=5765 -PATCHES=( - "${FILESDIR}/fix-php-5-4-support.patch" - "${FILESDIR}/fix-pecl-bug-5765.patch" - "${FILESDIR}/${PV}-php7.patch" - "${FILESDIR}/0.4-php8.patch" -) diff --git a/dev-php/pecl-dbase/Manifest b/dev-php/pecl-dbase/Manifest index 0d3e3920193f..c380d8b4769b 100644 --- a/dev-php/pecl-dbase/Manifest +++ b/dev-php/pecl-dbase/Manifest @@ -1,2 +1 @@ -DIST dbase-7.0.1.tgz 33588 BLAKE2B 50cc5b4e0096dbdd7067e9c05cb7b580ff5a9d548ec6acb8a777fa3ba62ac4fa06b30e040bdec2a77b87736cdd0684a662aab344db11806e6ca2c6824cee6908 SHA512 8aa743545e807773be6a3f74cd9ae686a982a5455e494ff2bc0e3fe6f1fdf25574702054253eaefc55a6e9529b3e70c8390a02bd317b74db17bfe6b7797d4ba2 -DIST dbase-7.1.0RC2.tgz 37029 BLAKE2B 93c011c428c4bc989481505fade25a6bd6f2841c32146b8efbaf67cbea4193b7362bf6dbb7dca382c607dd04f217f04dbdd529443e1b931f2149e7e32e30a6dd SHA512 dd3d0f67ffb1f8e8b7bd87f83f134d06cece225bcca52609e395771430d337632bbf1daff2a7db25dd163e3707db9ca2aaebace359c5f95a52debb1ceaefb379 +DIST dbase-7.1.1.tgz 37583 BLAKE2B 7131e6219aa263259e7892b8a4bb29051bf3b9688532e73c77032f6d0ef86c94bc6a4f75461c8901995383e86fcc4828d175132064cb181e3de9f9e57f502282 SHA512 bdcd0be903fec5760e23ba9cbaef9a0f21c8a5388c7ccee56b4932a0cbb1e35ec5424f1130fd94068c4074d38c4ecc387ff93f7f01f6249fce7a64af494af0bc diff --git a/dev-php/pecl-dbase/metadata.xml b/dev-php/pecl-dbase/metadata.xml index b86acf66c756..222c77f3742a 100644 --- a/dev-php/pecl-dbase/metadata.xml +++ b/dev-php/pecl-dbase/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> diff --git a/dev-php/pecl-dbase/pecl-dbase-7.1.0_rc2.ebuild b/dev-php/pecl-dbase/pecl-dbase-7.1.0_rc2.ebuild deleted file mode 100644 index 86cf3a4e3909..000000000000 --- a/dev-php/pecl-dbase/pecl-dbase-7.1.0_rc2.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" - -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-dbase/pecl-dbase-7.0.1.ebuild b/dev-php/pecl-dbase/pecl-dbase-7.1.1.ebuild index e39dbd9f0ad1..89239550f54f 100644 --- a/dev-php/pecl-dbase/pecl-dbase-7.0.1.ebuild +++ b/dev-php/pecl-dbase/pecl-dbase-7.1.1.ebuild @@ -1,19 +1,15 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" -USE_PHP="php7-2 php7-3 php7-4" +USE_PHP="php8-1" inherit php-ext-pecl-r3 KEYWORDS="~amd64 ~x86" DESCRIPTION="dBase database file access functions" + LICENSE="PHP-3.01" SLOT="7" -IUSE="" - -DEPEND="" -RDEPEND="${DEPEND}" -PHP_EXT_ECONF_ARGS=( ) diff --git a/dev-php/pecl-dio/Manifest b/dev-php/pecl-dio/Manifest index e2cd6c2e2e75..bb44dcb20c6b 100644 --- a/dev-php/pecl-dio/Manifest +++ b/dev-php/pecl-dio/Manifest @@ -1 +1,2 @@ DIST dio-0.2.0.tgz 37328 BLAKE2B e7ad6be1a4c957c155753e834d79f51b985578a03781ddbc66f05961dc270d58b20abcc74c64a0e9744d5cfbb6e545c1a7ac2bc1d54009c74f26bf786587ef49 SHA512 172c2a2a84d348d684d84ca94f23b767952461ca848cd114e899ea3fd39503a35ac0624a2a774b9dc6fd2d463d3f6aa6937e780e2faa6a0955a8594aad27ec8b +DIST dio-0.2.1.tgz 37004 BLAKE2B 5988e7fbbb26f904ed8f651bb3499afdd444fce7408d76fd62a8bf74b5a035006ecb9b23fdcf85cb42885976c7f39c9b2480578e3bfa56ad9ab972dcda481124 SHA512 ed40ae3a950410e65a15c893a90d16da7f152c73e92623b68706b942c42f27e01a799134cb4b464d09f6e99c35d80e634ba662a20c7c9bc7f27ca2515c392abf diff --git a/dev-php/pecl-dio/metadata.xml b/dev-php/pecl-dio/metadata.xml index aca42932b833..77793b997e9e 100644 --- a/dev-php/pecl-dio/metadata.xml +++ b/dev-php/pecl-dio/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> diff --git a/dev-php/pecl-dio/pecl-dio-0.2.0-r1.ebuild b/dev-php/pecl-dio/pecl-dio-0.2.0-r1.ebuild index cb33182010a9..73da4af902e8 100644 --- a/dev-php/pecl-dio/pecl-dio-0.2.0-r1.ebuild +++ b/dev-php/pecl-dio/pecl-dio-0.2.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -7,10 +7,7 @@ PHP_EXT_NAME="dio" PHP_EXT_INI="yes" PHP_EXT_ZENDEXT="no" -USE_PHP="php7-3 php7-4 php8-0" - -MY_PV=${PV/_rc/RC} -PHP_EXT_S="${WORKDIR}/${PN/pecl-/}-${MY_PV}" +USE_PHP="php8-1" inherit php-ext-pecl-r3 @@ -20,5 +17,3 @@ DESCRIPTION="Direct I/O functions for PHP" LICENSE="PHP-3.01" SLOT="0" IUSE="" - -S="${PHP_EXT_S}" diff --git a/dev-php/pecl-dio/pecl-dio-0.2.1.ebuild b/dev-php/pecl-dio/pecl-dio-0.2.1.ebuild new file mode 100644 index 000000000000..dec265550cb3 --- /dev/null +++ b/dev-php/pecl-dio/pecl-dio-0.2.1.ebuild @@ -0,0 +1,18 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PHP_EXT_NAME="dio" +PHP_EXT_INI="yes" +PHP_EXT_ZENDEXT="no" + +USE_PHP="php8-1 php8-2 php8-3" + +inherit php-ext-pecl-r3 + +KEYWORDS="~amd64 ~x86" + +DESCRIPTION="Direct I/O functions for PHP" +LICENSE="PHP-3.01" +SLOT="0" diff --git a/dev-php/pecl-eio/Manifest b/dev-php/pecl-eio/Manifest index a7cfe5a8314e..75e15a906dff 100644 --- a/dev-php/pecl-eio/Manifest +++ b/dev-php/pecl-eio/Manifest @@ -1 +1 @@ -DIST eio-2.0.4.tgz 74118 BLAKE2B 0228f0ca91ed6410614242e7ea1ddadaa1d1aa8211b3ea6f730c0711e4339bc158d661c5addee685d750a51e654874d35a04cf011d2a02ad06ab3f249b893753 SHA512 a74464752af5792c527b9149a7edff574952cac0b5b09e1e7ff3b7c0a2cc88ab171d916d94d508b9f92aa40bd5262a5b9f8d4ba239908f13ebcb89c6513da4d0 +DIST eio-3.1.0RC1.tgz 99307 BLAKE2B dbadc519f43a38796994d5854ef5f5e0c2876aa1afe9f98a3933f89332c4dc7b6db7a675cb06e47039243130d39f12f26085f02d9ea871eda68580d8fdcf143f SHA512 2118eb47bfa24a753588e24691d96f46d07fde9e2ce409f1d93d77aa52494536aa06654c95831b7841d54f44a5cfd5c958efd4304a344a620c7f348cd5f7a368 diff --git a/dev-php/pecl-eio/metadata.xml b/dev-php/pecl-eio/metadata.xml index a7f2cca502fe..44ac05f47123 100644 --- a/dev-php/pecl-eio/metadata.xml +++ b/dev-php/pecl-eio/metadata.xml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="person" proxied="yes"> -<email>rrosmanov@gmail.com</email> -<name>Ruslan Osmanov</name> -</maintainer> -<maintainer type="project" proxied="proxy"> -<email>proxy-maint@gentoo.org</email> -<name>Proxy Maintainers</name> -</maintainer> + <maintainer type="person" proxied="yes"> + <email>rrosmanov@gmail.com</email> + <name>Ruslan Osmanov</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> </pkgmetadata> diff --git a/dev-php/pecl-eio/pecl-eio-2.0.4-r1.ebuild b/dev-php/pecl-eio/pecl-eio-3.1.0_rc1.ebuild index ef6623eb4e18..79eff92d0976 100644 --- a/dev-php/pecl-eio/pecl-eio-2.0.4-r1.ebuild +++ b/dev-php/pecl-eio/pecl-eio-3.1.0_rc1.ebuild @@ -1,21 +1,27 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 + +MY_PN="${PN/pecl-}" +MY_PV="${PV/_rc/RC}" +MY_P="${MY_PN}-${MY_PV}" PHP_EXT_NAME="eio" PHP_EXT_INI="yes" PHP_EXT_ZENDEXT="no" +PHP_EXT_PECL_FILENAME="${MY_P}.tgz" +PHP_EXT_S="${WORKDIR}/${MY_P}" DOCS=( README.md ) -USE_PHP="php7-3 php7-4" +USE_PHP="php8-1" inherit php-ext-pecl-r3 -KEYWORDS="~amd64 ~x86" -LICENSE="PHP-3.01" - DESCRIPTION="PHP wrapper for libeio library" -LICENSE="PHP-3" +S="${PHP_EXT_S}" + +LICENSE="PHP-3.01" SLOT="0" +KEYWORDS="~amd64 ~x86" IUSE="debug" src_configure() { diff --git a/dev-php/pecl-event/Manifest b/dev-php/pecl-event/Manifest index ad7c4fa930bb..657bea0658bc 100644 --- a/dev-php/pecl-event/Manifest +++ b/dev-php/pecl-event/Manifest @@ -1,2 +1 @@ -DIST event-2.5.7.tgz 141451 BLAKE2B 6d5e87b0b4892b59e2dc37dde0ae8ecafd104fbaa90fcc4d2b7183d4e3ba2f8fa182ddee90d5ebaebeb826f3e02d760ae25ce5ca01582fec9dfa5cb05dc6f5c6 SHA512 8160c3df1f6faa4b3ee37b9212a7953e5c0cdc747228517d238ea638b2b441e4b64e9d8c91d3af6bd33f33486137e9da1c7cb45b8d8400b8ab46d1ae4c03590a -DIST event-3.0.2r1.tgz 198176 BLAKE2B ca93fa75fc1210476bddfafb89f9fd7a9a9ed9b23023ce37c5b5fe94c782d3a95a3a9bee8263cca3329b96b848cb213de7fac73c6594a8fee0c7c299b5f44215 SHA512 b117119814763bffe1c2c44766a822f638cd0873eeede29aab139fceb09a09df264f0d7b7e882b21dd9a7e96f45d692b45193509c3f53e0f3b10feb59c1a4ae4 +DIST event-3.0.8.tgz 199567 BLAKE2B 520949b55d27629e089993a49fe55114f8fb45cf5788dd57b30b0977fcfc9074757b4cc2efb6d5a126eea5343926f326d1651546650e9dbc8baa0ef7b06649f5 SHA512 45b4c07cac6dfca386cf9e6c792abc72c6f68d1443a1c67fd645f5e6f05ae9d45fb346b50b35cc6818ca70ebbff93c42afd801e70e9ebc63f997366996193593 diff --git a/dev-php/pecl-event/metadata.xml b/dev-php/pecl-event/metadata.xml index 34450cf3ba65..d2fc50b19cc3 100644 --- a/dev-php/pecl-event/metadata.xml +++ b/dev-php/pecl-event/metadata.xml @@ -1,15 +1,22 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="person" proxied="yes"> -<email>rrosmanov@gmail.com</email> -<name>Ruslan Osmanov</name> -</maintainer> -<maintainer type="project" proxied="proxy"> -<email>proxy-maint@gentoo.org</email> -<name>Proxy Maintainers</name> -</maintainer> -<use> -<flag name="extra">Add support of the Libevent extra API</flag> -</use> + <maintainer type="person" proxied="yes"> + <email>rrosmanov@gmail.com</email> + <name>Ruslan Osmanov</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> + <maintainer type="project"> + <email>php-bugs@gentoo.org</email> + <name>PHP</name> + </maintainer> + <use> + <flag name="extra">Add support of the Libevent extra API</flag> + </use> + <upstream> + <remote-id type="bitbucket">osmanov/pecl-event</remote-id> + </upstream> </pkgmetadata> diff --git a/dev-php/pecl-event/pecl-event-3.0.2_p1.ebuild b/dev-php/pecl-event/pecl-event-3.0.2_p1.ebuild deleted file mode 100644 index bb93011413f9..000000000000 --- a/dev-php/pecl-event/pecl-event-3.0.2_p1.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -PHP_EXT_NAME="event" -PHP_EXT_INI="yes" -PHP_EXT_ZENDEXT="no" -DOCS=( README.md ) - -USE_PHP="php7-3 php7-4 php8-0" -#Unique to this release -MY_P="${PN/pecl-/}-${PV/_p/r}" -PHP_EXT_PECL_FILENAME="${MY_P}.tgz" - -inherit php-ext-pecl-r3 - -KEYWORDS="~amd64 ~ia64 ~x86" -LICENSE="PHP-3.01" - -DESCRIPTION="PHP wrapper for libevent2" -SLOT="0" - -DEPEND=" - >=dev-libs/libevent-2.0.2 - ssl? ( dev-libs/openssl:0= ) - php_targets_php7-3? ( dev-lang/php:7.3[sockets(-)?] ) - php_targets_php7-4? ( dev-lang/php:7.4[sockets(-)?] ) - php_targets_php8-0? ( dev-lang/php:8.0[sockets(-)?] )" - -RDEPEND=" - ${DEPEND} - !dev-php/pecl-libevent" - -IUSE="debug examples +extra +sockets +ssl threads" -#Unique to this release -S="${WORKDIR}/${MY_P}" -PHP_EXT_S="${S}" - -src_configure() { - local PHP_EXT_ECONF_ARGS=( - --with-event-core - $(use_enable debug event-debug) - $(use_with extra event-extra) - $(use_with ssl event-openssl) - $(use_with threads event-pthreads) - $(use_enable sockets event-sockets) - ) - php-ext-source-r3_src_configure -} - -src_test() { - local slot - for slot in $(php_get_slots); do - php_init_slot_env "${slot}" - SKIP_ONLINE_TESTS="yes" NO_INTERACTION="yes" emake test - done -} diff --git a/dev-php/pecl-event/pecl-event-2.5.7.ebuild b/dev-php/pecl-event/pecl-event-3.0.8.ebuild index e8ea2c43cbde..db4efb91920a 100644 --- a/dev-php/pecl-event/pecl-event-2.5.7.ebuild +++ b/dev-php/pecl-event/pecl-event-3.0.8.ebuild @@ -1,36 +1,33 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="7" +EAPI="8" PHP_EXT_NAME="event" PHP_EXT_INI="yes" PHP_EXT_ZENDEXT="no" DOCS=( README.md ) -USE_PHP="php7-2 php7-3 php7-4" +USE_PHP="php8-1 php8-2" +PHP_EXT_NEEDED_USE="sockets(-)?" inherit php-ext-pecl-r3 -KEYWORDS="amd64 ~ia64 x86" +KEYWORDS="amd64 x86" LICENSE="PHP-3.01" DESCRIPTION="PHP wrapper for libevent2" SLOT="0" +IUSE="debug examples +extra +sockets +ssl threads" DEPEND=" >=dev-libs/libevent-2.0.2 - ssl? ( dev-libs/openssl:0= ) - php_targets_php7-2? ( dev-lang/php:7.2[sockets?] ) - php_targets_php7-3? ( dev-lang/php:7.3[sockets?] ) - php_targets_php7-4? ( dev-lang/php:7.4[sockets?] )" + ssl? ( dev-libs/openssl:0= )" RDEPEND=" ${DEPEND} !dev-php/pecl-libevent" -IUSE="debug examples +extra +sockets +ssl threads" - src_configure() { local PHP_EXT_ECONF_ARGS=( --with-event-core diff --git a/dev-php/pecl-geoip/Manifest b/dev-php/pecl-geoip/Manifest deleted file mode 100644 index 40aaf1667795..000000000000 --- a/dev-php/pecl-geoip/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST geoip-1.1.1.tgz 13004 BLAKE2B fe073b9459c434751ea0291ce6802041db47254f9d2d5b930db51751b3a66ce5cf925dc4bd07764920748b1735f26ba8bd136654e08ed9c24ac3b520e842f45d SHA512 395715297726aa8e7ed71297d403bea9cb08417a03adfca29dc6ea68bbc738c176f71ea621f9026109e07cd5a2adc647e2af8e140e18a6af1c8f0fe4ed1a9c6b diff --git a/dev-php/pecl-geoip/files/fix-failing-tests-1.1.1.patch b/dev-php/pecl-geoip/files/fix-failing-tests-1.1.1.patch deleted file mode 100644 index a86994708e7b..000000000000 --- a/dev-php/pecl-geoip/files/fix-failing-tests-1.1.1.patch +++ /dev/null @@ -1,46 +0,0 @@ -On Gentoo, we require users to download the GeoIP databases -themselves. As a result, the databases may not be there when -installing pecl-geoip. The first patch below skips a test if the -database it uses is not present. The second patch disables 019.phpt -completely, because I can't make it pass. - -PHP-Bug: 73416 - -diff --git a/tests/001.phpt b/tests/001.phpt -index a548d6e..c0e4972 100644 ---- a/tests/001.phpt -+++ b/tests/001.phpt -@@ -1,7 +1,10 @@ - --TEST-- - Checking Country (Free) DB availability - --SKIPIF-- --<?php if (!extension_loaded("geoip")) print "skip"; ?> -+<?php -+if (!extension_loaded("geoip")) print "skip"; -+if (!file_exists(geoip_db_filename(GEOIP_COUNTRY_EDITION))) print "skip"; -+?> - --POST-- - --GET-- - --FILE-- -diff --git a/tests/019.phpt b/tests/019.phpt -deleted file mode 100644 -index 4630354..0000000 ---- a/tests/019.phpt -+++ /dev/null -@@ -1,15 +0,0 @@ ----TEST-- --Checking geoip_setup_custom_directory() (with trailing slash) ----SKIPIF-- --<?php if (!extension_loaded("geoip")) print "skip"; ?> ----INI-- --geoip.custom_directory="/test/" ----FILE-- --<?php -- --var_dump( geoip_country_name_by_name_v6('0000:0000:0000:0000') ); -- --?> ----EXPECT-- --string(27) "/some/other/place/GeoIP.dat" --string(6) "/test/" -\ No newline at end of file diff --git a/dev-php/pecl-geoip/files/php8-support-1.1.1.patch b/dev-php/pecl-geoip/files/php8-support-1.1.1.patch deleted file mode 100644 index 50c53d1a94a7..000000000000 --- a/dev-php/pecl-geoip/files/php8-support-1.1.1.patch +++ /dev/null @@ -1,93 +0,0 @@ ---- 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/metadata.xml b/dev-php/pecl-geoip/metadata.xml deleted file mode 100644 index b86acf66c756..000000000000 --- a/dev-php/pecl-geoip/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>php-bugs@gentoo.org</email> - <name>PHP</name> - </maintainer> -</pkgmetadata> diff --git a/dev-php/pecl-geoip/pecl-geoip-1.1.1-r4.ebuild b/dev-php/pecl-geoip/pecl-geoip-1.1.1-r4.ebuild deleted file mode 100644 index 9b8d00516a8d..000000000000 --- a/dev-php/pecl-geoip/pecl-geoip-1.1.1-r4.ebuild +++ /dev/null @@ -1,22 +0,0 @@ -# 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="php7-2 php7-3 php7-4" - -inherit php-ext-pecl-r3 - -KEYWORDS="amd64 x86" - -DESCRIPTION="PHP extension to map IP address to geographic places" -LICENSE="PHP-3" -SLOT="0" -IUSE="" - -DEPEND="dev-libs/geoip" -RDEPEND="${DEPEND}" - -PATCHES=( "${FILESDIR}/fix-failing-tests-1.1.1.patch" ) diff --git a/dev-php/pecl-geoip/pecl-geoip-1.1.1-r5.ebuild b/dev-php/pecl-geoip/pecl-geoip-1.1.1-r5.ebuild deleted file mode 100644 index f5bbf1f24038..000000000000 --- a/dev-php/pecl-geoip/pecl-geoip-1.1.1-r5.ebuild +++ /dev/null @@ -1,25 +0,0 @@ -# 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-gnupg/Manifest b/dev-php/pecl-gnupg/Manifest index 064537d02bec..f1632633ea70 100644 --- a/dev-php/pecl-gnupg/Manifest +++ b/dev-php/pecl-gnupg/Manifest @@ -1,2 +1,2 @@ -DIST gnupg-1.4.0.tgz 28349 BLAKE2B d023746b104db38bcf7617d79570aa3c38d318879d34b1d4df7fc0c28b4e435deadc2a1a4827922cc14a8068b578896e297c8fe8461afebd2768ffb63ddc502d SHA512 70fa1d2956bc5caedbeadf556f9f40a7b963d3b519d6574b0c7695d9fb4c7f9d612306f475a90a1125661407c11de97040e54b158f38d71f239c1fe436d48018 DIST gnupg-1.5.0.tgz 37045 BLAKE2B 61031a493fc460b102c0a2e831e7523c4eeafc203d51a40d8aa902992740d96e3f1f46437a51a65dceefa283845d00d0b39db90163b7901a29cd133ddfc34d7c SHA512 1b4f9a39a2c585c5f8d749f8e2e2256d9765480ef8ef93c24c538b2f1284dacf8e9f71a42f96fa3150ace1a6ff37256a7a849f29a3e57332fe3b05656e4199cc +DIST gnupg-1.5.1.tgz 37316 BLAKE2B 61aa965518909f436b3350f1ca9a10298dc739cf44140dec1bd0937e8f29c99fff1e3e117ab4100bd0c480e27c3c59d29fdb24be08fb9f8d285f9c0e93bd7b86 SHA512 93aa267e3ebf0307a700560c6ea170e6763e0a94c22730a27d39956c2d4472187018efd6393c2c9bd6c0518b92fade1b60323e3b3c24ada480f1c4d22d9e2072 diff --git a/dev-php/pecl-gnupg/files/1.3.2/01-large_file_system.patch b/dev-php/pecl-gnupg/files/1.3.2/01-large_file_system.patch deleted file mode 100644 index c679bad631da..000000000000 --- a/dev-php/pecl-gnupg/files/1.3.2/01-large_file_system.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- a/config.m4 2007-05-04 13:23:41.000000000 +0000 -+++ b/config.m4 2010-03-28 01:13:10.000000000 +0000 -@@ -41,4 +41,6 @@ - PHP_SUBST(GNUPG_SHARED_LIBADD) - - PHP_NEW_EXTENSION(gnupg, [gnupg.c gnupg_keylistiterator.c], $ext_shared) -+ -+ AC_SYS_LARGEFILE - fi diff --git a/dev-php/pecl-gnupg/files/php-8.1-support-1.5.0.patch b/dev-php/pecl-gnupg/files/php-8.1-support-1.5.0.patch new file mode 100644 index 000000000000..c755ccd0c5b8 --- /dev/null +++ b/dev-php/pecl-gnupg/files/php-8.1-support-1.5.0.patch @@ -0,0 +1,55 @@ +diff --git a/phpc.h b/phpc.h +index 4b55747..70fb317 100644 +--- a/phpc/phpc.h ++++ b/phpc/phpc.h +@@ -51,6 +51,12 @@ + memcpy(&PHPC_OBJ_GET_HANDLER_VAR_NAME(_name), \ + zend_get_std_object_handlers(), sizeof(zend_object_handlers)) + ++/* for arginfo */ ++#ifndef ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX ++#define ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(name, return_reference, required_num_args, type, allow_null) \ ++ ZEND_BEGIN_ARG_INFO_EX(name, 0, return_reference, required_num_args) ++#endif ++ + /* ZEND_ACC_CTOR and ZEND_ACC_DTOR is removed in 7.4 */ + #ifndef ZEND_ACC_CTOR + #define ZEND_ACC_CTOR 0 +diff --git a/gnupg_keylistiterator.c b/gnupg_keylistiterator.c +index 215aaa0..9b285ee 100644 +--- a/gnupg_keylistiterator.c ++++ b/gnupg_keylistiterator.c +@@ -90,14 +90,28 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_gnupg_void_iterator_method, 0, 0, 0) + ZEND_END_ARG_INFO() + /* }}} */ + ++ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_gnupg_current, 0, 0, IS_MIXED, 0) ++ZEND_END_ARG_INFO() ++ ++#define arginfo_gnupg_key arginfo_gnupg_current ++ ++ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_gnupg_valid, 0, 0, _IS_BOOL, 0) ++ZEND_END_ARG_INFO() ++ ++ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_gnupg_next, 0, 0, IS_VOID, 0) ++ZEND_END_ARG_INFO() ++ ++#define arginfo_gnupg_rewind arginfo_gnupg_next ++ ++ + /* {{{ method list gnupg_keylistiterator */ + static zend_function_entry gnupg_keylistiterator_methods[] = { + PHP_ME(gnupg_keylistiterator, __construct, arginfo_gnupg_void_iterator_method, ZEND_ACC_PUBLIC) +- PHP_ME(gnupg_keylistiterator, current, arginfo_gnupg_void_iterator_method, ZEND_ACC_PUBLIC) +- PHP_ME(gnupg_keylistiterator, key, arginfo_gnupg_void_iterator_method, ZEND_ACC_PUBLIC) +- PHP_ME(gnupg_keylistiterator, next, arginfo_gnupg_void_iterator_method, ZEND_ACC_PUBLIC) +- PHP_ME(gnupg_keylistiterator, rewind, arginfo_gnupg_void_iterator_method, ZEND_ACC_PUBLIC) +- PHP_ME(gnupg_keylistiterator, valid, arginfo_gnupg_void_iterator_method, ZEND_ACC_PUBLIC) ++ PHP_ME(gnupg_keylistiterator, current, arginfo_gnupg_current, ZEND_ACC_PUBLIC) ++ PHP_ME(gnupg_keylistiterator, key, arginfo_gnupg_key, ZEND_ACC_PUBLIC) ++ PHP_ME(gnupg_keylistiterator, next, arginfo_gnupg_next, ZEND_ACC_PUBLIC) ++ PHP_ME(gnupg_keylistiterator, rewind, arginfo_gnupg_rewind, ZEND_ACC_PUBLIC) ++ PHP_ME(gnupg_keylistiterator, valid, arginfo_gnupg_valid, ZEND_ACC_PUBLIC) + PHPC_FE_END + }; + /* }}} */ diff --git a/dev-php/pecl-gnupg/metadata.xml b/dev-php/pecl-gnupg/metadata.xml index aca42932b833..77793b997e9e 100644 --- a/dev-php/pecl-gnupg/metadata.xml +++ b/dev-php/pecl-gnupg/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> diff --git a/dev-php/pecl-gnupg/pecl-gnupg-1.5.0.ebuild b/dev-php/pecl-gnupg/pecl-gnupg-1.5.0.ebuild index b489fe2f6453..170d7018c741 100644 --- a/dev-php/pecl-gnupg/pecl-gnupg-1.5.0.ebuild +++ b/dev-php/pecl-gnupg/pecl-gnupg-1.5.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 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_PECL_FILENAME="${MY_P}.tgz" PHP_EXT_S="${WORKDIR}/${MY_P}" -USE_PHP="php7-3 php7-4 php8-0" +USE_PHP="php8-1" inherit php-ext-pecl-r3 @@ -24,3 +24,5 @@ IUSE="" DEPEND="app-crypt/gpgme app-crypt/gnupg" RDEPEND="${DEPEND}" + +PATCHES=( "${FILESDIR}/php-8.1-support-1.5.0.patch" ) diff --git a/dev-php/pecl-gnupg/pecl-gnupg-1.4.0-r2.ebuild b/dev-php/pecl-gnupg/pecl-gnupg-1.5.1.ebuild index ce3a3f298456..2eee874e5749 100644 --- a/dev-php/pecl-gnupg/pecl-gnupg-1.4.0-r2.ebuild +++ b/dev-php/pecl-gnupg/pecl-gnupg-1.5.1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI="8" MY_P="${PN/pecl-/}-${PV/_rc/RC}" PHP_EXT_NAME="gnupg" @@ -10,7 +10,7 @@ PHP_EXT_ZENDEXT="no" PHP_EXT_PECL_FILENAME="${MY_P}.tgz" PHP_EXT_S="${WORKDIR}/${MY_P}" -USE_PHP="php5-6 php7-1 php7-2 php7-3 php7-4" +USE_PHP="php8-1" inherit php-ext-pecl-r3 @@ -24,10 +24,3 @@ IUSE="" DEPEND="app-crypt/gpgme app-crypt/gnupg" RDEPEND="${DEPEND}" - -PATCHES=( "${FILESDIR}"/1.3.2/01-large_file_system.patch ) - -# tests are broken with gnupg 2.0/2.1, see: -# https://github.com/php-gnupg/php-gnupg/issues/2 -# https://github.com/php-gnupg/php-gnupg/issues/3 -RESTRICT="test" diff --git a/dev-php/pecl-http/Manifest b/dev-php/pecl-http/Manifest index dc929ad0735f..c6ecbe7266f4 100644 --- a/dev-php/pecl-http/Manifest +++ b/dev-php/pecl-http/Manifest @@ -1,4 +1 @@ -DIST pecl_http-3.2.1.tgz 221244 BLAKE2B b6581829fb8a800e24ccedd4d0f3efbaf558850bdc356d27a6e1d1097a8e2cfc61963a1daccd1d0f269a7cef5b243d45cdfaff5138321fe20df615dde44d19e3 SHA512 e67d4b32ba6f524e3fcf65f5497b94275e1a4a14fce97c57afe366369f368b3acdbedf364ed73cf983fb2c5f57f498adaa1100e7c936f11cbc5de1caedad7b51 -DIST pecl_http-3.2.4.tgz 220631 BLAKE2B 996236cf9dd2f7d9bfaf046306e99c3ccf778261df19df8fd828b5811798f784841d89a6890e7347bd20cc6da71c966ea3ac9b17bf058e0bb766db7e1a8a6c49 SHA512 59c41d57c94a6e50e2f0b261130a24791b2845246f783b55e7f644f9a897d3650da364c5b38a860761b4a23f9266ed05000d6348bae2a7941e59d6bf5fb61a9e -DIST pecl_http-4.0.0.tgz 218259 BLAKE2B c9f5973686fd4db95a24dd4c50f217b93becc6a439066a395b0b7fec6e977154e5ae8f2261414458aed8e4a9d1281f44da2ecc67a05127610579f5be91196a88 SHA512 268b569c23f10ed72fe3c84fc5e5bf526c3e5ac345ca0556a24fbd01ce95da468d4e9aac6300d058001534ab826836793bf901e9560b744f1e20d7059be2ec79 -DIST pecl_http-4.1.0.tgz 220349 BLAKE2B 71152ee20930843636d90547339270fecf5569cb9a252a516c8150a134bf75fcb88b4fcfd129af1ca1366f4df775653b4dcdddbf0eb02426625550c1b1a0b483 SHA512 653c1dd8ec6dc738ce2dbf235a3c92522858e17ab9c0d00dd75a51bcfeb836f3fb02a6040b8b67d8d6839055286599958db844891686ca70c36031500be0bc1c +DIST pecl_http-4.2.2.tgz 224436 BLAKE2B 26ef3bb38778f0374938ba3f3bddba37c3a2044c7b9ffe2aacbca2566251d26d37882bf66773b8ed62d46855e8f14ad9b577cdb1ef3db9eba9850c0b30e57284 SHA512 1203367d590c7d80ffe7a21e7ac352ba053e3daeb778bf99e08fc13582e665e1429f850e51e36304bdec15e6646b648f2c444b46fa263e5441d008ac41a00f4b diff --git a/dev-php/pecl-http/files/pecl-http-4.1.0-use-getenv.patch b/dev-php/pecl-http/files/pecl-http-4.1.0-use-getenv.patch deleted file mode 100644 index c3ad7d968360..000000000000 --- a/dev-php/pecl-http/files/pecl-http-4.1.0-use-getenv.patch +++ /dev/null @@ -1,25 +0,0 @@ -commit a4f66fb42bb5203e9d1897a6cf554aa702ce0380 -Author: Thomas Deutschmann <whissi@gentoo.org> -AuthorDate: Tue May 18 19:55:47 2021 +0200 -Commit: Thomas Deutschmann <whissi@gentoo.org> -CommitDate: Tue May 18 19:55:47 2021 +0200 - - tests: use getenv() to access environment variable - - Fixes - - Warning: Undefined array key "PATH" in pecl-http-4.1.0/work/php8.0/tests/skipif.inc on line 56 - -diff --git a/tests/skipif.inc b/tests/skipif.inc -index 51272fb..76c3bd7 100644 ---- a/tests/skipif.inc -+++ b/tests/skipif.inc -@@ -53,7 +53,7 @@ function skip_http2_test($message = "skip need http2 support") { - if (!(http\Client\Curl\FEATURES & http\Client\Curl\Features\HTTP2)) { - die("$message (FEATURES & HTTP2)\n"); - } -- foreach (explode(":", $_ENV["PATH"]) as $path) { -+ foreach (explode(":", getenv("PATH")) as $path) { - if (is_executable($path . "/nghttpd")) { - return; - } diff --git a/dev-php/pecl-http/metadata.xml b/dev-php/pecl-http/metadata.xml index b86acf66c756..a6713ca675f7 100644 --- a/dev-php/pecl-http/metadata.xml +++ b/dev-php/pecl-http/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> <name>PHP</name> </maintainer> + <upstream> + <remote-id type="github">m6w6/ext-http</remote-id> + </upstream> </pkgmetadata> diff --git a/dev-php/pecl-http/pecl-http-3.2.1.ebuild b/dev-php/pecl-http/pecl-http-3.2.1.ebuild deleted file mode 100644 index 6ccd05d09da9..000000000000 --- a/dev-php/pecl-http/pecl-http-3.2.1.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -PHP_EXT_NAME="http" -PHP_EXT_PECL_PKG="pecl_http" -PHP_EXT_INI="yes" -PHP_EXT_ZENDEXT="no" -PHP_INI_NAME="50-http" - -USE_PHP="php5-6 php7-1 php7-2 php7-3" - -inherit php-ext-pecl-r3 - -USE_PHP="php7-1 php7-2 php7-3" - -KEYWORDS="amd64 x86" - -DESCRIPTION="Extended HTTP Support for PHP" -LICENSE="BSD-2 MIT" -SLOT="7" -IUSE="ssl curl_ssl_gnutls curl_ssl_nss +curl_ssl_openssl" - -DEPEND="app-arch/brotli:= - dev-libs/libevent - dev-php/pecl-propro:7[php_targets_php7-1?,php_targets_php7-2?,php_targets_php7-3?] - dev-php/pecl-raphf:7[php_targets_php7-1?,php_targets_php7-2?,php_targets_php7-3?] - net-dns/libidn2 - sys-libs/zlib - ssl? ( net-misc/curl[ssl,curl_ssl_gnutls=,curl_ssl_nss=,curl_ssl_openssl=] ) - !ssl? ( net-misc/curl[-ssl] ) - php_targets_php7-1? ( dev-lang/php:7.1[hash,session,iconv] ) - php_targets_php7-2? ( dev-lang/php:7.2[hash,session,iconv] ) - php_targets_php7-3? ( dev-lang/php:7.3[hash,session,iconv] )" -RDEPEND="${DEPEND} - php_targets_php5-6? ( dev-php/pecl-http:2[php_targets_php5-6] )" - -PHP_EXT_ECONF_ARGS=( --with-http --without-http-shared-deps --without-http-libidn-dir ) - -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_install() { - if use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3 ; 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 -} - -pkg_postinst() { - ewarn "This API has drastically changed and is not compatible with the 1.x syntax." - ewarn "Please review the documentation and update your code." -} diff --git a/dev-php/pecl-http/pecl-http-3.2.4.ebuild b/dev-php/pecl-http/pecl-http-3.2.4.ebuild deleted file mode 100644 index 0a717e5377db..000000000000 --- a/dev-php/pecl-http/pecl-http-3.2.4.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -PHP_EXT_NAME="http" -PHP_EXT_PECL_PKG="pecl_http" -PHP_EXT_INI="yes" -PHP_EXT_ZENDEXT="no" -PHP_INI_NAME="50-http" - -USE_PHP="php7-3 php7-4 php8-0" - -inherit php-ext-pecl-r3 - -USE_PHP="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_nss +curl_ssl_openssl" - -COMMON_DEPEND="app-arch/brotli:= - dev-libs/libevent - dev-php/pecl-propro:7[php_targets_php7-3(-)?,php_targets_php7-4(-)?] - >=dev-php/pecl-raphf-2.0.1:7[php_targets_php7-3(-)?,php_targets_php7-4(-)?] - net-dns/libidn2 - sys-libs/zlib - ssl? ( net-misc/curl[ssl,curl_ssl_gnutls(-)=,curl_ssl_nss(-)=,curl_ssl_openssl(-)=] ) - !ssl? ( net-misc/curl[-ssl] ) -" -DEPEND=" - 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-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-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.ebuild b/dev-php/pecl-http/pecl-http-4.0.0.ebuild deleted file mode 100644 index 92ccc331b626..000000000000 --- a/dev-php/pecl-http/pecl-http-4.0.0.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -PHP_EXT_NAME="http" -PHP_EXT_PECL_PKG="pecl_http" -PHP_EXT_INI="yes" -PHP_EXT_ZENDEXT="no" -PHP_INI_NAME="50-http" - -USE_PHP="php7-3 php7-4 php8-0" - -inherit php-ext-pecl-r3 - -USE_PHP="php8-0" - -KEYWORDS="~amd64 ~x86" - -DESCRIPTION="Extended HTTP Support for PHP" -LICENSE="BSD-2 MIT" -SLOT="8" -IUSE="ssl curl_ssl_gnutls curl_ssl_nss +curl_ssl_openssl" - -COMMON_DEPEND="app-arch/brotli:= - dev-libs/libevent - >=dev-php/pecl-raphf-2.0.1:7[php_targets_php8-0(-)?] - net-dns/libidn2 - sys-libs/zlib - ssl? ( net-misc/curl[ssl,curl_ssl_gnutls(-)=,curl_ssl_nss(-)=,curl_ssl_openssl(-)=] ) - !ssl? ( net-misc/curl[-ssl] ) -" -DEPEND=" - php_targets_php8-0? ( ${COMMON_DEPEND} dev-lang/php:8.0[session(-),iconv(-)] )" -RDEPEND="${DEPEND} - php_targets_php7-3? ( dev-php/pecl-http:7[php_targets_php7-3(-)] ) - php_targets_php7-4? ( dev-php/pecl-http:7[php_targets_php7-4(-)] )" - -PHP_EXT_ECONF_ARGS=( --with-http --without-http-shared-deps --without-http-libidn-dir ) - -src_prepare() { - if use php_targets_php8-0 ; then - php-ext-source-r3_src_prepare - else - default_src_prepare - fi -} - -src_install() { - if use php_targets_php8-0 ; then - php-ext-pecl-r3_src_install - fi -} - -src_test() { - # Cannot use eclass function due to required modules - # All tests SKIP otherwise - for slot in $(php_get_slots); do - php_init_slot_env "${slot}" - # Link in required modules for testing - ln -s "${EXT_DIR}/raphf.so" "modules/raphf.so" || die - sed -i \ - 's/PHP_TEST_SHARED_EXTENSIONS)/PHP_TEST_SHARED_EXTENSIONS) -d extension=raphf/' \ - Makefile || die - SKIP_ONLINE_TESTS=yes NO_INTERACTION="yes" emake test - # Clean up testing links - rm modules/raphf.so || die - done -} diff --git a/dev-php/pecl-http/pecl-http-4.1.0.ebuild b/dev-php/pecl-http/pecl-http-4.2.2-r1.ebuild index 9ffc9765e462..976d95d6c8fa 100644 --- a/dev-php/pecl-http/pecl-http-4.1.0.ebuild +++ b/dev-php/pecl-http/pecl-http-4.2.2-r1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="7" +EAPI="8" PHP_EXT_NAME="http" PHP_EXT_PECL_PKG="pecl_http" @@ -9,43 +9,35 @@ PHP_EXT_INI="yes" PHP_EXT_ZENDEXT="no" PHP_INI_NAME="50-http" -USE_PHP="php7-3 php7-4 php8-0" +USE_PHP="php8-1" inherit php-ext-pecl-r3 -USE_PHP="php8-0" - -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" DESCRIPTION="Extended HTTP Support for PHP" LICENSE="BSD-2 MIT" SLOT="8" -IUSE="ssl curl_ssl_gnutls curl_ssl_nss +curl_ssl_openssl" +IUSE="ssl curl_ssl_gnutls +curl_ssl_openssl" COMMON_DEPEND="app-arch/brotli:= dev-libs/libevent - >=dev-php/pecl-raphf-2.0.1:7[php_targets_php8-0(-)?] + >=dev-php/pecl-raphf-2.0.1:7[php_targets_php8-1(-)?] net-dns/libidn2 sys-libs/zlib - ssl? ( net-misc/curl[ssl,curl_ssl_gnutls(-)=,curl_ssl_nss(-)=,curl_ssl_openssl(-)=] ) + ssl? ( net-misc/curl[ssl,curl_ssl_gnutls(-)=,curl_ssl_openssl(-)=] ) !ssl? ( net-misc/curl[-ssl] ) " DEPEND=" - php_targets_php8-0? ( ${COMMON_DEPEND} dev-lang/php:8.0[session(-),iconv(-)] )" -RDEPEND="${DEPEND} - php_targets_php7-3? ( dev-php/pecl-http:7[php_targets_php7-3(-)] ) - php_targets_php7-4? ( dev-php/pecl-http:7[php_targets_php7-4(-)] )" - -PHP_EXT_ECONF_ARGS=( --with-http --without-http-shared-deps --without-http-libidn-dir ) + php_targets_php8-1? ( ${COMMON_DEPEND} dev-lang/php:8.1[session(-),iconv(-)] )" +RDEPEND="${DEPEND}" -PATCHES=( "${FILESDIR}"/${P}-use-getenv.patch ) +PHP_EXT_ECONF_ARGS=( --with-http --without-http-shared-deps + --without-http-libidn-dir --without-http-libicu-dir + --without-http-libidnkit2-dir --without-http-libidnkit-dir ) src_prepare() { - if use php_targets_php8-0 ; then - php-ext-source-r3_src_prepare - else - default_src_prepare - fi + php-ext-source-r3_src_prepare # Respect LDFLAGS, bug 727134 export EXTRA_LDFLAGS="${LDFLAGS}" @@ -71,9 +63,3 @@ src_test() { rm modules/raphf.so || die done } - -src_install() { - if use php_targets_php8-0 ; then - php-ext-pecl-r3_src_install - fi -} diff --git a/dev-php/pecl-imagick/Manifest b/dev-php/pecl-imagick/Manifest index 1f064c2a8feb..5680f09a093f 100644 --- a/dev-php/pecl-imagick/Manifest +++ b/dev-php/pecl-imagick/Manifest @@ -1 +1 @@ -DIST imagick-3.4.4.tgz 253434 BLAKE2B 73ce21547881b60733dbc19ae83cd2e60135dbb4052ea723f1ee10b3759ce12065a0cab2a7e4923b78e9e68b12fd7b875c7d1bd7b2a14ce4e4d7ff5b9c7fbc06 SHA512 73145a1f095849c32760db2dfc4acc13c57d99a037d65eca9b0ddf8f8e81cf6d28a50f2614e44bae1d90b4f881a2e9a64926e0e3b9403e491fd903ffeb30c4b7 +DIST imagick-3.7.0.tgz 360138 BLAKE2B 2c149f2ec771df92789d67e88c6f7180d3da7c9182561432bdd4e0a83f96982cc8fc95bc1a003e05e37a54fabe6ab0fe693a6b9208d2e481d36e6c334aeee023 SHA512 c84408e4e4a0c46d979240e06d58d264c6bb21f3b95e3d434c8a21cd808f6c495fd453ef9c07b5c44dac81c6f205b6697f8ecaf1a65a86ce4e9052328a389ebe diff --git a/dev-php/pecl-imagick/files/pecl-imagick-3.7.0-php8.3.patch b/dev-php/pecl-imagick/files/pecl-imagick-3.7.0-php8.3.patch new file mode 100644 index 000000000000..d75d23dbf11b --- /dev/null +++ b/dev-php/pecl-imagick/files/pecl-imagick-3.7.0-php8.3.patch @@ -0,0 +1,20 @@ +From 7088edc353f53c4bc644573a79cdcd67a726ae16 Mon Sep 17 00:00:00 2001 +From: FedericoHeichou <federicoheichou@gmail.com> +Date: Fri, 24 Nov 2023 11:24:00 +0100 +Subject: [PATCH] Fix compilation error "Unterminated preprocessor conditions" + in php 8.3 + +--- + Imagick.stub.php | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/Imagick.stub.php b/Imagick.stub.php +index 804c0152..49da9386 100644 +--- a/Imagick.stub.php ++++ b/Imagick.stub.php +@@ -1669,4 +1669,5 @@ public function setInterpolateMethod(int $method): bool{} + public function setOrientation(int $orientation): bool {} + #endif + ++#endif + } diff --git a/dev-php/pecl-imagick/metadata.xml b/dev-php/pecl-imagick/metadata.xml index 16ca6ff90970..efc1a76b7775 100644 --- a/dev-php/pecl-imagick/metadata.xml +++ b/dev-php/pecl-imagick/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> @@ -9,4 +9,7 @@ <email>mjo@gentoo.org</email> <name>Michael Orlitzky</name> </maintainer> + <upstream> + <remote-id type="github">Imagick/imagick</remote-id> + </upstream> </pkgmetadata> diff --git a/dev-php/pecl-imagick/pecl-imagick-3.4.4.ebuild b/dev-php/pecl-imagick/pecl-imagick-3.4.4.ebuild deleted file mode 100644 index d89a60267eae..000000000000 --- a/dev-php/pecl-imagick/pecl-imagick-3.4.4.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -PHP_EXT_NAME="imagick" -USE_PHP="php5-6 php7-1 php7-2 php7-3 php7-4" - -inherit php-ext-pecl-r3 - -KEYWORDS="amd64 ~arm ~arm64 x86" - -DESCRIPTION="PHP wrapper for the ImageMagick library" -HOMEPAGE="https://pecl.php.net/imagick https://github.com/mkoppanen/imagick" -LICENSE="PHP-3.01" -SLOT="0" -IUSE="examples test" -RESTRICT="!test? ( test )" - -# imagemagick[-openmp] is needed wrt bug 547922 and upstream -# https://github.com/mkoppanen/imagick#openmp -RDEPEND=">=media-gfx/imagemagick-6.2.4:=[-openmp]" -DEPEND="${RDEPEND} - test? ( >=media-gfx/imagemagick-6.2.4:=[jpeg,png,svg,truetype,xml] )" - -PHP_EXT_ECONF_ARGS="--with-imagick=${EPREFIX}/usr" diff --git a/dev-php/pecl-imagick/pecl-imagick-3.7.0-r2.ebuild b/dev-php/pecl-imagick/pecl-imagick-3.7.0-r2.ebuild new file mode 100644 index 000000000000..ade0fc6c5557 --- /dev/null +++ b/dev-php/pecl-imagick/pecl-imagick-3.7.0-r2.ebuild @@ -0,0 +1,34 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PHP_EXT_NAME="imagick" +USE_PHP="php8-1 php8-2" + +# https://github.com/Imagick/imagick/issues/626 +PHP_EXT_NEEDED_USE="-debug" + +inherit php-ext-pecl-r3 + +KEYWORDS="amd64 ~arm ~arm64 x86" + +DESCRIPTION="PHP wrapper for the ImageMagick library" +HOMEPAGE="https://pecl.php.net/package/imagick https://github.com/Imagick/imagick" +LICENSE="PHP-3.01" +SLOT="0" +IUSE="examples test" +RESTRICT="!test? ( test )" + +# imagemagick[-openmp] is needed wrt bug 547922 and upstream +# https://github.com/Imagick/imagick#openmp +RDEPEND="media-gfx/imagemagick:=[-openmp]" +DEPEND="${RDEPEND} + test? ( media-gfx/imagemagick:=[hdri,jpeg,png,svg,truetype,xml] )" + +PHP_EXT_ECONF_ARGS="--with-imagick=${EPREFIX}/usr" + +src_install() { + php-ext-pecl-r3_src_install + php-ext-source-r3_addtoinifiles "imagick.skip_version_check" "1" +} diff --git a/dev-php/pecl-imagick/pecl-imagick-3.7.0-r3.ebuild b/dev-php/pecl-imagick/pecl-imagick-3.7.0-r3.ebuild new file mode 100644 index 000000000000..ac710a275deb --- /dev/null +++ b/dev-php/pecl-imagick/pecl-imagick-3.7.0-r3.ebuild @@ -0,0 +1,38 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PHP_EXT_NAME="imagick" +USE_PHP="php8-1 php8-2 php8-3" + +# https://github.com/Imagick/imagick/issues/626 +PHP_EXT_NEEDED_USE="-debug" + +inherit php-ext-pecl-r3 + +KEYWORDS="amd64 ~arm ~arm64 x86" + +DESCRIPTION="PHP wrapper for the ImageMagick library" +HOMEPAGE="https://pecl.php.net/package/imagick https://github.com/Imagick/imagick" +LICENSE="PHP-3.01" +SLOT="0" +IUSE="examples test" +RESTRICT="!test? ( test )" + +# imagemagick[-openmp] is needed wrt bug 547922 and upstream +# https://github.com/Imagick/imagick#openmp +RDEPEND="media-gfx/imagemagick:=[-openmp]" +DEPEND=" + ${RDEPEND} + test? ( media-gfx/imagemagick:=[hdri,jpeg,png,svg,truetype,xml] ) +" + +PATCHES="${FILESDIR}/${PN}-3.7.0-php8.3.patch" + +PHP_EXT_ECONF_ARGS="--with-imagick=${EPREFIX}/usr" + +src_install() { + php-ext-pecl-r3_src_install + php-ext-source-r3_addtoinifiles "imagick.skip_version_check" "1" +} diff --git a/dev-php/pecl-lzf/Manifest b/dev-php/pecl-lzf/Manifest index f9ab9348d2e9..f881dbc8a50f 100644 --- a/dev-php/pecl-lzf/Manifest +++ b/dev-php/pecl-lzf/Manifest @@ -1 +1,2 @@ DIST LZF-1.6.8.tgz 18071 BLAKE2B 83a12c44c02145baac75bc7b5172b09a6a15d4d02852f25d56ea97cf58a83709d59d56cb12be7df510fd687fd5ade760939527ee8151d3ecdb4407b7be2022e3 SHA512 c35543a40b2b44da4bd60e3142ba6ecf33e3460a8ea9f4f7fe6cdc4d728048593b33c423195d58707355975d655f614249642aff2d9b810af0e6a34d42fa1c43 +DIST LZF-1.7.0.tgz 18267 BLAKE2B c3d0a9383037e9e2bbe0a156fc4e23090ab0b5bc2ea31b402d3f56ea9d162b6ed938d754138dbae2a984d7237cb2a2d04b58a62679eea3c3f5b48718882494b8 SHA512 76a2bce7aa44f9aae40345f37c9294626d453879c7f98099ad6c31ae32abc638233934bf22ddd9bc0d4a6d285b25aa06dedc175ad5bb1544884a272e6b031ced diff --git a/dev-php/pecl-lzf/metadata.xml b/dev-php/pecl-lzf/metadata.xml index aca42932b833..77793b997e9e 100644 --- a/dev-php/pecl-lzf/metadata.xml +++ b/dev-php/pecl-lzf/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> diff --git a/dev-php/pecl-lzf/pecl-lzf-1.6.8-r1.ebuild b/dev-php/pecl-lzf/pecl-lzf-1.6.8-r1.ebuild index 2cce616bb3dc..b64e140ffa8f 100644 --- a/dev-php/pecl-lzf/pecl-lzf-1.6.8-r1.ebuild +++ b/dev-php/pecl-lzf/pecl-lzf-1.6.8-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 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="php7-3 php7-4 php8-0" +USE_PHP="php8-1" inherit php-ext-pecl-r3 diff --git a/dev-php/pecl-lzf/pecl-lzf-1.7.0.ebuild b/dev-php/pecl-lzf/pecl-lzf-1.7.0.ebuild new file mode 100644 index 000000000000..a3c29c564b72 --- /dev/null +++ b/dev-php/pecl-lzf/pecl-lzf-1.7.0.ebuild @@ -0,0 +1,19 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PHP_EXT_NAME="lzf" +PHP_EXT_PECL_PKG="LZF" +PHP_EXT_INI="yes" +PHP_EXT_ZENDEXT="no" +USE_PHP="php8-1" + +inherit php-ext-pecl-r3 + +KEYWORDS="~amd64 ~x86" + +DESCRIPTION="This package handles LZF de/compression" +LICENSE="PHP-3" +SLOT="0" +IUSE="" diff --git a/dev-php/pecl-mailparse/Manifest b/dev-php/pecl-mailparse/Manifest index e22f8ecc188b..f1fc620973bb 100644 --- a/dev-php/pecl-mailparse/Manifest +++ b/dev-php/pecl-mailparse/Manifest @@ -1 +1 @@ -DIST mailparse-3.1.1.tgz 941192 BLAKE2B 00b5a506031cd03439e3d67172c17aeeb6af3b950694251f7654007642bf80fff3cda900fc97ba177b91ca970e47416132080793ce64d8038e7aecbf2fdaf6c0 SHA512 01ddb8d4d27a74c14f70b02b49322c60fc79affab374205fee91b9da21e5148e08dba024f6bc620e4f26c2c937675e09092c52ca69172d2f7797c3e2bf374bee +DIST mailparse-3.1.3.tgz 943785 BLAKE2B 03cb7d4d4ac78d04f710155fdd9282250dc686dbab3a6d9dfb8e3ff82fda07faf02680ad86a810cd7ee2f38c8980fbdc9ad67399f3164506e523a98ce3ffb0a9 SHA512 93659e479d8ab61ae473f6dc002b7198903eebdcfb4aa515e76952f5050fd1a815baccfcb57bd32fb9be6108dfed6dc73172067a58c9e6098058999bb3802000 diff --git a/dev-php/pecl-mailparse/metadata.xml b/dev-php/pecl-mailparse/metadata.xml index b86acf66c756..0e51a348d85f 100644 --- a/dev-php/pecl-mailparse/metadata.xml +++ b/dev-php/pecl-mailparse/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> <name>PHP</name> </maintainer> + <upstream> + <remote-id type="github">php/pecl-mail-mailparse</remote-id> + </upstream> </pkgmetadata> diff --git a/dev-php/pecl-mailparse/pecl-mailparse-3.1.1.ebuild b/dev-php/pecl-mailparse/pecl-mailparse-3.1.3.ebuild index 35e848549fa6..e5efcd368a9e 100644 --- a/dev-php/pecl-mailparse/pecl-mailparse-3.1.1.ebuild +++ b/dev-php/pecl-mailparse/pecl-mailparse-3.1.3.ebuild @@ -1,15 +1,15 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 WANT_AUTOMAKE="none" PHP_EXT_NAME="mailparse" PHP_EXT_INI="yes" PHP_EXT_ZENDEXT="no" PHP_EXT_ECONF_ARGS="" -USE_PHP="php7-2 php7-3 php7-4 php8-0" -PHP_EXT_NEEDED_USE="unicode" +USE_PHP="php8-1" +PHP_EXT_NEEDED_USE="unicode(-)" DOCS=( README.md ) inherit php-ext-pecl-r3 diff --git a/dev-php/pecl-mcrypt/Manifest b/dev-php/pecl-mcrypt/Manifest index 404b1e8693f0..23e6a47808a8 100644 --- a/dev-php/pecl-mcrypt/Manifest +++ b/dev-php/pecl-mcrypt/Manifest @@ -1 +1 @@ -DIST mcrypt-1.0.3.tgz 33590 BLAKE2B 5de1108f53604fffea9e3cb64d9efdae2008da164acd47b27fd0df8f12a0f508345d63bee4d588c1eecd9a935f8be3b2db5c3d119c5b3013955c54085ebe9e9f SHA512 ef215b576b471d6e1ecac4bb097f518fa57fd551b678b7fdddd9d5058f6667b0ee757e887f00b61672b89cd86f1962cbfe0e355681fa47daba9873c3bf4db679 +DIST mcrypt-1.0.5.tgz 27056 BLAKE2B 0ed78eed5d5e1c848f554bf16bb5d94fd445081ab389b4a44f3b0ad0fdb11b25bd79eea77ed87a35120fb89b8409705b01d725923d7b2777dd32276f3a39238f SHA512 fe9afd0987ddbcbb0a9fc5e8313c08c65ac6afd606cce586fe30600ab149b4f4add917bb0319f803942833a88f520f65e2e94bbcc6c58e2075e829509e7dfac5 diff --git a/dev-php/pecl-mcrypt/metadata.xml b/dev-php/pecl-mcrypt/metadata.xml index 051239844a94..63821063206c 100644 --- a/dev-php/pecl-mcrypt/metadata.xml +++ b/dev-php/pecl-mcrypt/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person" proxied="yes"> <email>hydrapolic@gmail.com</email> diff --git a/dev-php/pecl-mcrypt/pecl-mcrypt-1.0.3.ebuild b/dev-php/pecl-mcrypt/pecl-mcrypt-1.0.3.ebuild deleted file mode 100644 index f2c29f734582..000000000000 --- a/dev-php/pecl-mcrypt/pecl-mcrypt-1.0.3.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PHP_EXT_NAME="mcrypt" -USE_PHP="php7-2 php7-3 php7-4" -MY_P="${PN/pecl-/}-${PV/_rc/RC}" -PHP_EXT_ECONF_ARGS=() -PHP_EXT_PECL_FILENAME="${MY_P}.tgz" -PHP_EXT_S="${WORKDIR}/${MY_P}" - -inherit php-ext-pecl-r3 - -DESCRIPTION="Bindings for the libmcrypt library" -LICENSE="PHP-3.01" -SLOT="0" -KEYWORDS="amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86" - -DEPEND="dev-libs/libmcrypt" -RDEPEND="${DEPEND}" - -S="${WORKDIR}/${MY_P}" - -src_prepare() { - # PHP Warning: Use of undefined constant MCRYPT_CBC - assumed 'MCRYPT_CBC' - sed -i '/MODE3/s/MCRYPT_CBC/"MCRYPT_CBC"/g' tests/bug8040.phpt || die - - php-ext-source-r3_src_prepare -} diff --git a/dev-php/pecl-mcrypt/pecl-mcrypt-1.0.5.ebuild b/dev-php/pecl-mcrypt/pecl-mcrypt-1.0.5.ebuild new file mode 100644 index 000000000000..019ba4f3108c --- /dev/null +++ b/dev-php/pecl-mcrypt/pecl-mcrypt-1.0.5.ebuild @@ -0,0 +1,24 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PHP_EXT_NAME="mcrypt" +USE_PHP="php8-1" +MY_P="${PN/pecl-/}-${PV/_rc/RC}" +PHP_EXT_ECONF_ARGS=() +PHP_EXT_PECL_FILENAME="${MY_P}.tgz" +PHP_EXT_S="${WORKDIR}/${MY_P}" + +inherit php-ext-pecl-r3 + +DESCRIPTION="Bindings for the libmcrypt library" +LICENSE="PHP-3.01" +SLOT="0" +KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86" + +DEPEND="dev-libs/libltdl + dev-libs/libmcrypt" +RDEPEND="${DEPEND}" + +S="${WORKDIR}/${MY_P}" diff --git a/dev-php/pecl-memcache/Manifest b/dev-php/pecl-memcache/Manifest index 37614f466156..5e622e7de7d9 100644 --- a/dev-php/pecl-memcache/Manifest +++ b/dev-php/pecl-memcache/Manifest @@ -1,2 +1 @@ -DIST memcache-4.0.5.2.tgz 75061 BLAKE2B fbf96fd182ff4b8764c4492edcdac53263176ebe6d63a27e9f3fb32110a016b221722c246e7c1ae49ee973a6e4cdff045876d1c6119f410f2fa3e796c0580e02 SHA512 93e163acf3a6c28f16b5f0982105f6f558cceeb314b3f09ad71655d8a5adf64d23959f1a2f3589eb7e7a7e18c88ba8132014e13f697a737cd570cf9405137384 DIST memcache-8.0.tgz 78448 BLAKE2B fb2d68d5ff4c6343dd2e66ae5c3f84fed22455b8614dce04dde2e10c164bf1f8d276776b74beaa387dd794cf82f6b897a88c8bed058376b9032e0452c2e94b06 SHA512 d5eea13b85d8d35ef6aab8c5699bdcc4707cf8debf4052cbbeac26e7e2360a4d3d4e55e8bd0b40cf19fe014ba1fc42d5417deabbe22a199f0c6aa98b67d132d4 diff --git a/dev-php/pecl-memcache/files/8.0-patches-20211123.patch b/dev-php/pecl-memcache/files/8.0-patches-20211123.patch new file mode 100644 index 000000000000..9005ac5feef3 --- /dev/null +++ b/dev-php/pecl-memcache/files/8.0-patches-20211123.patch @@ -0,0 +1,204 @@ +diff --git a/Dockerfile b/Dockerfile +index a52759e..506c28a 100644 +--- a/Dockerfile ++++ b/Dockerfile +@@ -1,10 +1,13 @@ + ARG PHP_IMAGE=php:8.0 + FROM $PHP_IMAGE + ++RUN docker-php-ext-configure pcntl --enable-pcntl \ ++ && docker-php-ext-install -j$(nproc) pcntl ++ + RUN apt-get update && apt-get install -y \ + git \ + zlib1g-dev \ +- memcached ; ++ memcached ; + + COPY docker/host.conf /etc/host.conf + +diff --git a/README b/README +index b36fa46..07f8f89 100644 +--- a/README ++++ b/README +@@ -3,7 +3,7 @@ This is an official repository for pecl-memcache plugin since 2019. + This repository contains modified pecl-memcache plugin ported to PHP8, + which was originally developed for the need of hosting company in Slovakia (Websupport.sk). + +-The latest release is 8.0 (released: 2020-12-06) with support for PHP 8.0. ++The latest release is 8.0 (released: 2020-12-06) with support for PHP 8.0 and unofficial support for PHP 7.3 and 7.4 + + Please use version 4.0.5.1 (released: 2020-12-19) for PHP 7.x from branch NON_BLOCKING_IO_php7. + +diff --git a/Vagrantfile b/Vagrantfile +new file mode 100644 +index 0000000..8665890 +--- /dev/null ++++ b/Vagrantfile +@@ -0,0 +1,17 @@ ++# -*- mode: ruby -*- ++# vi: set ft=ruby : ++ ++VAGRANTFILE_API_VERSION = '2' ++ ++Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| ++ config.vm.box = 'ubuntu/bionic64' ++ ++ config.vm.provider :virtualbox do |vb| ++ vb.name = 'ext-memcache-dev' ++ vb.memory = 1024 ++ vb.cpus = 2 ++ end ++ ++ config.vm.provision 'docker' ++ ++end +diff --git a/src/memcache.c b/src/memcache.c +index 7c3a660..2cb675b 100644 +--- a/src/memcache.c ++++ b/src/memcache.c +@@ -924,7 +924,7 @@ static void php_mmc_store(INTERNAL_FUNCTION_PARAMETERS, int op) /* {{{ */ + continue; + } + +- /* begin sending requests immediatly */ ++ /* begin sending requests immediately */ + mmc_pool_select(pool); + } ZEND_HASH_FOREACH_END(); + } +@@ -1089,7 +1089,7 @@ static void php_mmc_numeric(INTERNAL_FUNCTION_PARAMETERS, int deleted, int inver + continue; + } + +- /* begin sending requests immediatly */ ++ /* begin sending requests immediately */ + mmc_pool_select(pool); + } ZEND_HASH_FOREACH_END(); + +@@ -1319,8 +1319,9 @@ static void php_mmc_connect(INTERNAL_FUNCTION_PARAMETERS, zend_bool persistent) + size_t host_len; + zend_long tcp_port = MEMCACHE_G(default_port); + double timeout = MMC_DEFAULT_TIMEOUT; ++ zend_bool null_port; + +- if (zend_parse_parameters(ZEND_NUM_ARGS(), "s|ld", &host, &host_len, &tcp_port, &timeout) == FAILURE) { ++ if (zend_parse_parameters(ZEND_NUM_ARGS(), "s|l!d", &host, &host_len, &tcp_port, &null_port, &timeout) == FAILURE) { + return; + } + +@@ -2492,7 +2493,7 @@ PHP_FUNCTION(memcache_flush) + pool->protocol->flush(request, delay); + + if (mmc_pool_schedule(pool, pool->servers[i], request) == MMC_OK) { +- /* begin sending requests immediatly */ ++ /* begin sending requests immediately */ + mmc_pool_select(pool); + } + } +diff --git a/src/memcache_pool.c b/src/memcache_pool.c +index 733a0c5..e52389d 100644 +--- a/src/memcache_pool.c ++++ b/src/memcache_pool.c +@@ -1303,7 +1303,7 @@ int mmc_pool_schedule_get( + pool->protocol->end_get(mmc->buildreq); + mmc_pool_schedule(pool, mmc, mmc->buildreq); + +- /* begin sending requests immediatly */ ++ /* begin sending requests immediately */ + mmc_pool_select(pool); + + mmc->buildreq = mmc_pool_request_get( +diff --git a/src/memcache_session.c b/src/memcache_session.c +index e4a80de..d3aab24 100644 +--- a/src/memcache_session.c ++++ b/src/memcache_session.c +@@ -319,7 +319,7 @@ PS_READ_FUNC(memcache) + ZVAL_NULL(&addresult); + + /* third request fetches the data, data is only valid if either of the lock requests succeeded */ +- ZVAL_EMPTY_STRING(&dataresult); ++ ZVAL_NULL(&dataresult); + + /* create requests */ + if (php_mmc_session_read_request(pool, &zkey, lockparam, &addresult, dataparam, &lockrequest, &addrequest, &datarequest) != MMC_OK) { +diff --git a/tests/redundancy_test.phpt b/tests/redundancy_test.phpt +new file mode 100644 +index 0000000..fb5ab84 +--- /dev/null ++++ b/tests/redundancy_test.phpt +@@ -0,0 +1,75 @@ ++--TEST-- ++redundancy test ++--SKIPIF-- ++<?php include 'connect.inc'; if (!MEMCACHE_HAVE_SESSION) print 'skip not compiled with session support'; else if (!function_exists('pcntl_fork')) print 'skip not compiled with pcntl_fork() support'; ?> ++--FILE-- ++<?php ++ ++include 'connect.inc'; ++ ++$sid = md5(rand()); ++ ++ini_set('session.save_handler', 'memcache'); ++ini_set('memcache.session_save_path', "tcp://$host:$port,tcp://$host2:$port2"); ++ini_set('memcache.session_redundancy', 3); ++ ++$memcache1 = test_connect1(); ++$memcache2 = test_connect2(); ++ ++$pid = pcntl_fork(); ++if (!$pid) { ++ // In child process ++ session_id($sid); ++ session_start(); ++ if (!isset($_SESSION['counter'])) ++ $_SESSION['counter'] = 0; ++ $_SESSION['counter'] += 1; ++ session_write_close(); ++ ++ exit(0); ++} ++pcntl_waitpid($pid, $status); ++ ++$memcache1->flush(); ++ ++$pid = pcntl_fork(); ++if (!$pid) { ++ // In child process ++ session_id($sid); ++ session_start(); ++ if (!isset($_SESSION['counter'])) ++ $_SESSION['counter'] = 0; ++ $_SESSION['counter'] += 1; ++ session_write_close(); ++ ++ exit(0); ++} ++pcntl_waitpid($pid, $status); ++ ++$memcache2->flush(); ++ ++$pid = pcntl_fork(); ++if (!$pid) { ++ // In child process ++ session_id($sid); ++ session_start(); ++ if (!isset($_SESSION['counter'])) ++ $_SESSION['counter'] = 0; ++ $_SESSION['counter'] += 1; ++ session_write_close(); ++ ++ exit(0); ++} ++pcntl_waitpid($pid, $status); ++ ++ ++session_id($sid); ++session_start(); ++var_dump($_SESSION); ++ ++?> ++--EXPECT-- ++array(1) { ++ ["counter"]=> ++ int(3) ++} diff --git a/dev-php/pecl-memcache/metadata.xml b/dev-php/pecl-memcache/metadata.xml index b86acf66c756..222c77f3742a 100644 --- a/dev-php/pecl-memcache/metadata.xml +++ b/dev-php/pecl-memcache/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> diff --git a/dev-php/pecl-memcache/pecl-memcache-4.0.5.2-r1.ebuild b/dev-php/pecl-memcache/pecl-memcache-4.0.5.2-r1.ebuild deleted file mode 100644 index 10134a07db4d..000000000000 --- a/dev-php/pecl-memcache/pecl-memcache-4.0.5.2-r1.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" -PHP_EXT_NAME="memcache" -PHP_EXT_INI="yes" -PHP_EXT_ZENDEXT="no" -PHP_EXT_NEEDED_USE="session(-)?" -DOCS=( README example.php ) -HTML_DOCS=( memcache.php ) - -USE_PHP="php7-3 php7-4 php8-0" - -inherit php-ext-pecl-r3 - -USE_PHP="php7-3 php7-4" - -KEYWORDS="~amd64 ~hppa ~ppc64 ~x86" - -DESCRIPTION="PHP extension for using memcached" -LICENSE="PHP-3" -SLOT="7" -IUSE="+session" - -DEPEND="php_targets_php7-3? ( sys-libs/zlib ) php_targets_php7-4? ( sys-libs/zlib )" -RDEPEND="${DEPEND} - php_targets_php8-0? ( dev-php/pecl-memcache:8[php_targets_php8-0(-)?] ) -" - -# The test suite requires memcached to be running. -RESTRICT='test' - -src_prepare() { - if 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-3 || use php_targets_php7-4 ; then - local PHP_EXT_ECONF_ARGS=( --enable-memcache --with-zlib-dir="${EPREFIX}/usr" $(use_enable session memcache-session) ) - php-ext-source-r3_src_configure - fi -} - -src_install() { - if use php_targets_php7-3 || use php_targets_php7-4 ; then - php-ext-pecl-r3_src_install - - php-ext-source-r3_addtoinifiles "memcache.allow_failover" "true" - php-ext-source-r3_addtoinifiles "memcache.max_failover_attempts" "20" - php-ext-source-r3_addtoinifiles "memcache.chunk_size" "32768" - php-ext-source-r3_addtoinifiles "memcache.default_port" "11211" - php-ext-source-r3_addtoinifiles "memcache.hash_strategy" "consistent" - php-ext-source-r3_addtoinifiles "memcache.hash_function" "crc32" - php-ext-source-r3_addtoinifiles "memcache.redundancy" "1" - php-ext-source-r3_addtoinifiles "memcache.session_redundancy" "2" - php-ext-source-r3_addtoinifiles "memcache.protocol" "ascii" - fi -} diff --git a/dev-php/pecl-memcache/pecl-memcache-8.0.ebuild b/dev-php/pecl-memcache/pecl-memcache-8.0-r1.ebuild index a837166eaa5c..40bb1203cafe 100644 --- a/dev-php/pecl-memcache/pecl-memcache-8.0.ebuild +++ b/dev-php/pecl-memcache/pecl-memcache-8.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -9,12 +9,10 @@ PHP_EXT_NEEDED_USE="session(-)?" DOCS=( README example.php ) HTML_DOCS=( memcache.php ) -USE_PHP="php7-3 php7-4 php8-0" +USE_PHP="php8-1" inherit php-ext-pecl-r3 -USE_PHP="php8-0" - KEYWORDS="~amd64 ~hppa ~ppc64 ~x86" DESCRIPTION="PHP extension for using memcached" @@ -22,17 +20,15 @@ LICENSE="PHP-3" SLOT="8" IUSE="+session" -DEPEND="php_targets_php8-0? ( sys-libs/zlib )" -RDEPEND="${DEPEND} - php_targets_php7-3? ( dev-php/pecl-memcache:7[php_targets_php7-3(-)?] ) - php_targets_php7-4? ( dev-php/pecl-memcache:7[php_targets_php7-4(-)?] ) -" +DEPEND="php_targets_php8-1? ( sys-libs/zlib )" +RDEPEND="${DEPEND}" # The test suite requires memcached to be running. RESTRICT='test' +PATCHES=( "${FILESDIR}/8.0-patches-20211123.patch" ) src_prepare() { - if use php_targets_php8-0 ; then + if use php_targets_php8-1 ; then php-ext-source-r3_src_prepare else default @@ -40,14 +36,14 @@ src_prepare() { } src_configure() { - if use php_targets_php8-0 ; then + if use php_targets_php8-1 ; then local PHP_EXT_ECONF_ARGS=( --enable-memcache --with-zlib-dir="${EPREFIX}/usr" $(use_enable session memcache-session) ) php-ext-source-r3_src_configure fi } src_install() { - if use php_targets_php8-0 ; then + if use php_targets_php8-1 ; then php-ext-pecl-r3_src_install php-ext-source-r3_addtoinifiles "memcache.allow_failover" "true" diff --git a/dev-php/pecl-memcached/Manifest b/dev-php/pecl-memcached/Manifest index 64f9f062d021..e19058e6dbea 100644 --- a/dev-php/pecl-memcached/Manifest +++ b/dev-php/pecl-memcached/Manifest @@ -1 +1,3 @@ -DIST memcached-3.1.5.tgz 83015 BLAKE2B 80f5cbed8e34f867962792d95d242015690f64ab3b462e09813a11b8b86234b0b05b0f6a78f7c6184482b66ba8015064b37f77bbb816a3aee2edd0ce97ab0cbc SHA512 87d5fd079fcaad81139785d6766da71b23a1a0fe907d4b22f3a787af148a20412c11df11c4d98c165241658baf0d87c8a6b29de15db07a0f9d1fabc8aec8f0e9 +DIST memcached-3.2.0.tgz 90722 BLAKE2B 5bc3ce40803004f45ad397684277862dbaffce467b3026e33d9737d4d93a82f2c89e32a256ebf6db3117a462ff8f81a517ed9950773cb4a0e927aa8af4e834be SHA512 ece5759a9d6d52afd46beb0821811e5d4830e75ad8564af395e2107fd349e271c6e6cf20eeacd9ad15ee2e99ccf0118ccc83c5810e2f3fa7c61f1984b0b26514 +DIST pecl-memcached-3.2.0_p20230419.tar.gz 99453 BLAKE2B 3fb0e0316c9d6de9d727f9fd3a5f723d00aef33adcfa815c6571b99b9f536e9e02e9e7d37c73252dca3d5415aea554c8c16374a018210a1bbd2caa4a0c1263d8 SHA512 74e1b53f2078f343367a6c83e287c2fd29427d42f3db3eac01d3c5dea1eef1cd94130e2e59eaa3bdb368aecac740391ef4961224d5751d81306881291818fa9c +DIST pecl-memcached-3.2.0_p20231008.tar.gz 101050 BLAKE2B b263eef7c29546d5faf71667f5266acaf77a18a65ecb972a31f29b1dafb8f7415346d066db99264e43326887e400f3e8a5372904e3f582439ed7500e0bbeb263 SHA512 b320dd4681070b35a49b87b143e01ce7f5a58364a0d9b807029c78aa57b18c3fc0add0b28c72dfaa4335c2b66fd54bb482a290c4a2b57afd80863c344a74177c diff --git a/dev-php/pecl-memcached/metadata.xml b/dev-php/pecl-memcached/metadata.xml index a3a0e753fbbd..1e2cd0417c05 100644 --- a/dev-php/pecl-memcached/metadata.xml +++ b/dev-php/pecl-memcached/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>robbat2@gentoo.org</email> diff --git a/dev-php/pecl-memcached/pecl-memcached-3.1.5-r1.ebuild b/dev-php/pecl-memcached/pecl-memcached-3.2.0-r1.ebuild index 281bbb0a15f7..3241265de040 100644 --- a/dev-php/pecl-memcached/pecl-memcached-3.1.5-r1.ebuild +++ b/dev-php/pecl-memcached/pecl-memcached-3.2.0-r1.ebuild @@ -1,11 +1,16 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 PHP_EXT_NAME="memcached" DOCS=( ChangeLog README.markdown ) -USE_PHP="php7-2 php7-3 php7-4" +USE_PHP="php8-1" +PHP_EXT_NEEDED_USE="json(+)?,session(-)?" +MY_P="${PN/pecl-/}-${PV/_rc/RC}" +PHP_EXT_PECL_FILENAME="${MY_P}.tgz" +PHP_EXT_S="${WORKDIR}/${MY_P}" + inherit php-ext-pecl-r3 DESCRIPTION="Interface PHP with memcached via libmemcached library" @@ -16,24 +21,15 @@ IUSE="igbinary json sasl +session test" RESTRICT="!test? ( test )" -COMMON_DEPEND=">=dev-libs/libmemcached-1.0.14[sasl(-)?] +COMMON_DEPEND="|| ( dev-libs/libmemcached-awesome[sasl(-)?] >=dev-libs/libmemcached-1.0.14[sasl(-)?] ) sys-libs/zlib + igbinary? ( dev-php/igbinary[php_targets_php8-1(-)?] ) " +DEPEND="${COMMON_DEPEND}" +RDEPEND="${COMMON_DEPEND}" +BDEPEND="${COMMON_DEPEND} test? ( net-misc/memcached )" -RDEPEND=" - 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(-)] ) - ) - php_targets_php7-4? ( - ${COMMON_DEPEND} dev-lang/php:7.4[session(-)?,json(-)?] - igbinary? ( dev-php/igbinary[php_targets_php7-4(-)] ) - )" -DEPEND="${RDEPEND} test? ( net-misc/memcached )" +S="${WORKDIR}/${MY_P}" src_configure() { local PHP_EXT_ECONF_ARGS="--enable-memcached @@ -46,7 +42,8 @@ src_configure() { } src_test() { - local memcached_opts=( -d -P "${T}/memcached.pid" -p 11211 -l 127.0.0.1 ) + touch "${T}/memcached.pid" || die + local memcached_opts=( -d -P "${T}/memcached.pid" -p 11211 -l 127.0.0.1 -U 11211 ) [[ ${EUID} == 0 ]] && memcached_opts+=( -u portage ) memcached "${memcached_opts[@]}" || die "Can't start memcached test server" diff --git a/dev-php/pecl-memcached/pecl-memcached-3.2.0_p20230419.ebuild b/dev-php/pecl-memcached/pecl-memcached-3.2.0_p20230419.ebuild new file mode 100644 index 000000000000..a2c7dc77ae96 --- /dev/null +++ b/dev-php/pecl-memcached/pecl-memcached-3.2.0_p20230419.ebuild @@ -0,0 +1,57 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +PHP_EXT_NAME="memcached" +DOCS=( ChangeLog README.markdown ) + +USE_PHP="php8-1 php8-2" +PHP_EXT_NEEDED_USE="json(+)?,session(-)?" +MY_P="${PN/pecl-/}-${PV/_rc/RC}" +PHP_EXT_PECL_FILENAME="${MY_P}.tgz" +GH_COMMIT="6926c53ac32a579b38a0dcc3c8aec662f8cd9dd5" +PHP_EXT_S="${WORKDIR}/php-memcached-${GH_COMMIT}" + +inherit php-ext-pecl-r3 + +DESCRIPTION="Interface PHP with memcached via libmemcached library" +SRC_URI="https://github.com/php-memcached-dev/php-memcached/archive/${GH_COMMIT}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/php-memcached-${GH_COMMIT}" +LICENSE="PHP-3.01" +SLOT="7" +KEYWORDS="~amd64 ~arm ~arm64 ~x86" +IUSE="igbinary json sasl +session test" + +RESTRICT="!test? ( test )" + +COMMON_DEPEND="|| ( dev-libs/libmemcached-awesome[sasl(-)?] >=dev-libs/libmemcached-1.0.14[sasl(-)?] ) + sys-libs/zlib + igbinary? ( dev-php/igbinary[php_targets_php8-1(-)?,php_targets_php8-2(-)?] ) +" +DEPEND="${COMMON_DEPEND}" +RDEPEND="${COMMON_DEPEND}" +BDEPEND="${COMMON_DEPEND} test? ( net-misc/memcached )" + +src_configure() { + local PHP_EXT_ECONF_ARGS="--enable-memcached + $(use_enable session memcached-session) + $(use_enable sasl memcached-sasl) + $(use_enable json memcached-json) + $(use_enable igbinary memcached-igbinary)" + + php-ext-source-r3_src_configure +} + +src_test() { + touch "${T}/memcached.pid" || die + local memcached_opts=( -d -P "${T}/memcached.pid" -p 11211 -l 127.0.0.1 -U 11211 ) + [[ ${EUID} == 0 ]] && memcached_opts+=( -u portage ) + memcached "${memcached_opts[@]}" || die "Can't start memcached test server" + + local exit_status + php-ext-source-r3_src_test + exit_status=$? + + kill "$(<"${T}/memcached.pid")" + return ${exit_status} +} diff --git a/dev-php/pecl-memcached/pecl-memcached-3.2.0_p20231008.ebuild b/dev-php/pecl-memcached/pecl-memcached-3.2.0_p20231008.ebuild new file mode 100644 index 000000000000..6e8bb8a2e28e --- /dev/null +++ b/dev-php/pecl-memcached/pecl-memcached-3.2.0_p20231008.ebuild @@ -0,0 +1,65 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +PHP_EXT_NAME="memcached" +DOCS=( ChangeLog README.markdown ) + +USE_PHP="php8-1 php8-2" +PHP_EXT_NEEDED_USE="json(+)?,session(-)?" +MY_P="${PN/pecl-/}-${PV/_rc/RC}" +PHP_EXT_PECL_FILENAME="${MY_P}.tgz" +GH_COMMIT="7fefcb792423906bba2bac66a49194f98bf11aa6" +PHP_EXT_S="${WORKDIR}/php-memcached-${GH_COMMIT}" + +inherit php-ext-pecl-r3 + +DESCRIPTION="Interface PHP with memcached via libmemcached library" +SRC_URI="https://github.com/php-memcached-dev/php-memcached/archive/${GH_COMMIT}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/php-memcached-${GH_COMMIT}" +LICENSE="PHP-3.01" +SLOT="7" +KEYWORDS="~amd64 ~arm ~arm64 ~x86" +IUSE="igbinary json sasl +session test" + +REQUIRED_USE="test? ( igbinary )" +RESTRICT="!test? ( test )" + +COMMON_DEPEND="|| ( dev-libs/libmemcached-awesome[sasl(-)?] >=dev-libs/libmemcached-1.0.14[sasl(-)?] ) + sys-libs/zlib + igbinary? ( dev-php/igbinary[php_targets_php8-1(-)?,php_targets_php8-2(-)?] ) +" +DEPEND="${COMMON_DEPEND}" +RDEPEND="${COMMON_DEPEND}" +BDEPEND="${COMMON_DEPEND} test? ( net-misc/memcached )" + +src_prepare() { + # remove broken tests + rm -r tests/experimental || die + + php-ext-source-r3_src_prepare +} + +src_configure() { + local PHP_EXT_ECONF_ARGS="--enable-memcached + $(use_enable session memcached-session) + $(use_enable sasl memcached-sasl) + $(use_enable json memcached-json) + $(use_enable igbinary memcached-igbinary)" + + php-ext-source-r3_src_configure +} + +src_test() { + touch "${T}/memcached.pid" || die + local memcached_opts=( -d -P "${T}/memcached.pid" -p 11211 -l 127.0.0.1 -U 11211 ) + [[ ${EUID} == 0 ]] && memcached_opts+=( -u portage ) + memcached "${memcached_opts[@]}" || die "Can't start memcached test server" + + local exit_status + php-ext-source-r3_src_test + exit_status=$? + + kill "$(<"${T}/memcached.pid")" + return ${exit_status} +} diff --git a/dev-php/pecl-mongodb/Manifest b/dev-php/pecl-mongodb/Manifest index b13d6baf0deb..8370ee4d0e77 100644 --- a/dev-php/pecl-mongodb/Manifest +++ b/dev-php/pecl-mongodb/Manifest @@ -1,6 +1 @@ -DIST mongodb-1.7.4.tgz 1223416 BLAKE2B 9db40284eb2b70e242f26c1661923c5f33de8ab1e33a7e816863b61fcbc49040204ca556b1f384cab958f9dc2cf4e49e97840b78bd520a4e374b83210a964e5d SHA512 6805ce1d0958e24e1edf3bc9698bc1f4a9d31c26250624fd35aebf7a7d310af30050e1974cd9571f989303fce4c5522e793a8cb41388397df66e8f5fe0a648f2 -DIST mongodb-1.7.5.tgz 1223892 BLAKE2B c30a217d1170c31be00259f4bb58cfea186947fa0bf1653de32e228a8eb8d3fb25b52d7a5a9e16f6b311418d977f7aa00bf96ca9d7e9ac9a8fa7b6fe05eace8f SHA512 f0565adc42659d4070e42122d02a8306f29d6d70fe0b5e9a92144df346a8c672aafdf36613435b9dc8d50db5e98c2359fdf97408c45439d4d447257b85e93122 -DIST mongodb-1.8.0.tgz 1292928 BLAKE2B 3bd9e5eb6b981010637b9e478928fa21268e1d1447f3ff345bfdb45c93637990e261c46b2ce09560cd4e284df73494dac210436cf700b588803e4ceffb8dc67c SHA512 7fd54dabde8df9533abd36d159c3da1c2b4606e7788b8a6d41faf83d0710b74885e8bfb4e1f4837a50248f3af1df2e7414b90f99227fc92c9084f779c7e68698 -DIST mongodb-1.8.1.tgz 1292453 BLAKE2B 25fe36b7d966a4dcf631764aeb93c09932cc0643e46fe5e594d9223a9d3f099b75211a813114c3e8cd4a1722da774b669ef968fdbb1d4877a81cf1f637890997 SHA512 a80682e3a90ead699a930185c3d10bc3a86b335b45891be6d41ef829fab6f2f2468adb5973735048fa98bb6aaa9c8568ba9f7df5709916d5b6f7676c77188d0c -DIST mongodb-1.9.0.tgz 1300408 BLAKE2B 1cf6a43694e8113df8028c2663db8049421140d53124e6dcf8cb3e42daf961dc6a63cc930c765874eb1ccac13d419980d883e42ba33f3ea389b07ea006217432 SHA512 80ad3caddde045fe5e879167b2b4cfc27bdabf6d3667df4df73f33503c329b0d6bf4da6b287fe454301a9a390434eec19971059c6de8d4c9720a79fe7680366d -DIST mongodb-1.9.1.tgz 1285984 BLAKE2B 7d3dd7635b97d142abdf0882d03f4b7a7b42b9720a8e790dae5d4cfcbee54a2f18d70641851baf9258e59ebe396336ae72956b9f6e09812f017850dbdcc3dd97 SHA512 e1ff9fba2268020862e917a38946a7f5f4cc5caf22b38e9ccf60b491cdee20f55b9643e8904cd934de48d31ca69b1c26dd86454f74572ce977669f908d4ffe51 +DIST mongodb-1.16.2.tgz 1907341 BLAKE2B 273ca2a5d92a195938cea103d12e9279c4a6aae43107f9b04d6e74752f82af5c258a3eff259ffc6a8381275be214bcc6cd577050ba1a908e202dda54ed31dae9 SHA512 3c81882c609b09cde534315aa4b1fe3c47e18e4ed26a940bf60a6bdbf4e53b2204d8e4e113a9b0a3469b60793ead9f8dff703920b86280e78448e07d6535a277 diff --git a/dev-php/pecl-mongodb/metadata.xml b/dev-php/pecl-mongodb/metadata.xml index b86acf66c756..222c77f3742a 100644 --- a/dev-php/pecl-mongodb/metadata.xml +++ b/dev-php/pecl-mongodb/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> diff --git a/dev-php/pecl-mongodb/pecl-mongodb-1.9.1.ebuild b/dev-php/pecl-mongodb/pecl-mongodb-1.16.2.ebuild index c64402fea99a..991299c1e00e 100644 --- a/dev-php/pecl-mongodb/pecl-mongodb-1.9.1.ebuild +++ b/dev-php/pecl-mongodb/pecl-mongodb-1.16.2.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 PHP_EXT_NAME="mongodb" -USE_PHP="php7-3 php7-4 php8-0" +USE_PHP="php8-1 php8-2" inherit php-ext-pecl-r3 @@ -16,13 +16,12 @@ KEYWORDS="~amd64 ~x86" IUSE="sasl test" PHP_DEPEND=" - php_targets_php7-3? ( dev-lang/php:7.3[json,ssl,zlib] ) - php_targets_php7-4? ( dev-lang/php:7.4[json,ssl,zlib] ) - php_targets_php8-0? ( dev-lang/php:8.0[ssl,zlib] )" + php_targets_php8-1? ( dev-lang/php:8.1[ssl,zlib] ) + php_targets_php8-2? ( dev-lang/php:8.2[ssl,zlib] )" COMMON_DEPEND="${PHP_DEPEND} - >=dev-libs/libbson-1.17.0 - >=dev-libs/mongo-c-driver-1.17.0[sasl?,ssl] - dev-libs/openssl:0= + >=dev-libs/libbson-1.18.0 + >=dev-libs/mongo-c-driver-1.18.0[sasl?,ssl] + dev-libs/openssl:= sasl? ( dev-libs/cyrus-sasl )" DEPEND="${COMMON_DEPEND} test? ( dev-db/mongodb )" diff --git a/dev-php/pecl-mongodb/pecl-mongodb-1.7.4.ebuild b/dev-php/pecl-mongodb/pecl-mongodb-1.7.4.ebuild deleted file mode 100644 index efdcf0d60ca3..000000000000 --- a/dev-php/pecl-mongodb/pecl-mongodb-1.7.4.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PHP_EXT_NAME="mongodb" -USE_PHP="php7-2 php7-3 php7-4" - -inherit php-ext-pecl-r3 - -DESCRIPTION="MongoDB database driver for PHP" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="sasl test" - -PHP_DEPEND=" - php_targets_php7-2? ( dev-lang/php:7.2[json,ssl,zlib] ) - php_targets_php7-3? ( dev-lang/php:7.3[json,ssl,zlib] ) - php_targets_php7-4? ( dev-lang/php:7.4[json,ssl,zlib] )" -COMMON_DEPEND="${PHP_DEPEND} - >=dev-libs/libbson-1.16.2 - >=dev-libs/mongo-c-driver-1.16.2[sasl?,ssl] - dev-libs/openssl:0= - sasl? ( dev-libs/cyrus-sasl )" -DEPEND="${COMMON_DEPEND} - test? ( dev-db/mongodb )" -RDEPEND="${COMMON_DEPEND}" -BDEPEND="${PHP_DEPEND} - virtual/pkgconfig" - -# No tests on x86 because tests require dev-db/mongodb which don't support -# x86 anymore (bug #645994) -RESTRICT="x86? ( test ) - !test? ( test )" - -src_configure() { - local PHP_EXT_ECONF_ARGS=( - --enable-mongodb - --with-libbson - --with-libmongoc - --with-mongodb-sasl=$(usex sasl) - ) - php-ext-source-r3_src_configure -} - -src_test() { - local PORT=27017 - mongod --port ${PORT} --bind_ip 127.0.0.1 --nounixsocket --fork \ - --dbpath="${T}" --logpath="${T}/mongod.log" || die - php-ext-pecl-r3_src_test - kill $(<"${T}/mongod.lock") -} diff --git a/dev-php/pecl-mongodb/pecl-mongodb-1.7.5.ebuild b/dev-php/pecl-mongodb/pecl-mongodb-1.7.5.ebuild deleted file mode 100644 index 5ebb9efa9f42..000000000000 --- a/dev-php/pecl-mongodb/pecl-mongodb-1.7.5.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PHP_EXT_NAME="mongodb" -USE_PHP="php7-2 php7-3 php7-4" - -inherit php-ext-pecl-r3 - -DESCRIPTION="MongoDB database driver for PHP" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="sasl test" - -PHP_DEPEND=" - php_targets_php7-2? ( dev-lang/php:7.2[json,ssl,zlib] ) - php_targets_php7-3? ( dev-lang/php:7.3[json,ssl,zlib] ) - php_targets_php7-4? ( dev-lang/php:7.4[json,ssl,zlib] )" -COMMON_DEPEND="${PHP_DEPEND} - >=dev-libs/libbson-1.16.2 - >=dev-libs/mongo-c-driver-1.16.2[sasl?,ssl] - dev-libs/openssl:0= - sasl? ( dev-libs/cyrus-sasl )" -DEPEND="${COMMON_DEPEND} - test? ( dev-db/mongodb )" -RDEPEND="${COMMON_DEPEND}" -BDEPEND="${PHP_DEPEND} - virtual/pkgconfig" - -# No tests on x86 because tests require dev-db/mongodb which don't support -# x86 anymore (bug #645994) -RESTRICT="x86? ( test ) - !test? ( test )" - -src_configure() { - local PHP_EXT_ECONF_ARGS=( - --enable-mongodb - --with-libbson - --with-libmongoc - --with-mongodb-sasl=$(usex sasl) - ) - php-ext-source-r3_src_configure -} - -src_test() { - local PORT=27017 - mongod --port ${PORT} --bind_ip 127.0.0.1 --nounixsocket --fork \ - --dbpath="${T}" --logpath="${T}/mongod.log" || die - php-ext-pecl-r3_src_test - kill $(<"${T}/mongod.lock") -} diff --git a/dev-php/pecl-mongodb/pecl-mongodb-1.8.0.ebuild b/dev-php/pecl-mongodb/pecl-mongodb-1.8.0.ebuild deleted file mode 100644 index 346f6f3dcb91..000000000000 --- a/dev-php/pecl-mongodb/pecl-mongodb-1.8.0.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PHP_EXT_NAME="mongodb" -USE_PHP="php7-2 php7-3 php7-4" - -inherit php-ext-pecl-r3 - -DESCRIPTION="MongoDB database driver for PHP" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="sasl test" - -PHP_DEPEND=" - php_targets_php7-2? ( dev-lang/php:7.2[json,ssl,zlib] ) - php_targets_php7-3? ( dev-lang/php:7.3[json,ssl,zlib] ) - php_targets_php7-4? ( dev-lang/php:7.4[json,ssl,zlib] )" -COMMON_DEPEND="${PHP_DEPEND} - >=dev-libs/libbson-1.17.0 - >=dev-libs/mongo-c-driver-1.17.0[sasl?,ssl] - dev-libs/openssl:0= - sasl? ( dev-libs/cyrus-sasl )" -DEPEND="${COMMON_DEPEND} - test? ( dev-db/mongodb )" -RDEPEND="${COMMON_DEPEND}" -BDEPEND="${PHP_DEPEND} - virtual/pkgconfig" - -# No tests on x86 because tests require dev-db/mongodb which don't support -# x86 anymore (bug #645994) -RESTRICT="x86? ( test ) - !test? ( test )" - -src_configure() { - local PHP_EXT_ECONF_ARGS=( - --enable-mongodb - --with-libbson - --with-libmongoc - --with-mongodb-sasl=$(usex sasl) - ) - php-ext-source-r3_src_configure -} - -src_test() { - local PORT=27017 - mongod --port ${PORT} --bind_ip 127.0.0.1 --nounixsocket --fork \ - --dbpath="${T}" --logpath="${T}/mongod.log" || die - php-ext-pecl-r3_src_test - kill $(<"${T}/mongod.lock") -} diff --git a/dev-php/pecl-mongodb/pecl-mongodb-1.8.1.ebuild b/dev-php/pecl-mongodb/pecl-mongodb-1.8.1.ebuild deleted file mode 100644 index 346f6f3dcb91..000000000000 --- a/dev-php/pecl-mongodb/pecl-mongodb-1.8.1.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PHP_EXT_NAME="mongodb" -USE_PHP="php7-2 php7-3 php7-4" - -inherit php-ext-pecl-r3 - -DESCRIPTION="MongoDB database driver for PHP" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="sasl test" - -PHP_DEPEND=" - php_targets_php7-2? ( dev-lang/php:7.2[json,ssl,zlib] ) - php_targets_php7-3? ( dev-lang/php:7.3[json,ssl,zlib] ) - php_targets_php7-4? ( dev-lang/php:7.4[json,ssl,zlib] )" -COMMON_DEPEND="${PHP_DEPEND} - >=dev-libs/libbson-1.17.0 - >=dev-libs/mongo-c-driver-1.17.0[sasl?,ssl] - dev-libs/openssl:0= - sasl? ( dev-libs/cyrus-sasl )" -DEPEND="${COMMON_DEPEND} - test? ( dev-db/mongodb )" -RDEPEND="${COMMON_DEPEND}" -BDEPEND="${PHP_DEPEND} - virtual/pkgconfig" - -# No tests on x86 because tests require dev-db/mongodb which don't support -# x86 anymore (bug #645994) -RESTRICT="x86? ( test ) - !test? ( test )" - -src_configure() { - local PHP_EXT_ECONF_ARGS=( - --enable-mongodb - --with-libbson - --with-libmongoc - --with-mongodb-sasl=$(usex sasl) - ) - php-ext-source-r3_src_configure -} - -src_test() { - local PORT=27017 - mongod --port ${PORT} --bind_ip 127.0.0.1 --nounixsocket --fork \ - --dbpath="${T}" --logpath="${T}/mongod.log" || die - php-ext-pecl-r3_src_test - kill $(<"${T}/mongod.lock") -} diff --git a/dev-php/pecl-mongodb/pecl-mongodb-1.9.0.ebuild b/dev-php/pecl-mongodb/pecl-mongodb-1.9.0.ebuild deleted file mode 100644 index c64402fea99a..000000000000 --- a/dev-php/pecl-mongodb/pecl-mongodb-1.9.0.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PHP_EXT_NAME="mongodb" -USE_PHP="php7-3 php7-4 php8-0" - -inherit php-ext-pecl-r3 - -DESCRIPTION="MongoDB database driver for PHP" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="sasl test" - -PHP_DEPEND=" - php_targets_php7-3? ( dev-lang/php:7.3[json,ssl,zlib] ) - php_targets_php7-4? ( dev-lang/php:7.4[json,ssl,zlib] ) - php_targets_php8-0? ( dev-lang/php:8.0[ssl,zlib] )" -COMMON_DEPEND="${PHP_DEPEND} - >=dev-libs/libbson-1.17.0 - >=dev-libs/mongo-c-driver-1.17.0[sasl?,ssl] - dev-libs/openssl:0= - sasl? ( dev-libs/cyrus-sasl )" -DEPEND="${COMMON_DEPEND} - test? ( dev-db/mongodb )" -RDEPEND="${COMMON_DEPEND}" -BDEPEND="${PHP_DEPEND} - virtual/pkgconfig" - -# No tests on x86 because tests require dev-db/mongodb which don't support -# x86 anymore (bug #645994) -RESTRICT="x86? ( test ) - !test? ( test )" - -src_configure() { - local PHP_EXT_ECONF_ARGS=( - --enable-mongodb - --with-libbson - --with-libmongoc - --with-mongodb-sasl=$(usex sasl) - ) - php-ext-source-r3_src_configure -} - -src_test() { - local PORT=27017 - mongod --port ${PORT} --bind_ip 127.0.0.1 --nounixsocket --fork \ - --dbpath="${T}" --logpath="${T}/mongod.log" || die - php-ext-pecl-r3_src_test - kill $(<"${T}/mongod.lock") -} diff --git a/dev-php/pecl-ncurses/Manifest b/dev-php/pecl-ncurses/Manifest deleted file mode 100644 index a25fbc4308db..000000000000 --- a/dev-php/pecl-ncurses/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST ncurses-1.0.2.tgz 16226 BLAKE2B 2b50fb953594f71e8ba2c93cc8ac1443168ea360c5c752eb4ebb941cdbd4e576bd6d5516722bbe06f31a5dd4732bf47c6fd740599af161cb33cbcb45493bbc5d SHA512 e1f684dcab2aa4dd3fded79fed02c78de1525f0384027fe64ad08759617f13ca6fb11742e3407723eecc431ed99847c0c98ae559797dc98ce373a01ba8413bf2 -DIST pecl-ncurses-1.0.2-php7.patch.xz 5096 BLAKE2B 8034121b97cc1769534923570c929444c0cd01238615e51c47845b9b10db4b62353a853a17d8ddd44c8ad47e68c44363321f7d08c2dfdd0e2948ddc7d33b2b9d SHA512 1f1dcaaa61033d7db55048f97e48029a335d5d191447038324eb170c9877da62a7b03cec20ea7496c073b76d7ba1009b4374b088c87e1838ee2dc433749c41fa diff --git a/dev-php/pecl-ncurses/files/pecl-ncurses-1.0.2-php7.3.patch b/dev-php/pecl-ncurses/files/pecl-ncurses-1.0.2-php7.3.patch deleted file mode 100644 index 9b4f8a6274b5..000000000000 --- a/dev-php/pecl-ncurses/files/pecl-ncurses-1.0.2-php7.3.patch +++ /dev/null @@ -1,175 +0,0 @@ -diff -aurN a/ncurses_fe.c b/ncurses_fe.c ---- a/ncurses_fe.c 2012-06-16 13:05:19.000000000 -0400 -+++ b/ncurses_fe.c 2019-02-06 10:41:09.000000000 -0500 -@@ -123,7 +123,9 @@ - PHP_FE(ncurses_savetty, NULL) - PHP_FE(ncurses_termattrs, NULL) - PHP_FE(ncurses_use_default_colors, NULL) -+#ifdef HAVE_NCURSES_SLK_ATTR - PHP_FE(ncurses_slk_attr, NULL) -+#endif - PHP_FE(ncurses_slk_clear, NULL) - PHP_FE(ncurses_slk_noutrefresh, NULL) - PHP_FE(ncurses_slk_refresh, NULL) -@@ -191,7 +193,9 @@ - #ifdef HAVE_NCURSES_ASSUME_DEFAULT_COLORS - PHP_FE(ncurses_assume_default_colors, NULL) - #endif -+#ifdef HAVE_NCURSES_DEFINE_KEY - PHP_FE(ncurses_define_key, NULL) -+#endif - PHP_FE(ncurses_hline, NULL) - PHP_FE(ncurses_vline, NULL) - PHP_FE(ncurses_keyok, NULL) -@@ -205,6 +209,10 @@ - PHP_FE(ncurses_waddstr, NULL) - PHP_FE(ncurses_wnoutrefresh, NULL) - PHP_FE(ncurses_wclear, NULL) -+ PHP_FE(ncurses_wscrl, NULL) -+ PHP_FE(ncurses_wsetscrreg, NULL) -+ PHP_FE(ncurses_scrollok, NULL) -+ - #ifdef HAVE_NCURSES_COLOR_SET - PHP_FE(ncurses_wcolor_set, NULL) - #endif -diff -aurN a/ncurses_functions.c b/ncurses_functions.c ---- a/ncurses_functions.c 2019-06-07 11:00:54.713250845 -0400 -+++ b/ncurses_functions.c 2019-02-06 10:41:09.000000000 -0500 -@@ -163,16 +163,25 @@ - *pscr = stdscr; - zscr = zend_register_resource(pscr, le_ncurses_windows); - ZVAL_RES(&c.value, zscr); -+#if PHP_VERSION_ID < 70300 - c.flags = CONST_CS; -+#endif - c.name = zend_string_init("STDSCR", sizeof("STDSCR")-1, 0); - zend_register_constant(&c); - -+#if PHP_VERSION_ID < 70300 - #define PHP_NCURSES_DEF_CONST(x) \ - ZVAL_LONG(&c.value, x); \ - c.flags = CONST_CS; \ - c.name = zend_string_init("NCURSES_" #x, sizeof("NCURSES_" #x)-1, 0); \ - zend_register_constant(&c) - #else -+#define PHP_NCURSES_DEF_CONST(x) \ -+ ZVAL_LONG(&c.value, x); \ -+ c.name = zend_string_init("NCURSES_" #x, sizeof("NCURSES_" #x)-1, 0); \ -+ zend_register_constant(&c) -+#endif -+#else - zval *zscr; - - *pscr = stdscr; -@@ -188,7 +197,6 @@ - /* we need this "interesting" arrangement because the - * underlying values of the ACS_XXX defines are not - * initialized until after ncurses has been initialized */ -- - #define PHP_NCURSES_DEF_CONST(x) \ - ZVAL_LONG(zscr, x); \ - c.value = *zscr; \ -@@ -1904,6 +1912,66 @@ - } - /* }}} */ - -+/* {{{ proto int ncurses_wscrl(resource window, int count) -+ Scrolls window content up or down without changing current position */ -+PHP_FUNCTION(ncurses_wscrl) -+{ -+ zval *handle; -+ zend_long intarg; -+ WINDOW **w; -+ -+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rl", &handle, &intarg) == FAILURE) { -+ return; -+ } -+ -+ IS_NCURSES_INITIALIZED(); -+ -+ FETCH_WINRES(w, &handle); -+ -+ RETURN_LONG(wscrl(*w, intarg)); -+} -+/* }}} */ -+ -+/* {{{ proto int ncurses_wsetscrreg(resource window, int top, int bot) -+ Set region for scrolling */ -+PHP_FUNCTION(ncurses_wsetscrreg) -+{ -+ zval *handle; -+ zend_long top, bot; -+ WINDOW **w; -+ -+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rll", &handle, &top, &bot) == FAILURE) { -+ return; -+ } -+ -+ IS_NCURSES_INITIALIZED(); -+ -+ FETCH_WINRES(w, &handle); -+ -+ RETURN_LONG(wsetscrreg(*w, top, bot)); -+} -+/* }}} */ -+ -+/* {{{ proto int ncurses_scrollok(resource window, bool bf) -+ Enable or disable scrolling of window content */ -+PHP_FUNCTION(ncurses_scrollok) -+{ -+ zval *handle; -+ zend_bool bf; -+ WINDOW **w; -+ -+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rb", &handle, &bf) == FAILURE) { -+ return; -+ } -+ -+ IS_NCURSES_INITIALIZED(); -+ -+ FETCH_WINRES(w, &handle); -+ -+ RETURN_LONG(scrollok(*w, bf)); -+} -+/* }}} */ -+ - /* {{{ proto string ncurses_termname(void) - Returns terminal name */ - PHP_FUNCTION(ncurses_termname) -@@ -2609,7 +2677,11 @@ - if (above) { - #if PHP_MAJOR_VERSION >= 7 - zend_resource *id = (zend_resource *)panel_userptr(above); -+#if PHP_VERSION_ID < 70300 - GC_REFCOUNT(id)++; -+#else -+ GC_ADDREF(id); -+#endif - RETURN_RES(id); - #else - long id = (long)panel_userptr(above); -@@ -2643,7 +2715,11 @@ - if (below) { - #if PHP_MAJOR_VERSION >= 7 - zend_resource *id = (zend_resource *)panel_userptr(below); -+#if PHP_VERSION_ID < 70300 - GC_REFCOUNT(id)++; -+#else -+ GC_ADDREF(id); -+#endif - RETURN_RES(id); - #else - long id = (long)panel_userptr(below); -diff -aurN a/php_ncurses_fe.h b/php_ncurses_fe.h ---- a/php_ncurses_fe.h 2012-06-16 13:05:19.000000000 -0400 -+++ b/php_ncurses_fe.h 2019-02-06 10:41:09.000000000 -0500 -@@ -158,6 +158,9 @@ - PHP_FUNCTION(ncurses_prefresh); - PHP_FUNCTION(ncurses_pnoutrefresh); - -+PHP_FUNCTION(ncurses_wscrl); -+PHP_FUNCTION(ncurses_wsetscrreg); -+PHP_FUNCTION(ncurses_scrollok); - PHP_FUNCTION(ncurses_wstandout); - PHP_FUNCTION(ncurses_wstandend); - PHP_FUNCTION(ncurses_wattrset); diff --git a/dev-php/pecl-ncurses/metadata.xml b/dev-php/pecl-ncurses/metadata.xml deleted file mode 100644 index b86acf66c756..000000000000 --- a/dev-php/pecl-ncurses/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>php-bugs@gentoo.org</email> - <name>PHP</name> - </maintainer> -</pkgmetadata> diff --git a/dev-php/pecl-ncurses/pecl-ncurses-1.0.2-r5.ebuild b/dev-php/pecl-ncurses/pecl-ncurses-1.0.2-r5.ebuild deleted file mode 100644 index 87adfe2ff31d..000000000000 --- a/dev-php/pecl-ncurses/pecl-ncurses-1.0.2-r5.ebuild +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -USE_PHP="php5-6 php7-1 php7-2 php7-3 php7-4" - -inherit php-ext-pecl-r3 - -SRC_URI+=" https://dev.gentoo.org/~grknight/distfiles/${P}-php7.patch.xz" - -DESCRIPTION="Terminal screen handling and optimization package" - -LICENSE="PHP-3.01" -SLOT="0" -KEYWORDS="~amd64" -IUSE="" - -DEPEND="sys-libs/ncurses:0=" -RDEPEND="${DEPEND}" - -PHP_EXT_ECONF_ARGS=( --enable-ncursesw ) -PATCHES=( "${WORKDIR}/${P}-php7.patch" "${FILESDIR}/${P}-php7.3.patch" ) diff --git a/dev-php/pecl-oauth/metadata.xml b/dev-php/pecl-oauth/metadata.xml index b86acf66c756..222c77f3742a 100644 --- a/dev-php/pecl-oauth/metadata.xml +++ b/dev-php/pecl-oauth/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> diff --git a/dev-php/pecl-oauth/pecl-oauth-2.0.7.ebuild b/dev-php/pecl-oauth/pecl-oauth-2.0.7.ebuild index 775332d83c50..bc24d0c0c38e 100644 --- a/dev-php/pecl-oauth/pecl-oauth-2.0.7.ebuild +++ b/dev-php/pecl-oauth/pecl-oauth-2.0.7.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -6,7 +6,7 @@ PHP_EXT_NAME="oauth" PHP_EXT_INI="yes" PHP_EXT_ZENDEXT="no" -USE_PHP="php7-2 php7-3 php7-4 php8-0" +USE_PHP="php8-1" inherit php-ext-pecl-r3 @@ -20,8 +20,6 @@ IUSE="+curl examples" 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-pam/Manifest b/dev-php/pecl-pam/Manifest index e4605a375aad..1b2d7809e20e 100644 --- a/dev-php/pecl-pam/Manifest +++ b/dev-php/pecl-pam/Manifest @@ -1 +1,2 @@ -DIST pam-1.0.3.tgz 6671 BLAKE2B f416fd0e47d3fda6a1d86e44a7ca17fc9a0428f976f18e2b663a2fd1e09b790cd069ca16d930d6dca6554762ca59bda987929e52365ed813949c1a93291c1dcc SHA512 3580582f1456b31be30a713cadaaca106527f2d4f3f12032b5d3617cc361aaf49539a9db3dd27221ce40320187abaac0f6ad4e23cdfe5eaa94436e3eaef3fb9c +DIST pam-2.2.3.tgz 9422 BLAKE2B 4d10ad40bdfbaa54225723a46a78dbe1609d89cf75d0ca73345e3346fb437a5500e451357b3b0bbcce88c13f8a54dec5b39e9c0741a6e89c0b3936cbb05da91a SHA512 1adc72b1517e224f36f960134d3444d36e6fa5a6868ce4bc1b87edbbfb09406910774061988300094ebf637ee54c5f5a43e0c42c8e2ab78c81a0910063d48c51 +DIST pam-2.2.4.tgz 9500 BLAKE2B fca0bf17c8eb38344f3ae5b47b395caf1a6d0d5f2ad83446a39d62b101492b06ae9cd8834ca63ad6f5e445de3c31a8616ac8180ce7510b0b4220b29e7cb04297 SHA512 fa0dac46cc61a590de4ece925a68e6fbece8c77a00dc48766635190b2f32888cee501d7f798c51890983ee643e15e3514360a0b12d0b56d8a2294ea3fe6acd7e diff --git a/dev-php/pecl-pam/files/1.0.3-php7.patch b/dev-php/pecl-pam/files/1.0.3-php7.patch deleted file mode 100644 index d56fffb08d38..000000000000 --- a/dev-php/pecl-pam/files/1.0.3-php7.patch +++ /dev/null @@ -1,118 +0,0 @@ ---- a/pam.c 2016-12-01 14:29:27.453904230 -0500 -+++ b/pam.c 2016-12-01 14:27:26.496109755 -0500 -@@ -227,8 +227,13 @@ - PHP_FUNCTION(pam_auth) - { - char *username, *password; -+#if PHP_MAJOR_VERSION >= 7 -+ size_t username_len, password_len; -+ zval *status = NULL, *server, *remote_addr; -+#else - int username_len, password_len; - zval *status = NULL, **server, **remote_addr; -+#endif - zend_bool checkacctmgmt = 1; - - pam_auth_t userinfo = {NULL, NULL}; -@@ -248,22 +253,37 @@ - if (status) { - spprintf(&error_msg, 0, "%s (in %s)", (char *) pam_strerror(pamh, result), "pam_start"); - zval_dtor(status); -+#if PHP_MAJOR_VERSION >= 7 -+ ZVAL_STRING(status, error_msg); -+ efree(error_msg); -+#else - ZVAL_STRING(status, error_msg, 0); -+#endif - } - RETURN_FALSE; - } - -+#if PHP_MAJOR_VERSION >= 7 -+ if ((remote_addr = zend_hash_str_find(Z_ARR(PG(http_globals)[TRACK_VARS_SERVER]), "REMOTE_ADDR", sizeof("REMOTE_ADDR")-1)) != NULL && Z_TYPE_P(remote_addr) == IS_STRING) { -+ pam_set_item(pamh, PAM_RHOST, Z_STRVAL_P(remote_addr)); -+#else - if (zend_hash_find(&EG(symbol_table), "_SERVER", sizeof("_SERVER"), (void **)&server) == SUCCESS && Z_TYPE_PP(server) == IS_ARRAY) { - if (zend_hash_find(Z_ARRVAL_PP(server), "REMOTE_ADDR", sizeof("REMOTE_ADDR"), (void **)&remote_addr) == SUCCESS && Z_TYPE_PP(remote_addr) == IS_STRING) { - pam_set_item(pamh, PAM_RHOST, Z_STRVAL_PP(remote_addr)); - } -+#endif - } - - if ((result = pam_authenticate(pamh, PAM_DISALLOW_NULL_AUTHTOK)) != PAM_SUCCESS) { - if (status) { - spprintf(&error_msg, 0, "%s (in %s)", (char *) pam_strerror(pamh, result), "pam_authenticate"); - zval_dtor(status); -+#if PHP_MAJOR_VERSION >= 7 -+ ZVAL_STRING(status, error_msg); -+ efree(error_msg); -+#else - ZVAL_STRING(status, error_msg, 0); -+#endif - } - pam_end(pamh, PAM_SUCCESS); - RETURN_FALSE; -@@ -274,7 +294,12 @@ - if (status) { - spprintf(&error_msg, 0, "%s (in %s)", (char *) pam_strerror(pamh, result), "pam_acct_mgmt"); - zval_dtor(status); -+#if PHP_MAJOR_VERSION >= 7 -+ ZVAL_STRING(status, error_msg); -+ efree(error_msg); -+#else - ZVAL_STRING(status, error_msg, 0); -+#endif - } - pam_end(pamh, PAM_SUCCESS); - RETURN_FALSE; -@@ -291,7 +316,11 @@ - PHP_FUNCTION(pam_chpass) - { - char *username, *oldpass, *newpass; -+#if PHP_MAJOR_VERSION >= 7 -+ size_t username_len, oldpass_len, newpass_len; -+#else - int username_len, oldpass_len, newpass_len; -+#endif - zval *status = NULL; - - pam_chpass_t userinfo = {NULL, NULL, NULL, 0}; -@@ -312,7 +341,12 @@ - if (status) { - spprintf(&error_msg, 0, "%s (in %s)", (char *) pam_strerror(pamh, result), "pam_start"); - zval_dtor(status); -+#if PHP_MAJOR_VERSION >= 7 -+ ZVAL_STRING(status, error_msg); -+ efree(error_msg); -+#else - ZVAL_STRING(status, error_msg, 0); -+#endif - } - RETURN_FALSE; - } -@@ -321,7 +355,12 @@ - if (status) { - spprintf(&error_msg, 0, "%s (in %s)", (char *) pam_strerror(pamh, result), "pam_authenticate"); - zval_dtor(status); -+#if PHP_MAJOR_VERSION >= 7 -+ ZVAL_STRING(status, error_msg); -+ efree(error_msg); -+#else - ZVAL_STRING(status, error_msg, 0); -+#endif - } - pam_end(pamh, PAM_SUCCESS); - RETURN_FALSE; -@@ -331,7 +370,12 @@ - if (status) { - spprintf(&error_msg, 0, "%s (in %s)", (char *) pam_strerror(pamh, result), "pam_chauthtok"); - zval_dtor(status); -+#if PHP_MAJOR_VERSION >= 7 -+ ZVAL_STRING(status, error_msg); -+ efree(error_msg); -+#else - ZVAL_STRING(status, error_msg, 0); -+#endif - } - pam_end(pamh, PAM_SUCCESS); - RETURN_FALSE; diff --git a/dev-php/pecl-pam/metadata.xml b/dev-php/pecl-pam/metadata.xml index b86acf66c756..222c77f3742a 100644 --- a/dev-php/pecl-pam/metadata.xml +++ b/dev-php/pecl-pam/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> diff --git a/dev-php/pecl-pam/pecl-pam-1.0.3-r3.ebuild b/dev-php/pecl-pam/pecl-pam-2.2.3.ebuild index 5827d6ef1d27..3438573159e8 100644 --- a/dev-php/pecl-pam/pecl-pam-1.0.3-r3.ebuild +++ b/dev-php/pecl-pam/pecl-pam-2.2.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -6,35 +6,29 @@ EAPI="7" PHP_EXT_NAME="pam" PHP_EXT_INI="yes" PHP_EXT_ZENDEXT="no" +PHP_EXT_ECONF_ARGS=( --with-pam=/usr ) DOCS=( README ) -USE_PHP="php7-2 php7-3 php7-4" +USE_PHP="php8-1" inherit php-ext-pecl-r3 pam KEYWORDS="~amd64 ~x86" DESCRIPTION="This extension provides PAM (Pluggable Authentication Modules) integration" -LICENSE="PHP-2.02" +LICENSE="PHP-3.01" SLOT="0" -IUSE="debug" +IUSE="" DEPEND="sys-libs/pam" RDEPEND="${DEPEND}" -PATCHES=( "${FILESDIR}/${PV}-php7.patch" ) - src_prepare() { #Fix DOS line endings sed -i 's/\r$//' -- pam.c || die php-ext-source-r3_src_prepare } -src_configure() { - local PHP_EXT_ECONF_ARGS=( --with-pam=/usr $(use_enable debug) ) - php-ext-source-r3_src_configure -} - src_install() { pamd_mimic_system php auth account password php-ext-pecl-r3_src_install diff --git a/dev-php/pecl-pam/pecl-pam-2.2.4.ebuild b/dev-php/pecl-pam/pecl-pam-2.2.4.ebuild new file mode 100644 index 000000000000..780ddb808521 --- /dev/null +++ b/dev-php/pecl-pam/pecl-pam-2.2.4.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="8" + +PHP_EXT_NAME="pam" +PHP_EXT_INI="yes" +PHP_EXT_ZENDEXT="no" +PHP_EXT_ECONF_ARGS=( --with-pam=/usr ) +DOCS=( README ) + +USE_PHP="php8-1" + +inherit php-ext-pecl-r3 pam + +KEYWORDS="~amd64 ~x86" + +DESCRIPTION="This extension provides PAM (Pluggable Authentication Modules) integration" +LICENSE="PHP-3.01" +SLOT="0" +IUSE="" + +DEPEND="sys-libs/pam" +RDEPEND="${DEPEND}" + +src_prepare() { + #Fix DOS line endings + sed -i 's/\r$//' -- pam.c || die + php-ext-source-r3_src_prepare +} + +src_install() { + pamd_mimic_system php auth account password + php-ext-pecl-r3_src_install +} diff --git a/dev-php/pecl-parallel/Manifest b/dev-php/pecl-parallel/Manifest index 9f6e7de3211c..80661e569e0b 100644 --- a/dev-php/pecl-parallel/Manifest +++ b/dev-php/pecl-parallel/Manifest @@ -1 +1,2 @@ -DIST pecl-parallel-1.1.4.tgz 58783 BLAKE2B 942c767ff4838c13e70829d6ac6599cee3185afaf71e9dc430064835102d31a3e50b99694e1632be652c6a019934a13ba0f5139041bba39d486a20615478b910 SHA512 6693f01b0d43de5153aa0953f90580717e519cfbe8ca5b0ba6abd9cc681e0efe9d7c6fcc601da98f74b570b5810dffdbf5100bedc8ab86c1f4bc61d48955ae77 +DIST pecl-parallel-1.2.0.tgz 61019 BLAKE2B 84b127e7c10f083bead7d12648b312b07d036fdd63239881ad299f4a111d98d1a62d781754c8a11614848ecb0042a3d403b40167072722261bc3734091920665 SHA512 a96e61c94fe5fb2e00f6c9007df553bb59d95a96c76a47fcd74e26d1c48b1ac0bd5359174035c6f534808367e7e0c74c9f0e74f8128de38126a008d26be2efa0 +DIST pecl-parallel-1.2.1.tgz 61948 BLAKE2B 47e36b4649b4787a52babc3ce8937f37fd3c0063762f41f36f865f89aab364d0541b1c01741dd43e6bb3cea60907e10169ff52e8576ffa30ab3c129de747139d SHA512 7dd85cf34daa7b1818235c1631eba7209d85f5b5e777810075c2f61dbaacf21a1211de44402d6750bac959c86940b97be57f022b318495724ff3d26cf3294d27 diff --git a/dev-php/pecl-parallel/metadata.xml b/dev-php/pecl-parallel/metadata.xml index d06f5db0340a..6aebbc46f559 100644 --- a/dev-php/pecl-parallel/metadata.xml +++ b/dev-php/pecl-parallel/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person" proxied="yes"> <email>jaco@uls.co.za</email> diff --git a/dev-php/pecl-parallel/pecl-parallel-1.1.4.ebuild b/dev-php/pecl-parallel/pecl-parallel-1.1.4.ebuild deleted file mode 100644 index 5d0e7fc04b47..000000000000 --- a/dev-php/pecl-parallel/pecl-parallel-1.1.4.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -PHP_EXT_NAME="parallel" -PHP_EXT_INI="yes" -PHP_EXT_ZENDEXT="no" - -USE_PHP="php7-3 php7-4" - -inherit php-ext-pecl-r3 - -SRC_URI="${SRC_URI} -> ${P}.tgz" - -KEYWORDS="~amd64 ~x86" - -DESCRIPTION="A succint parallel concurrency API for PHP" -LICENSE="PHP-3.01" -SLOT="0" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND=" - php_targets_php7-3? ( dev-lang/php:7.3[threads] ) - php_targets_php7-4? ( dev-lang/php:7.4[threads] ) -" -DEPEND="test? ( ${RDEPEND} )" diff --git a/dev-php/pecl-parallel/pecl-parallel-1.2.0.ebuild b/dev-php/pecl-parallel/pecl-parallel-1.2.0.ebuild new file mode 100644 index 000000000000..438399658902 --- /dev/null +++ b/dev-php/pecl-parallel/pecl-parallel-1.2.0.ebuild @@ -0,0 +1,19 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="8" + +PHP_EXT_INI="yes" +PHP_EXT_NAME="parallel" +PHP_EXT_NEEDED_USE="threads" +PHP_EXT_ZENDEXT="no" +USE_PHP="php8-1 php8-2" + +inherit php-ext-pecl-r3 + +DESCRIPTION="A succint parallel concurrency API for PHP" +SRC_URI="${SRC_URI} -> ${P}.tgz" + +LICENSE="PHP-3.01" +SLOT="8" +KEYWORDS="amd64 x86" diff --git a/dev-php/pecl-parallel/pecl-parallel-1.2.1.ebuild b/dev-php/pecl-parallel/pecl-parallel-1.2.1.ebuild new file mode 100644 index 000000000000..438399658902 --- /dev/null +++ b/dev-php/pecl-parallel/pecl-parallel-1.2.1.ebuild @@ -0,0 +1,19 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="8" + +PHP_EXT_INI="yes" +PHP_EXT_NAME="parallel" +PHP_EXT_NEEDED_USE="threads" +PHP_EXT_ZENDEXT="no" +USE_PHP="php8-1 php8-2" + +inherit php-ext-pecl-r3 + +DESCRIPTION="A succint parallel concurrency API for PHP" +SRC_URI="${SRC_URI} -> ${P}.tgz" + +LICENSE="PHP-3.01" +SLOT="8" +KEYWORDS="amd64 x86" diff --git a/dev-php/pecl-propro/Manifest b/dev-php/pecl-propro/Manifest deleted file mode 100644 index d6fdb6b0c2b6..000000000000 --- a/dev-php/pecl-propro/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST propro-2.1.0.tgz 14253 BLAKE2B 44c9bde831486fa41520ce75b313865b90a057acd0d566ae7e5c2aca97240e089580ca79ef04842a57a5d8eb76a179e57c505e977913567c1e97260f87fe2165 SHA512 94fc97f7bf17661ec7ecbe4d13b4fc98b8381469140d121fef49d32a4b767e956ed87b9f5bbb794f27ca47ce4b7b3125ea2b9091eb9d1f0a52b5c8f9df7ee145 diff --git a/dev-php/pecl-propro/metadata.xml b/dev-php/pecl-propro/metadata.xml deleted file mode 100644 index b86acf66c756..000000000000 --- a/dev-php/pecl-propro/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>php-bugs@gentoo.org</email> - <name>PHP</name> - </maintainer> -</pkgmetadata> diff --git a/dev-php/pecl-propro/pecl-propro-2.1.0.ebuild b/dev-php/pecl-propro/pecl-propro-2.1.0.ebuild deleted file mode 100644 index cf9bab8e4729..000000000000 --- a/dev-php/pecl-propro/pecl-propro-2.1.0.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -PHP_EXT_NAME="propro" -PHP_EXT_INI="yes" -PHP_EXT_ZENDEXT="no" -PHP_EXT_ECONF_ARGS="" -PHP_INI_NAME="30-${PHP_EXT_NAME}" - -USE_PHP="php5-6 php7-1 php7-2 php7-3 php7-4" - -inherit php-ext-pecl-r3 - -# Only really build for 7.x -USE_PHP="php7-1 php7-2 php7-3 php7-4" - -KEYWORDS="amd64 x86" - -DESCRIPTION="A reusable property proxy API for PHP" -LICENSE="BSD-2" -SLOT="7" -IUSE="" - -RDEPEND="php_targets_php5-6? ( ${CATEGORY}/${PN}:0[php_targets_php5-6] )" - -src_prepare() { - if use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3 || use php_targets_php7-4 ; then - php-ext-source-r3_src_prepare - else - default_src_prepare - fi -} - -src_install() { - if use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3 || use php_targets_php7-4 ; then - php-ext-pecl-r3_src_install - fi -} diff --git a/dev-php/pecl-ps/Manifest b/dev-php/pecl-ps/Manifest index 80b4ba920465..13947a539fe8 100644 --- a/dev-php/pecl-ps/Manifest +++ b/dev-php/pecl-ps/Manifest @@ -1 +1 @@ -DIST ps-1.4.1.tgz 578991 BLAKE2B 549fae78ffb6e91f39b6292d969b9b80adba1a5911fb52e99c5fcbc940b9470205556e3e11c2940fadc7cc084400bc08ae7255b79e175d705c9bacb8eb3d6e71 SHA512 e9eeb5ad1c9314af0fcfd33e461b560f6cc599a679bc0a5541994fa698e3da63b7cb523f617647bdb2ac1c8fc090263e314ddf956a1e6126f8813de92e49f3af +DIST ps-1.4.4.tgz 637247 BLAKE2B 19dd32a2321fd53224c662e68603c7c330fcf8fe0d3e4e3d4a6e75e211c876225f1f6cf9325b117f7a3713abd87e6acfe25c4c9b0c161e6d6717f94cc90b7649 SHA512 42ab1fff661da68afb42d90dc7fb07761698f191beaf09b6dd4b2c3e7e67949ef06b2f6389738a462f58722f863c6b80f55a00a57dddc860250a4500cbfecf8b diff --git a/dev-php/pecl-ps/files/ps-1.4.4-fix-gd-detection.patch b/dev-php/pecl-ps/files/ps-1.4.4-fix-gd-detection.patch new file mode 100644 index 000000000000..282bc7a34106 --- /dev/null +++ b/dev-php/pecl-ps/files/ps-1.4.4-fix-gd-detection.patch @@ -0,0 +1,11 @@ +--- a/config.m4 ++++ b/config.m4 +@@ -38,7 +38,7 @@ + PHP_ARG_ENABLE([gd], + [for GD support], + [AS_HELP_STRING([--enable-gd], +- [Include GD support])]) ++ [Include GD support])], no, no) + + if test "$PHP_GD" != "no"; then + diff --git a/dev-php/pecl-ps/metadata.xml b/dev-php/pecl-ps/metadata.xml index b86acf66c756..222c77f3742a 100644 --- a/dev-php/pecl-ps/metadata.xml +++ b/dev-php/pecl-ps/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> diff --git a/dev-php/pecl-ps/pecl-ps-1.4.1.ebuild b/dev-php/pecl-ps/pecl-ps-1.4.1.ebuild deleted file mode 100644 index fd04378b47c9..000000000000 --- a/dev-php/pecl-ps/pecl-ps-1.4.1.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -PHP_EXT_NAME="ps" -USE_PHP="php5-6 php7-1 php7-2 php7-3 php7-4" - -inherit php-ext-pecl-r3 - -# Only really build for >=7.0 -USE_PHP="php7-1 php7-2 php7-3 php7-4" - -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" - -DESCRIPTION="PHP extension for creating PostScript files" -LICENSE="BSD" -SLOT="7" -IUSE="examples" - -DEPEND=" - php_targets_php7-1? ( dev-libs/pslib ) - php_targets_php7-2? ( dev-libs/pslib ) - php_targets_php7-3? ( dev-libs/pslib ) - php_targets_php7-4? ( dev-libs/pslib ) -" -RDEPEND="${DEPEND} php_targets_php5-6? ( dev-php/pecl-ps:0[php_targets_php5-6] )" -PHP_EXT_ECONF_ARGS="" - -src_prepare() { - if use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3 || use php_targets_php7-4 ; then - php-ext-source-r3_src_prepare - else - default_src_prepare - fi -} - -src_install() { - if use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3 || use php_targets_php7-4 ; then - php-ext-pecl-r3_src_install - fi -} - -src_test() { - if use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3 || use php_targets_php7-4 ; then - # tests/004.phpt depends on set numeric format - LC_ALL=C php-ext-pecl-r3_src_test - fi -} diff --git a/dev-php/pecl-ps/pecl-ps-1.4.4.ebuild b/dev-php/pecl-ps/pecl-ps-1.4.4.ebuild new file mode 100644 index 000000000000..36411d1ed132 --- /dev/null +++ b/dev-php/pecl-ps/pecl-ps-1.4.4.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +PHP_EXT_NAME="ps" +USE_PHP="php8-1" +PHP_EXT_NEEDED_USE="gd(-)?" + +inherit php-ext-pecl-r3 + +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" + +DESCRIPTION="PHP extension for creating PostScript files" +LICENSE="BSD" +SLOT="7" +IUSE="examples gd" + +DEPEND="dev-libs/pslib gd? ( media-libs/gd:2= )" +RDEPEND="${DEPEND}" +PATCHES=( "${FILESDIR}/ps-1.4.4-fix-gd-detection.patch" ) + +src_configure() { + PHP_EXT_ECONF_ARGS=( $(use_enable gd) ) + php-ext-source-r3_src_configure +} + +src_test() { + # tests/004.phpt depends on set numeric format + LC_ALL=C php-ext-pecl-r3_src_test +} diff --git a/dev-php/pecl-psr/Manifest b/dev-php/pecl-psr/Manifest new file mode 100644 index 000000000000..f4c7b233bf3f --- /dev/null +++ b/dev-php/pecl-psr/Manifest @@ -0,0 +1 @@ +DIST psr-1.2.0.tgz 28238 BLAKE2B c8a3b81b1442c0bda2041aa3ca8d0b37759ff44fd36dd896b3b639e2deeb0767f8baaa699f6b6db063c7deb2f7b217a665d0306a75cc5d783bb635c6c0bf72a4 SHA512 90d4bc1cd2364a15775024806ec5bc1b8f60ed44569162016a0a78fca89f4ad0f0e0b1f9f09ebdcfe6a803e888bddd1d8ce73100eec52ecc21c2e505a35ee5dd diff --git a/dev-php/pecl-crack/metadata.xml b/dev-php/pecl-psr/metadata.xml index b86acf66c756..222c77f3742a 100644 --- a/dev-php/pecl-crack/metadata.xml +++ b/dev-php/pecl-psr/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> diff --git a/dev-php/pecl-psr/pecl-psr-1.2.0.ebuild b/dev-php/pecl-psr/pecl-psr-1.2.0.ebuild new file mode 100644 index 000000000000..c18f3e47c466 --- /dev/null +++ b/dev-php/pecl-psr/pecl-psr-1.2.0.ebuild @@ -0,0 +1,21 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PHP_EXT_NAME="psr" +PHP_EXT_INI="yes" +PHP_EXT_ZENDEXT="no" +PHP_EXT_ECONF_ARGS="" +DOCS=( README.md CHANGELOG.md ) + +USE_PHP="php8-1" + +inherit php-ext-pecl-r3 + +KEYWORDS="~amd64" + +DESCRIPTION="Provides the accepted PSR interfaces, so they can be used in an extension" +LICENSE="BSD-2" +SLOT="0" +IUSE="" diff --git a/dev-php/pecl-radius/files/1.4.0-php8.patch b/dev-php/pecl-radius/files/1.4.0-php8.patch new file mode 100644 index 000000000000..08ff55866beb --- /dev/null +++ b/dev-php/pecl-radius/files/1.4.0-php8.patch @@ -0,0 +1,289 @@ +From 6cfaa16a21780f09f76a7703da255e07910b8b4d Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Bruno=20Pr=C3=A9mont?= <bruno.premont@restena.lu> +Date: Mon, 25 Jan 2021 19:37:14 +0100 +Subject: [PATCH] Fix compatibility with PHP-8 + +With PHP-7.x missing arginfo has been triggering warnings: + NOTICE: PHP message: PHP Warning: Missing arginfo for radius_auth_open() in Unknown on line 0 +With PHP-8 this has become mandatory. +--- + radius.c | 216 +++++++++++++++++++++++++++++++++++++++++++++++-------- + 1 file changed, 188 insertions(+), 28 deletions(-) + +diff --git a/radius.c b/radius.c +index 89ee0d6..4bfb429 100644 +--- a/radius.c ++++ b/radius.c +@@ -61,39 +61,199 @@ ZEND_DECLARE_MODULE_GLOBALS(radius) + /* True global resources - no need for thread safety here */ + static int le_radius; + ++/* {{{ arginfo */ ++ZEND_BEGIN_ARG_INFO_EX(arginfo_radius_auth_open, 0, 0, 0) ++ZEND_END_ARG_INFO() ++ ++ZEND_BEGIN_ARG_INFO_EX(arginfo_radius_acct_open, 0, 0, 0) ++ZEND_END_ARG_INFO() ++ ++ZEND_BEGIN_ARG_INFO_EX(arginfo_radius_close, 0, 0, 1) ++ ZEND_ARG_INFO(0, radius_handle) ++ZEND_END_ARG_INFO() ++ ++ZEND_BEGIN_ARG_INFO_EX(arginfo_radius_strerror, 0, 0, 1) ++ ZEND_ARG_INFO(0, radius_handle) ++ZEND_END_ARG_INFO() ++ ++ZEND_BEGIN_ARG_INFO_EX(arginfo_radius_config, 0, 0, 2) ++ ZEND_ARG_INFO(0, radius_handle) ++ ZEND_ARG_INFO(0, file) ++ZEND_END_ARG_INFO() ++ ++ZEND_BEGIN_ARG_INFO_EX(arginfo_radius_add_server, 0, 0, 6) ++ ZEND_ARG_INFO(0, radius_handle) ++ ZEND_ARG_INFO(0, hostname) ++ ZEND_ARG_INFO(0, port) ++ ZEND_ARG_INFO(0, secret) ++ ZEND_ARG_INFO(0, timeout) ++ ZEND_ARG_INFO(0, max_tries) ++ZEND_END_ARG_INFO() ++ ++ZEND_BEGIN_ARG_INFO_EX(arginfo_radius_create_request, 0, 0, 2) ++ ZEND_ARG_INFO(0, radius_handle) ++ ZEND_ARG_INFO(0, type) ++ZEND_END_ARG_INFO() ++ ++ZEND_BEGIN_ARG_INFO_EX(arginfo_radius_put_string, 0, 0, 3) ++ ZEND_ARG_INFO(0, radius_handle) ++ ZEND_ARG_INFO(0, type) ++ ZEND_ARG_INFO(0, value) ++ ZEND_ARG_INFO(0, options) ++ ZEND_ARG_INFO(0, tag) ++ZEND_END_ARG_INFO() ++ ++ZEND_BEGIN_ARG_INFO_EX(arginfo_radius_put_int, 0, 0, 3) ++ ZEND_ARG_INFO(0, radius_handle) ++ ZEND_ARG_INFO(0, type) ++ ZEND_ARG_INFO(0, value) ++ ZEND_ARG_INFO(0, options) ++ ZEND_ARG_INFO(0, tag) ++ZEND_END_ARG_INFO() ++ ++ZEND_BEGIN_ARG_INFO_EX(arginfo_radius_put_attr, 0, 0, 3) ++ ZEND_ARG_INFO(0, radius_handle) ++ ZEND_ARG_INFO(0, type) ++ ZEND_ARG_INFO(0, value) ++ ZEND_ARG_INFO(0, options) ++ ZEND_ARG_INFO(0, tag) ++ZEND_END_ARG_INFO() ++ ++ZEND_BEGIN_ARG_INFO_EX(arginfo_radius_put_addr, 0, 0, 3) ++ ZEND_ARG_INFO(0, radius_handle) ++ ZEND_ARG_INFO(0, type) ++ ZEND_ARG_INFO(0, addr) ++ ZEND_ARG_INFO(0, options) ++ ZEND_ARG_INFO(0, tag) ++ZEND_END_ARG_INFO() ++ ++ZEND_BEGIN_ARG_INFO_EX(arginfo_radius_put_vendor_string, 0, 0, 4) ++ ZEND_ARG_INFO(0, radius_handle) ++ ZEND_ARG_INFO(0, vendor) ++ ZEND_ARG_INFO(0, type) ++ ZEND_ARG_INFO(0, value) ++ ZEND_ARG_INFO(0, options) ++ ZEND_ARG_INFO(0, tag) ++ZEND_END_ARG_INFO() ++ ++ZEND_BEGIN_ARG_INFO_EX(arginfo_radius_put_vendor_int, 0, 0, 4) ++ ZEND_ARG_INFO(0, radius_handle) ++ ZEND_ARG_INFO(0, vendor) ++ ZEND_ARG_INFO(0, type) ++ ZEND_ARG_INFO(0, value) ++ ZEND_ARG_INFO(0, options) ++ ZEND_ARG_INFO(0, tag) ++ZEND_END_ARG_INFO() ++ ++ZEND_BEGIN_ARG_INFO_EX(arginfo_radius_put_vendor_attr, 0, 0, 4) ++ ZEND_ARG_INFO(0, radius_handle) ++ ZEND_ARG_INFO(0, vendor) ++ ZEND_ARG_INFO(0, type) ++ ZEND_ARG_INFO(0, value) ++ ZEND_ARG_INFO(0, options) ++ ZEND_ARG_INFO(0, tag) ++ZEND_END_ARG_INFO() ++ ++ZEND_BEGIN_ARG_INFO_EX(arginfo_radius_put_vendor_addr, 0, 0, 4) ++ ZEND_ARG_INFO(0, radius_handle) ++ ZEND_ARG_INFO(0, vendor) ++ ZEND_ARG_INFO(0, type) ++ ZEND_ARG_INFO(0, addr) ++ ZEND_ARG_INFO(0, options) ++ ZEND_ARG_INFO(0, tag) ++ZEND_END_ARG_INFO() ++ ++ZEND_BEGIN_ARG_INFO_EX(arginfo_radius_send_request, 0, 0, 1) ++ ZEND_ARG_INFO(0, radius_handle) ++ZEND_END_ARG_INFO() ++ ++ZEND_BEGIN_ARG_INFO_EX(arginfo_radius_get_attr, 0, 0, 1) ++ ZEND_ARG_INFO(0, radius_handle) ++ZEND_END_ARG_INFO() ++ ++ZEND_BEGIN_ARG_INFO_EX(arginfo_radius_get_tagged_attr_data, 0, 0, 1) ++ ZEND_ARG_INFO(0, data) ++ZEND_END_ARG_INFO() ++ ++ZEND_BEGIN_ARG_INFO_EX(arginfo_radius_get_tagged_attr_tag, 0, 0, 1) ++ ZEND_ARG_INFO(0, data) ++ZEND_END_ARG_INFO() ++ ++ZEND_BEGIN_ARG_INFO_EX(arginfo_radius_get_vendor_attr, 0, 0, 1) ++ ZEND_ARG_INFO(0, data) ++ZEND_END_ARG_INFO() ++ ++ZEND_BEGIN_ARG_INFO_EX(arginfo_radius_cvt_addr, 0, 0, 1) ++ ZEND_ARG_INFO(0, data) ++ZEND_END_ARG_INFO() ++ ++ZEND_BEGIN_ARG_INFO_EX(arginfo_radius_cvt_int, 0, 0, 1) ++ ZEND_ARG_INFO(0, data) ++ZEND_END_ARG_INFO() ++ ++ZEND_BEGIN_ARG_INFO_EX(arginfo_radius_cvt_string, 0, 0, 1) ++ ZEND_ARG_INFO(0, data) ++ZEND_END_ARG_INFO() ++ ++ZEND_BEGIN_ARG_INFO_EX(arginfo_radius_salt_encrypt_attr, 0, 0, 2) ++ ZEND_ARG_INFO(0, radius_handle) ++ ZEND_ARG_INFO(0, data) ++ZEND_END_ARG_INFO() ++ ++ZEND_BEGIN_ARG_INFO_EX(arginfo_radius_request_authenticator, 0, 0, 1) ++ ZEND_ARG_INFO(0, radius_handle) ++ZEND_END_ARG_INFO() ++ ++ZEND_BEGIN_ARG_INFO_EX(arginfo_radius_server_secret, 0, 0, 1) ++ ZEND_ARG_INFO(0, radius_handle) ++ZEND_END_ARG_INFO() ++ ++ZEND_BEGIN_ARG_INFO_EX(arginfo_radius_demangle, 0, 0, 2) ++ ZEND_ARG_INFO(0, radius_handle) ++ ZEND_ARG_INFO(0, mangled) ++ZEND_END_ARG_INFO() ++ ++ZEND_BEGIN_ARG_INFO_EX(arginfo_radius_demangle_mppe_key, 0, 0, 2) ++ ZEND_ARG_INFO(0, radius_handle) ++ ZEND_ARG_INFO(0, mangled) ++ZEND_END_ARG_INFO() ++ ++/* }}} */ ++ ++ + /* {{{ radius_functions[] + * + * Every user visible function must have an entry in radius_functions[]. + */ + zend_function_entry radius_functions[] = { +- PHP_FE(radius_auth_open, NULL) +- PHP_FE(radius_acct_open, NULL) +- PHP_FE(radius_close, NULL) +- PHP_FE(radius_strerror, NULL) +- PHP_FE(radius_config, NULL) +- PHP_FE(radius_add_server, NULL) +- PHP_FE(radius_create_request, NULL) +- PHP_FE(radius_put_string, NULL) +- PHP_FE(radius_put_int, NULL) +- PHP_FE(radius_put_attr, NULL) +- PHP_FE(radius_put_addr, NULL) +- PHP_FE(radius_put_vendor_string, NULL) +- PHP_FE(radius_put_vendor_int, NULL) +- PHP_FE(radius_put_vendor_attr, NULL) +- PHP_FE(radius_put_vendor_addr, NULL) +- PHP_FE(radius_send_request, NULL) +- PHP_FE(radius_get_attr, NULL) +- PHP_FE(radius_get_tagged_attr_data, NULL) +- PHP_FE(radius_get_tagged_attr_tag, NULL) +- PHP_FE(radius_get_vendor_attr, NULL) +- PHP_FE(radius_cvt_addr, NULL) +- PHP_FE(radius_cvt_int, NULL) +- PHP_FE(radius_cvt_string, NULL) +- PHP_FE(radius_salt_encrypt_attr, NULL) +- PHP_FE(radius_request_authenticator, NULL) +- PHP_FE(radius_server_secret, NULL) +- PHP_FE(radius_demangle, NULL) +- PHP_FE(radius_demangle_mppe_key, NULL) ++ PHP_FE(radius_auth_open, arginfo_radius_auth_open) ++ PHP_FE(radius_acct_open, arginfo_radius_acct_open) ++ PHP_FE(radius_close, arginfo_radius_close) ++ PHP_FE(radius_strerror, arginfo_radius_strerror) ++ PHP_FE(radius_config, arginfo_radius_config) ++ PHP_FE(radius_add_server, arginfo_radius_add_server) ++ PHP_FE(radius_create_request, arginfo_radius_create_request) ++ PHP_FE(radius_put_string, arginfo_radius_put_string) ++ PHP_FE(radius_put_int, arginfo_radius_put_int) ++ PHP_FE(radius_put_attr, arginfo_radius_put_attr) ++ PHP_FE(radius_put_addr, arginfo_radius_put_addr) ++ PHP_FE(radius_put_vendor_string, arginfo_radius_put_vendor_string) ++ PHP_FE(radius_put_vendor_int, arginfo_radius_put_vendor_int) ++ PHP_FE(radius_put_vendor_attr, arginfo_radius_put_vendor_attr) ++ PHP_FE(radius_put_vendor_addr, arginfo_radius_put_vendor_addr) ++ PHP_FE(radius_send_request, arginfo_radius_get_attr) ++ PHP_FE(radius_get_attr, arginfo_radius_get_attr) ++ PHP_FE(radius_get_tagged_attr_data, arginfo_radius_get_tagged_attr_data) ++ PHP_FE(radius_get_tagged_attr_tag, arginfo_radius_get_tagged_attr_tag) ++ PHP_FE(radius_get_vendor_attr, arginfo_radius_get_vendor_attr) ++ PHP_FE(radius_cvt_addr, arginfo_radius_cvt_addr) ++ PHP_FE(radius_cvt_int, arginfo_radius_cvt_int) ++ PHP_FE(radius_cvt_string, arginfo_radius_cvt_string) ++ PHP_FE(radius_salt_encrypt_attr, arginfo_radius_salt_encrypt_attr) ++ PHP_FE(radius_request_authenticator, arginfo_radius_request_authenticator) ++ PHP_FE(radius_server_secret, arginfo_radius_server_secret) ++ PHP_FE(radius_demangle, arginfo_radius_demangle) ++ PHP_FE(radius_demangle_mppe_key, arginfo_radius_demangle_mppe_key) + {NULL, NULL, NULL} /* Must be the last line in radius_functions[] */ + }; + /* }}} */ +--- a/php_radius.h 2016-02-15 10:11:50.000000000 -0500 ++++ b/php_radius.h 2022-12-13 10:24:33.505295274 -0500 +@@ -96,6 +96,14 @@ + #define RADIUS_OPTION_TAGGED RAD_OPTION_TAG + #define RADIUS_OPTION_SALT RAD_OPTION_SALT + ++#ifndef TSRMLS_D ++#define TSRMLS_D void ++#define TSRMLS_DC ++#define TSRMLS_C ++#define TSRMLS_CC ++#define TSRMLS_FETCH() ++#endif ++ + #endif /* PHP_RADIUS_H */ + + +--- a/radlib_compat.h 2016-02-15 10:11:50.000000000 -0500 ++++ b/radlib_compat.h 2022-12-13 10:24:33.505295274 -0500 +@@ -83,6 +83,14 @@ + } while (0) + #endif + ++#ifndef TSRMLS_D ++#define TSRMLS_D void ++#define TSRMLS_DC ++#define TSRMLS_C ++#define TSRMLS_CC ++#define TSRMLS_FETCH() ++#endif ++ + #endif + + +--- a/tests/server/fake_server.php 2016-02-15 10:11:50.000000000 -0500 ++++ b/tests/server/fake_server.php 2022-12-13 10:46:50.933484601 -0500 +@@ -321,7 +321,7 @@ + * + * @return boolean + */ +- function skip() { ++ static function skip() { + return !(function_exists('socket_create') && function_exists('pcntl_fork') && function_exists('radius_acct_open')); + } + diff --git a/dev-php/pecl-radius/metadata.xml b/dev-php/pecl-radius/metadata.xml index b86acf66c756..222c77f3742a 100644 --- a/dev-php/pecl-radius/metadata.xml +++ b/dev-php/pecl-radius/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> diff --git a/dev-php/pecl-radius/pecl-radius-1.4.0_beta1-r3.ebuild b/dev-php/pecl-radius/pecl-radius-1.4.0_beta1-r3.ebuild index 467867d6f62c..ad164b41e256 100644 --- a/dev-php/pecl-radius/pecl-radius-1.4.0_beta1-r3.ebuild +++ b/dev-php/pecl-radius/pecl-radius-1.4.0_beta1-r3.ebuild @@ -1,15 +1,16 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="7" +EAPI="8" PHP_EXT_NAME="radius" PHP_EXT_INI="yes" PHP_EXT_ZENDEXT="no" -USE_PHP="php7-2 php7-3 php7-4" +USE_PHP="php8-1 php8-2" PHP_EXT_PECL_FILENAME="${PN/pecl-/}-${PV/_beta/b}.tgz" PHP_EXT_S="${WORKDIR}/${PHP_EXT_PECL_FILENAME%.tgz}" +PHP_EXT_NEEDED_USE="pcntl(-),sockets(-)" inherit php-ext-pecl-r3 @@ -18,14 +19,14 @@ KEYWORDS="~amd64 ~x86" DESCRIPTION="Provides support for RADIUS authentication (RFC 2865) and accounting (RFC 2866)" LICENSE="BSD" SLOT="0" -IUSE="examples test" -RESTRICT="!test? ( test )" +IUSE="examples" S="${PHP_EXT_S}" -RDEPEND=" - 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} )" +PATCHES=( "${FILESDIR}/1.4.0-php8.patch" ) + +src_unpack() { + default + #Non-portable test + rm "${S}/tests/radius_close.phpt" || die +} diff --git a/dev-php/pecl-raphf/Manifest b/dev-php/pecl-raphf/Manifest index 370d4da0588e..fe67b291dc82 100644 --- a/dev-php/pecl-raphf/Manifest +++ b/dev-php/pecl-raphf/Manifest @@ -1,2 +1 @@ -DIST raphf-2.0.0.tgz 15715 BLAKE2B bab2997d9ce8358efaa69f2e633f49e4dd16f640e8d30284ebb33767285bead1aabcd973e7133152b82cf624e2c2e68cc6247e424aa5ed540e4211b5ed3da365 SHA512 16b029b694d30817a68a1a9d80bdf031d058ada45a93a4b34b49ec5d61fa8af78d0dbf1a3e5e2f1b950b2a11ac0b86b5a467807551556ab2a77f7f99739ed11b DIST raphf-2.0.1.tgz 16003 BLAKE2B 4eaf9f89e6572e17e0df347543dc99221f68d45103444f89e59862b9078574722278fbb1e2841b0a5952ffd6dfc4ea0fa81298f2014ffbe8a6b51ed6887f6692 SHA512 0a609fc21a62880963e7afb75297eb75a2598aab2c816cb61e84d665b0453e4952aa9bf25fe2c818cc94492a4b94aed965053c67899fdb984d88661364fffb1e diff --git a/dev-php/pecl-raphf/metadata.xml b/dev-php/pecl-raphf/metadata.xml index b86acf66c756..222c77f3742a 100644 --- a/dev-php/pecl-raphf/metadata.xml +++ b/dev-php/pecl-raphf/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> diff --git a/dev-php/pecl-raphf/pecl-raphf-2.0.0-r2.ebuild b/dev-php/pecl-raphf/pecl-raphf-2.0.0-r2.ebuild deleted file mode 100644 index e594718f2c51..000000000000 --- a/dev-php/pecl-raphf/pecl-raphf-2.0.0-r2.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2019 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="php5-6 php7-1 php7-2 php7-3" - -inherit php-ext-pecl-r3 - -# Only really build for 7.x -USE_PHP="php7-1 php7-2 php7-3" - -KEYWORDS="amd64 x86" - -DESCRIPTION="A reusable, persistent handle and resource factory API" -LICENSE="BSD-2" -SLOT="7" -IUSE="" - -RDEPEND="php_targets_php5-6? ( ${CATEGORY}/${PN}:0[php_targets_php5-6] )" - -# Tests need pecl-http, which needs this -RESTRICT="test" - -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_install() { - if use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3; then - php-ext-pecl-r3_src_install - fi -} diff --git a/dev-php/pecl-raphf/pecl-raphf-2.0.1-r1.ebuild b/dev-php/pecl-raphf/pecl-raphf-2.0.1-r2.ebuild index 7c2efe5219cd..3d7ea2841257 100644 --- a/dev-php/pecl-raphf/pecl-raphf-2.0.1-r1.ebuild +++ b/dev-php/pecl-raphf/pecl-raphf-2.0.1-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -9,11 +9,11 @@ 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" +USE_PHP="php8-1" inherit php-ext-pecl-r3 -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" DESCRIPTION="A reusable, persistent handle and resource factory API" LICENSE="BSD-2" diff --git a/dev-php/pecl-raphf/pecl-raphf-2.0.1.ebuild b/dev-php/pecl-raphf/pecl-raphf-2.0.1.ebuild deleted file mode 100644 index 9923b1d0c97d..000000000000 --- a/dev-php/pecl-raphf/pecl-raphf-2.0.1.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2019 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="php5-6 php7-0 php7-1 php7-2 php7-3 php7-4" - -inherit php-ext-pecl-r3 - -# Only really build for 7.x -USE_PHP="php7-1 php7-2 php7-3 php7-4" - -KEYWORDS="~amd64 ~x86" - -DESCRIPTION="A reusable, persistent handle and resource factory API" -LICENSE="BSD-2" -SLOT="7" -IUSE="" - -RDEPEND="php_targets_php5-6? ( ${CATEGORY}/${PN}:0[php_targets_php5-6] )" - -src_prepare() { - if use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3 || use php_targets_php7-4; then - php-ext-source-r3_src_prepare - else - default_src_prepare - fi -} - -src_install() { - if use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3 || use php_targets_php7-4; then - php-ext-pecl-r3_src_install - fi -} diff --git a/dev-php/pecl-redis/Manifest b/dev-php/pecl-redis/Manifest index 374261f43f04..8bba19119471 100644 --- a/dev-php/pecl-redis/Manifest +++ b/dev-php/pecl-redis/Manifest @@ -1,3 +1,3 @@ -DIST redis-5.3.2.tgz 266814 BLAKE2B 2be79d850e5958bcaf4fddcbdef0a402e62a522f260ae94c0fdc931a988e9b266c7a4e049b89b507a29a8e9085590e4077e336b85974d70a7cb9b3d6c806949d SHA512 95ce960b78cf94ecd212ec88914935167af37e4176d4b111dfc8c6f1a0846a34beba7f9f516cd7a5e1c9dda23f46cce44c99aaa5b42724c0c2a188b0698af414 -DIST redis-5.3.3.tgz 266990 BLAKE2B b939e5a33b3013d1aeaa59f9a1ebbb4b4665d57abf87dc4e300273221d3390d14387cad318d69a56ab573861c1aef89ab7778d3f636adfc351b4fc330eba98d3 SHA512 a04a7d0aa3881b861a00c3f0a889b2f3fd135009293629ac55a74890196c0686e9766438f5255561105e30293f1a6a91ca987fd68e43f3ca436f6cc884e6a5df -DIST redis-5.3.4.tgz 268154 BLAKE2B 17a3af10c09f302d46faa5122147e4882437f92e9440b3a580919382e48f2697ede453f11411de7c1a1114f94a2601ec5f905943f045c8d64e5fea7231ff96f5 SHA512 c1270235b18544e651411ddfb512d74b7229e3dc241b2dfcdf97f2e26cf60754afb7deaac17bc48202875b5caafae19f31a7b8da980fcba578df51b0c0860a95 +DIST redis-5.3.6.tgz 274235 BLAKE2B 8479b3060abb99f765b27fd8937cb4c7ef92c55c0581ae6a69dd06113367547d546a9f96a8418df928f258520cb0fed6f5d39f6d88972c74b8446134be08edc4 SHA512 e5047ba9974ff6065be0fe8614aea8bf7d7c77b3a4ca08b19d0bb53069dd164614ffd19bf09bda458511abddce438fd816c28a169536388c8c4cd923596aadf0 +DIST redis-5.3.7.tgz 275200 BLAKE2B 50cff3d36e189593a741ed3fe05c3558e6a0621e7ff906e4902ba39e3f7d3ae5b9bfa554480a131e32bcc0334bccbd3aa5507dc714b6d4b20ac808139c525a95 SHA512 b945d5aa86d3f58e75094369b0f324e987202f104aca7d7b46ba23cfaed54d186bb66931e200dd16d2dbeea11732dd0311da4e3d7485c3b725027f7924652832 +DIST redis-6.0.2.tgz 365966 BLAKE2B d8baebb64e1a2b8799da151253b98d045beebcbdadae7b6081f3a8e29fe20ca0928cac027ebb74264b25b900d7c04ea2e15a07b20090aa529299808878fc45d0 SHA512 1918d15433d1b4d782a9fb0364f6dfeed8d9e6c2ae70c34e235be5f890992c73a40ef19842e0aabb181da86dd2cde28b9aebab8698b387738321298a2ab94aa6 diff --git a/dev-php/pecl-redis/metadata.xml b/dev-php/pecl-redis/metadata.xml index 25557ad02e0d..381f530243d9 100644 --- a/dev-php/pecl-redis/metadata.xml +++ b/dev-php/pecl-redis/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> diff --git a/dev-php/pecl-redis/pecl-redis-5.3.4.ebuild b/dev-php/pecl-redis/pecl-redis-5.3.6.ebuild index 87d6d5860b52..b2d812cbde98 100644 --- a/dev-php/pecl-redis/pecl-redis-5.3.4.ebuild +++ b/dev-php/pecl-redis/pecl-redis-5.3.6.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 PHP_EXT_NAME="redis" -USE_PHP="php7-3 php7-4 php8-0" +USE_PHP="php8-1" PHP_EXT_NEEDED_USE="json(+)?,session(-)?" DOCS=( arrays.markdown cluster.markdown README.markdown CREDITS ) MY_P="${PN/pecl-/}-${PV/_rc/RC}" @@ -16,11 +16,11 @@ inherit php-ext-pecl-r3 DESCRIPTION="PHP extension for interfacing with Redis" LICENSE="PHP-3.01" SLOT="0" -KEYWORDS="~amd64 ~arm" +KEYWORDS="amd64 ~arm" IUSE="igbinary +json lz4 +session zstd" DEPEND=" - igbinary? ( >=dev-php/igbinary-3.0.1-r1[php_targets_php7-3(-)?,php_targets_php7-4(-)?,php_targets_php8-0(-)?] ) + igbinary? ( >=dev-php/igbinary-3.0.1-r1[php_targets_php8-1(-)?] ) lz4? ( app-arch/lz4:= ) zstd? ( app-arch/zstd:= ) " diff --git a/dev-php/pecl-redis/pecl-redis-5.3.2.ebuild b/dev-php/pecl-redis/pecl-redis-5.3.7-r1.ebuild index 28935f2552a5..f2e20d6e2554 100644 --- a/dev-php/pecl-redis/pecl-redis-5.3.2.ebuild +++ b/dev-php/pecl-redis/pecl-redis-5.3.7-r1.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 PHP_EXT_NAME="redis" -USE_PHP="php7-2 php7-3 php7-4 php8-0" -PHP_EXT_NEEDED_USE="json(+)?,session?" +USE_PHP="php8-1 php8-2" +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" @@ -16,11 +16,11 @@ inherit php-ext-pecl-r3 DESCRIPTION="PHP extension for interfacing with Redis" LICENSE="PHP-3.01" SLOT="0" -KEYWORDS="amd64 ~arm" +KEYWORDS="amd64 ~arm ~arm64" 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(-)?] ) + igbinary? ( >=dev-php/igbinary-3.0.1-r1[php_targets_php8-1(-)?,php_targets_php8-2(-)?] ) lz4? ( app-arch/lz4:= ) zstd? ( app-arch/zstd:= ) " diff --git a/dev-php/pecl-redis/pecl-redis-5.3.3.ebuild b/dev-php/pecl-redis/pecl-redis-6.0.2-r1.ebuild index cc99909962e4..7dbf2b7d829a 100644 --- a/dev-php/pecl-redis/pecl-redis-5.3.3.ebuild +++ b/dev-php/pecl-redis/pecl-redis-6.0.2-r1.ebuild @@ -1,12 +1,11 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 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 ) +USE_PHP="php8-1 php8-2 php8-3" +PHP_EXT_NEEDED_USE="json(+)?,session(-)?" MY_P="${PN/pecl-/}-${PV/_rc/RC}" PHP_EXT_PECL_FILENAME="${MY_P}.tgz" PHP_EXT_S="${WORKDIR}/${MY_P}" @@ -16,11 +15,11 @@ inherit php-ext-pecl-r3 DESCRIPTION="PHP extension for interfacing with Redis" LICENSE="PHP-3.01" SLOT="0" -KEYWORDS="~amd64 ~arm" +KEYWORDS="amd64 ~arm ~arm64" 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(-)?] ) + igbinary? ( >=dev-php/igbinary-3.0.1-r1[php_targets_php8-1(-)?,php_targets_php8-2(-)?,php_targets_php8-3(-)?] ) lz4? ( app-arch/lz4:= ) zstd? ( app-arch/zstd:= ) " diff --git a/dev-php/pecl-rrd/Manifest b/dev-php/pecl-rrd/Manifest index 3f9af491a776..23eeb6d19ab1 100644 --- a/dev-php/pecl-rrd/Manifest +++ b/dev-php/pecl-rrd/Manifest @@ -1 +1 @@ -DIST rrd-2.0.1.tgz 18880 BLAKE2B c3fb65e95aece39690085830ec1c43ba173e173591215d6a66145ac71079f8d5ba5b097acd9018c86d2342550001334f8e1c98e22204d94a24aee5cc086295ca SHA512 b6f7173f54fcf49bf014cc6c78263c169cdf53dac66c12f5f88db7e01b49ea74da84a55f61deb25c866e6e2e74275ec48fc4a3d1b46719f66b5b7b7eb000b6b3 +DIST rrd-2.0.3.tgz 19178 BLAKE2B 473fe53e858665372133db9f13d9aeac330da2ca57a8fb59f0eb280f1bdd40d2f0b28179a9b150acdf15d7bbc6fb5416a82dcd670c67ad39050cbd1c5795b62e SHA512 28679ccead54806d1e92accc6f5ebab582a41db802f95797ddb43e3e15690889be3437f22e2a14939d217422ac2700ef90ae0a9b36244ddead3856343b3e09b4 diff --git a/dev-php/pecl-rrd/metadata.xml b/dev-php/pecl-rrd/metadata.xml index b86acf66c756..222c77f3742a 100644 --- a/dev-php/pecl-rrd/metadata.xml +++ b/dev-php/pecl-rrd/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> diff --git a/dev-php/pecl-rrd/pecl-rrd-2.0.1-r4.ebuild b/dev-php/pecl-rrd/pecl-rrd-2.0.3.ebuild index 7652ef702136..10d676933d22 100644 --- a/dev-php/pecl-rrd/pecl-rrd-2.0.1-r4.ebuild +++ b/dev-php/pecl-rrd/pecl-rrd-2.0.3.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="7" +EAPI="8" -USE_PHP="php7-3 php7-4 php8-0" +USE_PHP="php8-1 php8-2" inherit php-ext-pecl-r3 @@ -14,8 +14,9 @@ KEYWORDS="~amd64 ~x86" DEPEND="net-analyzer/rrdtool[graph(-)]" RDEPEND="${DEPEND}" +BDEPEND="virtual/pkgconfig" -PATCHES=( "${FILESDIR}/${PV}" ) +#PATCHES=( "${FILESDIR}/${PV}" ) PHP_EXT_ECONF_ARGS=() src_test() { diff --git a/dev-php/pecl-ssh2/Manifest b/dev-php/pecl-ssh2/Manifest index 4a420e281de7..0d800ebf183e 100644 --- a/dev-php/pecl-ssh2/Manifest +++ b/dev-php/pecl-ssh2/Manifest @@ -1,4 +1 @@ -DIST pecl-ssh2-1.1.2-fix-php7-port.patch 27860 BLAKE2B 23054187608bdcf79f53ce638e37c646f44297aa7d1e8f7a7c85fd922977ab835b915d541fbae327a30d2e863b503ed4822a82c1b242346290ceb94d49c97020 SHA512 1c2ecc990323a77fb2b69be0d6649f96dd7ad2d06c62f4fcb79a9ef4f89e066d463301668a044d37d717c99837c5d7d3f621f61119543445bd05c3229d9270e9 -DIST pecl-ssh2-1.2.tar.gz 32447 BLAKE2B 3a9d0f205097a381d07fb9dd5ab4dcb8e361f555dbc633abb8fa895c83024b70e85cd87602da1ceeb1018a7b07c474720b02810ef0689e9294fc33b129b6c738 SHA512 7b7d311cd5f88835e124d70a0295468f75d0fa6936a58808c936d1a185bb630b9e02c21f49b4bd777194a7b104aa3ff85c4fbf480f43d5906787e532ba2d3e04 -DIST ssh2-1.1.2.tgz 32057 BLAKE2B 88ffb3fb608687a086bbe345677982e944210791acc100312ba56ac7c35188a52cde5529d78caf473d19710e9965fba853ea9ff046715413a0b488ae2d8b690c SHA512 36793191448745b8a9b3cc628fe9fb431480792c7a2ff0bf2eccd58cda1cf944933be1d301c455d4a6f3dabf7e04ffef248bc402a8ff99bfafcba0deddb25c36 DIST ssh2-1.3.1.tgz 33838 BLAKE2B 05976ad143563fd9d51be3f8e23b5b22099e351d6f252b612aa1dcb56648dc337b623d2cddf7b9079f3e07c879ca69215a1987cd6f4326f97ba134e13c6d28e7 SHA512 c74d4f699853148b53cdca0eaf8837bfdbdd21d185761606acadf2442e84dbefdb00cde207e0ce4794ae1e4f8692a38ed903b6d11fdc57bca7b54a4250da9a76 diff --git a/dev-php/pecl-ssh2/files/pecl-ssh2-1.1.2-fix-php_url-fields-usage-for-php7-3.patch b/dev-php/pecl-ssh2/files/pecl-ssh2-1.1.2-fix-php_url-fields-usage-for-php7-3.patch deleted file mode 100644 index 1f1352564220..000000000000 --- a/dev-php/pecl-ssh2/files/pecl-ssh2-1.1.2-fix-php_url-fields-usage-for-php7-3.patch +++ /dev/null @@ -1,302 +0,0 @@ -From a8835aab2c15e794fce13bd927295719e384ad2d Mon Sep 17 00:00:00 2001 -From: Remi Collet <remi@php.net> -Date: Thu, 28 Jun 2018 07:10:35 +0200 -Subject: [PATCH] fix php_url fields usage for PHP 7.3 - ---- - php_ssh2.h | 8 ++++++++ - ssh2_fopen_wrappers.c | 55 ++++++++++++++++++++++++++++++++------------------- - ssh2_sftp.c | 20 +++++++++---------- - 3 files changed, 53 insertions(+), 30 deletions(-) - -diff --git a/php_ssh2.h b/php_ssh2.h -index 734b795..d010ff9 100644 ---- a/php_ssh2.h -+++ b/php_ssh2.h -@@ -166,6 +166,14 @@ extern php_stream_wrapper php_ssh2_sftp_wrapper; - extern int le_ssh2_session; - extern int le_ssh2_sftp; - -+#if PHP_VERSION_ID < 70300 -+#define SSH2_URL_STR(a) (a) -+#define SSH2_URL_LEN(a) strlen(a) -+#else -+#define SSH2_URL_STR(a) ZSTR_VAL(a) -+#define SSH2_URL_LEN(a) ZSTR_LEN(a) -+#endif -+ - #endif /* PHP_SSH2_H */ - - /* -diff --git a/ssh2_fopen_wrappers.c b/ssh2_fopen_wrappers.c -index 2f96ca4..f2f3475 100644 ---- a/ssh2_fopen_wrappers.c -+++ b/ssh2_fopen_wrappers.c -@@ -215,7 +215,7 @@ php_url *php_ssh2_fopen_wraper_parse_path(const char *path, char *type, php_stre - php_url *resource; - zval *methods = NULL, *callbacks = NULL, zsession, *tmpzval; - zend_long resource_id; -- char *h, *s, *username = NULL, *password = NULL, *pubkey_file = NULL, *privkey_file = NULL; -+ char *h, *username = NULL, *password = NULL, *pubkey_file = NULL, *privkey_file = NULL; - int username_len = 0, password_len = 0; - - h = strstr(path, "Resource id #"); -@@ -233,13 +233,13 @@ php_url *php_ssh2_fopen_wraper_parse_path(const char *path, char *type, php_stre - return NULL; - } - -- if (strncmp(resource->scheme, "ssh2.", sizeof("ssh2.") - 1)) { -+ if (strncmp(SSH2_URL_STR(resource->scheme), "ssh2.", sizeof("ssh2.") - 1)) { - /* Not an ssh wrapper */ - php_url_free(resource); - return NULL; - } - -- if (strcmp(resource->scheme + sizeof("ssh2.") - 1, type)) { -+ if (strcmp(SSH2_URL_STR(resource->scheme) + sizeof("ssh2.") - 1, type)) { - /* Wrong ssh2. wrapper type */ - php_url_free(resource); - return NULL; -@@ -253,13 +253,27 @@ php_url *php_ssh2_fopen_wraper_parse_path(const char *path, char *type, php_stre - Find resource->path in the path string, then copy the entire string from the original path. - This includes ?query#fragment in the path string - */ -+// TODO copy seems uneeded -+#if PHP_VERSION_ID < 70300 -+ { -+ char * s; -+ - s = resource->path; - resource->path = estrdup(strstr(path, resource->path)); - efree(s); -+ } -+#else -+ { -+ zend_string *tmp; -+ -+ tmp = resource->path; -+ resource->path = zend_string_init(ZSTR_VAL(resource->path), ZSTR_LEN(resource->path), 0); -+ zend_string_release(tmp); -+ } -+#endif - - /* Look for a resource ID to reuse a session */ -- s = resource->host; -- if (is_numeric_string(s, strlen(s), &resource_id, NULL, 0) == IS_LONG) { -+ if (is_numeric_string(SSH2_URL_STR(resource->host), SSH2_URL_LEN(resource->host), &resource_id, NULL, 0) == IS_LONG) { - php_ssh2_sftp_data *sftp_data; - zval *zresource; - -@@ -309,7 +323,7 @@ php_url *php_ssh2_fopen_wraper_parse_path(const char *path, char *type, php_stre - } - - /* Fallback on finding it in the context */ -- if (resource->host[0] == 0 && context && psftp && -+ if (SSH2_URL_STR(resource->host)[0] == 0 && context && psftp && - (tmpzval = php_stream_context_get_option(context, "ssh2", "sftp")) != NULL && - Z_TYPE_P(tmpzval) == IS_RESOURCE) { - php_ssh2_sftp_data *sftp_data; -@@ -323,7 +337,7 @@ php_url *php_ssh2_fopen_wraper_parse_path(const char *path, char *type, php_stre - return resource; - } - } -- if (resource->host[0] == 0 && context && -+ if (SSH2_URL_STR(resource->host)[0] == 0 && context && - (tmpzval = php_stream_context_get_option(context, "ssh2", "session")) != NULL && - Z_TYPE_P(tmpzval) == IS_RESOURCE) { - session = (LIBSSH2_SESSION *)zend_fetch_resource(Z_RES_P(tmpzval), PHP_SSH2_SESSION_RES_NAME, le_ssh2_session); -@@ -399,19 +413,19 @@ php_url *php_ssh2_fopen_wraper_parse_path(const char *path, char *type, php_stre - } - - if (resource->user) { -- int len = strlen(resource->user); -+ int len = SSH2_URL_LEN(resource->user); - - if (len) { -- username = resource->user; -+ username = SSH2_URL_STR(resource->user); - username_len = len; - } - } - - if (resource->pass) { -- int len = strlen(resource->pass); -+ int len = SSH2_URL_LEN(resource->pass); - - if (len) { -- password = resource->pass; -+ password = SSH2_URL_STR(resource->pass); - password_len = len; - } - } -@@ -422,7 +436,7 @@ php_url *php_ssh2_fopen_wraper_parse_path(const char *path, char *type, php_stre - return NULL; - } - -- session = php_ssh2_session_connect(resource->host, resource->port, methods, callbacks); -+ session = php_ssh2_session_connect(SSH2_URL_STR(resource->host), resource->port, methods, callbacks); - if (!session) { - /* Unable to connect! */ - php_url_free(resource); -@@ -482,6 +496,7 @@ session_authed: - *psftp = sftp; - } - -+ //TODO may be undefined - *presource_id = Z_LVAL(zsession); - *psession = session; - -@@ -527,7 +542,7 @@ static php_stream *php_ssh2_shell_open(LIBSSH2_SESSION *session, int resource_id - zval_copy_ctor(©val); - convert_to_string(©val); - if (libssh2_channel_setenv_ex(channel, key->val, key->len, Z_STRVAL(copyval), Z_STRLEN(copyval))) { -- php_error_docref(NULL, E_WARNING, "Failed setting %s=%s on remote end", key, Z_STRVAL(copyval)); -+ php_error_docref(NULL, E_WARNING, "Failed setting %s=%s on remote end", ZSTR_VAL(key), Z_STRVAL(copyval)); - } - zval_dtor(©val); - } -@@ -631,7 +646,7 @@ static php_stream *php_ssh2_fopen_wrapper_shell(php_stream_wrapper *wrapper, con - zval_ptr_dtor(©val); - } - -- s = resource->path ? resource->path : NULL; -+ s = resource->path ? SSH2_URL_STR(resource->path) : NULL; - - if (s && s[0] == '/') { - /* Terminal type encoded into URL overrides context terminal type */ -@@ -766,7 +781,7 @@ static php_stream *php_ssh2_exec_command(LIBSSH2_SESSION *session, int resource_ - zval_copy_ctor(©val); - convert_to_string(©val); - if (libssh2_channel_setenv_ex(channel, key->val, key->len, Z_STRVAL(copyval), Z_STRLEN(copyval))) { -- php_error_docref(NULL, E_WARNING, "Failed setting %s=%s on remote end", key, Z_STRVAL(copyval)); -+ php_error_docref(NULL, E_WARNING, "Failed setting %s=%s on remote end", ZSTR_VAL(key), Z_STRVAL(copyval)); - } - zval_dtor(©val); - } -@@ -878,7 +893,7 @@ static php_stream *php_ssh2_fopen_wrapper_exec(php_stream_wrapper *wrapper, cons - zval_ptr_dtor(copyval); - } - -- stream = php_ssh2_exec_command(session, resource_id, resource->path + 1, terminal, terminal_len, environment, width, height, type); -+ stream = php_ssh2_exec_command(session, resource_id, SSH2_URL_STR(resource->path) + 1, terminal, terminal_len, environment, width, height, type); - if (!stream) { - // TODO Sean-Der - //zend_list_delete(resource_id); -@@ -1021,7 +1036,7 @@ static php_stream *php_ssh2_fopen_wrapper_scp(php_stream_wrapper *wrapper, const - return NULL; - } - -- stream = php_ssh2_scp_xfer(session, resource_id, resource->path); -+ stream = php_ssh2_scp_xfer(session, resource_id, SSH2_URL_STR(resource->path)); - if (!stream) { - //TODO Sean-Der - //zend_list_delete(resource_id); -@@ -1147,7 +1162,7 @@ PHP_FUNCTION(ssh2_scp_send) - char *error_msg = NULL; - - last_error = libssh2_session_last_error(session, &error_msg, NULL, 0); -- php_error_docref(NULL, E_WARNING, "Failure creating remote file: %s", error_msg); -+ php_error_docref(NULL, E_WARNING, "Failure creating remote file: %s (%d)", error_msg, last_error); - php_stream_close(local_file); - RETURN_FALSE; - } -@@ -1262,10 +1277,10 @@ static php_stream *php_ssh2_fopen_wrapper_tunnel(php_stream_wrapper *wrapper, co - return NULL; - } - -- if (resource->path && resource->path[0] == '/') { -+ if (resource->path && SSH2_URL_STR(resource->path)[0] == '/') { - char *colon; - -- host = resource->path + 1; -+ host = SSH2_URL_STR(resource->path) + 1; - if (*host == '[') { - /* IPv6 Encapsulated Format */ - host++; -diff --git a/ssh2_sftp.c b/ssh2_sftp.c -index 13f89f0..6332be8 100644 ---- a/ssh2_sftp.c -+++ b/ssh2_sftp.c -@@ -238,7 +238,7 @@ static php_stream *php_ssh2_sftp_stream_opener(php_stream_wrapper *wrapper, cons - - flags = php_ssh2_parse_fopen_modes((char *)mode); - -- handle = libssh2_sftp_open(sftp, resource->path, flags, perms); -+ handle = libssh2_sftp_open(sftp, SSH2_URL_STR(resource->path), flags, perms); - if (!handle) { - php_error_docref(NULL, E_WARNING, "Unable to open %s on remote host", filename); - php_url_free(resource); -@@ -341,7 +341,7 @@ static php_stream *php_ssh2_sftp_dirstream_opener(php_stream_wrapper *wrapper, c - return NULL; - } - -- handle = libssh2_sftp_opendir(sftp, resource->path); -+ handle = libssh2_sftp_opendir(sftp, SSH2_URL_STR(resource->path)); - if (!handle) { - php_error_docref(NULL, E_WARNING, "Unable to open %s on remote host", filename); - php_url_free(resource); -@@ -386,7 +386,7 @@ static int php_ssh2_sftp_urlstat(php_stream_wrapper *wrapper, const char *url, i - return -1; - } - -- if (libssh2_sftp_stat_ex(sftp, resource->path, strlen(resource->path), -+ if (libssh2_sftp_stat_ex(sftp, SSH2_URL_STR(resource->path), SSH2_URL_LEN(resource->path), - (flags & PHP_STREAM_URL_STAT_LINK) ? LIBSSH2_SFTP_LSTAT : LIBSSH2_SFTP_STAT, &attrs)) { - php_url_free(resource); - //zend_list_delete(sftp_rsrcid); -@@ -420,7 +420,7 @@ static int php_ssh2_sftp_unlink(php_stream_wrapper *wrapper, const char *url, in - return 0; - } - -- result = libssh2_sftp_unlink(sftp, resource->path); -+ result = libssh2_sftp_unlink(sftp, SSH2_URL_STR(resource->path)); - php_url_free(resource); - - //zend_list_delete(sftp_rsrcid); -@@ -462,7 +462,7 @@ static int php_ssh2_sftp_rename(php_stream_wrapper *wrapper, const char *url_fro - return 0; - } - -- result = libssh2_sftp_rename(sftp, resource->path, resource_to->path); -+ result = libssh2_sftp_rename(sftp, SSH2_URL_STR(resource->path), SSH2_URL_STR(resource_to->path)); - php_url_free(resource); - php_url_free(resource_to); - -@@ -493,13 +493,13 @@ static int php_ssh2_sftp_mkdir(php_stream_wrapper *wrapper, const char *url, int - - if (options & PHP_STREAM_MKDIR_RECURSIVE) { - /* Just attempt to make every directory, some will fail, but we only care about the last success/failure */ -- char *p = resource->path; -+ char *p = SSH2_URL_STR(resource->path); - while ((p = strchr(p + 1, '/'))) { -- libssh2_sftp_mkdir_ex(sftp, resource->path, p - resource->path, mode); -+ libssh2_sftp_mkdir_ex(sftp, SSH2_URL_STR(resource->path), p - SSH2_URL_STR(resource->path), mode); - } - } - -- result = libssh2_sftp_mkdir(sftp, resource->path, mode); -+ result = libssh2_sftp_mkdir(sftp, SSH2_URL_STR(resource->path), mode); - php_url_free(resource); - - //zend_list_delete(sftp_rsrcid); -@@ -527,7 +527,7 @@ static int php_ssh2_sftp_rmdir(php_stream_wrapper *wrapper, const char *url, int - return 0; - } - -- result = libssh2_sftp_rmdir(sftp, resource->path); -+ result = libssh2_sftp_rmdir(sftp, SSH2_URL_STR(resource->path)); - php_url_free(resource); - - //zend_list_delete(sftp_rsrcid); -@@ -836,7 +836,7 @@ PHP_FUNCTION(ssh2_sftp_readlink) - } - - if ((targ_len = libssh2_sftp_symlink_ex(data->sftp, link->val, link->len, targ, 8192, LIBSSH2_SFTP_READLINK)) < 0) { -- php_error_docref(NULL, E_WARNING, "Unable to read link '%s'", link); -+ php_error_docref(NULL, E_WARNING, "Unable to read link '%s'", ZSTR_VAL(link)); - RETURN_FALSE; - } - --- -2.1.4 - diff --git a/dev-php/pecl-ssh2/metadata.xml b/dev-php/pecl-ssh2/metadata.xml index aca42932b833..4d08220c3f76 100644 --- a/dev-php/pecl-ssh2/metadata.xml +++ b/dev-php/pecl-ssh2/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> <name>PHP</name> </maintainer> +<upstream> + <remote-id type="github">php/pecl-networking-ssh2</remote-id> +</upstream> </pkgmetadata> diff --git a/dev-php/pecl-ssh2/pecl-ssh2-1.1.2.ebuild b/dev-php/pecl-ssh2/pecl-ssh2-1.1.2.ebuild deleted file mode 100644 index a27f6970b153..000000000000 --- a/dev-php/pecl-ssh2/pecl-ssh2-1.1.2.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -PHP_EXT_NAME="ssh2" - -USE_PHP="php5-6 php7-1 php7-2 php7-3" - -inherit php-ext-pecl-r3 - -USE_PHP="php7-1 php7-2 php7-3" - -DESCRIPTION="PHP bindings for the libssh2 library" -LICENSE="PHP-3.01" -SLOT="7" - -SRC_URI+=" https://dev.gentoo.org/~juippis/distfiles/tmp/pecl-ssh2-1.1.2-fix-php7-port.patch" -KEYWORDS="amd64 x86" -# Upstream notes say there are errors with gcrypt backend -DEPEND=">=net-libs/libssh2-1.2[-gcrypt]" -RDEPEND="${DEPEND} - php_targets_php5-6? ( dev-php/pecl-ssh2:0[php_targets_php5-6] )" - -PATCHES=( - "${FILESDIR}"/${P}-fix-php_url-fields-usage-for-php7-3.patch - "${DISTDIR}"/${P}-fix-php7-port.patch -) - -src_prepare() { - if use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3; then - php-ext-source-r3_src_prepare - else - default_src_prepare - fi -} diff --git a/dev-php/pecl-ssh2/pecl-ssh2-1.2.ebuild b/dev-php/pecl-ssh2/pecl-ssh2-1.2.ebuild deleted file mode 100644 index ffc132c93745..000000000000 --- a/dev-php/pecl-ssh2/pecl-ssh2-1.2.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -PHP_EXT_NAME="ssh2" - -USE_PHP="php5-6 php7-1 php7-2 php7-3 php7-4" - -inherit php-ext-pecl-r3 - -# https://pecl.php.net/get/ssh2-1.2.tgz isn't work for some weeks -SRC_URI="https://dev.gentoo.org/~whissi/dist/${PN}/${P}.tar.gz" - -USE_PHP="php7-1 php7-2 php7-3 php7-4" - -DESCRIPTION="PHP bindings for the libssh2 library" -LICENSE="PHP-3.01" -SLOT="7" -IUSE="" -KEYWORDS="~amd64 ~x86" -# Upstream notes say there are errors with gcrypt backend -DEPEND=">=net-libs/libssh2-1.2[-gcrypt]" -RDEPEND="${DEPEND} - php_targets_php5-6? ( dev-php/pecl-ssh2:0[php_targets_php5-6] )" - -src_prepare() { - if use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3 || use php_targets_php7-4 ; then - php-ext-source-r3_src_prepare - else - default_src_prepare - fi -} diff --git a/dev-php/pecl-ssh2/pecl-ssh2-1.3.1.ebuild b/dev-php/pecl-ssh2/pecl-ssh2-1.3.1-r1.ebuild index 09caa04b19ad..3d39340c1223 100644 --- a/dev-php/pecl-ssh2/pecl-ssh2-1.3.1.ebuild +++ b/dev-php/pecl-ssh2/pecl-ssh2-1.3.1-r1.ebuild @@ -1,21 +1,19 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="7" +EAPI="8" PHP_EXT_NAME="ssh2" -USE_PHP="php7-3 php7-4 php8-0" +USE_PHP="php8-1 php8-2" inherit php-ext-pecl-r3 -USE_PHP="php7-3 php7-4 php8-0" - DESCRIPTION="PHP bindings for the libssh2 library" LICENSE="PHP-3.01" SLOT="7" IUSE="" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" # Upstream notes say there are errors with gcrypt backend DEPEND=">=net-libs/libssh2-1.2[-gcrypt]" RDEPEND="${DEPEND}" diff --git a/dev-php/pecl-ssh2/pecl-ssh2-9999.ebuild b/dev-php/pecl-ssh2/pecl-ssh2-9999.ebuild index 3d6ba5b1e14c..3a5b4f3cb3ba 100644 --- a/dev-php/pecl-ssh2/pecl-ssh2-9999.ebuild +++ b/dev-php/pecl-ssh2/pecl-ssh2-9999.ebuild @@ -1,12 +1,12 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="7" +EAPI="8" PHP_EXT_NAME="ssh2" -USE_PHP="php7-3 php7-4 php8-0" -EGIT_REPO_URI="https://git.php.net/repository/pecl/networking/ssh2.git" +USE_PHP="php8-1 php8-2" +EGIT_REPO_URI="https://github.com/php/pecl-networking-ssh2.git" inherit php-ext-source-r3 git-r3 diff --git a/dev-php/pecl-stomp/Manifest b/dev-php/pecl-stomp/Manifest index 5b21b5de59df..f600cd840773 100644 --- a/dev-php/pecl-stomp/Manifest +++ b/dev-php/pecl-stomp/Manifest @@ -1 +1 @@ -DIST stomp-2.0.2.tgz 23609 BLAKE2B b6ed89b5b8fd0bb501b2337e87107797eedc6ac53c81ba86d2e755cfa2dd716bf4e409cee623430791e0b4854833ef44ed7f6f9e1d89fcd2250d598af0dcaea6 SHA512 577a781b45ef394cd833fb69c808da9b8a8ff69b31b1093c5eef3f7b5d1b37cd0b45c32a03883f56f86213e32bb18aaf0a80010c6bec7efa7239ea48bc57b4b4 +DIST stomp-2.0.3.tgz 23518 BLAKE2B f0253d0e6d1bb51d95007ce2580cb4e5a271547b73705d1ab5be36975cd58068e5fceea64b1451e438fb17601c1b1f513f287b189e3d2922747f735a48e582ef SHA512 e34a63d776cb79da7676d200e4aa2b4a9d4272014fff30eb4c07bc27417d8dc4e7738fb8d62e283cdaac0a411a7bd6e06ef5b06171caa629a404601d14da71d6 diff --git a/dev-php/pecl-stomp/files/pecl-stomp-2.0.2-php8.patch b/dev-php/pecl-stomp/files/pecl-stomp-2.0.2-php8.patch deleted file mode 100644 index 9d38a2d7ff41..000000000000 --- a/dev-php/pecl-stomp/files/pecl-stomp-2.0.2-php8.patch +++ /dev/null @@ -1,369 +0,0 @@ -From 13681a79d9389603d9788802f0a114671a753df1 Mon Sep 17 00:00:00 2001 -From: Remi Collet <remi@remirepo.net> -Date: Fri, 25 Sep 2020 16:06:39 +0200 -Subject: [PATCH] Fix compatibility with PHP 8 - cleanup remaining TSRMLS - macros - fix read/update_property parameters - adapt test suite for exception - in arg. parsing - fix callback - ---- - php_stomp.c | 38 ++++++++++++++++++++-------------- - stomp.c | 6 +++--- - stomp.h | 4 ++-- - tests/003-connect/003.phpt | 2 +- - tests/005-close/001.phpt | 8 +++++-- - tests/007-subscribe/001.phpt | 2 +- - tests/008-unsubscribe/001.phpt | 2 +- - tests/010-timeout/001.phpt | 24 ++++++++++++--------- - tests/010-timeout/002.phpt | 26 ++++++++++++++--------- - 9 files changed, 67 insertions(+), 45 deletions(-) - -diff --git a/php_stomp.c b/php_stomp.c -index 0dcefed..b99a9ff 100644 ---- a/php_stomp.c -+++ b/php_stomp.c -@@ -97,7 +97,7 @@ - zval _object, *object = &_object; \ - THROW_STOMP_EXCEPTION(object, errno, msg) \ - if (details) { \ -- zend_update_property_string(stomp_ce_exception, object, "details", sizeof("details")-1, (char *) details ); \ -+ zend_update_property_string(stomp_ce_exception, OBJ_FOR_PROP(object), "details", sizeof("details")-1, (char *) details ); \ - } \ - } - -@@ -107,6 +107,12 @@ - #define STOMP_URL_STR(a) ZSTR_VAL(a) - #endif - -+#if PHP_VERSION_ID < 80000 -+#define OBJ_FOR_PROP(zv) (zv) -+#else -+#define OBJ_FOR_PROP(zv) Z_OBJ_P(zv) -+#endif -+ - static int le_stomp; - static zend_object_handlers stomp_obj_handlers; - -@@ -564,7 +570,7 @@ PHP_FUNCTION(stomp_connect) - zval excobj; - THROW_STOMP_EXCEPTION(&excobj, stomp->errnum, stomp->error); - if (stomp->error_details) { -- zend_update_property_string(stomp_ce_exception, &excobj, "details", sizeof("details")-1, stomp->error_details ); -+ zend_update_property_string(stomp_ce_exception, OBJ_FOR_PROP(&excobj), "details", sizeof("details")-1, stomp->error_details ); - } - return; - } -@@ -578,7 +584,7 @@ PHP_FUNCTION(stomp_connect) - if ((error_msg = zend_hash_str_find(res->headers, ZEND_STRL("message"))) != NULL) { - THROW_STOMP_EXCEPTION(&excobj, 0, ZSTR_VAL(Z_STR_P(error_msg))); - if (res->body) { -- zend_update_property_string(stomp_ce_exception, &excobj, "details", sizeof("details")-1, (char *) res->body ); -+ zend_update_property_string(stomp_ce_exception, OBJ_FOR_PROP(&excobj), "details", sizeof("details")-1, (char *) res->body ); - } - } - stomp_free_frame(res); -@@ -735,17 +741,17 @@ PHP_FUNCTION(stomp_send) - frame.body_length = Z_STRLEN_P(msg); - } else if (Z_TYPE_P(msg) == IS_OBJECT && instanceof_function(Z_OBJCE_P(msg), stomp_ce_frame )) { - zval *frame_obj_prop = NULL; -- frame_obj_prop = zend_read_property(stomp_ce_frame, msg, "command", sizeof("command")-1, 1, &rv); -+ frame_obj_prop = zend_read_property(stomp_ce_frame, OBJ_FOR_PROP(msg), "command", sizeof("command")-1, 1, &rv); - if (Z_TYPE_P(frame_obj_prop) == IS_STRING) { - frame.command = Z_STRVAL_P(frame_obj_prop); - frame.command_length = Z_STRLEN_P(frame_obj_prop); - } -- frame_obj_prop = zend_read_property(stomp_ce_frame, msg, "body", sizeof("body")-1, 1, &rv); -+ frame_obj_prop = zend_read_property(stomp_ce_frame, OBJ_FOR_PROP(msg), "body", sizeof("body")-1, 1, &rv); - if (Z_TYPE_P(frame_obj_prop) == IS_STRING) { - frame.body = Z_STRVAL_P(frame_obj_prop); - frame.body_length = Z_STRLEN_P(frame_obj_prop); - } -- frame_obj_prop = zend_read_property(stomp_ce_frame, msg, "headers", sizeof("headers")-1, 1, &rv); -+ frame_obj_prop = zend_read_property(stomp_ce_frame, OBJ_FOR_PROP(msg), "headers", sizeof("headers")-1, 1, &rv); - if (Z_TYPE_P(frame_obj_prop) == IS_ARRAY) { - FRAME_HEADER_FROM_HASHTABLE(frame.headers, Z_ARRVAL_P(frame_obj_prop)); - } -@@ -930,7 +936,7 @@ PHP_FUNCTION(stomp_read_frame) - zval excobj; - THROW_STOMP_EXCEPTION(&excobj, 0, Z_STRVAL_P(error_msg)); - if (res->body) { -- zend_update_property_string(stomp_ce_exception, &excobj, ZEND_STRL("details"), (char *)res->body ); -+ zend_update_property_string(stomp_ce_exception, OBJ_FOR_PROP(&excobj), ZEND_STRL("details"), (char *)res->body ); - } - stomp_free_frame(res); - RETURN_FALSE; -@@ -968,10 +974,11 @@ PHP_FUNCTION(stomp_read_frame) - ZVAL_NULL(&body); - } - -+ memset(&fci, 0, sizeof(fci)); -+ memset(&fcc, 0, sizeof(fcc)); - fci.size = sizeof(fci); - #if (PHP_MAJOR_VERSION == 7 && PHP_MINOR_VERSION == 0) - fci.function_table = &ce->function_table; -- fci.symbol_table = NULL; - #endif - /* PARAMS */ - fci.param_count = 3; -@@ -983,8 +990,9 @@ PHP_FUNCTION(stomp_read_frame) - ZVAL_UNDEF(&fci.function_name); - fci.object = Z_OBJ_P(return_value); - fci.retval = &retval; -+#if PHP_VERSION_ID < 80000 - fci.no_separation = 1; -- -+#endif - #if PHP_VERSION_ID < 70300 - fcc.initialized = 1; - #endif -@@ -997,7 +1005,7 @@ PHP_FUNCTION(stomp_read_frame) - fcc.object = Z_OBJ_P(return_value); - - if (zend_call_function(&fci, &fcc ) == FAILURE) { -- zend_throw_exception_ex(zend_exception_get_default(TSRMLS_C), 0 , "Could not execute %s::%s()", ZSTR_VAL(ce->name), ZSTR_VAL(ce->constructor->common.function_name)); -+ zend_throw_exception_ex(zend_exception_get_default(), 0 , "Could not execute %s::%s()", ZSTR_VAL(ce->name), ZSTR_VAL(ce->constructor->common.function_name)); - } else { - zval_ptr_dtor(&retval); - } -@@ -1127,7 +1135,7 @@ static void _php_stomp_acknowledgment(INTERNAL_FUNCTION_PARAMETERS, char *cmd) { - } else if (Z_TYPE_P(msg) == IS_OBJECT && instanceof_function(Z_OBJCE_P(msg), stomp_ce_frame )) { - zval *frame_obj_prop, rv; - -- frame_obj_prop = zend_read_property(stomp_ce_frame, msg, "headers", sizeof("headers")-1, 1, &rv); -+ frame_obj_prop = zend_read_property(stomp_ce_frame, OBJ_FOR_PROP(msg), "headers", sizeof("headers")-1, 1, &rv); - if (Z_TYPE_P(frame_obj_prop) == IS_ARRAY) { - FRAME_HEADER_FROM_HASHTABLE(frame.headers, Z_ARRVAL_P(frame_obj_prop)); - } -@@ -1257,13 +1265,13 @@ PHP_METHOD(stompframe, __construct) - } - - if (command_length > 0) { -- zend_update_property_stringl(stomp_ce_frame, object, "command", sizeof("command")-1, command, command_length ); -+ zend_update_property_stringl(stomp_ce_frame, OBJ_FOR_PROP(object), "command", sizeof("command")-1, command, command_length ); - } - if (headers) { -- zend_update_property(stomp_ce_frame, object, "headers", sizeof("headers")-1, headers ); -+ zend_update_property(stomp_ce_frame, OBJ_FOR_PROP(object), "headers", sizeof("headers")-1, headers ); - } - if (body_length > 0) { -- zend_update_property_stringl(stomp_ce_frame, object, "body", sizeof("body")-1, body, body_length ); -+ zend_update_property_stringl(stomp_ce_frame, OBJ_FOR_PROP(object), "body", sizeof("body")-1, body, body_length ); - } - } - /* }}} */ -@@ -1273,7 +1281,7 @@ PHP_METHOD(stompframe, __construct) - PHP_METHOD(stompexception, getDetails) - { - zval *object = getThis(); -- zval rv, *details = zend_read_property(stomp_ce_exception, object, "details", sizeof("details")-1, 1, &rv); -+ zval rv, *details = zend_read_property(stomp_ce_exception, OBJ_FOR_PROP(object), "details", sizeof("details")-1, 1, &rv); - RETURN_STR(zval_get_string(details)); - } - /* }}} */ -diff --git a/stomp.c b/stomp.c -index d83a4e6..6e77ede 100644 ---- a/stomp.c -+++ b/stomp.c -@@ -36,7 +36,7 @@ extern zend_class_entry *stomp_ce_exception; - - /* {{{ DEBUG */ - #if PHP_DEBUG --static void print_stomp_frame(stomp_frame_t *frame TSRMLS_DC) { -+static void print_stomp_frame(stomp_frame_t *frame) { - php_printf("------ START FRAME ------\n"); - php_printf("%s\n", frame->command); - /* Headers */ -@@ -188,7 +188,7 @@ int stomp_writable(stomp_t *stomp) - - /* {{{ stomp_connect - */ --int stomp_connect(stomp_t *stomp, const char *host, unsigned short port TSRMLS_DC) -+int stomp_connect(stomp_t *stomp, const char *host, unsigned short port) - { - char error[1024]; - socklen_t size; -@@ -299,7 +299,7 @@ void stomp_close(stomp_t *stomp) - - /* {{{ stomp_send - */ --int stomp_send(stomp_t *stomp, stomp_frame_t *frame TSRMLS_DC) -+int stomp_send(stomp_t *stomp, stomp_frame_t *frame) - { - smart_str buf = {0}; - -diff --git a/stomp.h b/stomp.h -index 1a422b7..e4d02b3 100644 ---- a/stomp.h -+++ b/stomp.h -@@ -81,9 +81,9 @@ typedef struct _stomp { - } stomp_t; - - stomp_t *stomp_init(); --int stomp_connect(stomp_t *stomp, const char *host, unsigned short port TSRMLS_DC); -+int stomp_connect(stomp_t *stomp, const char *host, unsigned short port); - void stomp_close(stomp_t *stomp); --int stomp_send(stomp_t *connection, stomp_frame_t *frame TSRMLS_DC); -+int stomp_send(stomp_t *connection, stomp_frame_t *frame); - stomp_frame_t *stomp_read_frame_ex(stomp_t *connection, int use_stack); - int stomp_valid_receipt(stomp_t *connection, stomp_frame_t *frame); - int stomp_select_ex(stomp_t *connection, const long int sec, const long int usec); -diff --git a/tests/003-connect/003.phpt b/tests/003-connect/003.phpt -index b3de8d6..ba60e15 100644 ---- a/tests/003-connect/003.phpt -+++ b/tests/003-connect/003.phpt -@@ -2,7 +2,7 @@ - Test stomp_connect() - Test error on CONNECT - --SKIPIF-- - <?php --include "../skipif.inc" -+include dirname(__DIR__) . "/skipif.inc"; - ?> - --FILE-- - <?php -diff --git a/tests/005-close/001.phpt b/tests/005-close/001.phpt -index 0a23a59..77cc014 100644 ---- a/tests/005-close/001.phpt -+++ b/tests/005-close/001.phpt -@@ -6,7 +6,11 @@ include dirname(__DIR__) . "/skipif.inc"; - ?> - --FILE-- - <?php --stomp_close(null); -+try { -+ stomp_close(null); -+} catch (TypeError $e) { -+ echo $e->getMessage() . PHP_EOL; -+} - ?> - --EXPECTF-- --Warning: stomp_close() expects parameter 1 to be resource, null given in %s on line %d -+%stomp_close()%s1%s null %s -diff --git a/tests/007-subscribe/001.phpt b/tests/007-subscribe/001.phpt -index 8d190dd..494471c 100644 ---- a/tests/007-subscribe/001.phpt -+++ b/tests/007-subscribe/001.phpt -@@ -16,7 +16,7 @@ $s->subscribe('/queue/test', 'string'); - --EXPECTF-- - Warning: Stomp::subscribe(): Destination can not be empty in %s007-subscribe%c001.php on line %d - --Fatal error: Uncaught TypeError: Argument 2 passed to Stomp::subscribe() must be of the type array, string given in %s007-subscribe%c001.php:%d -+Fatal error: Uncaught TypeError: %s, string given in %s007-subscribe%c001.php:%d - Stack trace: - #0 %s001.php(%d): Stomp->subscribe('/queue/test', 'string') - #1 {main} -diff --git a/tests/008-unsubscribe/001.phpt b/tests/008-unsubscribe/001.phpt -index c1200eb..7d1b50f 100644 ---- a/tests/008-unsubscribe/001.phpt -+++ b/tests/008-unsubscribe/001.phpt -@@ -17,7 +17,7 @@ $s->unsubscribe('/queue/test', 'string'); - --EXPECTF-- - Warning: Stomp::unsubscribe(): Destination can not be empty in %s008-unsubscribe%c001.php on line %d - --Fatal error: Uncaught TypeError: Argument 2 passed to Stomp::unsubscribe() must be of the type array, string given in %s008-unsubscribe%c001.php:%d -+Fatal error: Uncaught TypeError: %s2%s string given in %s008-unsubscribe%c001.php:%d - Stack trace: - #0 %s(%d): Stomp->unsubscribe('/queue/test', 'string') - #1 {main} -diff --git a/tests/010-timeout/001.phpt b/tests/010-timeout/001.phpt -index 7389f70..b9886db 100644 ---- a/tests/010-timeout/001.phpt -+++ b/tests/010-timeout/001.phpt -@@ -25,13 +25,21 @@ var_dump($s->setReadTimeout(10, 5)); - // Third test, read supposed to return 10.5 - var_dump($s->getReadTimeout()); - --// Set read timout with the first param as a string, supposed to trigger a warning --var_dump($s->setReadTimeout('')); -+try { -+ // Set read timout with the first param as a string, supposed to trigger a warning/exception -+ var_dump($s->setReadTimeout('')); -+} catch (TypeError $e) { -+ echo $e->getMessage() . PHP_EOL; -+} - // Fourth test, read supposed to get the last value set : 10.5 - var_dump($s->getReadTimeout()); - --// Set read timout with the second param as a string, supposed to trigger a warning --var_dump($s->setReadTimeout(10, '')); -+try { -+ // Set read timout with the second param as a string, supposed to trigger a warning/exception -+ var_dump($s->setReadTimeout(10, '')); -+} catch (TypeError $e) { -+ echo $e->getMessage() . PHP_EOL; -+} - // Fourth test, read supposed to get the last value set : 10.5 - var_dump($s->getReadTimeout()); - -@@ -64,18 +72,14 @@ array(2) { - ["usec"]=> - int(5) - } -- --Warning: Stomp::setReadTimeout() expects parameter 1 to be long, string given in %s on line %d --NULL -+%AStomp::setReadTimeout()%s1%s string given%A - array(2) { - ["sec"]=> - int(10) - ["usec"]=> - int(5) - } -- --Warning: Stomp::setReadTimeout() expects parameter 2 to be long, string given in %s on line %d --NULL -+%AStomp::setReadTimeout()%s2%s string given%A - array(2) { - ["sec"]=> - int(10) -diff --git a/tests/010-timeout/002.phpt b/tests/010-timeout/002.phpt -index a6a9b4a..c22dedf 100644 ---- a/tests/010-timeout/002.phpt -+++ b/tests/010-timeout/002.phpt -@@ -25,13 +25,23 @@ var_dump(stomp_set_read_timeout($link, 10, 5)); - // Third test, read supposed to return 10.5 - var_dump(stomp_get_read_timeout($link)); - --// Set read timout with the first param as a string, supposed to trigger a warning --var_dump(stomp_set_read_timeout($link, '')); -+try { -+ // Set read timout with the first param as a string, supposed to trigger a warning on PHP 7 -+ // supposed to trigger an exception on PHP 8 -+ var_dump(stomp_set_read_timeout($link, '')); -+} catch (TypeError $e) { -+ echo $e->getMessage() . PHP_EOL; -+} - // Fourth test, read supposed to get the last value set : 10.5 - var_dump(stomp_get_read_timeout($link)); - --// Set read timout with the second param as a string, supposed to trigger a warning --var_dump(stomp_set_read_timeout($link, 10, '')); -+try { -+ // Set read timout with the second param as a string, supposed to trigger a warning on PHP 7 -+ // supposed to trigger an exception on PHP 8 -+ var_dump(stomp_set_read_timeout($link, 10, '')); -+} catch (TypeError $e) { -+ echo $e->getMessage() . PHP_EOL; -+} - // Fourth test, read supposed to get the last value set : 10.5 - var_dump(stomp_get_read_timeout($link)); - -@@ -64,18 +74,14 @@ array(2) { - ["usec"]=> - int(5) - } -- --Warning: stomp_set_read_timeout() expects parameter 2 to be long, string given in %s on line %d --NULL -+%Astomp_set_read_timeout()%s2%S string given%A - array(2) { - ["sec"]=> - int(10) - ["usec"]=> - int(5) - } -- --Warning: stomp_set_read_timeout() expects parameter 3 to be long, string given in %s on line %d --NULL -+%Astomp_set_read_timeout()%s3%s string given%A - array(2) { - ["sec"]=> - int(10) diff --git a/dev-php/pecl-stomp/metadata.xml b/dev-php/pecl-stomp/metadata.xml index b86acf66c756..222c77f3742a 100644 --- a/dev-php/pecl-stomp/metadata.xml +++ b/dev-php/pecl-stomp/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> diff --git a/dev-php/pecl-stomp/pecl-stomp-2.0.2-r1.ebuild b/dev-php/pecl-stomp/pecl-stomp-2.0.3.ebuild index 9a975221aa49..06c43c8e2424 100644 --- a/dev-php/pecl-stomp/pecl-stomp-2.0.2-r1.ebuild +++ b/dev-php/pecl-stomp/pecl-stomp-2.0.3.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -USE_PHP="php7-3 php7-4 php8-0" +USE_PHP="php8-1 php8-2" PHP_EXT_NAME="stomp" PHP_EXT_NEEDED_USE="ssl(-)?" DOCS=( CREDITS doc/classes.php doc/functions.php ) @@ -20,8 +20,6 @@ RESTRICT="!test? ( test )" BDEPEND="virtual/pkgconfig" -PATCHES=( "${FILESDIR}/pecl-stomp-2.0.2-php8.patch" ) - src_configure() { local PHP_EXT_ECONF_ARGS=( --enable-stomp diff --git a/dev-php/pecl-taint/Manifest b/dev-php/pecl-taint/Manifest deleted file mode 100644 index cb0caf88fbc7..000000000000 --- a/dev-php/pecl-taint/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST taint-2.1.0.tgz 18613 BLAKE2B a76299140dade9a9a2adf7f873cdbaf762abf9248fa7eb16ed502651ade0bcb3a8ca4fc52d495a809d9360e0650dd34ce57798e864e81587a65791f861dd051a SHA512 26374654b07f6c07de0993c91b331d4b35fa485b3d5d737f27daf401b4db0da3d10f59f7b38e523ab705cc76938c4bbf3aa862389122a9afbba008d912de1a6a diff --git a/dev-php/pecl-taint/metadata.xml b/dev-php/pecl-taint/metadata.xml deleted file mode 100644 index b86acf66c756..000000000000 --- a/dev-php/pecl-taint/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>php-bugs@gentoo.org</email> - <name>PHP</name> - </maintainer> -</pkgmetadata> diff --git a/dev-php/pecl-taint/pecl-taint-2.1.0.ebuild b/dev-php/pecl-taint/pecl-taint-2.1.0.ebuild deleted file mode 100644 index 0719c8b569b5..000000000000 --- a/dev-php/pecl-taint/pecl-taint-2.1.0.ebuild +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -USE_PHP="php7-3 php7-4" -inherit php-ext-pecl-r3 - -DESCRIPTION="Extension used for detecting XSS code (tainted strings)" -LICENSE="PHP-3.01" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -pkg_postinst() { - elog 'To enable this extension, add' - elog ' taint.enable=1' - elog 'to /etc/php/<sapi>-<slot>/ext/taint.ini' -} diff --git a/dev-php/pecl-timezonedb/Manifest b/dev-php/pecl-timezonedb/Manifest index 3d00159f53a5..a887978a23d0 100644 --- a/dev-php/pecl-timezonedb/Manifest +++ b/dev-php/pecl-timezonedb/Manifest @@ -1,2 +1 @@ -DIST timezonedb-2020.4.tgz 414667 BLAKE2B 1a219a090ae33a9f3eef76ab52e2bafd453a1f1161bbeeb53ee995d090f3fdd03c7a658a93ade72e3e1ae61df9d646eaef85dd4cacb5cea45c00adcfac8d6651 SHA512 d5c41c76b4b0b033464a4f086072d061504fc439c910c47a7077a0586b308cc37a4202ff9f418a39cee63534d55136d15a173bb94923160c0fa16bb33ac89a09 -DIST timezonedb-2021.1.tgz 415891 BLAKE2B c473f7d7556cae03263700300c09be75d3a827c4f80eaecd2683f706369d9e1a1a74379eba3fed720a51bba66da13ad330ea50720fe11f98fc5e495b6d406316 SHA512 53c53e061c1173e587b353da630272f2cbf9d223de7a49e6ce654b2c844da7afb641ef4a39ac4b17e0a56e86f23a4f4c448189e8c178e226ec0317f64c60c55a +DIST timezonedb-2021.5.tgz 631371 BLAKE2B fd9312a5a826a0f3ff469277151e68b2fd1dbaecdd345ebfe1c3cc8e847c0a925a8a22b4e7aa2eb9f18b9cd438cdab89ab3f889ad9cd384e13ec42700f6d17b7 SHA512 ac295df0dbc833e1b6d452df2fa0a316cc8df95abf6aaf809a87401256c891b9ba0e663dc300e5a0fdf1c0e3566b9eea580eff12ed4d2bcc4355b13eb5893d9e diff --git a/dev-php/pecl-timezonedb/metadata.xml b/dev-php/pecl-timezonedb/metadata.xml index aed048d4616c..d86c62cbf4bc 100644 --- a/dev-php/pecl-timezonedb/metadata.xml +++ b/dev-php/pecl-timezonedb/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> diff --git a/dev-php/pecl-timezonedb/pecl-timezonedb-2021.1.ebuild b/dev-php/pecl-timezonedb/pecl-timezonedb-2021.1.ebuild deleted file mode 100644 index 6e41e4f16b8a..000000000000 --- a/dev-php/pecl-timezonedb/pecl-timezonedb-2021.1.ebuild +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright 1999-2021 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="php7-2 php7-3 php7-4 php8-0" - -inherit php-ext-pecl-r3 - -DESCRIPTION="Timezone Database to be used with PHP's date and time functions" -LICENSE="PHP-3" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86" -IUSE="" -PHP_EXT_ECONF_ARGS="" diff --git a/dev-php/pecl-timezonedb/pecl-timezonedb-2020.4.ebuild b/dev-php/pecl-timezonedb/pecl-timezonedb-2021.5.ebuild index a390fa7584ed..fefd7d0232d3 100644 --- a/dev-php/pecl-timezonedb/pecl-timezonedb-2020.4.ebuild +++ b/dev-php/pecl-timezonedb/pecl-timezonedb-2021.5.ebuild @@ -1,19 +1,19 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="7" +EAPI="8" PHP_EXT_NAME="timezonedb" PHP_EXT_INI="yes" PHP_EXT_ZENDEXT="no" -USE_PHP="php7-2 php7-3 php7-4 php8-0" +USE_PHP="php8-1" 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" +KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86" IUSE="" PHP_EXT_ECONF_ARGS="" diff --git a/dev-php/pecl-translit/metadata.xml b/dev-php/pecl-translit/metadata.xml index 8b3c2e229aed..15bcddfaca9f 100644 --- a/dev-php/pecl-translit/metadata.xml +++ b/dev-php/pecl-translit/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> diff --git a/dev-php/pecl-translit/pecl-translit-0.7.1.ebuild b/dev-php/pecl-translit/pecl-translit-0.7.1.ebuild index 5c7709ce8eff..f5d7be003087 100644 --- a/dev-php/pecl-translit/pecl-translit-0.7.1.ebuild +++ b/dev-php/pecl-translit/pecl-translit-0.7.1.ebuild @@ -1,14 +1,13 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="7" +EAPI="8" 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" +USE_PHP="php8-1" inherit php-ext-source-r3 diff --git a/dev-php/pecl-uploadprogress/Manifest b/dev-php/pecl-uploadprogress/Manifest index ce8d10d0aef5..b6abb05fe048 100644 --- a/dev-php/pecl-uploadprogress/Manifest +++ b/dev-php/pecl-uploadprogress/Manifest @@ -1 +1 @@ -DIST uploadprogress-1.1.3.tgz 14798 BLAKE2B 5edda3e8672bb0e0829d100284240fcceac26be695386225a18446c742f59edfd906a9ae2f17b594816d3cddea02eb648db01a3352d7f8bd764ad2f6b2e03628 SHA512 2202f419be852a71eadae47eaa83909a032e5a6bbe4ce17ae5d45ea4e9f6d9c9edceb2111630d1f0e277b531d463accf540288ecbcca9bf154fe01754f225686 +DIST uploadprogress-2.0.2.tgz 19969 BLAKE2B 148cac83b00eb6b4f23861a04829280346957cdfc5bdbe94d687d0efb5da97b5f48162c59b07e0830a67350c7a2aa9a3085a4575f07b32016b01845301f04843 SHA512 b9ee5a09c3de78d58abd34da2d25d7b0cad38416309a9a69192f07e0c3fe2259de261bb3dee571e64e042753f861738ebcd67fa7fafeb595ec32ed3034c773cd diff --git a/dev-php/pecl-uploadprogress/files/php-debug-testfix.patch b/dev-php/pecl-uploadprogress/files/php-debug-testfix.patch new file mode 100644 index 000000000000..febc989ab79b --- /dev/null +++ b/dev-php/pecl-uploadprogress/files/php-debug-testfix.patch @@ -0,0 +1,74 @@ +From 57f3c17c684a4e5607a322a24be306eb98d340ac Mon Sep 17 00:00:00 2001 +From: Michael Orlitzky <michael@orlitzky.com> +Date: Mon, 22 May 2023 10:18:29 -0400 +Subject: [PATCH 1/1] tests: skip tests that fail with --enable-debug. + +With PHP debugging enabled, a few tests fail. The root cause of this +is that uploadprogress_get_contents() can return FALSE to indicate +that an error has occurred, but its declared type is string. It +would probably be better if the function raised an error rather +than abusing the return value, but that's a decision upstream +would have to agree too (see: Github issue 17). For now we just +skip the tests if PHP_DEBUG is defined. +--- + tests/uploadprogress_get_contents_error001.phpt | 2 ++ + tests/uploadprogress_get_contents_error003.phpt | 2 ++ + tests/uploadprogress_get_contents_variation002.phpt | 2 ++ + tests/uploadprogress_get_contents_variation006.phpt | 2 ++ + 4 files changed, 8 insertions(+) + +diff --git a/tests/uploadprogress_get_contents_error001.phpt b/tests/uploadprogress_get_contents_error001.phpt +index 63f4f5d..c3e10d9 100644 +--- a/tests/uploadprogress_get_contents_error001.phpt ++++ b/tests/uploadprogress_get_contents_error001.phpt +@@ -5,6 +5,8 @@ uploadprogress_get_contents - Warns when function is disabled + <?php + if (!extension_loaded('uploadprogress')) exit('skip extension not loaded'); + ++if (PHP_DEBUG) exit('skip test throws a fatal error with --enable-debug'); ++ + --INI-- + uploadprogress.get_contents = Off + +diff --git a/tests/uploadprogress_get_contents_error003.phpt b/tests/uploadprogress_get_contents_error003.phpt +index 1ea19b8..65d94c1 100644 +--- a/tests/uploadprogress_get_contents_error003.phpt ++++ b/tests/uploadprogress_get_contents_error003.phpt +@@ -5,6 +5,8 @@ uploadprogress_get_contents - Warns when maxlength is less than zero + <?php + if (!extension_loaded('uploadprogress')) exit('skip extension not loaded'); + ++if (PHP_DEBUG) exit('skip test throws a fatal error with --enable-debug'); ++ + --INI-- + uploadprogress.get_contents = On + +diff --git a/tests/uploadprogress_get_contents_variation002.phpt b/tests/uploadprogress_get_contents_variation002.phpt +index b4bf458..67b1b89 100644 +--- a/tests/uploadprogress_get_contents_variation002.phpt ++++ b/tests/uploadprogress_get_contents_variation002.phpt +@@ -5,6 +5,8 @@ uploadprogress_get_contents - File contents not found + <?php + if (!extension_loaded('uploadprogress')) exit('skip extension not loaded'); + ++if (PHP_DEBUG) exit('skip test throws a fatal error with --enable-debug'); ++ + --INI-- + uploadprogress.get_contents = On + +diff --git a/tests/uploadprogress_get_contents_variation006.phpt b/tests/uploadprogress_get_contents_variation006.phpt +index e19f8d5..ec70c78 100644 +--- a/tests/uploadprogress_get_contents_variation006.phpt ++++ b/tests/uploadprogress_get_contents_variation006.phpt +@@ -5,6 +5,8 @@ uploadprogress_get_contents - When contents file cannot be read + <?php + if (!extension_loaded('uploadprogress')) exit('skip extension not loaded'); + ++if (PHP_DEBUG) exit('skip test throws a fatal error with --enable-debug'); ++ + --INI-- + uploadprogress.get_contents = On + +-- +2.39.3 + diff --git a/dev-php/pecl-uploadprogress/metadata.xml b/dev-php/pecl-uploadprogress/metadata.xml index ce710ecbb07d..f59dc60df813 100644 --- a/dev-php/pecl-uploadprogress/metadata.xml +++ b/dev-php/pecl-uploadprogress/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> @@ -11,8 +11,8 @@ </maintainer> <longdescription lang="en"> An extension to track the progress of a file upload. See - http://svn.php.net/viewvc/pecl/uploadprogress/trunk/examples/ for - an example. It is only known to work on apache with mod_php; other - SAPI implementations unfortunately still have issues. -</longdescription> + https://github.com/php/pecl-php-uploadprogress/tree/master/examples for + examples. It is known to work on apache with mod_php and, beginning with 2.0, + php-fpm with apache and nginx; other servers and SAPIs are not known to work. + </longdescription> </pkgmetadata> diff --git a/dev-php/pecl-uploadprogress/pecl-uploadprogress-1.1.3-r1.ebuild b/dev-php/pecl-uploadprogress/pecl-uploadprogress-1.1.3-r1.ebuild deleted file mode 100644 index dabf3dddf33b..000000000000 --- a/dev-php/pecl-uploadprogress/pecl-uploadprogress-1.1.3-r1.ebuild +++ /dev/null @@ -1,20 +0,0 @@ -# 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 - -DESCRIPTION="An extension to track progress of a file upload" -LICENSE="PHP-3.01" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="examples" - -RDEPEND=" - php_targets_php7-2? ( dev-lang/php:7.2[apache2] ) - php_targets_php7-3? ( dev-lang/php:7.3[apache2] ) - php_targets_php7-4? ( dev-lang/php:7.4[apache2] ) -" diff --git a/dev-php/pecl-uploadprogress/pecl-uploadprogress-2.0.2-r1.ebuild b/dev-php/pecl-uploadprogress/pecl-uploadprogress-2.0.2-r1.ebuild new file mode 100644 index 000000000000..0c9d9f1e1d73 --- /dev/null +++ b/dev-php/pecl-uploadprogress/pecl-uploadprogress-2.0.2-r1.ebuild @@ -0,0 +1,22 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +USE_PHP="php8-1 php8-2" +PHP_EXT_SAPIS="apache2 fpm" + +inherit php-ext-pecl-r3 + +DESCRIPTION="An extension to track progress of a file upload" +LICENSE="PHP-3.01" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="examples" + +PATCHES=( "${FILESDIR}/php-debug-testfix.patch" ) + +RDEPEND=" + php_targets_php8-1? ( || ( dev-lang/php:8.1[apache2(-),fileinfo(-)] dev-lang/php:8.1[fileinfo(-),fpm(-)] ) ) + php_targets_php8-2? ( || ( dev-lang/php:8.2[apache2(-),fileinfo(-)] dev-lang/php:8.2[fileinfo(-),fpm(-)] ) ) +" diff --git a/dev-php/pecl-uuid/metadata.xml b/dev-php/pecl-uuid/metadata.xml index 04d9b1663bd1..dabe2462bc03 100644 --- a/dev-php/pecl-uuid/metadata.xml +++ b/dev-php/pecl-uuid/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> diff --git a/dev-php/pecl-uuid/pecl-uuid-1.2.0.ebuild b/dev-php/pecl-uuid/pecl-uuid-1.2.0.ebuild index 65d0a5fb0ec5..d6ae03766ddd 100644 --- a/dev-php/pecl-uuid/pecl-uuid-1.2.0.ebuild +++ b/dev-php/pecl-uuid/pecl-uuid-1.2.0.ebuild @@ -1,14 +1,14 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="7" +EAPI="8" PHP_EXT_NAME="uuid" PHP_EXT_INIT="yes" PHP_EXT_ZENDEXT="no" DOCS=( CREDITS ) -USE_PHP="php7-2 php7-3 php7-4 php8-0" +USE_PHP="php8-1" inherit php-ext-pecl-r3 diff --git a/dev-php/pecl-xattr/Manifest b/dev-php/pecl-xattr/Manifest new file mode 100644 index 000000000000..f1c89623e8c1 --- /dev/null +++ b/dev-php/pecl-xattr/Manifest @@ -0,0 +1 @@ +DIST pecl-xattr-1.4.0.tgz 8401 BLAKE2B 661611cd638db4807b33b68d549cb85659c1fe092d2f576a72f44a5afd5306e551303f4b55a4ed6354b5fa69c91f98c8a7e0d27eb7700c1aa506bfaa50dbf991 SHA512 b8e0225e07df55f428db7d9c26fa4c7007f7345df72bced162b1910235de52040147c1925658bcd428f6dd76793a874d3db6cd14258cf3f794f3abe5ec07e97d diff --git a/dev-php/pecl-xattr/metadata.xml b/dev-php/pecl-xattr/metadata.xml new file mode 100644 index 000000000000..6aebbc46f559 --- /dev/null +++ b/dev-php/pecl-xattr/metadata.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person" proxied="yes"> + <email>jaco@uls.co.za</email> + <name>Jaco Kroon</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> +</pkgmetadata> diff --git a/dev-php/pecl-xattr/pecl-xattr-1.4.0.ebuild b/dev-php/pecl-xattr/pecl-xattr-1.4.0.ebuild new file mode 100644 index 000000000000..b00b7733ae29 --- /dev/null +++ b/dev-php/pecl-xattr/pecl-xattr-1.4.0.ebuild @@ -0,0 +1,19 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="8" + +PHP_EXT_INI="yes" +PHP_EXT_NAME="xattr" +PHP_EXT_NEEDED_USE="" +PHP_EXT_ZENDEXT="no" +USE_PHP="php8-1 php8-2" + +inherit php-ext-pecl-r3 + +DESCRIPTION="Extended attributes for PHP" +SRC_URI="${SRC_URI} -> ${P}.tgz" + +LICENSE="PHP-3.01" +SLOT="8" +KEYWORDS="~amd64 ~x86" diff --git a/dev-php/pecl-xdiff/Manifest b/dev-php/pecl-xdiff/Manifest index af60abb030a5..a837ca98d247 100644 --- a/dev-php/pecl-xdiff/Manifest +++ b/dev-php/pecl-xdiff/Manifest @@ -1 +1 @@ -DIST xdiff-2.0.1.tgz 10418 BLAKE2B d80afd629db788343e5804925fb8a9971cb0df2db6462be5adcace7e15e9b7fb2bf52cbb49f900878659fcf5e91c69b721c01e01f04876e8245ecc8094f0be61 SHA512 43f2bddac82ac19ac688ae7dad3fef65b0d8887c0e6adefd1fc15236582c31d78a54538903760270dee294ca8b8ba3def48bfa9b1d44160bcc450f5c6516402a +DIST xdiff-2.1.1.tgz 25842 BLAKE2B 5699ceebc47ab05b24443bf5379ea485dbad459de933661ca1d8d77a3ca5aa31ffde8c79f165fcc3bdb52ed1c3800abafd824ea80bfd0c3cebf59e3b33cf0043 SHA512 80a845bd93d0083d95954be3b81a1b52a3f7d61ec10191af8fc9a46fea91559be97034aabbc51631ce0a9fc9a8ef894f3b4f347b5e917f1e15ffca2a3804c218 diff --git a/dev-php/pecl-xdiff/files/2.1.0_pre-php8-2.patch b/dev-php/pecl-xdiff/files/2.1.0_pre-php8-2.patch deleted file mode 100644 index 80bebf7dfddd..000000000000 --- a/dev-php/pecl-xdiff/files/2.1.0_pre-php8-2.patch +++ /dev/null @@ -1,214 +0,0 @@ -From 2afb71ae1d6bcebe66f2e52019222a117c607f66 Mon Sep 17 00:00:00 2001 -From: Rasmus Lerdorf <rasmus@lerdorf.com> -Date: Thu, 14 Jan 2021 08:23:43 -0800 -Subject: [PATCH] Version 2.1.0 PHP 8 support Drop PHP 5 support - -diff --git a/xdiff.stub.php b/xdiff.stub.php -new file mode 100644 -index 0000000..4597e7f ---- /dev/null -+++ b/xdiff.stub.php -@@ -0,0 +1,84 @@ -+<?php -+/** @generate-function-entries */ -+ -+/** -+ * @param string $str1 -+ * @param string $str2 -+ * @param int $context -+ * @param bool $minimal -+ * @return string|false -+ */ -+function xdiff_string_diff(string $str1, string $str2, int $context = 3, bool $minimal = false) {} -+ -+function xdiff_file_diff(string $file1, string $file2, string $dest, int $context = 3, bool $minimal = false): bool {} -+ -+/** -+ * @param string $str1 -+ * @param string $str2 -+ * @return string|false -+ * @alias xdiff_string_bdiff -+ */ -+function xdiff_string_diff_binary(string $str1, string $str2) {} -+ -+/** @alias xdiff_file_bdiff */ -+function xdiff_file_diff_binary(string $file1, string $file2, string $dest): bool {} -+ -+/** -+ * @param string $str1 -+ * @param string $str2 -+ * @return string|false -+ */ -+function xdiff_string_rabdiff(string $str1, string $str2) {} -+ -+function xdiff_file_rabdiff(string $file1, string $file2, string $dest): bool {} -+ -+function xdiff_file_bdiff_size(string $file1, string $file2, string $dest): bool {} -+ -+function xdiff_string_bdiff_size(string $file1, string $file2, string $dest): bool {} -+ -+/** -+ * @param string $file -+ * @param string $patch -+ * @param string $dest -+ * @param int $flags -+ * @return string|bool -+ */ -+function xdiff_file_patch(string $file, string $patch, string $dest, int $flags=XDIFF_PATCH_NORMAL) {} -+ -+/** -+ * @param string $file -+ * @param string $patch -+ * @param int $flags -+ * @param string $error -+ * @return string|bool -+ */ -+function xdiff_string_patch(string $file, string $patch, int $flags=XDIFF_PATCH_NORMAL, string &$error=null) {} -+ -+/** @alias xdiff_file_bpatch */ -+function xdiff_file_patch_binary(string $file, string $patch, string $dest): bool {} -+ -+/** -+ * @param string $file -+ * @param string $patch -+ * @return string|false -+ * @alias xdiff_string_bpatch -+ */ -+function xdiff_string_patch_binary(string $str, string $patch) {} -+ -+/** -+ * @param string $file1 -+ * @param string $file2 -+ * @param string $file3 -+ * @param string $dest -+ * @return string|bool -+ */ -+function xdiff_file_merge3(string $file1, string $file2, string $file3, string $dest) {} -+ -+/** -+ * @param string $str1 -+ * @param string $str2 -+ * @param string $str3 -+ * @param string $error -+ * @return string|bool -+ */ -+function xdiff_string_merge3(string $str1, string $str2, string $str3, string &$error=null) {} -diff --git a/xdiff_arginfo.h b/xdiff_arginfo.h -new file mode 100644 -index 0000000..2016f7e ---- /dev/null -+++ b/xdiff_arginfo.h -@@ -0,0 +1,110 @@ -+/* This is a generated file, edit the .stub.php file instead. -+ * Stub hash: ec3a63aa4462f084433c3576ad532de87da7f867 */ -+ -+ZEND_BEGIN_ARG_INFO_EX(arginfo_xdiff_string_diff, 0, 0, 2) -+ ZEND_ARG_TYPE_INFO(0, str1, IS_STRING, 0) -+ ZEND_ARG_TYPE_INFO(0, str2, IS_STRING, 0) -+ ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, context, IS_LONG, 0, "3") -+ ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, minimal, _IS_BOOL, 0, "false") -+ZEND_END_ARG_INFO() -+ -+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_xdiff_file_diff, 0, 3, _IS_BOOL, 0) -+ ZEND_ARG_TYPE_INFO(0, file1, IS_STRING, 0) -+ ZEND_ARG_TYPE_INFO(0, file2, IS_STRING, 0) -+ ZEND_ARG_TYPE_INFO(0, dest, IS_STRING, 0) -+ ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, context, IS_LONG, 0, "3") -+ ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, minimal, _IS_BOOL, 0, "false") -+ZEND_END_ARG_INFO() -+ -+ZEND_BEGIN_ARG_INFO_EX(arginfo_xdiff_string_diff_binary, 0, 0, 2) -+ ZEND_ARG_TYPE_INFO(0, str1, IS_STRING, 0) -+ ZEND_ARG_TYPE_INFO(0, str2, IS_STRING, 0) -+ZEND_END_ARG_INFO() -+ -+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_xdiff_file_diff_binary, 0, 3, _IS_BOOL, 0) -+ ZEND_ARG_TYPE_INFO(0, file1, IS_STRING, 0) -+ ZEND_ARG_TYPE_INFO(0, file2, IS_STRING, 0) -+ ZEND_ARG_TYPE_INFO(0, dest, IS_STRING, 0) -+ZEND_END_ARG_INFO() -+ -+#define arginfo_xdiff_string_rabdiff arginfo_xdiff_string_diff_binary -+ -+#define arginfo_xdiff_file_rabdiff arginfo_xdiff_file_diff_binary -+ -+#define arginfo_xdiff_file_bdiff_size arginfo_xdiff_file_diff_binary -+ -+#define arginfo_xdiff_string_bdiff_size arginfo_xdiff_file_diff_binary -+ -+ZEND_BEGIN_ARG_INFO_EX(arginfo_xdiff_file_patch, 0, 0, 3) -+ ZEND_ARG_TYPE_INFO(0, file, IS_STRING, 0) -+ ZEND_ARG_TYPE_INFO(0, patch, IS_STRING, 0) -+ ZEND_ARG_TYPE_INFO(0, dest, IS_STRING, 0) -+ ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, flags, IS_LONG, 0, "XDIFF_PATCH_NORMAL") -+ZEND_END_ARG_INFO() -+ -+ZEND_BEGIN_ARG_INFO_EX(arginfo_xdiff_string_patch, 0, 0, 2) -+ ZEND_ARG_TYPE_INFO(0, file, IS_STRING, 0) -+ ZEND_ARG_TYPE_INFO(0, patch, IS_STRING, 0) -+ ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, flags, IS_LONG, 0, "XDIFF_PATCH_NORMAL") -+ ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(1, error, IS_STRING, 0, "null") -+ZEND_END_ARG_INFO() -+ -+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_xdiff_file_patch_binary, 0, 3, _IS_BOOL, 0) -+ ZEND_ARG_TYPE_INFO(0, file, IS_STRING, 0) -+ ZEND_ARG_TYPE_INFO(0, patch, IS_STRING, 0) -+ ZEND_ARG_TYPE_INFO(0, dest, IS_STRING, 0) -+ZEND_END_ARG_INFO() -+ -+ZEND_BEGIN_ARG_INFO_EX(arginfo_xdiff_string_patch_binary, 0, 0, 2) -+ ZEND_ARG_TYPE_INFO(0, str, IS_STRING, 0) -+ ZEND_ARG_TYPE_INFO(0, patch, IS_STRING, 0) -+ZEND_END_ARG_INFO() -+ -+ZEND_BEGIN_ARG_INFO_EX(arginfo_xdiff_file_merge3, 0, 0, 4) -+ ZEND_ARG_TYPE_INFO(0, file1, IS_STRING, 0) -+ ZEND_ARG_TYPE_INFO(0, file2, IS_STRING, 0) -+ ZEND_ARG_TYPE_INFO(0, file3, IS_STRING, 0) -+ ZEND_ARG_TYPE_INFO(0, dest, IS_STRING, 0) -+ZEND_END_ARG_INFO() -+ -+ZEND_BEGIN_ARG_INFO_EX(arginfo_xdiff_string_merge3, 0, 0, 3) -+ ZEND_ARG_TYPE_INFO(0, str1, IS_STRING, 0) -+ ZEND_ARG_TYPE_INFO(0, str2, IS_STRING, 0) -+ ZEND_ARG_TYPE_INFO(0, str3, IS_STRING, 0) -+ ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(1, error, IS_STRING, 0, "null") -+ZEND_END_ARG_INFO() -+ -+ -+ZEND_FUNCTION(xdiff_string_diff); -+ZEND_FUNCTION(xdiff_file_diff); -+ZEND_FUNCTION(xdiff_string_bdiff); -+ZEND_FUNCTION(xdiff_file_bdiff); -+ZEND_FUNCTION(xdiff_string_rabdiff); -+ZEND_FUNCTION(xdiff_file_rabdiff); -+ZEND_FUNCTION(xdiff_file_bdiff_size); -+ZEND_FUNCTION(xdiff_string_bdiff_size); -+ZEND_FUNCTION(xdiff_file_patch); -+ZEND_FUNCTION(xdiff_string_patch); -+ZEND_FUNCTION(xdiff_file_bpatch); -+ZEND_FUNCTION(xdiff_string_bpatch); -+ZEND_FUNCTION(xdiff_file_merge3); -+ZEND_FUNCTION(xdiff_string_merge3); -+ -+ -+static const zend_function_entry ext_functions[] = { -+ ZEND_FE(xdiff_string_diff, arginfo_xdiff_string_diff) -+ ZEND_FE(xdiff_file_diff, arginfo_xdiff_file_diff) -+ ZEND_FALIAS(xdiff_string_diff_binary, xdiff_string_bdiff, arginfo_xdiff_string_diff_binary) -+ ZEND_FALIAS(xdiff_file_diff_binary, xdiff_file_bdiff, arginfo_xdiff_file_diff_binary) -+ ZEND_FE(xdiff_string_rabdiff, arginfo_xdiff_string_rabdiff) -+ ZEND_FE(xdiff_file_rabdiff, arginfo_xdiff_file_rabdiff) -+ ZEND_FE(xdiff_file_bdiff_size, arginfo_xdiff_file_bdiff_size) -+ ZEND_FE(xdiff_string_bdiff_size, arginfo_xdiff_string_bdiff_size) -+ ZEND_FE(xdiff_file_patch, arginfo_xdiff_file_patch) -+ ZEND_FE(xdiff_string_patch, arginfo_xdiff_string_patch) -+ ZEND_FALIAS(xdiff_file_patch_binary, xdiff_file_bpatch, arginfo_xdiff_file_patch_binary) -+ ZEND_FALIAS(xdiff_string_patch_binary, xdiff_string_bpatch, arginfo_xdiff_string_patch_binary) -+ ZEND_FE(xdiff_file_merge3, arginfo_xdiff_file_merge3) -+ ZEND_FE(xdiff_string_merge3, arginfo_xdiff_string_merge3) -+ ZEND_FE_END -+}; --- -2.11.0 - diff --git a/dev-php/pecl-xdiff/files/2.1.0_pre-php8-3.patch b/dev-php/pecl-xdiff/files/2.1.0_pre-php8-3.patch deleted file mode 100644 index e41155467973..000000000000 --- a/dev-php/pecl-xdiff/files/2.1.0_pre-php8-3.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 5458ecb8ce81e921239af1a76d6acb54cf945863 Mon Sep 17 00:00:00 2001 -From: Rasmus Lerdorf <rasmus@lerdorf.com> -Date: Thu, 14 Jan 2021 15:23:43 -0800 -Subject: [PATCH] Don't need these here - ---- - php_xdiff.h | 16 ---------------- - 1 file changed, 16 deletions(-) - -diff --git a/php_xdiff.h b/php_xdiff.h -index de882fa..1b9a699 100644 ---- a/php_xdiff.h -+++ b/php_xdiff.h -@@ -39,22 +39,6 @@ extern zend_module_entry xdiff_module_entry; - PHP_MINIT_FUNCTION(xdiff); - PHP_MINFO_FUNCTION(xdiff); - --PHP_FUNCTION(xdiff_file_diff); --PHP_FUNCTION(xdiff_file_bdiff); --PHP_FUNCTION(xdiff_file_patch); --PHP_FUNCTION(xdiff_file_bpatch); --PHP_FUNCTION(xdiff_file_merge3); --PHP_FUNCTION(xdiff_file_rabdiff); --PHP_FUNCTION(xdiff_file_bdiff_size); -- --PHP_FUNCTION(xdiff_string_diff); --PHP_FUNCTION(xdiff_string_bdiff); --PHP_FUNCTION(xdiff_string_patch); --PHP_FUNCTION(xdiff_string_bpatch); --PHP_FUNCTION(xdiff_string_merge3); --PHP_FUNCTION(xdiff_string_rabdiff); --PHP_FUNCTION(xdiff_string_bdiff_size); -- - #endif /* PHP_XDIFF_H */ - - --- -2.11.0 - diff --git a/dev-php/pecl-xdiff/files/2.1.0_pre-php8.patch b/dev-php/pecl-xdiff/files/2.1.0_pre-php8.patch deleted file mode 100644 index 8a8f3ab43299..000000000000 --- a/dev-php/pecl-xdiff/files/2.1.0_pre-php8.patch +++ /dev/null @@ -1,467 +0,0 @@ -From 2afb71ae1d6bcebe66f2e52019222a117c607f66 Mon Sep 17 00:00:00 2001 -From: Rasmus Lerdorf <rasmus@lerdorf.com> -Date: Thu, 14 Jan 2021 08:23:43 -0800 -Subject: [PATCH] Version 2.1.0 PHP 8 support Drop PHP 5 support - -diff --git a/php_xdiff.h b/php_xdiff.h -index c79ad63..de882fa 100644 ---- a/php_xdiff.h -+++ b/php_xdiff.h -@@ -24,7 +24,7 @@ - extern zend_module_entry xdiff_module_entry; - #define phpext_xdiff_ptr &xdiff_module_entry - --#define PHP_XDIFF_VERSION "2.0.1" -+#define PHP_XDIFF_VERSION "2.1.0" - - #ifdef PHP_WIN32 - #define PHP_XDIFF_API __declspec(dllexport) -diff --git a/xdiff.c b/xdiff.c -index 0756c5a..f4c09f2 100644 ---- a/xdiff.c -+++ b/xdiff.c -@@ -27,6 +27,29 @@ - #include "ext/standard/info.h" - #include "php_xdiff.h" - -+#ifndef ZEND_ARG_INFO_WITH_DEFAULT_VALUE -+#define ZEND_ARG_INFO_WITH_DEFAULT_VALUE(pass_by_ref, name, default_value) \ -+ ZEND_ARG_INFO(pass_by_ref, name) -+#endif -+#if PHP_VERSION_ID < 70200 -+#undef ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX -+#define ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(name, return_reference, required_num_args, class_name, allow_null) \ -+ static const zend_internal_arg_info name[] = { \ -+ { (const char*)(zend_uintptr_t)(required_num_args), ( #class_name ), 0, return_reference, allow_null, 0 }, -+#endif -+ -+#ifndef ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX -+#define ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(name, return_reference, required_num_args, class_name, allow_null) \ -+ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(name, return_reference, required_num_args, class_name, allow_null) -+#endif -+ -+#ifndef ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE -+#define ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(pass_by_ref, name, type_hint, allow_null, default_value) \ -+ ZEND_ARG_TYPE_INFO(pass_by_ref, name, type_hint, allow_null) -+#endif -+ -+#include "xdiff_arginfo.h" -+ - #include <xdiff.h> - - /* Not exported by header file */ -@@ -37,14 +60,7 @@ struct string_buffer { - unsigned long size; - }; - -- ZEND_BEGIN_ARG_INFO(xdiff_arg_force_ref, 0) -- ZEND_ARG_PASS_INFO(0) -- ZEND_ARG_PASS_INFO(0) -- ZEND_ARG_PASS_INFO(0) -- ZEND_ARG_PASS_INFO(1) -- ZEND_END_ARG_INFO() -- --static int load_mm_file(const char *filepath, mmfile_t *dest TSRMLS_DC); -+static int load_mm_file(const char *filepath, mmfile_t *dest); - static int load_into_mm_file(const char *buffer, unsigned long size, mmfile_t *dest); - static int append_string(void *ptr, mmbuffer_t *buffer, int array_size); - static int append_stream(void *ptr, mmbuffer_t *buffer, int array_size); -@@ -52,17 +68,17 @@ static int init_string(struct string_buffer *string); - static void free_string(struct string_buffer *string); - static void invalidate_string(struct string_buffer *string); - --static int make_diff(char *filepath1, char *filepath2, xdemitcb_t *output, int context, int minimal TSRMLS_DC); -+static int make_diff(char *filepath1, char *filepath2, xdemitcb_t *output, int context, int minimal); - static int make_diff_str(char *str1, int size1, char *str2, int size2, xdemitcb_t *output, int context, int minimal); --static int make_bdiff(char *filepath1, char *filepath2, xdemitcb_t *output TSRMLS_DC); -+static int make_bdiff(char *filepath1, char *filepath2, xdemitcb_t *output); - static int make_bdiff_str(char *str1, int size1, char *str2, int size2, xdemitcb_t *output); --static int make_patch(char *file_path, char *patch_path, xdemitcb_t *output, xdemitcb_t *error, int flags TSRMLS_DC); -+static int make_patch(char *file_path, char *patch_path, xdemitcb_t *output, xdemitcb_t *error, int flags); - static int make_patch_str(char *file, int size1, char *patch, int size2, xdemitcb_t *output, xdemitcb_t *error, int flags); --static int make_bpatch(char *file_path, char *patch_path, xdemitcb_t *output TSRMLS_DC); -+static int make_bpatch(char *file_path, char *patch_path, xdemitcb_t *output); - static int make_bpatch_str(char *file, int size1, char *patch, int size2, xdemitcb_t *output); --static int make_merge3(char *filepath1, char *filepath2, char *filepath3, xdemitcb_t *output, xdemitcb_t *error TSRMLS_DC); -+static int make_merge3(char *filepath1, char *filepath2, char *filepath3, xdemitcb_t *output, xdemitcb_t *error); - static int make_merge3_str(char *content1, int size1, char *content2, int size2, char *content3, int size3, xdemitcb_t *output, xdemitcb_t *error); --static int make_rabdiff(char *filepath1, char *filepath2, xdemitcb_t *output TSRMLS_DC); -+static int make_rabdiff(char *filepath1, char *filepath2, xdemitcb_t *output); - static int make_rabdiff_str(char *str1, int size1, char *str2, int size2, xdemitcb_t *output); - - static void *xdiff_malloc(void *foo, unsigned int size) -@@ -84,33 +100,6 @@ static void *xdiff_realloc(void *foo, void *ptr, unsigned int nsize) - - static memallocator_t allocator = { NULL, xdiff_malloc, xdiff_free, xdiff_realloc }; - --/* {{{ xdiff_functions[] -- * -- * Every user visible function must have an entry in xdiff_functions[]. -- */ --zend_function_entry xdiff_functions[] = { -- PHP_FE(xdiff_file_diff, NULL) -- PHP_FE(xdiff_file_bdiff, NULL) -- PHP_FE(xdiff_file_patch, NULL) -- PHP_FE(xdiff_file_bpatch, NULL) -- PHP_FE(xdiff_file_merge3, NULL) -- PHP_FE(xdiff_file_rabdiff, NULL) -- PHP_FE(xdiff_file_bdiff_size, NULL) -- PHP_FE(xdiff_string_diff, NULL) -- PHP_FE(xdiff_string_bdiff, NULL) -- PHP_FE(xdiff_string_patch, xdiff_arg_force_ref) -- PHP_FE(xdiff_string_bpatch, NULL) -- PHP_FE(xdiff_string_merge3, xdiff_arg_force_ref) -- PHP_FE(xdiff_string_rabdiff, NULL) -- PHP_FE(xdiff_string_bdiff_size, NULL) -- PHP_FALIAS(xdiff_file_diff_binary, xdiff_file_bdiff, NULL) -- PHP_FALIAS(xdiff_file_patch_binary, xdiff_file_bpatch, NULL) -- PHP_FALIAS(xdiff_string_diff_binary, xdiff_string_bdiff, NULL) -- PHP_FALIAS(xdiff_string_patch_binary, xdiff_string_bpatch, NULL) -- {NULL, NULL, NULL} --}; --/* }}} */ -- - /* {{{ xdiff_module_entry - */ - zend_module_entry xdiff_module_entry = { -@@ -118,7 +107,7 @@ zend_module_entry xdiff_module_entry = { - STANDARD_MODULE_HEADER, - #endif - "xdiff", -- xdiff_functions, -+ ext_functions, - PHP_MINIT(xdiff), - NULL, - NULL, -@@ -172,7 +161,7 @@ PHP_FUNCTION(xdiff_string_diff) - xdemitcb_t output; - struct string_buffer string; - -- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "SS|lb", &str1, &str2, &context, &minimal) == FAILURE) { -+ if (zend_parse_parameters(ZEND_NUM_ARGS(), "SS|lb", &str1, &str2, &context, &minimal) == FAILURE) { - RETURN_FALSE; - } - -@@ -204,7 +193,7 @@ PHP_FUNCTION(xdiff_file_diff) - xdemitcb_t output; - php_stream *output_stream; - -- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "SSS|lb", &filepath1, &filepath2, &dest, &context, &minimal) == FAILURE) { -+ if (zend_parse_parameters(ZEND_NUM_ARGS(), "SSS|lb", &filepath1, &filepath2, &dest, &context, &minimal) == FAILURE) { - RETURN_FALSE; - } - -@@ -217,7 +206,7 @@ PHP_FUNCTION(xdiff_file_diff) - output.priv = output_stream; - output.outf = append_stream; - -- retval = make_diff(filepath1->val, filepath2->val, &output, context, minimal TSRMLS_CC); -+ retval = make_diff(filepath1->val, filepath2->val, &output, context, minimal); - if (!retval) - goto out_stream_close; - -@@ -239,7 +228,7 @@ PHP_FUNCTION(xdiff_string_bdiff) - xdemitcb_t output; - struct string_buffer string; - -- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "SS", &str1, &str2) == FAILURE) { -+ if (zend_parse_parameters(ZEND_NUM_ARGS(), "SS", &str1, &str2) == FAILURE) { - RETURN_FALSE; - } - -@@ -270,7 +259,7 @@ PHP_FUNCTION(xdiff_file_bdiff) - xdemitcb_t output; - php_stream *output_stream; - -- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "SSS", &filepath1, &filepath2, &result) == FAILURE) { -+ if (zend_parse_parameters(ZEND_NUM_ARGS(), "SSS", &filepath1, &filepath2, &result) == FAILURE) { - RETURN_FALSE; - } - -@@ -283,7 +272,7 @@ PHP_FUNCTION(xdiff_file_bdiff) - output.priv = output_stream; - output.outf = append_stream; - -- retval = make_bdiff(filepath1->val, filepath2->val, &output TSRMLS_CC); -+ retval = make_bdiff(filepath1->val, filepath2->val, &output); - if (!retval) - goto out_stream_close; - -@@ -305,7 +294,7 @@ PHP_FUNCTION(xdiff_string_rabdiff) - xdemitcb_t output; - struct string_buffer string; - -- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "SS", &str1, &str2) == FAILURE) { -+ if (zend_parse_parameters(ZEND_NUM_ARGS(), "SS", &str1, &str2) == FAILURE) { - RETURN_FALSE; - } - -@@ -336,7 +325,7 @@ PHP_FUNCTION(xdiff_file_rabdiff) - xdemitcb_t output; - php_stream *output_stream; - -- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "SSS", &filepath1, &filepath2, &result) == FAILURE) { -+ if (zend_parse_parameters(ZEND_NUM_ARGS(), "SSS", &filepath1, &filepath2, &result) == FAILURE) { - RETURN_FALSE; - } - -@@ -349,7 +338,7 @@ PHP_FUNCTION(xdiff_file_rabdiff) - output.priv = output_stream; - output.outf = append_stream; - -- retval = make_rabdiff(filepath1->val, filepath2->val, &output TSRMLS_CC); -+ retval = make_rabdiff(filepath1->val, filepath2->val, &output); - if (!retval) - goto out_stream_close; - -@@ -371,13 +360,13 @@ PHP_FUNCTION(xdiff_file_bdiff_size) - long result; - mmfile_t file; - -- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "S", &filepath) == FAILURE) { -+ if (zend_parse_parameters(ZEND_NUM_ARGS(), "S", &filepath) == FAILURE) { - RETURN_FALSE; - } - - RETVAL_FALSE; - -- retval = load_mm_file(filepath->val, &file TSRMLS_CC); -+ retval = load_mm_file(filepath->val, &file); - if (!retval) - goto out; - -@@ -403,7 +392,7 @@ PHP_FUNCTION(xdiff_string_bdiff_size) - long result; - mmfile_t file; - -- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "S", &patch) == FAILURE) { -+ if (zend_parse_parameters(ZEND_NUM_ARGS(), "S", &patch) == FAILURE) { - RETURN_FALSE; - } - -@@ -437,7 +426,7 @@ PHP_FUNCTION(xdiff_file_patch) - xdemitcb_t output, error_output; - struct string_buffer error_string; - -- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "SSS|l", &src_path, &patch_path, &dest_path, &flags) == FAILURE) { -+ if (zend_parse_parameters(ZEND_NUM_ARGS(), "SSS|l", &src_path, &patch_path, &dest_path, &flags) == FAILURE) { - RETURN_FALSE; - } - -@@ -457,7 +446,7 @@ PHP_FUNCTION(xdiff_file_patch) - error_output.priv= &error_string; - error_output.outf = append_string; - -- retval = make_patch(src_path->val, patch_path->val, &output, &error_output, flags TSRMLS_CC); -+ retval = make_patch(src_path->val, patch_path->val, &output, &error_output, flags); - if (retval < 0) - goto out_free_string; - -@@ -487,7 +476,7 @@ PHP_FUNCTION(xdiff_string_patch) - xdemitcb_t output, error_output; - struct string_buffer output_string, error_string; - -- if (zend_parse_parameters_ex(0, ZEND_NUM_ARGS() TSRMLS_CC, "SS|lz", &src, &patch, &flags, &error_ref) == FAILURE) { -+ if (zend_parse_parameters_ex(0, ZEND_NUM_ARGS(), "SS|lz", &src, &patch, &flags, &error_ref) == FAILURE) { - RETURN_FALSE; - } - -@@ -539,7 +528,7 @@ PHP_FUNCTION(xdiff_file_bpatch) - int retval; - xdemitcb_t output; - -- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "SSS", &src_path, &patch_path, &dest_path) == FAILURE) { -+ if (zend_parse_parameters(ZEND_NUM_ARGS(), "SSS", &src_path, &patch_path, &dest_path) == FAILURE) { - RETURN_FALSE; - } - -@@ -552,7 +541,7 @@ PHP_FUNCTION(xdiff_file_bpatch) - output.outf = append_stream; - output.priv = output_stream; - -- retval = make_bpatch(src_path->val, patch_path->val, &output TSRMLS_CC); -+ retval = make_bpatch(src_path->val, patch_path->val, &output); - php_stream_close(output_stream); - - if (retval == 0) -@@ -572,7 +561,7 @@ PHP_FUNCTION(xdiff_string_bpatch) - xdemitcb_t output; - struct string_buffer output_string; - -- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "SS", &src, &patch) == FAILURE) { -+ if (zend_parse_parameters(ZEND_NUM_ARGS(), "SS", &src, &patch) == FAILURE) { - RETURN_FALSE; - } - -@@ -608,7 +597,7 @@ PHP_FUNCTION(xdiff_file_merge3) - xdemitcb_t output, error_output; - int retval; - -- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "SSSS", &file1, &file2, &file3, &dest) == FAILURE) { -+ if (zend_parse_parameters(ZEND_NUM_ARGS(), "SSSS", &file1, &file2, &file3, &dest) == FAILURE) { - RETURN_FALSE; - } - -@@ -628,7 +617,7 @@ PHP_FUNCTION(xdiff_file_merge3) - error_output.priv = &string; - error_output.outf = append_string; - -- retval = make_merge3(file1->val, file2->val, file3->val, &output, &error_output TSRMLS_CC); -+ retval = make_merge3(file1->val, file2->val, file3->val, &output, &error_output); - if (!retval) - goto out_free_string; - -@@ -657,7 +646,7 @@ PHP_FUNCTION(xdiff_string_merge3) - xdemitcb_t output, error_output; - int retval; - -- if (zend_parse_parameters_ex(0, ZEND_NUM_ARGS() TSRMLS_CC, "SSS|z", &file1, &file2, &file3, &error_ref) == FAILURE) { -+ if (zend_parse_parameters_ex(0, ZEND_NUM_ARGS(), "SSS|z", &file1, &file2, &file3, &error_ref) == FAILURE) { - RETURN_FALSE; - } - -@@ -700,7 +689,7 @@ out: - } - /* }}} */ - --static int load_mm_file(const char *filepath, mmfile_t *dest TSRMLS_DC) -+static int load_mm_file(const char *filepath, mmfile_t *dest) - { - int retval; - off_t filesize; -@@ -789,7 +778,6 @@ static int append_stream(void *ptr, mmbuffer_t *buffer, int array_size) - { - php_stream *stream = ptr; - unsigned int i; -- TSRMLS_FETCH(); - - for (i = 0; i < array_size; i++) { - php_stream_write(stream, buffer[i].ptr, buffer[i].size); -@@ -821,18 +809,18 @@ static void free_string(struct string_buffer *string) - efree(string->ptr); - } - --static int make_diff(char *filepath1, char *filepath2, xdemitcb_t *output, int context, int minimal TSRMLS_DC) -+static int make_diff(char *filepath1, char *filepath2, xdemitcb_t *output, int context, int minimal) - { - mmfile_t file1, file2; - xpparam_t params; - xdemitconf_t conf; - int retval, result = 0; - -- retval = load_mm_file(filepath1, &file1 TSRMLS_CC); -+ retval = load_mm_file(filepath1, &file1); - if (!retval) - goto out; - -- retval = load_mm_file(filepath2, &file2 TSRMLS_CC); -+ retval = load_mm_file(filepath2, &file2); - if (!retval) - goto out_free_mmfile; - -@@ -885,17 +873,17 @@ out: - return result; - } - --static int make_bdiff(char *filepath1, char *filepath2, xdemitcb_t *output TSRMLS_DC) -+static int make_bdiff(char *filepath1, char *filepath2, xdemitcb_t *output) - { - mmfile_t file1, file2; - bdiffparam_t params; - int retval, result = 0; - -- retval = load_mm_file(filepath1, &file1 TSRMLS_CC); -+ retval = load_mm_file(filepath1, &file1); - if (!retval) - goto out; - -- retval = load_mm_file(filepath2, &file2 TSRMLS_CC); -+ retval = load_mm_file(filepath2, &file2); - if (!retval) - goto out_free_mmfile; - -@@ -945,16 +933,16 @@ out: - return result; - } - --static int make_rabdiff(char *filepath1, char *filepath2, xdemitcb_t *output TSRMLS_DC) -+static int make_rabdiff(char *filepath1, char *filepath2, xdemitcb_t *output) - { - mmfile_t file1, file2; - int retval, result = 0; - -- retval = load_mm_file(filepath1, &file1 TSRMLS_CC); -+ retval = load_mm_file(filepath1, &file1); - if (!retval) - goto out; - -- retval = load_mm_file(filepath2, &file2 TSRMLS_CC); -+ retval = load_mm_file(filepath2, &file2); - if (!retval) - goto out_free_mmfile; - -@@ -999,16 +987,16 @@ out: - return result; - } - --static int make_patch(char *file_path, char *patch_path, xdemitcb_t *output, xdemitcb_t *error, int flags TSRMLS_DC) -+static int make_patch(char *file_path, char *patch_path, xdemitcb_t *output, xdemitcb_t *error, int flags) - { - mmfile_t file, patch; - int retval, result = 0; - -- retval = load_mm_file(file_path, &file TSRMLS_CC); -+ retval = load_mm_file(file_path, &file); - if (!retval) - goto out; - -- retval = load_mm_file(patch_path, &patch TSRMLS_CC); -+ retval = load_mm_file(patch_path, &patch); - if (!retval) - goto out_free_mmfile; - -@@ -1053,16 +1041,16 @@ out: - return result; - } - --static int make_bpatch(char *file_path, char *patch_path, xdemitcb_t *output TSRMLS_DC) -+static int make_bpatch(char *file_path, char *patch_path, xdemitcb_t *output) - { - mmfile_t file_mm, patch_mm; - int retval, result = 0; - -- retval = load_mm_file(file_path, &file_mm TSRMLS_CC); -+ retval = load_mm_file(file_path, &file_mm); - if (!retval) - goto out; - -- retval = load_mm_file(patch_path, &patch_mm TSRMLS_CC); -+ retval = load_mm_file(patch_path, &patch_mm); - if (!retval) - goto out_free_mmfile; - -@@ -1107,20 +1095,20 @@ out: - return result; - } - --static int make_merge3(char *filepath1, char *filepath2, char *filepath3, xdemitcb_t *output, xdemitcb_t *error TSRMLS_DC) -+static int make_merge3(char *filepath1, char *filepath2, char *filepath3, xdemitcb_t *output, xdemitcb_t *error) - { - mmfile_t file1, file2, file3; - int retval, result = 0; - -- retval = load_mm_file(filepath1, &file1 TSRMLS_CC); -+ retval = load_mm_file(filepath1, &file1); - if (!retval) - goto out; - -- retval = load_mm_file(filepath2, &file2 TSRMLS_CC); -+ retval = load_mm_file(filepath2, &file2); - if (!retval) - goto out_free_mmfile; - -- retval = load_mm_file(filepath3, &file3 TSRMLS_CC); -+ retval = load_mm_file(filepath3, &file3); - if (!retval) - goto out_free_mmfile2; - diff --git a/dev-php/pecl-xdiff/metadata.xml b/dev-php/pecl-xdiff/metadata.xml index fa339cc6f309..ad75a109ffc3 100644 --- a/dev-php/pecl-xdiff/metadata.xml +++ b/dev-php/pecl-xdiff/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> diff --git a/dev-php/pecl-xdiff/pecl-xdiff-2.1.0_pre.ebuild b/dev-php/pecl-xdiff/pecl-xdiff-2.1.0_pre.ebuild deleted file mode 100644 index 336f7f480f72..000000000000 --- a/dev-php/pecl-xdiff/pecl-xdiff-2.1.0_pre.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PHP_EXT_NAME="xdiff" -PHP_EXT_PECL_PKG="xdiff" -DOCS=( README.API ) - -USE_PHP="php7-3 php7-4 php8-0" -PHP_EXT_PECL_FILENAME="${PN/pecl-/}-2.0.1.tgz" - -inherit php-ext-pecl-r3 - -KEYWORDS="~amd64 ~x86" - -DESCRIPTION="PHP extension for generating diff files" -LICENSE="PHP-3.01" -SLOT="7" - -DEPEND="dev-libs/libxdiff" -RDEPEND="${DEPEND}" -PHP_EXT_ECONF_ARGS=() -PATCHES=( -"${FILESDIR}/2.1.0_pre-php8.patch" -"${FILESDIR}/2.1.0_pre-php8-2.patch" -"${FILESDIR}/2.1.0_pre-php8-3.patch" -) -S="${WORKDIR}/${PHP_EXT_PECL_FILENAME/.tgz/}" -PHP_EXT_S="${S}" diff --git a/dev-php/pecl-xdiff/pecl-xdiff-2.1.1.ebuild b/dev-php/pecl-xdiff/pecl-xdiff-2.1.1.ebuild new file mode 100644 index 000000000000..c9f297c09583 --- /dev/null +++ b/dev-php/pecl-xdiff/pecl-xdiff-2.1.1.ebuild @@ -0,0 +1,22 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PHP_EXT_NAME="xdiff" +PHP_EXT_PECL_PKG="xdiff" +DOCS=( README.API ) + +USE_PHP="php8-1 php8-2 php8-3" + +inherit php-ext-pecl-r3 + +DESCRIPTION="PHP extension for generating diff files" +LICENSE="PHP-3.01" + +SLOT="7" +KEYWORDS="~amd64 ~x86" + +RDEPEND="dev-libs/libxdiff" +DEPEND="${RDEPEND}" +PHP_EXT_ECONF_ARGS=() diff --git a/dev-php/pecl-yaml/Manifest b/dev-php/pecl-yaml/Manifest index 246e3c9e72ce..5f65243a569b 100644 --- a/dev-php/pecl-yaml/Manifest +++ b/dev-php/pecl-yaml/Manifest @@ -1,2 +1,2 @@ -DIST yaml-2.2.0.tgz 40716 BLAKE2B ef8e4082cf7aa3c6996d878f04b57438fc5fa4eb6672617685b3fd3ba535581329e8bb8d6b0644b97b2d64e951aea2d46d4e702acf02ac283d8e2b43fc82acba SHA512 3af6a0f2bcbab7d0ea21b81c2914a8c65393156b5a974448645ca079edbd616b5f46564e5f55a83d556f8e3fc38573a869f79c9eb3c2449e1c3d410ae32a6fb5 -DIST yaml-2.2.1.tgz 40977 BLAKE2B 110f77058ac2b1c26dcfb7df024bb37ee58c902fc2fe6ff1ba14d981a17591d6cfda157c79d8d991e8edda95818978b83a98ba7b873367788a64f6c1abd78196 SHA512 b171ca9ca108dc093fb0dda3bc9de821fdd8ddcf79d386baba02f367e331f42e6500f26e73577864cd5f8d12f8c9bfe01962fb8d1bb56fa26d6f0a1208ac5441 +DIST yaml-2.2.2.tgz 41063 BLAKE2B 9fc85be5cb1eb86bc052b86d6292601babee0eb6fa790c0f5a77b307c2bd5a7a6ff66ea9efa21fa958a3c4f415f1850525454566b5a4303182d12a778fb2ed93 SHA512 4c1d3012623154b8d74908fb319a637d7bff178d02d0732d1a3d19d24df2c612d62948eb7dcd9ead9fd31f2da7af0cec54657b8cce128968a04079dd0002117d +DIST yaml-2.2.3.tgz 41276 BLAKE2B f3233b63bbaffa0d6fff70092d46e6b38557b78b3a1dcee498745b9253b828c6d68b09bee17a598fd1006701a795c0ace0c61755d1cd8e8a4305092ba8bec6a6 SHA512 99d63d430dd2fa9767ecb3f70599d2ebd4c53b27770df72c00c4723816de422c581cea05e96c3cba5aaecbdc57cc482fad0f1fa300bdcf887daa7c2c034e6f4b diff --git a/dev-php/pecl-yaml/metadata.xml b/dev-php/pecl-yaml/metadata.xml index 749b4249f16e..f93d19d4b0d7 100644 --- a/dev-php/pecl-yaml/metadata.xml +++ b/dev-php/pecl-yaml/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> diff --git a/dev-php/pecl-yaml/pecl-yaml-2.2.1.ebuild b/dev-php/pecl-yaml/pecl-yaml-2.2.2.ebuild index f05593acf494..34801c887a43 100644 --- a/dev-php/pecl-yaml/pecl-yaml-2.2.1.ebuild +++ b/dev-php/pecl-yaml/pecl-yaml-2.2.2.ebuild @@ -1,29 +1,20 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -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" +USE_PHP="php8-1 php8-2" 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="" +KEYWORDS="~amd64 ~arm64 ~x86" -DEPEND=">=dev-libs/libyaml-0.1.0" +DEPEND="dev-libs/libyaml" RDEPEND="${DEPEND}" -PHP_EXT_ECONF_ARGS=() diff --git a/dev-php/pecl-yaml/pecl-yaml-2.2.0.ebuild b/dev-php/pecl-yaml/pecl-yaml-2.2.3.ebuild index 9a2570bbf2c0..64c9a699a0c2 100644 --- a/dev-php/pecl-yaml/pecl-yaml-2.2.0.ebuild +++ b/dev-php/pecl-yaml/pecl-yaml-2.2.3.ebuild @@ -1,29 +1,20 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -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" +USE_PHP="php8-1 php8-2 php8-3" 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="" +KEYWORDS="~amd64 ~arm64 ~x86" -DEPEND=">=dev-libs/libyaml-0.1.0" +DEPEND="dev-libs/libyaml" RDEPEND="${DEPEND}" -PHP_EXT_ECONF_ARGS=() diff --git a/dev-php/pecl-yaz/Manifest b/dev-php/pecl-yaz/Manifest index e23f2509034d..a3887ef91d62 100644 --- a/dev-php/pecl-yaz/Manifest +++ b/dev-php/pecl-yaz/Manifest @@ -1 +1 @@ -DIST yaz-1.2.3.tgz 20059 BLAKE2B 3fbf6d57e8519f6d363dbf308cb6ba259098521ae352f8886e8e12ca2a0d8119eaa31fc30301aea6979b32c6c321c4de0ad63ebe72e8f52cbb630d7f136f3e60 SHA512 5e6ebccac05fa44b0758b6817530e8cb436e45ead659f6a5029383515213bcce8c8cc7ceb8ef5ff4ec2335ad5c3009c6ccf8786116b115c24a013329d107bd7a +DIST yaz-1.2.4.tgz 20204 BLAKE2B f36a0db6b8c49a8a4235f49ef07e28196954e9e25bcbe1a2fe94d69d14224b777f692bdc135b17b4d12d1684bb2abd52fd7966a3d78460e563d8475e31cb0ce6 SHA512 c7e17681ec82805ba74d643b427d6fdb4c4542a7efcf690cf9e4ac8adf61b9a9bfe3268ed317dc5220a85f9962f86387c3054f50e98cd986b29f8fb3f5be6b1e 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 deleted file mode 100644 index 8cc9929f06c3..000000000000 --- a/dev-php/pecl-yaz/files/1.2.3/0001-arginfo_php8-support.patch +++ /dev/null @@ -1,245 +0,0 @@ -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 deleted file mode 100644 index 53cde0a92769..000000000000 --- a/dev-php/pecl-yaz/files/1.2.3/0002-arginfo-fixes.patch +++ /dev/null @@ -1,39 +0,0 @@ -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/metadata.xml b/dev-php/pecl-yaz/metadata.xml index b86acf66c756..222c77f3742a 100644 --- a/dev-php/pecl-yaz/metadata.xml +++ b/dev-php/pecl-yaz/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> diff --git a/dev-php/pecl-yaz/pecl-yaz-1.2.3.ebuild b/dev-php/pecl-yaz/pecl-yaz-1.2.3.ebuild deleted file mode 100644 index 3fcf919582e9..000000000000 --- a/dev-php/pecl-yaz/pecl-yaz-1.2.3.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PHP_EXT_NAME="yaz" -PHP_EXT_INI="yes" -PHP_EXT_ZENDEXT="no" -DOCS=( README ) - -USE_PHP="php5-6 php7-0 php7-1 php7-2 php7-3 php7-4" - -inherit php-ext-pecl-r3 - -KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86" - -DESCRIPTION="This extension implements a Z39.50 client for PHP using the YAZ toolkit" -LICENSE="BSD" -SLOT="0" -IUSE="" - -DEPEND=">=dev-libs/yaz-3.0.2:0=" -RDEPEND="${DEPEND}" - -# Needs network access -RESTRICT="test" - -PHP_EXT_ECONF_ARGS="--with-yaz=/usr" diff --git a/dev-php/pecl-yaz/pecl-yaz-1.2.3-r1.ebuild b/dev-php/pecl-yaz/pecl-yaz-1.2.4.ebuild index 1b66eaf384cc..c3acacaca57b 100644 --- a/dev-php/pecl-yaz/pecl-yaz-1.2.3-r1.ebuild +++ b/dev-php/pecl-yaz/pecl-yaz-1.2.4.ebuild @@ -1,18 +1,18 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 PHP_EXT_NAME="yaz" PHP_EXT_INI="yes" PHP_EXT_ZENDEXT="no" DOCS=( README ) -USE_PHP="php7-3 php7-4 php8-0" +USE_PHP="php8-1 php8-2" inherit php-ext-pecl-r3 -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86" +KEYWORDS="amd64 arm ~hppa ~ppc ~ppc64 ~s390 ~sparc x86" DESCRIPTION="This extension implements a Z39.50 client for PHP using the YAZ toolkit" LICENSE="BSD" @@ -21,10 +21,10 @@ IUSE="" DEPEND=">=dev-libs/yaz-3.0.2:0=" RDEPEND="${DEPEND}" +BDEPEND="virtual/pkgconfig" -# Needs network access +# Needs network access to z3950.indexdata.com +PROPERTIES="test_network" RESTRICT="test" PHP_EXT_ECONF_ARGS="--with-yaz=/usr" - -PATCHES=( "${FILESDIR}/${PV}" ) diff --git a/dev-php/pecl-zmq/Manifest b/dev-php/pecl-zmq/Manifest index da2d71c9c60d..c909e27a8844 100644 --- a/dev-php/pecl-zmq/Manifest +++ b/dev-php/pecl-zmq/Manifest @@ -1 +1 @@ -DIST zmq-1.1.3.tgz 82397 BLAKE2B 5c221abf614bcc33c4c69e64308508d544f790371549c421fe2fcdedd67f2e843b2b82d96f517ea9413ffedd128838725e9afc18f0d4048b270d4982571874d0 SHA512 0f03016e315a6c6a1e1d6eca1e20564834d2a924cef06af1b38693933f1e5a094c37e9c432705a64f61d95e82655f61358fc7783e7a6f06c7dd9ad84fc6f7bbc +DIST pecl-zmq-1.1.3_p20211103.tar.gz 104608 BLAKE2B 5217c77353cf36eb10fbb4825a77e16293770b58ee92aeec3487816c713982c67e1964e3da40b152952abe7a1e2be1dab3e67f53798849bfa1a52f3c47f2884e SHA512 762ecc78fda2e94d7bec57dc329741e0a4a6442e76a8a0bb367576b961e96482f43698e36adc7c8e6a585c914e696e6a17056a1ea680caa96f69faefc604d873 diff --git a/dev-php/pecl-zmq/files/pecl-zmq-1.1.3-php7-3-compatibility.patch b/dev-php/pecl-zmq/files/pecl-zmq-1.1.3-php7-3-compatibility.patch deleted file mode 100644 index 2de703039b07..000000000000 --- a/dev-php/pecl-zmq/files/pecl-zmq-1.1.3-php7-3-compatibility.patch +++ /dev/null @@ -1,265 +0,0 @@ -From af02bde61c2a5af1ae64cac09ffe2b25237aa58e Mon Sep 17 00:00:00 2001 -From: Alex/AT <alex@alex-at.net> -Date: Mon, 10 Dec 2018 06:02:27 +0300 -Subject: [PATCH] PHP 7.3 compatibility and bugfixes - -- Define new GC_ADDREF/DELREF/SET_REFCOUNT macros for older PHP versions and use them instead of direct GC reference counter access - -- Fixup all necessary 'long' type parameters to 'zend_long', PHP 7.3 makes it mandatory, also fixup some direct function implementations to accept the same - -- In php_zmq_recv(), zend_string_init() was wrongly called with third parameter as '1', marking new string with IS_STR_PERSISTENT, this caused heap corruption and/or segfaults with PHP 7.3 and could possibly cause other sorts of bugs under any 7.x version - With ZVAL_STRINGL macro, this last '1' parameter meant to copy the string and was seemingly erroneously moved to zend_string_init(). zend_string_init() copies string by default, and last parameter has totally different meaning here - -- In poll(), flag ZVAL separation on passed arrays (PHP 7.3 makes it mandatory) - -- Test 19 (exception on connect callback with forced reference parameter): skip on PHP 7.1 and higher, PHP >= 7.1 started to fallback to passing argument by value instead of failing - -- Test 21 (warning generation from callback): it is ok, but PHP 7.3 uses 'int' instead of 'integer' for constants, so allow any word in place of the word 'integer' ---- - php_zmq.h | 6 ++++ - tests/019-callbackinvalidsignature.phpt | 3 +- - tests/021-callbackwarning.phpt | 2 +- - zmq.c | 40 ++++++++++++------------- - zmq_sockopt.c | 4 +-- - 5 files changed, 30 insertions(+), 25 deletions(-) - -diff --git a/php_zmq.h b/php_zmq.h -index ef50bfb..3833967 100644 ---- a/php_zmq.h -+++ b/php_zmq.h -@@ -44,6 +44,12 @@ - - #include "php.h" - -+#if PHP_VERSION_ID < 70300 -+#define GC_ADDREF(p) ++GC_REFCOUNT(p) -+#define GC_DELREF(p) --GC_REFCOUNT(p) -+#define GC_SET_REFCOUNT(p, rc) GC_REFCOUNT(p) = rc -+#endif -+ - extern zend_module_entry zmq_module_entry; - #define phpext_zmq_ptr &zmq_module_entry - -diff --git a/tests/019-callbackinvalidsignature.phpt b/tests/019-callbackinvalidsignature.phpt -index 753de31..b5bb20c 100644 ---- a/tests/019-callbackinvalidsignature.phpt -+++ b/tests/019-callbackinvalidsignature.phpt -@@ -1,7 +1,8 @@ - --TEST-- - Test callback edge-cases - --SKIPIF-- --<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?> -+<?php require_once(dirname(__FILE__) . '/skipif.inc'); -+if (PHP_VERSION_ID >= 70100) die("skip PHP 7.1 and higher fallback to passing argument by value even when forced to reference"); ?> - --FILE-- - <?php - -diff --git a/tests/021-callbackwarning.phpt b/tests/021-callbackwarning.phpt -index 435743e..eba2ecf 100644 ---- a/tests/021-callbackwarning.phpt -+++ b/tests/021-callbackwarning.phpt -@@ -13,5 +13,5 @@ function generate_warning($a, $b) - $socket = new ZMQSocket(new ZMQContext(), ZMQ::SOCKET_REQ, 'persistent_socket', 'generate_warning'); - - --EXPECTF-- --Warning: in_array() expects parameter 2 to be array, integer given in %s on line %d -+Warning: in_array() expects parameter 2 to be array, %s given in %s on line %d - -diff --git a/zmq.c b/zmq.c -index 942e69b..57ebd11 100644 ---- a/zmq.c -+++ b/zmq.c -@@ -235,7 +235,7 @@ php_zmq_context *php_zmq_context_get(zend_long io_threads, zend_bool is_persiste - le.type = php_zmq_context_list_entry(); - le.ptr = context; - -- GC_REFCOUNT(&le) = 1; -+ GC_SET_REFCOUNT(&le, 1); - - /* plist_key is not a persistent allocated key, thus we use str_update here */ - if (zend_hash_str_update_mem(&EG(persistent_list), plist_key->val, plist_key->len, &le, sizeof(le)) == NULL) { -@@ -369,7 +369,7 @@ PHP_METHOD(zmq, curvekeypair) - PHP_METHOD(zmqcontext, __construct) - { - php_zmq_context_object *intern; -- long io_threads = 1; -+ zend_long io_threads = 1; - zend_bool is_persistent = 1; - - if (zend_parse_parameters(ZEND_NUM_ARGS(), "|lb", &io_threads, &is_persistent) == FAILURE) { -@@ -495,7 +495,7 @@ PHP_METHOD(zmqcontext, getOpt) - Create a new zmq socket - */ - static --php_zmq_socket *php_zmq_socket_new(php_zmq_context *context, int type, zend_bool is_persistent) -+php_zmq_socket *php_zmq_socket_new(php_zmq_context *context, zend_long type, zend_bool is_persistent) - { - php_zmq_socket *zmq_sock; - -@@ -503,7 +503,7 @@ php_zmq_socket *php_zmq_socket_new(php_zmq_context *context, int type, zend_bool - zmq_sock->z_socket = zmq_socket(context->z_ctx, type); - zmq_sock->pid = getpid(); - zmq_sock->ctx = context; -- zmq_sock->socket_type = type; -+ zmq_sock->socket_type = type; - - if (!zmq_sock->z_socket) { - pefree(zmq_sock, is_persistent); -@@ -535,7 +535,7 @@ void php_zmq_socket_store(php_zmq_socket *zmq_sock_p, zend_long type, zend_strin - le.type = php_zmq_socket_list_entry(); - le.ptr = zmq_sock_p; - -- GC_REFCOUNT(&le) = 1; -+ GC_SET_REFCOUNT(&le, 1); - - plist_key = php_zmq_socket_plist_key(type, persistent_id, use_shared_ctx); - -@@ -796,7 +796,7 @@ PHP_METHOD(zmqsocket, __construct) - - /* {{{ static zend_bool php_zmq_send(php_zmq_socket_object *intern, char *message_param, long flags) - */ --static zend_bool php_zmq_send(php_zmq_socket_object *intern, zend_string *message_param, long flags) -+static zend_bool php_zmq_send(php_zmq_socket_object *intern, zend_string *message_param, zend_long flags) - { - int rc, errno_; - zmq_msg_t message; -@@ -828,7 +828,7 @@ static void php_zmq_sendmsg_impl(INTERNAL_FUNCTION_PARAMETERS) - { - php_zmq_socket_object *intern; - zend_string *message_param; -- long flags = 0; -+ zend_long flags = 0; - zend_bool ret; - - if (zend_parse_parameters(ZEND_NUM_ARGS(), "S|l", &message_param, &flags) == FAILURE) { -@@ -890,7 +890,7 @@ PHP_METHOD(zmqsocket, sendmulti) - zval *messages; - php_zmq_socket_object *intern; - int to_send, ret = 0; -- long flags = 0; -+ zend_long flags = 0; - - if (zend_parse_parameters(ZEND_NUM_ARGS(), "a|l", &messages, &flags) == FAILURE) { - return; -@@ -910,7 +910,7 @@ PHP_METHOD(zmqsocket, sendmulti) - /* {{{ static zend_bool php_zmq_recv(php_zmq_socket_object *intern, long flags, zval *return_value) - */ - static --zend_string *php_zmq_recv(php_zmq_socket_object *intern, long flags) -+zend_string *php_zmq_recv(php_zmq_socket_object *intern, zend_long flags) - { - int rc, errno_; - zmq_msg_t message; -@@ -933,7 +933,7 @@ zend_string *php_zmq_recv(php_zmq_socket_object *intern, long flags) - return NULL; - } - -- str = zend_string_init(zmq_msg_data(&message), zmq_msg_size(&message), 1); -+ str = zend_string_init(zmq_msg_data(&message), zmq_msg_size(&message), 0); - zmq_msg_close(&message); - return str; - } -@@ -943,7 +943,7 @@ static void php_zmq_recvmsg_impl(INTERNAL_FUNCTION_PARAMETERS) - { - zend_string *str = NULL; - php_zmq_socket_object *intern; -- long flags = 0; -+ zend_long flags = 0; - - if (zend_parse_parameters(ZEND_NUM_ARGS(), "|l", &flags) == FAILURE) { - return; -@@ -974,7 +974,7 @@ PHP_METHOD(zmqsocket, recvmulti) - { - php_zmq_socket_object *intern; - size_t value_len; -- long flags = 0; -+ zend_long flags = 0; - #if ZMQ_VERSION_MAJOR < 3 - int64_t value; - #else -@@ -1303,7 +1303,7 @@ PHP_METHOD(zmqpoll, add) - { - php_zmq_poll_object *intern; - zval *object; -- long events; -+ zend_long events; - int error; - zend_string *key; - -@@ -1423,10 +1423,10 @@ PHP_METHOD(zmqpoll, poll) - php_zmq_poll_object *intern; - zval *r_array, *w_array; - -- long timeout = -1; -+ zend_long timeout = -1; - int rc; - -- if (zend_parse_parameters(ZEND_NUM_ARGS(), "a!a!|l", &r_array, &w_array, &timeout) == FAILURE) { -+ if (zend_parse_parameters(ZEND_NUM_ARGS(), "a!/a!/|l", &r_array, &w_array, &timeout) == FAILURE) { - return; - } - -@@ -1592,7 +1592,7 @@ void s_clear_device_callback (php_zmq_device_cb_t *cb) - } - - static --void s_init_device_callback (php_zmq_device_cb_t *cb, zend_fcall_info *fci, zend_fcall_info_cache *fci_cache, long timeout, zval *user_data) -+void s_init_device_callback (php_zmq_device_cb_t *cb, zend_fcall_info *fci, zend_fcall_info_cache *fci_cache, zend_long timeout, zval *user_data) - { - memcpy (&cb->fci, fci, sizeof (zend_fcall_info)); - memcpy (&cb->fci_cache, fci_cache, sizeof (zend_fcall_info_cache)); -@@ -1615,7 +1615,7 @@ void s_init_device_callback (php_zmq_device_cb_t *cb, zend_fcall_info *fci, zend - PHP_METHOD(zmqdevice, setidletimeout) - { - php_zmq_device_object *intern; -- long timeout; -+ zend_long timeout; - - if (zend_parse_parameters(ZEND_NUM_ARGS(), "l", &timeout) == FAILURE) { - return; -@@ -1644,7 +1644,7 @@ PHP_METHOD(zmqdevice, getidletimeout) - PHP_METHOD(zmqdevice, settimertimeout) - { - php_zmq_device_object *intern; -- long timeout; -+ zend_long timeout; - - if (zend_parse_parameters(ZEND_NUM_ARGS(), "l", &timeout) == FAILURE) { - return; -@@ -1676,7 +1676,7 @@ PHP_METHOD(zmqdevice, setidlecallback) - zval *user_data = NULL; - zend_fcall_info fci; - zend_fcall_info_cache fci_cache; -- long timeout = 0; -+ zend_long timeout = 0; - - if (ZEND_NUM_ARGS() == 2) { - php_error_docref(NULL, E_DEPRECATED, "The signature for setIdleCallback has changed, please update your code"); -@@ -1718,7 +1718,7 @@ PHP_METHOD(zmqdevice, settimercallback) - zval *user_data = NULL; - zend_fcall_info fci; - zend_fcall_info_cache fci_cache; -- long timeout; -+ zend_long timeout; - - if (zend_parse_parameters(ZEND_NUM_ARGS(), "fl|z!", &fci, &fci_cache, &timeout, &user_data) == FAILURE) { - return; -diff --git a/zmq_sockopt.c b/zmq_sockopt.c -index 1357032..3a00421 100644 ---- a/zmq_sockopt.c -+++ b/zmq_sockopt.c -@@ -1,5 +1,3 @@ -- -- - /* - +-----------------------------------------------------------------------------------+ - | ZMQ extension for PHP | -@@ -2033,7 +2031,7 @@ PHP_METHOD(zmqsocket, getsockopt) - PHP_METHOD(zmqsocket, setsockopt) - { - php_zmq_socket_object *intern; -- long key; -+ zend_long key; - zval *zv; - - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "lz/", &key, &zv) == FAILURE) { diff --git a/dev-php/pecl-zmq/metadata.xml b/dev-php/pecl-zmq/metadata.xml index b86acf66c756..222c77f3742a 100644 --- a/dev-php/pecl-zmq/metadata.xml +++ b/dev-php/pecl-zmq/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> diff --git a/dev-php/pecl-zmq/pecl-zmq-1.1.3-r3.ebuild b/dev-php/pecl-zmq/pecl-zmq-1.1.3_p20211103.ebuild index d183c65cd902..388d3f04fa55 100644 --- a/dev-php/pecl-zmq/pecl-zmq-1.1.3-r3.ebuild +++ b/dev-php/pecl-zmq/pecl-zmq-1.1.3_p20211103.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="7" +EAPI="8" -USE_PHP="php7-2 php7-3 php7-4" +USE_PHP="php8-1" inherit php-ext-pecl-r3 if [[ ${PV} == "9999" ]]; then @@ -16,6 +16,9 @@ else KEYWORDS="~amd64 ~x86" fi +SNAPSHOT="ee5fbc693f07b2d6f0d9fd748f131be82310f386" +SRC_URI="https://github.com/zeromq/php-zmq/archive/${SNAPSHOT}.tar.gz -> ${P}.tar.gz" + DESCRIPTION="PHP Bindings for ZeroMQ messaging" LICENSE="BSD" SLOT="0" @@ -25,4 +28,5 @@ BDEPEND="virtual/pkgconfig" DEPEND="net-libs/zeromq" RDEPEND="net-libs/zeromq:=" -PATCHES=( "${FILESDIR}"/${PN}-1.1.3-php7-3-compatibility.patch ) +S="${WORKDIR}/php-zmq-${SNAPSHOT}" +PHP_EXT_S="${S}" diff --git a/dev-php/pecl-zmq/pecl-zmq-9999.ebuild b/dev-php/pecl-zmq/pecl-zmq-9999.ebuild index a0147e05ff53..d08160059b57 100644 --- a/dev-php/pecl-zmq/pecl-zmq-9999.ebuild +++ b/dev-php/pecl-zmq/pecl-zmq-9999.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="7" +EAPI="8" -USE_PHP="php7-3 php7-4 php8-0" +USE_PHP="php8-1" inherit php-ext-pecl-r3 if [[ ${PV} == "9999" ]]; then diff --git a/dev-php/phar-io-manifest/Manifest b/dev-php/phar-io-manifest/Manifest index 3e0b56dae27b..7f3d77dc80ab 100644 --- a/dev-php/phar-io-manifest/Manifest +++ b/dev-php/phar-io-manifest/Manifest @@ -1,2 +1,3 @@ DIST phar-io-manifest-1.0.3.tar.gz 21903 BLAKE2B 48fb8858ea6c89415e78da399e2d3b6660e1857958094bf5e6c42465cfc32e34122ec1ab6e413f36f48e288ef40af7b85f93c80e6a2cfa547a166557de04ec97 SHA512 f8f9a6d4b761b739ec24a9f94ae5d4ac74f7276621675e3f3c7c3085aa7662c73cc703b1c86531d327199cf42074bb19446c14f78a3c8a888b1d236dc59bed94 DIST phar-io-manifest-2.0.1.tar.gz 10146 BLAKE2B dad3a04bf63c53c2cf4c715eb752ca57458f936a0872db481e81452b9efc8f10bb3903248cb834c8e25eb88987b68545903e1f68876e284597f54ceef755dfe8 SHA512 5c9772a5a48f17abab3806bbb8f9c07a2f26f3231385fb7dd7dcdc390f925f0f7de2d07d8b0bb4e966de86c3262bb4900cf81c1bf897fb38425aa8d644c74e95 +DIST phar-io-manifest-2.0.3.tar.gz 10249 BLAKE2B 3463a52fac2d0392b9c4a40089b536b0aebdbfe51154dbeab093da386085ead91eb95cdd133eb4464bde3a616b13c5a5772af2d97edfc585b0fa1128ef2a5166 SHA512 c0c646f0770e66909377f5f4b6b755ecfc070c44ac83d58c3ad07d79aa4481092e7c702e62d0ee65b036dd5de8ba45356d85717a733f141248e41f77d54bbe86 diff --git a/dev-php/phar-io-manifest/metadata.xml b/dev-php/phar-io-manifest/metadata.xml index 98477e04d046..6f10ced3923d 100644 --- a/dev-php/phar-io-manifest/metadata.xml +++ b/dev-php/phar-io-manifest/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> diff --git a/dev-php/phar-io-manifest/phar-io-manifest-1.0.3.ebuild b/dev-php/phar-io-manifest/phar-io-manifest-1.0.3.ebuild index 22306e0b6d74..0bfb446de478 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-2021 Gentoo Authors +# Copyright 1999-2023 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="amd64 arm ~hppa ppc ppc64 ~s390 sparc x86" IUSE="examples" S="${WORKDIR}/manifest-${PV}" diff --git a/dev-php/phar-io-manifest/phar-io-manifest-2.0.1.ebuild b/dev-php/phar-io-manifest/phar-io-manifest-2.0.1.ebuild index 25f65d07e8d4..f788684ce98a 100644 --- a/dev-php/phar-io-manifest/phar-io-manifest-2.0.1.ebuild +++ b/dev-php/phar-io-manifest/phar-io-manifest-2.0.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 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="~amd64 ~arm ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86" IUSE="examples" CDEPEND="dev-php/fedora-autoloader diff --git a/dev-php/phar-io-manifest/phar-io-manifest-2.0.3.ebuild b/dev-php/phar-io-manifest/phar-io-manifest-2.0.3.ebuild new file mode 100644 index 000000000000..6a35711f039f --- /dev/null +++ b/dev-php/phar-io-manifest/phar-io-manifest-2.0.3.ebuild @@ -0,0 +1,49 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +DESCRIPTION="Reading phar.io manifest information from a PHP Archive (PHAR)" +HOMEPAGE="https://github.com/phar-io/manifest" +SRC_URI="https://github.com/phar-io/manifest/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 arm ~hppa ppc ppc64 ~s390 sparc x86" +IUSE="examples" + +CDEPEND="dev-php/fedora-autoloader + >=dev-php/phar-io-version-3.0.1 + >=dev-lang/php-7.2:*[phar,xml(-),xmlwriter(-)]" + +BDEPEND="dev-php/theseer-Autoload" + +RDEPEND="${CDEPEND}" + +S="${WORKDIR}/manifest-${PV}" + +src_prepare() { + default + + phpab \ + --output src/autoload.php \ + --template fedora2 \ + --basedir src \ + src \ + || die + + cat >> src/autoload.php <<EOF || die "failed to extend autoload.php" + +// Dependencies +\Fedora\Autoloader\Dependencies::required([ + '/usr/share/php/PharIo/Version/autoload.php' +]); +EOF +} + +src_install() { + insinto /usr/share/php/PharIo/Manifest + doins -r src/* + dodoc README.md + use examples && dodoc -r examples +} diff --git a/dev-php/phar-io-version/metadata.xml b/dev-php/phar-io-version/metadata.xml index cb69a2563f88..374d367f368e 100644 --- a/dev-php/phar-io-version/metadata.xml +++ b/dev-php/phar-io-version/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> diff --git a/dev-php/phar-io-version/phar-io-version-2.0.1.ebuild b/dev-php/phar-io-version/phar-io-version-2.0.1.ebuild index 122d7410f89f..a88050851a1e 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-2021 Gentoo Authors +# Copyright 1999-2023 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="amd64 arm ~hppa ppc ppc64 ~s390 sparc x86" IUSE="" S="${WORKDIR}/version-${PV}" diff --git a/dev-php/phar-io-version/phar-io-version-3.0.4.ebuild b/dev-php/phar-io-version/phar-io-version-3.0.4.ebuild index 1c28ee251730..60de43a18576 100644 --- a/dev-php/phar-io-version/phar-io-version-3.0.4.ebuild +++ b/dev-php/phar-io-version/phar-io-version-3.0.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 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="~amd64 ~arm ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86" IUSE="" S="${WORKDIR}/version-${PV}" diff --git a/dev-php/phar-io-version/phar-io-version-3.1.0.ebuild b/dev-php/phar-io-version/phar-io-version-3.1.0.ebuild index 1c28ee251730..1fbabc076a86 100644 --- a/dev-php/phar-io-version/phar-io-version-3.1.0.ebuild +++ b/dev-php/phar-io-version/phar-io-version-3.1.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 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="amd64 arm ~hppa ppc ppc64 ~s390 sparc x86" IUSE="" S="${WORKDIR}/version-${PV}" diff --git a/dev-php/phar-utils/Manifest b/dev-php/phar-utils/Manifest index 791852e8b0a7..43aa84b192f3 100644 --- a/dev-php/phar-utils/Manifest +++ b/dev-php/phar-utils/Manifest @@ -1 +1,2 @@ DIST phar-utils-1.1.1.tar.gz 4211 BLAKE2B 370c6e325dcef6fb8ac2ab12a661f59d1c5feb5135aa8bdf7c0b3beb31f90a309994e959b68a96d9da2ea2ae25d38ee5bda1d86a647b4958ce81bece3d02a935 SHA512 bfe7ce821767588032a2db8e2b80d827f33a5bd9049d74d6d1871b7e65878cf78a86162ed67e96edd363a3520f53723bdd496914e96d4ef8629880729bd812e3 +DIST phar-utils-1.1.2.tar.gz 4223 BLAKE2B fa64eb6f6a53f5a571c4cab21235269321055d09c4adb5d72baa1084d862a72f8ac010d1dd02fa8a3e1da4b8b8b449d648cfa4b47486832f85e68f222184518e SHA512 122c76ee29bb981b75f86f025235577bb9c1cf2b3f18c16740a000284a23e04b8ec7ee37a369513f7c44e4da8a8838d90384a02ce38bcb425f826ac2b6eb3b88 diff --git a/dev-php/phar-utils/metadata.xml b/dev-php/phar-utils/metadata.xml index 3500cb35f8d6..7a2309f32992 100644 --- a/dev-php/phar-utils/metadata.xml +++ b/dev-php/phar-utils/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person" proxied="yes"> <email>guillaumeseren@gmail.com</email> diff --git a/dev-php/cli-prompt/cli-prompt-1.0.0.ebuild b/dev-php/phar-utils/phar-utils-1.1.2.ebuild index 4bf34feadb3c..e3b6014925d4 100644 --- a/dev-php/cli-prompt/cli-prompt-1.0.0.ebuild +++ b/dev-php/phar-utils/phar-utils-1.1.2.ebuild @@ -1,22 +1,22 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -DESCRIPTION="Allows you to prompt for user input on the command line" -HOMEPAGE="https://github.com/Seldaek/cli-prompt" +DESCRIPTION="PHAR file format utilities, for when PHP phars you up" +HOMEPAGE="https://github.com/Seldaek/phar-utils" SRC_URI="https://github.com/Seldaek/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 ~arm64 x86" RDEPEND=" - dev-lang/php:* + dev-lang/php:*[phar] dev-php/fedora-autoloader" src_install() { - insinto "/usr/share/php/Seld/CliPrompt" + insinto "/usr/share/php/Seld/PharUtils" doins -r src/. "${FILESDIR}"/autoload.php dodoc README.md } diff --git a/dev-php/phing/Manifest b/dev-php/phing/Manifest deleted file mode 100644 index 94f9936900f7..000000000000 --- a/dev-php/phing/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -DIST phing-2.16.1.tgz 4149013 BLAKE2B 266c124237d437361e9e18a42c9358fc18cfacfaa798a3a92a31858b7c1af847cde2cac43e0fcfe3759e8291639de9ec564f977fe00939316dbacdfd266e4e92 SHA512 e0832396dac9fbd43680f01acfa55f3ed2819726ace1db4ec9addf18c9c023c4f63143c6a63bbe1b16c2bd19dba54f503efdc77d772a3239bc8f9efe0ab375bb -DIST phing-2.16.3.tgz 858508 BLAKE2B f1125420989af4ec9d1795044d96131a78012d5000eb8adaf9d076f4e2bbceeab0f11b9a24b79425fff179b4ec9dbe5a33aba65dbd4de6b70e64c1cb7c243004 SHA512 b564ddea969bd2a538e09768f6e4d88e9e61ecf6d783db4e328ef9be00099b1fee6ac6dac49b61bab6243e61969131d22869e95b8f063b9c233fd23afa314d30 -DIST phing-2.16.4.tgz 860196 BLAKE2B 0db5171e4076ab07de6118fb11daedef27247b785a2f15899d7b24c677edee334df2b2dbb1d7386e546cfa9d81cea942d967531793333d67d70e8898e2472978 SHA512 e3c0aa808e75c1f4ed73bd179261dfa5e6c52ae480567d4503cade939ef4b7430a1ac90097bfb246e0dd29e3bca6a22b200a995e4dd5442b283948aaf26ee311 diff --git a/dev-php/phing/files/autoload.php b/dev-php/phing/files/autoload.php deleted file mode 100644 index 437a7dc7ee1e..000000000000 --- a/dev-php/phing/files/autoload.php +++ /dev/null @@ -1,14 +0,0 @@ -<?php -$vendor_dir = '/usr/share/php'; -if (!class_exists('Fedora\\Autoloader\\Autoload', false)) { - require_once("${vendor_dir}/Fedora/Autoloader/autoload.php"); -} - -/* - At least for the moment, we don't need to autoload the Phing classes - themselves, because the "require" statements are all still there. -*/ - -\Fedora\Autoloader\Dependencies::required( - array("${vendor_dir}/Symfony/Component/Yaml/autoload.php") -); diff --git a/dev-php/phing/metadata.xml b/dev-php/phing/metadata.xml deleted file mode 100644 index 104818de2b2f..000000000000 --- a/dev-php/phing/metadata.xml +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>php-bugs@gentoo.org</email> - <name>PHP</name> - </maintainer> - <upstream> - <remote-id type="github">phingofficial/phing</remote-id> - </upstream> - <use> - <flag name="zip"> - Support zip archives by requiring said support in - <pkg>dev-lang/php</pkg>. - </flag> - </use> -</pkgmetadata> diff --git a/dev-php/phing/phing-2.16.1.ebuild b/dev-php/phing/phing-2.16.1.ebuild deleted file mode 100644 index 30583fdb8fe3..000000000000 --- a/dev-php/phing/phing-2.16.1.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="PHP project build system based on Apache Ant" -HOMEPAGE="https://www.phing.info/" -SRC_URI="https://www.phing.info/get/${P}.tgz" - -LICENSE="FDL-1.3 LGPL-2.1" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="doc examples minimal zip" - -RDEPEND="dev-lang/php:*[cli,xml,xslt,zip?] - dev-php/symfony-yaml - !minimal? ( - dev-php/PEAR-HTTP_Request2 - dev-php/PEAR-PEAR_PackageFileManager - dev-php/PEAR-VersionControl_SVN - dev-php/PHP_CodeCoverage - dev-php/phpDocumentor - dev-php/phpmd - dev-php/phpunit - dev-php/simpletest - dev-php/xdebug - )" - -S="${WORKDIR}" - -src_install() { - dodoc CHANGELOG.md CREDITS.md README.md - dodoc -r docs/docbook5/en/output/hlhtml - use doc && dodoc -r docs/api - use examples && dodoc -r docs/example - - # Install the executable (and the PHP file it wraps) outside of the - # PHP include directory, since nobody should be including it. - exeinto "/usr/share/${PN}/bin" - doexe "bin/${PN}" - insinto "/usr/share/${PN}/bin" - doins "bin/${PN}.php" - dosym "../share/${PN}/bin/${PN}" "/usr/bin/${PN}" - - # Phing tries to get the version number from this file. - insinto "/usr/share/${PN}/etc" - doins etc/VERSION.TXT - - # The executable will only look for autoload.php in one place, so we - # create an (otherwise pointless) vendor directory to house it. - insinto "/usr/share/${PN}/vendor" - doins "${FILESDIR}/autoload.php" - - # But install the library under /usr/share/php. - insinto "/usr/share/php" - doins -r "classes/${PN}" -} diff --git a/dev-php/phing/phing-2.16.3.ebuild b/dev-php/phing/phing-2.16.3.ebuild deleted file mode 100644 index a85ce522c145..000000000000 --- a/dev-php/phing/phing-2.16.3.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="PHP project build system based on Apache Ant" -HOMEPAGE="https://www.phing.info/" -SRC_URI="https://www.phing.info/get/${P}.tgz" - -LICENSE="FDL-1.3 LGPL-2.1" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="doc examples minimal zip" - -RDEPEND="dev-lang/php:*[cli,xml,xslt,zip?] - dev-php/symfony-yaml - !minimal? ( - dev-php/PEAR-HTTP_Request2 - dev-php/PEAR-PEAR_PackageFileManager - dev-php/PEAR-VersionControl_SVN - dev-php/PHP_CodeCoverage - dev-php/phpDocumentor - dev-php/phpmd - dev-php/phpunit - dev-php/simpletest - dev-php/xdebug - )" - -S="${WORKDIR}" - -src_install() { - dodoc CHANGELOG.md CREDITS.md README.md - dodoc -r docs/docbook5/en/output/hlhtml - use doc && dodoc -r docs/api - use examples && dodoc -r docs/example - - # Install the executable (and the PHP file it wraps) outside of the - # PHP include directory, since nobody should be including it. - exeinto "/usr/share/${PN}/bin" - doexe "bin/${PN}" - insinto "/usr/share/${PN}/bin" - doins "bin/${PN}.php" - dosym "../share/${PN}/bin/${PN}" "/usr/bin/${PN}" - - # Phing tries to get the version number from this file. - insinto "/usr/share/${PN}/etc" - doins etc/VERSION.TXT - - # The executable will only look for autoload.php in one place, so we - # create an (otherwise pointless) vendor directory to house it. - insinto "/usr/share/${PN}/vendor" - doins "${FILESDIR}/autoload.php" - - # But install the library under /usr/share/php. - insinto "/usr/share/php" - doins -r "classes/${PN}" -} diff --git a/dev-php/phing/phing-2.16.4.ebuild b/dev-php/phing/phing-2.16.4.ebuild deleted file mode 100644 index 7d5bc50b8c70..000000000000 --- a/dev-php/phing/phing-2.16.4.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="PHP project build system based on Apache Ant" -HOMEPAGE="https://www.phing.info/" -SRC_URI="https://www.phing.info/get/${P}.tgz" - -LICENSE="FDL-1.3 LGPL-2.1" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="doc examples minimal zip" - -RDEPEND="dev-lang/php:*[cli,xml,xslt,zip?] - dev-php/symfony-yaml - !minimal? ( - dev-php/PEAR-HTTP_Request2 - dev-php/PEAR-PEAR_PackageFileManager - dev-php/PEAR-VersionControl_SVN - dev-php/PHP_CodeCoverage - dev-php/phpDocumentor - dev-php/phpmd - dev-php/phpunit - dev-php/simpletest - dev-php/xdebug - )" - -S="${WORKDIR}" - -src_install() { - dodoc CHANGELOG.md CREDITS.md README.md - dodoc -r docs/docbook5/en/output/hlhtml - use doc && dodoc -r docs/api - use examples && dodoc -r docs/example - - # Install the executable (and the PHP file it wraps) outside of the - # PHP include directory, since nobody should be including it. - exeinto "/usr/share/${PN}/bin" - doexe "bin/${PN}" - insinto "/usr/share/${PN}/bin" - doins "bin/${PN}.php" - dosym "../share/${PN}/bin/${PN}" "/usr/bin/${PN}" - - # Phing tries to get the version number from this file. - insinto "/usr/share/${PN}/etc" - doins etc/VERSION.TXT - - # The executable will only look for autoload.php in one place, so we - # create an (otherwise pointless) vendor directory to house it. - insinto "/usr/share/${PN}/vendor" - doins "${FILESDIR}/autoload.php" - - # But install the library under /usr/share/php. - insinto "/usr/share/php" - doins -r "classes/${PN}" -} diff --git a/dev-php/php-codebrowser/Manifest b/dev-php/php-codebrowser/Manifest deleted file mode 100644 index f14a52413d4e..000000000000 --- a/dev-php/php-codebrowser/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST PHP_CodeBrowser-1.0.2.tgz 171746 BLAKE2B ceffe162cc64387d086f6b16b03449ec80a360a34ba2740f6f482f5b592439a9c40fe0b1d2706638967586df06dd2dd601cc48ce03e16f45c7427820bcf884d8 SHA512 6b0a174e25ae76f8218856ee52dcb78a09bfe4084f79c241d6ef5f90ffb2c7cee68aa6557717f26a3ce91b09b0b15cd75352f4f59e04e9a74f7a4a9ed33e2c89 diff --git a/dev-php/php-codebrowser/files/channel.xml b/dev-php/php-codebrowser/files/channel.xml deleted file mode 100644 index 91bb6786f543..000000000000 --- a/dev-php/php-codebrowser/files/channel.xml +++ /dev/null @@ -1,16 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" ?> -<channel version="1.0" xmlns="http://pear.php.net/channel-1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://pear.php.net/channel-1.0 http://pear.php.net/dtd/channel-1.0.xsd"> - <name>pear.phpunit.de</name> - <summary>PHPUnit PEAR Channel</summary> - <suggestedalias>phpunit</suggestedalias> - <servers> - <primary> - <rest> - <baseurl type="REST1.0">http://pear.phpunit.de/rest/</baseurl> - <baseurl type="REST1.1">http://pear.phpunit.de/rest/</baseurl> - <baseurl type="REST1.2">http://pear.phpunit.de/rest/</baseurl> - <baseurl type="REST1.3">http://pear.phpunit.de/rest/</baseurl> - </rest> - </primary> - </servers> -</channel>
\ No newline at end of file diff --git a/dev-php/php-codebrowser/metadata.xml b/dev-php/php-codebrowser/metadata.xml deleted file mode 100644 index 596e8a4211f4..000000000000 --- a/dev-php/php-codebrowser/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<maintainer type="project"> -<email>php-bugs@gentoo.org</email> -<name>PHP</name> -</maintainer> -<longdescription lang="en"> -PHP_CodeBrowser generates a html view for code browsing with higlighted and colored errors, parsed from xml reports generated from codesniffer or phpunit. -</longdescription> -</pkgmetadata> diff --git a/dev-php/php-codebrowser/php-codebrowser-1.0.2-r1.ebuild b/dev-php/php-codebrowser/php-codebrowser-1.0.2-r1.ebuild deleted file mode 100644 index 2c85f0c8d57a..000000000000 --- a/dev-php/php-codebrowser/php-codebrowser-1.0.2-r1.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PHP_PEAR_CHANNEL="${FILESDIR}/channel.xml" -PHP_PEAR_DOMAIN="pear.phpunit.de" -PHP_PEAR_PKG_NAME="PHP_CodeBrowser" -inherit php-pear-r2 - -DESCRIPTION="Creates highlighted code by reading xml reports from codesniffer or phpunit" -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" -HOMEPAGE="http://pear.phpunit.de" -SRC_URI="http://${PHP_PEAR_URI}/get/${PEAR_P}.tgz" - -RDEPEND="${RDEPEND} - >=dev-php/PEAR-Console_CommandLine-1.1.3 - >=dev-php/File_Iterator-1.3.0 - >=dev-php/PEAR-Log-1.12.1" - -src_prepare() { - sed -i -e "s~@php_dir@~${EPREFIX}/usr/share/php~" \ - -e "s~@data_dir@~${EPREFIX}/usr/share/php/data~" \ - -e "s~@package_version@~${PV}~" \ - "${S}/src/CLIController.php" || die - sed -i -e "s~@php_dir@~${EPREFIX}/usr/share/php~" \ - "${S}/bin/phpcb.php" || die - eapply_user -} - -src_install() { - local DOCS=( CHANGELOG.markdown README.markdown ) - insinto /usr/share/php/data/${PHP_PEAR_PKG_NAME} - doins -r templates - insinto /usr/share/php/${PHP_PEAR_PKG_NAME} - doins -r src/* - exeinto /usr/bin - newexe bin/phpcb.php phpcb - php-pear-r2_install_packagexml - einstalldocs -} diff --git a/dev-php/php-redmine-api/Manifest b/dev-php/php-redmine-api/Manifest deleted file mode 100644 index 621b8011dcfc..000000000000 --- a/dev-php/php-redmine-api/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST php-redmine-api-1.5.16.tar.gz 34323 BLAKE2B 5879c9a67959ec8104344d1d5c57ead036fc60d3bea2ae94684617a711eae0cf9c7d6d2eae6d94c273fdc06bed82f48e281c2895e37ddef2144be8f0881c5341 SHA512 e25dbcababcde4e0b3160f7060a837aa4e52a2f3b1b91bfb131c04c250c543fc41a3667d87c8a668057d5acbfac84f395dd3180b815921fc05edb6325d34dee5 -DIST php-redmine-api-1.5.9.tar.gz 36297 BLAKE2B 32c8cd500b0134afcb20e792f21585315f9635e038bca118d6ea289e2c0f91632aa5e2db2c023969cb228d592a242902a47bbef119e58560b39ba4b418854f8b SHA512 dd23dcadb27965568c3066f417edbff633eee5e804430568e60abf6b69f0fdfe36b73497984f80b055fae07cd3bb6f94264875f076b98f05327c474eb3f2ae5e diff --git a/dev-php/php-redmine-api/metadata.xml b/dev-php/php-redmine-api/metadata.xml deleted file mode 100644 index cd1ae1186934..000000000000 --- a/dev-php/php-redmine-api/metadata.xml +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>mjo@gentoo.org</email> - <name>Michael Orlitzky</name> - </maintainer> - <maintainer type="project"> - <email>php-bugs@gentoo.org</email> - <name>PHP</name> - </maintainer> - <upstream> - <remote-id type="github">kbsali/php-redmine-api</remote-id> - </upstream> -</pkgmetadata> diff --git a/dev-php/php-redmine-api/php-redmine-api-1.5.16.ebuild b/dev-php/php-redmine-api/php-redmine-api-1.5.16.ebuild deleted file mode 100644 index a49c9672f800..000000000000 --- a/dev-php/php-redmine-api/php-redmine-api-1.5.16.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="A simple, object-oriented, PHP Redmine API client" -HOMEPAGE="https://github.com/kbsali/php-redmine-api" -SRC_URI="https://github.com/kbsali/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND="dev-lang/php:*[curl,json(+),simplexml]" -BDEPEND="test? ( ${RDEPEND} <dev-php/phpunit-6 )" - -src_install() { - insinto "/usr/share/php/${PN}" - doins -r lib - - dodoc example.php README.markdown -} - -src_test() { - phpunit || die "test suite failed" -} - -pkg_postinst() { - elog "${PN} has been installed in /usr/share/php/${PN}/." - elog "To use it in a script, require('${PN}/lib/autoload.php'), and then" - elog "use the Redmine\\Client class normally. Most of the examples in the" - elog "documentation should work without modification." -} diff --git a/dev-php/php-redmine-api/php-redmine-api-1.5.9.ebuild b/dev-php/php-redmine-api/php-redmine-api-1.5.9.ebuild deleted file mode 100644 index 770222f7cad6..000000000000 --- a/dev-php/php-redmine-api/php-redmine-api-1.5.9.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="A simple, object-oriented, PHP Redmine API client" -HOMEPAGE="https://github.com/kbsali/php-redmine-api" -SRC_URI="https://github.com/kbsali/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND="dev-lang/php:*[curl,json(+),simplexml]" -DEPEND="test? ( ${RDEPEND} <dev-php/phpunit-6 )" - -src_install() { - insinto "/usr/share/php/${PN}" - doins -r lib - - dodoc example.php README.markdown -} - -src_test() { - phpunit || die "test suite failed" -} - -pkg_postinst() { - elog "${PN} has been installed in /usr/share/php/${PN}/." - elog "To use it in a script, require('${PN}/lib/autoload.php'), and then" - elog "use the Redmine\\Client class normally. Most of the examples in the" - elog "documentation should work without modification." -} diff --git a/dev-php/phpDocumentor/metadata.xml b/dev-php/phpDocumentor/metadata.xml index 5b3f6d868306..68e8c559876c 100644 --- a/dev-php/phpDocumentor/metadata.xml +++ b/dev-php/phpDocumentor/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> diff --git a/dev-php/phpDocumentor/phpDocumentor-2.9.0.ebuild b/dev-php/phpDocumentor/phpDocumentor-2.9.0.ebuild index 48f99127a9eb..be42348c75e5 100644 --- a/dev-php/phpDocumentor/phpDocumentor-2.9.0.ebuild +++ b/dev-php/phpDocumentor/phpDocumentor-2.9.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -10,7 +10,7 @@ SRC_URI="https://github.com/${PN}/${PN}2/releases/download/v${PV}/${PN}.phar -> LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86" IUSE="" # block old version that provides the same binary diff --git a/dev-php/phpcov/metadata.xml b/dev-php/phpcov/metadata.xml index 68745855add1..555be065e834 100644 --- a/dev-php/phpcov/metadata.xml +++ b/dev-php/phpcov/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> diff --git a/dev-php/phpdepend/metadata.xml b/dev-php/phpdepend/metadata.xml index db6a432a175b..a55636ecfa83 100644 --- a/dev-php/phpdepend/metadata.xml +++ b/dev-php/phpdepend/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> diff --git a/dev-php/phpdocumentor-reflection-common/metadata.xml b/dev-php/phpdocumentor-reflection-common/metadata.xml index 349b1ff23b6e..3f577a570a0f 100644 --- a/dev-php/phpdocumentor-reflection-common/metadata.xml +++ b/dev-php/phpdocumentor-reflection-common/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> diff --git a/dev-php/phpdocumentor-reflection-common/phpdocumentor-reflection-common-1.0.ebuild b/dev-php/phpdocumentor-reflection-common/phpdocumentor-reflection-common-1.0.ebuild index f2aa1de51a0d..8128b7ef3747 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 @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -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="amd64 arm ~hppa ppc ppc64 ~s390 sparc x86" IUSE="" S="${WORKDIR}/${MY_PN}-${PV}" diff --git a/dev-php/phpdocumentor-reflection-docblock/metadata.xml b/dev-php/phpdocumentor-reflection-docblock/metadata.xml index d6bbab08b840..2e604b1f972d 100644 --- a/dev-php/phpdocumentor-reflection-docblock/metadata.xml +++ b/dev-php/phpdocumentor-reflection-docblock/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> diff --git a/dev-php/phpdocumentor-reflection-docblock/phpdocumentor-reflection-docblock-3.1.1.ebuild b/dev-php/phpdocumentor-reflection-docblock/phpdocumentor-reflection-docblock-3.1.1.ebuild index e444d50c0972..ada5cc1ef88a 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 @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -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="amd64 arm ~hppa ppc ppc64 ~s390 sparc x86" IUSE="" S="${WORKDIR}/${MY_PN}-${PV}" diff --git a/dev-php/phpdocumentor-type-resolver/metadata.xml b/dev-php/phpdocumentor-type-resolver/metadata.xml index 92320d9ee877..a76adf1ae5fc 100644 --- a/dev-php/phpdocumentor-type-resolver/metadata.xml +++ b/dev-php/phpdocumentor-type-resolver/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> diff --git a/dev-php/phpdocumentor-type-resolver/phpdocumentor-type-resolver-0.2.1.ebuild b/dev-php/phpdocumentor-type-resolver/phpdocumentor-type-resolver-0.2.1.ebuild index 43ea54707d99..b6a9a63243f2 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 @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -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="amd64 arm ~hppa ppc ppc64 ~s390 sparc x86" IUSE="" S="${WORKDIR}/${MY_PN}-${PV}" diff --git a/dev-php/phpmd/Manifest b/dev-php/phpmd/Manifest deleted file mode 100644 index 2cc702421edd..000000000000 --- a/dev-php/phpmd/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST phpmd-2.6.0.tar.gz 57496 BLAKE2B 447e1b0a18372abc82746e8f2a47ea0df76fdeea51e7012ea63a0d644f7cd71790a3e354584d18f57bab3e7211f1037ff3f61aff367c3419caa44e77e79d1cbb SHA512 7c81bef8457f28dd40b908f535cf432d65ba6910c54f730b4d9f7a0bffa096653af029701a6ce4bd22910ec69453c5ff22c657100757d7d6eacff2226b597023 -DIST phpmd-2.8.2.tar.gz 68049 BLAKE2B 5135364fd77aa7e56bcbc7cda7b8bff1daf08211ff2a555aadb6f9fd6706d138bd89a3bfdb8b33f15df8746826d2c09435fa1d69109609a2e7b63843ba15e0fc SHA512 7c793181fa954b8c67334c0e0bdbb5bd93244233c404fb8b51ceacb3ede121e7fb66f69d555455fddbf333741a8d8636b85f20884a09988934e128f853f6faaa diff --git a/dev-php/phpmd/files/autoload.php b/dev-php/phpmd/files/autoload.php deleted file mode 100644 index b0fa4764c7ca..000000000000 --- a/dev-php/phpmd/files/autoload.php +++ /dev/null @@ -1,14 +0,0 @@ -<?php -if (!class_exists('Fedora\\Autoloader\\Autoload', false)) { - require_once('/usr/share/php/Fedora/Autoloader/autoload.php'); -} - -\Fedora\Autoloader\Autoload::addPsr4( - 'PHPMD\\', - __DIR__ . '/../src/main/php/PHPMD' -); - - -\Fedora\Autoloader\Dependencies::required( - array('/usr/share/phpdepend/vendor/autoload.php') -); diff --git a/dev-php/phpmd/phpmd-2.6.0.ebuild b/dev-php/phpmd/phpmd-2.6.0.ebuild deleted file mode 100644 index dc08acef5020..000000000000 --- a/dev-php/phpmd/phpmd-2.6.0.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="PHP mess detector" -HOMEPAGE="http://www.phpmd.org/" - -# The test suite is absent from the release tarballs because -# the only build system that Composer understands is "cp -r". -# To obtain the tests, we would need to grab a VCS snapshot. -SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND="dev-lang/php[xml] - dev-php/phpdepend" - -src_install() { - dodoc AUTHORS.rst CHANGELOG CONTRIBUTING.md README.rst - - # The executable will only look for autoload.php in one place, so we - # create an (otherwise pointless) vendor directory to house it. - insinto "/usr/share/${PN}/vendor" - doins "${FILESDIR}/autoload.php" - - insinto "/usr/share/${PN}/src" - doins -r src/main - - # The executable uses relative include paths, so the one users will - # actually run needs to be symlinked into the source tree. - exeinto "/usr/share/${PN}/src/bin" - doexe "src/bin/${PN}" - dosym "../share/${PN}/src/bin/${PN}" "/usr/bin/${PN}" -} diff --git a/dev-php/phpmd/phpmd-2.8.2.ebuild b/dev-php/phpmd/phpmd-2.8.2.ebuild deleted file mode 100644 index e760429e045b..000000000000 --- a/dev-php/phpmd/phpmd-2.8.2.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="PHP mess detector" -HOMEPAGE="http://www.phpmd.org/" - -# The test suite is absent from the release tarballs because -# the only build system that Composer understands is "cp -r". -# To obtain the tests, we would need to grab a VCS snapshot. -SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND="dev-lang/php[xml] - dev-php/phpdepend" - -src_install() { - dodoc AUTHORS.rst CHANGELOG CONTRIBUTING.md README.rst - - # The executable will only look for autoload.php in one place, so we - # create an (otherwise pointless) vendor directory to house it. - insinto "/usr/share/${PN}/vendor" - doins "${FILESDIR}/autoload.php" - - insinto "/usr/share/${PN}/src" - doins -r src/main - - # The executable uses relative include paths, so the one users will - # actually run needs to be symlinked into the source tree. - exeinto "/usr/share/${PN}/src/bin" - doexe "src/bin/${PN}" - dosym "../share/${PN}/src/bin/${PN}" "/usr/bin/${PN}" -} diff --git a/dev-php/phpspec-prophecy/Manifest b/dev-php/phpspec-prophecy/Manifest deleted file mode 100644 index 1a9cb4ef3fd9..000000000000 --- a/dev-php/phpspec-prophecy/Manifest +++ /dev/null @@ -1,7 +0,0 @@ -DIST phpspec-prophecy-1.10.0.tar.gz 38663 BLAKE2B 44a292eb24cbef36217c108cc09497847b27e249fa3894bdd6846e7547aab7a514396deb9918f7b1ddfe4e71142beb266914669c1d3ce151dfac2aafe7be214b SHA512 f2f871dfe6db2b405ef57b859f82b7540c233ce3056601aee3a09394416a625445e4b94db50cef240a5b0da0fc972fb8b8ca3216750b6a658f09817a60da21b1 -DIST phpspec-prophecy-1.10.1.tar.gz 38707 BLAKE2B 1eaa3fe0043b0d03341778679683cd388d2cdcc3c386ee5801f22dce453fbc3c276023f1b9dc6f26ee332948f59081e09d0944948feff1a6332195523570e4c9 SHA512 f42d115969894b0c1f4887a2154fe310ddd3c7d5a49abbed3c3cb6ffa86d83b1458b9323203e68a7389f5df3c95b3a25037bed41cb8f3b5e824d45102579b9ca -DIST phpspec-prophecy-1.10.3.tar.gz 38838 BLAKE2B 05150e31bcb5896768878672a2523499470541409796b6f4f0de2b8b8686cfa097b6a745e467ed3c9693b0498712d04f6f0e1ba0d19e2fa3677ab9f6423608de SHA512 ada5ecf157bcc5979a86c76448f72c8a890f7db4496327ecf2b7b723bdfe901dd53b0225f8ee3ae7cbc38d08933c863224c9661466428fb47da9bfebdb86627c -DIST phpspec-prophecy-1.13.0.tar.gz 40362 BLAKE2B e99001cfe9fb20cea12b5e109ef36ba087f99ae1bcc922af853eff1bf2d0986017b9b7be03a280de05726480ad75c9d8ee34a27c54b78e22bade9534a75e5c34 SHA512 5d7befb615805243f9602fe78c230c0938186d01c62cc5b90aa279713ba3b653629e91d96acd4e8bb1dc25cded81526934d189ef3f4ef38f75cba04877ccdf70 -DIST phpspec-prophecy-1.7.0.tar.gz 60338 BLAKE2B 8171120d8407f2e554150d5e3ea1972c54d4e2ce0e6698763f0b3c7e1645340ce22404da7844fed8412579c46f372852b4553c6d8a65c8094ef3065b0dbbd80c SHA512 e8efb3882d869f10fe39dff7c2185e1ec6f044c794fd6a5785e1c1c69c71b91dc3997f61bd2566d3243dde0becce568beba9a18fa0fd152e6ce74ca43a9a0fb0 -DIST phpspec-prophecy-1.8.0.tar.gz 37907 BLAKE2B 4bdd55d7fc14604c9fade23c60bf51f4c03accc182d7c5ad445dc6212a1e41b1bf392fe8f4a29768ecfcb2af479c0db3e29d5787d12e1f3222b032ba7e64dbc8 SHA512 992673f7cd148cf0b8752bbad614bbe34175a761cd4bf8849625794b505342d1bd918212a0f1463d94513f9e805d3dd127ba129d6622bcda29ea2b5c57a5582f -DIST phpspec-prophecy-1.9.0.tar.gz 38262 BLAKE2B 1642d38afa368be504da73c0bcf34921fe167dff5665651af23142f33979a35d8d10112e3d1c5b1b38448b92b4741ebda2c183dca10473dce833090a603f95f6 SHA512 d0ba1840ca84cf4b0642083858326c593086f35ba3a6d83746956efbe5d538910efc01655eaa14b4e2b7e17e7bd19cd2494cdfad0dd5bdfb43cdee2402a55b05 diff --git a/dev-php/phpspec-prophecy/files/autoload-1.10.0.php b/dev-php/phpspec-prophecy/files/autoload-1.10.0.php deleted file mode 100644 index fbc88617da61..000000000000 --- a/dev-php/phpspec-prophecy/files/autoload-1.10.0.php +++ /dev/null @@ -1,15 +0,0 @@ -<?php -/* Autoloader for dev-php/phpspec-prophecy */ - -if (!class_exists('Fedora\\Autoloader\\Autoload', false)) { - require_once '/usr/share/php/Fedora/Autoloader/autoload.php'; -} - -Fedora\Autoloader\Autoload::addPsr4('Prophecy\\', __DIR__); - -\Fedora\Autoloader\Dependencies::required(array( - '/usr/share/php/phpDocumentor/ReflectionDocBlock/autoload.php', - '/usr/share/php/SebastianBergmann/Comparator/autoload.php', - '/usr/share/php/Doctrine/Instantiator/autoload.php', - '/usr/share/php/SebastianBergmann/RecursionContext/autoload.php', -)); diff --git a/dev-php/phpspec-prophecy/files/autoload.php b/dev-php/phpspec-prophecy/files/autoload.php deleted file mode 100644 index eb61ccb5eedb..000000000000 --- a/dev-php/phpspec-prophecy/files/autoload.php +++ /dev/null @@ -1,15 +0,0 @@ -<?php -/* Autoloader for dev-php/phpspec-prophecy */ - -if (!class_exists('Fedora\\Autoloader\\Autoload', false)) { - require_once '/usr/share/php/Fedora/Autoloader/autoload.php'; -} - -Fedora\Autoloader\Autoload::addPsr0('Prophecy\\', __DIR__); - -\Fedora\Autoloader\Dependencies::required(array( - '/usr/share/php/phpDocumentor/ReflectionDocBlock/autoload.php', - '/usr/share/php/SebastianBergmann/Comparator/autoload.php', - '/usr/share/php/Doctrine/Instantiator/autoload.php', - '/usr/share/php/SebastianBergmann/RecursionContext/autoload.php', -)); diff --git a/dev-php/phpspec-prophecy/phpspec-prophecy-1.10.0.ebuild b/dev-php/phpspec-prophecy/phpspec-prophecy-1.10.0.ebuild deleted file mode 100644 index bdb25fc6a8fd..000000000000 --- a/dev-php/phpspec-prophecy/phpspec-prophecy-1.10.0.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -MY_PN="prophecy" -MY_VENDOR="phpspec" - -DESCRIPTION="Highly opinionated mocking framework" -HOMEPAGE="https://github.com/phpspec/prophecy" -SRC_URI="https://github.com/${MY_VENDOR}/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86" -IUSE="" - -S="${WORKDIR}/${MY_PN}-${PV}" - -RDEPEND="dev-php/fedora-autoloader - <dev-php/doctrine-instantiator-2 - <dev-php/phpdocumentor-reflection-docblock-6 - <dev-php/sebastian-comparator-4 - <dev-php/sebastian-recursion-context-4 - >=dev-lang/php-5.6:*" - -src_install() { - insinto /usr/share/php/${MY_VENDOR}/Prophecy - doins -r src/Prophecy/* - newins "${FILESDIR}/autoload-1.10.0.php" autoload.php -} diff --git a/dev-php/phpspec-prophecy/phpspec-prophecy-1.10.1.ebuild b/dev-php/phpspec-prophecy/phpspec-prophecy-1.10.1.ebuild deleted file mode 100644 index bdb25fc6a8fd..000000000000 --- a/dev-php/phpspec-prophecy/phpspec-prophecy-1.10.1.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -MY_PN="prophecy" -MY_VENDOR="phpspec" - -DESCRIPTION="Highly opinionated mocking framework" -HOMEPAGE="https://github.com/phpspec/prophecy" -SRC_URI="https://github.com/${MY_VENDOR}/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86" -IUSE="" - -S="${WORKDIR}/${MY_PN}-${PV}" - -RDEPEND="dev-php/fedora-autoloader - <dev-php/doctrine-instantiator-2 - <dev-php/phpdocumentor-reflection-docblock-6 - <dev-php/sebastian-comparator-4 - <dev-php/sebastian-recursion-context-4 - >=dev-lang/php-5.6:*" - -src_install() { - insinto /usr/share/php/${MY_VENDOR}/Prophecy - doins -r src/Prophecy/* - newins "${FILESDIR}/autoload-1.10.0.php" autoload.php -} diff --git a/dev-php/phpspec-prophecy/phpspec-prophecy-1.10.3-r1.ebuild b/dev-php/phpspec-prophecy/phpspec-prophecy-1.10.3-r1.ebuild deleted file mode 100644 index 0b396d498f72..000000000000 --- a/dev-php/phpspec-prophecy/phpspec-prophecy-1.10.3-r1.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -MY_PN="prophecy" -MY_VENDOR="phpspec" - -DESCRIPTION="Highly opinionated mocking framework" -HOMEPAGE="https://github.com/phpspec/prophecy" -SRC_URI="https://github.com/${MY_VENDOR}/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86" -IUSE="" - -S="${WORKDIR}/prophecy-${PV}" - -RDEPEND="dev-php/fedora-autoloader - <dev-php/doctrine-instantiator-2 - <dev-php/phpdocumentor-reflection-docblock-6 - <dev-php/sebastian-comparator-4 - <dev-php/sebastian-recursion-context-4 - >=dev-lang/php-5.6:*" - -src_install() { - insinto /usr/share/php/${MY_VENDOR}/Prophecy - doins -r src/Prophecy/* - newins "${FILESDIR}/autoload-1.10.0.php" autoload.php -} diff --git a/dev-php/phpspec-prophecy/phpspec-prophecy-1.13.0.ebuild b/dev-php/phpspec-prophecy/phpspec-prophecy-1.13.0.ebuild deleted file mode 100644 index 92ee8e7fe54c..000000000000 --- a/dev-php/phpspec-prophecy/phpspec-prophecy-1.13.0.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -MY_PN="prophecy" -MY_VENDOR="phpspec" - -DESCRIPTION="Highly opinionated mocking framework" -HOMEPAGE="https://github.com/phpspec/prophecy" -SRC_URI="https://github.com/${MY_VENDOR}/${MY_PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86" -IUSE="" - -S="${WORKDIR}/prophecy-${PV}" - -RDEPEND="dev-php/fedora-autoloader - <dev-php/doctrine-instantiator-2 - <dev-php/phpdocumentor-reflection-docblock-6 - <dev-php/sebastian-comparator-4 - <dev-php/sebastian-recursion-context-4 - >=dev-lang/php-5.6:*" - -src_install() { - insinto /usr/share/php/${MY_VENDOR}/Prophecy - doins -r src/Prophecy/* - newins "${FILESDIR}/autoload-1.10.0.php" autoload.php -} diff --git a/dev-php/phpspec-prophecy/phpspec-prophecy-1.7.0.ebuild b/dev-php/phpspec-prophecy/phpspec-prophecy-1.7.0.ebuild deleted file mode 100644 index 2a7be15445c1..000000000000 --- a/dev-php/phpspec-prophecy/phpspec-prophecy-1.7.0.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -MY_PN="prophecy" -MY_VENDOR="phpspec" - -DESCRIPTION="Highly opinionated mocking framework" -HOMEPAGE="https://github.com/phpspec/prophecy" -SRC_URI="https://github.com/${MY_VENDOR}/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86" -IUSE="" - -S="${WORKDIR}/${MY_PN}-${PV}" - -RDEPEND="dev-php/fedora-autoloader - <dev-php/doctrine-instantiator-2 - <dev-php/phpdocumentor-reflection-docblock-4 - <dev-php/sebastian-comparator-3 - <dev-php/sebastian-recursion-context-4 - >=dev-lang/php-5.6:*" - -src_install() { - insinto /usr/share/php/${MY_VENDOR}/Prophecy - doins -r src/Prophecy/* - doins "${FILESDIR}/autoload.php" -} diff --git a/dev-php/phpspec-prophecy/phpspec-prophecy-1.8.0.ebuild b/dev-php/phpspec-prophecy/phpspec-prophecy-1.8.0.ebuild deleted file mode 100644 index 37aeac8fe4fa..000000000000 --- a/dev-php/phpspec-prophecy/phpspec-prophecy-1.8.0.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -MY_PN="prophecy" -MY_VENDOR="phpspec" - -DESCRIPTION="Highly opinionated mocking framework" -HOMEPAGE="https://github.com/phpspec/prophecy" -SRC_URI="https://github.com/${MY_VENDOR}/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86" -IUSE="" - -S="${WORKDIR}/${MY_PN}-${PV}" - -RDEPEND="dev-php/fedora-autoloader - <dev-php/doctrine-instantiator-2 - <dev-php/phpdocumentor-reflection-docblock-4 - <dev-php/sebastian-comparator-3 - <dev-php/sebastian-recursion-context-4 - >=dev-lang/php-5.6:*" - -src_install() { - insinto /usr/share/php/${MY_VENDOR}/Prophecy - doins -r src/Prophecy/* - doins "${FILESDIR}/autoload.php" -} diff --git a/dev-php/phpspec-prophecy/phpspec-prophecy-1.9.0.ebuild b/dev-php/phpspec-prophecy/phpspec-prophecy-1.9.0.ebuild deleted file mode 100644 index 37aeac8fe4fa..000000000000 --- a/dev-php/phpspec-prophecy/phpspec-prophecy-1.9.0.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -MY_PN="prophecy" -MY_VENDOR="phpspec" - -DESCRIPTION="Highly opinionated mocking framework" -HOMEPAGE="https://github.com/phpspec/prophecy" -SRC_URI="https://github.com/${MY_VENDOR}/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86" -IUSE="" - -S="${WORKDIR}/${MY_PN}-${PV}" - -RDEPEND="dev-php/fedora-autoloader - <dev-php/doctrine-instantiator-2 - <dev-php/phpdocumentor-reflection-docblock-4 - <dev-php/sebastian-comparator-3 - <dev-php/sebastian-recursion-context-4 - >=dev-lang/php-5.6:*" - -src_install() { - insinto /usr/share/php/${MY_VENDOR}/Prophecy - doins -r src/Prophecy/* - doins "${FILESDIR}/autoload.php" -} diff --git a/dev-php/phptal/Manifest b/dev-php/phptal/Manifest deleted file mode 100644 index e24092ed7848..000000000000 --- a/dev-php/phptal/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST phptal-1.3.1.tar.gz 272883 BLAKE2B 4914b8bb40464f22417fd7ed7dbf88709b95b69a69a905a5152ff640dd5af6af2be7c7d67a622d78029e4075b6b19d8d1bf537a4a6ccc0c97260e5183a961ecd SHA512 74856cbeab3f8d9d552bcb7275a0180fd25e7703230c90e4343fbe9be4001118b091fabbace89efa98a8bf0344f46edf36c4ba709ed0e9b040b82204ea3b7290 diff --git a/dev-php/phptal/metadata.xml b/dev-php/phptal/metadata.xml deleted file mode 100644 index 04d9b1663bd1..000000000000 --- a/dev-php/phptal/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>php-bugs@gentoo.org</email> - <name>PHP</name> - </maintainer> -</pkgmetadata> diff --git a/dev-php/phptal/phptal-1.3.1.ebuild b/dev-php/phptal/phptal-1.3.1.ebuild deleted file mode 100644 index 852ecd7ec345..000000000000 --- a/dev-php/phptal/phptal-1.3.1.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PHP_LIB_NAME="PHPTAL" - -DESCRIPTION="A templating engine for PHP5 that implements Zope Page Templates syntax" -HOMEPAGE="https://phptal.org/" -SRC_URI="https://github.com/${PN}/${PHP_LIB_NAME}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND="dev-lang/php:*" -DEPEND="test? ( ${RDEPEND} <dev-php/phpunit-6 )" - -S="${WORKDIR}/${PHP_LIB_NAME}-${PV}" - -src_compile() { :; } - -src_install() { - insinto /usr/share/php/${PN} - doins -r "classes/${PHP_LIB_NAME}" - doins classes/PHPTAL.php tools/phptal_lint.php - - dodoc README.md -} - -src_test() { - [[ -z $(locale -a |grep en_GB) ]] && ewarn "Tests require en_GB locale to complete" - phpunit || die -} diff --git a/dev-php/phpunit-mock-objects/Manifest b/dev-php/phpunit-mock-objects/Manifest deleted file mode 100644 index d214db2edee0..000000000000 --- a/dev-php/phpunit-mock-objects/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST phpunit-mock-objects-3.4.3.tar.gz 37921 BLAKE2B 1d1cb1dc0bf024525f3d226d1fa67eb27a6de747ac90d58c54d145d284bb0edc06821f45b7b7bb8a3378bd68baa01c31e773da9ff522a410b3f5038746eadf67 SHA512 c9305796062a9ef412c194a82322c913b695c74fd9505580707381f9d9f96f6d69a16bde2c35226240e3c2bfaa6f0f9bf1c94c178b8a1f050b5afef7e53611de diff --git a/dev-php/phpunit-mock-objects/files/autoload.php b/dev-php/phpunit-mock-objects/files/autoload.php deleted file mode 100644 index 96bcae916553..000000000000 --- a/dev-php/phpunit-mock-objects/files/autoload.php +++ /dev/null @@ -1,61 +0,0 @@ -<?php -/* Autoloader for dev-php/sebastian-diff */ - -if (!class_exists('Fedora\\Autoloader\\Autoload', false)) { - require_once '/usr/share/php/Fedora/Autoloader/autoload.php'; -} - -\Fedora\Autoloader\Autoload::addClassMap( - array( - 'phpunit_framework_mockobject_badmethodcallexception' => '/Exception/BadMethodCallException.php', - 'phpunit_framework_mockobject_builder_identity' => '/Builder/Identity.php', - 'phpunit_framework_mockobject_builder_invocationmocker' => '/Builder/InvocationMocker.php', - 'phpunit_framework_mockobject_builder_match' => '/Builder/Match.php', - 'phpunit_framework_mockobject_builder_methodnamematch' => '/Builder/MethodNameMatch.php', - 'phpunit_framework_mockobject_builder_namespace' => '/Builder/Namespace.php', - 'phpunit_framework_mockobject_builder_parametersmatch' => '/Builder/ParametersMatch.php', - 'phpunit_framework_mockobject_builder_stub' => '/Builder/Stub.php', - 'phpunit_framework_mockobject_exception' => '/Exception/Exception.php', - 'phpunit_framework_mockobject_generator' => '/Generator.php', - 'phpunit_framework_mockobject_invocation' => '/Invocation.php', - 'phpunit_framework_mockobject_invocationmocker' => '/InvocationMocker.php', - 'phpunit_framework_mockobject_invocation_object' => '/Invocation/Object.php', - 'phpunit_framework_mockobject_invocation_static' => '/Invocation/Static.php', - 'phpunit_framework_mockobject_invokable' => '/Invokable.php', - 'phpunit_framework_mockobject_matcher' => '/Matcher.php', - 'phpunit_framework_mockobject_matcher_anyinvokedcount' => '/Matcher/AnyInvokedCount.php', - 'phpunit_framework_mockobject_matcher_anyparameters' => '/Matcher/AnyParameters.php', - 'phpunit_framework_mockobject_matcher_consecutiveparameters' => '/Matcher/ConsecutiveParameters.php', - 'phpunit_framework_mockobject_matcher_invocation' => '/Matcher/Invocation.php', - 'phpunit_framework_mockobject_matcher_invokedatindex' => '/Matcher/InvokedAtIndex.php', - 'phpunit_framework_mockobject_matcher_invokedatleastcount' => '/Matcher/InvokedAtLeastCount.php', - 'phpunit_framework_mockobject_matcher_invokedatleastonce' => '/Matcher/InvokedAtLeastOnce.php', - 'phpunit_framework_mockobject_matcher_invokedatmostcount' => '/Matcher/InvokedAtMostCount.php', - 'phpunit_framework_mockobject_matcher_invokedcount' => '/Matcher/InvokedCount.php', - 'phpunit_framework_mockobject_matcher_invokedrecorder' => '/Matcher/InvokedRecorder.php', - 'phpunit_framework_mockobject_matcher_methodname' => '/Matcher/MethodName.php', - 'phpunit_framework_mockobject_matcher_parameters' => '/Matcher/Parameters.php', - 'phpunit_framework_mockobject_matcher_statelessinvocation' => '/Matcher/StatelessInvocation.php', - 'phpunit_framework_mockobject_mockbuilder' => '/MockBuilder.php', - 'phpunit_framework_mockobject_mockobject' => '/MockObject.php', - 'phpunit_framework_mockobject_runtimeexception' => '/Exception/RuntimeException.php', - 'phpunit_framework_mockobject_stub' => '/Stub.php', - 'phpunit_framework_mockobject_stub_consecutivecalls' => '/Stub/ConsecutiveCalls.php', - 'phpunit_framework_mockobject_stub_exception' => '/Stub/Exception.php', - 'phpunit_framework_mockobject_stub_matchercollection' => '/Stub/MatcherCollection.php', - 'phpunit_framework_mockobject_stub_return' => '/Stub/Return.php', - 'phpunit_framework_mockobject_stub_returnargument' => '/Stub/ReturnArgument.php', - 'phpunit_framework_mockobject_stub_returncallback' => '/Stub/ReturnCallback.php', - 'phpunit_framework_mockobject_stub_returnreference' => '/Stub/ReturnReference.php', - 'phpunit_framework_mockobject_stub_returnself' => '/Stub/ReturnSelf.php', - 'phpunit_framework_mockobject_stub_returnvaluemap' => '/Stub/ReturnValueMap.php', - 'phpunit_framework_mockobject_verifiable' => '/Verifiable.php', - ), - __DIR__ -); - -\Fedora\Autoloader\Dependencies::required(array( - '/usr/share/php/Doctrine/Instantiator/autoload.php', - '/usr/share/php/SebastianBergmann/Exporter/autoload.php', - '/usr/share/php/Text/Template/autoload.php', -)); diff --git a/dev-php/phpunit-mock-objects/metadata.xml b/dev-php/phpunit-mock-objects/metadata.xml deleted file mode 100644 index a377557cec14..000000000000 --- a/dev-php/phpunit-mock-objects/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>php-bugs@gentoo.org</email> - <name>PHP</name> - </maintainer> - <upstream> - <remote-id type="github">sebastianbergmann/phpunit-mock-objects</remote-id> - </upstream> -</pkgmetadata> diff --git a/dev-php/phpunit-mock-objects/phpunit-mock-objects-3.4.3-r1.ebuild b/dev-php/phpunit-mock-objects/phpunit-mock-objects-3.4.3-r1.ebuild deleted file mode 100644 index 9b0a499ebf29..000000000000 --- a/dev-php/phpunit-mock-objects/phpunit-mock-objects-3.4.3-r1.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="Mock Object library for PHPUnit" -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/Text_Template-1.2 - <dev-php/Text_Template-2.0 - <dev-php/doctrine-instantiator-2.0 - <dev-php/sebastian-exporter-3.0 - !<dev-php/phpunit-5.4.0 - >=dev-lang/php-5.6:*" - -src_install() { - insinto /usr/share/php/PHPUnit/ - doins -r src/* - insinto /usr/share/php/PHPUnit/Framework/MockObject - doins "${FILESDIR}/autoload.php" -} diff --git a/dev-php/phpunit-mock-objects/phpunit-mock-objects-3.4.3.ebuild b/dev-php/phpunit-mock-objects/phpunit-mock-objects-3.4.3.ebuild deleted file mode 100644 index e54d3abab3f1..000000000000 --- a/dev-php/phpunit-mock-objects/phpunit-mock-objects-3.4.3.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="Mock Object library for PHPUnit" -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/Text_Template-1.2 - !>=dev-php/Text_Template-2.0 - <dev-php/doctrine-instantiator-2.0 - <dev-php/sebastian-exporter-3.0 - !<dev-php/phpunit-5.4.0 - >=dev-lang/php-5.6:*" - -src_install() { - insinto /usr/share/php/PHPUnit/ - doins -r src/* - insinto /usr/share/php/PHPUnit/Framework/MockObject - doins "${FILESDIR}/autoload.php" -} diff --git a/dev-php/phpunit/Manifest b/dev-php/phpunit/Manifest deleted file mode 100644 index 31d7859aad6e..000000000000 --- a/dev-php/phpunit/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST phpunit-8.5.11.tar.gz 159302 BLAKE2B fdf156842b3607f4cbd26194efd7eb7cb204fb1d1d078c0c6bd3bb68e520e5d748767f8aab64b7c9bf313161e3d84e08d415fbf0408c26541ec1f70cfe7af8bd SHA512 3e9db4a1d6c5bea3546b24bd837479a0114a9200f96034aabc96933dfb42c1237b03f7118f19eeb1216e32f2034c1ec8c632d20ecacbe70d3660fbbfd167ac79 -DIST phpunit-8.5.14.tar.gz 163158 BLAKE2B 8be0765b89cd7c7f91c7c8753eda9be46a38368c1b538b9e1a06b6f7e5b2cf2c37ef806338b7f4dd213962bfb8f7d749e1a97dd65d0e877fb2ffdeb747dcd344 SHA512 589cd74bf44c16ee0bb0b0e85f3468b0fdbd7e6ce968894954918094d49a0fed46570cac2fa2367f417715bf64f942f5742a292b09edd91317bbea06624ac313 diff --git a/dev-php/phpunit/phpunit-8.5.11.ebuild b/dev-php/phpunit/phpunit-8.5.11.ebuild deleted file mode 100644 index 5d87e3517972..000000000000 --- a/dev-php/phpunit/phpunit-8.5.11.ebuild +++ /dev/null @@ -1,96 +0,0 @@ -# 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.14.ebuild b/dev-php/phpunit/phpunit-8.5.14.ebuild deleted file mode 100644 index b60c35cb8271..000000000000 --- a/dev-php/phpunit/phpunit-8.5.14.ebuild +++ /dev/null @@ -1,97 +0,0 @@ -# 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-2.0.1 - >=dev-php/phar-io-version-3.0.2 - >=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:8.0[cli(-),unicode(-),xml(-),xmlwriter(-)] - 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/psr-log/metadata.xml b/dev-php/psr-log/metadata.xml index 898d1f544b35..ada5d643498e 100644 --- a/dev-php/psr-log/metadata.xml +++ b/dev-php/psr-log/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person" proxied="yes"> <email>guillaumeseren@gmail.com</email> diff --git a/dev-php/psr-log/psr-log-1.1.4.ebuild b/dev-php/psr-log/psr-log-1.1.4.ebuild index db272717331e..fba021a817a1 100644 --- a/dev-php/psr-log/psr-log-1.1.4.ebuild +++ b/dev-php/psr-log/psr-log-1.1.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -9,7 +9,7 @@ SRC_URI="https://github.com/php-fig/log/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 ~arm64 x86" RDEPEND=" dev-lang/php:* diff --git a/dev-php/reactphp-promise/metadata.xml b/dev-php/reactphp-promise/metadata.xml index f58805830cdc..852584f51a68 100644 --- a/dev-php/reactphp-promise/metadata.xml +++ b/dev-php/reactphp-promise/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> diff --git a/dev-php/reactphp-promise/reactphp-promise-2.8.0.ebuild b/dev-php/reactphp-promise/reactphp-promise-2.8.0.ebuild index bcc2cd5557a4..3126e02ce036 100644 --- a/dev-php/reactphp-promise/reactphp-promise-2.8.0.ebuild +++ b/dev-php/reactphp-promise/reactphp-promise-2.8.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="https://github.com/reactphp/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar. LICENSE="MIT" SLOT="0" -KEYWORDS="amd64 x86" +KEYWORDS="amd64 ~arm64 x86" IUSE="" BDEPEND="dev-php/theseer-Autoload" diff --git a/dev-php/realpath_turbo/metadata.xml b/dev-php/realpath_turbo/metadata.xml index 9c672a724777..f689049a20f7 100644 --- a/dev-php/realpath_turbo/metadata.xml +++ b/dev-php/realpath_turbo/metadata.xml @@ -1,10 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>whissi@gentoo.org</email> - <name>Thomas Deutschmann</name> - </maintainer> <maintainer type="project"> <email>php-bugs@gentoo.org</email> <name>PHP Project</name> diff --git a/dev-php/realpath_turbo/realpath_turbo-2.0.0.ebuild b/dev-php/realpath_turbo/realpath_turbo-2.0.0.ebuild index fdda0e07336f..c231200c3f09 100644 --- a/dev-php/realpath_turbo/realpath_turbo-2.0.0.ebuild +++ b/dev-php/realpath_turbo/realpath_turbo-2.0.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -7,7 +7,7 @@ PHP_EXT_NAME="realpath_turbo" PHP_EXT_INI="yes" PHP_EXT_ZENDEXT="no" -USE_PHP="php5-6 php7-1 php7-2 php7-3 php7-4" +USE_PHP="php8-1" inherit php-ext-source-r3 diff --git a/dev-php/recaptcha/Manifest b/dev-php/recaptcha/Manifest index d82a9d1c40af..e875c255ca4d 100644 --- a/dev-php/recaptcha/Manifest +++ b/dev-php/recaptcha/Manifest @@ -1 +1 @@ -DIST recaptcha-1.2.1.tar.gz 19935 BLAKE2B 43077b25d484940951bf070fa440b5d13c6992c2a157e06b81961b9692683a277d9507e44102dd0ba0cde66c892fd4736ed34cae4b001bdce0d4ab619828b432 SHA512 62df22a6f4b05006a6051db689994e455ada43f76406dd62c5c13f1d90ae64401e9d75c6a92f2c620a14c070d2b49199c20e70eb6284e42e676d37412a98abe4 +DIST recaptcha-1.2.4.tar.gz 21762 BLAKE2B 46c00ac95f2d2643a719b8ea4b53f33f92357406168e057dbdb87fb1419dd6626d1032113ba5842c69bdacb385887563b52290a55a861b57ddcf494e325c0595 SHA512 7c0bee86e532547900a0131c2c52d9d3e427eb0465d7ae5ca2bd3ccbeb7620c8b3216313e4ab382013045310f928364c1284a77eee2f2216d5b241e2d275597d diff --git a/dev-php/recaptcha/metadata.xml b/dev-php/recaptcha/metadata.xml index 199668983735..e082944c00c9 100644 --- a/dev-php/recaptcha/metadata.xml +++ b/dev-php/recaptcha/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>mjo@gentoo.org</email> diff --git a/dev-php/recaptcha/recaptcha-1.2.1.ebuild b/dev-php/recaptcha/recaptcha-1.2.4.ebuild index 87981b66c8c7..2d48efba7a19 100644 --- a/dev-php/recaptcha/recaptcha-1.2.1.ebuild +++ b/dev-php/recaptcha/recaptcha-1.2.4.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 DESCRIPTION="PHP client library for Google's reCAPTCHA service" HOMEPAGE="https://github.com/google/recaptcha" @@ -14,7 +14,7 @@ IUSE="examples test" RESTRICT="!test? ( test )" RDEPEND="dev-lang/php" -BDEPEND="test? ( ${RDEPEND} <dev-php/phpunit-6 )" +BDEPEND="test? ( ${RDEPEND} <dev-php/phpunit-8 )" src_install() { insinto "/usr/share/php/${PN}" diff --git a/dev-php/scrypt/Manifest b/dev-php/scrypt/Manifest index 2b70ca8e86eb..00e5ed387f21 100644 --- a/dev-php/scrypt/Manifest +++ b/dev-php/scrypt/Manifest @@ -1 +1 @@ -DIST scrypt-1.4.2.tgz 21585 BLAKE2B 6297b15aac8470eedc619c498badc4e453476a390cab0cfe7fabef00012131ff9e363834b9423a566dba603ea2a4351eee416419cc1e6c1245a9aba54d63a5ab SHA512 34a87e63250dcfb21b3d36f90a4e5f4bac9f0623917ceb0d613d49112ce0e13df9a93fb0730fb797be6337d023dc490fb881902b5492309fe8bf3e6fd5e685a0 +DIST scrypt-2.0.0.tgz 23229 BLAKE2B 71a40869004cbcb3fb6b303e1d59c0687b9817b89b38ebedc0001a732f4d4fba134ba124b09a6b4970da9892654631b41d0ce8e79d60eaccf788344972cb0760 SHA512 88b559f112f768eb1b61652ee5a6a75edbfd6133aca39c0d740dd083e3d2f718232a607a05a306cd40faeb4cab48f98de04f0799011d86543385583a99fb508f diff --git a/dev-php/scrypt/files/scrypt-1.4.2-php8-0.patch b/dev-php/scrypt/files/scrypt-1.4.2-php8-0.patch deleted file mode 100644 index a5e1ea665897..000000000000 --- a/dev-php/scrypt/files/scrypt-1.4.2-php8-0.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 5010f9fa0743518d149d994728ca930503adde1e Mon Sep 17 00:00:00 2001 -From: Remi Collet <remi@remirepo.net> -Date: Tue, 22 Sep 2020 14:55:32 +0200 -Subject: [PATCH] trivial fix for PHP 8 - ---- - crypto/crypto_scrypt-sse.c | 1 + - php_scrypt.h | 5 +++++ - php_scrypt_utils.c | 1 + - 3 files changed, 7 insertions(+) - -diff --git a/crypto/crypto_scrypt-sse.c b/crypto/crypto_scrypt-sse.c -index a52ce81..709a04f 100644 ---- a/crypto/crypto_scrypt-sse.c -+++ b/crypto/crypto_scrypt-sse.c -@@ -44,6 +44,7 @@ - #include "sysendian.h" - - #include "crypto_scrypt.h" -+#include "php_scrypt.h" - - static void blkcpy(void *, void *, size_t); - static void blkxor(void *, void *, size_t); -diff --git a/php_scrypt.h b/php_scrypt.h -index a1117c8..6cc1c4c 100644 ---- a/php_scrypt.h -+++ b/php_scrypt.h -@@ -35,4 +35,9 @@ PHP_FUNCTION(scrypt_pickparams); - extern zend_module_entry scrypt_module_entry; - #define phpext_scrypt_ptr &scrypt_module_entry - -+#ifndef TSRMLS_CC -+#define TSRMLS_CC -+#define TSRMLS_FETCH() -+#endif -+ - #endif -diff --git a/php_scrypt_utils.c b/php_scrypt_utils.c -index 797e2c7..34fe347 100644 ---- a/php_scrypt_utils.c -+++ b/php_scrypt_utils.c -@@ -25,6 +25,7 @@ - */ - - #include "php_scrypt_utils.h" -+#include "php_scrypt.h" - - /* - * Casts a long into a uint64_t. diff --git a/dev-php/scrypt/metadata.xml b/dev-php/scrypt/metadata.xml index eecb8d72e99c..05cea54b5643 100644 --- a/dev-php/scrypt/metadata.xml +++ b/dev-php/scrypt/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person" proxied="yes"> <email>spiderx@spiderx.dp.ua</email> diff --git a/dev-php/scrypt/scrypt-1.4.2.ebuild b/dev-php/scrypt/scrypt-2.0.0.ebuild index 026a54355943..96d69de30aec 100644 --- a/dev-php/scrypt/scrypt-1.4.2.ebuild +++ b/dev-php/scrypt/scrypt-2.0.0.ebuild @@ -1,14 +1,14 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 PHP_EXT_ECONF_ARGS="--enable-scrypt" -USE_PHP="php7-3 php7-4 php8-0" +USE_PHP="php8-1 php8-2" inherit php-ext-pecl-r3 -DESCRIPTION="A PHP wrapper fo the scrypt hashing algorithm" +DESCRIPTION="A PHP wrapper for the scrypt hashing algorithm" LICENSE="BSD-2" SLOT="0" @@ -16,5 +16,3 @@ KEYWORDS="~amd64 ~x86" IUSE="" DEPEND="dev-util/re2c" - -PATCHES=( "${FILESDIR}"/"${P}"-php8-0.patch ) diff --git a/dev-php/scrypt/scrypt-9999.ebuild b/dev-php/scrypt/scrypt-9999.ebuild index 900385d5cf23..3bc00ea74e2d 100644 --- a/dev-php/scrypt/scrypt-9999.ebuild +++ b/dev-php/scrypt/scrypt-9999.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 PHP_EXT_ECONF_ARGS="--enable-scrypt" -USE_PHP="php7-3 php7-4 php8-0" +USE_PHP="php8-1 php8-2" EGIT_REPO_URI="https://github.com/DomBlack/php-scrypt.git" inherit git-r3 php-ext-pecl-r3 diff --git a/dev-php/sebastian-code-unit-reverse-lookup/Manifest b/dev-php/sebastian-code-unit-reverse-lookup/Manifest index b5f352bbb68f..558659fcf380 100644 --- a/dev-php/sebastian-code-unit-reverse-lookup/Manifest +++ b/dev-php/sebastian-code-unit-reverse-lookup/Manifest @@ -1,3 +1 @@ -DIST sebastian-code-unit-reverse-lookup-1.0.1.tar.gz 4326 BLAKE2B 1c1f65d70a90b9f6d665cb80f3272d95f003bb61e7f682b7c2d7d0010ddd2b26a90ce0cb2a217445df6fff6aa0c7d414e8951d7ad5a0763fc715504e8f649c5d SHA512 bb6419a13b645a4f35d688d3dd47b0d10de8c996721e95805c08119925fa66ef89cca38f94d3818c62c2eb9a978ee231e91fdeb47bf3b640eeefceaaca135469 -DIST sebastian-code-unit-reverse-lookup-1.0.2.tar.gz 4405 BLAKE2B b501a5d7ab19ead2fcdd8b7747afca8f7d55b21534100b5dd312f830aa63df76335403b490e859f53f314198e2fb87b658b5ed9654f8d9f93a3c4bbef2cca16f SHA512 ac784516f8934a4581822de8d4f8513e9fc217c710b1cd0ba8dfa87413194ef5cc28ab774a26a799a540b428c02d8b00fe4239c89551b27c96b2e248043417c5 DIST sebastian-code-unit-reverse-lookup-2.0.3.tar.gz 3047 BLAKE2B 8a61edd4fe312fb089f5bc5973b7174f64e20a84bddb8bb4f832d4ce3a8d59203cd322b932ffb48108b7ffd9e9a219693b55bbf2ccf5b4314cf5c127701ab323 SHA512 3d4f7c8b517743f556480196b43bdb1d5397ab0d9b11afbfe063f161fbbe55155c192695c7f474cf0abd54a8e118992e2c5b62d2e9009217e07f0f63973cfcc1 diff --git a/dev-php/sebastian-code-unit-reverse-lookup/files/autoload.php b/dev-php/sebastian-code-unit-reverse-lookup/files/autoload.php deleted file mode 100644 index b721c7324032..000000000000 --- a/dev-php/sebastian-code-unit-reverse-lookup/files/autoload.php +++ /dev/null @@ -1,13 +0,0 @@ -<?php -/* Autoloader for dev-php/sebastian-diff */ - -if (!class_exists('Fedora\\Autoloader\\Autoload', false)) { - require_once '/usr/share/php/Fedora/Autoloader/autoload.php'; -} - -\Fedora\Autoloader\Autoload::addClassMap( - array( - 'sebastianbergmann\codeunitreverselookup\wizard' => '/Wizard.php', - ), - __DIR__ -); diff --git a/dev-php/sebastian-code-unit-reverse-lookup/metadata.xml b/dev-php/sebastian-code-unit-reverse-lookup/metadata.xml index f502d06de0ed..dc7abb6c7afd 100644 --- a/dev-php/sebastian-code-unit-reverse-lookup/metadata.xml +++ b/dev-php/sebastian-code-unit-reverse-lookup/metadata.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> <name>PHP</name> </maintainer> + <stabilize-allarches/> <upstream> <remote-id type="github">sebastianbergmann/code-unit-reverse-lookup</remote-id> </upstream> 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 deleted file mode 100644 index 1488738b635d..000000000000 --- a/dev-php/sebastian-code-unit-reverse-lookup/sebastian-code-unit-reverse-lookup-1.0.1.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -MY_PN="${PN/sebastian-/}" - -DESCRIPTION="Looks up which function or method a line of code belongs to" -HOMEPAGE="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="" - -S="${WORKDIR}/${MY_PN}-${PV}" - -RDEPEND="dev-php/fedora-autoloader - >=dev-lang/php-5.6:*" - -src_install() { - insinto /usr/share/php/SebastianBergmann/CodeUnitReverseLookup - doins -r src/* - doins "${FILESDIR}/autoload.php" -} diff --git a/dev-php/sebastian-code-unit-reverse-lookup/sebastian-code-unit-reverse-lookup-1.0.2.ebuild b/dev-php/sebastian-code-unit-reverse-lookup/sebastian-code-unit-reverse-lookup-1.0.2.ebuild deleted file mode 100644 index 393410638aa9..000000000000 --- a/dev-php/sebastian-code-unit-reverse-lookup/sebastian-code-unit-reverse-lookup-1.0.2.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -MY_PN="${PN/sebastian-/}" - -DESCRIPTION="Looks up which function or method a line of code belongs to" -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="" - -BDEPEND="dev-php/theseer-Autoload" - -RDEPEND="dev-php/fedora-autoloader - >=dev-lang/php-7.2:*" - -S="${WORKDIR}/${MY_PN}-${PV}" - -src_prepare() { - default - - phpab \ - --output src/autoload.php \ - --template fedora2 \ - --basedir src \ - src \ - || die -} - -src_install() { - insinto /usr/share/php/SebastianBergmann/CodeUnitReverseLookup - doins -r src/. - - einstalldocs -} diff --git a/dev-php/sebastian-code-unit-reverse-lookup/sebastian-code-unit-reverse-lookup-2.0.3.ebuild b/dev-php/sebastian-code-unit-reverse-lookup/sebastian-code-unit-reverse-lookup-2.0.3.ebuild index 282d22debb45..b8578d0aef30 100644 --- a/dev-php/sebastian-code-unit-reverse-lookup/sebastian-code-unit-reverse-lookup-2.0.3.ebuild +++ b/dev-php/sebastian-code-unit-reverse-lookup/sebastian-code-unit-reverse-lookup-2.0.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 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="amd64 arm ~hppa ppc ppc64 ~s390 sparc x86" IUSE="" BDEPEND="dev-php/theseer-Autoload" diff --git a/dev-php/sebastian-comparator/Manifest b/dev-php/sebastian-comparator/Manifest deleted file mode 100644 index 333288ad55d1..000000000000 --- a/dev-php/sebastian-comparator/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST sebastian-comparator-1.2.4.tar.gz 13402 BLAKE2B 5fc664e42408a188ed8601f2413f0b6517e5fd9b26f85be3177f09d6aaf4fda8eaa2e9e643e08914fb18aca0c795989d1e341d28476e3857c7d991bd2c06d51c SHA512 b7ca4bbdd91c9d59f83c4ccbd63d7755205f6686de7d7e41808faba404df8f58173a0699a0e4d1fbc09914c2fcf841ddc4df41a86aa5cd0fdffa3be4d438a8aa -DIST sebastian-comparator-3.0.2.tar.gz 16305 BLAKE2B 3cc8551fad28542823fba182abf6e9f33bafa0fea004ceee7d2b192f250678ec7f2014b7e9ae16eee1ec84ff37e656f5612a0d45d3bc10c5959831d39d851fee SHA512 05d5cdb5ce6346325c3f7c6f7b6669de7d599e0b65a95505a85aca887df5498d5baa22f22e9065bf185ac50df1abc969bf86263d31a3923034607938a5eace58 diff --git a/dev-php/sebastian-comparator/files/autoload.php b/dev-php/sebastian-comparator/files/autoload.php deleted file mode 100644 index 696ae0327d79..000000000000 --- a/dev-php/sebastian-comparator/files/autoload.php +++ /dev/null @@ -1,32 +0,0 @@ -<?php -/* Autoloader for dev-php/sebastian-comparator */ - -if (!class_exists('Fedora\\Autoloader\\Autoload', false)) { - require_once '/usr/share/php/Fedora/Autoloader/autoload.php'; -} - -\Fedora\Autoloader\Autoload::addClassMap( - array( - 'sebastianbergmann\comparator\arraycomparator' => '/ArrayComparator.php', - 'sebastianbergmann\comparator\comparator' => '/Comparator.php', - 'sebastianbergmann\comparator\comparisonfailure' => '/ComparisonFailure.php', - 'sebastianbergmann\comparator\domnodecomparator' => '/DOMNodeComparator.php', - 'sebastianbergmann\comparator\datetimecomparator' => '/DateTimeComparator.php', - 'sebastianbergmann\comparator\doublecomparator' => '/DoubleComparator.php', - 'sebastianbergmann\comparator\exceptioncomparator' => '/ExceptionComparator.php', - 'sebastianbergmann\comparator\factory' => '/Factory.php', - 'sebastianbergmann\comparator\mockobjectcomparator' => '/MockObjectComparator.php', - 'sebastianbergmann\comparator\numericcomparator' => '/NumericComparator.php', - 'sebastianbergmann\comparator\objectcomparator' => '/ObjectComparator.php', - 'sebastianbergmann\comparator\resourcecomparator' => '/ResourceComparator.php', - 'sebastianbergmann\comparator\scalarcomparator' => '/ScalarComparator.php', - 'sebastianbergmann\comparator\splobjectstoragecomparator' => '/SplObjectStorageComparator.php', - 'sebastianbergmann\comparator\typecomparator' => '/TypeComparator.php', - ), - __DIR__ -); - -\Fedora\Autoloader\Dependencies::required(array( - '/usr/share/php/SebastianBergmann/Diff/autoload.php', - '/usr/share/php/SebastianBergmann/Exporter/autoload.php', -)); diff --git a/dev-php/sebastian-comparator/sebastian-comparator-1.2.4.ebuild b/dev-php/sebastian-comparator/sebastian-comparator-1.2.4.ebuild deleted file mode 100644 index 87983369a3c1..000000000000 --- a/dev-php/sebastian-comparator/sebastian-comparator-1.2.4.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -MY_PN="${PN/sebastian-//}" - -DESCRIPTION="Compare PHP values for equality" -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="" - -S="${WORKDIR}/${MY_PN}-${PV}" - -RDEPEND="dev-php/fedora-autoloader - <dev-php/sebastian-diff-2.0 - <dev-php/sebastian-exporter-3.0 - >=dev-lang/php-5.6:* -" -src_install() { - insinto /usr/share/php/SebastianBergmann/Comparator - doins -r src/* - doins "${FILESDIR}/autoload.php" -} diff --git a/dev-php/sebastian-comparator/sebastian-comparator-3.0.2.ebuild b/dev-php/sebastian-comparator/sebastian-comparator-3.0.2.ebuild deleted file mode 100644 index 1967df759685..000000000000 --- a/dev-php/sebastian-comparator/sebastian-comparator-3.0.2.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -MY_PN="${PN/sebastian-//}" - -DESCRIPTION="Compare PHP values for equality" -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="" - -S="${WORKDIR}/${MY_PN}-${PV}" - -RDEPEND="dev-php/fedora-autoloader - >=dev-php/sebastian-diff-3.0 - <dev-php/sebastian-diff-4.0 - >=dev-php/sebastian-exporter-3.1 - <dev-php/sebastian-exporter-4.0 - >=dev-lang/php-7.1:* -" -src_install() { - insinto /usr/share/php/SebastianBergmann/Comparator - doins -r src/* - doins "${FILESDIR}/autoload.php" -} diff --git a/dev-php/sebastian-complexity/Manifest b/dev-php/sebastian-complexity/Manifest new file mode 100644 index 000000000000..a4f65cc18eaa --- /dev/null +++ b/dev-php/sebastian-complexity/Manifest @@ -0,0 +1 @@ +DIST sebastian-complexity-2.0.2.tar.gz 4979 BLAKE2B f742e0f3057d7d24963236e2b32841cd6d8fb9b14870e2bfbe1d84cb737008428c9e00db28f5c2f42a61877a4282b3dbd5935c9a3ea4cf93401691c43bab40df SHA512 04773cfac3622eca3d859e9180f8eb5582e3a4124837b2e2cb536b052eeac6fe19dbae81ddbdcc88405de0ff0b202140609e7a5eb435af54faac4b1262c780e7 diff --git a/dev-php/sebastian-complexity/files/autoload-2.0.2.php b/dev-php/sebastian-complexity/files/autoload-2.0.2.php new file mode 100644 index 000000000000..07eb31b7ee93 --- /dev/null +++ b/dev-php/sebastian-complexity/files/autoload-2.0.2.php @@ -0,0 +1,20 @@ +<?php +/* Autoloader for dev-php/sebastian-complexity */ + +if (!class_exists('Fedora\\Autoloader\\Autoload', false)) { + require_once '/usr/share/php/Fedora/Autoloader/autoload.php'; +} + +\Fedora\Autoloader\Autoload::addClassMap( + [ + 'sebastianbergmann\complexity\calculator' => '/Calculator.php', + 'sebastianbergmann\complexity\complexity' => '/Complexity/Complexity.php', + 'sebastianbergmann\complexity\complexitycollection' => '/Complexity/ComplexityCollection.php', + 'sebastianbergmann\complexity\complexitycollectioniterator' => '/Complexity/ComplexityCollectionIterator.php', + 'sebastianbergmann\complexity\complexitycalculatingvisitor' => '/Visitor/ComplexityCalculatingVisitor.php', + 'sebastianbergmann\complexity\cyclomaticcomplexitycalculatingvisitor' => '/Visitor/CyclomaticComplexityCalculatingVisitor.php', + 'sebastianbergmann\complexity\exception' => '/Exception/Exception.php', + 'sebastianbergmann\complexity\runtimeexception' => '/Exception/RuntimeException.php', + ], + __DIR__ +); diff --git a/dev-php/sebastian-comparator/metadata.xml b/dev-php/sebastian-complexity/metadata.xml index c10982b0fbd1..3f4b99635ae6 100644 --- a/dev-php/sebastian-comparator/metadata.xml +++ b/dev-php/sebastian-complexity/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> @@ -7,6 +7,6 @@ </maintainer> <stabilize-allarches/> <upstream> - <remote-id type="github">sebastianbergmann/comparator</remote-id> + <remote-id type="github">sebastianbergmann/complexity</remote-id> </upstream> </pkgmetadata> diff --git a/dev-php/sebastian-exporter/sebastian-exporter-2.0.0.ebuild b/dev-php/sebastian-complexity/sebastian-complexity-2.0.2.ebuild index c009cfcb320a..cda2d641838e 100644 --- a/dev-php/sebastian-exporter/sebastian-exporter-2.0.0.ebuild +++ b/dev-php/sebastian-complexity/sebastian-complexity-2.0.2.ebuild @@ -1,27 +1,27 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 MY_PN="${PN/sebastian-//}" -DESCRIPTION="Export PHP variables for visualization" +DESCRIPTION="Library for calculating the complexity of PHP code units" 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" +KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86" IUSE="" S="${WORKDIR}/${MY_PN}-${PV}" RDEPEND="dev-php/fedora-autoloader - =dev-php/sebastian-recursion-context-2* - >=dev-lang/php-5.6:*" + dev-php/nikic-php-parser + >=dev-lang/php-7.3:*" src_install() { - insinto /usr/share/php/SebastianBergmann/Exporter + insinto /usr/share/php/SebastianBergmann/Complexity doins -r src/* - doins "${FILESDIR}/autoload.php" + newins "${FILESDIR}/autoload-2.0.2.php" autoload.php } diff --git a/dev-php/sebastian-diff/Manifest b/dev-php/sebastian-diff/Manifest index da56572dda16..ae6be20156cd 100644 --- a/dev-php/sebastian-diff/Manifest +++ b/dev-php/sebastian-diff/Manifest @@ -1,2 +1 @@ -DIST sebastian-diff-1.4.1.tar.gz 10310 BLAKE2B facb81bb6ec7a60714493b531eecd0cea6fc8fde0811de982f3a149b2446cfe71f32bfca62bb830dee734966ac6161990e14b666426f5b34c4068922c544f36f SHA512 b355f1407619ea6f1e9153a7946c339e790530c1c86369005998dc0c1078b96ef1ca369fec32f134b056dd8833770fcdb30443334275c8cb17b69e95ef8325a9 DIST sebastian-diff-3.0.2.tar.gz 30918 BLAKE2B 33c307c97d30573c913e4a696710c7b0091b3d0a612661b900dfdb749e4fa5c8970d993c0ee8828c4b0342336c39db4c74702114a5a6ae0daf650fc625baade7 SHA512 c06176de492970f3e55a5fdf1901eb56299b3e49cb838b8cdcbb93bc9cfe9fe9c1b693acb0c598c618760c4de0e49deb2f7bad15a929bd13ef08d30fab41b677 diff --git a/dev-php/sebastian-diff/files/autoload.php b/dev-php/sebastian-diff/files/autoload.php deleted file mode 100644 index 5b72dc303318..000000000000 --- a/dev-php/sebastian-diff/files/autoload.php +++ /dev/null @@ -1,20 +0,0 @@ -<?php -/* Autoloader for dev-php/sebastian-diff */ - -if (!class_exists('Fedora\\Autoloader\\Autoload', false)) { - require_once '/usr/share/php/Fedora/Autoloader/autoload.php'; -} - -\Fedora\Autoloader\Autoload::addClassMap( - array( - 'sebastianbergmann\diff\chunk' => '/Chunk.php', - 'sebastianbergmann\diff\diff' => '/Diff.php', - 'sebastianbergmann\diff\differ' => '/Differ.php', - 'sebastianbergmann\diff\line' => '/Line.php', - 'sebastianbergmann\diff\parser' => '/Parser.php', - 'sebastianbergmann\diff\lcs\longestcommonsubsequence' => '/LCS/LongestCommonSubsequence.php', - 'sebastianbergmann\diff\lcs\memoryefficientimplementation' => '/LCS/MemoryEfficientLongestCommonSubsequenceImplementation.php', - 'sebastianbergmann\diff\lcs\timeefficientimplementation' => '/LCS/TimeEfficientLongestCommonSubsequenceImplementation.php', - ), - __DIR__ -); diff --git a/dev-php/sebastian-diff/metadata.xml b/dev-php/sebastian-diff/metadata.xml index 4dfd55b95825..0bf33cca6401 100644 --- a/dev-php/sebastian-diff/metadata.xml +++ b/dev-php/sebastian-diff/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> diff --git a/dev-php/sebastian-diff/sebastian-diff-1.4.1-r1.ebuild b/dev-php/sebastian-diff/sebastian-diff-1.4.1-r1.ebuild deleted file mode 100644 index a91aa10b3ced..000000000000 --- a/dev-php/sebastian-diff/sebastian-diff-1.4.1-r1.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -MY_PN="diff" - -DESCRIPTION="PHP Diff implementation" -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="" - -S="${WORKDIR}/${MY_PN}-${PV}" - -RDEPEND="dev-php/fedora-autoloader - >=dev-lang/php-5.6:*" - -src_install() { - insinto /usr/share/php/SebastianBergmann/Diff - doins -r src/* - doins "${FILESDIR}/autoload.php" -} diff --git a/dev-php/sebastian-diff/sebastian-diff-3.0.2.ebuild b/dev-php/sebastian-diff/sebastian-diff-3.0.2.ebuild index 5fa9f76c31c8..36507ca1f4ff 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-2021 Gentoo Authors +# Copyright 1999-2023 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="amd64 arm ~hppa ppc ppc64 ~s390 sparc x86" IUSE="" S="${WORKDIR}/${MY_PN}-${PV}" diff --git a/dev-php/sebastian-environment/Manifest b/dev-php/sebastian-environment/Manifest index c7e3c89a8d15..5632e1cea5f6 100644 --- a/dev-php/sebastian-environment/Manifest +++ b/dev-php/sebastian-environment/Manifest @@ -1,2 +1,2 @@ -DIST sebastian-environment-2.0.0.tar.gz 5607 BLAKE2B 3c34c6e61d9a0bdc5df8083331390935bd513d735a1509890a9af05be8b5a718bbb1d5826ab0cb80da2ee5c4cd436b22ef4ccb50c7b4e1c11d361a78b51621c3 SHA512 cf91f0a5f057007f318c5d6b11f8a1345b8df35d513c6291c5b725f0874ed301a64d1097c3fac1e6b32533caa96b3f78ac415d99b9b6ef63dc4a303b90d49c88 DIST sebastian-environment-4.2.3.tar.gz 9622 BLAKE2B d90b181c3aae7c4ea8e172e5b7f897f8a93bf1edbeca19cc8a7a6f10963730ece1f267fed325a6734b1677b75cc8f5b84a5aa55be383a40b1ec2aa7a603bc668 SHA512 871a15297196b21364000d72afa73c2319e741a284c5446443ae3cacd8ce1a07b1ea3b1d8b6b1a88356fb261d093b889508cea63706341413b15f23348f77e80 +DIST sebastian-environment-5.1.3.tar.gz 6766 BLAKE2B b19be2ce9b9d514ed5ce7203f2bb0b06c90d36b42dac5f210cbc9d1a764d727aefd6b18fbd291b82516c8902aa3b895e5563eab4113ad977bbc7aa8e63a69068 SHA512 f11826a65ed758e1fe94e6c53293660406ea93f45c107b78053134d695580cb0507786c6d527fef8e7d52ab8df0b4ad9acb2c4a6c758c3a165658a5c3d138d65 diff --git a/dev-php/sebastian-environment/files/autoload.php b/dev-php/sebastian-environment/files/autoload.php deleted file mode 100644 index 3abd16ee357b..000000000000 --- a/dev-php/sebastian-environment/files/autoload.php +++ /dev/null @@ -1,14 +0,0 @@ -<?php -/* Autoloader for dev-php/sebastian-environment */ - -if (!class_exists('Fedora\\Autoloader\\Autoload', false)) { - require_once '/usr/share/php/Fedora/Autoloader/autoload.php'; -} - -\Fedora\Autoloader\Autoload::addClassMap( - array( - 'sebastianbergmann\environment\console' => '/Console.php', - 'sebastianbergmann\environment\runtime' => '/Runtime.php', - ), - __DIR__ -); diff --git a/dev-php/sebastian-environment/metadata.xml b/dev-php/sebastian-environment/metadata.xml index d44f1c505211..dde356223d79 100644 --- a/dev-php/sebastian-environment/metadata.xml +++ b/dev-php/sebastian-environment/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> diff --git a/dev-php/sebastian-environment/sebastian-environment-4.2.3.ebuild b/dev-php/sebastian-environment/sebastian-environment-4.2.3.ebuild index 3813f97d805c..074266ebd582 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-2021 Gentoo Authors +# Copyright 1999-2023 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="amd64 arm ~hppa ppc ppc64 ~s390 sparc x86" IUSE="" S="${WORKDIR}/${MY_PN}-${PV}" diff --git a/dev-php/sebastian-environment/sebastian-environment-2.0.0.ebuild b/dev-php/sebastian-environment/sebastian-environment-5.1.3.ebuild index cbe1d4def8ed..eddafd682c67 100644 --- a/dev-php/sebastian-environment/sebastian-environment-2.0.0.ebuild +++ b/dev-php/sebastian-environment/sebastian-environment-5.1.3.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 MY_PN="${PN/sebastian-//}" @@ -11,16 +11,16 @@ 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="amd64 arm ~hppa ppc ppc64 ~s390 sparc x86" IUSE="" S="${WORKDIR}/${MY_PN}-${PV}" RDEPEND="dev-php/fedora-autoloader - >=dev-lang/php-5.6:*" + >=dev-lang/php-7.3:*" src_install() { insinto /usr/share/php/SebastianBergmann/Environment doins -r src/* - doins "${FILESDIR}/autoload.php" + newins "${FILESDIR}/autoload-4.2.3.php" autoload.php } diff --git a/dev-php/sebastian-exporter/Manifest b/dev-php/sebastian-exporter/Manifest deleted file mode 100644 index 80befeadcd3f..000000000000 --- a/dev-php/sebastian-exporter/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST sebastian-exporter-2.0.0.tar.gz 7473 BLAKE2B c8f39c9fb19d146959e184ca1356a2f802bb29d31792575fe624072fcc7fc44f5d5d619dbc9dafc9114c46e91ba64338af6902abc2fecc96cfbd0b28294a97cc SHA512 0d418973a6e272e327c16f2393bde09424f8dea6991a804259ac57261efddeb99e33a904bbf2ede99b07def897c0baa12ad9fc04c8c33af684f1fd19d976948a -DIST sebastian-exporter-3.1.2.tar.gz 9996 BLAKE2B 214acefe5679a45d5e67ce635790a12002aca0e380a087e96358200001400458ce907bb4f424ee3683b2fe17fb4bfbb674ebe0afbdcd51b24c654de2b4075736 SHA512 bc6cb070c8c7cd5262262337950ffc70081137c4513c427cc94ac491e2ebe0e91ca4caf7858eb7957f9abe5b4b2b2d6237020a0a6df556439191724f3cda1db8 diff --git a/dev-php/sebastian-exporter/files/autoload.php b/dev-php/sebastian-exporter/files/autoload.php deleted file mode 100644 index 7803f5f61891..000000000000 --- a/dev-php/sebastian-exporter/files/autoload.php +++ /dev/null @@ -1,17 +0,0 @@ -<?php -/* Autoloader for dev-php/sebastian-exporter */ - -if (!class_exists('Fedora\\Autoloader\\Autoload', false)) { - require_once '/usr/share/php/Fedora/Autoloader/autoload.php'; -} - -\Fedora\Autoloader\Autoload::addClassMap( - array( - 'sebastianbergmann\exporter\exporter' => '/Exporter.php', - ), - __DIR__ -); - -\Fedora\Autoloader\Dependencies::required(array( - '/usr/share/php/SebastianBergmann/RecursionContext/autoload.php', -)); diff --git a/dev-php/sebastian-exporter/metadata.xml b/dev-php/sebastian-exporter/metadata.xml deleted file mode 100644 index 14106ec24ebb..000000000000 --- a/dev-php/sebastian-exporter/metadata.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?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">sebastianbergmann/exporter</remote-id> - </upstream> -</pkgmetadata> diff --git a/dev-php/sebastian-exporter/sebastian-exporter-3.1.2.ebuild b/dev-php/sebastian-exporter/sebastian-exporter-3.1.2.ebuild deleted file mode 100644 index 7de2b3bc07d0..000000000000 --- a/dev-php/sebastian-exporter/sebastian-exporter-3.1.2.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -MY_PN="${PN/sebastian-//}" - -DESCRIPTION="Export PHP variables for visualization" -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="" - -S="${WORKDIR}/${MY_PN}-${PV}" - -RDEPEND="dev-php/fedora-autoloader - =dev-php/sebastian-recursion-context-3* - =dev-lang/php-7*:*" - -src_install() { - insinto /usr/share/php/SebastianBergmann/Exporter - doins -r src/* - doins "${FILESDIR}/autoload.php" -} diff --git a/dev-php/sebastian-global-state/Manifest b/dev-php/sebastian-global-state/Manifest deleted file mode 100644 index edc11eb7be53..000000000000 --- a/dev-php/sebastian-global-state/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST sebastian-global-state-1.1.1.tar.gz 7659 BLAKE2B 9793e68f226901cb2d67e3d4ac03cc41323485a1b7d819dfe0a4cd9c00b19eb79ebf539a8705545a4c132ef8a2a286edc804016cb76400256008ecd298f2f3c5 SHA512 dec6387183ea6cf869b1302e641a9d85b6dd69ebf299354825ab2f8a06a82609f8e3a2bdeea6924b5520f813af7493fc8e957c3f9876dcaa302066770997186c -DIST sebastian-global-state-3.0.0.tar.gz 10550 BLAKE2B 58ad62cce7f94805add12105b3000c54e73624c780fa12970e779538f3ff06f145001c6d19e98e817982b092be992b4e1e55638f727fb3e7bad9d12c242546a5 SHA512 2a081fbf7b26afab0eeaf1933887dea12973c6cde1fe7115fe560d56e81ab69dceb7b3431818c51641778f6526abb0055e2a27420e53b2fe90e3f95ee57b01d0 diff --git a/dev-php/sebastian-global-state/files/autoload-3.0.0.php b/dev-php/sebastian-global-state/files/autoload-3.0.0.php deleted file mode 100644 index 01a691b3140d..000000000000 --- a/dev-php/sebastian-global-state/files/autoload-3.0.0.php +++ /dev/null @@ -1,25 +0,0 @@ -<?php -/* Autoloader for dev-php/sebastian-global-state */ - -if (!class_exists('Fedora\\Autoloader\\Autoload', false)) { - require_once '/usr/share/php/Fedora/Autoloader/autoload.php'; -} - -\Fedora\Autoloader\Autoload::addClassMap( - [ - 'sebastianbergmann\globalstate\blacklist' => '/Blacklist.php', - 'sebastianbergmann\globalstate\codeexporter' => '/CodeExporter.php', - 'sebastianbergmann\globalstate\exception' => '/exceptions/Exception.php', - 'sebastianbergmann\globalstate\restorer' => '/Restorer.php', - 'sebastianbergmann\globalstate\runtimeexception' => '/exceptions/RuntimeException.php', - 'sebastianbergmann\globalstate\snapshot' => '/Snapshot.php', - ], - __DIR__ -); - -// Required dependencies. -\Fedora\Autoloader\Dependencies::required([ - __DIR__."/../ObjectReflector/autoload.php", - __DIR__."/../RecursionContext/autoload.php", -]); - diff --git a/dev-php/sebastian-global-state/files/autoload.php b/dev-php/sebastian-global-state/files/autoload.php deleted file mode 100644 index e7c855e9b3f3..000000000000 --- a/dev-php/sebastian-global-state/files/autoload.php +++ /dev/null @@ -1,18 +0,0 @@ -<?php -/* Autoloader for dev-php/sebastian-global-state */ - -if (!class_exists('Fedora\\Autoloader\\Autoload', false)) { - require_once '/usr/share/php/Fedora/Autoloader/autoload.php'; -} - -\Fedora\Autoloader\Autoload::addClassMap( - array( - 'sebastianbergmann\globalstate\blacklist' => '/Blacklist.php', - 'sebastianbergmann\globalstate\codeexporter' => '/CodeExporter.php', - 'sebastianbergmann\globalstate\exception' => '/Exception.php', - 'sebastianbergmann\globalstate\restorer' => '/Restorer.php', - 'sebastianbergmann\globalstate\runtimeexception' => '/RuntimeException.php', - 'sebastianbergmann\globalstate\snapshot' => '/Snapshot.php', - ), - __DIR__ -); diff --git a/dev-php/sebastian-global-state/metadata.xml b/dev-php/sebastian-global-state/metadata.xml deleted file mode 100644 index 5963ae95ffc9..000000000000 --- a/dev-php/sebastian-global-state/metadata.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?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">sebastianbergmann/global-state</remote-id> - </upstream> -</pkgmetadata> 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 deleted file mode 100644 index 707301722613..000000000000 --- a/dev-php/sebastian-global-state/sebastian-global-state-3.0.0.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -MY_PN="${PN/sebastian-//}" - -DESCRIPTION="Snapshotting of global state" -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="" - -S="${WORKDIR}/${MY_PN}-${PV}" - -RDEPEND="dev-php/fedora-autoloader - >=dev-lang/php-7.2:* - >=dev-php/sebastian-object-reflector-1.1.1 - <dev-php/sebastian-object-reflector-2.0 - =dev-php/sebastian-recursion-context-3* -" - -src_install() { - insinto /usr/share/php/SebastianBergmann/GlobalState - doins -r src/* - newins "${FILESDIR}/autoload-3.0.0.php" autoload.php -} diff --git a/dev-php/sebastian-lines-of-code/Manifest b/dev-php/sebastian-lines-of-code/Manifest new file mode 100644 index 000000000000..7f00e06c886c --- /dev/null +++ b/dev-php/sebastian-lines-of-code/Manifest @@ -0,0 +1 @@ +DIST sebastian-lines-of-code-1.0.3.tar.gz 4438 BLAKE2B 1142dabe91907fdcb469fe223ba292b8444f093c6dfa5d4a428357db59635aa760ccda5b8f077def130eeba3365f5d0f50fad465300ba8028edd9d46f99defbc SHA512 09812716a68586cad8304fd14ee4957de68fff6cfabf9982a126ba19d1990a4822962ccbb384170082b18f0ab081d5beeec06c633f4c374f21718a616a054dfd diff --git a/dev-php/sebastian-lines-of-code/files/autoload-1.0.3.php b/dev-php/sebastian-lines-of-code/files/autoload-1.0.3.php new file mode 100644 index 000000000000..5c824ac8c0ac --- /dev/null +++ b/dev-php/sebastian-lines-of-code/files/autoload-1.0.3.php @@ -0,0 +1,19 @@ +<?php +/* Autoloader for dev-php/sebastian-linesofcode */ + +if (!class_exists('Fedora\\Autoloader\\Autoload', false)) { + require_once '/usr/share/php/Fedora/Autoloader/autoload.php'; +} + +\Fedora\Autoloader\Autoload::addClassMap( + [ + 'sebastianbergmann\linesofcode\linesofcode' => '/LinesOfCode.php', + 'sebastianbergmann\linesofcode\linecountingvisitor' => '/LineCountingVisitor.php', + 'sebastianbergmann\linesofcode\counter' => '/Counter.php', + 'sebastianbergmann\linesofcode\exception' => '/Exception/Exception.php', + 'sebastianbergmann\linesofcode\illogicalvaluesexception' => '/Exception/IllogicalValuesException.php', + 'sebastianbergmann\linesofcode\negativevalueexception' => '/Exception/NegativeValueException.php', + 'sebastianbergmann\linesofcode\runtimeexception' => '/Exception/RuntimeException.php', + ], + __DIR__ +); diff --git a/dev-php/phpunit/metadata.xml b/dev-php/sebastian-lines-of-code/metadata.xml index cecdb66c098d..233d89157577 100644 --- a/dev-php/phpunit/metadata.xml +++ b/dev-php/sebastian-lines-of-code/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> @@ -7,6 +7,6 @@ </maintainer> <stabilize-allarches/> <upstream> - <remote-id type="github">sebastianbergmann/phpunit</remote-id> + <remote-id type="github">sebastianbergmann/lines-of-code</remote-id> </upstream> </pkgmetadata> diff --git a/dev-php/sebastian-global-state/sebastian-global-state-1.1.1.ebuild b/dev-php/sebastian-lines-of-code/sebastian-lines-of-code-1.0.3.ebuild index 256ac1e6d492..86fb8d7e506d 100644 --- a/dev-php/sebastian-global-state/sebastian-global-state-1.1.1.ebuild +++ b/dev-php/sebastian-lines-of-code/sebastian-lines-of-code-1.0.3.ebuild @@ -1,26 +1,27 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 MY_PN="${PN/sebastian-//}" -DESCRIPTION="Snapshotting of global state" +DESCRIPTION="Library for counting the lines of code in PHP source code" 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" +KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86" IUSE="" S="${WORKDIR}/${MY_PN}-${PV}" RDEPEND="dev-php/fedora-autoloader - >=dev-lang/php-5.6:*" + dev-php/nikic-php-parser + >=dev-lang/php-7.3:*" src_install() { - insinto /usr/share/php/SebastianBergmann/GlobalState + insinto /usr/share/php/SebastianBergmann/LinesOfCode doins -r src/* - doins "${FILESDIR}/autoload.php" + newins "${FILESDIR}/autoload-1.0.3.php" autoload.php } diff --git a/dev-php/sebastian-object-enumerator/Manifest b/dev-php/sebastian-object-enumerator/Manifest deleted file mode 100644 index ae6ac094869f..000000000000 --- a/dev-php/sebastian-object-enumerator/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST sebastian-object-enumerator-2.0.1.tar.gz 4861 BLAKE2B cc68da9e38e756e478eedab588c023ebbf15d28d6f9e5399f178c581765aa02324ffe6f0bdf5e561f61791f449d8763e6cfdb572c779adaa9c7dedcc8b0f15a8 SHA512 087ef23c079be2ef56948c734cbdefbf4d8cad36c6c26aae5e38401ec3f306d91067aea28a2226811d1ed90611c7c8070a4f5c3733a24eb56f6a177eb332a9b3 -DIST sebastian-object-enumerator-3.0.3.tar.gz 4989 BLAKE2B 8d2314daf82280dc746cdc91c3c927d012440ef162a59918e038a15775f0113cf7bc0ae0eafb83d6d6992cdb2680bdd92935789584305906747fd71f13fcad5a SHA512 9bbff5081e1627d7ab98e01830cf6245f15b3ca96a56f6074e090f10862d19d0849251d69bf1117d3634b7e0ef86e266b2e9d4062e75eff9c9bc5f994dfe9a2d diff --git a/dev-php/sebastian-object-enumerator/files/autoload-3.0.3.php b/dev-php/sebastian-object-enumerator/files/autoload-3.0.3.php deleted file mode 100644 index 07afae81e5d4..000000000000 --- a/dev-php/sebastian-object-enumerator/files/autoload-3.0.3.php +++ /dev/null @@ -1,20 +0,0 @@ -<?php -/* Autoloader for dev-php/sebastian-object-enumerator */ - -if (!class_exists('Fedora\\Autoloader\\Autoload', false)) { - require_once '/usr/share/php/Fedora/Autoloader/autoload.php'; -} - -\Fedora\Autoloader\Autoload::addClassMap( - [ - 'sebastianbergmann\objectenumerator\enumerator' => '/Enumerator.php', - 'sebastianbergmann\objectenumerator\exception' => '/Exception.php', - 'sebastianbergmann\objectenumerator\invalidargumentexception' => '/InvalidArgumentException.php', - ], - __DIR__ -); - -\Fedora\Autoloader\Dependencies::required([ - __DIR__.'/../ObjectReflector/autoload.php', - __DIR__.'/../RecursionContext/autoload.php', -]); diff --git a/dev-php/sebastian-object-enumerator/files/autoload.php b/dev-php/sebastian-object-enumerator/files/autoload.php deleted file mode 100644 index cac71a54f125..000000000000 --- a/dev-php/sebastian-object-enumerator/files/autoload.php +++ /dev/null @@ -1,19 +0,0 @@ -<?php -/* Autoloader for dev-php/sebastian-object-enumerator */ - -if (!class_exists('Fedora\\Autoloader\\Autoload', false)) { - require_once '/usr/share/php/Fedora/Autoloader/autoload.php'; -} - -\Fedora\Autoloader\Autoload::addClassMap( - array( - 'sebastianbergmann\objectenumerator\enumerator' => '/Enumerator.php', - 'sebastianbergmann\objectenumerator\exception' => '/Exception.php', - 'sebastianbergmann\objectenumerator\invalidargumentexception' => '/InvalidArgumentException.php', - ), - __DIR__ -); - -\Fedora\Autoloader\Dependencies::required(array( - '/usr/share/php/SebastianBergmann/RecursionContext/autoload.php', -)); diff --git a/dev-php/sebastian-object-enumerator/metadata.xml b/dev-php/sebastian-object-enumerator/metadata.xml deleted file mode 100644 index 492ff122fad7..000000000000 --- a/dev-php/sebastian-object-enumerator/metadata.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?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">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 deleted file mode 100644 index 99e54f1f8bae..000000000000 --- a/dev-php/sebastian-object-enumerator/sebastian-object-enumerator-2.0.1.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -MY_PN="${PN/sebastian-//}" - -DESCRIPTION="Traverses array structures and object graphs to enumerate all referenced objects" -HOMEPAGE="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="" - -S="${WORKDIR}/${MY_PN}-${PV}" - -RDEPEND="dev-php/fedora-autoloader - <dev-php/sebastian-recursion-context-3.0 - >=dev-lang/php-5.6:*" - -src_install() { - insinto /usr/share/php/SebastianBergmann/ObjectEnumerator - doins -r src/* - doins "${FILESDIR}/autoload.php" -} diff --git a/dev-php/sebastian-object-enumerator/sebastian-object-enumerator-3.0.3.ebuild b/dev-php/sebastian-object-enumerator/sebastian-object-enumerator-3.0.3.ebuild deleted file mode 100644 index 90dcda08ea79..000000000000 --- a/dev-php/sebastian-object-enumerator/sebastian-object-enumerator-3.0.3.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -MY_PN="${PN/sebastian-//}" - -DESCRIPTION="Traverses array structures and object graphs to enumerate all referenced objects" -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="" - -S="${WORKDIR}/${MY_PN}-${PV}" - -RDEPEND="dev-php/fedora-autoloader - <dev-php/sebastian-object-reflector-2.0 - >=dev-php/sebastian-recursion-context-3.0 - <dev-php/sebastian-recursion-context-4.0 - =dev-lang/php-7*:*" - -src_install() { - insinto /usr/share/php/SebastianBergmann/ObjectEnumerator - doins -r src/* - newins "${FILESDIR}/autoload-3.0.3.php" autoload.php -} diff --git a/dev-php/sebastian-object-reflector/Manifest b/dev-php/sebastian-object-reflector/Manifest deleted file mode 100644 index f011dbba2a74..000000000000 --- a/dev-php/sebastian-object-reflector/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -DIST sebastian-object-reflector-1.1.1.tar.gz 4755 BLAKE2B c549186722bde6625d44478dc90023511cd4e2fb9fe206b08881746e4443275b20eaad86a13bc202b3f464cad7239aac28da9962db7a97b9c789534424cb3ead SHA512 42dc43d1a606b1aedf2cc40443139d115fc38a50a2e51d2b4d72ecededf39bf5cecbed6d1bb002dbb6f7bd3c7da50d9436f7489f9078d52d61af7777f31f5e57 -DIST sebastian-object-reflector-1.1.2.tar.gz 4814 BLAKE2B 0692da7e50e6ff262395ece9bae1e02138bb3d86bd8b992b32d1eff9e3eabf5a1b3246e9e117314eaf49fdc5ed12b599bfb6fdab7de45506b392bf1d7dd94879 SHA512 2cfbc24d2f2105000ba039226e6dc399b847d60ca84f6643755c8cfa2d5efe3259da2e7762670ab5d330fe8075eca3124dbfe0a4780dc873e39e8c1420267c4b -DIST sebastian-object-reflector-2.0.4.tar.gz 3366 BLAKE2B 9ceb1666e2e1e3679b66473b48a9c0a79fb905a7f0b2dbc5ba36766c1a15ba9ea5678da7a15664ef63a1a7fb1add80535da4ff065a356d085d966704e5647e3f SHA512 e7f9932a7a7c123008490a07bd7fb0a06acd6f0c39d1efd8de677a7ab9af3d98d72d8cf6c3a06ca15f869069a6709f1f70437cefc9c171b4f13436f68ab7112f diff --git a/dev-php/sebastian-object-reflector/files/autoload.php b/dev-php/sebastian-object-reflector/files/autoload.php deleted file mode 100644 index 5190fda9b96c..000000000000 --- a/dev-php/sebastian-object-reflector/files/autoload.php +++ /dev/null @@ -1,15 +0,0 @@ -<?php -/* Autoloader for dev-php/sebastian-version */ - -if (!class_exists('Fedora\\Autoloader\\Autoload', false)) { - require_once '/usr/share/php/Fedora/Autoloader/autoload.php'; -} - -\Fedora\Autoloader\Autoload::addClassMap( - [ - 'sebastianbergmann\objectreflector\exception' => '/Exception.php', - 'sebastianbergmann\objectreflector\invalidargumentexception' => '/InvalidArgumentException.php', - 'sebastianbergmann\objectreflector\objectreflector' => '/ObjectReflector.php', - ], - __DIR__ -); diff --git a/dev-php/sebastian-object-reflector/metadata.xml b/dev-php/sebastian-object-reflector/metadata.xml deleted file mode 100644 index 0c15891ac5ab..000000000000 --- a/dev-php/sebastian-object-reflector/metadata.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?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">sebastianbergmann/version</remote-id> - </upstream> -</pkgmetadata> 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 deleted file mode 100644 index fc8ff64226f6..000000000000 --- a/dev-php/sebastian-object-reflector/sebastian-object-reflector-1.1.1.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -MY_PN="object-reflector" - -DESCRIPTION="Allows reflection of object attributes, including inherited and non-public ones" -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="" - -S="${WORKDIR}/${MY_PN}-${PV}" - -RDEPEND="dev-php/fedora-autoloader - =dev-lang/php-7*" - -src_install() { - insinto /usr/share/php/SebastianBergmann/ObjectReflector - doins src/ObjectReflector.php src/{,InvalidArgument}Exception.php - doins "${FILESDIR}/autoload.php" -} diff --git a/dev-php/sebastian-object-reflector/sebastian-object-reflector-1.1.2.ebuild b/dev-php/sebastian-object-reflector/sebastian-object-reflector-1.1.2.ebuild deleted file mode 100644 index 4373ddb60bb0..000000000000 --- a/dev-php/sebastian-object-reflector/sebastian-object-reflector-1.1.2.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -MY_PN="${PN/sebastian-/}" - -DESCRIPTION="Allows reflection of object attributes, including inherited and non-public ones" -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="" - -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/autoload.php \ - --template fedora2 \ - --basedir src \ - src \ - || die -} - -src_install() { - insinto /usr/share/php/SebastianBergmann/ObjectReflector - doins -r src/. - - einstalldocs -} diff --git a/dev-php/sebastian-object-reflector/sebastian-object-reflector-2.0.4.ebuild b/dev-php/sebastian-object-reflector/sebastian-object-reflector-2.0.4.ebuild deleted file mode 100644 index 240d65e2677c..000000000000 --- a/dev-php/sebastian-object-reflector/sebastian-object-reflector-2.0.4.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -MY_PN="${PN/sebastian-/}" - -DESCRIPTION="Allows reflection of object attributes, including inherited and non-public ones" -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="" - -BDEPEND="dev-php/theseer-Autoload" - -RDEPEND="dev-php/fedora-autoloader - >=dev-lang/php-7.3:*" - -S="${WORKDIR}/${MY_PN}-${PV}" - -src_prepare() { - default - - phpab \ - --output src/autoload.php \ - --template fedora2 \ - --basedir src \ - src \ - || die -} - -src_install() { - insinto /usr/share/php/SebastianBergmann/ObjectReflector - doins -r src/. - - einstalldocs -} diff --git a/dev-php/sebastian-recursion-context/Manifest b/dev-php/sebastian-recursion-context/Manifest deleted file mode 100644 index 75c7c5f109e9..000000000000 --- a/dev-php/sebastian-recursion-context/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST sebastian-recursion-context-2.0.0.tar.gz 4526 BLAKE2B 54ecdfc255c3bdbedc2a909f5b569c62b19e2e66fc5ea4ae7be8401516c142b43e611d5e8f1c056be329983f21e1a8b85e7fb2ff1ddb92a2f6aad4d4191418a6 SHA512 9d25d148decc81f5a21d7a4e1f966563bf6ec765fcc1b1ce779668b74dfa39959db07cf296e9cffcbcb3943c8911709bb73f22c5bfcc81c5d2fcbb51967cf75e -DIST sebastian-recursion-context-3.0.0.tar.gz 4414 BLAKE2B 04a0aca4b6012013306c813109c0ed6f60d2f4f1381ba6506398388b5065d69375191290d33cdc4b82359dc30b1fd98ef61005a657fa8db302472597950255b5 SHA512 0fce5709cb22818de6bbfda1ba2a99fea511d5b36bcbe7955661d756a6f82ba84cbf8fb4eb421d6b51ae9e36a8edac56c5bafbccf8b665a0296883ea0dbb3b91 diff --git a/dev-php/sebastian-recursion-context/files/autoload.php b/dev-php/sebastian-recursion-context/files/autoload.php deleted file mode 100644 index 5f7e83143612..000000000000 --- a/dev-php/sebastian-recursion-context/files/autoload.php +++ /dev/null @@ -1,15 +0,0 @@ -<?php -/* Autoloader for dev-php/sebastian-recursion-context */ - -if (!class_exists('Fedora\\Autoloader\\Autoload', false)) { - require_once '/usr/share/php/Fedora/Autoloader/autoload.php'; -} - -\Fedora\Autoloader\Autoload::addClassMap( - array( - 'sebastianbergmann\recursioncontext\context' => '/Context.php', - 'sebastianbergmann\recursioncontext\exception' => '/Exception.php', - 'sebastianbergmann\recursioncontext\invalidargumentexception' => '/InvalidArgumentException.php', - ), - __DIR__ -); diff --git a/dev-php/sebastian-recursion-context/metadata.xml b/dev-php/sebastian-recursion-context/metadata.xml deleted file mode 100644 index 21c373eb5ef4..000000000000 --- a/dev-php/sebastian-recursion-context/metadata.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?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">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 deleted file mode 100644 index 7aeb39d9e647..000000000000 --- a/dev-php/sebastian-recursion-context/sebastian-recursion-context-2.0.0.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -MY_PN="${PN/sebastian-//}" - -DESCRIPTION="Recursively process PHP variables" -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="" - -S="${WORKDIR}/${MY_PN}-${PV}" - -RDEPEND="dev-php/fedora-autoloader - >=dev-lang/php-5.6:*" - -src_install() { - insinto /usr/share/php/SebastianBergmann/RecursionContext - doins -r src/* - doins "${FILESDIR}/autoload.php" -} diff --git a/dev-php/sebastian-recursion-context/sebastian-recursion-context-3.0.0.ebuild b/dev-php/sebastian-recursion-context/sebastian-recursion-context-3.0.0.ebuild deleted file mode 100644 index fc0a0fd747d0..000000000000 --- a/dev-php/sebastian-recursion-context/sebastian-recursion-context-3.0.0.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -MY_PN="${PN/sebastian-//}" - -DESCRIPTION="Recursively process PHP variables" -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="" - -S="${WORKDIR}/${MY_PN}-${PV}" - -RDEPEND="dev-php/fedora-autoloader - =dev-lang/php-7*:*" - -src_install() { - insinto /usr/share/php/SebastianBergmann/RecursionContext - doins -r src/* - doins "${FILESDIR}/autoload.php" -} diff --git a/dev-php/sebastian-resource-operations/Manifest b/dev-php/sebastian-resource-operations/Manifest index 3fedbbc8c9eb..50a598a1575e 100644 --- a/dev-php/sebastian-resource-operations/Manifest +++ b/dev-php/sebastian-resource-operations/Manifest @@ -1,2 +1 @@ -DIST sebastian-resource-operations-1.0.0.tar.gz 6449 BLAKE2B 0f748d4792a3d4705560c79047fbdb9c6371435600dbd8373e4c60c8edc436f3487264107b7f3d76125bde3ec7b30062587c96dad7612fdc4e4132d3912813ef SHA512 d11d06c9b8b4a1507238443588f34a85836fcd65d2afdb9bcf3cecfe352cba46c9349988550e901c301db8a21f19cc960a8164653ac66e57661cebddf52ad906 DIST sebastian-resource-operations-2.0.1.tar.gz 17772 BLAKE2B 8a98c2735973f063fefba9079bf10e1b4a1317eab2e9326bf338d50b2c278673ade93bc20fb415d4d33046575045d0e2d147b5b1ba38812c84031c7a691d1946 SHA512 991716a948f3492b2f3c886f07485fec26ad7e31f8588a2cbf6deff8ef4791e403962578590b117ed43def7753a5f44f0f8c8f92994bc58295d58db3f7d71021 diff --git a/dev-php/sebastian-resource-operations/metadata.xml b/dev-php/sebastian-resource-operations/metadata.xml index f4be19dca0e2..15259de56742 100644 --- a/dev-php/sebastian-resource-operations/metadata.xml +++ b/dev-php/sebastian-resource-operations/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> diff --git a/dev-php/sebastian-resource-operations/sebastian-resource-operations-1.0.0.ebuild b/dev-php/sebastian-resource-operations/sebastian-resource-operations-1.0.0.ebuild deleted file mode 100644 index df963717269d..000000000000 --- a/dev-php/sebastian-resource-operations/sebastian-resource-operations-1.0.0.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -MY_PN="${PN/sebastian-//}" - -DESCRIPTION="Provides a list of PHP built-in functions that operate on resources" -HOMEPAGE="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="" - -S="${WORKDIR}/${MY_PN}-${PV}" - -RDEPEND="dev-php/fedora-autoloader - >=dev-lang/php-5.6:* - " - -src_install() { - insinto /usr/share/php/SebastianBergmann/ResourceOperations - doins -r src/* - doins "${FILESDIR}/autoload.php" -} diff --git a/dev-php/sebastian-resource-operations/sebastian-resource-operations-2.0.1.ebuild b/dev-php/sebastian-resource-operations/sebastian-resource-operations-2.0.1.ebuild index e79868e3a85c..d1567293ca48 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-2021 Gentoo Authors +# Copyright 1999-2023 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="amd64 arm ~hppa 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 9745bd5bc7f5..0976677111a9 100644 --- a/dev-php/sebastian-type/metadata.xml +++ b/dev-php/sebastian-type/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> diff --git a/dev-php/sebastian-type/sebastian-type-1.1.3.ebuild b/dev-php/sebastian-type/sebastian-type-1.1.3.ebuild index 4de318935931..db14f958a597 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-2021 Gentoo Authors +# Copyright 1999-2023 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="amd64 arm ~hppa ppc ppc64 ~s390 sparc x86" IUSE="" S="${WORKDIR}/${MY_PN}-${PV}" diff --git a/dev-php/sebastian-type/sebastian-type-1.1.4.ebuild b/dev-php/sebastian-type/sebastian-type-1.1.4.ebuild index 2a0d5cf2d201..6529fdd3fd66 100644 --- a/dev-php/sebastian-type/sebastian-type-1.1.4.ebuild +++ b/dev-php/sebastian-type/sebastian-type-1.1.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 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="amd64 arm ~hppa ppc ppc64 ~s390 sparc x86" IUSE="" BDEPEND="dev-php/theseer-Autoload" diff --git a/dev-php/sebastian-version/Manifest b/dev-php/sebastian-version/Manifest index 629901c1b48d..93119515f194 100644 --- a/dev-php/sebastian-version/Manifest +++ b/dev-php/sebastian-version/Manifest @@ -1 +1 @@ -DIST sebastian-version-2.0.1.tar.gz 3581 BLAKE2B c6da754aa5ef6f46309d52f7d36a30a1d1b9b847aa90d62481633e0c290fe58554772d4016aa90f79b153b0e3df377269f7dbf007dc7049226899ef9bc2aa868 SHA512 12a813ff08996f8a6e53069ea297fb00f5fc9b58ce463b4008791cadc19575539bdb17acbf1f2fa67b18ce5a9207c9acd47183d520b60d6a188569f513d8a661 +DIST sebastian-version-3.0.2.tar.gz 3316 BLAKE2B ecf9bd1e6ad471271410863ac4ce1066cfe13467bc324d4313f829c0bffe765ac07af514f096bc008c95c2e981821f2c8f905646d5194d61cc5c800f173fd345 SHA512 4dba99c14827ef2a402af1faa09c42e55dd16440c0d26fa97927f1c211e779a0d7f6ca005d87fbb76a081bf116d2a7fc3f5296481c908a1eeece162e4aad084d diff --git a/dev-php/sebastian-version/metadata.xml b/dev-php/sebastian-version/metadata.xml index 9738b305aae0..ec74c535c743 100644 --- a/dev-php/sebastian-version/metadata.xml +++ b/dev-php/sebastian-version/metadata.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> <name>PHP</name> </maintainer> + <stabilize-allarches/> <upstream> <remote-id type="github">sebastianbergmann/version</remote-id> </upstream> diff --git a/dev-php/sebastian-version/sebastian-version-2.0.1.ebuild b/dev-php/sebastian-version/sebastian-version-3.0.2.ebuild index 5e8a74302553..feee665aa581 100644 --- a/dev-php/sebastian-version/sebastian-version-2.0.1.ebuild +++ b/dev-php/sebastian-version/sebastian-version-3.0.2.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 MY_PN="version" @@ -11,13 +11,13 @@ 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="amd64 arm ~hppa ppc ppc64 ~s390 sparc x86" IUSE="" S="${WORKDIR}/${MY_PN}-${PV}" RDEPEND="dev-php/fedora-autoloader - >=dev-lang/php-5.6:*" + >=dev-lang/php-7.3:*" src_install() { insinto /usr/share/php/SebastianBergmann diff --git a/dev-php/securimage/Manifest b/dev-php/securimage/Manifest deleted file mode 100644 index 0ebeca561686..000000000000 --- a/dev-php/securimage/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST securimage-3.6.5.tar.gz 7590487 BLAKE2B 0285860497edf6c89e043b8cb660a6f5948e6ae7d80dacdd83ed37705856fd225e0c9ed43973eb837e85734f1d3c528d210f251d5cbc68c457cac224fea55fb7 SHA512 776130271f54d50cae5d9a71fed4bfe4870c187cbda55314b49706b3d88c8e76c283c09ead195f89b074fba8b16ddb22e25c268d80d01ee34e9dc5d624e12e7d diff --git a/dev-php/securimage/metadata.xml b/dev-php/securimage/metadata.xml deleted file mode 100644 index 7a38bb900964..000000000000 --- a/dev-php/securimage/metadata.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <!-- maintainer-needed --> -</pkgmetadata> diff --git a/dev-php/securimage/securimage-3.6.5.ebuild b/dev-php/securimage/securimage-3.6.5.ebuild deleted file mode 100644 index 8d408cebb0e0..000000000000 --- a/dev-php/securimage/securimage-3.6.5.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="PHP captcha creator and validator library" -HOMEPAGE="https://www.phpcaptcha.org/" -SRC_URI="https://github.com/dapphp/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD GPL-3+" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND="dev-lang/php[gd,truetype] - virtual/httpd-php" - -src_install() { - # Grab all PHP files except the examples. - set *.php - local php_files=${@/*example*/} - - insinto /usr/share/php/${PN} - doins -r ${php_files} *.{ttf,swf} audio backgrounds database images words - - dodoc README* -} diff --git a/dev-php/semver/Manifest b/dev-php/semver/Manifest index 9e7cde8809a6..b3ba0217d881 100644 --- a/dev-php/semver/Manifest +++ b/dev-php/semver/Manifest @@ -1,5 +1,2 @@ -DIST semver-1.4.2.tar.gz 10408 BLAKE2B 1504b6dff157e1b3c5ca338060e668f478fdd4e6a61be7835af6da669d22ef15a2143551e96bd01926fd2b408736fd8e70df22e1364b80712dc7d65608889b27 SHA512 2e41e2e70e9e62b280bff40b1a05b3803d95fb088eb4ce395e1f1fed79a40efc3a0ad16f8506d83a81b0e1d08e069640b2b084cc91aeb1ed41d934fd18249fe2 -DIST semver-1.5.1.tar.gz 10534 BLAKE2B ca6743415867db96696cc604c00a1ffabb35617af055a621079621fb73d951453f4c893ccf1377a142c05f5481a42884b380455c37e4e945c382f811a3917f72 SHA512 c9b582217060124fe20dcd7821e669173b9deffa976ad8921f48d22793f03af5deb4006380932e49e06da13a63db9aaa63254118d43448575446b78226d9cf3f -DIST semver-1.7.0.tar.gz 11249 BLAKE2B 8997f07f009f64472762fdccc8255d7149a03416bf912d74bb818d8bb3b31e81c5897d15e3a0dc0b6ad28fe2e0ddadc13f8c4f9ff63bfb05f6c5880a74d90a89 SHA512 7d90d172c91d56218b44d994d9b997486c950c72d19026c9a9cccd594348896222aa4b74ba9fd0735e2702b7a63133fb6a16089ace97bd2b8f97dbe862b07e82 -DIST semver-1.7.1.tar.gz 11433 BLAKE2B 9f0f054bd657081efd73a23c2ce3d04d12c2fbd8115c54d5b17ca895e7a6bf47a50fdd13213560dd7a0c75a427dbc2aba5c610a726dcc2729d7a531e0c6c1d7d SHA512 7e2f60dfbe7b39eb2a6fcb0439e4ad94d981f4b7b467f0853e923bc22dfe95d1ecaf6ae537ddc46f774cddd0d01b4cf73b6588dbcac45edc7811cacf26f3d23f DIST semver-3.2.4.tar.gz 19806 BLAKE2B 8d8c78f570c7b2c4b37a096e2835c2611d09e77cafaab555b588d48fa0600b85bc9487d54d67556eb2440e0d04b6ffa46c54dd678b4c2cc7b206fe6d33157111 SHA512 ed2aed0a55e23f76b05b1dc3eee18938eda1d21205f786d02c83a879dd0ef5aaf799201967c2166e70f383980ab047bd93dd7d1b5d7154d853d551bafa2eddb1 +DIST semver-3.2.6.tar.gz 19872 BLAKE2B 239e6a82168e5b9b1077c25de672138f11395bebe31fec088ff874cd83b0acf52b10e155740376733a091bb2844082a5db79740a10cfb70a06020d3c45555d8a SHA512 44e2d195c224af93a6440a97a90e4a201221a7d1ce6bc413b8c86e4bc3d24ede193179294e9bd83da636827e8530f3aefc212652210655be6aa7cc1681a28f3f diff --git a/dev-php/semver/files/autoload.php b/dev-php/semver/files/autoload.php deleted file mode 100644 index bf9e65beee0b..000000000000 --- a/dev-php/semver/files/autoload.php +++ /dev/null @@ -1,8 +0,0 @@ -<?php -/* Autoloader for composer/ca-bundle and its dependencies */ - -if (!class_exists('Fedora\\Autoloader\\Autoload', false)) { - require_once 'Fedora/Autoloader/autoload.php'; -} - -\Fedora\Autoloader\Autoload::addPsr4('Composer\\Semver\\', __DIR__); diff --git a/dev-php/semver/metadata.xml b/dev-php/semver/metadata.xml index 6ec5f5908294..df116260c3e5 100644 --- a/dev-php/semver/metadata.xml +++ b/dev-php/semver/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person" proxied="yes"> <email>guillaumeseren@gmail.com</email> diff --git a/dev-php/semver/semver-1.4.2.ebuild b/dev-php/semver/semver-1.4.2.ebuild deleted file mode 100644 index 98683b0d6256..000000000000 --- a/dev-php/semver/semver-1.4.2.ebuild +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="Semantic versioning utilities, constraint parsing, and checking" -HOMEPAGE="https://github.com/composer/semver" -SRC_URI="https://github.com/composer/semver/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -RDEPEND="dev-lang/php:* - dev-php/fedora-autoloader" - -# The releases don't contain the test suite at the moment, see -# https://github.com/composer/semver/issues/59 - -src_install() { - insinto '/usr/share/php/Composer/Semver' - doins -r src/. "${FILESDIR}/autoload.php" - dodoc README.md -} diff --git a/dev-php/semver/semver-1.5.1.ebuild b/dev-php/semver/semver-1.5.1.ebuild deleted file mode 100644 index 1301f1d01d41..000000000000 --- a/dev-php/semver/semver-1.5.1.ebuild +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="Semantic versioning utilities, constraint parsing, and checking" -HOMEPAGE="https://github.com/composer/semver" -SRC_URI="https://github.com/composer/semver/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -RDEPEND="dev-lang/php:* - dev-php/fedora-autoloader" - -# The releases don't contain the test suite at the moment, see -# https://github.com/composer/semver/issues/59 - -src_install() { - insinto '/usr/share/php/Composer/Semver' - doins -r src/. "${FILESDIR}/autoload.php" - dodoc README.md -} diff --git a/dev-php/semver/semver-1.7.0.ebuild b/dev-php/semver/semver-1.7.0.ebuild deleted file mode 100644 index 56bf1017f3b7..000000000000 --- a/dev-php/semver/semver-1.7.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 - -DESCRIPTION="Semantic versioning utilities, constraint parsing, and checking" -HOMEPAGE="https://github.com/composer/semver" -SRC_URI="https://github.com/composer/semver/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -RDEPEND="dev-lang/php:* - dev-php/fedora-autoloader" - -# The releases don't contain the test suite at the moment, see -# https://github.com/composer/semver/issues/59 - -src_install() { - insinto '/usr/share/php/Composer/Semver' - doins -r src/. "${FILESDIR}/autoload.php" - dodoc README.md -} diff --git a/dev-php/semver/semver-1.7.1.ebuild b/dev-php/semver/semver-3.2.6.ebuild index 56bf1017f3b7..092cd6f87554 100644 --- a/dev-php/semver/semver-1.7.1.ebuild +++ b/dev-php/semver/semver-3.2.6.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -9,16 +9,27 @@ SRC_URI="https://github.com/composer/semver/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 ~arm64 x86" -RDEPEND="dev-lang/php:* - dev-php/fedora-autoloader" +BDEPEND="dev-php/theseer-Autoload" -# The releases don't contain the test suite at the moment, see -# https://github.com/composer/semver/issues/59 +RDEPEND="dev-php/fedora-autoloader + >=dev-lang/php-7.2:*" + +src_prepare() { + default + + phpab \ + --output src/autoload.php \ + --template fedora2 \ + --basedir src \ + src \ + || die +} src_install() { insinto '/usr/share/php/Composer/Semver' - doins -r src/. "${FILESDIR}/autoload.php" - dodoc README.md + doins -r src/* + + einstalldocs } diff --git a/dev-php/simpletest/Manifest b/dev-php/simpletest/Manifest deleted file mode 100644 index 1d52062da053..000000000000 --- a/dev-php/simpletest/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST simpletest-1.1.7.tar.gz 763745 BLAKE2B 20c61b8dce5c628c6f26ef60b605b7ce3bb61c95a43a8f29bf5d176c03bc43f1e463d5ff301c93ddd71e43419773f2c99a3cb52561c6a8d6b0d586ef2341708e SHA512 105ce73a36bb3885ee27052b5bc7fde775ec04afc725ab45c79cf103639e9c7d8bd7f9e279f5b07ad5d1e9ccf3797741506e3bf07b57283b5f1b3f39901ad852 diff --git a/dev-php/simpletest/metadata.xml b/dev-php/simpletest/metadata.xml deleted file mode 100644 index 26c2f4a62f95..000000000000 --- a/dev-php/simpletest/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>php-bugs@gentoo.org</email> - <name>PHP</name> - </maintainer> - <upstream> - <remote-id type="github">simpletest/simpletest</remote-id> - </upstream> -</pkgmetadata> diff --git a/dev-php/simpletest/simpletest-1.1.7.ebuild b/dev-php/simpletest/simpletest-1.1.7.ebuild deleted file mode 100644 index 90a8205b07e1..000000000000 --- a/dev-php/simpletest/simpletest-1.1.7.ebuild +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -KEYWORDS="~amd64 ~x86" - -DESCRIPTION="A PHP testing framework" -HOMEPAGE="http://www.simpletest.org/" -SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" -LICENSE="LGPL-2.1" -SLOT="0" -IUSE="" - -DEPEND="" -RDEPEND="dev-lang/php:*" - -src_install() { - local DOCS=( docs HELP_MY_TESTS_DONT_WORK_ANYMORE README.md TODO.xml ) - einstalldocs - - insinto "/usr/share/php/${PN}" - doins -r *.php extensions packages tutorials -} diff --git a/dev-php/smarty/Manifest b/dev-php/smarty/Manifest index 59f8dd20ec00..bf76715a4a1c 100644 --- a/dev-php/smarty/Manifest +++ b/dev-php/smarty/Manifest @@ -1,2 +1 @@ -DIST manual-en.3.1.14.zip 408414 BLAKE2B 03d4e7a386eb3bd5b19e5c555ec34b86812838a5b5fac8ec0ab9701fba89a5867714da57d950f68224a89bbe2267c18d638ee850681860de309c74bbfb3d0a0b SHA512 d384e3856b45ed3f992f3732a5465120abe9fb947cdf13ff67a9c4264f72987d24885ee61cd7309b728e64cdfe4f34c3e7f757096d35de56d962f3b78def9e58 -DIST smarty-3.1.39.tar.gz 264604 BLAKE2B ab5e8e052fd83e38a99725f03dcc4a206848c153b0584c12de1c605d9a9a5b47d23c29bd8a5179e53cf73921c89632ee2c4e9921002f41a4de97c6dc2e7d91a1 SHA512 84566bdefd83784c5b22ea4c21405261010a03e07839b15f6e1837aeb93ae12ae724a31648627b5f8794659e2fcd6cbbcd633be8d290dd1744e45e87fbe60fd2 +DIST smarty-4.3.1.tar.gz 361248 BLAKE2B b09ab14742b9ebdfd1e31ec9d2ac79016ce8869403da67ea241b735875ef25f40c2936a41bda5647ca697b708b91b02a29f5d17ebbc7d6049bf468851f0bc70f SHA512 03a42007fd1c03ba502b7a2255071638e978a54e5d75d4542a033e9f490c7c41587b5593316269107fe904a7b96a1a3337bf9525e038a5bb4051cc9aef13940f diff --git a/dev-php/smarty/metadata.xml b/dev-php/smarty/metadata.xml index 0a961b37b77e..36b08b7f5c7d 100644 --- a/dev-php/smarty/metadata.xml +++ b/dev-php/smarty/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> diff --git a/dev-php/smarty/smarty-3.1.39.ebuild b/dev-php/smarty/smarty-4.3.1.ebuild index e78d49468259..b84ccc12b9f3 100644 --- a/dev-php/smarty/smarty-3.1.39.ebuild +++ b/dev-php/smarty/smarty-4.3.1.ebuild @@ -1,21 +1,16 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 - -DOC_PV="3.1.14" +EAPI=8 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 )" +HOMEPAGE="https://www.smarty.net/ https://github.com/smarty-php/smarty/" +SRC_URI="https://github.com/smarty-php/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="LGPL-3" SLOT="0" -KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86" -IUSE="doc" - -BDEPEND="doc? ( app-arch/unzip )" +KEYWORDS="amd64 ~hppa ppc ppc64 sparc x86" +IUSE="doc examples" # PHP unicode support is detected at runtime, and the cached templates # that smarty generates depend on it. If, later on, PHP is reinstalled @@ -24,13 +19,22 @@ BDEPEND="doc? ( app-arch/unzip )" # functions. See bug #532618. RDEPEND="dev-lang/php:*[unicode]" +src_prepare() { + default + + # Prepare the docs and examples for easy dodocing. + rm docs/_config.yml || die + mv -v demo examples || die +} + 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/"* + local DOCS=( CHANGELOG.md README.md SECURITY.md ) + + use doc && dodoc -r docs/* + use examples && dodoc -r examples einstalldocs } diff --git a/dev-php/snuffleupagus/Manifest b/dev-php/snuffleupagus/Manifest new file mode 100644 index 000000000000..af5d6f90c9d0 --- /dev/null +++ b/dev-php/snuffleupagus/Manifest @@ -0,0 +1 @@ +DIST snuffleupagus-0.8.3.tar.gz 11987086 BLAKE2B 989dbb57a8375cb394dfb41f07de5c048b66936a8e5b3dd14fb3609149dd371203f7a30d1fbcfe8ef6faa2ba5864c68b209b1b209541c348c0277c8bd12b568a SHA512 426ab7509e31f712dbef1505bf60f00d3a31481de1fbb0b438e45fb45a50fbdc16204d6af18490c5522a41e62d83107f280a20ac2ffc2795da68407b0dac81d6 diff --git a/dev-php/phpmd/metadata.xml b/dev-php/snuffleupagus/metadata.xml index 133c28059f56..6cb8e5e502b5 100644 --- a/dev-php/phpmd/metadata.xml +++ b/dev-php/snuffleupagus/metadata.xml @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> <name>PHP</name> </maintainer> <upstream> - <remote-id type="github">phpmd/phpmd</remote-id> + <remote-id type="github">jvoisin/snuffleupagus</remote-id> </upstream> </pkgmetadata> diff --git a/dev-php/snuffleupagus/snuffleupagus-0.8.3.ebuild b/dev-php/snuffleupagus/snuffleupagus-0.8.3.ebuild new file mode 100644 index 000000000000..179ce8eb5ff4 --- /dev/null +++ b/dev-php/snuffleupagus/snuffleupagus-0.8.3.ebuild @@ -0,0 +1,78 @@ +# Copyright 2022-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +PHP_EXT_NAME="${PN}" +PHP_EXT_INI="yes" +PHP_EXT_ZENDEXT="no" +PHP_EXT_ECONF_ARGS=( --enable-${PN} ) +PHP_EXT_S="${S}/src" +PHP_EXT_NEEDED_USE="session(+)" + +USE_PHP="php8-1" + +inherit php-ext-source-r3 + +KEYWORDS="~amd64" + +DESCRIPTION="A PHP module to drastically raise the cost of attacks against websites" +HOMEPAGE="https://snuffleupagus.readthedocs.io/index.html" +SRC_URI="https://github.com/jvoisin/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="LGPL-3 PHP-3.01" +SLOT="0" + +src_prepare() { + # fix file locations tests look for + ln -s "${P}/config" "${WORKDIR}/config" || die + # Fix path dependent tests + sed -i -e 's~src/tests/~~' \ + src/tests/session_encryption/crypt_session_read_uncrypt.phpt || die + sed -i -e 's~%a/src~%a~' \ + src/tests/disable_function/disabled_functions_runtime.phpt || die + # Fix bad test reference + sed -i -e 's~%src/~%s~' \ + src/tests/deny_writable/deny_writable_execution_simulation.phpt || die + php-ext-source-r3_src_prepare +} + +src_install() { + addtoinifile() { + local inifile="${WORKDIR}/${1}" + local inidir="${inifile%/*}" + + mkdir -p "${inidir}" || die "failed to create INI directory ${inidir}" + + local my_added="${2}=${3}" + echo "${my_added}" >> "${inifile}" || die "failed to append to ${inifile}" + einfo "Added '${my_added}' to /${1}" + + insinto "/${1%/*}" + doins "${inifile}" + } + einstalldocs + local slot x cfgdir + php-ext-source-r3_src_install + # Add the rules file which vary by install version + for slot in $(php_get_slots); do + php_init_slot_env "${slot}" + for x in ${PHP_EXT_SAPIS} ; do + cfgdir="/etc/php/${x}-${slot}" + if [[ -f "${ED}${cfgdir}/ext/${PHP_INI_NAME}.ini" ]]; then + addtoinifile "${cfgdir#/}/ext/${PHP_INI_NAME}.ini" \ + "sp.configuration_file" "${cfgdir}/${PN}.rules" + insinto "${cfgdir}" + case ${PHP_CURRENTSLOT:0:1} in + 8) newins "${S}/config/default_php8.rules" "${PN}.rules" ;; + *) newins "${S}/config/default.rules" "${PN}.rules" ;; + esac + fi + done + done +} + +pkg_postinst() { + elog "This extension is configured with recommended rules enabled by default." + elog "Feel free to customize as necessary. Please test outside of production first." + elog "Failure to test may cause unexpected results to loosely coded sites." +} diff --git a/dev-php/spdx-licenses/metadata.xml b/dev-php/spdx-licenses/metadata.xml index 0218de4810be..74d05ceb674e 100644 --- a/dev-php/spdx-licenses/metadata.xml +++ b/dev-php/spdx-licenses/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person" proxied="yes"> <email>guillaumeseren@gmail.com</email> diff --git a/dev-php/spdx-licenses/spdx-licenses-1.5.4.ebuild b/dev-php/spdx-licenses/spdx-licenses-1.5.4.ebuild index b304cd775644..7a74e42a2f7d 100644 --- a/dev-php/spdx-licenses/spdx-licenses-1.5.4.ebuild +++ b/dev-php/spdx-licenses/spdx-licenses-1.5.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -9,7 +9,7 @@ SRC_URI="https://github.com/composer/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="amd64 x86" +KEYWORDS="amd64 ~arm64 x86" RDEPEND=" dev-lang/php:* diff --git a/dev-php/stringparser_bbcode/metadata.xml b/dev-php/stringparser_bbcode/metadata.xml index b86acf66c756..222c77f3742a 100644 --- a/dev-php/stringparser_bbcode/metadata.xml +++ b/dev-php/stringparser_bbcode/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> diff --git a/dev-php/swoole-async/Manifest b/dev-php/swoole-async/Manifest deleted file mode 100644 index 4735139323d5..000000000000 --- a/dev-php/swoole-async/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST swoole-async-4.4.12.tar.gz 417674 BLAKE2B 77a96f53b1b159b558eb4759fe172e4a3b8f2648cd9f49252d89508eb56b4d342b178fa3c84d6a425c300a286063b4d32a05d09a3da4f3769be4c25a9800783c SHA512 adfb761803e5ec93c30aa2a4bbc312a2f43287a54cd237c0a87237dfcbfe1e6daa3d57ec2cdf15720202aa9a7830ed67ab2efdf2f7dd81989c3693e91bc22143 -DIST swoole-async-4.4.16.tar.gz 419094 BLAKE2B 7b93a0d2eb8a9597a68871783c60746c832b2eb1dce89a0f82ca6df2ee20151f910ad4f8ebb6a453bea3b7c2cc274266614f147b34c21a089ff9cc4ca0f73d1c SHA512 cf4bfc3c86740e343774b2cddc0ef2386f522e7929c160bc10d47ebe0b8f8d63dbcc82e70b7f3f30e7f7c102ebd42b02cddf4c3e1a0289f0e45147ddbd9aa546 diff --git a/dev-php/swoole-async/metadata.xml b/dev-php/swoole-async/metadata.xml deleted file mode 100644 index d355171f926f..000000000000 --- a/dev-php/swoole-async/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>php-bugs@gentoo.org</email> - <name>PHP Project</name> - </maintainer> -</pkgmetadata> diff --git a/dev-php/swoole-async/swoole-async-4.4.12.ebuild b/dev-php/swoole-async/swoole-async-4.4.12.ebuild deleted file mode 100644 index 845bfc568cc0..000000000000 --- a/dev-php/swoole-async/swoole-async-4.4.12.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -PHP_EXT_NAME="swoole_async" -PHP_EXT_INI="yes" -PHP_EXT_ZENDEXT="no" -PHP_EXT_SAPIS="cli" -DOCS=( README.md ) - -USE_PHP="php7-1 php7-2 php7-3 php7-4" - -inherit php-ext-pecl-r3 - -SRC_URI="https://github.com/swoole/ext-async/archive/v${PV}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/ext-async-${PV}" -PHP_EXT_S="${S}" - -HOMEPAGE="https://www.swoole.co.uk" -KEYWORDS="~amd64 ~x86" - -DESCRIPTION="An extension of Swoole, including the async callback style API" -LICENSE="Apache-2.0" -SLOT="0" -# Tests will require pre-configured endpoint -RESTRICT="test" - -DEPEND=">=dev-php/swoole-4.3" - -RDEPEND="${DEPEND}" - -IUSE="debug" - -src_configure() { - local PHP_EXT_ECONF_ARGS=( - --enable-swoole_async - $(use_enable debug) - ) - - 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/swoole-async/swoole-async-4.4.16.ebuild b/dev-php/swoole-async/swoole-async-4.4.16.ebuild deleted file mode 100644 index 09b9d48a22e1..000000000000 --- a/dev-php/swoole-async/swoole-async-4.4.16.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -PHP_EXT_NAME="swoole_async" -PHP_EXT_INI="yes" -PHP_EXT_ZENDEXT="no" -PHP_EXT_SAPIS="cli" -DOCS=( README.md ) - -USE_PHP="php7-1 php7-2 php7-3 php7-4" - -inherit php-ext-pecl-r3 - -SRC_URI="https://github.com/swoole/ext-async/archive/v${PV}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/ext-async-${PV}" -PHP_EXT_S="${S}" - -HOMEPAGE="https://www.swoole.co.uk" -KEYWORDS="~amd64 ~x86" - -DESCRIPTION="An extension of Swoole, including the async callback style API" -LICENSE="Apache-2.0" -SLOT="0" -# Tests will require pre-configured endpoint -RESTRICT="test" - -DEPEND=">=dev-php/swoole-4.3" - -RDEPEND="${DEPEND}" - -IUSE="debug" - -src_configure() { - local PHP_EXT_ECONF_ARGS=( - --enable-swoole_async - $(use_enable debug) - ) - - 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/swoole/Manifest b/dev-php/swoole/Manifest index 64550949ad54..f83ffe54f33e 100644 --- a/dev-php/swoole/Manifest +++ b/dev-php/swoole/Manifest @@ -1,7 +1 @@ -DIST swoole-4.2.13.tgz 1305634 BLAKE2B bb30180f7ca7b024a2aab8aff1149f6b19035315c9518dfc9e9e2e02acde09aa4cd09fbe146aefd39fc09c25af68347a5c188ca8a21677926b1adea5b549858b SHA512 f2438ce761766d20a24279a2d6f2094c718324585b1d396344f64e8a4facc1cc025a3afb2deff3b1accd5266763bdaa0a2b15e831ea4b9bdb107c83b0046636d -DIST swoole-4.4.12.tgz 1436554 BLAKE2B cc9e64e108aa9b393265708a6922f53824c2e9941c0f47f4f6aacf93239829381cdf4625af8f30e2ca8ceb1663047c6be8b2d7808dbc29d27100135288f7ac85 SHA512 8899bb048b85c048903c80fe1af045ea4f82a25b3b4fd9995d51c8a2ab144306f9f5651276776e3f6a29c83322fb0aeee2822d131247070fe9e2e87b26f2e0e9 -DIST swoole-4.4.14.tgz 1440095 BLAKE2B 8a893604a84f750b95bb63a3c6ce9869a80a700b58e744e0da588dcdb88b9d9ae8fa5b73548cc182e255d7fe4e49139c3da9bcec40a54af94c35d355ee4cbfe0 SHA512 73b598069d38dcc3201a31fdd93c1bcf0ce31ab5399bade8c31f6decae25ef6e9c0aefe0412409158c1dd0fe502751c8e669e0a34561cb1b36448366708572c6 -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 +DIST swoole-4.8.7.tgz 1851160 BLAKE2B 3e5c9d664f1897b7bd490a1e9dbc4c3c03117a18ae58586efe534c617578a7af5be779e6ca44a5bf2f782abc2eb57bc21e3dc4e3445c3299918bc189547dc75c SHA512 36f36aface71435233aaa8c81e023b813c6175d3ed00a9de20acb690b58b464d99670c3b96f247ab1147f95e099d44785d60d5f1e36f519ccfeb09b3bddba264 diff --git a/dev-php/swoole/files/swoole-4.8.7-gcc13.patch b/dev-php/swoole/files/swoole-4.8.7-gcc13.patch new file mode 100644 index 000000000000..a99088af87cf --- /dev/null +++ b/dev-php/swoole/files/swoole-4.8.7-gcc13.patch @@ -0,0 +1,19 @@ +https://bugs.gentoo.org/895232 +https://github.com/swoole/swoole-src/issues/4983 +https://github.com/swoole/swoole-src/commit/402eec43ec385b63307b3ba772f871f0f86fa299 + +From 402eec43ec385b63307b3ba772f871f0f86fa299 Mon Sep 17 00:00:00 2001 +From: Remi Collet <remi@remirepo.net> +Date: Sun, 19 Feb 2023 13:00:01 +0100 +Subject: [PATCH] Fix #4983 Add missing header for GCC 13 (#4985) + +--- a/include/swoole_proxy.h ++++ b/include/swoole_proxy.h +@@ -17,6 +17,7 @@ + #pragma once + + #include <string> ++#include <cstdint> + + #define SW_SOCKS5_VERSION_CODE 0x05 + diff --git a/dev-php/swoole/metadata.xml b/dev-php/swoole/metadata.xml index 6384a235e856..edb85e79ce7f 100644 --- a/dev-php/swoole/metadata.xml +++ b/dev-php/swoole/metadata.xml @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> <name>PHP Project</name> </maintainer> -<use> -<flag name="http2">Add support for HTTP/2 protocol via <pkg>net-libs/nghttp2</pkg></flag> -</use> +<upstream> + <remote-id type="github">swoole/swoole-src</remote-id> +</upstream> </pkgmetadata> diff --git a/dev-php/swoole/swoole-4.2.13.ebuild b/dev-php/swoole/swoole-4.2.13.ebuild deleted file mode 100644 index 5f7e9c4b7df3..000000000000 --- a/dev-php/swoole/swoole-4.2.13.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -PHP_EXT_NAME="swoole" -PHP_EXT_INI="yes" -PHP_EXT_ZENDEXT="no" -PHP_EXT_SAPIS="cli" -DOCS=( README.md ) - -USE_PHP="php7-1 php7-2 php7-3" - -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=" - dev-libs/libaio - dev-libs/boost:0= - dev-libs/libpcre - http2? ( net-libs/nghttp2:0= ) - ssl? ( dev-libs/openssl:0= ) - php_targets_php7-1? ( dev-lang/php:7.1[cli,sockets?] ) - php_targets_php7-2? ( dev-lang/php:7.2[cli,sockets?] ) - php_targets_php7-3? ( dev-lang/php:7.3[cli,sockets?] ) - mysql? ( - php_targets_php7-1? ( dev-lang/php:7.1[mysql,mysqli(+)] ) - php_targets_php7-2? ( dev-lang/php:7.2[mysql,mysqli(+)] ) - php_targets_php7-3? ( dev-lang/php:7.3[mysql,mysqli(+)] ) - ) -" - -RDEPEND="${DEPEND}" - -IUSE="debug http2 mysql sockets ssl" - -src_configure() { - # PostgreSQL disabled due to Gentoo's slot system - # JEMalloc not included as it refuses to find a ${ESYSROOT}/usr/includes/jemalloc subdirectory - local PHP_EXT_ECONF_ARGS=( - --enable-swoole - --disable-coroutine-postgresql - $(use_enable debug) - $(use_enable http2) - $(use_enable mysql mysqlnd) - $(use_enable ssl openssl) - $(use_with ssl openssl-dir "${ESYSROOT}/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/swoole/swoole-4.4.12.ebuild b/dev-php/swoole/swoole-4.4.12.ebuild deleted file mode 100644 index 4d978ebbd611..000000000000 --- a/dev-php/swoole/swoole-4.4.12.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 1999-2021 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" -DOCS=( README.md ) - -USE_PHP="php7-1 php7-2 php7-3 php7-4" - -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/libaio - dev-libs/boost:0= - dev-libs/libpcre - sys-libs/zlib:0= - http2? ( net-libs/nghttp2:0= ) - ssl? ( - dev-libs/openssl:0= - ) - php_targets_php7-1? ( dev-lang/php:7.1[cli,sockets?] ) - php_targets_php7-2? ( dev-lang/php:7.2[cli,sockets?] ) - php_targets_php7-3? ( dev-lang/php:7.3[cli,sockets?] ) - php_targets_php7-4? ( dev-lang/php:7.4[cli,sockets?] ) - mysql? ( - php_targets_php7-1? ( dev-lang/php:7.1[mysql,mysqli(+)] ) - php_targets_php7-2? ( dev-lang/php:7.2[mysql,mysqli(+)] ) - php_targets_php7-3? ( dev-lang/php:7.3[mysql,mysqli(+)] ) - php_targets_php7-4? ( dev-lang/php:7.4[mysql,mysqli(+)] ) - ) -" - -RDEPEND="${DEPEND}" - -IUSE="debug http2 mysql sockets ssl" - -src_configure() { - # JEMalloc not included as it refuses to find a ${ESYSROOT}/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 "${ESYSROOT}/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/swoole/swoole-4.4.14.ebuild b/dev-php/swoole/swoole-4.4.14.ebuild deleted file mode 100644 index 4d978ebbd611..000000000000 --- a/dev-php/swoole/swoole-4.4.14.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 1999-2021 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" -DOCS=( README.md ) - -USE_PHP="php7-1 php7-2 php7-3 php7-4" - -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/libaio - dev-libs/boost:0= - dev-libs/libpcre - sys-libs/zlib:0= - http2? ( net-libs/nghttp2:0= ) - ssl? ( - dev-libs/openssl:0= - ) - php_targets_php7-1? ( dev-lang/php:7.1[cli,sockets?] ) - php_targets_php7-2? ( dev-lang/php:7.2[cli,sockets?] ) - php_targets_php7-3? ( dev-lang/php:7.3[cli,sockets?] ) - php_targets_php7-4? ( dev-lang/php:7.4[cli,sockets?] ) - mysql? ( - php_targets_php7-1? ( dev-lang/php:7.1[mysql,mysqli(+)] ) - php_targets_php7-2? ( dev-lang/php:7.2[mysql,mysqli(+)] ) - php_targets_php7-3? ( dev-lang/php:7.3[mysql,mysqli(+)] ) - php_targets_php7-4? ( dev-lang/php:7.4[mysql,mysqli(+)] ) - ) -" - -RDEPEND="${DEPEND}" - -IUSE="debug http2 mysql sockets ssl" - -src_configure() { - # JEMalloc not included as it refuses to find a ${ESYSROOT}/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 "${ESYSROOT}/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/swoole/swoole-4.4.15.ebuild b/dev-php/swoole/swoole-4.4.15.ebuild deleted file mode 100644 index 4d978ebbd611..000000000000 --- a/dev-php/swoole/swoole-4.4.15.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 1999-2021 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" -DOCS=( README.md ) - -USE_PHP="php7-1 php7-2 php7-3 php7-4" - -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/libaio - dev-libs/boost:0= - dev-libs/libpcre - sys-libs/zlib:0= - http2? ( net-libs/nghttp2:0= ) - ssl? ( - dev-libs/openssl:0= - ) - php_targets_php7-1? ( dev-lang/php:7.1[cli,sockets?] ) - php_targets_php7-2? ( dev-lang/php:7.2[cli,sockets?] ) - php_targets_php7-3? ( dev-lang/php:7.3[cli,sockets?] ) - php_targets_php7-4? ( dev-lang/php:7.4[cli,sockets?] ) - mysql? ( - php_targets_php7-1? ( dev-lang/php:7.1[mysql,mysqli(+)] ) - php_targets_php7-2? ( dev-lang/php:7.2[mysql,mysqli(+)] ) - php_targets_php7-3? ( dev-lang/php:7.3[mysql,mysqli(+)] ) - php_targets_php7-4? ( dev-lang/php:7.4[mysql,mysqli(+)] ) - ) -" - -RDEPEND="${DEPEND}" - -IUSE="debug http2 mysql sockets ssl" - -src_configure() { - # JEMalloc not included as it refuses to find a ${ESYSROOT}/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 "${ESYSROOT}/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/swoole/swoole-4.4.16.ebuild b/dev-php/swoole/swoole-4.4.16.ebuild deleted file mode 100644 index 4d978ebbd611..000000000000 --- a/dev-php/swoole/swoole-4.4.16.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 1999-2021 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" -DOCS=( README.md ) - -USE_PHP="php7-1 php7-2 php7-3 php7-4" - -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/libaio - dev-libs/boost:0= - dev-libs/libpcre - sys-libs/zlib:0= - http2? ( net-libs/nghttp2:0= ) - ssl? ( - dev-libs/openssl:0= - ) - php_targets_php7-1? ( dev-lang/php:7.1[cli,sockets?] ) - php_targets_php7-2? ( dev-lang/php:7.2[cli,sockets?] ) - php_targets_php7-3? ( dev-lang/php:7.3[cli,sockets?] ) - php_targets_php7-4? ( dev-lang/php:7.4[cli,sockets?] ) - mysql? ( - php_targets_php7-1? ( dev-lang/php:7.1[mysql,mysqli(+)] ) - php_targets_php7-2? ( dev-lang/php:7.2[mysql,mysqli(+)] ) - php_targets_php7-3? ( dev-lang/php:7.3[mysql,mysqli(+)] ) - php_targets_php7-4? ( dev-lang/php:7.4[mysql,mysqli(+)] ) - ) -" - -RDEPEND="${DEPEND}" - -IUSE="debug http2 mysql sockets ssl" - -src_configure() { - # JEMalloc not included as it refuses to find a ${ESYSROOT}/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 "${ESYSROOT}/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/swoole/swoole-4.4.19.ebuild b/dev-php/swoole/swoole-4.4.19.ebuild deleted file mode 100644 index 4d978ebbd611..000000000000 --- a/dev-php/swoole/swoole-4.4.19.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 1999-2021 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" -DOCS=( README.md ) - -USE_PHP="php7-1 php7-2 php7-3 php7-4" - -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/libaio - dev-libs/boost:0= - dev-libs/libpcre - sys-libs/zlib:0= - http2? ( net-libs/nghttp2:0= ) - ssl? ( - dev-libs/openssl:0= - ) - php_targets_php7-1? ( dev-lang/php:7.1[cli,sockets?] ) - php_targets_php7-2? ( dev-lang/php:7.2[cli,sockets?] ) - php_targets_php7-3? ( dev-lang/php:7.3[cli,sockets?] ) - php_targets_php7-4? ( dev-lang/php:7.4[cli,sockets?] ) - mysql? ( - php_targets_php7-1? ( dev-lang/php:7.1[mysql,mysqli(+)] ) - php_targets_php7-2? ( dev-lang/php:7.2[mysql,mysqli(+)] ) - php_targets_php7-3? ( dev-lang/php:7.3[mysql,mysqli(+)] ) - php_targets_php7-4? ( dev-lang/php:7.4[mysql,mysqli(+)] ) - ) -" - -RDEPEND="${DEPEND}" - -IUSE="debug http2 mysql sockets ssl" - -src_configure() { - # JEMalloc not included as it refuses to find a ${ESYSROOT}/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 "${ESYSROOT}/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/swoole/swoole-4.5.9.ebuild b/dev-php/swoole/swoole-4.8.7.ebuild index 5d5171051808..df9af9c5d2da 100644 --- a/dev-php/swoole/swoole-4.5.9.ebuild +++ b/dev-php/swoole/swoole-4.8.7.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="7" +EAPI="8" PHP_EXT_NAME="swoole" PHP_EXT_INI="yes" @@ -10,17 +10,17 @@ PHP_EXT_SAPIS="cli" PHP_EXT_NEEDED_USE="cli,sockets?" DOCS=( README.md ) -USE_PHP="php7-2 php7-3 php7-4 php8-0" +USE_PHP="php8-1" inherit php-ext-pecl-r3 HOMEPAGE="https://www.swoole.co.uk" -KEYWORDS="~amd64 ~x86" +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 +# Tests require network access for composer libraries under tests/include/lib/vendor RESTRICT="test" DEPEND=" @@ -31,10 +31,7 @@ DEPEND=" dev-libs/openssl: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(+)] ) + php_targets_php8-1? ( dev-lang/php:8.1[mysql,mysqli(+)] ) ) " @@ -42,6 +39,10 @@ RDEPEND="${DEPEND}" IUSE="debug http2 mysql sockets ssl" +PATCHES=( + "${FILESDIR}"/${P}-gcc13.patch +) + src_configure() { # JEMalloc not included as it refuses to find a ${ESYSROOT}/usr/includes/jemalloc subdirectory local PHP_EXT_ECONF_ARGS=( @@ -58,10 +59,14 @@ src_configure() { } src_test() { + ulimit -n 16384 > /dev/null 2>&1 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 + cd tests || die + if has_version ">=dev-php/xdebug-3" ; then + sed -i 's/xdebug.default_enable=0/xdebug.mode=off/' run-tests || die + fi + PHPT=1 "${PHPCLI}" -d "memory_limit=1024m" ./run-tests swoole_* || die done } diff --git a/dev-php/symfony-config/metadata.xml b/dev-php/symfony-config/metadata.xml index be6f5818811c..c664fe8c1c68 100644 --- a/dev-php/symfony-config/metadata.xml +++ b/dev-php/symfony-config/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person" proxied="yes"> <email>guillaumeseren@gmail.com</email> diff --git a/dev-php/symfony-config/symfony-config-2.8.20.ebuild b/dev-php/symfony-config/symfony-config-2.8.20.ebuild index 60317d7d2700..ee42042c335b 100644 --- a/dev-php/symfony-config/symfony-config-2.8.20.ebuild +++ b/dev-php/symfony-config/symfony-config-2.8.20.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -10,7 +10,7 @@ SRC_URI="https://github.com/symfony/config/archive/v${PV}.tar.gz LICENSE="MIT" SLOT="0" -KEYWORDS="amd64 x86" +KEYWORDS="amd64 ~arm64 x86" IUSE="test" RESTRICT="!test? ( test )" diff --git a/dev-php/symfony-console/metadata.xml b/dev-php/symfony-console/metadata.xml index 9db86af2e1bb..0a5a50eef4ed 100644 --- a/dev-php/symfony-console/metadata.xml +++ b/dev-php/symfony-console/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person" proxied="yes"> <email>guillaumeseren@gmail.com</email> diff --git a/dev-php/symfony-console/symfony-console-2.8.52.ebuild b/dev-php/symfony-console/symfony-console-2.8.52.ebuild index 87d04719232c..b7f0b267512e 100644 --- a/dev-php/symfony-console/symfony-console-2.8.52.ebuild +++ b/dev-php/symfony-console/symfony-console-2.8.52.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -10,7 +10,7 @@ SRC_URI="https://github.com/symfony/console/archive/v${PV}.tar.gz LICENSE="MIT" SLOT="0" -KEYWORDS="amd64 x86" +KEYWORDS="amd64 ~arm64 x86" RDEPEND=" dev-lang/php:* diff --git a/dev-php/symfony-dependency-injection/Manifest b/dev-php/symfony-dependency-injection/Manifest index 4102180b8f32..ce54999d9b20 100644 --- a/dev-php/symfony-dependency-injection/Manifest +++ b/dev-php/symfony-dependency-injection/Manifest @@ -1,2 +1 @@ -DIST symfony-dependency-injection-2.8.20.tar.gz 117123 BLAKE2B 469b11d55bbfdffe46b5cc94592f0bf81c1ddf82c656bbf9914a78cb7e5164960455c2ef1a70ef905b35775e91e279693af19015e586ddb3c95a0184d1737f32 SHA512 9ab6a4b36fde3908f26c2211066df501dd73387a7ec3d0aae85f8289257653bb54393bd9f4b50c347a4d5ba47214f13c089e475eaace3868f5c18f67b69bd829 DIST symfony-dependency-injection-2.8.50.tar.gz 117771 BLAKE2B b71535619a45a03640064b987a7b5996dc991458c737661a983782d7af53bf89865bf511dbac99384f8ece583b628a2cde0def2cdd3e8c133055d84d9dbed1e1 SHA512 690b3f373c2fb549115f7fdb35880a2c94bf7afa28be2c75d718373e8925897f89d5e34f82b709b11cd8940547289345a8def4debe657f495a0b636a6aa72baa diff --git a/dev-php/symfony-dependency-injection/metadata.xml b/dev-php/symfony-dependency-injection/metadata.xml index b37e97d4dc2c..25c9bf67dceb 100644 --- a/dev-php/symfony-dependency-injection/metadata.xml +++ b/dev-php/symfony-dependency-injection/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person" proxied="yes"> <email>guillaumeseren@gmail.com</email> diff --git a/dev-php/symfony-dependency-injection/symfony-dependency-injection-2.8.20.ebuild b/dev-php/symfony-dependency-injection/symfony-dependency-injection-2.8.20.ebuild deleted file mode 100644 index 9b26caf5c58d..000000000000 --- a/dev-php/symfony-dependency-injection/symfony-dependency-injection-2.8.20.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="Symfony DependencyInjection Component" -HOMEPAGE="https://github.com/symfony/dependency-injection" -SRC_URI="https://github.com/symfony/dependency-injection/archive/v${PV}.tar.gz - -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="test" - -# The test suite requires the unpackaged symfony-expression-language. -RESTRICT=test - -# I'm not sure if symfony-config and symfony-yaml are actually needed if -# you're not running the test suite... -RDEPEND="dev-lang/php:* - dev-php/fedora-autoloader - >=dev-php/symfony-config-2.1.0 - >=dev-php/symfony-yaml-2.1.0" -DEPEND="test? ( ${RDEPEND} >=dev-php/phpunit-5.7.15 )" - -S="${WORKDIR}/dependency-injection-${PV}" - -src_prepare() { - default - if use test; then - cp "${FILESDIR}/autoload.php" "${S}/autoload-test.php" || die - fi -} - -src_install() { - insinto "/usr/share/php/Symfony/Component/DependencyInjection" - doins -r Compiler Dumper Exception Extension LazyProxy Loader ParameterBag - doins *.php "${FILESDIR}/autoload.php" - dodoc CHANGELOG.md README.md -} - -src_test() { - phpunit --bootstrap "${S}/autoload-test.php" || die 'test suite failed' -} diff --git a/dev-php/symfony-dependency-injection/symfony-dependency-injection-2.8.50.ebuild b/dev-php/symfony-dependency-injection/symfony-dependency-injection-2.8.50.ebuild index f0e4869bbdf1..e7aa98e37382 100644 --- a/dev-php/symfony-dependency-injection/symfony-dependency-injection-2.8.50.ebuild +++ b/dev-php/symfony-dependency-injection/symfony-dependency-injection-2.8.50.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -10,7 +10,7 @@ SRC_URI="https://github.com/symfony/dependency-injection/archive/v${PV}.tar.gz LICENSE="MIT" SLOT="0" -KEYWORDS="amd64 x86" +KEYWORDS="amd64 ~arm64 x86" IUSE="test" # The test suite requires the unpackaged symfony-expression-language. diff --git a/dev-php/symfony-event-dispatcher/Manifest b/dev-php/symfony-event-dispatcher/Manifest index f050f1dad3dc..e8b5b1725ebb 100644 --- a/dev-php/symfony-event-dispatcher/Manifest +++ b/dev-php/symfony-event-dispatcher/Manifest @@ -1,2 +1 @@ -DIST symfony-event-dispatcher-2.1.0.tar.gz 10271 BLAKE2B 0fcb3fd95643a24ff31d4e60c31e801e488c323358dc723be95471dc01df9d052fc6cb19ce5401ba4512cc4e308fd149975f969cf89406b48d11e48ef6313ee1 SHA512 2430e0955322aa938635b34cfa151166218da51bcc7ac1ff52789fc16aef9eeaa5c504f9d03daa819f47652e5207703314c8695e5023369fe8edf88af06bc54b DIST symfony-event-dispatcher-2.8.50.tar.gz 15682 BLAKE2B dff817cc540074caabef6bbcd24fedee8bc377fbd688ead9d7a95df9987c79446bac630f806dfa190572a214393676042682b84bed58a6e0d5bb47d0dfd64986 SHA512 ecb5e17d5f0639c49fa35e9dc33d3b7d6a7792c95d9020ede9ceebe0de5e0192101607ac6f797e35a7ea5ced36231e616d76fe4f8ab74c0d42014782de590a35 diff --git a/dev-php/symfony-event-dispatcher/metadata.xml b/dev-php/symfony-event-dispatcher/metadata.xml index 00c47e10e312..8955ceda226c 100644 --- a/dev-php/symfony-event-dispatcher/metadata.xml +++ b/dev-php/symfony-event-dispatcher/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person" proxied="yes"> <email>guillaumeseren@gmail.com</email> diff --git a/dev-php/symfony-event-dispatcher/symfony-event-dispatcher-2.1.0-r1.ebuild b/dev-php/symfony-event-dispatcher/symfony-event-dispatcher-2.1.0-r1.ebuild deleted file mode 100644 index 43e947bc1128..000000000000 --- a/dev-php/symfony-event-dispatcher/symfony-event-dispatcher-2.1.0-r1.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="Symfony EventDispatcher Component" -HOMEPAGE="https://github.com/symfony/event-dispatcher" -SRC_URI="https://github.com/symfony/event-dispatcher/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND=" - dev-lang/php:* - dev-php/fedora-autoloader - >=dev-php/symfony-dependency-injection-2.1.0" -DEPEND=" - test? ( - ${RDEPEND} - dev-php/phpunit )" - -S="${WORKDIR}/event-dispatcher-${PV}" - -src_prepare() { - default - if use test; then - cp "${FILESDIR}"/autoload.php "${S}"/autoload-test.php || die - fi -} - -src_install() { - insinto "/usr/share/php/Symfony/Component/EventDispatcher" - doins -r . "${FILESDIR}"/autoload.php - dodoc README.md -} - -src_test() { - phpunit --bootstrap "${S}"/autoload-test.php || die "test suite failed" -} diff --git a/dev-php/symfony-event-dispatcher/symfony-event-dispatcher-2.8.50.ebuild b/dev-php/symfony-event-dispatcher/symfony-event-dispatcher-2.8.50.ebuild index 2e2a694d65a1..dcd6a598432a 100644 --- a/dev-php/symfony-event-dispatcher/symfony-event-dispatcher-2.8.50.ebuild +++ b/dev-php/symfony-event-dispatcher/symfony-event-dispatcher-2.8.50.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -9,7 +9,7 @@ SRC_URI="https://github.com/symfony/event-dispatcher/archive/v${PV}.tar.gz -> ${ LICENSE="MIT" SLOT="0" -KEYWORDS="amd64 x86" +KEYWORDS="amd64 ~arm64 x86" IUSE="test" RESTRICT="!test? ( test )" diff --git a/dev-php/symfony-filesystem/metadata.xml b/dev-php/symfony-filesystem/metadata.xml index b2cb0eba12ad..3e63d7040745 100644 --- a/dev-php/symfony-filesystem/metadata.xml +++ b/dev-php/symfony-filesystem/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person" proxied="yes"> <email>guillaumeseren@gmail.com</email> diff --git a/dev-php/symfony-filesystem/symfony-filesystem-3.4.36.ebuild b/dev-php/symfony-filesystem/symfony-filesystem-3.4.36.ebuild index d34ab533a863..a944791b1c0d 100644 --- a/dev-php/symfony-filesystem/symfony-filesystem-3.4.36.ebuild +++ b/dev-php/symfony-filesystem/symfony-filesystem-3.4.36.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -9,7 +9,7 @@ SRC_URI="https://github.com/symfony/filesystem/archive/v${PV}.tar.gz -> ${P}.tar LICENSE="MIT" SLOT="0" -KEYWORDS="amd64 x86" +KEYWORDS="amd64 ~arm64 x86" IUSE="test" RESTRICT="!test? ( test )" diff --git a/dev-php/symfony-finder/metadata.xml b/dev-php/symfony-finder/metadata.xml index 990080d5dde3..be400dd57a4e 100644 --- a/dev-php/symfony-finder/metadata.xml +++ b/dev-php/symfony-finder/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person" proxied="yes"> <email>guillaumeseren@gmail.com</email> diff --git a/dev-php/symfony-finder/symfony-finder-3.4.38.ebuild b/dev-php/symfony-finder/symfony-finder-3.4.38.ebuild index 5649030280f1..274ecb1b555c 100644 --- a/dev-php/symfony-finder/symfony-finder-3.4.38.ebuild +++ b/dev-php/symfony-finder/symfony-finder-3.4.38.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -9,7 +9,7 @@ SRC_URI="https://github.com/symfony/finder/archive/v${PV}.tar.gz -> symfony-find LICENSE="MIT" SLOT="0" -KEYWORDS="amd64 x86" +KEYWORDS="amd64 ~arm64 x86" IUSE="test" RESTRICT="!test? ( test )" diff --git a/dev-php/symfony-process/metadata.xml b/dev-php/symfony-process/metadata.xml index fbfab081f2a4..c67e25864a18 100644 --- a/dev-php/symfony-process/metadata.xml +++ b/dev-php/symfony-process/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person" proxied="yes"> <email>guillaumeseren@gmail.com</email> diff --git a/dev-php/symfony-process/symfony-process-3.4.38.ebuild b/dev-php/symfony-process/symfony-process-3.4.38.ebuild index 11d8a4f73eca..2d25bb7245fa 100644 --- a/dev-php/symfony-process/symfony-process-3.4.38.ebuild +++ b/dev-php/symfony-process/symfony-process-3.4.38.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -9,7 +9,7 @@ SRC_URI="https://github.com/symfony/process/archive/v${PV}.tar.gz -> ${P}.tar.gz LICENSE="MIT" SLOT="0" -KEYWORDS="amd64 x86" +KEYWORDS="amd64 ~arm64 x86" IUSE="test" RESTRICT="test" diff --git a/dev-php/symfony-yaml/metadata.xml b/dev-php/symfony-yaml/metadata.xml index fa154916059b..091344a6b287 100644 --- a/dev-php/symfony-yaml/metadata.xml +++ b/dev-php/symfony-yaml/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person" proxied="yes"> <email>guillaumeseren@gmail.com</email> diff --git a/dev-php/symfony-yaml/symfony-yaml-2.1.0.ebuild b/dev-php/symfony-yaml/symfony-yaml-2.1.0.ebuild index d0cd3eafe328..63f00b0a679a 100644 --- a/dev-php/symfony-yaml/symfony-yaml-2.1.0.ebuild +++ b/dev-php/symfony-yaml/symfony-yaml-2.1.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -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="amd64 arm ~arm64 ~hppa ppc ppc64 ~s390 sparc x86" IUSE="test" RESTRICT="test" diff --git a/dev-php/tcpdf/metadata.xml b/dev-php/tcpdf/metadata.xml index 40391479723e..ca6f47dad088 100644 --- a/dev-php/tcpdf/metadata.xml +++ b/dev-php/tcpdf/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> diff --git a/dev-php/theseer-Autoload/Manifest b/dev-php/theseer-Autoload/Manifest index 8317998a9905..7b4b9e48b084 100644 --- a/dev-php/theseer-Autoload/Manifest +++ b/dev-php/theseer-Autoload/Manifest @@ -1 +1,2 @@ DIST theseer-Autoload-1.26.0.tar.gz 43119 BLAKE2B 7b2413bc2fb281472cee03010c175aae1c8304ab0629c31f09e11497bd6f46d58bae8625da610f5a513b19fc8aafc45c35be7271ba13188466f576e7b4a7392f SHA512 c8fcb3ad39c140517d695c44e6dea3797ea0135ff64246478e55cbf167e4b9fbb3e5027732c201f66b404039a313952c7125f13fdeb1cd96633dbccfdda6f143 +DIST theseer-Autoload-1.26.3.tar.gz 43810 BLAKE2B b2d7fe33b9663a3c324656abe63e4ae89533b773007362b546cb9401de0a8fd8f0c00f8f385c4a45c39be675d062cf5dd5a739972fc12611331065f244515d63 SHA512 00a6fbf86cc0f5958c5d0d049af0370ef510fe21a05d7dcbeb1b0771f979ea6638f5db74d913c56b10d9212a68b5d918cdfefec241b1383faf0e97b4305895bd diff --git a/dev-php/theseer-Autoload/metadata.xml b/dev-php/theseer-Autoload/metadata.xml index 667fdfa8de4a..82b131853a75 100644 --- a/dev-php/theseer-Autoload/metadata.xml +++ b/dev-php/theseer-Autoload/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> diff --git a/dev-php/theseer-Autoload/theseer-Autoload-1.26.0-r1.ebuild b/dev-php/theseer-Autoload/theseer-Autoload-1.26.0-r2.ebuild index 0a9d2dbf7b22..4d94399da572 100644 --- a/dev-php/theseer-Autoload/theseer-Autoload-1.26.0-r1.ebuild +++ b/dev-php/theseer-Autoload/theseer-Autoload-1.26.0-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -7,15 +7,15 @@ 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" +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" +KEYWORDS="amd64 arm ~hppa ppc ppc64 ~s390 sparc x86" IUSE="test" RESTRICT="!test? ( test )" -CDEPEND="dev-lang/php:*[cli] +CDEPEND="dev-lang/php:*[cli,fileinfo(-),tokenizer(-)] >=dev-php/theseer-DirectoryScanner-1.3 <dev-php/theseer-DirectoryScanner-2 >=dev-php/zetacomponents-Base-1.8 diff --git a/dev-php/theseer-Autoload/theseer-Autoload-1.26.3-r1.ebuild b/dev-php/theseer-Autoload/theseer-Autoload-1.26.3-r1.ebuild new file mode 100644 index 000000000000..dc8a86e63012 --- /dev/null +++ b/dev-php/theseer-Autoload/theseer-Autoload-1.26.3-r1.ebuild @@ -0,0 +1,82 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MY_PN="Autoload" + +DESCRIPTION="PHP Autoload Builder" +HOMEPAGE="https://github.com/theseer/Autoload" +SRC_URI="https://github.com/theseer/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 ~s390 sparc x86" +IUSE="test" +RESTRICT="!test? ( test )" + +CDEPEND="dev-lang/php:*[cli,fileinfo(-),tokenizer(-)] + >=dev-php/theseer-DirectoryScanner-1.3 + <dev-php/theseer-DirectoryScanner-2 + >=dev-php/zetacomponents-Base-1.8 + <dev-php/zetacomponents-Base-2 + >=dev-php/zetacomponents-ConsoleTools-1.7.1 + <dev-php/zetacomponents-ConsoleTools-2" + +BDEPEND="${CDEPEND} + test? ( + >=dev-php/phpunit-8 + <dev-php/phpunit-9 + )" + +RDEPEND="${CDEPEND}" + +PATCHES=( "${FILESDIR}"/${PN}-1.26.0-autoload.php.patch ) + +S="${WORKDIR}/${MY_PN}-${PV}" + +src_prepare() { + default + + # Set version + sed -i \ + -e "s/%development%/${PV}/" \ + phpab.php \ + composer/bin/phpab \ + || die + + cp --target-directory src/templates/ci \ + "${FILESDIR}"/fedora.php.tpl \ + "${FILESDIR}"/fedora2.php.tpl \ + || die + + # Mimick layout to bootstrap phpab + mkdir --parents \ + vendor/theseer/directoryscanner \ + vendor/zetacomponents/base \ + vendor/zetacomponents/console-tools \ + || die + + ln -s /usr/share/php/TheSeer/DirectoryScanner vendor/theseer/directoryscanner/src || die + ln -s /usr/share/php/ezc/Base vendor/zetacomponents/base/src || die + ln -s /usr/share/php/ezc/ConsoleTools vendor/zetacomponents/console-tools/src || die + + ./phpab.php \ + --output src/autoload.php \ + --template "${FILESDIR}"/autoload.php.tpl \ + --basedir src \ + src || die +} + +src_test() { + phpunit --no-coverage --verbose || die "Unit testing failed!" +} + +src_install() { + insinto /usr/share/php/TheSeer/${MY_PN} + doins -r src/* + + dobin "${S}"/composer/bin/phpab + + einstalldocs +} diff --git a/dev-php/theseer-DirectoryScanner/Manifest b/dev-php/theseer-DirectoryScanner/Manifest index 8ff466068a08..64f919a3f0a7 100644 --- a/dev-php/theseer-DirectoryScanner/Manifest +++ b/dev-php/theseer-DirectoryScanner/Manifest @@ -1 +1,2 @@ DIST theseer-DirectoryScanner-1.3.2.tar.gz 9262 BLAKE2B 5b16781d9ccd030ea779b286b9d22c528468db52e39c6761e91e0f9f83d4a50e1775382eca4eea0f027cc508f7dd35e416664451f83bdfae8607cf074e5ed9cb SHA512 720db8baa40983918e5c0d7cfac194e26d877becf6e55868ca21c1ab0a4366b86a8aad2c700e38a6360e280d372db0f1be6c80dbb81d279c277bf9f56a6cbadf +DIST theseer-DirectoryScanner-1.3.3.tar.gz 9281 BLAKE2B a58cecc35ac96752cc09ef6cd0c6a607014e6b8317559803810089fab1d1d19f33369580bd90fbd328b3f106e3664e65da6750c7ad52c62f446497738a8e60b7 SHA512 260820a468f163641d2a249dab2b812ef3589cb251f4995681a9fc344b38a8aa1dfb7bf52bef702adc627ea39fd8a2bb4f2b18117edba83fe6a1db5e8f69efdd diff --git a/dev-php/theseer-DirectoryScanner/metadata.xml b/dev-php/theseer-DirectoryScanner/metadata.xml index d26b2c68d2d4..cf4c63f4b67f 100644 --- a/dev-php/theseer-DirectoryScanner/metadata.xml +++ b/dev-php/theseer-DirectoryScanner/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> diff --git a/dev-php/theseer-DirectoryScanner/theseer-DirectoryScanner-1.3.2.ebuild b/dev-php/theseer-DirectoryScanner/theseer-DirectoryScanner-1.3.2.ebuild index 6fc0f450ae6b..fca9e94b1b7f 100644 --- a/dev-php/theseer-DirectoryScanner/theseer-DirectoryScanner-1.3.2.ebuild +++ b/dev-php/theseer-DirectoryScanner/theseer-DirectoryScanner-1.3.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ 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" +KEYWORDS="amd64 arm ~hppa ppc ppc64 ~s390 sparc x86" RDEPEND="dev-lang/php:*" diff --git a/dev-php/theseer-DirectoryScanner/theseer-DirectoryScanner-1.3.3.ebuild b/dev-php/theseer-DirectoryScanner/theseer-DirectoryScanner-1.3.3.ebuild new file mode 100644 index 000000000000..c70a06b959bc --- /dev/null +++ b/dev-php/theseer-DirectoryScanner/theseer-DirectoryScanner-1.3.3.ebuild @@ -0,0 +1,25 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MY_PN="DirectoryScanner" + +DESCRIPTION="A recursive directory scanner and filter" +HOMEPAGE="https://github.com/theseer/DirectoryScanner" +SRC_URI="https://github.com/theseer/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 ~s390 sparc x86" + +RDEPEND="dev-lang/php:*" + +S="${WORKDIR}/${MY_PN}-${PV}" + +src_install() { + insinto /usr/share/php/TheSeer/${MY_PN} + doins -r src/* + + einstalldocs +} diff --git a/dev-php/theseer-tokenizer/Manifest b/dev-php/theseer-tokenizer/Manifest index eb773bbb1aaa..97b386f74765 100644 --- a/dev-php/theseer-tokenizer/Manifest +++ b/dev-php/theseer-tokenizer/Manifest @@ -1,3 +1,2 @@ -DIST theseer-tokenizer-1.1.0.tar.gz 10163 BLAKE2B b2360f901d60f784db2045912707a8e293a55967d60d4e72168a1c4b0c9a2d5bdb739fbed9bfec02075476e7bf6762eb1cc7e36870b84fcc341b609527579ca2 SHA512 8b500565dc0d6c8513db3aa72a7ee1fa04510a712ce9b0977feccddc6b2dae53825e39182d43508e196f326776115789e81697116418f6f9f63d08f0c05d0543 -DIST theseer-tokenizer-1.1.3.tar.gz 10553 BLAKE2B 4bed1623abe110cec432a97fbd28752618420a188b450c935c77b5771d6986be9a51c8f100fd81a89d892b0c1e2b46b0124e3c35e3cbe2138eee2d520c74933a SHA512 e29fd41b311bac8021f4c0593d79a9c1bde4b6ccf4774e94d27a0e8a97bac3844109f9312c4aab6e239365630394b602b56a084c291dc13fb439dc8ac22944e3 DIST theseer-tokenizer-1.2.0.tar.gz 7156 BLAKE2B 61474e3ebed5262b4d250f0057fbe68df6b2b2d6026cba28efbfc35c865bc9491e3b3f7871591a7aa52383c3bb748cf5dfb95f36d680bdbb9755b585b5b8f4f8 SHA512 e0deeffc151a1831cc7226037c75b534aa0d28d9639de45a1f0a6f5865d3df3cfbd7225e075b094603d512b0beb449e91205f40366ef1c7c865c8994e0710ff7 +DIST theseer-tokenizer-1.2.1.tar.gz 7537 BLAKE2B 204b39ca71cb6e99696c8bda19e5319e83302cd9fd4689343d3864ec81996d433ea8cfa2578abec2bef440271a1abe3169c3c871fd931c1ab73705cb7c36e4eb SHA512 7c7382f8f2e96984862d187fffb08b020cac8c0a0d93b58f9b1a244a46f8fcbfbe1c18d005acce8f8e1ef9aec2b9be99b7f2312e28f54a66f5a97ee263ed5239 diff --git a/dev-php/theseer-tokenizer/files/autoload.php b/dev-php/theseer-tokenizer/files/autoload.php deleted file mode 100644 index 67f5bd3506e0..000000000000 --- a/dev-php/theseer-tokenizer/files/autoload.php +++ /dev/null @@ -1,20 +0,0 @@ -<?php -/* Autoloader for dev-php/theseer-tokenizer */ - -if (!class_exists('Fedora\\Autoloader\\Autoload', false)) { - require_once 'Fedora/Autoloader/autoload.php'; -} - -\Fedora\Autoloader\Autoload::addClassMap( - [ - 'theseer\\tokenizer\\exception' => '/Exception.php', - 'theseer\\tokenizer\\namespaceuri' => '/NamespaceUri.php', - 'theseer\\tokenizer\\namespaceuriexception' => '/NamespaceUriException.php', - 'theseer\\tokenizer\\token' => '/Token.php', - 'theseer\\tokenizer\\tokencollection' => '/TokenCollection.php', - 'theseer\\tokenizer\\tokencollectionexception' => '/TokenCollectionException.php', - 'theseer\\tokenizer\\tokenizer' => '/Tokenizer.php', - 'theseer\\tokenizer\\xmlserializer' => '/XMLSerializer.php', - ], - __DIR__ -); diff --git a/dev-php/theseer-tokenizer/metadata.xml b/dev-php/theseer-tokenizer/metadata.xml index 97cdb9aa384c..e819be73ce10 100644 --- a/dev-php/theseer-tokenizer/metadata.xml +++ b/dev-php/theseer-tokenizer/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> diff --git a/dev-php/theseer-tokenizer/theseer-tokenizer-1.1.0.ebuild b/dev-php/theseer-tokenizer/theseer-tokenizer-1.1.0.ebuild deleted file mode 100644 index f55bd6c3895a..000000000000 --- a/dev-php/theseer-tokenizer/theseer-tokenizer-1.1.0.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="Convert tokenized PHP source code into XML and other formats" -HOMEPAGE="https://github.com/theseer/tokenizer" -SRC_URI="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 )" - -S="${WORKDIR}/tokenizer-${PV}" - -RDEPEND="dev-php/fedora-autoloader - >=dev-lang/php-7.0:*[tokenizer,xmlwriter]" - -DEPEND="test? ( ${RDEPEND} dev-php/phpunit )" - -src_prepare() { - cp "${FILESDIR}/autoload.php" src/ || die - default -} - -src_install() { - insinto /usr/share/php/TheSeer/Tokenizer - doins src/*.php - dodoc README.md -} - -src_test() { - phpunit || die "Unit testing failed!" -} diff --git a/dev-php/theseer-tokenizer/theseer-tokenizer-1.2.0.ebuild b/dev-php/theseer-tokenizer/theseer-tokenizer-1.2.0.ebuild index 9fe1250bc9a8..881390cc1ec0 100644 --- a/dev-php/theseer-tokenizer/theseer-tokenizer-1.2.0.ebuild +++ b/dev-php/theseer-tokenizer/theseer-tokenizer-1.2.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -9,7 +9,7 @@ SRC_URI="https://github.com/theseer/tokenizer/archive/${PV}.tar.gz -> ${P}.tar.g LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86" +KEYWORDS="amd64 arm ~hppa ppc ppc64 ~s390 sparc x86" IUSE="test" RESTRICT="!test? ( test )" diff --git a/dev-php/theseer-tokenizer/theseer-tokenizer-1.1.3.ebuild b/dev-php/theseer-tokenizer/theseer-tokenizer-1.2.1.ebuild index 88e27eb644ac..4763bbbb092f 100644 --- a/dev-php/theseer-tokenizer/theseer-tokenizer-1.1.3.ebuild +++ b/dev-php/theseer-tokenizer/theseer-tokenizer-1.2.1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 DESCRIPTION="Convert tokenized PHP source code into XML and other formats" HOMEPAGE="https://github.com/theseer/tokenizer" @@ -9,28 +9,32 @@ SRC_URI="https://github.com/theseer/tokenizer/archive/${PV}.tar.gz -> ${P}.tar.g LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86" +KEYWORDS="amd64 arm ~hppa ppc ppc64 ~s390 sparc x86" IUSE="test" RESTRICT="!test? ( test )" -S="${WORKDIR}/tokenizer-${PV}" +CDEPEND="dev-lang/php:* + dev-php/fedora-autoloader" + +BDEPEND="dev-php/theseer-Autoload" -RDEPEND="dev-php/fedora-autoloader - >=dev-lang/php-7.0:*[tokenizer,xmlwriter]" +RDEPEND="${CDEPEND}" -DEPEND="test? ( ${RDEPEND} dev-php/phpunit )" +S="${WORKDIR}/tokenizer-${PV}" src_prepare() { - cp "${FILESDIR}/autoload.php" src/ || die default + + phpab \ + --output src/autoload.php \ + --template fedora2 \ + --basedir src \ + src || die } src_install() { insinto /usr/share/php/TheSeer/Tokenizer - doins src/*.php - dodoc README.md -} + doins -r src/* -src_test() { - phpunit || die "Unit testing failed!" + einstalldocs } diff --git a/dev-php/twig/Manifest b/dev-php/twig/Manifest index 5f5c81ed5330..3ebb75db4aec 100644 --- a/dev-php/twig/Manifest +++ b/dev-php/twig/Manifest @@ -1,2 +1 @@ -DIST twig-1.40.1.tar.gz 274081 BLAKE2B 0e73bd9fff58677446ba03ed560bff17c1879192b79cca9f718ccd330e1eac64ee1195d7034fa52ec009e323868d1cc1bedc182e90f0a77c8b54d6aa16022554 SHA512 de174e5dd14562a155515a3238aa07ef5a22c3bf0eff8ecc320f1a972e56f1ec759a53ee24579c6434e286b3775044e88c753fd08930037314b45c9577b310b1 -DIST twig-1.42.3.tar.gz 278164 BLAKE2B 4bff9f7f85ce8ca00871e9342ec11a68d4b930f7761bc7404f504322483d328570e9e540e2518b5e1ad513002ce95686b7a1a47ff7aa4b28c16b2871ba759b01 SHA512 9dc892d80445f9fa9a3bde5cfdc49f2975a43f36123c1f4bbbb40740269e9aa4355d0d8668552e535f74a8ff27cc8ee1dc6983b50567993c1deab09569a7c5e3 +DIST twig-1.44.7.tar.gz 126915 BLAKE2B 2a88840cbea671dae367d39422d4b222e275236aab511fa8f5e4704093b53c3c8e5f335aac4930d84d43b05bcbe759993228de40d1aa2dd90e7b84ca8e5af7e6 SHA512 134d43f310f4277902ea06d632a7946de475ce1907cb33176f82cc49ffefc1c13b9d3f4cf76846c0084bb5a1636b001b6eb72d25e3770e118b7c1e4e4a30a373 diff --git a/dev-php/twig/metadata.xml b/dev-php/twig/metadata.xml index 3a1ebe231eea..10c660f698a7 100644 --- a/dev-php/twig/metadata.xml +++ b/dev-php/twig/metadata.xml @@ -1,10 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>djc@gentoo.org</email> - <name>Dirkjan Ochtman</name> - </maintainer> <maintainer type="project"> <email>php-bugs@gentoo.org</email> <name>PHP</name> diff --git a/dev-php/twig/twig-1.40.1-r1.ebuild b/dev-php/twig/twig-1.40.1-r1.ebuild deleted file mode 100644 index 5935eab4bd1d..000000000000 --- a/dev-php/twig/twig-1.40.1-r1.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -MY_PN="Twig" -S="${WORKDIR}/${MY_PN}-${PV}" - -DESCRIPTION="PHP templating engine with syntax similar to Django" -HOMEPAGE="http://twig.sensiolabs.org/" -SRC_URI="https://github.com/twigphp/${MY_PN}/archive/v${PV}.tar.gz - -> ${P}.tar.gz" -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="doc test" - -RDEPEND="dev-lang/php:*[ctype] dev-php/fedora-autoloader" -DEPEND="test? ( dev-php/phpunit ${RDEPEND} )" -# Test fail due to missing Symphony dependencies -RESTRICT="test" - -src_install() { - # The autoloader requires the 'T' in "Twig" capitalized. - insinto "/usr/share/php/${MY_PN}/lib" - doins -r lib/"${MY_PN}"/* - insinto "/usr/share/php/${MY_PN}/src" - doins -r src/* - insinto "/usr/share/php/${MY_PN}" - doins "${FILESDIR}/Autoloader.php" - - dodoc README.rst CHANGELOG - - # This installs the reStructuredText source documents. There's got - # to be some way to turn them into HTML using Sphinx, but upstream - # doesn't provide for it. - use doc && dodoc -r doc -} - -src_test() { - cp "${FILESDIR}/Autoloader.php" "${S}" || die - phpunit --bootstrap Autoloader.php || die "test suite failed" - rm "${S}/Autoloader.php" || die -} - -pkg_postinst() { - elog "${PN} has been installed in /usr/share/php/${MY_PN}/." - elog "To use it in a script, require('${MY_PN}/Autoloader.php')" -} diff --git a/dev-php/twig/twig-1.42.3.ebuild b/dev-php/twig/twig-1.42.3.ebuild deleted file mode 100644 index 5935eab4bd1d..000000000000 --- a/dev-php/twig/twig-1.42.3.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -MY_PN="Twig" -S="${WORKDIR}/${MY_PN}-${PV}" - -DESCRIPTION="PHP templating engine with syntax similar to Django" -HOMEPAGE="http://twig.sensiolabs.org/" -SRC_URI="https://github.com/twigphp/${MY_PN}/archive/v${PV}.tar.gz - -> ${P}.tar.gz" -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="doc test" - -RDEPEND="dev-lang/php:*[ctype] dev-php/fedora-autoloader" -DEPEND="test? ( dev-php/phpunit ${RDEPEND} )" -# Test fail due to missing Symphony dependencies -RESTRICT="test" - -src_install() { - # The autoloader requires the 'T' in "Twig" capitalized. - insinto "/usr/share/php/${MY_PN}/lib" - doins -r lib/"${MY_PN}"/* - insinto "/usr/share/php/${MY_PN}/src" - doins -r src/* - insinto "/usr/share/php/${MY_PN}" - doins "${FILESDIR}/Autoloader.php" - - dodoc README.rst CHANGELOG - - # This installs the reStructuredText source documents. There's got - # to be some way to turn them into HTML using Sphinx, but upstream - # doesn't provide for it. - use doc && dodoc -r doc -} - -src_test() { - cp "${FILESDIR}/Autoloader.php" "${S}" || die - phpunit --bootstrap Autoloader.php || die "test suite failed" - rm "${S}/Autoloader.php" || die -} - -pkg_postinst() { - elog "${PN} has been installed in /usr/share/php/${MY_PN}/." - elog "To use it in a script, require('${MY_PN}/Autoloader.php')" -} diff --git a/dev-php/twig/twig-1.42.3-r1.ebuild b/dev-php/twig/twig-1.44.7.ebuild index 1b651a90eb5c..01310215fa64 100644 --- a/dev-php/twig/twig-1.42.3-r1.ebuild +++ b/dev-php/twig/twig-1.44.7.ebuild @@ -1,13 +1,13 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 MY_PN="Twig" S="${WORKDIR}/${MY_PN}-${PV}" DESCRIPTION="PHP templating engine with syntax similar to Django" -HOMEPAGE="http://twig.sensiolabs.org/" +HOMEPAGE="https://twig.symfony.com/" SRC_URI="https://github.com/twigphp/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="BSD" @@ -16,7 +16,7 @@ KEYWORDS="~amd64 ~x86" IUSE="doc test" RDEPEND="dev-lang/php:*[ctype] dev-php/fedora-autoloader" -DEPEND="test? ( dev-php/phpunit ${RDEPEND} )" +BDEPEND="test? ( dev-php/phpunit ${RDEPEND} )" # Test fail due to missing Symphony dependencies RESTRICT="test" diff --git a/dev-php/webmozart-assert/Manifest b/dev-php/webmozart-assert/Manifest index 9c3f8cb75b6b..c662b5a4b49a 100644 --- a/dev-php/webmozart-assert/Manifest +++ b/dev-php/webmozart-assert/Manifest @@ -1,3 +1 @@ DIST webmozart-assert-1.10.0.tar.gz 17318 BLAKE2B e4ef61655deb639f22e40cf37a43820b7cebe455d5dc157f68ee9ab4720a0203233a744f6a2cc8ab8c755e9e017f478beb31cbb52de8df0e8f24da86de76b28f SHA512 e847da4f137f90da2016ea6935e479d7ea11d8944b2b9932cd0fea534f2d789c2a1c4ed7db3837a517f0074fb6ca58af9d45bc2aeb6d3bebc01f795a3be9811f -DIST webmozart-assert-1.2.0.tar.gz 11866 BLAKE2B 86cb0f299efff9822ea79964153b17337eac3e17a968b5201680186cfb3f6721b2ca561e041e71b304c6d29d227b446f7f52b65d5a6fc490c8535dd4fee0160c SHA512 36bae648cfe5bbd258d738574a820ea3de2e95b59700d556dd5eadbb1657bc09a7e73000e3436d020e060ecd2a99944199795f315a278acbeeea90570b0a4a22 -DIST webmozart-assert-1.4.0.tar.gz 9241 BLAKE2B bbe5d42732c99700f11db6a3a8b6d6753d60b3e6fbfb8412383459199139f31e3ec55e4abee03295adea19c9c48edb0f13a11597b654fdd0de0a7823ed545586 SHA512 1ed2328de800bb98b7c00264009182934006ae146d86aa313f3478b9f3a7e6eed9dee026ed80d18393724840711ecd9891ee34178676470d12cac8124f819309 diff --git a/dev-php/webmozart-assert/metadata.xml b/dev-php/webmozart-assert/metadata.xml index 0988eee357e7..ab7b6c76d8fe 100644 --- a/dev-php/webmozart-assert/metadata.xml +++ b/dev-php/webmozart-assert/metadata.xml @@ -1,11 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> <name>PHP</name> </maintainer> + <stabilize-allarches/> <upstream> - <remote-id type="github">webmozart/</remote-id> + <remote-id type="github">webmozart/assert</remote-id> </upstream> </pkgmetadata> diff --git a/dev-php/webmozart-assert/webmozart-assert-1.10.0.ebuild b/dev-php/webmozart-assert/webmozart-assert-1.10.0.ebuild index 5ceccfa33d0c..67a4b73b9558 100644 --- a/dev-php/webmozart-assert/webmozart-assert-1.10.0.ebuild +++ b/dev-php/webmozart-assert/webmozart-assert-1.10.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -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="amd64 arm ~hppa ppc ppc64 ~s390 sparc x86" IUSE="" S="${WORKDIR}/${MY_PN}-${PV}" diff --git a/dev-php/webmozart-assert/webmozart-assert-1.2.0.ebuild b/dev-php/webmozart-assert/webmozart-assert-1.2.0.ebuild deleted file mode 100644 index a570a508a6ab..000000000000 --- a/dev-php/webmozart-assert/webmozart-assert-1.2.0.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -MY_PN="${PN/webmozart-//}" - -DESCRIPTION="Assertions to validate method input/output with nice error messages" -HOMEPAGE="https://github.com/webmozart/assert" -SRC_URI="https://github.com/webmozart/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86" -IUSE="" - -S="${WORKDIR}/${MY_PN}-${PV}" - -RDEPEND="dev-php/fedora-autoloader - >=dev-lang/php-5.6:*" - -src_install() { - insinto /usr/share/php/Webmozart/Assert - doins -r src/* - doins "${FILESDIR}/autoload.php" -} diff --git a/dev-php/webmozart-assert/webmozart-assert-1.4.0.ebuild b/dev-php/webmozart-assert/webmozart-assert-1.4.0.ebuild deleted file mode 100644 index fcfe27496da6..000000000000 --- a/dev-php/webmozart-assert/webmozart-assert-1.4.0.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -MY_PN="${PN/webmozart-//}" - -DESCRIPTION="Assertions to validate method input/output with nice error messages" -HOMEPAGE="https://github.com/webmozart/assert" -SRC_URI="https://github.com/webmozart/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86" -IUSE="" - -S="${WORKDIR}/${MY_PN}-${PV}" - -RDEPEND="dev-php/fedora-autoloader - >=dev-lang/php-5.6:*" - -src_install() { - insinto /usr/share/php/Webmozart/Assert - doins -r src/* - doins "${FILESDIR}/autoload.php" -} diff --git a/dev-php/xdebug-client/metadata.xml b/dev-php/xdebug-client/metadata.xml index b86acf66c756..8bdfa70e6be3 100644 --- a/dev-php/xdebug-client/metadata.xml +++ b/dev-php/xdebug-client/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> <name>PHP</name> </maintainer> + <upstream> + <remote-id type="github">xdebug/xdebug</remote-id> + </upstream> </pkgmetadata> 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 36607c13f71b..a91395b04a40 100644 --- a/dev-php/xdebug-client/xdebug-client-2.9.8.ebuild +++ b/dev-php/xdebug-client/xdebug-client-2.9.8.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" -KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86" +KEYWORDS="amd64 ~hppa ppc ppc64 x86" MY_PN="xdebug" MY_PV="${PV/_/}" diff --git a/dev-php/xdebug-handler/Manifest b/dev-php/xdebug-handler/Manifest index 7e641018ea3c..82770a0cd130 100644 --- a/dev-php/xdebug-handler/Manifest +++ b/dev-php/xdebug-handler/Manifest @@ -1,2 +1 @@ -DIST xdebug-handler-1.4.3.tar.gz 13660 BLAKE2B 2edbd2755102ced0183e6d7ade341ed830b4c1d923f453868d29f39aa7de5159758fd162a369246adf4551a8a06c0bc6f1a29921369e47ba645f9aed2707a5b3 SHA512 ed92ca769276e66611de3cf9d44a03fd163516b973486ac5339dfe9cd9fbab8fb5f754799f59505f03aa5eb4ad175e804c6e61d0a5db63a558edf7ef1aff438c DIST xdebug-handler-2.0.1.tar.gz 14212 BLAKE2B 01200a86794145132a4c8d1b851a3131d73c23ca33d27fa9da26988f48a6c0df3552322f8fad0559ac00adf1605f35a65aa21591bc221d239ad2d8cbf4c303cd SHA512 6cc1d336a82f1edf6fb9dd317d0275c79754eb7a01fa34e0cc85c24b0a02363ccb2ff42e8b692d90077745f4db8409e7e66bef64f30a89b364eff71a4af7f4f1 diff --git a/dev-php/xdebug-handler/metadata.xml b/dev-php/xdebug-handler/metadata.xml index 3572103e75fb..9fe7978bdffe 100644 --- a/dev-php/xdebug-handler/metadata.xml +++ b/dev-php/xdebug-handler/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person" proxied="yes"> <email>guillaumeseren@gmail.com</email> diff --git a/dev-php/xdebug-handler/xdebug-handler-1.4.3.ebuild b/dev-php/xdebug-handler/xdebug-handler-1.4.3.ebuild deleted file mode 100644 index 3bda89b13555..000000000000 --- a/dev-php/xdebug-handler/xdebug-handler-1.4.3.ebuild +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="Restart a CLI process without loading the xdebug extension" -HOMEPAGE="https://github.com/composer/xdebug-handler" -SRC_URI="https://github.com/composer/xdebug-handler/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 x86" - -RDEPEND=" - dev-lang/php:* - dev-php/fedora-autoloader - >=dev-php/psr-log-1.0.2" - -src_install() { - insinto /usr/share/php/Composer/XdebugHandler - doins src/*.php "${FILESDIR}/autoload.php" - dodoc README.md -} diff --git a/dev-php/xdebug-handler/xdebug-handler-2.0.1.ebuild b/dev-php/xdebug-handler/xdebug-handler-2.0.1.ebuild index ad9f7604ad52..5a3df841ee37 100644 --- a/dev-php/xdebug-handler/xdebug-handler-2.0.1.ebuild +++ b/dev-php/xdebug-handler/xdebug-handler-2.0.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -9,7 +9,7 @@ SRC_URI="https://github.com/composer/xdebug-handler/archive/${PV}.tar.gz -> ${P} LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 ~arm64 x86" RDEPEND=" dev-lang/php:* diff --git a/dev-php/xdebug/Manifest b/dev-php/xdebug/Manifest index 5f70b3b24e97..9add28f80792 100644 --- a/dev-php/xdebug/Manifest +++ b/dev-php/xdebug/Manifest @@ -1,5 +1,4 @@ -DIST xdebug-2.9.6.tar.gz 436208 BLAKE2B 00cfb42c41bfb44f285b97779d6ba625641fc34494465e9e791ab5458c6a608e432df0ad45c561df2f8c9aba04ab34b3a98bb5e6bfb92ace39a3ad4145f3514a SHA512 13ed07a1489ba7bc0b4e85bf56306c733e7894cea8cb442649635196606b12d92e5618ab2485e7cde4aaee2ac6752993aecd933c24fd64b5113ef619339403d2 -DIST xdebug-2.9.8.tar.gz 438295 BLAKE2B 8645052faceb354817ddb448f46af5b849507d31255b43ac59bcef4ece7837ef835ae2ad624ed8a95f8f98d552ef0e7195a4ade7df9176bc300d855a0156f405 SHA512 c431d51a0d9c5ac1c7fc529c2819db480cbfff6f65c35c3c0dbef4e78427aa28ede164f397f92c409e58e386a6be34ecd2ded0ee35e01df1cbf92a49fd2f2aab -DIST xdebug-3.0.2.tar.gz 435761 BLAKE2B 0476d29b3a960d83fd0818098a3d076f48f4d67057a2b6ec79571b011a9f364b18d3319771ad18e7145aa0f0f45fab7ed13d814b863731abe1721aafa8b59408 SHA512 723e00885a49a5626870cc4cb0f7fd49a3173c8d4e9b4022009430fdeaa1b152828de18e6e7fa709be8bb11989c89dc2d9940de9cc3d592174b5dafbc3d2c52d -DIST xdebug-3.0.3.tar.gz 437261 BLAKE2B 7ccfa8acbbe8b40eb086c9d4f47d363ec52850f5b0b91480bebfa416d7b88edf20deb6ee5fb5514dd1885f7a5b77c4b18caecf958d7dcf463c44c259d0fe2b89 SHA512 2ea5c6e2d6481aeeb5b2d8e39f5c5686d9b7480aea0c159f3da6e830700594b24129c1c4242ff8413b52aa2ed0ea872bf72a17fe23facb69c1cae75a917bde5d -DIST xdebug-3.0.4.tar.gz 438559 BLAKE2B 0b4dc4a014f2459691bf43bb76d70a4080a6191b5f6cf4998751e73cdfcbecb7a6274e6f398476a2c68d014ddb25662e08e45b68fbc73c9b38c79c94b0682124 SHA512 f7f935903adb18f0920c919c3e5c923b70667dd82772bef7ae73fe40441ad1cb73f030aa206046720d4bfcf8b33f56d454cbb5f65dbdc275b7c1fd1907ff4ddb +DIST xdebug-3.1.1.tar.gz 468120 BLAKE2B 038774612158c2c9b406e29dd70e2a3e182ce121bc92036eeb3362be0ba513a223cb2da41bdfe914d6861ae9d94ff33c5301cc23725ee771f47876c8095ae0b8 SHA512 b91bca3bac184723b3f6dc0c5db012f2ec0895ed55cd4ff83f73d35462b9cea654476c848f7d61559a4bd8661ce335fc71a45a7cab1165f4197d265e31eccc71 +DIST xdebug-3.1.3.tar.gz 470305 BLAKE2B abc799f966c20ba868d57e707ebc35e1f2d4ef5567bcd373ae5ae2ada58fbd4a4a807cfdf520cb883f08bc5296f219d190865462eab7d11ff2cb8c12a33b671b SHA512 cd2e85ce37f5122bcaa8300061be3b244bf9a58060e4e7286b3b52e9ab592f9a8ad43b62d53f13c7be878bb8662ff7aba187b73040bea79a3244df3d6b59e27b +DIST xdebug-3.1.5.tar.gz 434440 BLAKE2B e9a94ff8d774ed55c848a6e3933064ab6ea91db6b70f9aaed206296152ec2bc7e15b6330ea166bf9bc5fa26ff0c2a0bf8accd281ad833318b9b718d6f7d671a4 SHA512 6949d98cdf67c5931f1abfac1a2a8ea95123431dc57325fe5005c445f4f87fd461ce4eadde41f45d2e3fd4d63c0e4ae952954eae4f86d78c498f95ce43b49e81 +DIST xdebug-3.2.1.tar.gz 450198 BLAKE2B 046120555bc6ff5b15380618c8126387eec213036299dfaefd2d8bca77c625c064dec938f56d665aae479c7fd76a9fdcc0304695f8ec44534d0a5265d9073159 SHA512 c7246e8cf7dc22b9c21ec1586fc5393817b1b5eefff9339652846340a6cc57fa72adb6c9229a87ac9849e8f5762aafbf140d99d0978950e93562e228d9da5a6b diff --git a/dev-php/xdebug/files/2.6.0-xdebug.ini b/dev-php/xdebug/files/2.6.0-xdebug.ini deleted file mode 100644 index e37ada0ef8fe..000000000000 --- a/dev-php/xdebug/files/2.6.0-xdebug.ini +++ /dev/null @@ -1,54 +0,0 @@ -;xdebug.auto_trace = 0 -;xdebug.cli_color = 0 -;xdebug.collect_assignments = 0 -;xdebug.collect_includes = 1 -;xdebug.collect_params = 0 -;xdebug.collect_return = 0 -;xdebug.collect_vars = 0 -;xdebug.coverage_enable = 1 -xdebug.default_enable = 0 -;xdebug.dump.* = Empty -;xdebug.dump_globals = 1 -;xdebug.dump_once = 1 -;xdebug.dump_undefined = 0 -;xdebug.extended_info = 1 -;xdebug.file_link_format = -;xdebug.force_display_errors = 0 -;xdebug.force_error_reporting = 0 -;xdebug.halt_level = 0 -;xdebug.idekey = *complex* -;xdebug.manual_url = http://www.php.net -;xdebug.max_nesting_level = 256 -;xdebug.max_stack_frames = -1 -;xdebug.overload_var_dump = 2 -;xdebug.profiler_aggregate = 0 -;xdebug.profiler_append = 0 -;xdebug.profiler_enable = 0 -;xdebug.profiler_enable_trigger = 0 -;xdebug.profiler_enable_trigger_value = "" -;xdebug.profiler_output_dir = /tmp -;xdebug.profiler_output_name = cachegrind.out.%p -;xdebug.remote_addr_header = "" -;xdebug.remote_autostart = 0 -;xdebug.remote_connect_back = 0 -;xdebug.remote_cookie_expire_time = 3600 -;xdebug.remote_enable = 0 -;xdebug.remote_handler = dbgp -;xdebug.remote_host = localhost -;xdebug.remote_log = -;xdebug.remote_mode = req -;xdebug.remote_port = 9000 -;xdebug.scream = 0 -;xdebug.show_error_trace = 0 -;xdebug.show_exception_trace = 0 -;xdebug.show_local_vars = 0 -;xdebug.show_mem_delta = 0 -;xdebug.trace_enable_trigger = 0 -;xdebug.trace_enable_trigger_value = "" -;xdebug.trace_format = 0 -;xdebug.trace_options = 0 -;xdebug.trace_output_dir = /tmp -;xdebug.trace_output_name = trace.%c -;xdebug.var_display_max_children = 128 -;xdebug.var_display_max_data = 512 -;xdebug.var_display_max_depth = 3 diff --git a/dev-php/xdebug/metadata.xml b/dev-php/xdebug/metadata.xml index b86acf66c756..8bdfa70e6be3 100644 --- a/dev-php/xdebug/metadata.xml +++ b/dev-php/xdebug/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> <name>PHP</name> </maintainer> + <upstream> + <remote-id type="github">xdebug/xdebug</remote-id> + </upstream> </pkgmetadata> diff --git a/dev-php/xdebug/xdebug-2.9.8.ebuild b/dev-php/xdebug/xdebug-2.9.8.ebuild deleted file mode 100644 index 2edd756ef66e..000000000000 --- a/dev-php/xdebug/xdebug-2.9.8.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# 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="2.6.0-xdebug.ini" - -USE_PHP="php7-2 php7-3 php7-4" - -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} - ~dev-php/xdebug-client-${PV}" -DOCS=( README.rst CREDITS ) -PHP_EXT_ECONF_ARGS=() - -pkg_postinst() { - ewarn "We have set xdebug.default_enable to 0 (off), as xdebug can be" - ewarn "installed as a dependency, and not all users will want xdebug to be" - ewarn "enabled by default. If you want to enable it, you should edit the" - ewarn "ini file and set xdebug.default_enable to 1. Alternatively you can" - ewarn "call xdebug_enable() in your code." -} diff --git a/dev-php/xdebug/xdebug-3.0.3.ebuild b/dev-php/xdebug/xdebug-3.1.1.ebuild index c4a24b3dd8dc..5d418f56c531 100644 --- a/dev-php/xdebug/xdebug-3.0.3.ebuild +++ b/dev-php/xdebug/xdebug-3.1.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -7,7 +7,7 @@ PHP_EXT_INI="yes" PHP_EXT_ZENDEXT="yes" PHP_EXT_INIFILE="3.0-xdebug.ini" -USE_PHP="php7-3 php7-4 php8-0" +USE_PHP="php8-1" PHP_EXT_NEEDED_USE="-threads(-)" MY_PV="${PV/_/}" @@ -17,7 +17,7 @@ S="${WORKDIR}/${PN}-${MY_PV}" inherit php-ext-source-r3 -KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86" +KEYWORDS="amd64 ~hppa ppc ppc64 x86" DESCRIPTION="A PHP debugging and profiling extension" HOMEPAGE="https://xdebug.org/" @@ -31,8 +31,6 @@ IUSE="" # Tests are known to fail RESTRICT="test" -DEPEND="" -RDEPEND="${DEPEND}" DOCS=( README.rst CREDITS ) PHP_EXT_ECONF_ARGS=() diff --git a/dev-php/xdebug/xdebug-2.9.6.ebuild b/dev-php/xdebug/xdebug-3.1.3.ebuild index e721f2c63e7b..5d418f56c531 100644 --- a/dev-php/xdebug/xdebug-2.9.6.ebuild +++ b/dev-php/xdebug/xdebug-3.1.3.ebuild @@ -1,13 +1,14 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 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="2.6.0-xdebug.ini" +PHP_EXT_INIFILE="3.0-xdebug.ini" -USE_PHP="php7-2 php7-3 php7-4" +USE_PHP="php8-1" +PHP_EXT_NEEDED_USE="-threads(-)" MY_PV="${PV/_/}" MY_PV="${MY_PV/rc/RC}" @@ -30,16 +31,26 @@ IUSE="" # Tests are known to fail RESTRICT="test" -DEPEND="" -RDEPEND="${DEPEND} - ~dev-php/xdebug-client-${PV}" 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.default_enable to 0 (off), as xdebug can be" + 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.default_enable to 1. Alternatively you can" - ewarn "call xdebug_enable() in your code." + 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.4.ebuild b/dev-php/xdebug/xdebug-3.1.5.ebuild index c4a24b3dd8dc..02f16075d018 100644 --- a/dev-php/xdebug/xdebug-3.0.4.ebuild +++ b/dev-php/xdebug/xdebug-3.1.5.ebuild @@ -1,13 +1,13 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="7" +EAPI=8 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" +USE_PHP="php8-1" PHP_EXT_NEEDED_USE="-threads(-)" MY_PV="${PV/_/}" diff --git a/dev-php/xdebug/xdebug-3.0.2-r1.ebuild b/dev-php/xdebug/xdebug-3.2.1.ebuild index c4a24b3dd8dc..ca7f9ae401a0 100644 --- a/dev-php/xdebug/xdebug-3.0.2-r1.ebuild +++ b/dev-php/xdebug/xdebug-3.2.1.ebuild @@ -1,13 +1,13 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="7" +EAPI=8 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" +USE_PHP="php8-1 php8-2" PHP_EXT_NEEDED_USE="-threads(-)" MY_PV="${PV/_/}" diff --git a/dev-php/xhprof/Manifest b/dev-php/xhprof/Manifest index 9b12b022e21b..993f97faf8d3 100644 --- a/dev-php/xhprof/Manifest +++ b/dev-php/xhprof/Manifest @@ -1,2 +1,2 @@ -DIST xhprof-2.1.4.tgz 841444 BLAKE2B 33be85d55f2636af5664aeb017ccaab6ad03962d44b3143c0eb9d9f9cc0fa74048fbca6beae89d02ed47db8ffe1ea77df1f6a41aa62fbc90fea2c52c467a422d SHA512 8777d29c16bce9e7698cf37c7dd631e951a018fa63ab5a4ab0df8e7621643e7fb905cd9bc189b238d76e32408a43f522bbab455caab6b89f7b6c26590b2733a3 -DIST xhprof-2.2.3.tgz 842543 BLAKE2B 5940a5ed8edc334ae2dc09d4621ed7fb4b8b56de6f07dc49e4a84ced33689f242f11ac89dced670f7b54d35fe8c9840fea09e55340174c399fae263760ca35ac SHA512 000468a7fa2a0af25004f0ffd59a8ab111a5cfa4cff275291fcbc54d3283fbf4a904b4aaeb38c2a8c7c81924bc31d9328ccf9fb7de24e20c224e014ed942efaf +DIST xhprof-2.3.5.tgz 842658 BLAKE2B 4392b521e8b4c10dc745bbd670c351231680e753251b1d1e3c7048e17fa5a88a6c79da39f3c50b8642ca0c1a5b9658e4dafe6ed4af3dc97c71265f021438fda9 SHA512 50ae6fb8d63ac8354b7887daecd1882f33e616cd1ef165b54d51f26fa93d2827f621e89d0d583979c453af5d66a83ddcbf0eb2d462df74ebb422294e601268f4 +DIST xhprof-2.3.9.tgz 843027 BLAKE2B be7c36d7b30f1efd1e3fb4d67f1d9ee8e23bb0e28f6bf9b8c00ee61154e753505e0935acf75c61d0806222a14d3203a4be1c0b4ef6b00f7d15aa9d35d99e410f SHA512 38a2609d961d908c6a4b5d1ff2085ffdad4a5f7d277705c826ae19e215660802528d606c5ee052f2e65255a7a85b2a9cb9038f4785c730ec468fc76dc7bcf5de diff --git a/dev-php/xhprof/metadata.xml b/dev-php/xhprof/metadata.xml index b5ff04d51c7a..6ab75789ddb5 100644 --- a/dev-php/xhprof/metadata.xml +++ b/dev-php/xhprof/metadata.xml @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> <name>PHP</name> </maintainer> <upstream> - <remote-id type="github">phacility/xhprof</remote-id> + <remote-id type="github">longxinH/xhprof</remote-id> </upstream> </pkgmetadata> diff --git a/dev-php/xhprof/xhprof-2.1.4.ebuild b/dev-php/xhprof/xhprof-2.3.5.ebuild index 6d7187add699..43941532e3b0 100644 --- a/dev-php/xhprof/xhprof-2.1.4.ebuild +++ b/dev-php/xhprof/xhprof-2.3.5.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" PHP_EXT_S="${S}/extension" PHP_EXT_ECONF_ARGS="" -USE_PHP="php7-2 php7-3 php7-4" +USE_PHP="php8-1" inherit php-ext-pecl-r3 diff --git a/dev-php/xhprof/xhprof-2.2.3.ebuild b/dev-php/xhprof/xhprof-2.3.9.ebuild index 1d609078c8c4..42bbc9840ab0 100644 --- a/dev-php/xhprof/xhprof-2.2.3.ebuild +++ b/dev-php/xhprof/xhprof-2.3.9.ebuild @@ -1,18 +1,17 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="7" +EAPI="8" PHP_EXT_S="${S}/extension" PHP_EXT_ECONF_ARGS="" -USE_PHP="php7-2 php7-3 php7-4 php8-0" +USE_PHP="php8-1 php8-2 php8-3" inherit php-ext-pecl-r3 -KEYWORDS="~amd64 ~x86" - -HOMEPAGE="https://pecl.php.net/package/xhprof" DESCRIPTION="A Hierarchical Profiler for PHP" +HOMEPAGE="https://pecl.php.net/package/xhprof" LICENSE="Apache-2.0" + SLOT="0" -IUSE="" +KEYWORDS="~amd64 ~x86" diff --git a/dev-php/zetacomponents-Base/Manifest b/dev-php/zetacomponents-Base/Manifest index d2b1d99d3293..71f868353468 100644 --- a/dev-php/zetacomponents-Base/Manifest +++ b/dev-php/zetacomponents-Base/Manifest @@ -1 +1,2 @@ DIST zetacomponents-Base-1.9.1.tar.gz 252350 BLAKE2B cc0d82a107fc1190b57b03ce3a594d9ffa5b3a2627cf30d7d31a1018005a8400917cf7bbd1dfeb23f46d118ae56083e147d148b3bbdba5dfea8fde0a8bcf0c46 SHA512 dd56f123c8ed3b8c0116b878120ba7763e402b8364ba404305a9ab483b1c5a341df994517f160c8a959005ab9b75a5a7af74d08b367daa3fd8f852ba4ede5e05 +DIST zetacomponents-Base-1.9.3.tar.gz 253144 BLAKE2B 5e8e5188e67d06da2a4ed0d9cd1df86d15740390109f98028a71cf0aa0cbfaab1a47007095faf7ba8c7fd9b6bb3daae7b3d6fae76cae8b82751b3d67b3680614 SHA512 5718095cbfe657c08b9adf71e4cada49e2edf8518601e235070ac8fb8fc5793bc4ba8a0cb1a4202210fc23884960d06f502288a94cd624c96a53e2fcf395d492 diff --git a/dev-php/zetacomponents-Base/metadata.xml b/dev-php/zetacomponents-Base/metadata.xml index 0edc8ccac85a..c9f7113195ae 100644 --- a/dev-php/zetacomponents-Base/metadata.xml +++ b/dev-php/zetacomponents-Base/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> diff --git a/dev-php/zetacomponents-Base/zetacomponents-Base-1.9.1.ebuild b/dev-php/zetacomponents-Base/zetacomponents-Base-1.9.1.ebuild index 70ba281e31d7..f3fb27246913 100644 --- a/dev-php/zetacomponents-Base/zetacomponents-Base-1.9.1.ebuild +++ b/dev-php/zetacomponents-Base/zetacomponents-Base-1.9.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="https://github.com/zetacomponents/${MY_PN}/archive/${PV}.tar.gz -> ${P} LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86" +KEYWORDS="amd64 arm ~hppa ppc ppc64 ~s390 sparc x86" RDEPEND="dev-lang/php:*" diff --git a/dev-php/zetacomponents-Base/zetacomponents-Base-1.9.3.ebuild b/dev-php/zetacomponents-Base/zetacomponents-Base-1.9.3.ebuild new file mode 100644 index 000000000000..35876269b9d1 --- /dev/null +++ b/dev-php/zetacomponents-Base/zetacomponents-Base-1.9.3.ebuild @@ -0,0 +1,26 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MY_PN="Base" + +DESCRIPTION="Base package for any Zeta component" +HOMEPAGE="https://github.com/zetacomponents/Base" +SRC_URI="https://github.com/zetacomponents/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 ~s390 sparc x86" + +RDEPEND="dev-lang/php:*" + +S="${WORKDIR}/${MY_PN}-${PV}" + +src_install() { + insinto /usr/share/php/ezc/${MY_PN} + doins -r src/* + doins "${FILESDIR}"/autoload.php + + einstalldocs +} diff --git a/dev-php/zetacomponents-ConsoleTools/metadata.xml b/dev-php/zetacomponents-ConsoleTools/metadata.xml index e795f5a99f52..e32cf71d82cb 100644 --- a/dev-php/zetacomponents-ConsoleTools/metadata.xml +++ b/dev-php/zetacomponents-ConsoleTools/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>php-bugs@gentoo.org</email> diff --git a/dev-php/zetacomponents-ConsoleTools/zetacomponents-ConsoleTools-1.7.2-r1.ebuild b/dev-php/zetacomponents-ConsoleTools/zetacomponents-ConsoleTools-1.7.2-r1.ebuild index c6fb4b93279d..6fbfab125ede 100644 --- a/dev-php/zetacomponents-ConsoleTools/zetacomponents-ConsoleTools-1.7.2-r1.ebuild +++ b/dev-php/zetacomponents-ConsoleTools/zetacomponents-ConsoleTools-1.7.2-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="https://github.com/zetacomponents/${MY_PN}/archive/${PV}.tar.gz -> ${P} LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86" +KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 ~s390 sparc x86" RDEPEND="dev-lang/php:*[iconv(-)]" |