diff options
Diffstat (limited to 'dev-lang/php')
| -rw-r--r-- | dev-lang/php/Manifest | 12 | ||||
| -rw-r--r-- | dev-lang/php/files/bug81656-gcc-11.patch | 53 | ||||
| -rw-r--r-- | dev-lang/php/php-7.4.27-r1.ebuild (renamed from dev-lang/php/php-8.1.1.ebuild) | 53 | ||||
| -rw-r--r-- | dev-lang/php/php-8.0.15.ebuild (renamed from dev-lang/php/php-8.0.13.ebuild) | 0 | ||||
| -rw-r--r-- | dev-lang/php/php-8.1.2.ebuild (renamed from dev-lang/php/php-8.1.0.ebuild) | 0 |
5 files changed, 79 insertions, 39 deletions
diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest index 6a089ca486b4..bd489269ca58 100644 --- a/dev-lang/php/Manifest +++ b/dev-lang/php/Manifest @@ -1,4 +1,5 @@ AUX 20php5-envd 145 BLAKE2B 06476b8fc04d1e835496b417ac752f0834ddbe8584e4fddc6db0aa5e6845b82cdea0a1355c77125375dcdd0f0a3c19de5f3a8a64ee93950f96c437a16f971567 SHA512 581aa86479e3cd584ee1bc6dc6d4a135fe8ec343fe5519566d728d81f7018cfb23658bd0c0368951d380982c75adbb4f45acf3c146868aaf4e4ec8e9f2fad1ce +AUX bug81656-gcc-11.patch 1953 BLAKE2B d682840f380693799fa1cf214d199b08862396bc795e88ac9a6ed0c0d12c6b04883301414ea5c3a2d28e204225787d546d3505322280df27105af3ce9d299139 SHA512 11e4c777538b00080cbdfb1a759064368582f894711fc1ff7828a0289d25770bc7a49c768a2a5fef2f89a04b3d9392a78ca0649dd05c67c30cb298320b115edb AUX php-fpm_at-simple.service 316 BLAKE2B 0ba10f3e3b004fbf14956e1e4f04f59b8a127e6717fe6b92c09b9f931033a11551c75fbbee9010f6b694c5a8758ca0eec9eed457ae304ba0dea8f2c256c3b8d4 SHA512 7367a3f8d3874f8e0c76f331ba613a0250db02f60ad9f87affaf448dcb5bc34bcecb91d88f415764a12b24b46ae3d1b738a002af9f77a4b707e916e83a0021fd AUX php-fpm_at.service 317 BLAKE2B f13fc38fcc0575a8517ee8d07b120efda37eabd2355061d0fdc303604c6b02ad42d7301180d86c977d5e585f5dd685343c592e37a6e0f44933707be79e0b77e0 SHA512 27982f9e2d958bfa75c89c7d3531e48d17fc388b1cdcbc8e09051b236b1184ee2baabdfcc567c19d9fcd067d4b3b86f171015616d8da42fccdabd89432d865e8 AUX php-freetype-2.9.1.patch 7667 BLAKE2B efc8f829bbad11b3e7b654d0882213ecb9aae766060d51f93446a6293a2f607339faba484c7b0b2f9318a5c5442da3c09e25aeda20dbc5e3258bf1009f8625b4 SHA512 0a06189f6fb3513cd2dcf9ddb590360475e2dd9a7aa8b13ab66c389c1ed40ce2361681f017cd3c6219f5b40a0a9d4978e57ca3ee4bacb7657db3285136fd2875 @@ -11,18 +12,17 @@ DIST php-7.4.25.tar.xz 10376304 BLAKE2B 75682840a9e978d2ce350892bb8d743238f1ca86 DIST php-7.4.26.tar.xz 10420236 BLAKE2B d4675ecf3632bb63e24d2f3cdef10c01fbf4a7a28384abc1e2eeb9ae7dc4ecfe341b95d946e182647837f4e082f0261e2ba921822ec5844b7fe833bf639197b7 SHA512 36cd493c9c95aabb1ee47e82cb0c20b2be99fe7ebd98743355139064590d0b9a1746d71e31dd47f164df34ebe3f8366a75f3efc149262e1391b43d83d3045c6e DIST php-7.4.27.tar.xz 10419380 BLAKE2B e62218f54f0455377f085499b3fa75d9d9a33c81d621ac4303cee59e70565a3cd9bfa6372ebb3492a4093eb22bf101653b6e8b3804cb8795db5d5ac2845de2f5 SHA512 2401f19d738a511c20efdf199fed7a6bdd02b51d91abf68a410f760cf846df87fce4bbf71acdf209926877cf3e8f8f39f045f1f03755862d09491f6ab6c9cfc8 DIST php-8.0.12.tar.xz 10713980 BLAKE2B ce8ca0d671e8613a81744a55cf94ff43254482a08dec365c05eb4ca22c1b31732e5ef93a51d383d2e8daf0cf332ed7946e79ba3b385386ca0773fc673fe58307 SHA512 927b15c4443f3741a5325ec7bf387987b405cd5e64e40fd81f1945bf073adda30eeede8e1f98185f505cb61f969cf1abe05b8dad57a3c4e87971e8037bb16b23 -DIST php-8.0.13.tar.xz 10854284 BLAKE2B 7f232dcfc89f0803cf1f1eff664fa9e16436d6b3c5a22c0454432a546e848a8e962057820866a85cb2af1234a0c0fa38f813c62be90526dbeab483f0e9095fd3 SHA512 cb00482b74146670c4644f4b5da63b40d9afd111e198cdf1e67bfcf4280501a657b4fbad8fd7580f4e3f537db3c8a9db5f4115d3a466392cefac9866e233fa49 DIST php-8.0.14.tar.xz 10860176 BLAKE2B e63e8e4446c1e1ee0bdf6faf38ce95a793107e582bd74677555d6f3576184af73d454111f14cd680086b11f288222d1ad5fb0e5ee38df53cd476fab6015b7fa7 SHA512 1fb96dd7e229dd71d0e872c8450e18bdefadebaf0b6b6429bd5d054be1b940cd2d53f132ba2d166d454b89374e79e4ea02d483320792e983d572df68ef769788 -DIST php-8.1.0.tar.xz 11737524 BLAKE2B 1c1bd664628343f1a0d502a009ab01cccc4cb3cb8239c1882ae1a9c1795db9cf382d5b5648cc83bc4a929a892e637324555cc59a6379118cb04f477d35cfabff SHA512 0f8667ec888dff2f1b7354ff3bd3def4130b1b7145258deb65e4529982383a90c1a7412f298d566f889b4f2c19a72d145ad150501881f8483a07fc9610c9ae49 -DIST php-8.1.1.tar.xz 11728680 BLAKE2B a9a6dd380efea7637e92707dfc3f8b0705efdfd6cb2639a69e43fa4d7ac17ba80d12086840d4b7118e8f132c1f7e1638d9df79e03190c1fd9647ffe553003980 SHA512 ab1cca08eb49fc2316f19d9e136a2d6462fe5b33967ecb671564dd9def2a765cc1b864a764c9cfbb8e7853936fb2d4939e7ed4f97220ca30eaf08c3badeb44da +DIST php-8.0.15.tar.xz 10764936 BLAKE2B f7bdc42dd3c9e9b58744dba644720fd5dfe581442f522759cd48b94a30c3fc65167f2b0e670bbbe5d5524ec3a6704e3b432e5af2dc07c6944a93adc52e527e98 SHA512 e6ac50b2e38d6d02cf84ce388826438bb7d339b54d2038ca071874b90c65f80c5c5e0c69f870edd7450d2de8f83788c8855eeb983d0d4528d44e31679caf404f +DIST php-8.1.2.tar.xz 11681132 BLAKE2B e693237b76d94cd4a50c3df68289d4c2f070c40cc52c099fd91134331377115b7e7df509e5d6cdfc7742da3ae7b27d3cbe7015acc3825b887ba0d7d690663dd4 SHA512 ec68587fc14d4e5aaa19d4a189c74b85e67b8ab4d5a15ef36115b564fc9e2f2b63bd608ea8c0e4a99615a24f38711b233f4e65b3672c3bfb69e1ab9d554a88cd EBUILD php-7.3.32.ebuild 22579 BLAKE2B 77061c8803da1468dfe09bda3a1d87e4d307980e41990f149a62306e92de66ed9a665c319b49de0f6655fa0073ca94f26de220592d197854b6d9fda9cab76e47 SHA512 9fada7c73de015edb07719368a4f02642c7b8b395d7d240459f952f75b424441c4aa6f2d088cd4632c56eeef0b44a02faf7a4f8e8ca403cd8178fc8a60ea38e4 EBUILD php-7.3.33.ebuild 22586 BLAKE2B 68c91b62746fb125ef2921100ef02549b7e9b6c7e01431b29269135dde94c8288db7af28988f9f5debeb1509c49d583fd19adbb2edde103b7de6f3b3bbd3a939 SHA512 879d25a58261d66c4b90da4447a15eb54407bec51cd71364fbd15a7c8b60b6cbb853a6af1f286bef1c15e2ba59a7fe65ece4babd69277e1322d5fab38b2fb529 EBUILD php-7.4.25.ebuild 21297 BLAKE2B b9c8400af5d83f2d366bc427690a7e454c507f41fbeb746c483a75eaa2aa7df89d7d13b71ceb14fbbc354f48cbd7b21509f8cce32f13f05504a5a802d37b1d48 SHA512 5a88de0728f8f76e1ffb16202c47e07910ec28187dfc7c8ae77e33a61838888c3aaad8e2c42c091788ccf4ec36204fd52f13f207d4485d3fe5ab423ba3e1991f EBUILD php-7.4.26.ebuild 21272 BLAKE2B 81120abe77f073de480514d21a02f48316cc2c01ba5863a9079c542cfc5a402d354d870233d2e98d4af929ebea83f8269793e76f0724c9efd175b83b66265240 SHA512 4c70d22f64134d902ad8069dfa61dcbd92d06cd1cce0ee2db6135fc0c6417de32ead2cba225c15cb4376af4ae23a7f40736a9b077d7994f617e6df72b22e9b98 +EBUILD php-7.4.27-r1.ebuild 21309 BLAKE2B 36d3cf644f0bc300f90e1635c4150a0b0da7b7a83600159bbf22178206039cffd4a7c5b02f414ced09024f137e9c70d19176de217e8ae7b1dbb0fa416746db73 SHA512 91651667c1f79fd500458d03fd5d12d61c9749a465132fa5a3c7c09653afc8dfc6efe456d16f192160effc5a4c6f7247703d93d4bfc21a73e57f02ed556503a2 EBUILD php-7.4.27.ebuild 21272 BLAKE2B 81120abe77f073de480514d21a02f48316cc2c01ba5863a9079c542cfc5a402d354d870233d2e98d4af929ebea83f8269793e76f0724c9efd175b83b66265240 SHA512 4c70d22f64134d902ad8069dfa61dcbd92d06cd1cce0ee2db6135fc0c6417de32ead2cba225c15cb4376af4ae23a7f40736a9b077d7994f617e6df72b22e9b98 EBUILD php-8.0.12.ebuild 21315 BLAKE2B c10ae3e2ce97b40a08b4ba4cc583986d545e1beffef93e5dbd95e6c657b8a99ce8551f6f115a59dc362915ef2f0a02d1abd93bc21aa2e0be3dab96a8cd72e037 SHA512 8d4b47550819953532357c82de4d60be4fbcb98484ccb8079d8258beabe000ccc01748b091344d026b5369529af919f4ead94e33dfcb83339a56214a510f9107 -EBUILD php-8.0.13.ebuild 21824 BLAKE2B b92ffb2a9de196b84614fb8622369727522d8543b141209a8d7b95344ef19a284e21a094098a73d948d9e83a82bded6ebaf6ae82ee53cfcfedb577c7be179c09 SHA512 6b5e9ba1423994a86cf864102c0fcb82a6ac364af76716cb533ce85f89308a26d80a1053860d684d7de708d19c8bd83446ee402e53ff6fed1f4fb813836a5321 EBUILD php-8.0.14.ebuild 21824 BLAKE2B b92ffb2a9de196b84614fb8622369727522d8543b141209a8d7b95344ef19a284e21a094098a73d948d9e83a82bded6ebaf6ae82ee53cfcfedb577c7be179c09 SHA512 6b5e9ba1423994a86cf864102c0fcb82a6ac364af76716cb533ce85f89308a26d80a1053860d684d7de708d19c8bd83446ee402e53ff6fed1f4fb813836a5321 -EBUILD php-8.1.0.ebuild 21837 BLAKE2B 709917a9d2745045903624ad66e74c57d55e770df24c33c3f05cce1e42fc4d6f3903fa165b6bdd829ba779ab4e160fc6f9e48b39ca76ca27a172b573057ce997 SHA512 53d028a0d79221154a890bbdadb4a08b067546710575edecea1e2e0a242511d274c24d31d8529add654908e797c193f1b752c97dd3475a15715a888186ee0f39 -EBUILD php-8.1.1.ebuild 21837 BLAKE2B 709917a9d2745045903624ad66e74c57d55e770df24c33c3f05cce1e42fc4d6f3903fa165b6bdd829ba779ab4e160fc6f9e48b39ca76ca27a172b573057ce997 SHA512 53d028a0d79221154a890bbdadb4a08b067546710575edecea1e2e0a242511d274c24d31d8529add654908e797c193f1b752c97dd3475a15715a888186ee0f39 +EBUILD php-8.0.15.ebuild 21824 BLAKE2B b92ffb2a9de196b84614fb8622369727522d8543b141209a8d7b95344ef19a284e21a094098a73d948d9e83a82bded6ebaf6ae82ee53cfcfedb577c7be179c09 SHA512 6b5e9ba1423994a86cf864102c0fcb82a6ac364af76716cb533ce85f89308a26d80a1053860d684d7de708d19c8bd83446ee402e53ff6fed1f4fb813836a5321 +EBUILD php-8.1.2.ebuild 21837 BLAKE2B 709917a9d2745045903624ad66e74c57d55e770df24c33c3f05cce1e42fc4d6f3903fa165b6bdd829ba779ab4e160fc6f9e48b39ca76ca27a172b573057ce997 SHA512 53d028a0d79221154a890bbdadb4a08b067546710575edecea1e2e0a242511d274c24d31d8529add654908e797c193f1b752c97dd3475a15715a888186ee0f39 MISC metadata.xml 3378 BLAKE2B 4ea64ce2404205f33be7d0be217ad8eeef2b82bc50700664dd89db5bd6c3aabfe2b0ab72497493bdb1214d3c30d9fdabe0e8790938aa68fd3cff8bb25249057b SHA512 21fc30b50fe9d5fdbd63c19e1bc7856bc2e7d96ff8fbd05aff4fc07bddae68cbe8dffecb1854de233031257dcd40da265463887259f95ed886dac8bc2b6cc535 diff --git a/dev-lang/php/files/bug81656-gcc-11.patch b/dev-lang/php/files/bug81656-gcc-11.patch new file mode 100644 index 000000000000..8dfe1deb2b33 --- /dev/null +++ b/dev-lang/php/files/bug81656-gcc-11.patch @@ -0,0 +1,53 @@ +From bb00a649e0c1ac57718cd9971e7e6f933cb2dadd Mon Sep 17 00:00:00 2001 +From: Michael Wallner <mike@php.net> +Date: Thu, 25 Nov 2021 07:43:14 +0100 +Subject: [PATCH] fix #81656: GCC-11 silently ignores -R + +--- + build/php.m4 | 28 ++++++++++++++-------------- + 1 file changed, 14 insertions(+), 14 deletions(-) + +diff --git a/build/php.m4 b/build/php.m4 +index 3af2b8b72d47..4697c5df9274 100644 +--- a/build/php.m4 ++++ b/build/php.m4 +@@ -279,25 +279,25 @@ dnl + dnl Checks for -R, etc. switch. + dnl + AC_DEFUN([PHP_RUNPATH_SWITCH],[ +-AC_MSG_CHECKING([if compiler supports -R]) +-AC_CACHE_VAL(php_cv_cc_dashr,[ ++AC_MSG_CHECKING([if compiler supports -Wl,-rpath,]) ++AC_CACHE_VAL(php_cv_cc_rpath,[ + SAVE_LIBS=$LIBS +- LIBS="-R /usr/$PHP_LIBDIR $LIBS" +- AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])],[php_cv_cc_dashr=yes],[php_cv_cc_dashr=no]) ++ LIBS="-Wl,-rpath,/usr/$PHP_LIBDIR $LIBS" ++ AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])],[php_cv_cc_rpath=yes],[php_cv_cc_rpath=no]) + LIBS=$SAVE_LIBS]) +-AC_MSG_RESULT([$php_cv_cc_dashr]) +-if test $php_cv_cc_dashr = "yes"; then +- ld_runpath_switch=-R ++AC_MSG_RESULT([$php_cv_cc_rpath]) ++if test $php_cv_cc_rpath = "yes"; then ++ ld_runpath_switch=-Wl,-rpath, + else +- AC_MSG_CHECKING([if compiler supports -Wl,-rpath,]) +- AC_CACHE_VAL(php_cv_cc_rpath,[ ++ AC_MSG_CHECKING([if compiler supports -R]) ++ AC_CACHE_VAL(php_cv_cc_dashr,[ + SAVE_LIBS=$LIBS +- LIBS="-Wl,-rpath,/usr/$PHP_LIBDIR $LIBS" +- AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])],[php_cv_cc_rpath=yes],[php_cv_cc_rpath=no]) ++ LIBS="-R /usr/$PHP_LIBDIR $LIBS" ++ AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])],[php_cv_cc_dashr=yes],[php_cv_cc_dashr=no]) + LIBS=$SAVE_LIBS]) +- AC_MSG_RESULT([$php_cv_cc_rpath]) +- if test $php_cv_cc_rpath = "yes"; then +- ld_runpath_switch=-Wl,-rpath, ++ AC_MSG_RESULT([$php_cv_cc_dashr]) ++ if test $php_cv_cc_dashr = "yes"; then ++ ld_runpath_switch=-R + else + dnl Something innocuous. + ld_runpath_switch=-L diff --git a/dev-lang/php/php-8.1.1.ebuild b/dev-lang/php/php-7.4.27-r1.ebuild index 423e9f806689..9925c7527525 100644 --- a/dev-lang/php/php-8.1.1.ebuild +++ b/dev-lang/php/php-7.4.27-r1.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="8" +EAPI="7" WANT_AUTOMAKE="none" @@ -33,17 +33,17 @@ IUSE="${IUSE} ${SAPIS/cli/+cli} threads" -IUSE="${IUSE} acl apparmor argon2 bcmath berkdb bzip2 calendar cdb cjk +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. @@ -59,6 +59,7 @@ REQUIRED_USE=" gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) + xmlrpc? ( xml iconv ) xmlreader? ( xml ) xmlwriter? ( xml ) xslt? ( xml ) @@ -77,17 +78,17 @@ 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 ) ) + fpm? ( acl? ( sys-apps/acl ) ) apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] ) argon2? ( app-crypt/argon2:= ) - 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? ( >=virtual/jpeg-0-r3:0 media-libs/libpng:0= ) @@ -105,7 +106,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 ) @@ -113,21 +114,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= ) 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? ( @@ -146,7 +145,8 @@ BDEPEND="virtual/pkgconfig" PHP_MV="$(ver_cut 1)" PATCHES=( - "${FILESDIR}/php-iodbc-header-location.patch" + "${FILESDIR}"/php-iodbc-header-location.patch + "${FILESDIR}"/bug81656-gcc-11.patch ) php_install_ini() { @@ -222,20 +222,6 @@ 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() { @@ -254,11 +240,10 @@ src_configure() { --with-libdir="$(get_libdir)" --localstatedir="${EPREFIX}/var" --without-pear - $(use_enable threads zts) + $(use_enable threads maintainer-zts) ) our_conf+=( - $(use_with apparmor fpm-apparmor) $(use_with argon2 password-argon2 "${EPREFIX}/usr") $(use_enable bcmath) $(use_with bzip2 bz2 "${EPREFIX}/usr") @@ -280,6 +265,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) @@ -306,6 +292,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") @@ -550,7 +537,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 @@ -573,7 +560,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" diff --git a/dev-lang/php/php-8.0.13.ebuild b/dev-lang/php/php-8.0.15.ebuild index 76be376118a8..76be376118a8 100644 --- a/dev-lang/php/php-8.0.13.ebuild +++ b/dev-lang/php/php-8.0.15.ebuild diff --git a/dev-lang/php/php-8.1.0.ebuild b/dev-lang/php/php-8.1.2.ebuild index 423e9f806689..423e9f806689 100644 --- a/dev-lang/php/php-8.1.0.ebuild +++ b/dev-lang/php/php-8.1.2.ebuild |