diff options
Diffstat (limited to 'dev-php')
78 files changed, 951 insertions, 2001 deletions
diff --git a/dev-php/PEAR-Archive_Tar/Manifest b/dev-php/PEAR-Archive_Tar/Manifest index d639d34ab864..1031207664d7 100644 --- a/dev-php/PEAR-Archive_Tar/Manifest +++ b/dev-php/PEAR-Archive_Tar/Manifest @@ -1 +1 @@ -DIST Archive_Tar-1.4.11.tgz 21556 BLAKE2B f7e450f4581400159099dba023192ec4026da8867c675119001085651c20315523a58180e0ccd4528e3b1764e222945055702e0fd8e42bb5976b891230351f29 SHA512 a67ff191eb1d814094fc752b58b5d4b4d3db0fd2476fce403f8e5cac49a35fd1219167817dc84d6f957af87d326435aef000e2e0b16357a0d051ab407b76d2cc +DIST Archive_Tar-1.4.12.tgz 21665 BLAKE2B fc4d2d5128bfc02da5f7e2465834e2ff14554188ede7899856f200935a850c35bb74e6fcca5c4c4ae641a575725a3edba2878376a587304f133c8f16e1ee9336 SHA512 9f2e6ca4628ba4ec95a324c4a706b2d01d2323b5e5e77f1cc7425784d1a35d139b1604bffca10af8b04c4cc875cb6b1f40715a00208cd042aba37f089a586497 diff --git a/dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.4.11.ebuild b/dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.4.12.ebuild index ef91adf2eadf..09a18646d8e6 100644 --- a/dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.4.11.ebuild +++ b/dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.4.12.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -28,4 +28,23 @@ src_install() { 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-Console_Getopt/Manifest b/dev-php/PEAR-Console_Getopt/Manifest index 508f8fc1e759..95d44b75733b 100644 --- a/dev-php/PEAR-Console_Getopt/Manifest +++ b/dev-php/PEAR-Console_Getopt/Manifest @@ -1,2 +1 @@ -DIST Console_Getopt-1.4.1.tgz 5580 BLAKE2B 514d44cfd2bb7c8bcda49df2b6ba4dafc77184557f58f52c02c6a136e335639e65b7c10f5659dad9d7a87e946d60947121cb5f35a72b6d29fbb3efa3e535283b SHA512 cbf12a72b33424935f019b17ae8fa55289eae77d3845dcfcbbc1c47b71111992d2c0eb837b0f262ce644809c3cc06ad0c2bb04aa1b6ec89a1e3122f327114dbd DIST Console_Getopt-1.4.3.tgz 5789 BLAKE2B 641432105696e93160fd6a3ade4ee8c1bd7780cc502668266485d8c747fc8ceb97ce70ebdab8f61a739a4bf8267bfc936f0c9fd51b408add680a2288d49e0412 SHA512 7803e063576e9dac6833064b5a1479d22ca31c2a8ef8036ae530271e4e824fedb94e54d63266be8929f90f8df745b3ada7185dc98319b331f8dc5e9cac5445a0 diff --git a/dev-php/PEAR-Console_Getopt/PEAR-Console_Getopt-1.4.1-r1.ebuild b/dev-php/PEAR-Console_Getopt/PEAR-Console_Getopt-1.4.1-r1.ebuild deleted file mode 100644 index 70263d63bc9b..000000000000 --- a/dev-php/PEAR-Console_Getopt/PEAR-Console_Getopt-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="${PN/PEAR-/}" -MY_P="${MY_PN}-${PV}" - -DESCRIPTION="Command-line option parser" -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" -IUSE="" - -DEPEND="" -RDEPEND="dev-lang/php:*" -PDEPEND="dev-php/PEAR-PEAR" - -S="${WORKDIR}/${MY_P}" - -src_install() { - insinto /usr/share/php - doins -r Console -} diff --git a/dev-php/PEAR-Console_Getopt/PEAR-Console_Getopt-1.4.3.ebuild b/dev-php/PEAR-Console_Getopt/PEAR-Console_Getopt-1.4.3.ebuild index 1f5d8be072f4..382f3c45799a 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-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ HOMEPAGE="https://pear.php.net/package/Console_Getopt" SRC_URI="https://pear.php.net/get/${MY_P}.tgz" LICENSE="BSD-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86" IUSE="" DEPEND="" diff --git a/dev-php/PEAR-Console_Getopt/metadata.xml b/dev-php/PEAR-Console_Getopt/metadata.xml index 0059b9071e53..e2e85886a9dd 100644 --- a/dev-php/PEAR-Console_Getopt/metadata.xml +++ b/dev-php/PEAR-Console_Getopt/metadata.xml @@ -8,5 +8,6 @@ <upstream> <remote-id type="pear">Console_Getopt</remote-id> </upstream> + <stabilize-allarches/> <origin>gentoo-staging</origin> </pkgmetadata> diff --git a/dev-php/PEAR-PEAR/Manifest b/dev-php/PEAR-PEAR/Manifest index 7892fd4e44f9..e94b02351ee7 100644 --- a/dev-php/PEAR-PEAR/Manifest +++ b/dev-php/PEAR-PEAR/Manifest @@ -1,4 +1 @@ DIST PEAR-1.10.12.tgz 293220 BLAKE2B fb25123852a60e4bd2c041d1fb58174b3053b24ff8ec19b44efe02aee041bbed102b14b270dc1c9764150eea7c85862ad78adefdc1d789540da18ec0f3aeae68 SHA512 1ce478800a150d7906f8aa4fa4371d3d190fa2af44691c9aa193babfe76f1b031b493f48df15b93e93dd5518a6d62ba6a7d5b1799b62d5a968f7a84f3677b971 -DIST PEAR-1.10.6.tgz 291529 BLAKE2B 7a75c89df2b34b368564e745a727292e5c5ee3a145995c15d338901b235664d0a783ca0efc9cd1d321cc2c496e88395db376ce7bbd6ccbf55d484d7f1021cd2b SHA512 ccd436a2cb9d30b434a78483432c51a8fa5b3e96e79ca3b28131b8dcd37bbae0b782efd762eb92dc40db24d3f61025c64ec5d29aed10fd80a6b28c224c4f1e2a -DIST PEAR-1.10.7.tgz 291786 BLAKE2B 7e760c2782832fab2a35f86e2f9072058d622918cdc2b61b7066d2f17787488d228186948e96e602bb412b76b806004642e7ba83db00950a822996869dae9cd4 SHA512 ebe93cff5546ad3a80d3d1c0284e34a46ec8dbdb7d015a11350231244baca75a57596e446c1386bc40650525f59c04617e73b1071a0fe77210dc5979edb5151f -DIST PEAR-1.10.9.tgz 291931 BLAKE2B b9120d9b643be926e80aac33aafd0f22cacca11c10b857d99b6d51a7315467ad18d79246ab2752b962de92957fe14fc65e1d01570eb73b562b0e6e030dfb7162 SHA512 072d2eda510c05649f8d1481665bdd42efa060e6098b4b0d0353c95cf79d342ec601dd36dab3e6583b612582d2f03672a7b5de1518e3a0e8fd190ea698a17e60 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 eda65ff33c79..fe194d02e2c5 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-2020 Gentoo Authors +# Copyright 1999-2021 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 ~ia64 ppc ppc64 ~s390 sparc x86" SLOT="0" IUSE="" diff --git a/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.6.ebuild b/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.6.ebuild deleted file mode 100644 index 1b52326be86b..000000000000 --- a/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.6.ebuild +++ /dev/null @@ -1,177 +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="PEAR Base System" -HOMEPAGE="https://pear.php.net/package/PEAR" -SRC_URI="https://pear.php.net/get/${MY_P}.tgz" -LICENSE="MIT" -KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86" -SLOT="0" -IUSE="" - -DEPEND="" -RDEPEND="dev-lang/php:*[cli,xml,zlib] - >=dev-php/PEAR-Archive_Tar-1.4.0 - >=dev-php/PEAR-Console_Getopt-1.4.1 - dev-php/PEAR-Exception - >=dev-php/PEAR-Structures_Graph-1.1.0 - >=dev-php/PEAR-XML_Util-1.3.0" - -S="${WORKDIR}/${MY_P}" - -PATCHES=( "${FILESDIR}/gentoo-libtool-mismatch-fix-v2.patch" ) - -pkg_setup() { - [[ -z "${PEAR_CACHEDIR}" ]] && PEAR_CACHEDIR="${EPREFIX}/var/cache/pear" - [[ -z "${PEAR_DOWNLOADDIR}" ]] && PEAR_DOWNLOADDIR="${EPREFIX}/var/tmp/pear" - [[ -z "${PEAR_TEMPDIR}" ]] && PEAR_TEMPDIR="${EPREFIX}/tmp" - - elog - elog "cache_dir is set to: ${PEAR_CACHEDIR}" - elog "download_dir is set to: ${PEAR_DOWNLOADDIR}" - elog "temp_dir is set to: ${PEAR_TEMPDIR}" - elog - elog "If you want to change the above values, you need to set" - elog "PEAR_CACHEDIR, PEAR_DOWNLOADDIR and PEAR_TEMPDIR variable(s)" - elog "accordingly in /etc/portage/make.conf and re-emerge ${PN}." - elog -} - -src_prepare() { - default - # Exception.php is part of dev-php/PEAR-Exception. - rm PEAR/Exception.php || die "failed to remove PEAR/Exception.php" -} - -src_install() { - insinto /usr/share/php - doins -r PEAR/ - doins -r OS/ - doins PEAR.php System.php - doins scripts/pearcmd.php - doins scripts/peclcmd.php - - newbin scripts/pear.sh pear - newbin scripts/peardev.sh peardev - newbin scripts/pecl.sh pecl - - # adjust some scripts for current version - [[ -z "${PEAR}" ]] && PEAR="${PV}" - for i in pearcmd.php peclcmd.php ; do - sed "s:@pear_version@:${PEAR}:g" -i "${D}/usr/share/php/${i}" \ - || die "failed to sed pear_version" - done - - for i in pear peardev pecl ; do - sed "s:@bin_dir@:${EPREFIX}/usr/bin:g" -i "${D}/usr/bin/${i}" \ - || die "failed to sed @bin_dir@ in ${i}" - sed "s:@php_dir@:${EPREFIX}/usr/share/php:g" -i "${D}/usr/bin/${i}" \ - || die "failed to sed @php_dir@ in ${i}" - done - - sed "s:-d output_buffering=1:-d output_buffering=1 -d memory_limit=32M:g" \ - -i "${D}/usr/bin/pear" \ - || die "failed to set PHP ini values in pear executable" - - sed "s:@package_version@:${PEAR}:g" \ - -i "${D}/usr/share/php/PEAR/Command/Package.php" \ - || die "failed to sed @package_version@" - - sed "s:@PEAR-VER@:${PEAR}:g" \ - -i "${D}/usr/share/php/PEAR/Dependency2.php" \ - || die "failed to sed @PEAR-VER@ in Dependency2.php" - - sed "s:@PEAR-VER@:${PEAR}:g" \ - -i "${D}/usr/share/php/PEAR/PackageFile/Parser/v1.php" \ - || die "failed to sed @PEAR-VER@ in v1.php" - - sed "s:@PEAR-VER@:${PEAR}:g" \ - -i "${D}/usr/share/php/PEAR/PackageFile/Parser/v2.php" \ - || die "failed to sed @PEAR-VER@ in v2.php" - - # finalize install - insinto /etc - newins "${FILESDIR}"/pear.conf-r2 pear.conf - - sed "s|s:PHPCLILEN:\"PHPCLI\"|s:${#PHPCLI}:\"${PHPCLI}\"|g" \ - -i "${D}/etc/pear.conf" \ - || die "failed to sed PHPCLILEN in pear.conf" - - sed "s|s:CACHEDIRLEN:\"CACHEDIR\"|s:${#PEAR_CACHEDIR}:\"${PEAR_CACHEDIR}\"|g" \ - -i "${D}/etc/pear.conf" \ - || die "failed to sed CACHEDIRLEN in pear.conf" - - sed "s|s:DOWNLOADDIRLEN:\"DOWNLOADDIR\"|s:${#PEAR_DOWNLOADDIR}:\"${PEAR_DOWNLOADDIR}\"|g" \ - -i "${D}/etc/pear.conf" \ - || die "failed to sed DOWNLOADDIRLEN in pear.conf" - - sed "s|s:TEMPDIRLEN:\"TEMPDIR\"|s:${#PEAR_TEMPDIR}:\"${PEAR_TEMPDIR}\"|g" \ - -i "${D}/etc/pear.conf" \ - || die "failed to sed TEMPDIRLEN in pear.conf" - - # Change the paths for eprefix! - sed "s|s:19:\"/usr/share/php/docs\"|s:$(( ${#EPREFIX}+19 )):\"${EPREFIX}/usr/share/php/docs\"|g" \ - -i "${D}/etc/pear.conf" \ - || die "failed to sed the docs path (prefix) in pear.conf" - - sed "s|s:19:\"/usr/share/php/data\"|s:$(( ${#EPREFIX}+19 )):\"${EPREFIX}/usr/share/php/data\"|g" \ - -i "${D}/etc/pear.conf" \ - || die "failed to sed the data path (prefix) in pear.conf" - - sed "s|s:20:\"/usr/share/php/tests\"|s:$(( ${#EPREFIX}+20 )):\"${EPREFIX}/usr/share/php/tests\"|g" \ - -i "${D}/etc/pear.conf" \ - || die "failed to sed the tests path (prefix) in pear.conf" - - sed "s|s:14:\"/usr/share/php\"|s:$(( ${#EPREFIX}+14 )):\"${EPREFIX}/usr/share/php\"|g" \ - -i "${D}/etc/pear.conf" \ - || die "failed to sed the PHP include path (prefix) in pear.conf" - - sed "s|s:8:\"/usr/bin\"|s:$(( ${#EPREFIX}+8 )):\"${EPREFIX}/usr/bin\"|g" \ - -i "${D}/etc/pear.conf" \ - || die "failed to sed the bin path (prefix) in pear.conf" - - [[ "${PEAR_TEMPDIR}" != "/tmp" ]] && keepdir "${PEAR_TEMPDIR#${EPREFIX}}" - keepdir "${PEAR_CACHEDIR#${EPREFIX}}" - diropts -m1777 - keepdir "${PEAR_DOWNLOADDIR#${EPREFIX}}" - - insinto /usr/share/php/.packagexml - newins "${WORKDIR}/package.xml" "${MY_P}.xml" -} - -pkg_config() { - # Update PEAR/PECL channels as needed, add new ones to the list if needed - elog "Updating PEAR/PECL channels" - local pearchans="pear.php.net pecl.php.net pear.symfony-project.com" - - for chan in ${pearchans} ; do - # The first command may fail if, for example, the channels have - # already been initialized. - pear channel-discover ${chan} - pear channel-update ${chan} || die "failed to update channels: ${chan}" - done -} - -pkg_postinst() { - pear clear-cache || die "failed to clear PEAR cache" - - elog "Run 'emerge --config =${PF}' to automatically update the PEAR/PECL channels while online." - - # Register the package from the package.xml file - # It is not critical to complete so only warn on failure - if [[ -f "${EROOT}usr/share/php/.packagexml/${MY_P}.xml" ]] ; then - "${EROOT}usr/bin/peardev" install -nrO --force \ - "${EROOT}usr/share/php/.packagexml/${MY_P}.xml" 2> /dev/null \ - || ewarn "Failed to insert package into local PEAR database" - fi -} - -pkg_prerm() { - # Uninstall known dependency - "${EROOT}usr/bin/peardev" uninstall -nrO "pear.php.net/PEAR" -} diff --git a/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.7.ebuild b/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.7.ebuild deleted file mode 100644 index 62984cee2a85..000000000000 --- a/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.7.ebuild +++ /dev/null @@ -1,177 +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_P="${MY_PN}-${PV}" - -DESCRIPTION="PEAR Base System" -HOMEPAGE="https://pear.php.net/package/PEAR" -SRC_URI="https://pear.php.net/get/${MY_P}.tgz" -LICENSE="MIT" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86" -SLOT="0" -IUSE="" - -DEPEND="" -RDEPEND="dev-lang/php:*[cli,xml,zlib] - >=dev-php/PEAR-Archive_Tar-1.4.0 - >=dev-php/PEAR-Console_Getopt-1.4.1 - dev-php/PEAR-Exception - >=dev-php/PEAR-Structures_Graph-1.1.0 - >=dev-php/PEAR-XML_Util-1.3.0" - -S="${WORKDIR}/${MY_P}" - -PATCHES=( "${FILESDIR}/gentoo-libtool-mismatch-fix-v2.patch" ) - -pkg_setup() { - [[ -z "${PEAR_CACHEDIR}" ]] && PEAR_CACHEDIR="${EPREFIX}/var/cache/pear" - [[ -z "${PEAR_DOWNLOADDIR}" ]] && PEAR_DOWNLOADDIR="${EPREFIX}/var/tmp/pear" - [[ -z "${PEAR_TEMPDIR}" ]] && PEAR_TEMPDIR="${EPREFIX}/tmp" - - elog - elog "cache_dir is set to: ${PEAR_CACHEDIR}" - elog "download_dir is set to: ${PEAR_DOWNLOADDIR}" - elog "temp_dir is set to: ${PEAR_TEMPDIR}" - elog - elog "If you want to change the above values, you need to set" - elog "PEAR_CACHEDIR, PEAR_DOWNLOADDIR and PEAR_TEMPDIR variable(s)" - elog "accordingly in /etc/portage/make.conf and re-emerge ${PN}." - elog -} - -src_prepare() { - default - # Exception.php is part of dev-php/PEAR-Exception. - rm PEAR/Exception.php || die "failed to remove PEAR/Exception.php" -} - -src_install() { - insinto /usr/share/php - doins -r PEAR/ - doins -r OS/ - doins PEAR.php System.php - doins scripts/pearcmd.php - doins scripts/peclcmd.php - - newbin scripts/pear.sh pear - newbin scripts/peardev.sh peardev - newbin scripts/pecl.sh pecl - - # adjust some scripts for current version - [[ -z "${PEAR}" ]] && PEAR="${PV}" - for i in pearcmd.php peclcmd.php ; do - sed "s:@pear_version@:${PEAR}:g" -i "${D}/usr/share/php/${i}" \ - || die "failed to sed pear_version" - done - - for i in pear peardev pecl ; do - sed "s:@bin_dir@:${EPREFIX}/usr/bin:g" -i "${D}/usr/bin/${i}" \ - || die "failed to sed @bin_dir@ in ${i}" - sed "s:@php_dir@:${EPREFIX}/usr/share/php:g" -i "${D}/usr/bin/${i}" \ - || die "failed to sed @php_dir@ in ${i}" - done - - sed "s:-d output_buffering=1:-d output_buffering=1 -d memory_limit=32M:g" \ - -i "${D}/usr/bin/pear" \ - || die "failed to set PHP ini values in pear executable" - - sed "s:@package_version@:${PEAR}:g" \ - -i "${D}/usr/share/php/PEAR/Command/Package.php" \ - || die "failed to sed @package_version@" - - sed "s:@PEAR-VER@:${PEAR}:g" \ - -i "${D}/usr/share/php/PEAR/Dependency2.php" \ - || die "failed to sed @PEAR-VER@ in Dependency2.php" - - sed "s:@PEAR-VER@:${PEAR}:g" \ - -i "${D}/usr/share/php/PEAR/PackageFile/Parser/v1.php" \ - || die "failed to sed @PEAR-VER@ in v1.php" - - sed "s:@PEAR-VER@:${PEAR}:g" \ - -i "${D}/usr/share/php/PEAR/PackageFile/Parser/v2.php" \ - || die "failed to sed @PEAR-VER@ in v2.php" - - # finalize install - insinto /etc - newins "${FILESDIR}"/pear.conf-r2 pear.conf - - sed "s|s:PHPCLILEN:\"PHPCLI\"|s:${#PHPCLI}:\"${PHPCLI}\"|g" \ - -i "${D}/etc/pear.conf" \ - || die "failed to sed PHPCLILEN in pear.conf" - - sed "s|s:CACHEDIRLEN:\"CACHEDIR\"|s:${#PEAR_CACHEDIR}:\"${PEAR_CACHEDIR}\"|g" \ - -i "${D}/etc/pear.conf" \ - || die "failed to sed CACHEDIRLEN in pear.conf" - - sed "s|s:DOWNLOADDIRLEN:\"DOWNLOADDIR\"|s:${#PEAR_DOWNLOADDIR}:\"${PEAR_DOWNLOADDIR}\"|g" \ - -i "${D}/etc/pear.conf" \ - || die "failed to sed DOWNLOADDIRLEN in pear.conf" - - sed "s|s:TEMPDIRLEN:\"TEMPDIR\"|s:${#PEAR_TEMPDIR}:\"${PEAR_TEMPDIR}\"|g" \ - -i "${D}/etc/pear.conf" \ - || die "failed to sed TEMPDIRLEN in pear.conf" - - # Change the paths for eprefix! - sed "s|s:19:\"/usr/share/php/docs\"|s:$(( ${#EPREFIX}+19 )):\"${EPREFIX}/usr/share/php/docs\"|g" \ - -i "${D}/etc/pear.conf" \ - || die "failed to sed the docs path (prefix) in pear.conf" - - sed "s|s:19:\"/usr/share/php/data\"|s:$(( ${#EPREFIX}+19 )):\"${EPREFIX}/usr/share/php/data\"|g" \ - -i "${D}/etc/pear.conf" \ - || die "failed to sed the data path (prefix) in pear.conf" - - sed "s|s:20:\"/usr/share/php/tests\"|s:$(( ${#EPREFIX}+20 )):\"${EPREFIX}/usr/share/php/tests\"|g" \ - -i "${D}/etc/pear.conf" \ - || die "failed to sed the tests path (prefix) in pear.conf" - - sed "s|s:14:\"/usr/share/php\"|s:$(( ${#EPREFIX}+14 )):\"${EPREFIX}/usr/share/php\"|g" \ - -i "${D}/etc/pear.conf" \ - || die "failed to sed the PHP include path (prefix) in pear.conf" - - sed "s|s:8:\"/usr/bin\"|s:$(( ${#EPREFIX}+8 )):\"${EPREFIX}/usr/bin\"|g" \ - -i "${D}/etc/pear.conf" \ - || die "failed to sed the bin path (prefix) in pear.conf" - - [[ "${PEAR_TEMPDIR}" != "/tmp" ]] && keepdir "${PEAR_TEMPDIR#${EPREFIX}}" - keepdir "${PEAR_CACHEDIR#${EPREFIX}}" - diropts -m1777 - keepdir "${PEAR_DOWNLOADDIR#${EPREFIX}}" - - insinto /usr/share/php/.packagexml - newins "${WORKDIR}/package.xml" "${MY_P}.xml" -} - -pkg_config() { - # Update PEAR/PECL channels as needed, add new ones to the list if needed - elog "Updating PEAR/PECL channels" - local pearchans="pear.php.net pecl.php.net pear.symfony-project.com" - - for chan in ${pearchans} ; do - # The first command may fail if, for example, the channels have - # already been initialized. - pear channel-discover ${chan} - pear channel-update ${chan} || die "failed to update channels: ${chan}" - done -} - -pkg_postinst() { - pear clear-cache || die "failed to clear PEAR cache" - - elog "Run 'emerge --config =${PF}' to automatically update the PEAR/PECL channels while online." - - # Register the package from the package.xml file - # It is not critical to complete so only warn on failure - if [[ -f "${EROOT}/usr/share/php/.packagexml/${MY_P}.xml" ]] ; then - "${EROOT}/usr/bin/peardev" install -nrO --force \ - "${EROOT}/usr/share/php/.packagexml/${MY_P}.xml" 2> /dev/null \ - || ewarn "Failed to insert package into local PEAR database" - fi -} - -pkg_prerm() { - # Uninstall known dependency - "${EROOT}/usr/bin/peardev" uninstall -nrO "pear.php.net/PEAR" -} diff --git a/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.9.ebuild b/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.9.ebuild deleted file mode 100644 index 62984cee2a85..000000000000 --- a/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.9.ebuild +++ /dev/null @@ -1,177 +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_P="${MY_PN}-${PV}" - -DESCRIPTION="PEAR Base System" -HOMEPAGE="https://pear.php.net/package/PEAR" -SRC_URI="https://pear.php.net/get/${MY_P}.tgz" -LICENSE="MIT" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86" -SLOT="0" -IUSE="" - -DEPEND="" -RDEPEND="dev-lang/php:*[cli,xml,zlib] - >=dev-php/PEAR-Archive_Tar-1.4.0 - >=dev-php/PEAR-Console_Getopt-1.4.1 - dev-php/PEAR-Exception - >=dev-php/PEAR-Structures_Graph-1.1.0 - >=dev-php/PEAR-XML_Util-1.3.0" - -S="${WORKDIR}/${MY_P}" - -PATCHES=( "${FILESDIR}/gentoo-libtool-mismatch-fix-v2.patch" ) - -pkg_setup() { - [[ -z "${PEAR_CACHEDIR}" ]] && PEAR_CACHEDIR="${EPREFIX}/var/cache/pear" - [[ -z "${PEAR_DOWNLOADDIR}" ]] && PEAR_DOWNLOADDIR="${EPREFIX}/var/tmp/pear" - [[ -z "${PEAR_TEMPDIR}" ]] && PEAR_TEMPDIR="${EPREFIX}/tmp" - - elog - elog "cache_dir is set to: ${PEAR_CACHEDIR}" - elog "download_dir is set to: ${PEAR_DOWNLOADDIR}" - elog "temp_dir is set to: ${PEAR_TEMPDIR}" - elog - elog "If you want to change the above values, you need to set" - elog "PEAR_CACHEDIR, PEAR_DOWNLOADDIR and PEAR_TEMPDIR variable(s)" - elog "accordingly in /etc/portage/make.conf and re-emerge ${PN}." - elog -} - -src_prepare() { - default - # Exception.php is part of dev-php/PEAR-Exception. - rm PEAR/Exception.php || die "failed to remove PEAR/Exception.php" -} - -src_install() { - insinto /usr/share/php - doins -r PEAR/ - doins -r OS/ - doins PEAR.php System.php - doins scripts/pearcmd.php - doins scripts/peclcmd.php - - newbin scripts/pear.sh pear - newbin scripts/peardev.sh peardev - newbin scripts/pecl.sh pecl - - # adjust some scripts for current version - [[ -z "${PEAR}" ]] && PEAR="${PV}" - for i in pearcmd.php peclcmd.php ; do - sed "s:@pear_version@:${PEAR}:g" -i "${D}/usr/share/php/${i}" \ - || die "failed to sed pear_version" - done - - for i in pear peardev pecl ; do - sed "s:@bin_dir@:${EPREFIX}/usr/bin:g" -i "${D}/usr/bin/${i}" \ - || die "failed to sed @bin_dir@ in ${i}" - sed "s:@php_dir@:${EPREFIX}/usr/share/php:g" -i "${D}/usr/bin/${i}" \ - || die "failed to sed @php_dir@ in ${i}" - done - - sed "s:-d output_buffering=1:-d output_buffering=1 -d memory_limit=32M:g" \ - -i "${D}/usr/bin/pear" \ - || die "failed to set PHP ini values in pear executable" - - sed "s:@package_version@:${PEAR}:g" \ - -i "${D}/usr/share/php/PEAR/Command/Package.php" \ - || die "failed to sed @package_version@" - - sed "s:@PEAR-VER@:${PEAR}:g" \ - -i "${D}/usr/share/php/PEAR/Dependency2.php" \ - || die "failed to sed @PEAR-VER@ in Dependency2.php" - - sed "s:@PEAR-VER@:${PEAR}:g" \ - -i "${D}/usr/share/php/PEAR/PackageFile/Parser/v1.php" \ - || die "failed to sed @PEAR-VER@ in v1.php" - - sed "s:@PEAR-VER@:${PEAR}:g" \ - -i "${D}/usr/share/php/PEAR/PackageFile/Parser/v2.php" \ - || die "failed to sed @PEAR-VER@ in v2.php" - - # finalize install - insinto /etc - newins "${FILESDIR}"/pear.conf-r2 pear.conf - - sed "s|s:PHPCLILEN:\"PHPCLI\"|s:${#PHPCLI}:\"${PHPCLI}\"|g" \ - -i "${D}/etc/pear.conf" \ - || die "failed to sed PHPCLILEN in pear.conf" - - sed "s|s:CACHEDIRLEN:\"CACHEDIR\"|s:${#PEAR_CACHEDIR}:\"${PEAR_CACHEDIR}\"|g" \ - -i "${D}/etc/pear.conf" \ - || die "failed to sed CACHEDIRLEN in pear.conf" - - sed "s|s:DOWNLOADDIRLEN:\"DOWNLOADDIR\"|s:${#PEAR_DOWNLOADDIR}:\"${PEAR_DOWNLOADDIR}\"|g" \ - -i "${D}/etc/pear.conf" \ - || die "failed to sed DOWNLOADDIRLEN in pear.conf" - - sed "s|s:TEMPDIRLEN:\"TEMPDIR\"|s:${#PEAR_TEMPDIR}:\"${PEAR_TEMPDIR}\"|g" \ - -i "${D}/etc/pear.conf" \ - || die "failed to sed TEMPDIRLEN in pear.conf" - - # Change the paths for eprefix! - sed "s|s:19:\"/usr/share/php/docs\"|s:$(( ${#EPREFIX}+19 )):\"${EPREFIX}/usr/share/php/docs\"|g" \ - -i "${D}/etc/pear.conf" \ - || die "failed to sed the docs path (prefix) in pear.conf" - - sed "s|s:19:\"/usr/share/php/data\"|s:$(( ${#EPREFIX}+19 )):\"${EPREFIX}/usr/share/php/data\"|g" \ - -i "${D}/etc/pear.conf" \ - || die "failed to sed the data path (prefix) in pear.conf" - - sed "s|s:20:\"/usr/share/php/tests\"|s:$(( ${#EPREFIX}+20 )):\"${EPREFIX}/usr/share/php/tests\"|g" \ - -i "${D}/etc/pear.conf" \ - || die "failed to sed the tests path (prefix) in pear.conf" - - sed "s|s:14:\"/usr/share/php\"|s:$(( ${#EPREFIX}+14 )):\"${EPREFIX}/usr/share/php\"|g" \ - -i "${D}/etc/pear.conf" \ - || die "failed to sed the PHP include path (prefix) in pear.conf" - - sed "s|s:8:\"/usr/bin\"|s:$(( ${#EPREFIX}+8 )):\"${EPREFIX}/usr/bin\"|g" \ - -i "${D}/etc/pear.conf" \ - || die "failed to sed the bin path (prefix) in pear.conf" - - [[ "${PEAR_TEMPDIR}" != "/tmp" ]] && keepdir "${PEAR_TEMPDIR#${EPREFIX}}" - keepdir "${PEAR_CACHEDIR#${EPREFIX}}" - diropts -m1777 - keepdir "${PEAR_DOWNLOADDIR#${EPREFIX}}" - - insinto /usr/share/php/.packagexml - newins "${WORKDIR}/package.xml" "${MY_P}.xml" -} - -pkg_config() { - # Update PEAR/PECL channels as needed, add new ones to the list if needed - elog "Updating PEAR/PECL channels" - local pearchans="pear.php.net pecl.php.net pear.symfony-project.com" - - for chan in ${pearchans} ; do - # The first command may fail if, for example, the channels have - # already been initialized. - pear channel-discover ${chan} - pear channel-update ${chan} || die "failed to update channels: ${chan}" - done -} - -pkg_postinst() { - pear clear-cache || die "failed to clear PEAR cache" - - elog "Run 'emerge --config =${PF}' to automatically update the PEAR/PECL channels while online." - - # Register the package from the package.xml file - # It is not critical to complete so only warn on failure - if [[ -f "${EROOT}/usr/share/php/.packagexml/${MY_P}.xml" ]] ; then - "${EROOT}/usr/bin/peardev" install -nrO --force \ - "${EROOT}/usr/share/php/.packagexml/${MY_P}.xml" 2> /dev/null \ - || ewarn "Failed to insert package into local PEAR database" - fi -} - -pkg_prerm() { - # Uninstall known dependency - "${EROOT}/usr/bin/peardev" uninstall -nrO "pear.php.net/PEAR" -} diff --git a/dev-php/PEAR-PEAR/metadata.xml b/dev-php/PEAR-PEAR/metadata.xml index addc1ac90a5a..8f104101fc02 100644 --- a/dev-php/PEAR-PEAR/metadata.xml +++ b/dev-php/PEAR-PEAR/metadata.xml @@ -8,5 +8,6 @@ <upstream> <remote-id type="pear">PEAR</remote-id> </upstream> + <stabilize-allarches/> <origin>gentoo-staging</origin> </pkgmetadata> diff --git a/dev-php/PEAR-XML_Util/Manifest b/dev-php/PEAR-XML_Util/Manifest index 56eb6f0f1be5..ddf350acf068 100644 --- a/dev-php/PEAR-XML_Util/Manifest +++ b/dev-php/PEAR-XML_Util/Manifest @@ -1,4 +1 @@ -DIST XML_Util-1.4.2.tgz 18993 BLAKE2B b2667aed3b3ec75dd8fca1625c6fa3d03a7662c24ce0fce69cb983f42fc3f45bc0bf27bdee7353c1d29fe0eabc181f2cbd415883575f5d6cf7163097c10f6d9c SHA512 e0a328f92cdcd09277238e14d68b73cba319ab9b4e9c50ab102b43f73c889599f5933415dc228bd1feb56a48c1527e0e9a86999ee2209b2d84131691aee74cbe -DIST XML_Util-1.4.3.tgz 18842 BLAKE2B 1cd0065b84e07a8cbc7f4d44c10362d40e71254b4964b3aa3d4d11cad5cb7e5bce780f926c69cc4fc871ac3c28d8239a428c145389950b4d6f6e626b6215dfc9 SHA512 c21a7cef90743e124c4bc8e0453b634de8f6a6b0aac060acc1a17f481a2eb8757d322b05c69151280b7651cea927b2c64b7d49b9fd815dcdc606d0472d967310 -DIST XML_Util-1.4.4.tgz 19069 BLAKE2B bd809d8a3250e5d08793f6d6ae50ebdbd0e95e46b667edf7176ac125b902cee8334bc6abe85704a945a508cba6a2146e5bbcb6039a40316ea8d2b1b30590d139 SHA512 3c2ae4492e76729da561398a43416cd540284297b497d2c1526515c00ba2918b9d520b580e21111cf9f9e133d473289cc9c896bc28ddd0c64a849ee66f897e42 DIST XML_Util-1.4.5.tgz 19191 BLAKE2B 2097e91bc6ed46e4af5713fe6e3f764b401f14ff1e06c0f96af68476db5e8cf2b463c0a9bed3eecd5e22c24108394fe1f622e4986888af131ee9a3c260f8c652 SHA512 dd373c15ea8057e1a31953a10d75a4821bb9ad63d55ec5ccdbe17c114895ac9b9a57871d50f9f83bca7e3920b461417aa09063cb06051834996d4a8aebfa84c9 diff --git a/dev-php/PEAR-XML_Util/PEAR-XML_Util-1.4.2.ebuild b/dev-php/PEAR-XML_Util/PEAR-XML_Util-1.4.2.ebuild deleted file mode 100644 index 3676080b9fd6..000000000000 --- a/dev-php/PEAR-XML_Util/PEAR-XML_Util-1.4.2.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/PEAR-/}" -MY_P="${MY_PN}-${PV}" - -DESCRIPTION="XML utility class" -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" -IUSE="examples" - -# PCRE is needed for a few calls to preg_replace and preg_match. -RDEPEND="dev-lang/php:*[pcre(+)]" -PDEPEND="dev-php/PEAR-PEAR" -DEPEND="" - -S="${WORKDIR}/${MY_P}" - -src_install() { - insinto /usr/share/php - doins -r XML - - use examples && dodoc -r examples -} diff --git a/dev-php/PEAR-XML_Util/PEAR-XML_Util-1.4.3.ebuild b/dev-php/PEAR-XML_Util/PEAR-XML_Util-1.4.3.ebuild deleted file mode 100644 index 1c013e52239f..000000000000 --- a/dev-php/PEAR-XML_Util/PEAR-XML_Util-1.4.3.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" - -MY_PN="${PN/PEAR-/}" -MY_P="${MY_PN}-${PV}" - -DESCRIPTION="XML utility class" -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" -IUSE="examples" - -# PCRE is needed for a few calls to preg_replace and preg_match. -RDEPEND="dev-lang/php:*[pcre(+)]" -PDEPEND="dev-php/PEAR-PEAR" -DEPEND="" - -S="${WORKDIR}/${MY_P}" - -src_install() { - insinto /usr/share/php - doins -r XML - - use examples && dodoc -r examples -} diff --git a/dev-php/PEAR-XML_Util/PEAR-XML_Util-1.4.4.ebuild b/dev-php/PEAR-XML_Util/PEAR-XML_Util-1.4.4.ebuild deleted file mode 100644 index 1c013e52239f..000000000000 --- a/dev-php/PEAR-XML_Util/PEAR-XML_Util-1.4.4.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" - -MY_PN="${PN/PEAR-/}" -MY_P="${MY_PN}-${PV}" - -DESCRIPTION="XML utility class" -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" -IUSE="examples" - -# PCRE is needed for a few calls to preg_replace and preg_match. -RDEPEND="dev-lang/php:*[pcre(+)]" -PDEPEND="dev-php/PEAR-PEAR" -DEPEND="" - -S="${WORKDIR}/${MY_P}" - -src_install() { - insinto /usr/share/php - doins -r XML - - use examples && dodoc -r examples -} diff --git a/dev-php/PEAR-XML_Util/PEAR-XML_Util-1.4.5.ebuild b/dev-php/PEAR-XML_Util/PEAR-XML_Util-1.4.5.ebuild index 90d887a6d2d0..ebef85243b86 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-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -11,7 +11,7 @@ HOMEPAGE="https://pear.php.net/package/XML_Util" SRC_URI="https://pear.php.net/get/${MY_P}.tgz" LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86" IUSE="examples" # PCRE is needed for a few calls to preg_replace and preg_match. diff --git a/dev-php/PEAR-XML_Util/metadata.xml b/dev-php/PEAR-XML_Util/metadata.xml index e0174bae644e..988b468bb167 100644 --- a/dev-php/PEAR-XML_Util/metadata.xml +++ b/dev-php/PEAR-XML_Util/metadata.xml @@ -8,5 +8,6 @@ <upstream> <remote-id type="pear">XML_Util</remote-id> </upstream> + <stabilize-allarches/> <origin>gentoo-staging</origin> </pkgmetadata> diff --git a/dev-php/jsonlint/Manifest b/dev-php/jsonlint/Manifest index 60014c2fc3fc..02c9af5eda49 100644 --- a/dev-php/jsonlint/Manifest +++ b/dev-php/jsonlint/Manifest @@ -1,3 +1 @@ -DIST jsonlint-1.7.1.tar.gz 11813 BLAKE2B ed1a1404cf77d526a5dce15d0a3f36c5ff8c691e3d2560b6b5e309108d6f0072988b292fd1410b48bfad4ba528abd854204c38bf36f5196c7d8beb468716a5db SHA512 dd8380d02591997a129dc8f25f3b2f7c2f00c1d280bdce6551079b564b54b4828beb929bd9a7c608be6429754eb1c33d2d655a0f87b8f671ccf26ee2ae46095d -DIST jsonlint-1.7.2.tar.gz 11915 BLAKE2B 4fb1bb526c64ad2db442bca4c2c609e7d589ed84c372291a7bb71edcf63d246be821d78fe246b1660444f99fe9dd3408f01841fc9d687654d2bcc45dc9337c91 SHA512 ac5a135b1940799b07c31c2b05b0c782d0409dbf93e93013f1cb69f8423d1913b93c18988f1a03781da4c29d28de35eee6a76a2f18c81cd049696f779045cafb DIST jsonlint-1.8.2.tar.gz 13729 BLAKE2B 80cbe2e1dc6bcbc0d75d04f34a36deb8b53ebd78bc4dcff0dd1195549ae2eaa02360b642d91c6a848cba9a3f502ed0618937c149663d6d0c9c7ad0f33897b7c1 SHA512 675ae7bf6cddd83bb2fab60f4c2ac4a8b4bf0068e630f266511a1805682cadefc9a44006623448364ceb73c5e211739787643d9196794349b992cca4d5fc737c diff --git a/dev-php/jsonlint/jsonlint-1.7.1.ebuild b/dev-php/jsonlint/jsonlint-1.7.1.ebuild deleted file mode 100644 index 4085b18b49f7..000000000000 --- a/dev-php/jsonlint/jsonlint-1.7.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 - -DESCRIPTION="JSON Lint for PHP" -HOMEPAGE="https://github.com/Seldaek/jsonlint" -SRC_URI="https://github.com/Seldaek/jsonlint/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="test" -RESTRICT="test" - -RDEPEND=" - dev-lang/php:* - dev-php/fedora-autoloader" -DEPEND=" - test? ( - ${RDEPEND} - dev-php/phpunit )" - -src_prepare() { - default - if use test; then - cp "${FILESDIR}"/autoload.php "${S}"/autoload-test.php || die - sed -i -e "s:__DIR__:'${S}/src/Seld/JsonLint':" "${S}"/autoload-test.php || die - fi -} - -src_install() { - insinto "/usr/share/php/Seld/JsonLint" - doins -r src/Seld/JsonLint/. "${FILESDIR}"/autoload.php - dodoc README.md -} - -src_test() { - phpunit --bootstrap "${S}"/autoload-test.php || die "test suite failed" -} diff --git a/dev-php/jsonlint/jsonlint-1.7.2.ebuild b/dev-php/jsonlint/jsonlint-1.7.2.ebuild deleted file mode 100644 index 4085b18b49f7..000000000000 --- a/dev-php/jsonlint/jsonlint-1.7.2.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 - -DESCRIPTION="JSON Lint for PHP" -HOMEPAGE="https://github.com/Seldaek/jsonlint" -SRC_URI="https://github.com/Seldaek/jsonlint/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="test" -RESTRICT="test" - -RDEPEND=" - dev-lang/php:* - dev-php/fedora-autoloader" -DEPEND=" - test? ( - ${RDEPEND} - dev-php/phpunit )" - -src_prepare() { - default - if use test; then - cp "${FILESDIR}"/autoload.php "${S}"/autoload-test.php || die - sed -i -e "s:__DIR__:'${S}/src/Seld/JsonLint':" "${S}"/autoload-test.php || die - fi -} - -src_install() { - insinto "/usr/share/php/Seld/JsonLint" - doins -r src/Seld/JsonLint/. "${FILESDIR}"/autoload.php - dodoc README.md -} - -src_test() { - phpunit --bootstrap "${S}"/autoload-test.php || die "test suite failed" -} diff --git a/dev-php/libvirt-php/libvirt-php-9999.ebuild b/dev-php/libvirt-php/libvirt-php-9999.ebuild index 4854f53a075b..87a1cfe7da8a 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-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" PHP_EXT_NAME="libvirt-php" PHP_EXT_SKIP_PHPIZE="yes" -USE_PHP="php5-6 php7-0 php7-1 php7-2 php7-3" +USE_PHP="php7-3 php7-4" PHP_EXT_ECONF_ARGS=() inherit php-ext-source-r3 git-r3 autotools @@ -26,7 +26,6 @@ DEPEND="${RDEPEND} virtual/pkgconfig doc? ( app-text/xhtml1 )" -RESTRICT="test" DOCS=( ChangeLog NEWS README ) # Remove the insane check for pecl-imagick which is only used in examples # and is not called upon in any build @@ -63,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/maxmind-db-reader/Manifest b/dev-php/maxmind-db-reader/Manifest index 48e10f9afd75..d1eea850d39e 100644 --- a/dev-php/maxmind-db-reader/Manifest +++ b/dev-php/maxmind-db-reader/Manifest @@ -1,2 +1 @@ -DIST MaxMind-DB-Reader-php-1.4.1.tar.gz 19667 BLAKE2B b397eb1bb7fa00c3382c7ee7c019c401d390c88d9bccd7742873445e95cb87d780ac17affe5cd1ec98e6f60d16660784dc5fdb188f8e4d2956df816397a9c251 SHA512 2407f3d1af10830078c9f5ba93ee74761084b06e630242eff0f707b98bdb78e6e87dabc999c36b29780ba9c8c38aec0225700005b66d95b3707bdc06875c6dd5 DIST MaxMind-DB-Reader-php-1.6.0.tar.gz 20898 BLAKE2B cf6922bbd5b2c76fcb9b7a97299f0a73232686bf8facce39355f8a4cc55e98a4d8e64a51eae8427b5f14d6905d4cd85956effa5299cc493bd63708cf52ab30d0 SHA512 e8c0ccf2cfcedf7527b4e3f858d2ed0e70add60692fff4a65f08e5cb885516b7c2a3ceaa3c21713369cd8ffca2b671d764063236de1d729cfc5173f7d5dd4607 diff --git a/dev-php/maxmind-db-reader/maxmind-db-reader-1.4.1.ebuild b/dev-php/maxmind-db-reader/maxmind-db-reader-1.4.1.ebuild deleted file mode 100644 index ebefd8c16abb..000000000000 --- a/dev-php/maxmind-db-reader/maxmind-db-reader-1.4.1.ebuild +++ /dev/null @@ -1,78 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -MY_PN="MaxMind-DB-Reader-php" -MY_P="${MY_PN}-${PV}" -S="${WORKDIR}/${MY_P}" -PHP_EXT_S="${S}/ext" -PHP_EXT_NAME="maxminddb" -PHP_EXT_OPTIONAL_USE="extension" - -USE_PHP="php5-6 php7-1 php7-2 php7-3" - -inherit php-ext-source-r3 - -DESCRIPTION="PHP reader for the MaxMind database format" -HOMEPAGE="https://github.com/maxmind/MaxMind-DB-Reader-php" -SRC_URI="https://github.com/maxmind/${MY_PN}/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64" -IUSE="extension test" -RESTRICT="!test? ( test )" - -DEPEND="extension? ( dev-libs/libmaxminddb )" -RDEPEND="${DEPEND}" - -src_prepare() { - # We need to call eapply_user ourselves, because it may be skipped - # if either the "extension" USE flag is not set, or if the user's - # PHP_TARGETS is essentially empty. In the latter case, the eclass - # src_prepare does nothing. We only call the eclass phase conditionally - # because the correct version of e.g. "phpize" may not be there - # unless USE=extension is set. - if use extension ; then - php-ext-source-r3_src_prepare - else - default - fi -} - -src_configure() { - # The eclass phase will try to run the ./configure script even if it - # doesn't exist (in contrast to the default src_configure), so we - # need to skip it if the eclass src_prepare (that creates said - # script) is not run. - use extension && php-ext-source-r3_src_configure -} - -src_compile() { - # Avoids the same problem as in src_configure. - use extension && php-ext-source-r3_src_compile -} - -src_install() { - dodoc CHANGELOG.md README.md - insinto /usr/share/php - doins -r src/MaxMind - insinto /usr/share/php/MaxMind/Db - doins autoload.php - - use extension && php-ext-source-r3_src_install -} - -src_test() { - # The PHP API has its own set of tests that isn't shipped with the - # release tarballs at the moment (github issues 55). - use extension && php-ext-source-r3_src_test -} - -pkg_postinst() { - elog "${PN} has been installed in /usr/share/php/MaxMind/Db/." - elog "To use it in a script, require('MaxMind/Db/autoload.php')," - elog "and then most of the examples in the documentation should" - elog "work without further modification." -} diff --git a/dev-php/pear/metadata.xml b/dev-php/pear/metadata.xml index c1bab239ddaa..f1be5cbd220a 100644 --- a/dev-php/pear/metadata.xml +++ b/dev-php/pear/metadata.xml @@ -5,5 +5,6 @@ <email>php-bugs@gentoo.org</email> <name>PHP</name> </maintainer> + <stabilize-allarches/> <origin>gentoo-staging</origin> </pkgmetadata> diff --git a/dev-php/pear/pear-1.10.1-r1.ebuild b/dev-php/pear/pear-1.10.1-r1.ebuild deleted file mode 100644 index 1f8d2b20214f..000000000000 --- a/dev-php/pear/pear-1.10.1-r1.ebuild +++ /dev/null @@ -1,16 +0,0 @@ -# Copyright 1999-2020 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" - -DESCRIPTION="PEAR - PHP Extension and Application Repository" -HOMEPAGE="https://pear.php.net/" -SRC_URI="" -LICENSE="MIT" -SLOT="0" -IUSE="" - -DEPEND="" -RDEPEND=">=dev-php/PEAR-PEAR-${PVR}" diff --git a/dev-php/pear/pear-1.10.3.ebuild b/dev-php/pear/pear-1.10.3.ebuild index 321c226df4b6..b6581c586165 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-2020 Gentoo Authors +# Copyright 1999-2021 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 ~ia64 ppc ppc64 ~s390 sparc x86" DESCRIPTION="PEAR - PHP Extension and Application Repository" HOMEPAGE="https://pear.php.net/" diff --git a/dev-php/pecl-apcu/Manifest b/dev-php/pecl-apcu/Manifest index 6e3d57640682..ee5a4d2cf52c 100644 --- a/dev-php/pecl-apcu/Manifest +++ b/dev-php/pecl-apcu/Manifest @@ -1,2 +1 @@ -DIST apcu-5.1.18.tgz 94668 BLAKE2B c88af867a5f0f3feb550b4b93b83451d972d8f9c2281af8b000b45cb42e2d005f82fe626da8665e0490c79bc378cf9ee5c9a0136d0b490a1155a885bb56fe4f2 SHA512 5e9c5b4540be7abdf2f473d2f8955d8708934a1d6e05cb2c99154cc7ba8a2bbf9afde51769e20f46ef278efd6f60b9172e0864c31e0976b9d3096a337035e7a9 DIST apcu-5.1.19.tgz 96583 BLAKE2B 330c08a4e557691d0b402111877b3caf56b211256db17cce52a76aeefce7237505eca4ecd71f3770ef3c405182a1604a92cc458cb9bca435b42370fe917e21a7 SHA512 45077e3bd0eac207539e2eafe21968c71f49b8c8920168dbafa87961b041f1d348b6bf1c130104744bc541e1f690854f0a29062e9520db81c04edeee3ef2ed99 diff --git a/dev-php/pecl-apcu/pecl-apcu-5.1.18.ebuild b/dev-php/pecl-apcu/pecl-apcu-5.1.18.ebuild deleted file mode 100644 index 187fdd7b9eff..000000000000 --- a/dev-php/pecl-apcu/pecl-apcu-5.1.18.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PHP_EXT_NAME="apcu" -PHP_EXT_INI="yes" -PHP_EXT_ZENDEXT="no" -DOCS=( NOTICE README.md TECHNOTES.txt ) - -USE_PHP="php7-1 php7-2 php7-3 php7-4" - -inherit php-ext-pecl-r3 - -KEYWORDS="amd64 arm64 x86" - -DESCRIPTION="Stripped down version of APC supporting only user cache" -LICENSE="PHP-3.01" -SLOT="7" - -LOCKS="pthreadmutex pthreadrw spinlock semaphore" - -LUSE="" -for l in ${LOCKS}; do - LUSE+="lock-${l} " -done - -IUSE="+mmap ${LUSE/lock-pthreadrw/+lock-pthreadrw}" - -REQUIRED_USE="^^ ( $LUSE )" - -src_prepare() { - php-ext-source-r3_src_prepare - # Remove broken tests from php 7.4 due to trivial output differences - if use php_targets_php7-4 ; then - php_init_slot_env "php7.4" - rm "${PHP_EXT_S}"/tests/apc_entry_00{2,3}.phpt || die - fi -} - -src_configure() { - local PHP_EXT_ECONF_ARGS=( - --enable-apcu - $(use_enable mmap apcu-mmap) - $(use_enable lock-spinlock apcu-spinlocks) - ) - # Broken upstream autoconf test disables if present at all - use lock-pthreadrw || PHP_EXT_ECONF_ARGS+=( --disable-apcu-rwlocks ) - - php-ext-source-r3_src_configure -} - -src_install() { - php-ext-pecl-r3_src_install - - insinto /usr/share/php7/apcu - doins apc.php -} - -pkg_postinst() { - elog "The apc.php file shipped with this release of pecl-apcu was" - elog "installed to ${EPREFIX}/usr/share/php7/apcu/." - elog - elog "If you depend on the apc_* functions," - elog "please install dev-php/pecl-apcu_bc as this extension no longer" - elog "provides backwards compatibility." -} diff --git a/dev-php/pecl-apcu/pecl-apcu-5.1.19.ebuild b/dev-php/pecl-apcu/pecl-apcu-5.1.19.ebuild index 374c3077b81c..777b8df0cd0c 100644 --- a/dev-php/pecl-apcu/pecl-apcu-5.1.19.ebuild +++ b/dev-php/pecl-apcu/pecl-apcu-5.1.19.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -12,7 +12,7 @@ USE_PHP="php7-2 php7-3 php7-4 php8-0" inherit php-ext-pecl-r3 -KEYWORDS="~amd64 ~arm64 ~x86" +KEYWORDS="amd64 arm64 x86" DESCRIPTION="Stripped down version of APC supporting only user cache" LICENSE="PHP-3.01" diff --git a/dev-php/pecl-apcu_bc/Manifest b/dev-php/pecl-apcu_bc/Manifest index 99201b68c412..c73d9fc2e92e 100644 --- a/dev-php/pecl-apcu_bc/Manifest +++ b/dev-php/pecl-apcu_bc/Manifest @@ -1,2 +1 @@ -DIST apcu_bc-1.0.4.tgz 7406 BLAKE2B c7099f13bfe589c9752fb7fa8454f16094a13d63924ceef614db1fef11d37265673e745383241836685dcabca8ae83af3c71ba2f2d8a77b4ab213db209924f12 SHA512 633ae74c4be3ee0c2c98540f696dc440f3f345c52811e856cb46c65c6b6fa8fa9f06ecb1d784cd990cf8b5219b65e14a29b97e57828dc6e7aa6b91d2475e6a0e DIST apcu_bc-1.0.5.tgz 7415 BLAKE2B d86c5a4949239d9196b4bfc22c19f97ff66b47ec87962540295a0d9f08c72c0f1213439dd6c4006355a73c7fa3dbdcc51e9f897b289f134116d33d9eb2c67cb7 SHA512 60ee1540c31873d7963fd8efa6293006eae19cb6c7815cea1f3b50b197a982840472a1e632cc7af5666f6af5522008bec30e48cd764920240a6c5a0d0eb0e6e0 diff --git a/dev-php/pecl-apcu_bc/pecl-apcu_bc-1.0.4-r1.ebuild b/dev-php/pecl-apcu_bc/pecl-apcu_bc-1.0.4-r1.ebuild deleted file mode 100644 index 4841dd913dec..000000000000 --- a/dev-php/pecl-apcu_bc/pecl-apcu_bc-1.0.4-r1.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PHP_INI_NAME="bc_apc" -PHP_EXT_NAME="apc" -PHP_EXT_INI="yes" -PHP_EXT_ZENDEXT="no" -PHP_EXT_EXTRA_ECONF="" -DOCS=( README.md ) - -USE_PHP="php7-1 php7-2 php7-3" - -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:7[php_targets_php7-1?,php_targets_php7-2?,php_targets_php7-3?]" -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-apcu_bc/pecl-apcu_bc-1.0.5.ebuild b/dev-php/pecl-apcu_bc/pecl-apcu_bc-1.0.5.ebuild index 2ac07f3f2d20..cf85dc9a5be8 100644 --- a/dev-php/pecl-apcu_bc/pecl-apcu_bc-1.0.5.ebuild +++ b/dev-php/pecl-apcu_bc/pecl-apcu_bc-1.0.5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -14,7 +14,7 @@ USE_PHP="php7-2 php7-3 php7-4" inherit php-ext-pecl-r3 multilib -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" DESCRIPTION="Provides APC backwards compatibility functions via APCu" LICENSE="PHP-3.01" diff --git a/dev-php/pecl-eio/pecl-eio-2.0.4.ebuild b/dev-php/pecl-eio/pecl-eio-2.0.4-r1.ebuild index 2c0e722da89e..ef6623eb4e18 100644 --- a/dev-php/pecl-eio/pecl-eio-2.0.4.ebuild +++ b/dev-php/pecl-eio/pecl-eio-2.0.4-r1.ebuild @@ -1,13 +1,13 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 PHP_EXT_NAME="eio" PHP_EXT_INI="yes" PHP_EXT_ZENDEXT="no" DOCS=( README.md ) -USE_PHP="php5-6 php7-0 php7-1 php7-2 php7-3 php7-4" +USE_PHP="php7-3 php7-4" inherit php-ext-pecl-r3 KEYWORDS="~amd64 ~x86" @@ -19,6 +19,6 @@ SLOT="0" IUSE="debug" src_configure() { - local PHP_EXT_ECONF_ARGS="--with-eio $(use_enable debug eio-debug)" + local PHP_EXT_ECONF_ARGS=("--with-eio" "$(use_enable debug eio-debug)" ) php-ext-source-r3_src_configure } diff --git a/dev-php/pecl-event/Manifest b/dev-php/pecl-event/Manifest index b61f90008523..068fee3890e2 100644 --- a/dev-php/pecl-event/Manifest +++ b/dev-php/pecl-event/Manifest @@ -1,2 +1 @@ -DIST event-2.5.3.tgz 140913 BLAKE2B e9b1886b65d1c307bf4a40ebe20e19f33d9e422ce98fb704c7174e953c2488b87f941fc5615bfee07e7d51e1775a0256349e023e6d8921fdd237e527ab108151 SHA512 359eee2f501444f444904ee1960d85af0b77259e59a06d9c6ae1ec008f7bda9bda5bf999d437d84416150a965466519c04e4c2f36dbca44367075fcbb46cd917 DIST event-2.5.7.tgz 141451 BLAKE2B 6d5e87b0b4892b59e2dc37dde0ae8ecafd104fbaa90fcc4d2b7183d4e3ba2f8fa182ddee90d5ebaebeb826f3e02d760ae25ce5ca01582fec9dfa5cb05dc6f5c6 SHA512 8160c3df1f6faa4b3ee37b9212a7953e5c0cdc747228517d238ea638b2b441e4b64e9d8c91d3af6bd33f33486137e9da1c7cb45b8d8400b8ab46d1ae4c03590a diff --git a/dev-php/pecl-event/files/pecl-event-2.5.3-no-sockets.patch b/dev-php/pecl-event/files/pecl-event-2.5.3-no-sockets.patch deleted file mode 100644 index 9b95708a6e7b..000000000000 --- a/dev-php/pecl-event/files/pecl-event-2.5.3-no-sockets.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/php7/src/fe-orig.c 2020-02-23 15:50:42.159505602 +0300 -+++ b/php7/src/fe.c 2020-02-23 15:51:09.985462245 +0300 -@@ -640,7 +640,9 @@ - PHP_ME(EventUtil, getSocketName, arginfo_event_util_get_socket_name, ZEND_ACC_PUBLIC | ZEND_ACC_STATIC) - PHP_ME(EventUtil, getSocketFd, arginfo_event_util_get_socket_fd, ZEND_ACC_PUBLIC | ZEND_ACC_STATIC) - PHP_ME(EventUtil, setSocketOption, arginfo_event_util_set_socket_option, ZEND_ACC_PUBLIC | ZEND_ACC_STATIC) -+#ifdef PHP_EVENT_SOCKETS_SUPPORT - PHP_ME(EventUtil, createSocket, arginfo_event_util_create_socket, ZEND_ACC_PUBLIC | ZEND_ACC_STATIC) -+#endif - - PHP_FE_END - }; diff --git a/dev-php/pecl-event/pecl-event-2.5.3-r1.ebuild b/dev-php/pecl-event/pecl-event-2.5.3-r1.ebuild deleted file mode 100644 index b30711ec149f..000000000000 --- a/dev-php/pecl-event/pecl-event-2.5.3-r1.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2020 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-1 php7-2 php7-3 php7-4" - -inherit php-ext-pecl-r3 - -KEYWORDS="~amd64 ~ia64 ~x86" -LICENSE="PHP-3.01" - -DESCRIPTION="PHP wrapper for libevent2" -SLOT="0" - -PATCHES=( - "${FILESDIR}/${PN}-2.5.3-no-sockets.patch" -) - -DEPEND=" - >=dev-libs/libevent-2.0.2 - ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - ) - php_targets_php7-1? ( dev-lang/php:7.1[sockets?] ) - 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?] )" - -RDEPEND=" - ${DEPEND} - !dev-php/pecl-libevent" - -IUSE="debug examples +extra libressl +sockets +ssl threads" - -src_configure() { - local PHP_EXT_ECONF_ARGS=( - --with-event-core - $(use_enable debug event-debug) - $(use_with extra event-extra) - $(use_with ssl event-openssl) - $(use_with threads event-pthreads) - $(use_enable sockets event-sockets) - ) - php-ext-source-r3_src_configure -} - -src_test() { - local slot - for slot in $(php_get_slots); do - php_init_slot_env "${slot}" - SKIP_ONLINE_TESTS="yes" NO_INTERACTION="yes" emake test - done -} diff --git a/dev-php/pecl-event/pecl-event-2.5.3.ebuild b/dev-php/pecl-event/pecl-event-2.5.3.ebuild deleted file mode 100644 index 1cb12cf06a50..000000000000 --- a/dev-php/pecl-event/pecl-event-2.5.3.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2019 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-1 php7-2 php7-3 php7-4" - -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? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - ) - php_targets_php7-1? ( dev-lang/php:7.1[sockets?] ) - 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?] )" - -RDEPEND=" - ${DEPEND} - !dev-php/pecl-libevent" - -IUSE="debug examples +extra libressl +sockets +ssl threads" - -src_configure() { - local PHP_EXT_ECONF_ARGS=( - --with-event-core - $(use_enable debug event-debug) - $(use_with extra event-extra) - $(use_with ssl event-openssl) - $(use_with threads event-pthreads) - $(use_enable sockets event-sockets) - ) - php-ext-source-r3_src_configure -} - -src_test() { - local slot - for slot in $(php_get_slots); do - php_init_slot_env "${slot}" - SKIP_ONLINE_TESTS="yes" NO_INTERACTION="yes" emake test - done -} diff --git a/dev-php/pecl-event/pecl-event-2.5.7.ebuild b/dev-php/pecl-event/pecl-event-2.5.7.ebuild index 51a0782ec320..9a0e909a2930 100644 --- a/dev-php/pecl-event/pecl-event-2.5.7.ebuild +++ b/dev-php/pecl-event/pecl-event-2.5.7.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -12,7 +12,7 @@ USE_PHP="php7-2 php7-3 php7-4" inherit php-ext-pecl-r3 -KEYWORDS="~amd64 ~ia64 ~x86" +KEYWORDS="amd64 ~ia64 x86" LICENSE="PHP-3.01" DESCRIPTION="PHP wrapper for libevent2" diff --git a/dev-php/pecl-http/Manifest b/dev-php/pecl-http/Manifest index eb018948dc41..d7a64d8c8cfb 100644 --- a/dev-php/pecl-http/Manifest +++ b/dev-php/pecl-http/Manifest @@ -1,3 +1,5 @@ DIST pecl_http-3.2.1.tgz 221244 BLAKE2B b6581829fb8a800e24ccedd4d0f3efbaf558850bdc356d27a6e1d1097a8e2cfc61963a1daccd1d0f269a7cef5b243d45cdfaff5138321fe20df615dde44d19e3 SHA512 e67d4b32ba6f524e3fcf65f5497b94275e1a4a14fce97c57afe366369f368b3acdbedf364ed73cf983fb2c5f57f498adaa1100e7c936f11cbc5de1caedad7b51 DIST pecl_http-3.2.3.tgz 220204 BLAKE2B 2a712dc8f69a8a80f6f8c306883df580fdff4a0d4cb0ac06cc004f8622b30b8e2f5d373276381fd3ad67657a80cc929be81745f200a98b6ed5e475de5639dfc5 SHA512 e955e3246db9a9172081dd9a077154139c585bfce546e91839052bbab4d0db9d0695122574a66891ceba5c0b7e8a8f0768274e1516521ccb95cd19504dc13666 +DIST pecl_http-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.0.0beta1.tgz 219277 BLAKE2B 184ea0a92fc514f24fd31aaec7824ba80293a52d168d11b3b3a9cea410df1bc9a6a819c45f301b357a3d19246e3c36b56f238c264579509eadf00fb42ae32d91 SHA512 d3e487d10e18e8af1a750d171e4432dd30562e1fb8d8ae7cbb33a379e3d385d27a6ce1896ed8f727802eae1045505254cb68840395098310e22f6dc640c5c616 diff --git a/dev-php/pecl-http/pecl-http-3.2.4.ebuild b/dev-php/pecl-http/pecl-http-3.2.4.ebuild new file mode 100644 index 000000000000..f4816f1ac8c3 --- /dev/null +++ b/dev-php/pecl-http/pecl-http-3.2.4.ebuild @@ -0,0 +1,71 @@ +# 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_libressl 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_libressl=,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 new file mode 100644 index 000000000000..a65db6f26344 --- /dev/null +++ b/dev-php/pecl-http/pecl-http-4.0.0.ebuild @@ -0,0 +1,69 @@ +# 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_libressl curl_ssl_nss +curl_ssl_openssl" + +COMMON_DEPEND="app-arch/brotli:= + dev-libs/libevent + >=dev-php/pecl-raphf-2.0.1:7[php_targets_php8-0(-)?] + net-dns/libidn2 + sys-libs/zlib + ssl? ( net-misc/curl[ssl,curl_ssl_gnutls=,curl_ssl_libressl=,curl_ssl_nss=,curl_ssl_openssl=] ) + !ssl? ( net-misc/curl[-ssl] ) +" +DEPEND=" + php_targets_php8-0? ( ${COMMON_DEPEND} dev-lang/php:8.0[session,iconv] )" +RDEPEND="${DEPEND} + php_targets_php7-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-mailparse/pecl-mailparse-3.1.1.ebuild b/dev-php/pecl-mailparse/pecl-mailparse-3.1.1.ebuild index 68fd925dfe8b..35e848549fa6 100644 --- a/dev-php/pecl-mailparse/pecl-mailparse-3.1.1.ebuild +++ b/dev-php/pecl-mailparse/pecl-mailparse-3.1.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -14,7 +14,7 @@ DOCS=( README.md ) inherit php-ext-pecl-r3 -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" +KEYWORDS="amd64 ppc ppc64 x86" DESCRIPTION="PHP extension for parsing and working with RFC822 and MIME compliant messages" LICENSE="PHP-3.01" diff --git a/dev-php/pecl-mcrypt/Manifest b/dev-php/pecl-mcrypt/Manifest index 753352dd9b22..404b1e8693f0 100644 --- a/dev-php/pecl-mcrypt/Manifest +++ b/dev-php/pecl-mcrypt/Manifest @@ -1,3 +1 @@ -DIST mcrypt-1.0.1.tgz 33782 BLAKE2B db5f89fdbc64c81bd50c92301155527f40b28cd274312565c79327133baa20e14c488f8ad1f87e6ddfd3ced9706ca30f10dc69a08279c82c9ec83fb5f713e826 SHA512 1677202715499a41ac6999089257a059106e58cbac06ca8a7dd2e9edd28be5a4118234dd7468110e9e3d7f9de5d099367848fe84bcd06716ea56645c9015c578 -DIST mcrypt-1.0.2.tgz 33698 BLAKE2B b79985455986ca28e7cb55d3f6f62f87e1112f57c4e26761a08a2d9ce7c702cf325fccb50f703cfe5c570c7e3abc473030742f098b10e709145f7ac9676f834a SHA512 bf3796b60f1d8d34185c3ad0d813653fe64ccfc883106ba544b01a8caa7bf9729978f44e0d481d28af9f8827803dcc5cd8bfc83e50dc950d26f851fabc868b18 DIST mcrypt-1.0.3.tgz 33590 BLAKE2B 5de1108f53604fffea9e3cb64d9efdae2008da164acd47b27fd0df8f12a0f508345d63bee4d588c1eecd9a935f8be3b2db5c3d119c5b3013955c54085ebe9e9f SHA512 ef215b576b471d6e1ecac4bb097f518fa57fd551b678b7fdddd9d5058f6667b0ee757e887f00b61672b89cd86f1962cbfe0e355681fa47daba9873c3bf4db679 diff --git a/dev-php/pecl-mcrypt/pecl-mcrypt-1.0.1.ebuild b/dev-php/pecl-mcrypt/pecl-mcrypt-1.0.1.ebuild deleted file mode 100644 index 2e2076290b17..000000000000 --- a/dev-php/pecl-mcrypt/pecl-mcrypt-1.0.1.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PHP_EXT_NAME="mcrypt" -USE_PHP="php7-2" -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="Bindings for the libmcrypt library" -LICENSE="PHP-3.01" -SLOT="0" -KEYWORDS="amd64" - -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.2.ebuild b/dev-php/pecl-mcrypt/pecl-mcrypt-1.0.2.ebuild deleted file mode 100644 index 078d2acdae8c..000000000000 --- a/dev-php/pecl-mcrypt/pecl-mcrypt-1.0.2.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PHP_EXT_NAME="mcrypt" -USE_PHP="php7-2 php7-3" -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" - -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-mongodb/Manifest b/dev-php/pecl-mongodb/Manifest index 2bec588d461f..3b88f99e7bc7 100644 --- a/dev-php/pecl-mongodb/Manifest +++ b/dev-php/pecl-mongodb/Manifest @@ -1,6 +1,3 @@ -DIST mongodb-1.5.3.tgz 1059580 BLAKE2B 23bd5f6b0f218cf55bd5713a770f3990d5c1492925623712583356d8aee42a1b47519b93ba64036aaf98f97ab4b1b30de9d8aa39659f2575c4f4dba3892d574d SHA512 35704e75bd7867a436d953c00c7560c9a08a4fa8f3555d7cc00aeda34e87c6c7aa7ecc1d7f674747e34f4f8dac35d320f6317e60229528ea9782bbe669bafec0 -DIST mongodb-1.5.5.tgz 1060017 BLAKE2B 475ca0f6a1cbd5270c9bde0f195d6092ef25441e0cee0a45ed378a868bd1ad27c7a77c4f4702b6f82004433805563cdaa728cbc11bb5beff83b982122cad339b SHA512 1eefc8f8e359a979082dc7808e89ff5418cd2dc73d4250638e33dc32cce40ef42502e9dbbb07303381e0062b84818568034f4e4cda8c8bf905513d00bf008392 -DIST mongodb-1.6.0.tgz 1096156 BLAKE2B 16c3b1d07d31d29a214aba320347f8e40cfc4f0dae8b0713b02cd0e3ff98fd54b09217472f333722228efdfcae755bbdbfe58da7db89d4dda2893ba7b3b0e8bb SHA512 e75dc607bf41bb71a0fce3b73785ef4203af97a3e8b21bf70a80c2216e9530463a6aaca55b013a4fa2f3c4eb72405a25209935ea1a238475f990763af54aa641 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 diff --git a/dev-php/pecl-mongodb/pecl-mongodb-1.5.3-r1.ebuild b/dev-php/pecl-mongodb/pecl-mongodb-1.5.3-r1.ebuild deleted file mode 100644 index 62a5bf128339..000000000000 --- a/dev-php/pecl-mongodb/pecl-mongodb-1.5.3-r1.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PHP_EXT_NAME="mongodb" -USE_PHP="php5-6 php7-1 php7-2 php7-3" - -inherit php-ext-pecl-r3 - -DESCRIPTION="MongoDB database driver for PHP" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="libressl sasl" - -COMMON_DEPEND=" - php_targets_php5-6? ( dev-lang/php:5.6[json,ssl,zlib] ) - php_targets_php7-1? ( dev-lang/php:7.1[json,ssl,zlib] ) - php_targets_php7-2? ( dev-lang/php:7.2[json,ssl,zlib] ) - php_targets_php7-3? ( dev-lang/php:7.3[json,ssl,zlib] )" -DEPEND="${COMMON_DEPEND} - >=dev-libs/libbson-1.13.0 - >=dev-libs/mongo-c-driver-1.13.0[sasl?,ssl] - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - sasl? ( dev-libs/cyrus-sasl )" -RDEPEND="${DEPEND}" -BDEPEND="${COMMON_DEPEND} - virtual/pkgconfig" - -src_configure() { - local PHP_EXT_ECONF_ARGS=( - --enable-mongodb - --with-libbson - --with-libmongoc - --with-mongodb-sasl=$(usex sasl) - ) - php-ext-source-r3_src_configure -} diff --git a/dev-php/pecl-mongodb/pecl-mongodb-1.5.3.ebuild b/dev-php/pecl-mongodb/pecl-mongodb-1.5.3.ebuild deleted file mode 100644 index 353be18eae0c..000000000000 --- a/dev-php/pecl-mongodb/pecl-mongodb-1.5.3.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PHP_EXT_NAME="mongodb" -USE_PHP="php5-6 php7-0 php7-1 php7-2" - -inherit php-ext-pecl-r3 - -DESCRIPTION="MongoDB database driver for PHP" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="libressl sasl" - -RDEPEND=" - php_targets_php5-6? ( dev-lang/php:5.6[json,ssl,zlib] ) - php_targets_php7-0? ( dev-lang/php:7.0[json,ssl,zlib] ) - php_targets_php7-1? ( dev-lang/php:7.1[json,ssl,zlib] ) - php_targets_php7-2? ( dev-lang/php:7.2[json,ssl,zlib] ) - >=dev-libs/libbson-1.13.0 - >=dev-libs/mongo-c-driver-1.13.0[sasl?,ssl] - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - sasl? ( dev-libs/cyrus-sasl ) -" -# pkgconfig needed if system libraries are used for bson and libmongoc -DEPEND="${RDEPEND} virtual/pkgconfig" - -src_configure() { - local PHP_EXT_ECONF_ARGS=( - --enable-mongodb - --with-libbson - --with-libmongoc - --with-mongodb-sasl=$(usex sasl) - ) - php-ext-source-r3_src_configure -} diff --git a/dev-php/pecl-mongodb/pecl-mongodb-1.5.5.ebuild b/dev-php/pecl-mongodb/pecl-mongodb-1.5.5.ebuild deleted file mode 100644 index 62a5bf128339..000000000000 --- a/dev-php/pecl-mongodb/pecl-mongodb-1.5.5.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PHP_EXT_NAME="mongodb" -USE_PHP="php5-6 php7-1 php7-2 php7-3" - -inherit php-ext-pecl-r3 - -DESCRIPTION="MongoDB database driver for PHP" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="libressl sasl" - -COMMON_DEPEND=" - php_targets_php5-6? ( dev-lang/php:5.6[json,ssl,zlib] ) - php_targets_php7-1? ( dev-lang/php:7.1[json,ssl,zlib] ) - php_targets_php7-2? ( dev-lang/php:7.2[json,ssl,zlib] ) - php_targets_php7-3? ( dev-lang/php:7.3[json,ssl,zlib] )" -DEPEND="${COMMON_DEPEND} - >=dev-libs/libbson-1.13.0 - >=dev-libs/mongo-c-driver-1.13.0[sasl?,ssl] - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - sasl? ( dev-libs/cyrus-sasl )" -RDEPEND="${DEPEND}" -BDEPEND="${COMMON_DEPEND} - virtual/pkgconfig" - -src_configure() { - local PHP_EXT_ECONF_ARGS=( - --enable-mongodb - --with-libbson - --with-libmongoc - --with-mongodb-sasl=$(usex sasl) - ) - php-ext-source-r3_src_configure -} diff --git a/dev-php/pecl-mongodb/pecl-mongodb-1.6.0.ebuild b/dev-php/pecl-mongodb/pecl-mongodb-1.6.0.ebuild deleted file mode 100644 index 6dc6dd1ed288..000000000000 --- a/dev-php/pecl-mongodb/pecl-mongodb-1.6.0.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PHP_EXT_NAME="mongodb" -USE_PHP="php7-1 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="libressl sasl test" - -PHP_DEPEND=" - php_targets_php7-1? ( dev-lang/php:7.1[json,ssl,zlib] ) - 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.15.1 - >=dev-libs/mongo-c-driver-1.15.1[sasl?,ssl] - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl: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-redis/Manifest b/dev-php/pecl-redis/Manifest index 076440f978be..1153a3511698 100644 --- a/dev-php/pecl-redis/Manifest +++ b/dev-php/pecl-redis/Manifest @@ -1,5 +1 @@ -DIST redis-5.1.1.tgz 245205 BLAKE2B b7177be5282b081562a446b1b37c7b46ba0ef382e55f27989d5586346a10f842d050ee46e881e480ea6b768e1259458df565d02193eda13a95704cd5455c1ca2 SHA512 eb6aa538d2ae4115634fd5841e3ccccf788cad13b99e0485fb2af43def85e93328012e5cef66d1be4bdd494be6f68de329a066e41b710e434f94f3ed3401bfee -DIST redis-5.2.1.tgz 251570 BLAKE2B 297d6130469735a53f6dfb6ffea8c7c813363099eb76f25619f0cbb05cd06f5ecad9c0f30c370e33985523cf26488cf133aa0a48a99075bc6d5796309e3d914d SHA512 de90bf65cce0cb8c5ea28415e4f7bfff23c8bb3dc96ddca3158f94be2e4bd051e13ec3f34429b0e8ceb436096520e3998f544f377d5ef7d4d1df4edba7f66bc2 -DIST redis-5.2.2.tgz 251629 BLAKE2B e6ca740412dd1ba4ee960e1c71b3f75ebb1a1e2605bc93159395c657ab61eda4c8222b6e890a447c06cd1ef016e061861ffc5d8a6fd6e7e324353a148b54c593 SHA512 0020c572bcd24cdb479046727fba2d30ca87c9a7111c51e5fe3be0b85459e3e7dfc8892b690650de0a7dc80c1a8921f9de45590f6e60257fbf0534729c6e6f4f -DIST redis-5.3.1.tgz 264485 BLAKE2B 51f68841d51329cbbbd2012e539351b3220dc1361ae5a3782b6c3e9620ed14b9a0b9097a0d6ba6e2fa60e8a794fd2ea57fff871d2fceb7bcdb4a2ab4a6d8789f SHA512 dca62e0e87d22c25818f0eb84ec0a4ae8ab4c1a2de295b7d56d10548c95448637e1b1ca86c55adf0f801fe22bf3c05fad4ff58f3823e5d74c506d041b64f1d4a DIST redis-5.3.2.tgz 266814 BLAKE2B 2be79d850e5958bcaf4fddcbdef0a402e62a522f260ae94c0fdc931a988e9b266c7a4e049b89b507a29a8e9085590e4077e336b85974d70a7cb9b3d6c806949d SHA512 95ce960b78cf94ecd212ec88914935167af37e4176d4b111dfc8c6f1a0846a34beba7f9f516cd7a5e1c9dda23f46cce44c99aaa5b42724c0c2a188b0698af414 diff --git a/dev-php/pecl-redis/pecl-redis-5.1.1.ebuild b/dev-php/pecl-redis/pecl-redis-5.1.1.ebuild deleted file mode 100644 index f765a4d536ff..000000000000 --- a/dev-php/pecl-redis/pecl-redis-5.1.1.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PHP_EXT_NAME="redis" -USE_PHP="php7-1 php7-2 php7-3 php7-4" -PHP_EXT_NEEDED_USE="json?,session?" -DOCS=( arrays.markdown cluster.markdown README.markdown CREDITS ) -MY_P="${PN/pecl-/}-${PV/_rc/RC}" -PHP_EXT_PECL_FILENAME="${MY_P}.tgz" -PHP_EXT_S="${WORKDIR}/${MY_P}" - -inherit php-ext-pecl-r3 - -DESCRIPTION="PHP extension for interfacing with Redis" -LICENSE="PHP-3.01" -SLOT="0" -KEYWORDS="amd64 ~arm" -IUSE="igbinary +json +session" - -DEPEND=" - igbinary? ( >=dev-php/igbinary-3.0.1-r1[php_targets_php7-1?,php_targets_php7-2?,php_targets_php7-3?,php_targets_php7-4?] ) -" -RDEPEND="${DEPEND} !dev-php/pecl-redis:7" - -# The test suite requires network access. -RESTRICT=test - -S="${WORKDIR}/${MY_P}" - -src_configure() { - local PHP_EXT_ECONF_ARGS=( - --enable-redis - $(use_enable igbinary redis-igbinary) - $(use_enable json redis-json) - $(use_enable session redis-session) - ) - php-ext-source-r3_src_configure -} - -src_test() { - local slot - for slot in $(php_get_slots); do - php_init_slot_env "${slot}" - # Run tests for Redis class - ${PHPCLI} -d extension=modules/redis.so \ - tests/TestRedis.php \ - --class Redis \ - --host ${PECL_REDIS_HOST} || die 'test suite failed' - done -} diff --git a/dev-php/pecl-redis/pecl-redis-5.2.1.ebuild b/dev-php/pecl-redis/pecl-redis-5.2.1.ebuild deleted file mode 100644 index ec5cd6b371d3..000000000000 --- a/dev-php/pecl-redis/pecl-redis-5.2.1.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PHP_EXT_NAME="redis" -USE_PHP="php7-2 php7-3 php7-4" -PHP_EXT_NEEDED_USE="json?,session?" -DOCS=( arrays.markdown cluster.markdown README.markdown CREDITS ) -MY_P="${PN/pecl-/}-${PV/_rc/RC}" -PHP_EXT_PECL_FILENAME="${MY_P}.tgz" -PHP_EXT_S="${WORKDIR}/${MY_P}" - -inherit php-ext-pecl-r3 - -DESCRIPTION="PHP extension for interfacing with Redis" -LICENSE="PHP-3.01" -SLOT="0" -KEYWORDS="~amd64 ~arm" -IUSE="igbinary +json +session" - -DEPEND=" - igbinary? ( >=dev-php/igbinary-3.0.1-r1[php_targets_php7-2?,php_targets_php7-3?,php_targets_php7-4?] ) -" -RDEPEND="${DEPEND} !dev-php/pecl-redis:7" - -# The test suite requires network access. -RESTRICT=test - -S="${WORKDIR}/${MY_P}" - -src_configure() { - local PHP_EXT_ECONF_ARGS=( - --enable-redis - $(use_enable igbinary redis-igbinary) - $(use_enable json redis-json) - $(use_enable session redis-session) - ) - php-ext-source-r3_src_configure -} - -src_test() { - local slot - for slot in $(php_get_slots); do - php_init_slot_env "${slot}" - # Run tests for Redis class - ${PHPCLI} -d extension=modules/redis.so \ - tests/TestRedis.php \ - --class Redis \ - --host ${PECL_REDIS_HOST} || die 'test suite failed' - done -} diff --git a/dev-php/pecl-redis/pecl-redis-5.2.2.ebuild b/dev-php/pecl-redis/pecl-redis-5.2.2.ebuild deleted file mode 100644 index ec5cd6b371d3..000000000000 --- a/dev-php/pecl-redis/pecl-redis-5.2.2.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PHP_EXT_NAME="redis" -USE_PHP="php7-2 php7-3 php7-4" -PHP_EXT_NEEDED_USE="json?,session?" -DOCS=( arrays.markdown cluster.markdown README.markdown CREDITS ) -MY_P="${PN/pecl-/}-${PV/_rc/RC}" -PHP_EXT_PECL_FILENAME="${MY_P}.tgz" -PHP_EXT_S="${WORKDIR}/${MY_P}" - -inherit php-ext-pecl-r3 - -DESCRIPTION="PHP extension for interfacing with Redis" -LICENSE="PHP-3.01" -SLOT="0" -KEYWORDS="~amd64 ~arm" -IUSE="igbinary +json +session" - -DEPEND=" - igbinary? ( >=dev-php/igbinary-3.0.1-r1[php_targets_php7-2?,php_targets_php7-3?,php_targets_php7-4?] ) -" -RDEPEND="${DEPEND} !dev-php/pecl-redis:7" - -# The test suite requires network access. -RESTRICT=test - -S="${WORKDIR}/${MY_P}" - -src_configure() { - local PHP_EXT_ECONF_ARGS=( - --enable-redis - $(use_enable igbinary redis-igbinary) - $(use_enable json redis-json) - $(use_enable session redis-session) - ) - php-ext-source-r3_src_configure -} - -src_test() { - local slot - for slot in $(php_get_slots); do - php_init_slot_env "${slot}" - # Run tests for Redis class - ${PHPCLI} -d extension=modules/redis.so \ - tests/TestRedis.php \ - --class Redis \ - --host ${PECL_REDIS_HOST} || die 'test suite failed' - done -} diff --git a/dev-php/pecl-redis/pecl-redis-5.3.1.ebuild b/dev-php/pecl-redis/pecl-redis-5.3.1.ebuild deleted file mode 100644 index 9f7ec9e88930..000000000000 --- a/dev-php/pecl-redis/pecl-redis-5.3.1.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PHP_EXT_NAME="redis" -USE_PHP="php7-2 php7-3 php7-4" -PHP_EXT_NEEDED_USE="json?,session?" -DOCS=( arrays.markdown cluster.markdown README.markdown CREDITS ) -MY_P="${PN/pecl-/}-${PV/_rc/RC}" -PHP_EXT_PECL_FILENAME="${MY_P}.tgz" -PHP_EXT_S="${WORKDIR}/${MY_P}" - -inherit php-ext-pecl-r3 - -DESCRIPTION="PHP extension for interfacing with Redis" -LICENSE="PHP-3.01" -SLOT="0" -KEYWORDS="~amd64 ~arm" -IUSE="igbinary +json lz4 +session zstd" - -DEPEND=" - igbinary? ( >=dev-php/igbinary-3.0.1-r1[php_targets_php7-2?,php_targets_php7-3?,php_targets_php7-4?] ) - lz4? ( app-arch/lz4:= ) - zstd? ( app-arch/zstd:= ) -" -RDEPEND="${DEPEND} - !dev-php/pecl-redis:7" - -# The test suite requires network access. -RESTRICT=test - -S="${WORKDIR}/${MY_P}" - -src_configure() { - local PHP_EXT_ECONF_ARGS=( - --enable-redis - --disable-redis-lzf - --disable-redis-msgpack - $(use_enable igbinary redis-igbinary) - $(use_enable json redis-json) - $(use_enable lz4 redis-lz4) - $(use_with lz4 liblz4) - $(use_enable session redis-session) - $(use_enable zstd redis-zstd) - $(use_with zstd libzstd) - ) - php-ext-source-r3_src_configure -} - -src_test() { - local slot - for slot in $(php_get_slots); do - php_init_slot_env "${slot}" - # Run tests for Redis class - ${PHPCLI} -d extension=modules/redis.so \ - tests/TestRedis.php \ - --class Redis \ - --host ${PECL_REDIS_HOST} || die 'test suite failed' - done -} diff --git a/dev-php/pecl-redis/pecl-redis-5.3.2.ebuild b/dev-php/pecl-redis/pecl-redis-5.3.2.ebuild index 65762af9b8d8..28935f2552a5 100644 --- a/dev-php/pecl-redis/pecl-redis-5.3.2.ebuild +++ b/dev-php/pecl-redis/pecl-redis-5.3.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -16,7 +16,7 @@ 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=" diff --git a/dev-php/pecl-taint/Manifest b/dev-php/pecl-taint/Manifest index 1193d63d8be9..cb0caf88fbc7 100644 --- a/dev-php/pecl-taint/Manifest +++ b/dev-php/pecl-taint/Manifest @@ -1,2 +1 @@ -DIST taint-2.0.5.tgz 18203 BLAKE2B 1e7d31f5a4eee810923420606892f2cd672d4fdcaf6decda1966d0ad44f779cf019a624c0f5971a44e8ceadf37159359f41ff52f523157eace26d7335405bad6 SHA512 625809e553d782dc6bb41b4dace1a32bf47157e3438430b3717e0ca692959625b293011220e47f95f4b484558e39454138b0760806fcd1e4ae42f608ab290b31 -DIST taint-2.0.6.tgz 18321 BLAKE2B dfa2765a0045072506e85664805c36beec2663b2d54c5bb385b3c1f624f1124bdafada38578d335a5054fb4c823cd4713d76fddb5588b2e1065ae30289539059 SHA512 ea99d738a73f98f881eb2ad82a756d915fbb43faa4ddf7bce52aaca2590d5cff0d4f3739015754d256f97a81cc54183900250dec249397aab1aebe9587140f6c +DIST taint-2.1.0.tgz 18613 BLAKE2B a76299140dade9a9a2adf7f873cdbaf762abf9248fa7eb16ed502651ade0bcb3a8ca4fc52d495a809d9360e0650dd34ce57798e864e81587a65791f861dd051a SHA512 26374654b07f6c07de0993c91b331d4b35fa485b3d5d737f27daf401b4db0da3d10f59f7b38e523ab705cc76938c4bbf3aa862389122a9afbba008d912de1a6a diff --git a/dev-php/pecl-taint/pecl-taint-2.0.6.ebuild b/dev-php/pecl-taint/pecl-taint-2.0.6.ebuild deleted file mode 100644 index 33166802822c..000000000000 --- a/dev-php/pecl-taint/pecl-taint-2.0.6.ebuild +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -USE_PHP="php7-1 php7-2 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-taint/pecl-taint-2.0.5.ebuild b/dev-php/pecl-taint/pecl-taint-2.1.0.ebuild index 916d01e54270..0719c8b569b5 100644 --- a/dev-php/pecl-taint/pecl-taint-2.0.5.ebuild +++ b/dev-php/pecl-taint/pecl-taint-2.1.0.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" -USE_PHP="php7-1 php7-2 php7-3" +USE_PHP="php7-3 php7-4" inherit php-ext-pecl-r3 DESCRIPTION="Extension used for detecting XSS code (tainted strings)" diff --git a/dev-php/pecl-translit/Manifest b/dev-php/pecl-translit/Manifest index 15715b90d65c..8575f6bd7c82 100644 --- a/dev-php/pecl-translit/Manifest +++ b/dev-php/pecl-translit/Manifest @@ -1,2 +1 @@ -DIST pecl-translit-0.6.3.tar.gz 227419 BLAKE2B ebff291a00d61bb4f8e2c47e26baef4278f317be8acd7e5265d3056f8992e6b7e792718c86633277c4a0af5403e253b317241a71aba9b73079a8efb53389ab30 SHA512 5b5e3097a972e45424696abea4d4698fc6c7b6598f1a76754224a4b66776752a01b3bad52bc14afb8cc6e75d36c4558677e609a379898cdd91a5b0a652155cd1 DIST pecl-translit-0.7.1.tar.gz 227287 BLAKE2B 4d9c9a74ec775d720bf4f2742460e7c96f52bac7b0ddec71622818d5e257bf468092b067ce33b335eee78ded8f2e74f0378acb22a18ef7a30db57a78d9215939 SHA512 62a2a26dbc01bd802c16ab0346d8c2a1960c1066b221bc05d609ca49fef26e9ffbbee9b685fbd82ca9b02be954fbd7f5eb2d9de307c746a792b8785f44e64d46 diff --git a/dev-php/pecl-translit/pecl-translit-0.6.3.ebuild b/dev-php/pecl-translit/pecl-translit-0.6.3.ebuild deleted file mode 100644 index 767d97480c0e..000000000000 --- a/dev-php/pecl-translit/pecl-translit-0.6.3.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -PHP_EXT_NAME="translit" -PHP_EXT_INI="yes" -PHP_EXT_ZENDEXT="no" - -USE_PHP="php7-1 php7-2 php7-3 php7-4" -PHP_EXT_NAME="translit" - -inherit php-ext-source-r3 - -SRC_URI="https://github.com/derickr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" -KEYWORDS="~amd64 ~x86" -HOMEPAGE="https://github.com/derickr/pecl-translit" - -DESCRIPTION="Transliterates non-latin character sets to latin" -LICENSE="BSD-2" -SLOT="0" -IUSE="" -PHP_EXT_ECONF_ARGS=() - -src_test() { - for slot in $(php_get_slots); do - php_init_slot_env ${slot} - NO_INTERACTION="yes" emake test - done -} diff --git a/dev-php/pecl-uuid/Manifest b/dev-php/pecl-uuid/Manifest index 294dd034e156..1b8bcf0eedf6 100644 --- a/dev-php/pecl-uuid/Manifest +++ b/dev-php/pecl-uuid/Manifest @@ -1,2 +1 @@ -DIST uuid-1.1.0.tgz 15225 BLAKE2B 0a5a326076707e0d3e7c779151a13853e52d026ebdf62c9ab147cf5d00bbc68a3d82e15101c1d4a232d96ea7e988304a25517723adb3127938474172dfab16c2 SHA512 aea814a12e266e4a9e36c58bae78927fa9de6d2b7bf9c75a911710b26958aeecd31d972f56519cf4882a4b13864bc0740ad968b06e704ce7642279253009e76d DIST uuid-1.2.0.tgz 16270 BLAKE2B a3746dce1c27973247fd84ccdf8d73809fae775fa0cf133c3bf09c862d93c6c3a53f2d093a1df3dd8bab90f4e58c326e6e7944bfdf436723c79ad5b634e46e18 SHA512 bd557823a8c2b78f74675a2554445eafc69193c6fe5af1f9435cdd90a8efdec0d3974ae8af759fe7d30b2f805876fc2ef55058dea245c9d89a792f634fdb0a10 diff --git a/dev-php/pecl-uuid/pecl-uuid-1.1.0.ebuild b/dev-php/pecl-uuid/pecl-uuid-1.1.0.ebuild deleted file mode 100644 index f030569d725f..000000000000 --- a/dev-php/pecl-uuid/pecl-uuid-1.1.0.ebuild +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -PHP_EXT_NAME="uuid" -PHP_EXT_INIT="yes" -PHP_EXT_ZENDEXT="no" -DOCS=( CREDITS ) - -USE_PHP="php7-1 php7-2 php7-3 php7-4" - -inherit php-ext-pecl-r3 - -DESCRIPTION="A wrapper around libuuid" -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~amd64" -IUSE="" - -DEPEND="sys-apps/util-linux" -RDEPEND="${DEPEND}" -PHP_EXT_ECONF_ARGS=() diff --git a/dev-php/pecl-xdiff/files/2.1.0_pre-php8-2.patch b/dev-php/pecl-xdiff/files/2.1.0_pre-php8-2.patch new file mode 100644 index 000000000000..80bebf7dfddd --- /dev/null +++ b/dev-php/pecl-xdiff/files/2.1.0_pre-php8-2.patch @@ -0,0 +1,214 @@ +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 new file mode 100644 index 000000000000..e41155467973 --- /dev/null +++ b/dev-php/pecl-xdiff/files/2.1.0_pre-php8-3.patch @@ -0,0 +1,39 @@ +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 new file mode 100644 index 000000000000..8a8f3ab43299 --- /dev/null +++ b/dev-php/pecl-xdiff/files/2.1.0_pre-php8.patch @@ -0,0 +1,467 @@ +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/pecl-xdiff-2.0.1-r2.ebuild b/dev-php/pecl-xdiff/pecl-xdiff-2.0.1-r2.ebuild deleted file mode 100644 index 4acbe27c4126..000000000000 --- a/dev-php/pecl-xdiff/pecl-xdiff-2.0.1-r2.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PHP_EXT_NAME="xdiff" -PHP_EXT_PECL_PKG="xdiff" -DOCS=( README.API ) - -USE_PHP="php5-6 php7-0 php7-1 php7-2 php7-3 php7-4" - -inherit php-ext-pecl-r3 - -USE_PHP="php7-0 php7-1 php7-2 php7-3 php7-4" - -KEYWORDS="~amd64 ~x86" - -DESCRIPTION="PHP extension for generating diff files" -LICENSE="PHP-3.01" -SLOT="7" - -DEPEND=" - php_targets_php7-0? ( dev-libs/libxdiff ) - php_targets_php7-1? ( dev-libs/libxdiff ) - php_targets_php7-2? ( dev-libs/libxdiff ) - php_targets_php7-3? ( dev-libs/libxdiff ) - php_targets_php7-4? ( dev-libs/libxdiff ) -" -RDEPEND="${DEPEND} php_targets_php5-6? ( dev-php/pecl-xdiff:0[php_targets_php5-6] )" - -src_prepare() { - if use php_targets_php7-0 || use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3 || use php_targets_php7-4 ; then - php-ext-source-r3_src_prepare - else - eapply_user - fi -} - -src_configure() { - if use php_targets_php7-0 || use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3 || use php_targets_php7-4 ; then - local PHP_EXT_ECONF_ARGS=() - php-ext-source-r3_src_configure - fi -} - -src_install() { - if use php_targets_php7-0 || use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3 || use php_targets_php7-4 ; then - php-ext-pecl-r3_src_install - fi -} 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 new file mode 100644 index 000000000000..336f7f480f72 --- /dev/null +++ b/dev-php/pecl-xdiff/pecl-xdiff-2.1.0_pre.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PHP_EXT_NAME="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/xdebug-client/Manifest b/dev-php/xdebug-client/Manifest index 65cb9595e140..801e04978a9e 100644 --- a/dev-php/xdebug-client/Manifest +++ b/dev-php/xdebug-client/Manifest @@ -1,5 +1,2 @@ -DIST xdebug-2.9.4.tar.gz 434622 BLAKE2B bd0d0c6a46867ffba88693f142346d11b5abfab3254c549b74ff9169536c42903b1fb1cb94c3344060590b63e287878ea05c6ef7ad8343234bada3857e0dbe75 SHA512 cf19fb9fd12c32e04c18f296694d0667dfe6e14617da932804d17526c88ab19dd2307ad43d036a8c0cb1f871a964523473879da8815f346faf83ec3b9e3952e3 -DIST xdebug-2.9.5.tar.gz 434947 BLAKE2B 08fd7cc92880c9b00180d495341fc7e54998cf3c2294b824d94c3c4ed982ae5b087084b776bcc4f8f4e1aa420396c803d330bc76748cf972cccab4e3f1416d38 SHA512 2a937d08468d3a2963559a56bdf9c9aa6ede3f0ee63797aa14831bcab33a5ede65b87791171a0c794eefdfcffa65bb4d0c06b5377fe03ade65f4defa6e328c72 DIST xdebug-2.9.6.tar.gz 436208 BLAKE2B 00cfb42c41bfb44f285b97779d6ba625641fc34494465e9e791ab5458c6a608e432df0ad45c561df2f8c9aba04ab34b3a98bb5e6bfb92ace39a3ad4145f3514a SHA512 13ed07a1489ba7bc0b4e85bf56306c733e7894cea8cb442649635196606b12d92e5618ab2485e7cde4aaee2ac6752993aecd933c24fd64b5113ef619339403d2 -DIST xdebug-2.9.7.tar.gz 437517 BLAKE2B 6d3cb615b6b75354e5dc993a2de9f90b5865ee1a98935c084a9d7a4e1d03cceb71278b06da1d5e47f2b4105937f6d24cb8d767c7179fa55798e61a599e173c13 SHA512 ec23f7b5b2e2b109a753e12f1cb01377db52716600fbb31ca5b9a749e9d98e0eb60942b272c25a42efcb56add016310c79eda2c7385a3e0fc18e563f2f486d1e DIST xdebug-2.9.8.tar.gz 438295 BLAKE2B 8645052faceb354817ddb448f46af5b849507d31255b43ac59bcef4ece7837ef835ae2ad624ed8a95f8f98d552ef0e7195a4ade7df9176bc300d855a0156f405 SHA512 c431d51a0d9c5ac1c7fc529c2819db480cbfff6f65c35c3c0dbef4e78427aa28ede164f397f92c409e58e386a6be34ecd2ded0ee35e01df1cbf92a49fd2f2aab diff --git a/dev-php/xdebug-client/xdebug-client-2.9.4.ebuild b/dev-php/xdebug-client/xdebug-client-2.9.4.ebuild deleted file mode 100644 index e78a7cba61c8..000000000000 --- a/dev-php/xdebug-client/xdebug-client-2.9.4.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" - -KEYWORDS="amd64 ~hppa ppc ppc64 x86" - -MY_PN="xdebug" -MY_PV="${PV/_/}" -MY_PV="${MY_PV/rc/RC}" - -inherit autotools - -DESCRIPTION="Xdebug client for the Common Debugger Protocol (DBGP)" -HOMEPAGE="https://xdebug.org/" -# Using tarball from GitHub for tests -#SRC_URI="http://pecl.php.net/get/xdebug-${MY_PV}.tgz" -SRC_URI="https://github.com/xdebug/xdebug/archive/${MY_PV}.tar.gz -> ${MY_PN}-${PV}.tar.gz" -LICENSE="Xdebug" -SLOT="0" -IUSE="libedit" - -S="${WORKDIR}/${MY_PN}-${MY_PV}/debugclient" - -DEPEND="libedit? ( dev-libs/libedit ) net-libs/libnsl:0=" -RDEPEND="${DEPEND}" - -src_prepare() { - default - - eautoreconf -} - -src_configure() { - econf $(use_with libedit) -} - -src_install() { - newbin debugclient xdebug -} diff --git a/dev-php/xdebug-client/xdebug-client-2.9.5.ebuild b/dev-php/xdebug-client/xdebug-client-2.9.5.ebuild deleted file mode 100644 index ad1c2866a297..000000000000 --- a/dev-php/xdebug-client/xdebug-client-2.9.5.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" - -KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86" - -MY_PN="xdebug" -MY_PV="${PV/_/}" -MY_PV="${MY_PV/rc/RC}" - -inherit autotools - -DESCRIPTION="Xdebug client for the Common Debugger Protocol (DBGP)" -HOMEPAGE="https://xdebug.org/" -# Using tarball from GitHub for tests -#SRC_URI="http://pecl.php.net/get/xdebug-${MY_PV}.tgz" -SRC_URI="https://github.com/xdebug/xdebug/archive/${MY_PV}.tar.gz -> ${MY_PN}-${PV}.tar.gz" -LICENSE="Xdebug" -SLOT="0" -IUSE="libedit" - -S="${WORKDIR}/${MY_PN}-${MY_PV}/debugclient" - -DEPEND="libedit? ( dev-libs/libedit ) net-libs/libnsl:0=" -RDEPEND="${DEPEND}" - -src_prepare() { - default - - eautoreconf -} - -src_configure() { - econf $(use_with libedit) -} - -src_install() { - newbin debugclient xdebug -} diff --git a/dev-php/xdebug-client/xdebug-client-2.9.7.ebuild b/dev-php/xdebug-client/xdebug-client-2.9.7.ebuild deleted file mode 100644 index ad1c2866a297..000000000000 --- a/dev-php/xdebug-client/xdebug-client-2.9.7.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" - -KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86" - -MY_PN="xdebug" -MY_PV="${PV/_/}" -MY_PV="${MY_PV/rc/RC}" - -inherit autotools - -DESCRIPTION="Xdebug client for the Common Debugger Protocol (DBGP)" -HOMEPAGE="https://xdebug.org/" -# Using tarball from GitHub for tests -#SRC_URI="http://pecl.php.net/get/xdebug-${MY_PV}.tgz" -SRC_URI="https://github.com/xdebug/xdebug/archive/${MY_PV}.tar.gz -> ${MY_PN}-${PV}.tar.gz" -LICENSE="Xdebug" -SLOT="0" -IUSE="libedit" - -S="${WORKDIR}/${MY_PN}-${MY_PV}/debugclient" - -DEPEND="libedit? ( dev-libs/libedit ) net-libs/libnsl:0=" -RDEPEND="${DEPEND}" - -src_prepare() { - default - - eautoreconf -} - -src_configure() { - econf $(use_with libedit) -} - -src_install() { - newbin debugclient xdebug -} diff --git a/dev-php/xdebug/Manifest b/dev-php/xdebug/Manifest index 4e8a20cd5a84..a652cfb3fada 100644 --- a/dev-php/xdebug/Manifest +++ b/dev-php/xdebug/Manifest @@ -1,7 +1,3 @@ -DIST xdebug-2.9.4.tar.gz 434622 BLAKE2B bd0d0c6a46867ffba88693f142346d11b5abfab3254c549b74ff9169536c42903b1fb1cb94c3344060590b63e287878ea05c6ef7ad8343234bada3857e0dbe75 SHA512 cf19fb9fd12c32e04c18f296694d0667dfe6e14617da932804d17526c88ab19dd2307ad43d036a8c0cb1f871a964523473879da8815f346faf83ec3b9e3952e3 -DIST xdebug-2.9.5.tar.gz 434947 BLAKE2B 08fd7cc92880c9b00180d495341fc7e54998cf3c2294b824d94c3c4ed982ae5b087084b776bcc4f8f4e1aa420396c803d330bc76748cf972cccab4e3f1416d38 SHA512 2a937d08468d3a2963559a56bdf9c9aa6ede3f0ee63797aa14831bcab33a5ede65b87791171a0c794eefdfcffa65bb4d0c06b5377fe03ade65f4defa6e328c72 DIST xdebug-2.9.6.tar.gz 436208 BLAKE2B 00cfb42c41bfb44f285b97779d6ba625641fc34494465e9e791ab5458c6a608e432df0ad45c561df2f8c9aba04ab34b3a98bb5e6bfb92ace39a3ad4145f3514a SHA512 13ed07a1489ba7bc0b4e85bf56306c733e7894cea8cb442649635196606b12d92e5618ab2485e7cde4aaee2ac6752993aecd933c24fd64b5113ef619339403d2 -DIST xdebug-2.9.7.tar.gz 437517 BLAKE2B 6d3cb615b6b75354e5dc993a2de9f90b5865ee1a98935c084a9d7a4e1d03cceb71278b06da1d5e47f2b4105937f6d24cb8d767c7179fa55798e61a599e173c13 SHA512 ec23f7b5b2e2b109a753e12f1cb01377db52716600fbb31ca5b9a749e9d98e0eb60942b272c25a42efcb56add016310c79eda2c7385a3e0fc18e563f2f486d1e DIST xdebug-2.9.8.tar.gz 438295 BLAKE2B 8645052faceb354817ddb448f46af5b849507d31255b43ac59bcef4ece7837ef835ae2ad624ed8a95f8f98d552ef0e7195a4ade7df9176bc300d855a0156f405 SHA512 c431d51a0d9c5ac1c7fc529c2819db480cbfff6f65c35c3c0dbef4e78427aa28ede164f397f92c409e58e386a6be34ecd2ded0ee35e01df1cbf92a49fd2f2aab -DIST xdebug-3.0.1.tar.gz 432140 BLAKE2B f326de9a24c7c766b0f49213625ab7c455f7fd564af1848f2acb728fe513457140ee9669a05ddf83fd4ca07ecd591896d06bd570b60319178b484eaa7664cf88 SHA512 c50dea2abcad9c7e78ad7b7600a71c1bf0543c5fa31280a41c2acad2423bb6af8160e9d6b1e653f350f20660cfb2d8e4de07ae8f1181a465cc858dec13331c67 DIST xdebug-3.0.2.tar.gz 435761 BLAKE2B 0476d29b3a960d83fd0818098a3d076f48f4d67057a2b6ec79571b011a9f364b18d3319771ad18e7145aa0f0f45fab7ed13d814b863731abe1721aafa8b59408 SHA512 723e00885a49a5626870cc4cb0f7fd49a3173c8d4e9b4022009430fdeaa1b152828de18e6e7fa709be8bb11989c89dc2d9940de9cc3d592174b5dafbc3d2c52d diff --git a/dev-php/xdebug/xdebug-2.9.4.ebuild b/dev-php/xdebug/xdebug-2.9.4.ebuild deleted file mode 100644 index c1072c7b3cba..000000000000 --- a/dev-php/xdebug/xdebug-2.9.4.ebuild +++ /dev/null @@ -1,42 +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="" - -DEPEND="" -RDEPEND="${DEPEND} - ~dev-php/xdebug-client-${PV}" -DOCS=( README.rst CREDITS ) -PHP_EXT_ECONF_ARGS=() - -pkg_postinst() { - ewarn "We have set xdebug.default_enable to 0 (off), as xdebug can be" - ewarn "installed as a dependency, and not all users will want xdebug to be" - ewarn "enabled by default. If you want to enable it, you should edit the" - ewarn "ini file and set xdebug.default_enable to 1. Alternatively you can" - ewarn "call xdebug_enable() in your code." -} diff --git a/dev-php/xdebug/xdebug-2.9.5.ebuild b/dev-php/xdebug/xdebug-2.9.5.ebuild deleted file mode 100644 index 95745e2c779d..000000000000 --- a/dev-php/xdebug/xdebug-2.9.5.ebuild +++ /dev/null @@ -1,42 +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="" - -DEPEND="" -RDEPEND="${DEPEND} - ~dev-php/xdebug-client-${PV}" -DOCS=( README.rst CREDITS ) -PHP_EXT_ECONF_ARGS=() - -pkg_postinst() { - ewarn "We have set xdebug.default_enable to 0 (off), as xdebug can be" - ewarn "installed as a dependency, and not all users will want xdebug to be" - ewarn "enabled by default. If you want to enable it, you should edit the" - ewarn "ini file and set xdebug.default_enable to 1. Alternatively you can" - ewarn "call xdebug_enable() in your code." -} diff --git a/dev-php/xdebug/xdebug-2.9.7.ebuild b/dev-php/xdebug/xdebug-2.9.7.ebuild deleted file mode 100644 index 2edd756ef66e..000000000000 --- a/dev-php/xdebug/xdebug-2.9.7.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.1.ebuild b/dev-php/xdebug/xdebug-3.0.1.ebuild deleted file mode 100644 index 26eee1e35033..000000000000 --- a/dev-php/xdebug/xdebug-3.0.1.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" -PHP_EXT_NAME="xdebug" -PHP_EXT_INI="yes" -PHP_EXT_ZENDEXT="yes" -PHP_EXT_INIFILE="3.0-xdebug.ini" - -USE_PHP="php7-2 php7-3 php7-4 php8-0" - -MY_PV="${PV/_/}" -MY_PV="${MY_PV/rc/RC}" - -S="${WORKDIR}/${PN}-${MY_PV}" - -inherit php-ext-source-r3 - -KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86" - -DESCRIPTION="A PHP debugging and profiling extension" -HOMEPAGE="https://xdebug.org/" -# Using tarball from GitHub for tests -#SRC_URI="https://pecl.php.net/get/${PN}-${MY_PV}.tgz" -SRC_URI="https://github.com/xdebug/xdebug/archive/${MY_PV}.tar.gz -> ${P}.tar.gz" -LICENSE="Xdebug" -SLOT="0" -IUSE="" - -# Tests are known to fail -RESTRICT="test" - -DEPEND="" -RDEPEND="${DEPEND}" -DOCS=( README.rst CREDITS ) -PHP_EXT_ECONF_ARGS=() - -src_test() { - local slot - for slot in $(php_get_slots); do - php_init_slot_env "${slot}" - TEST_PHP_EXECUTABLE="${PHPCLI}" \ - TEST_PHP_CGI_EXECUTABLE="${PHPCGI}" \ - TEST_PHPDBG_EXECUTABLE="${PHPCLI}dbg" \ - "${PHPCLI}" run-xdebug-tests.php - done -} - -pkg_postinst() { - ewarn "We have set xdebug.mode to off, as xdebug can be" - ewarn "installed as a dependency, and not all users will want xdebug to be" - ewarn "enabled by default. If you want to enable it, you should edit the" - ewarn "ini file and set xdebug.mode to one or more modes e.g. develop,debug,trace" - elog "" - elog "The 3.0 major release changes many options." - elog "Review https://xdebug.org/docs/upgrade_guide for differences from 2.x" -} |