diff --git a/dev-lang/php/php-7.4.33_p20251219.ebuild b/dev-lang/php/php-7.4.33_p20251219.ebuild index 513246c..eae87f4 100644 --- a/dev-lang/php/php-7.4.33_p20251219.ebuild +++ b/dev-lang/php/php-7.4.33_p20251219.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2025 Gentoo Authors +# Copyright 1999-2026 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -13,7 +13,7 @@ PHP_PATCH="php-$(ver_cut 1-3)-patches-2.tar.xz" DESCRIPTION="The PHP language runtime engine" HOMEPAGE="https://www.php.net/" -SRC_URI="https://raw.githubusercontent.com/inode64/inode64-overlay/main/dist/${PHP_PATCH}" +SRC_URI="https://www.inode64.com/dist/${PHP_PATCH}" EGIT_REPO_URI="https://github.com/shivammathur/php-src-backports" # Alternative #EGIT_REPO_URI="https://github.com/remicollet/php-src-security" @@ -37,7 +37,7 @@ SAPIS="embed cli cgi fpm apache2 phpdbg" # SAPIs and SAPI-specific USE flags (cli SAPI is default on): IUSE="${IUSE} ${SAPIS/cli/+cli} - " +" IUSE="${IUSE} acl argon2 bcmath berkdb bzip2 calendar cdb cjk +ctype curl debug @@ -116,7 +116,7 @@ COMMON_DEPEND=" qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) session-mm? ( dev-libs/mm ) - snmp? ( >=net-analyzer/net-snmp-5.2 ) + snmp? ( >=net-analyzer/net-snmp-5.2:= ) sodium? ( dev-libs/libsodium ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) @@ -137,16 +137,21 @@ RDEPEND="${COMMON_DEPEND} virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) - systemd? ( sys-apps/systemd ) )" + systemd? ( sys-apps/systemd ) ) +" # Bison isn't actually needed when building from a release tarball # However, the configure script will warn if it's absent or if you # have an incompatible version installed. See bug 593278. DEPEND="${COMMON_DEPEND} app-arch/xz-utils - >=sys-devel/bison-3.0.1" + >=sys-devel/bison-3.0.1 +" -BDEPEND="virtual/pkgconfig" +BDEPEND=" + dev-util/re2c + virtual/pkgconfig +" php_install_ini() { local phpsapi="${1}" @@ -211,8 +216,6 @@ src_unpack() { src_prepare() { default - eapply -R ${FILESDIR}/0009-Fix-w-strict-prototype-build-warnings-PHP-7.4.patch - local patchdir="${WORKDIR}/patches" eapply "${patchdir}/"