commit: eef0359bf0335b935c19d8ba80a77ec6c05938be Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org> AuthorDate: Sun Jun 18 13:07:09 2023 +0000 Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org> CommitDate: Sun Jun 18 14:11:34 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eef0359b
dev-lang/php: add missing virtual/libcrypt:= dependencies, bump 8.0.29. Bug: https://bugs.gentoo.org/908259 Closes: https://bugs.gentoo.org/908674 Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org> dev-lang/php/Manifest | 1 + .../{php-8.1.20.ebuild => php-7.4.33-r3.ebuild} | 82 ++++++++++------------ .../php/{php-8.1.20.ebuild => php-8.0.29.ebuild} | 30 ++++---- .../{php-8.1.20.ebuild => php-8.1.20-r1.ebuild} | 6 +- .../php/{php-8.2.7.ebuild => php-8.2.7-r1.ebuild} | 7 +- 5 files changed, 54 insertions(+), 72 deletions(-) diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest index bd933b54f810..998dc250d9e9 100644 --- a/dev-lang/php/Manifest +++ b/dev-lang/php/Manifest @@ -1,6 +1,7 @@ DIST php-7.4.33.tar.xz 10420144 BLAKE2B e75817e79c698628c873c90afb3b5677480d03ecf07e8f2e26a062bc5b91affc6079e792e864f28cf12d45f86e5d01ede289ecdcefc06477986d193d22c982ef SHA512 499b63b99e5d8e8082ff89d3a91b4cb9a593ea7553b96e48863414c13d2e50275904ed29070e2232e529ee91160f505e6060a4d129cb5bf098aa5b6ea0928d3d DIST php-8.0.25.tar.xz 10802888 BLAKE2B c1f283613c43551cccd52955deaae364781fffd4f73befa5e103211ed2b972272189973639d840ef1839b038e1872a6a28424939ea133f0bf86d82b56bb591fb SHA512 43bb0637e424e2a637e05f3faf0ca2c5309f2d9cc03def9fc9af9b756003ea6efe730b608c70177c3c1b9cb03cef31c27cd6507cca9d9f0fd854aadb5e51aee3 DIST php-8.0.28.tar.xz 10801568 BLAKE2B de03f5ad262e830c70d24b9e2dd997897e5613d8bbc998ab7e59df703db89d587c6c8955e6f82f0cf6630eed82f33e21567ccf7a873ca07f4d0659f7bf4bd974 SHA512 d66e41cdccc332fccaf03bb24356652b17be5267cba5a47d80f1b74732b674f6a23c91e4a151ca442e629de8e8bcf6daecf0b34cbcbc9e33f53b8da9f06dc6b9 +DIST php-8.0.29.tar.xz 10803592 BLAKE2B 6e15ce459aa5a51b2a07a4bfa1f6dba076dbbd4828ccdcb8dc4796f64ad3dbda6ee2b6789880591847a7de0d077072e63c46f13399b5b44a4ec34c83172fb6ac SHA512 5f849753bbcc12e253160af072213bc1ede32e5051684129707d32fd6ce8e12867fcf7a5f6790b25071fdda0508dfffd3344e4bb850a747cb8f3c9aee970311d DIST php-8.1.12.tar.xz 11747176 BLAKE2B 0505794826fb0fc92b04be5f7162af8aa92d782bb228243348d85b46866cd47089fcb7febd6886a8179babf64cb227bcdbf5d5f60d44dfefe1c947a3a708e3c1 SHA512 437b6a8146b58479f4d1acb7b35d68954f1f7bc13a8f3dddc66e1677d7e9b6a11154861f9e894cbd59b9c28d4df3fd5422f9b5553004e9fc8d0320ab59b9f907 DIST php-8.1.16.tar.xz 11760948 BLAKE2B ac0d352dae05115197852092b9b3c0b5091528326806c70eb34e0aba6007f718e927e67045d65976cb2104e4737a475b2224d4f05ff89ddf8c3066e0240c38e1 SHA512 4515da38803272abfafb069d1684c66dbb5086987b148c48dd7d8acf8f5316d255cf321ec57d6fbffe914a35551a533446ac13c34bb7c984e0d109247e8e64da DIST php-8.1.20.tar.xz 11793228 BLAKE2B ecdaf43278b69e039e5440b441a89d02ea53e8246515a89f430d7affbaefa3e1637a6830f91dc9062961719ba5bf7c56993f3b47db96b56c14111f77c74a3096 SHA512 d93767c6ff4d305c209e1a0fcb17f19b1d417fa872b002413ebe7883e93900c210e8f122410ac54da373b9d10dd2f522ea2bafc9b66214fb466314d64907a558 diff --git a/dev-lang/php/php-8.1.20.ebuild b/dev-lang/php/php-7.4.33-r3.ebuild similarity index 91% copy from dev-lang/php/php-8.1.20.ebuild copy to dev-lang/php/php-7.4.33-r3.ebuild index c0e72501cd78..a83e47e6d4f0 100644 --- a/dev-lang/php/php-8.1.20.ebuild +++ b/dev-lang/php/php-7.4.33-r3.ebuild @@ -1,13 +1,12 @@ # Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="8" +EAPI=8 WANT_AUTOMAKE="none" -inherit flag-o-matic multilib systemd autotools +inherit flag-o-matic systemd autotools -MY_PV=${PV/_rc/RC} DESCRIPTION="The PHP language runtime engine" HOMEPAGE="https://www.php.net/"; SRC_URI="https://www.php.net/distributions/${P}.tar.xz"; @@ -21,9 +20,7 @@ LICENSE="PHP-3.01 unicode? ( BSD-2 LGPL-2.1 )" SLOT="$(ver_cut 1-2)" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" - -S="${WORKDIR}/${PN}-${MY_PV}" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" # We can build the following SAPIs in the given order SAPIS="embed cli cgi fpm apache2 phpdbg" @@ -33,23 +30,22 @@ IUSE="${IUSE} ${SAPIS/cli/+cli} threads" -IUSE="${IUSE} acl apparmor argon2 avif bcmath berkdb bzip2 calendar - cdb cjk coverage +ctype curl debug +IUSE="${IUSE} acl argon2 bcmath berkdb bzip2 calendar cdb cjk + coverage +ctype curl debug enchant exif ffi +fileinfo +filter firebird +flatfile ftp gd gdbm gmp +iconv imap inifile - intl iodbc ipv6 +jit kerberos ldap ldap-sasl libedit lmdb + intl iodbc ipv6 +jit +json kerberos ldap ldap-sasl libedit lmdb mhash mssql mysql mysqli nls oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm readline selinux +session session-mm sharedmem +simplexml snmp soap sockets sodium spell sqlite ssl sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode webp - +xml xmlreader xmlwriter xpm xslt zip zlib" + +xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib" # Without USE=readline or libedit, the interactive "php -a" CLI will hang. # The Oracle instant client provides its own incompatible ldap library. REQUIRED_USE=" || ( cli cgi fpm apache2 embed phpdbg ) - avif? ( gd zlib ) cli? ( ^^ ( readline libedit ) ) !cli? ( ?? ( readline libedit ) ) truetype? ( gd zlib ) @@ -60,6 +56,7 @@ REQUIRED_USE=" gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) + xmlrpc? ( xml iconv ) xmlreader? ( xml ) xmlwriter? ( xml ) xslt? ( xml ) @@ -78,18 +75,18 @@ RESTRICT="!test? ( test )" # the ./configure script. Other versions *work*, but we need to stick to # the ones that can be detected to avoid a repeat of bug #564824. COMMON_DEPEND=" - >=app-eselect/eselect-php-0.9.7[apache2?,fpm?] + >=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre2-10.30[jit?,unicode] - fpm? ( acl? ( sys-apps/acl ) apparmor? ( sys-libs/libapparmor ) ) + virtual/libcrypt:= + fpm? ( acl? ( sys-apps/acl ) ) apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] ) argon2? ( app-crypt/argon2:= ) - avif? ( media-libs/libavif:= ) - berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:4.8 ) ) + berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:4.8 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) coverage? ( dev-util/lcov ) - curl? ( >=net-misc/curl-7.29.0 ) - enchant? ( app-text/enchant:2 ) + curl? ( >=net-misc/curl-7.10.5 ) + enchant? ( <app-text/enchant-2.0:0 ) ffi? ( >=dev-libs/libffi-3.0.11:= ) firebird? ( dev-db/firebird ) gd? ( media-libs/libjpeg-turbo:0= media-libs/libpng:0= ) @@ -107,7 +104,7 @@ COMMON_DEPEND=" nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient[sdk] ) odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( >=dev-db/unixODBC-1.8.13 ) ) - postgres? ( >=dev-db/postgresql-9.1:* ) + postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) session-mm? ( dev-libs/mm ) @@ -115,21 +112,19 @@ COMMON_DEPEND=" sodium? ( dev-libs/libsodium:=[-minimal] ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) - ssl? ( >=dev-libs/openssl-1.0.2:0= ) + ssl? ( >=dev-libs/openssl-1.0.1:0= <dev-libs/openssl-3.0 ) tidy? ( app-text/htmltidy ) tokyocabinet? ( dev-db/tokyocabinet ) truetype? ( =media-libs/freetype-2* ) unicode? ( dev-libs/oniguruma:= ) webp? ( media-libs/libwebp:0= ) - xml? ( >=dev-libs/libxml2-2.9.0 ) + xml? ( >=dev-libs/libxml2-2.7.6 ) xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt ) zip? ( >=dev-libs/libzip-1.2.0:= ) zlib? ( >=sys-libs/zlib-1.2.0.4:0= ) " -IDEPEND=">=app-eselect/eselect-php-0.9.7[apache2?,fpm?]" - RDEPEND="${COMMON_DEPEND} virtual/mta fpm? ( @@ -148,8 +143,12 @@ BDEPEND="virtual/pkgconfig" PHP_MV="$(ver_cut 1)" PATCHES=( - "${FILESDIR}/php-iodbc-header-location.patch" - "${FILESDIR}/php-capstone-optional.patch" + "${FILESDIR}"/php-iodbc-header-location.patch + "${FILESDIR}"/bug81656-gcc-11.patch + "${FILESDIR}"/php-7.4.33-CVE-2022-31631.patch + "${FILESDIR}"/php-7.4.33-CVE-2023-0567.patch + "${FILESDIR}"/php-7.4.33-CVE-2023-0568.patch + "${FILESDIR}"/php-7.4.33-CVE-2023-0662.patch ) php_install_ini() { @@ -225,23 +224,11 @@ src_prepare() { configure main/php_config.h.in || die eautoconf --force eautoheader - - # Remove false positive test failures - # stream_isatty fails due to portage redirects - # curl tests here fail for network sandbox issues - # session tests here fail because we set the session directory to $T - rm tests/output/stream_isatty_err.phpt \ - tests/output/stream_isatty_out-err.phpt \ - tests/output/stream_isatty_out.phpt \ - ext/curl/tests/bug76675.phpt \ - ext/curl/tests/bug77535.phpt \ - ext/curl/tests/curl_error_basic.phpt \ - ext/session/tests/bug74514.phpt \ - ext/session/tests/bug74936.phpt || die - } src_configure() { + filter-lto # bug 855644 + addpredict /usr/share/snmp/mibs/.index #nowarn addpredict /var/lib/net-snmp/mib_indexes #nowarn @@ -258,13 +245,11 @@ src_configure() { --localstatedir="${EPREFIX}/var" --without-pear --without-valgrind - $(use_enable threads zts) + $(use_enable threads maintainer-zts) ) our_conf+=( - $(use_with apparmor fpm-apparmor) $(use_with argon2 password-argon2 "${EPREFIX}/usr") - $(use_with avif) $(use_enable bcmath) $(use_with bzip2 bz2 "${EPREFIX}/usr") $(use_enable calendar) @@ -285,6 +270,7 @@ src_configure() { $(use elibc_glibc || use elibc_musl || echo "${EPREFIX}/usr")) $(use_enable intl) $(use_enable ipv6) + $(use_enable json) $(use_with kerberos) $(use_with xml libxml) $(use_enable unicode mbstring) @@ -311,6 +297,7 @@ src_configure() { $(use_enable xml) $(use_enable xmlreader) $(use_enable xmlwriter) + $(use_with xmlrpc) $(use_with xslt xsl) $(use_with zip) $(use_with zlib zlib "${EPREFIX}/usr") @@ -363,7 +350,10 @@ src_configure() { fi # MySQL support - our_conf+=( $(use_with mysqli mysqli "mysqlnd") ) + local mysqllib="mysqlnd" + local mysqlilib="mysqlnd" + + our_conf+=( $(use_with mysqli mysqli "${mysqlilib}") ) local mysqlsock="${EPREFIX}/var/run/mysqld/mysqld.sock" if use mysql || use mysqli ; then @@ -398,7 +388,7 @@ src_configure() { if use pdo ; then our_conf+=( $(use_with mssql pdo-dblib "${EPREFIX}/usr") - $(use_with mysql pdo-mysql "mysqlnd") + $(use_with mysql pdo-mysql "${mysqllib}") $(use_with postgres pdo-pgsql) $(use_with sqlite pdo-sqlite) $(use_with firebird pdo-firebird "${EPREFIX}/usr") @@ -552,7 +542,7 @@ src_install() { # We're specifically not using emake install-sapi as libtool # may cause unnecessary relink failures (see bug #351266) insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/" - newins ".libs/libphp$(get_libname)" \ + newins ".libs/libphp${PHP_MV}$(get_libname)" \ "libphp${PHP_MV}$(get_libname)" keepdir "/usr/$(get_libdir)/apache2/modules" else @@ -575,7 +565,7 @@ src_install() { source="sapi/fpm/php-fpm" ;; embed) - source="libs/libphp$(get_libname)" + source="libs/libphp${PHP_MV}$(get_libname)" ;; phpdbg) source="sapi/phpdbg/phpdbg" @@ -650,7 +640,7 @@ src_test() { export TEST_PHPDBG_EXECUTABLE="${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg" fi - SKIP_ONLINE_TESTS=1 REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n -d \ + REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n -d \ "session.save_path=${T}" \ "${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d \ "session.save_path=${T}" diff --git a/dev-lang/php/php-8.1.20.ebuild b/dev-lang/php/php-8.0.29.ebuild similarity index 97% copy from dev-lang/php/php-8.1.20.ebuild copy to dev-lang/php/php-8.0.29.ebuild index c0e72501cd78..b6ce4bcbf1b4 100644 --- a/dev-lang/php/php-8.1.20.ebuild +++ b/dev-lang/php/php-8.0.29.ebuild @@ -1,13 +1,12 @@ # Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="8" +EAPI=8 WANT_AUTOMAKE="none" -inherit flag-o-matic multilib systemd autotools +inherit flag-o-matic systemd autotools -MY_PV=${PV/_rc/RC} DESCRIPTION="The PHP language runtime engine" HOMEPAGE="https://www.php.net/"; SRC_URI="https://www.php.net/distributions/${P}.tar.xz"; @@ -21,9 +20,7 @@ LICENSE="PHP-3.01 unicode? ( BSD-2 LGPL-2.1 )" SLOT="$(ver_cut 1-2)" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" - -S="${WORKDIR}/${PN}-${MY_PV}" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" # We can build the following SAPIs in the given order SAPIS="embed cli cgi fpm apache2 phpdbg" @@ -33,8 +30,8 @@ IUSE="${IUSE} ${SAPIS/cli/+cli} threads" -IUSE="${IUSE} acl apparmor argon2 avif bcmath berkdb bzip2 calendar - cdb cjk coverage +ctype curl debug +IUSE="${IUSE} acl apparmor argon2 bcmath berkdb bzip2 calendar cdb cjk + coverage +ctype curl debug enchant exif ffi +fileinfo +filter firebird +flatfile ftp gd gdbm gmp +iconv imap inifile intl iodbc ipv6 +jit kerberos ldap ldap-sasl libedit lmdb @@ -49,7 +46,6 @@ IUSE="${IUSE} acl apparmor argon2 avif bcmath berkdb bzip2 calendar # The Oracle instant client provides its own incompatible ldap library. REQUIRED_USE=" || ( cli cgi fpm apache2 embed phpdbg ) - avif? ( gd zlib ) cli? ( ^^ ( readline libedit ) ) !cli? ( ?? ( readline libedit ) ) truetype? ( gd zlib ) @@ -80,10 +76,10 @@ RESTRICT="!test? ( test )" COMMON_DEPEND=" >=app-eselect/eselect-php-0.9.7[apache2?,fpm?] >=dev-libs/libpcre2-10.30[jit?,unicode] + virtual/libcrypt:= fpm? ( acl? ( sys-apps/acl ) apparmor? ( sys-libs/libapparmor ) ) apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] ) argon2? ( app-crypt/argon2:= ) - avif? ( media-libs/libavif:= ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:4.8 ) ) bzip2? ( app-arch/bzip2:0= ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) @@ -115,7 +111,7 @@ COMMON_DEPEND=" sodium? ( dev-libs/libsodium:=[-minimal] ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) - ssl? ( >=dev-libs/openssl-1.0.2:0= ) + ssl? ( >=dev-libs/openssl-1.0.1:0= <dev-libs/openssl-3.0 ) tidy? ( app-text/htmltidy ) tokyocabinet? ( dev-db/tokyocabinet ) truetype? ( =media-libs/freetype-2* ) @@ -128,8 +124,6 @@ COMMON_DEPEND=" zlib? ( >=sys-libs/zlib-1.2.0.4:0= ) " -IDEPEND=">=app-eselect/eselect-php-0.9.7[apache2?,fpm?]" - RDEPEND="${COMMON_DEPEND} virtual/mta fpm? ( @@ -149,7 +143,7 @@ PHP_MV="$(ver_cut 1)" PATCHES=( "${FILESDIR}/php-iodbc-header-location.patch" - "${FILESDIR}/php-capstone-optional.patch" + "${FILESDIR}/php80-firebird-warnings.patch" ) php_install_ini() { @@ -264,7 +258,6 @@ src_configure() { our_conf+=( $(use_with apparmor fpm-apparmor) $(use_with argon2 password-argon2 "${EPREFIX}/usr") - $(use_with avif) $(use_enable bcmath) $(use_with bzip2 bz2 "${EPREFIX}/usr") $(use_enable calendar) @@ -363,7 +356,10 @@ src_configure() { fi # MySQL support - our_conf+=( $(use_with mysqli mysqli "mysqlnd") ) + local mysqllib="mysqlnd" + local mysqlilib="mysqlnd" + + our_conf+=( $(use_with mysqli mysqli "${mysqlilib}") ) local mysqlsock="${EPREFIX}/var/run/mysqld/mysqld.sock" if use mysql || use mysqli ; then @@ -398,7 +394,7 @@ src_configure() { if use pdo ; then our_conf+=( $(use_with mssql pdo-dblib "${EPREFIX}/usr") - $(use_with mysql pdo-mysql "mysqlnd") + $(use_with mysql pdo-mysql "${mysqllib}") $(use_with postgres pdo-pgsql) $(use_with sqlite pdo-sqlite) $(use_with firebird pdo-firebird "${EPREFIX}/usr") diff --git a/dev-lang/php/php-8.1.20.ebuild b/dev-lang/php/php-8.1.20-r1.ebuild similarity index 99% rename from dev-lang/php/php-8.1.20.ebuild rename to dev-lang/php/php-8.1.20-r1.ebuild index c0e72501cd78..6fb08e8646fb 100644 --- a/dev-lang/php/php-8.1.20.ebuild +++ b/dev-lang/php/php-8.1.20-r1.ebuild @@ -1,13 +1,12 @@ # Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="8" +EAPI=8 WANT_AUTOMAKE="none" inherit flag-o-matic multilib systemd autotools -MY_PV=${PV/_rc/RC} DESCRIPTION="The PHP language runtime engine" HOMEPAGE="https://www.php.net/"; SRC_URI="https://www.php.net/distributions/${P}.tar.xz"; @@ -23,8 +22,6 @@ LICENSE="PHP-3.01 SLOT="$(ver_cut 1-2)" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" -S="${WORKDIR}/${PN}-${MY_PV}" - # We can build the following SAPIs in the given order SAPIS="embed cli cgi fpm apache2 phpdbg" @@ -80,6 +77,7 @@ RESTRICT="!test? ( test )" COMMON_DEPEND=" >=app-eselect/eselect-php-0.9.7[apache2?,fpm?] >=dev-libs/libpcre2-10.30[jit?,unicode] + virtual/libcrypt:= fpm? ( acl? ( sys-apps/acl ) apparmor? ( sys-libs/libapparmor ) ) apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] ) argon2? ( app-crypt/argon2:= ) diff --git a/dev-lang/php/php-8.2.7.ebuild b/dev-lang/php/php-8.2.7-r1.ebuild similarity index 99% rename from dev-lang/php/php-8.2.7.ebuild rename to dev-lang/php/php-8.2.7-r1.ebuild index 7da6cd162462..11169ef1de48 100644 --- a/dev-lang/php/php-8.2.7.ebuild +++ b/dev-lang/php/php-8.2.7-r1.ebuild @@ -1,17 +1,15 @@ # Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="8" +EAPI=8 WANT_AUTOMAKE="none" inherit flag-o-matic multilib systemd autotools -MY_PV=${PV/_rc/RC} DESCRIPTION="The PHP language runtime engine" HOMEPAGE="https://www.php.net/"; SRC_URI="https://www.php.net/distributions/${P}.tar.xz"; -#SRC_URI="https://downloads.php.net/~pierrick/php-${MY_PV}.tar.xz"; LICENSE="PHP-3.01 BSD @@ -24,8 +22,6 @@ LICENSE="PHP-3.01 SLOT="$(ver_cut 1-2)" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" -S="${WORKDIR}/${PN}-${MY_PV}" - # We can build the following SAPIs in the given order SAPIS="embed cli cgi fpm apache2 phpdbg" @@ -81,6 +77,7 @@ RESTRICT="!test? ( test )" COMMON_DEPEND=" >=app-eselect/eselect-php-0.9.7[apache2?,fpm?] >=dev-libs/libpcre2-10.30[jit?,unicode] + virtual/libcrypt:= fpm? ( acl? ( sys-apps/acl ) apparmor? ( sys-libs/libapparmor ) selinux? ( sys-libs/libselinux ) ) apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] ) argon2? ( app-crypt/argon2:= )
