[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/, dev-lang/php/files/

2024-08-16 Thread Michael Orlitzky
commit: 09a4b7ed4f24d04730e19ae146317c2032c81eac
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Fri Aug 16 21:32:51 2024 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Fri Aug 16 21:34:57 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09a4b7ed

dev-lang/php: add 8.2.22, upgrade 8.3.9 -> 8.3.10

Sorry for the big test patch (again). It's been upstream for a long time
but keeps getting overlooked when cutting the releases.

Signed-off-by: Michael Orlitzky  gentoo.org>

 dev-lang/php/Manifest  |   3 +-
 ...tch => php-8.3.10-optional-png-testfixen.patch} |  28 ---
 .../php/{php-8.3.9.ebuild => php-8.2.22.ebuild}| 278 +
 .../php/{php-8.3.9.ebuild => php-8.3.10.ebuild}|   2 +-
 4 files changed, 178 insertions(+), 133 deletions(-)

diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index 0f0436a4d5b4..8bfd4776ccb2 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -1,3 +1,4 @@
 DIST php-8.1.29.tar.xz 11826292 BLAKE2B 
471f85504531c61e534c857a854de2ce9935b263e002deee19c4508390f6b2a11f89a02f55a90d660ee8d537b22a45db057e24373fb17fd2edf45f6e458f0196
 SHA512 
fd4f75224f7a4cc40b3015ae70ac57a623326a3299da9ab8bd9dfad4ea27ff345d0eb75f1407d183207e763d372d738bbd8d217d01ec1414d29a547e8ba7
 DIST php-8.2.20.tar.xz 12097568 BLAKE2B 
1e38e48ea9c28abfe2c3bd860bc5d959fbe327669c007f2e2a665ae14f5a045f6ad8a0a972f32618f88ea1ff3636c2692504478b5b094b48404d6c4a214f863b
 SHA512 
c659ed4809b6507aa428b483c85c7322815ac9d7d8e4bfe575513a5e69c5a680b8d089fd98a19f83d3a00df3de61468809f21408455913aa24d519776e44abc5
-DIST php-8.3.9.tar.xz 12470616 BLAKE2B 
44cc360c91b121f6fe1c768134d2e5e355fe1ab23ebefb98e60e878755e79b0bd31fa46a435eb5c3dabf034fb7b4bd785db014dc63f40331a6b168a14d849571
 SHA512 
f6291b71cf2c66f9effc2a8a7b0365364481cd5532551161194376893074f1f20dc7e9dbd628727e3b07460ac63b6d38bf4871bf4976e2b3b290f230b0111360
+DIST php-8.2.22.tar.xz 12099476 BLAKE2B 
8c6c664f0d48ce839971e5316b6c6619434babdf26013709589b2c5e91a63d79eddc3d716762ff1714620e7e5e35cf24f06eb270931dc6f15603e233c34728af
 SHA512 
b72df5bf8bde09571a965f512b970e2403f1c9b26fbf9efc4d1aeb5940def10e4088e5c7dbb06087b2f5206d711e34849b0726af6a81b0c3b6d9bcbd14f5172d
+DIST php-8.3.10.tar.xz 12484660 BLAKE2B 
a2cb60f83eea13aff7c907f322733a78f3d02bc334666a5350d795a84433252e0b27468f23eecc654fcfe882464da2699669bed247b7f4eaf40138bfb3773656
 SHA512 
99dc53cef802304dba455b7e1e54183e780fa21a58ec044ee5eac34d24fc9e5a1390447c18a3ef0035ef3dc531fc817016b47edab5b2e90af1233a73b59517be

diff --git a/dev-lang/php/files/php-8.3.9-optional-png-testfixen.patch 
b/dev-lang/php/files/php-8.3.10-optional-png-testfixen.patch
similarity index 97%
rename from dev-lang/php/files/php-8.3.9-optional-png-testfixen.patch
rename to dev-lang/php/files/php-8.3.10-optional-png-testfixen.patch
index 04b55b3b6b81..def26884ef2f 100644
--- a/dev-lang/php/files/php-8.3.9-optional-png-testfixen.patch
+++ b/dev-lang/php/files/php-8.3.10-optional-png-testfixen.patch
@@ -1247,31 +1247,3 @@ index 29cc89c1c56eb..a7be335ca92a6 100644
  --FILE--
  
-Date: Wed, 10 Jul 2024 08:20:31 -0400
-Subject: [PATCH 1/1] ext/gd/tests/gh10614.phpt: skip if no PNG support
-
-This test uses imagecreatefrompng(), which won't be there if libgd was
-built without PNG support.

- ext/gd/tests/gh10614.phpt | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/ext/gd/tests/gh10614.phpt b/ext/gd/tests/gh10614.phpt
-index c068914183..1b91115d74 100644
 a/ext/gd/tests/gh10614.phpt
-+++ b/ext/gd/tests/gh10614.phpt
-@@ -5,6 +5,9 @@
- --SKIPIF--
- =')) die("skip test 
requires GD 2.3.4 or older");
-+if (!(imagetypes() & IMG_PNG)) {
-+die("skip No PNG support");
-+}
- ?>
- --FILE--
- https://www.php.net/";
@@ -16,6 +16,7 @@ LICENSE="PHP-3.01
Zend-2.0
bcmath? ( LGPL-2.1+ )
fpm? ( BSD-2 )
+   gd? ( gd )
unicode? ( BSD-2 LGPL-2.1 )"
 
 SLOT="$(ver_cut 1-2)"
@@ -30,22 +31,29 @@ IUSE="${IUSE}
threads"
 
 IUSE="${IUSE} acl apparmor argon2 avif bcmath berkdb bzip2 calendar
-   capstone cdb +ctype curl debug
+   cdb cjk +ctype curl debug
enchant exif ffi +fileinfo +filter firebird
+flatfile ftp gd gdbm gmp +iconv imap inifile
-   intl iodbc ipv6 +jit jpeg kerberos ldap ldap-sasl libedit lmdb
+   intl iodbc ipv6 +jit kerberos ldap ldap-sasl libedit lmdb
mhash mssql mysql mysqli nls
-   odbc +opcache +opcache-jit pcntl pdo +phar +posix postgres png
-   qdbm readline selinux +session session-mm sharedmem
+   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
valgrind webp +xml xmlreader xmlwriter xpm xslt zip zlib"
 
 # Without USE=readline or libedit, the interactive "php -a" CLI will hang.
+# The Oracle instant client pr

[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/

2024-08-03 Thread Michael Orlitzky
commit: 69ab92d97f0cedcfda4d5b2a40b37ba28a7a54b5
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Sat Aug  3 13:50:44 2024 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Sat Aug  3 13:50:44 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69ab92d9

dev-lang/php: drop 8.1.26-r1, 8.1.28, 8.2.15, 8.2.18

Signed-off-by: Michael Orlitzky  gentoo.org>

 dev-lang/php/Manifest |   4 -
 dev-lang/php/php-8.1.26-r1.ebuild | 762 -
 dev-lang/php/php-8.1.28.ebuild| 782 --
 dev-lang/php/php-8.2.15.ebuild| 845 -
 dev-lang/php/php-8.2.18.ebuild| 863 --
 5 files changed, 3256 deletions(-)

diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index 56ca4d9663cd..0f0436a4d5b4 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -1,7 +1,3 @@
-DIST php-8.1.26.tar.xz 11809448 BLAKE2B 
e1d50f1de572580a207586b3c3b57081f7b9f1b680ffe8f9e82c88c9285af117dd7e9e2576fcb13119176cb9cd02b39481b6f40e9a1df81aa90b8c4d3e59e4b1
 SHA512 
5bc40077e57c0fccdf17810d688baea416f22ac248bb01b73d2e2590fc4cfabc7001c1c3833281a60870c74178f7b06cbc85474eba695aabf969ad0081a98417
-DIST php-8.1.28.tar.xz 11848504 BLAKE2B 
a5deb596176bcd69c33f239e752ac75e2da1538efe6d2b321802c50ea250214c6d9b59e8a5cb74f97f37c917159ef4fde4ccda4403d6e0a6fe751a19b7687472
 SHA512 
d56ecac164e00e9514cd3c6c8c453598b323118dc7d7ae7cc14ba0847d50a2e455b2391f52e0d81af325b02d8f73a7d2ed66bf66d068dac4a496d777c83a398f
 DIST php-8.1.29.tar.xz 11826292 BLAKE2B 
471f85504531c61e534c857a854de2ce9935b263e002deee19c4508390f6b2a11f89a02f55a90d660ee8d537b22a45db057e24373fb17fd2edf45f6e458f0196
 SHA512 
fd4f75224f7a4cc40b3015ae70ac57a623326a3299da9ab8bd9dfad4ea27ff345d0eb75f1407d183207e763d372d738bbd8d217d01ec1414d29a547e8ba7
-DIST php-8.2.15.tar.xz 12075384 BLAKE2B 
cef15868968538e232093bd66d862a88f0960325f2274eaf53a3d114d01787c58844aa3bce8bc09a723acd95801e1935a60e79fc189317e7f1ba19196dbfcdc4
 SHA512 
56c94bcafe07cf4bf5eb5fc6c67fcf16654c44a262ffb18188fc3ffac5e9bb11d39093bfb26c26bc8d2dec7e530d1a175180909262c9b5c30130cf5a4a293166
-DIST php-8.2.18.tar.xz 12089400 BLAKE2B 
82a4ef0aee7fa66018cb528e6fc2da40f67be2a75449ed85c54881e6725cfa9fe82d6d5655c12d2e92f3fd685479367b7c038df5af0d7a0a122d627c78c50514
 SHA512 
8bdd6e5aa19dac80745d258a43f7330a3096d47dc66cbef0054b8f9eb9ace5e87d841a4001185a783241a416975753c922425e977f50b2716ce643b6a7bf351f
 DIST php-8.2.20.tar.xz 12097568 BLAKE2B 
1e38e48ea9c28abfe2c3bd860bc5d959fbe327669c007f2e2a665ae14f5a045f6ad8a0a972f32618f88ea1ff3636c2692504478b5b094b48404d6c4a214f863b
 SHA512 
c659ed4809b6507aa428b483c85c7322815ac9d7d8e4bfe575513a5e69c5a680b8d089fd98a19f83d3a00df3de61468809f21408455913aa24d519776e44abc5
 DIST php-8.3.9.tar.xz 12470616 BLAKE2B 
44cc360c91b121f6fe1c768134d2e5e355fe1ab23ebefb98e60e878755e79b0bd31fa46a435eb5c3dabf034fb7b4bd785db014dc63f40331a6b168a14d849571
 SHA512 
f6291b71cf2c66f9effc2a8a7b0365364481cd5532551161194376893074f1f20dc7e9dbd628727e3b07460ac63b6d38bf4871bf4976e2b3b290f230b0111360

diff --git a/dev-lang/php/php-8.1.26-r1.ebuild 
b/dev-lang/php/php-8.1.26-r1.ebuild
deleted file mode 100644
index 4b24fb08bbe5..
--- a/dev-lang/php/php-8.1.26-r1.ebuild
+++ /dev/null
@@ -1,762 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-WANT_AUTOMAKE="none"
-
-inherit flag-o-matic multilib systemd autotools
-
-DESCRIPTION="The PHP language runtime engine"
-HOMEPAGE="https://www.php.net/";
-SRC_URI="https://www.php.net/distributions/${P}.tar.xz";
-
-LICENSE="PHP-3.01
-   BSD
-   Zend-2.0
-   bcmath? ( LGPL-2.1+ )
-   fpm? ( BSD-2 )
-   gd? ( gd )
-   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"
-
-# We can build the following SAPIs in the given order
-SAPIS="embed cli cgi fpm apache2 phpdbg"
-
-# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
-IUSE="${IUSE}
-   ${SAPIS/cli/+cli}
-   threads"
-
-IUSE="${IUSE} acl apparmor argon2 avif 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
-   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"
-
-# Without USE=readline or libedit, the interactive "php -a" CLI will hang.
-# The Oracle instant client provides its own incompati

[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/

2024-08-03 Thread Michael Orlitzky
commit: 47df9d4503c509646b303484ac935773abab36c2
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Sat Aug  3 13:04:27 2024 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Sat Aug  3 13:48:44 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47df9d45

dev-lang/php: delete a faily test

The upstream fix for this issue wasn't backported. There's no problem.

Closes: https://bugs.gentoo.org/937231
Signed-off-by: Michael Orlitzky  gentoo.org>

 dev-lang/php/php-8.2.20.ebuild | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/dev-lang/php/php-8.2.20.ebuild b/dev-lang/php/php-8.2.20.ebuild
index f4a2e43fcdb1..115df248ab4e 100644
--- a/dev-lang/php/php-8.2.20.ebuild
+++ b/dev-lang/php/php-8.2.20.ebuild
@@ -354,6 +354,9 @@ src_prepare() {
# - https://github.com/php/php-src/issues/14786
#
rm ext/dba/tests/dba_gdbm.phpt || die
+
+   # https://github.com/php/php-src/pull/14439
+   rm ext/openssl/tests/bug74341.phpt || die
 }
 
 src_configure() {



[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/files/, dev-lang/php/

2024-07-10 Thread Michael Orlitzky
commit: 0771e0a34345350b76153a1d4826dbec82e0dbea
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Tue Jul  9 19:16:23 2024 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Wed Jul 10 14:07:08 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0771e0a3

dev-lang/php: add 8.3.9, drop 8.3.8

Various improvements on top of the version bump:

  * The system copy of media-libs/gd is now used.
  * Autoconf cache variables are overridden to allow
cross-compiles with external libraries.
  * New USE=opcache-jit flag to control the use of a
JIT within the opcache extension.

Closes: https://bugs.gentoo.org/857597
Closes: https://bugs.gentoo.org/906585
Bug: https://bugs.gentoo.org/931884
Signed-off-by: Michael Orlitzky  gentoo.org>

 dev-lang/php/Manifest  |2 +-
 dev-lang/php/files/php-8.3.9-gd-cachevars.patch|   68 ++
 .../files/php-8.3.9-optional-png-testfixen.patch   | 1277 
 dev-lang/php/metadata.xml  |3 +
 .../php/{php-8.3.8.ebuild => php-8.3.9.ebuild} |   89 +-
 5 files changed, 1406 insertions(+), 33 deletions(-)

diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index d558144544a8..56ca4d9663cd 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -4,4 +4,4 @@ DIST php-8.1.29.tar.xz 11826292 BLAKE2B 
471f85504531c61e534c857a854de2ce9935b263
 DIST php-8.2.15.tar.xz 12075384 BLAKE2B 
cef15868968538e232093bd66d862a88f0960325f2274eaf53a3d114d01787c58844aa3bce8bc09a723acd95801e1935a60e79fc189317e7f1ba19196dbfcdc4
 SHA512 
56c94bcafe07cf4bf5eb5fc6c67fcf16654c44a262ffb18188fc3ffac5e9bb11d39093bfb26c26bc8d2dec7e530d1a175180909262c9b5c30130cf5a4a293166
 DIST php-8.2.18.tar.xz 12089400 BLAKE2B 
82a4ef0aee7fa66018cb528e6fc2da40f67be2a75449ed85c54881e6725cfa9fe82d6d5655c12d2e92f3fd685479367b7c038df5af0d7a0a122d627c78c50514
 SHA512 
8bdd6e5aa19dac80745d258a43f7330a3096d47dc66cbef0054b8f9eb9ace5e87d841a4001185a783241a416975753c922425e977f50b2716ce643b6a7bf351f
 DIST php-8.2.20.tar.xz 12097568 BLAKE2B 
1e38e48ea9c28abfe2c3bd860bc5d959fbe327669c007f2e2a665ae14f5a045f6ad8a0a972f32618f88ea1ff3636c2692504478b5b094b48404d6c4a214f863b
 SHA512 
c659ed4809b6507aa428b483c85c7322815ac9d7d8e4bfe575513a5e69c5a680b8d089fd98a19f83d3a00df3de61468809f21408455913aa24d519776e44abc5
-DIST php-8.3.8.tar.xz 12480896 BLAKE2B 
477129fcd766f2235e3d776c923ba51b76539f074245e8041a861db09ebbc648658b2756e6a23051a75a512fdc6e5c129633d1471213dec6f7e24d4da0d317e8
 SHA512 
1a2840f0b5dcbea6dfcc3894cb9e38d103bf4110c1b956438199deee0b60e5ae63cce34be25ca6f03ac8d26581a852657f8800f92fefe38345e20443b646bb3e
+DIST php-8.3.9.tar.xz 12470616 BLAKE2B 
44cc360c91b121f6fe1c768134d2e5e355fe1ab23ebefb98e60e878755e79b0bd31fa46a435eb5c3dabf034fb7b4bd785db014dc63f40331a6b168a14d849571
 SHA512 
f6291b71cf2c66f9effc2a8a7b0365364481cd5532551161194376893074f1f20dc7e9dbd628727e3b07460ac63b6d38bf4871bf4976e2b3b290f230b0111360

diff --git a/dev-lang/php/files/php-8.3.9-gd-cachevars.patch 
b/dev-lang/php/files/php-8.3.9-gd-cachevars.patch
new file mode 100644
index ..cb6ae9f3479d
--- /dev/null
+++ b/dev-lang/php/files/php-8.3.9-gd-cachevars.patch
@@ -0,0 +1,68 @@
+From b5e5a42d145be30be3856ff4be9af7978adec5c5 Mon Sep 17 00:00:00 2001
+From: Peter Kokot 
+Date: Sun, 2 Jun 2024 19:47:39 +0200
+Subject: [PATCH] Wrap gdImageCreateFrom* checks in AC_CACHE_CHECK
+
+This enables cross-compiling edge cases to manually override the checks
+with the php_cv_lib_gd_gdImageCreateFrom* cache variables.
+---
+ ext/gd/config.m4 | 39 ---
+ 1 file changed, 20 insertions(+), 19 deletions(-)
+
+diff --git a/ext/gd/config.m4 b/ext/gd/config.m4
+index d9c6d4f6ee0c2..5c1c7a867c2f8 100644
+--- a/ext/gd/config.m4
 b/ext/gd/config.m4
+@@ -147,14 +147,15 @@ dnl that gd defines "junk" versions of each 
gdImageCreateFromFoo function
+ dnl even when it does not support the Foo format. Those junk functions
+ dnl display a warning but eventually return normally, making a simple link
+ dnl or run test insufficient.
+-AC_DEFUN([PHP_GD_CHECK_FORMAT],[
+-  old_LIBS="${LIBS}"
+-  LIBS="${LIBS} ${GD_SHARED_LIBADD}"
+-  old_CFLAGS="${CFLAGS}"
+-  CFLAGS="${CFLAGS} ${GDLIB_CFLAGS}"
+-  AC_MSG_CHECKING([for working gdImageCreateFrom$1 in libgd])
+-  AC_LANG_PUSH([C])
+-  AC_RUN_IFELSE([AC_LANG_SOURCE([
++AC_DEFUN([PHP_GD_CHECK_FORMAT],
++[AS_VAR_PUSHDEF([php_var], [php_cv_lib_gd_gdImageCreateFrom$1])
++old_LIBS="${LIBS}"
++LIBS="${LIBS} ${GD_SHARED_LIBADD}"
++old_CFLAGS="${CFLAGS}"
++CFLAGS="${CFLAGS} ${GDLIB_CFLAGS}"
++AC_LANG_PUSH([C])
++AC_CACHE_CHECK([for working gdImageCreateFrom$1 in libgd], [php_var],
++  [AC_RUN_IFELSE([AC_LANG_SOURCE([
+ #include 
+ #include 
+ #include 
+@@ -173,17 +174,17 @@ int main(int argc, char** argv) {
+   gdSetErrorMethod(exit1);
+   gdImagePtr p = gdImageCreateFrom$1(f);
+   return 0;
+-}])],[
+-AC_MSG_RESULT([yes])
+-AC_DEFINE($2, 1, [Does gdImageCreateFrom$1 work?])
+

[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/, dev-lang/php/files/

2024-07-05 Thread Michael Orlitzky
commit: 0114511477c2c09faa967081345798482f041eea
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Fri Jul  5 22:18:15 2024 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Sat Jul  6 00:44:36 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01145114

dev-lang/php: backport implicit printf patch to 8.2.x

Closes: https://bugs.gentoo.org/935451
Signed-off-by: Michael Orlitzky  gentoo.org>

 .../php/files/php-8.2.20-implicit-printf.patch | 65 ++
 dev-lang/php/php-8.2.20.ebuild |  1 +
 2 files changed, 66 insertions(+)

diff --git a/dev-lang/php/files/php-8.2.20-implicit-printf.patch 
b/dev-lang/php/files/php-8.2.20-implicit-printf.patch
new file mode 100644
index ..6c0bdb57a35d
--- /dev/null
+++ b/dev-lang/php/files/php-8.2.20-implicit-printf.patch
@@ -0,0 +1,65 @@
+commit 88b30e08cc434ec82cae7881d360bd83fac733a2
+Author: Michael Orlitzky 
+Date:   Fri Mar 3 12:28:37 2023 -0500
+
+ext/iconv/config.m4: add missing stdio.h include.
+
+The next generation of C compilers is going to enforce the C standard
+more strictly:
+
+  https://wiki.gentoo.org/wiki/Modern_C_porting
+
+One warning that will eventually become an error is
+-Wimplicit-function-declaration. This is relatively easy to catch in
+most code (it will fail to compile), but inside of autoconf tests it
+can go unnoticed because many feature-test compilations fail by
+design. For example,
+
+  AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include ]],
+ [[iconv_ccs_init(NULL, NULL);]])]...
+
+is designed to fail if iconv_ccs_init() is not in iconv.h. On the
+other hand,
+
+  AC_RUN_IFELSE([AC_LANG_SOURCE([[
+  #include 
+  int main() {
+printf("%d", _libiconv_version);
+return 0;
+  }
+
+should pass if _libiconv_version is defined. If the user has
+-Werror=implicit-function-declaration in his CFLAGS, however,
+it will not:
+
+  $ export CFLAGS="$CFLAGS -Werror=implicit-function-declaration"
+  $ ./configure
+  ...
+  checking if using GNU libiconv... no
+
+This is because the stdio.h header that defines printf() is missing:
+
+  conftest.c:240:3: error: implicit declaration of function 'printf'
+  [-Werror=implicit-function-declaration]
+240 |   printf("%d", _libiconv_version);
+|   ^~
+  conftest.c:239:1: note: include '' or provide a declaration
+  of 'printf'
+
+This commit adds the include, correcting the test with any compiler
+that balks at implicit function definitions.
+
+Closes GH-10751
+
+diff --git a/ext/iconv/config.m4 b/ext/iconv/config.m4
+index 5d408de833..3cf400fe96 100644
+--- a/ext/iconv/config.m4
 b/ext/iconv/config.m4
+@@ -30,6 +30,7 @@ if test "$PHP_ICONV" != "no"; then
+   AC_MSG_CHECKING([if using GNU libiconv])
+   AC_RUN_IFELSE([AC_LANG_SOURCE([[
+ #include 
++#include 
+ int main(void) {
+   printf("%d", _libiconv_version);
+   return 0;

diff --git a/dev-lang/php/php-8.2.20.ebuild b/dev-lang/php/php-8.2.20.ebuild
index 995563df3dfc..f4a2e43fcdb1 100644
--- a/dev-lang/php/php-8.2.20.ebuild
+++ b/dev-lang/php/php-8.2.20.ebuild
@@ -150,6 +150,7 @@ PATCHES=(
"${FILESDIR}/php-iodbc-header-location.patch"
"${FILESDIR}/php-capstone-optional.patch"
"${FILESDIR}/php-8.2.8-openssl-tests.patch"
+   "${FILESDIR}/php-8.2.20-implicit-printf.patch"
 )
 
 # ARM/Windows functions (bug 923335)



[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/

2024-07-04 Thread Michael Orlitzky
commit: 7d9685b45a751c82699682644d5a5203ce983888
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Thu Jul  4 13:05:42 2024 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Thu Jul  4 16:38:27 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d9685b4

dev-lang/php: temporarily(?) disable a few tests

Disable three failing tests that are being worked on upstream but will
take a while to hit an official release.

Closes: https://bugs.gentoo.org/935379
Closes: https://bugs.gentoo.org/935382
Signed-off-by: Michael Orlitzky  gentoo.org>

 dev-lang/php/php-8.2.20.ebuild | 15 +++
 dev-lang/php/php-8.3.8.ebuild  | 15 +++
 2 files changed, 30 insertions(+)

diff --git a/dev-lang/php/php-8.2.20.ebuild b/dev-lang/php/php-8.2.20.ebuild
index d21e14874745..19bba50ac3f5 100644
--- a/dev-lang/php/php-8.2.20.ebuild
+++ b/dev-lang/php/php-8.2.20.ebuild
@@ -338,6 +338,21 @@ src_prepare() {
#   https://github.com/php/php-src/issues/14368
#
rm ext/session/tests/gh13856.phpt || die
+
+   # Bug 935382, fixed eventually by
+   #
+   # - https://github.com/php/php-src/pull/14788
+   # - https://github.com/php/php-src/pull/14814
+   #
+   rm ext/standard/tests/strings/chunk_split_variation1_32bit.phpt || die
+   rm ext/standard/tests/strings/wordwrap_memory_limit.phpt || die
+
+   # Bug 935379, not yet fixed upstream but looks harmless (ordering
+   # of keys isn't guaranteed AFAICS):
+   #
+   # - https://github.com/php/php-src/issues/14786
+   #
+   rm ext/dba/tests/dba_gdbm.phpt || die
 }
 
 src_configure() {

diff --git a/dev-lang/php/php-8.3.8.ebuild b/dev-lang/php/php-8.3.8.ebuild
index 607ae090b3e6..8ea0dd1af24f 100644
--- a/dev-lang/php/php-8.3.8.ebuild
+++ b/dev-lang/php/php-8.3.8.ebuild
@@ -260,6 +260,21 @@ src_prepare() {
#   https://github.com/php/php-src/issues/14368
#
rm ext/session/tests/gh13856.phpt || die
+
+   # Bug 935382, fixed eventually by
+   #
+   # - https://github.com/php/php-src/pull/14788
+   # - https://github.com/php/php-src/pull/14814
+   #
+   rm ext/standard/tests/strings/chunk_split_variation1_32bit.phpt || die
+   rm ext/standard/tests/strings/wordwrap_memory_limit.phpt || die
+
+   # Bug 935379, not yet fixed upstream but looks harmless (ordering
+   # of keys isn't guaranteed AFAICS):
+   #
+   # - https://github.com/php/php-src/issues/14786
+   #
+   rm ext/dba/tests/dba_gdbm.phpt || die
 }
 
 src_configure() {



[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/

2024-06-11 Thread Arthur Zamarin
commit: f589864d96d6c811b62b8aeef505be989b33ecd1
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Wed Jun 12 05:37:53 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Wed Jun 12 05:37:53 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f589864d

dev-lang/php: Stabilize 8.2.20 ppc64, #933753

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-lang/php/php-8.2.20.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-lang/php/php-8.2.20.ebuild b/dev-lang/php/php-8.2.20.ebuild
index 772982bd7c3e..b41df824151a 100644
--- a/dev-lang/php/php-8.2.20.ebuild
+++ b/dev-lang/php/php-8.2.20.ebuild
@@ -20,7 +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"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~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"



[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/

2024-06-11 Thread Arthur Zamarin
commit: 2ce206d9ed93e58209c7904352f8f08572c7dbce
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Wed Jun 12 05:37:52 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Wed Jun 12 05:37:52 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ce206d9

dev-lang/php: Stabilize 8.1.29 ppc64, #933753

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-lang/php/php-8.1.29.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-lang/php/php-8.1.29.ebuild b/dev-lang/php/php-8.1.29.ebuild
index 64589a10d000..40dff326628c 100644
--- a/dev-lang/php/php-8.1.29.ebuild
+++ b/dev-lang/php/php-8.1.29.ebuild
@@ -20,7 +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"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~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"



[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/

2024-06-07 Thread Arthur Zamarin
commit: 3bbc30d5c1ca507f3f6b2bed20211d7b837dc19a
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Jun  7 17:46:33 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Jun  7 17:46:33 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3bbc30d5

dev-lang/php: Stabilize 8.2.20 arm, #933753

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-lang/php/php-8.2.20.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-lang/php/php-8.2.20.ebuild b/dev-lang/php/php-8.2.20.ebuild
index 1979464f2d5e..6ceb2fbdc0aa 100644
--- a/dev-lang/php/php-8.2.20.ebuild
+++ b/dev-lang/php/php-8.2.20.ebuild
@@ -20,7 +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"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~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"



[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/

2024-06-07 Thread Arthur Zamarin
commit: 66d1573c280790f613b4eef3e7a5f87504d3354e
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Jun  7 17:46:33 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Jun  7 17:46:33 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66d1573c

dev-lang/php: Stabilize 8.1.29 arm, #933753

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-lang/php/php-8.1.29.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-lang/php/php-8.1.29.ebuild b/dev-lang/php/php-8.1.29.ebuild
index f434f0df4366..95c0924610d5 100644
--- a/dev-lang/php/php-8.1.29.ebuild
+++ b/dev-lang/php/php-8.1.29.ebuild
@@ -20,7 +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"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~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"



[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/

2024-06-07 Thread Arthur Zamarin
commit: 3d0557b872e11382e0ad2ac9cfaad9a0292a2ad0
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Jun  7 17:46:34 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Jun  7 17:46:34 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d0557b8

dev-lang/php: Stabilize 8.1.29 arm64, #933753

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-lang/php/php-8.1.29.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-lang/php/php-8.1.29.ebuild b/dev-lang/php/php-8.1.29.ebuild
index 95c0924610d5..64589a10d000 100644
--- a/dev-lang/php/php-8.1.29.ebuild
+++ b/dev-lang/php/php-8.1.29.ebuild
@@ -20,7 +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"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~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"



[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/

2024-06-07 Thread Arthur Zamarin
commit: 241683ea5d5a20967c47a17d8ead3f79ddcfd0fa
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Jun  7 17:46:35 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Jun  7 17:46:35 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=241683ea

dev-lang/php: Stabilize 8.2.20 arm64, #933753

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-lang/php/php-8.2.20.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-lang/php/php-8.2.20.ebuild b/dev-lang/php/php-8.2.20.ebuild
index 6ceb2fbdc0aa..772982bd7c3e 100644
--- a/dev-lang/php/php-8.2.20.ebuild
+++ b/dev-lang/php/php-8.2.20.ebuild
@@ -20,7 +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"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~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"



[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/

2024-06-07 Thread Michael Orlitzky
commit: 9d0884c2742132467dce76b72e445ad62c14488d
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Fri Jun  7 14:37:10 2024 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Fri Jun  7 14:37:10 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d0884c2

dev-lang/php: new security releases for all three series

CVE-2024-4577, CVE-2024-5458, CVE-2024-5585, etc. Better to just read
the ChangeLog:

  https://www.php.net/ChangeLog-8.php

Signed-off-by: Michael Orlitzky  gentoo.org>

 dev-lang/php/Manifest  |   5 +-
 .../php/{php-8.2.19.ebuild => php-8.1.29.ebuild}   | 237 +++--
 .../php/{php-8.2.19.ebuild => php-8.2.20.ebuild}   |   0
 .../php/{php-8.3.7-r1.ebuild => php-8.3.8.ebuild}  |   0
 4 files changed, 78 insertions(+), 164 deletions(-)

diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index fc7eef5537a2..d558144544a8 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -1,6 +1,7 @@
 DIST php-8.1.26.tar.xz 11809448 BLAKE2B 
e1d50f1de572580a207586b3c3b57081f7b9f1b680ffe8f9e82c88c9285af117dd7e9e2576fcb13119176cb9cd02b39481b6f40e9a1df81aa90b8c4d3e59e4b1
 SHA512 
5bc40077e57c0fccdf17810d688baea416f22ac248bb01b73d2e2590fc4cfabc7001c1c3833281a60870c74178f7b06cbc85474eba695aabf969ad0081a98417
 DIST php-8.1.28.tar.xz 11848504 BLAKE2B 
a5deb596176bcd69c33f239e752ac75e2da1538efe6d2b321802c50ea250214c6d9b59e8a5cb74f97f37c917159ef4fde4ccda4403d6e0a6fe751a19b7687472
 SHA512 
d56ecac164e00e9514cd3c6c8c453598b323118dc7d7ae7cc14ba0847d50a2e455b2391f52e0d81af325b02d8f73a7d2ed66bf66d068dac4a496d777c83a398f
+DIST php-8.1.29.tar.xz 11826292 BLAKE2B 
471f85504531c61e534c857a854de2ce9935b263e002deee19c4508390f6b2a11f89a02f55a90d660ee8d537b22a45db057e24373fb17fd2edf45f6e458f0196
 SHA512 
fd4f75224f7a4cc40b3015ae70ac57a623326a3299da9ab8bd9dfad4ea27ff345d0eb75f1407d183207e763d372d738bbd8d217d01ec1414d29a547e8ba7
 DIST php-8.2.15.tar.xz 12075384 BLAKE2B 
cef15868968538e232093bd66d862a88f0960325f2274eaf53a3d114d01787c58844aa3bce8bc09a723acd95801e1935a60e79fc189317e7f1ba19196dbfcdc4
 SHA512 
56c94bcafe07cf4bf5eb5fc6c67fcf16654c44a262ffb18188fc3ffac5e9bb11d39093bfb26c26bc8d2dec7e530d1a175180909262c9b5c30130cf5a4a293166
 DIST php-8.2.18.tar.xz 12089400 BLAKE2B 
82a4ef0aee7fa66018cb528e6fc2da40f67be2a75449ed85c54881e6725cfa9fe82d6d5655c12d2e92f3fd685479367b7c038df5af0d7a0a122d627c78c50514
 SHA512 
8bdd6e5aa19dac80745d258a43f7330a3096d47dc66cbef0054b8f9eb9ace5e87d841a4001185a783241a416975753c922425e977f50b2716ce643b6a7bf351f
-DIST php-8.2.19.tar.xz 12094184 BLAKE2B 
ef599fc9faba7137eccd1ad48157ece57f5449c7afbb406e5a3dcda6ae95ef37fe3ffb4e6c60f9d113be144a7ef5305f8c772c7b550c733a0df2a1f51e8c5f0a
 SHA512 
5ba7ab4317f7880a6cea93bf6d3a48d62db6bfcb5682be7e13a6a6f7bd1fef96ca813c2cf95f6b5020756f03b298995d1722367adb2580c1db221a2f9e311038
-DIST php-8.3.7.tar.xz 12456020 BLAKE2B 
065b49fbfcf543a14dfbf1bef1b710f241f8a36df9c45518d5ba786ef9c0c0fa0a495974cc69b2d8369e5398844e299d5b6ca2a3d246be9b5ff7edc9fdb2dc85
 SHA512 
ff2c16a5cc08b1a59a61eee9df75c4c9a6dda7054d48198b75d104c194e934109fed3665005ba798eeca3d7294d7dc81df3a14e63a527baf9f196e229068d9a3
+DIST php-8.2.20.tar.xz 12097568 BLAKE2B 
1e38e48ea9c28abfe2c3bd860bc5d959fbe327669c007f2e2a665ae14f5a045f6ad8a0a972f32618f88ea1ff3636c2692504478b5b094b48404d6c4a214f863b
 SHA512 
c659ed4809b6507aa428b483c85c7322815ac9d7d8e4bfe575513a5e69c5a680b8d089fd98a19f83d3a00df3de61468809f21408455913aa24d519776e44abc5
+DIST php-8.3.8.tar.xz 12480896 BLAKE2B 
477129fcd766f2235e3d776c923ba51b76539f074245e8041a861db09ebbc648658b2756e6a23051a75a512fdc6e5c129633d1471213dec6f7e24d4da0d317e8
 SHA512 
1a2840f0b5dcbea6dfcc3894cb9e38d103bf4110c1b956438199deee0b60e5ae63cce34be25ca6f03ac8d26581a852657f8800f92fefe38345e20443b646bb3e

diff --git a/dev-lang/php/php-8.2.19.ebuild b/dev-lang/php/php-8.1.29.ebuild
similarity index 77%
copy from dev-lang/php/php-8.2.19.ebuild
copy to dev-lang/php/php-8.1.29.ebuild
index 1979464f2d5e..f434f0df4366 100644
--- a/dev-lang/php/php-8.2.19.ebuild
+++ b/dev-lang/php/php-8.1.29.ebuild
@@ -31,7 +31,7 @@ IUSE="${IUSE}
threads"
 
 IUSE="${IUSE} acl apparmor argon2 avif bcmath berkdb bzip2 calendar
-   cdb cjk +ctype curl debug
+   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
@@ -39,8 +39,8 @@ IUSE="${IUSE} acl apparmor argon2 avif bcmath berkdb bzip2 
calendar
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
-   valgrind webp +xml xmlreader xmlwriter xpm xslt zip zlib"
+   sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode webp
+   +xml xmlreader xmlwriter xpm xslt zi

[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/

2024-06-04 Thread Michael Orlitzky
commit: a471f99343590c267a67ef6c973b5e3d51938921
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Tue Jun  4 18:18:18 2024 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Tue Jun  4 19:09:11 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a471f993

dev-lang/php: avoid the iodbc patch

The patch _is_ simpler, but with enough hacks, we can convince the build
system to use the right paths without patching.

Signed-off-by: Michael Orlitzky  gentoo.org>

 dev-lang/php/php-8.3.7.ebuild | 18 +-
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/dev-lang/php/php-8.3.7.ebuild b/dev-lang/php/php-8.3.7.ebuild
index 1ccb66ce8a52..8bb61d05fe7b 100644
--- a/dev-lang/php/php-8.3.7.ebuild
+++ b/dev-lang/php/php-8.3.7.ebuild
@@ -144,10 +144,6 @@ BDEPEND="virtual/pkgconfig"
 
 PHP_MV="$(ver_cut 1)"
 
-PATCHES=(
-   "${FILESDIR}/php-iodbc-header-location.patch"
-)
-
 # ARM/Windows functions (bug 923335)
 QA_CONFIG_IMPL_DECL_SKIP=(
__crc32d
@@ -418,10 +414,22 @@ src_configure() {
 
# ODBC support
if use odbc && use iodbc ; then
+   # Obtain the correct -l and -I flags for the actual build from
+   # pkg-config. We use the "generic" library type to avoid the
+   # (wrong) hard-coded include dir for iodbc.
+   #
+   # We set the pdo_odbc_def_incdir variable because the
+   # ./configure script checks for the headers using "test -f" and
+   # ignores your CFLAGS... and pdo_odbc_def_libdir prevents the
+   # build system from appending a nonsense -L flag.
+   local iodbc_ldflags=$(pkg-config --libs libiodbc)
+   local iodbc_cflags=$(pkg-config --cflags libiodbc)
our_conf+=(
+   pdo_odbc_def_libdir="${EPREFIX}/usr/$(get_libdir)"
+   pdo_odbc_def_incdir="${EPREFIX}/usr/include/iodbc"
--without-unixODBC
--with-iodbc
-   $(use_with pdo pdo-odbc "iODBC,${EPREFIX}/usr")
+   $(use_with pdo pdo-odbc 
"generic,,iodbc,${iodbc_ldlags},${iodbc_cflags}")
)
elif use odbc ; then
our_conf+=(



[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/

2024-06-04 Thread Michael Orlitzky
commit: 118eabf595a6f71f38babc0faf7bc9ea40ab928c
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Tue Jun  4 18:40:35 2024 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Tue Jun  4 19:09:12 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=118eabf5

dev-lang/php: drop autotools.eclass

There's a comment in the ebuild about using eautoreconf to support
cross-compilation, but I don't think that should have been necessary in
the first place. Or at least, it shouldn't be necessary now. Aside from
that, the remaining autotools patches (requiring eautoreconf) have been
dropped. Maybe we can do without, to speed up the build and simplify the
ebuild a bit?

Signed-off-by: Michael Orlitzky  gentoo.org>

 dev-lang/php/{php-8.3.7.ebuild => php-8.3.7-r1.ebuild} | 8 +---
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/dev-lang/php/php-8.3.7.ebuild b/dev-lang/php/php-8.3.7-r1.ebuild
similarity index 99%
rename from dev-lang/php/php-8.3.7.ebuild
rename to dev-lang/php/php-8.3.7-r1.ebuild
index 8bb61d05fe7b..607ae090b3e6 100644
--- a/dev-lang/php/php-8.3.7.ebuild
+++ b/dev-lang/php/php-8.3.7-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 WANT_AUTOMAKE="none"
 
-inherit flag-o-matic multilib systemd autotools
+inherit flag-o-matic multilib systemd
 
 DESCRIPTION="The PHP language runtime engine"
 HOMEPAGE="https://www.php.net/";
@@ -224,12 +224,6 @@ src_prepare() {
sapi/fpm/php-fpm.conf.in \
|| die 'failed to move the include directory in php-fpm.conf'
 
-   # Emulate buildconf to support cross-compilation
-   rm -fr aclocal.m4 autom4te.cache config.cache \
-   configure main/php_config.h.in || die
-   eautoconf --force
-   eautoheader
-
# fails in a network sandbox,
#
#   https://github.com/php/php-src/issues/11662



[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/

2024-05-30 Thread Michael Orlitzky
commit: de522d159c5258b2e98c51f5b6a25027e959cf26
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Wed May 29 14:59:46 2024 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Thu May 30 15:06:06 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de522d15

dev-lang/php: add 8.3.7, drop 8.3.6

Signed-off-by: Michael Orlitzky  gentoo.org>

 dev-lang/php/Manifest  |  2 +-
 .../php/{php-8.3.6.ebuild => php-8.3.7.ebuild} | 26 +++---
 2 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index 29a8ddbafa8c..7283964d8535 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -2,4 +2,4 @@ DIST php-8.1.26.tar.xz 11809448 BLAKE2B 
e1d50f1de572580a207586b3c3b57081f7b9f1b6
 DIST php-8.1.28.tar.xz 11848504 BLAKE2B 
a5deb596176bcd69c33f239e752ac75e2da1538efe6d2b321802c50ea250214c6d9b59e8a5cb74f97f37c917159ef4fde4ccda4403d6e0a6fe751a19b7687472
 SHA512 
d56ecac164e00e9514cd3c6c8c453598b323118dc7d7ae7cc14ba0847d50a2e455b2391f52e0d81af325b02d8f73a7d2ed66bf66d068dac4a496d777c83a398f
 DIST php-8.2.15.tar.xz 12075384 BLAKE2B 
cef15868968538e232093bd66d862a88f0960325f2274eaf53a3d114d01787c58844aa3bce8bc09a723acd95801e1935a60e79fc189317e7f1ba19196dbfcdc4
 SHA512 
56c94bcafe07cf4bf5eb5fc6c67fcf16654c44a262ffb18188fc3ffac5e9bb11d39093bfb26c26bc8d2dec7e530d1a175180909262c9b5c30130cf5a4a293166
 DIST php-8.2.18.tar.xz 12089400 BLAKE2B 
82a4ef0aee7fa66018cb528e6fc2da40f67be2a75449ed85c54881e6725cfa9fe82d6d5655c12d2e92f3fd685479367b7c038df5af0d7a0a122d627c78c50514
 SHA512 
8bdd6e5aa19dac80745d258a43f7330a3096d47dc66cbef0054b8f9eb9ace5e87d841a4001185a783241a416975753c922425e977f50b2716ce643b6a7bf351f
-DIST php-8.3.6.tar.xz 12468116 BLAKE2B 
33d318058123544cbfd95ca65bd75b1eda64757f07af1d0c49eeb98c1ea5f803f1a27f5fe32c983ecdf6f789cef8afc564b384b8537b0a11525cf3ec38373e04
 SHA512 
fa0b6734e34af90b67bdb991726faa02f7ddd7f31adf73d0b96762452a652690ef5fbae2f6cb941fbd41533b1d6870a78192433e78d5a16a8b5f55b3a5fdf44a
+DIST php-8.3.7.tar.xz 12456020 BLAKE2B 
065b49fbfcf543a14dfbf1bef1b710f241f8a36df9c45518d5ba786ef9c0c0fa0a495974cc69b2d8369e5398844e299d5b6ca2a3d246be9b5ff7edc9fdb2dc85
 SHA512 
ff2c16a5cc08b1a59a61eee9df75c4c9a6dda7054d48198b75d104c194e934109fed3665005ba798eeca3d7294d7dc81df3a14e63a527baf9f196e229068d9a3

diff --git a/dev-lang/php/php-8.3.6.ebuild b/dev-lang/php/php-8.3.7.ebuild
similarity index 97%
rename from dev-lang/php/php-8.3.6.ebuild
rename to dev-lang/php/php-8.3.7.ebuild
index 7242d6432c71..1ccb66ce8a52 100644
--- a/dev-lang/php/php-8.3.6.ebuild
+++ b/dev-lang/php/php-8.3.7.ebuild
@@ -118,7 +118,7 @@ COMMON_DEPEND="
unicode? ( dev-libs/oniguruma:= )
valgrind? ( dev-debug/valgrind )
webp? ( media-libs/libwebp:0= )
-   xml? ( dev-libs/libxml2 )
+   xml? ( >=dev-libs/libxml2-2.12.5 )
xpm? ( x11-libs/libXpm )
xslt? ( dev-libs/libxslt )
zip? ( dev-libs/libzip:= )
@@ -146,7 +146,6 @@ PHP_MV="$(ver_cut 1)"
 
 PATCHES=(
"${FILESDIR}/php-iodbc-header-location.patch"
-   "${FILESDIR}/fix-musl-llvm.patch"
 )
 
 # ARM/Windows functions (bug 923335)
@@ -259,21 +258,18 @@ src_prepare() {
   sapi/cli/tests/bug78323.phpt \
   || die
 
-   # https://github.com/php/php-src/issues/12801
-   rm ext/pcre/tests/gh11374.phpt || die
-
-   # A new test failure appearing in 8.3.2, mentioned on the PR
-   # where it was likely introduced:
-   #
-   #   https://github.com/php/php-src/pull/13017
-   #
-   rm ext/dom/tests/DOMNode_isEqualNode.phpt || die
-
# This is a memory usage test with hard-coded limits. Whenever the
# limits are surpassed... they get increased... but in the meantime,
# the tests fail. This is not really a test that end users should
# be running pre-install, in my opinion. Bug 927461.
rm ext/fileinfo/tests/bug78987.phpt || die
+
+   # The expected warnings aren't triggered in this test because we
+   # define session.save_path on the CLI:
+   #
+   #   https://github.com/php/php-src/issues/14368
+   #
+   rm ext/session/tests/gh13856.phpt || die
 }
 
 src_configure() {
@@ -691,11 +687,6 @@ src_test() {
export 
TEST_PHPDBG_EXECUTABLE="${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg"
fi
 
-   # The sendmail override prevents ext/imap/tests/bug77020.phpt from
-   # actually trying to send mail, and will be fixed upstream soon:
-   #
-   #   https://github.com/php/php-src/issues/11629
-   #
# The IO capture tests need to be disabled because they fail when
# std{in,out,err} are redirected (as they are within portage).
#
@@ -705,7 +696,6 @@ src_test() {
"${TEST_PHP_EXECUTABLE}" -n \
"${WORKDIR}/sapis-build/cli/run-tests.php" --offline -n -q \
-d "session.save_path=${T}" \
-   -d "sen

[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/

2024-05-30 Thread Michael Orlitzky
commit: e93f374f72abb762d3e44c12205024371dc6983a
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Thu May 30 12:16:05 2024 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Thu May 30 15:06:07 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e93f374f

dev-lang/php: add 8.2.19

Signed-off-by: Michael Orlitzky  gentoo.org>

 dev-lang/php/Manifest  |   1 +
 dev-lang/php/php-8.2.19.ebuild | 869 +
 2 files changed, 870 insertions(+)

diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index 7283964d8535..fc7eef5537a2 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -2,4 +2,5 @@ DIST php-8.1.26.tar.xz 11809448 BLAKE2B 
e1d50f1de572580a207586b3c3b57081f7b9f1b6
 DIST php-8.1.28.tar.xz 11848504 BLAKE2B 
a5deb596176bcd69c33f239e752ac75e2da1538efe6d2b321802c50ea250214c6d9b59e8a5cb74f97f37c917159ef4fde4ccda4403d6e0a6fe751a19b7687472
 SHA512 
d56ecac164e00e9514cd3c6c8c453598b323118dc7d7ae7cc14ba0847d50a2e455b2391f52e0d81af325b02d8f73a7d2ed66bf66d068dac4a496d777c83a398f
 DIST php-8.2.15.tar.xz 12075384 BLAKE2B 
cef15868968538e232093bd66d862a88f0960325f2274eaf53a3d114d01787c58844aa3bce8bc09a723acd95801e1935a60e79fc189317e7f1ba19196dbfcdc4
 SHA512 
56c94bcafe07cf4bf5eb5fc6c67fcf16654c44a262ffb18188fc3ffac5e9bb11d39093bfb26c26bc8d2dec7e530d1a175180909262c9b5c30130cf5a4a293166
 DIST php-8.2.18.tar.xz 12089400 BLAKE2B 
82a4ef0aee7fa66018cb528e6fc2da40f67be2a75449ed85c54881e6725cfa9fe82d6d5655c12d2e92f3fd685479367b7c038df5af0d7a0a122d627c78c50514
 SHA512 
8bdd6e5aa19dac80745d258a43f7330a3096d47dc66cbef0054b8f9eb9ace5e87d841a4001185a783241a416975753c922425e977f50b2716ce643b6a7bf351f
+DIST php-8.2.19.tar.xz 12094184 BLAKE2B 
ef599fc9faba7137eccd1ad48157ece57f5449c7afbb406e5a3dcda6ae95ef37fe3ffb4e6c60f9d113be144a7ef5305f8c772c7b550c733a0df2a1f51e8c5f0a
 SHA512 
5ba7ab4317f7880a6cea93bf6d3a48d62db6bfcb5682be7e13a6a6f7bd1fef96ca813c2cf95f6b5020756f03b298995d1722367adb2580c1db221a2f9e311038
 DIST php-8.3.7.tar.xz 12456020 BLAKE2B 
065b49fbfcf543a14dfbf1bef1b710f241f8a36df9c45518d5ba786ef9c0c0fa0a495974cc69b2d8369e5398844e299d5b6ca2a3d246be9b5ff7edc9fdb2dc85
 SHA512 
ff2c16a5cc08b1a59a61eee9df75c4c9a6dda7054d48198b75d104c194e934109fed3665005ba798eeca3d7294d7dc81df3a14e63a527baf9f196e229068d9a3

diff --git a/dev-lang/php/php-8.2.19.ebuild b/dev-lang/php/php-8.2.19.ebuild
new file mode 100644
index ..1979464f2d5e
--- /dev/null
+++ b/dev-lang/php/php-8.2.19.ebuild
@@ -0,0 +1,869 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+WANT_AUTOMAKE="none"
+
+inherit flag-o-matic multilib systemd autotools
+
+DESCRIPTION="The PHP language runtime engine"
+HOMEPAGE="https://www.php.net/";
+SRC_URI="https://www.php.net/distributions/${P}.tar.xz";
+
+LICENSE="PHP-3.01
+   BSD
+   Zend-2.0
+   bcmath? ( LGPL-2.1+ )
+   fpm? ( BSD-2 )
+   gd? ( gd )
+   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"
+
+# We can build the following SAPIs in the given order
+SAPIS="embed cli cgi fpm apache2 phpdbg"
+
+# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
+IUSE="${IUSE}
+   ${SAPIS/cli/+cli}
+   threads"
+
+IUSE="${IUSE} acl apparmor argon2 avif bcmath berkdb bzip2 calendar
+   cdb cjk +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
+   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
+   valgrind webp +xml xmlreader xmlwriter 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 )
+   webp? ( gd zlib )
+   cjk? ( gd zlib )
+   exif? ( gd zlib )
+   xpm? ( gd zlib )
+   gd? ( zlib )
+   simplexml? ( xml )
+   soap? ( xml )
+   xmlreader? ( xml )
+   xmlwriter? ( xml )
+   xslt? ( xml )
+   ldap-sasl? ( ldap )
+   oci8-instant-client? ( !ldap )
+   qdbm? ( !gdbm )
+   session-mm? ( session !threads )
+   mysql? ( || ( mysqli pdo ) )
+   firebird? ( pdo )
+   mssql? ( pdo )
+   test? ( cli )
+"
+
+RESTRICT="!test? ( test )"
+
+# The supported (that is, autodetected) versions of BDB are

[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/

2024-05-29 Thread Michael Orlitzky
commit: 0dc2770237b56c442795cbbfcd28ef4d893e6f8e
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Wed May 29 14:08:02 2024 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Wed May 29 14:08:02 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0dc27702

dev-lang/php: disable failing test for >=glibc-2.39

Closes: https://bugs.gentoo.org/933095
Signed-off-by: Michael Orlitzky  gentoo.org>

 dev-lang/php/php-8.2.18.ebuild | 4 
 1 file changed, 4 insertions(+)

diff --git a/dev-lang/php/php-8.2.18.ebuild b/dev-lang/php/php-8.2.18.ebuild
index 5b90e1767bb8..9bd4d38c38c4 100644
--- a/dev-lang/php/php-8.2.18.ebuild
+++ b/dev-lang/php/php-8.2.18.ebuild
@@ -328,6 +328,10 @@ src_prepare() {
# the tests fail. This is not really a test that end users should
# be running pre-install, in my opinion. Bug 927461.
rm ext/fileinfo/tests/bug78987.phpt || die
+
+   # glibc-2.39 compatibility, fixed upstream in
+   # https://github.com/php/php-src/pull/14097
+   rm ext/standard/tests/strings/setlocale_variation3.phpt || die
 }
 
 src_configure() {



[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/

2024-04-29 Thread Ionen Wolkens
commit: d4d45a2a1254958aae9ac981839145d29f761dbf
Author: Matoro Mahri  matoro  tk>
AuthorDate: Mon Apr 29 22:39:01 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Tue Apr 30 02:28:35 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4d45a2a

dev-lang/php: Stabilize 8.2.18 sparc, #929928

Signed-off-by: Matoro Mahri  matoro.tk>
Signed-off-by: Ionen Wolkens  gentoo.org>

 dev-lang/php/php-8.2.18.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-lang/php/php-8.2.18.ebuild b/dev-lang/php/php-8.2.18.ebuild
index 2e304932b5ed..5b90e1767bb8 100644
--- a/dev-lang/php/php-8.2.18.ebuild
+++ b/dev-lang/php/php-8.2.18.ebuild
@@ -20,7 +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"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~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"



[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/

2024-04-24 Thread Sam James
commit: eee9274c73af9dcdf367383182362cdbf606f0ae
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Wed Apr 24 13:56:28 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Apr 24 15:02:05 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eee9274c

dev-lang/php: stable 8.1.28 for sparc, bug #929928

Signed-off-by: Rolf Eike Beer  sf-mail.de>
Signed-off-by: Sam James  gentoo.org>

 dev-lang/php/php-8.1.28.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-lang/php/php-8.1.28.ebuild b/dev-lang/php/php-8.1.28.ebuild
index 64589a10d000..406551a46114 100644
--- a/dev-lang/php/php-8.1.28.ebuild
+++ b/dev-lang/php/php-8.1.28.ebuild
@@ -20,7 +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"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~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"



[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/

2024-04-13 Thread Arthur Zamarin
commit: c655bf403777d39f00680b1a8ee6834ea6261c52
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Apr 13 18:20:45 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Apr 13 18:20:45 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c655bf40

dev-lang/php: Stabilize 8.1.28 arm64, #929928

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-lang/php/php-8.1.28.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-lang/php/php-8.1.28.ebuild b/dev-lang/php/php-8.1.28.ebuild
index 95c0924610d5..64589a10d000 100644
--- a/dev-lang/php/php-8.1.28.ebuild
+++ b/dev-lang/php/php-8.1.28.ebuild
@@ -20,7 +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"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~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"



[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/

2024-04-13 Thread Arthur Zamarin
commit: 3c36fee180b6dfc8c227d396a4306ebe4b5b8a91
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Apr 13 18:20:46 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Apr 13 18:20:46 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c36fee1

dev-lang/php: Stabilize 8.2.18 arm64, #929928

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-lang/php/php-8.2.18.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-lang/php/php-8.2.18.ebuild b/dev-lang/php/php-8.2.18.ebuild
index b11da4d2083d..2e304932b5ed 100644
--- a/dev-lang/php/php-8.2.18.ebuild
+++ b/dev-lang/php/php-8.2.18.ebuild
@@ -20,7 +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"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~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"



[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/

2024-04-13 Thread Arthur Zamarin
commit: ff02473ef68e5ea5076250595bc77e25dca9326f
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Apr 13 18:11:56 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Apr 13 18:11:56 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff02473e

dev-lang/php: Stabilize 8.2.18 arm, #929928

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-lang/php/php-8.2.18.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-lang/php/php-8.2.18.ebuild b/dev-lang/php/php-8.2.18.ebuild
index 7b6e3c14226b..b11da4d2083d 100644
--- a/dev-lang/php/php-8.2.18.ebuild
+++ b/dev-lang/php/php-8.2.18.ebuild
@@ -20,7 +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"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~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"



[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/

2024-04-13 Thread Arthur Zamarin
commit: 5d8b6b35e8784b3b121aa470de1ff33aede97d9b
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Apr 13 18:11:56 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Apr 13 18:11:56 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d8b6b35

dev-lang/php: Stabilize 8.1.28 arm, #929928

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-lang/php/php-8.1.28.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-lang/php/php-8.1.28.ebuild b/dev-lang/php/php-8.1.28.ebuild
index f434f0df4366..95c0924610d5 100644
--- a/dev-lang/php/php-8.1.28.ebuild
+++ b/dev-lang/php/php-8.1.28.ebuild
@@ -20,7 +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"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~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"



[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/

2024-04-13 Thread Michael Orlitzky
commit: 137f08de5c88eb61b698b8848d9b701e84bab5c2
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Sat Apr 13 11:27:08 2024 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Sat Apr 13 16:09:36 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=137f08de

dev-lang/php: security updates for all three series

Announcements:

* https://news-web.php.net/php.announce/423
* https://news-web.php.net/php.announce/424
* https://news-web.php.net/php.announce/425

CVEs:

* CVE-2024-1874
* CVE-2024-2756
* CVE-2024-2757
* CVE-2024-3096

Signed-off-by: Michael Orlitzky  gentoo.org>

 dev-lang/php/Manifest| 6 +++---
 dev-lang/php/{php-8.1.27-r2.ebuild => php-8.1.28.ebuild} | 0
 dev-lang/php/{php-8.2.17.ebuild => php-8.2.18.ebuild}| 1 -
 dev-lang/php/{php-8.3.4.ebuild => php-8.3.6.ebuild}  | 0
 4 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index 644a082dd64e..29a8ddbafa8c 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -1,5 +1,5 @@
 DIST php-8.1.26.tar.xz 11809448 BLAKE2B 
e1d50f1de572580a207586b3c3b57081f7b9f1b680ffe8f9e82c88c9285af117dd7e9e2576fcb13119176cb9cd02b39481b6f40e9a1df81aa90b8c4d3e59e4b1
 SHA512 
5bc40077e57c0fccdf17810d688baea416f22ac248bb01b73d2e2590fc4cfabc7001c1c3833281a60870c74178f7b06cbc85474eba695aabf969ad0081a98417
-DIST php-8.1.27.tar.xz 11915228 BLAKE2B 
83f4f3c25435b26dc526dc1fd7aff44cd03157349f9bb6454e216525a16c2bbc3bfac47cce6b5ea8bfdfcf3c7f27e342fc602ca7d2491fe89db06ea93f686f0e
 SHA512 
07fb2b8e10e2487635e26bfd8a27949a26b85f76bc3984ad8599224bb7a7f9498d84299335ae5a0bba16599275e9747ab141f73f4f2076ddf49ebec8e76fd0ed
+DIST php-8.1.28.tar.xz 11848504 BLAKE2B 
a5deb596176bcd69c33f239e752ac75e2da1538efe6d2b321802c50ea250214c6d9b59e8a5cb74f97f37c917159ef4fde4ccda4403d6e0a6fe751a19b7687472
 SHA512 
d56ecac164e00e9514cd3c6c8c453598b323118dc7d7ae7cc14ba0847d50a2e455b2391f52e0d81af325b02d8f73a7d2ed66bf66d068dac4a496d777c83a398f
 DIST php-8.2.15.tar.xz 12075384 BLAKE2B 
cef15868968538e232093bd66d862a88f0960325f2274eaf53a3d114d01787c58844aa3bce8bc09a723acd95801e1935a60e79fc189317e7f1ba19196dbfcdc4
 SHA512 
56c94bcafe07cf4bf5eb5fc6c67fcf16654c44a262ffb18188fc3ffac5e9bb11d39093bfb26c26bc8d2dec7e530d1a175180909262c9b5c30130cf5a4a293166
-DIST php-8.2.17.tar.xz 12092404 BLAKE2B 
352ad673c6eb4e827982b822c0d2f50f62b047e759bb056224f83f939b26a2348a36c3fea3950f3c55df2845a5eb56c103ffef5a81f192c07f02fb2cbaefa7a4
 SHA512 
113cd8c6a481770aba7e21f1bc22500c93dfa41ff85a7b54e1abbfd5b5a32f51501c91eb45c29a5e2d8ec5f61861060c193a96e27224c97f8cad7979f378bde8
-DIST php-8.3.4.tar.xz 12443980 BLAKE2B 
b3e7c491583081cc24cef24a1adaee91da4454518e6feb1320e3c2fe474c1e84b8cc861d3706976cee0df011da734321ae4ea5336fc17f9c799a6728eb74de44
 SHA512 
7254421c57de6c8f9f84079212ead38b397e053ad2dc202bd4e0c9d63aa5d9884a6a856fb93fcdbc9e671051436814188439bc5de480979e53fdcb5488cdc321
+DIST php-8.2.18.tar.xz 12089400 BLAKE2B 
82a4ef0aee7fa66018cb528e6fc2da40f67be2a75449ed85c54881e6725cfa9fe82d6d5655c12d2e92f3fd685479367b7c038df5af0d7a0a122d627c78c50514
 SHA512 
8bdd6e5aa19dac80745d258a43f7330a3096d47dc66cbef0054b8f9eb9ace5e87d841a4001185a783241a416975753c922425e977f50b2716ce643b6a7bf351f
+DIST php-8.3.6.tar.xz 12468116 BLAKE2B 
33d318058123544cbfd95ca65bd75b1eda64757f07af1d0c49eeb98c1ea5f803f1a27f5fe32c983ecdf6f789cef8afc564b384b8537b0a11525cf3ec38373e04
 SHA512 
fa0b6734e34af90b67bdb991726faa02f7ddd7f31adf73d0b96762452a652690ef5fbae2f6cb941fbd41533b1d6870a78192433e78d5a16a8b5f55b3a5fdf44a

diff --git a/dev-lang/php/php-8.1.27-r2.ebuild b/dev-lang/php/php-8.1.28.ebuild
similarity index 100%
rename from dev-lang/php/php-8.1.27-r2.ebuild
rename to dev-lang/php/php-8.1.28.ebuild

diff --git a/dev-lang/php/php-8.2.17.ebuild b/dev-lang/php/php-8.2.18.ebuild
similarity index 99%
rename from dev-lang/php/php-8.2.17.ebuild
rename to dev-lang/php/php-8.2.18.ebuild
index abe657f95e1d..7b6e3c14226b 100644
--- a/dev-lang/php/php-8.2.17.ebuild
+++ b/dev-lang/php/php-8.2.18.ebuild
@@ -150,7 +150,6 @@ PATCHES=(
"${FILESDIR}/php-iodbc-header-location.patch"
"${FILESDIR}/php-capstone-optional.patch"
"${FILESDIR}/php-8.2.8-openssl-tests.patch"
-   "${FILESDIR}/php-8.1.27-implicit-decls.patch"
"${FILESDIR}/fix-musl-llvm.patch"
 )
 

diff --git a/dev-lang/php/php-8.3.4.ebuild b/dev-lang/php/php-8.3.6.ebuild
similarity index 100%
rename from dev-lang/php/php-8.3.4.ebuild
rename to dev-lang/php/php-8.3.6.ebuild



[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/

2024-04-11 Thread Arthur Zamarin
commit: f8620d641d4c7e02bf852e1190d1315b4e40abc1
Author: Matoro Mahri  matoro  tk>
AuthorDate: Fri Apr 12 05:52:16 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Apr 12 06:25:11 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8620d64

dev-lang/php: Stabilize 8.2.15 sparc, #920701

Signed-off-by: Matoro Mahri  matoro.tk>
Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-lang/php/php-8.2.15.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-lang/php/php-8.2.15.ebuild b/dev-lang/php/php-8.2.15.ebuild
index f5ce99221a72..bb0e5f666f8f 100644
--- a/dev-lang/php/php-8.2.15.ebuild
+++ b/dev-lang/php/php-8.2.15.ebuild
@@ -20,7 +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"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~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"



[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/

2024-04-11 Thread Michael Orlitzky
commit: 7d56cd36ac6b6d468e20d6333ae2917c6c39c146
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Thu Apr 11 19:50:37 2024 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Thu Apr 11 20:55:06 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d56cd36

dev-lang/php: skip doomed test in 8.2.15, too

Bug: https://bugs.gentoo.org/927461
Signed-off-by: Michael Orlitzky  gentoo.org>

 dev-lang/php/php-8.2.15.ebuild | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/dev-lang/php/php-8.2.15.ebuild b/dev-lang/php/php-8.2.15.ebuild
index 38a2c837e671..f5ce99221a72 100644
--- a/dev-lang/php/php-8.2.15.ebuild
+++ b/dev-lang/php/php-8.2.15.ebuild
@@ -308,6 +308,12 @@ src_prepare() {
 
# https://github.com/php/php-src/issues/12801
rm ext/pcre/tests/gh11374.phpt || die
+
+   # This is a memory usage test with hard-coded limits. Whenever the
+   # limits are surpassed... they get increased... but in the meantime,
+   # the tests fail. This is not really a test that end users should
+   # be running pre-install, in my opinion. Bug 927461.
+   rm ext/fileinfo/tests/bug78987.phpt || die
 }
 
 src_configure() {



[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/files/, dev-lang/php/

2024-04-09 Thread Michael Orlitzky
commit: ccc5cdc89ecf3ad501acfa34650e63b3329e18da
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Tue Apr  9 13:08:47 2024 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Tue Apr  9 13:50:55 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ccc5cdc8

dev-lang/php: fix a failing test and a musl compatibility issue

Closes: https://bugs.gentoo.org/927461
Closes: https://bugs.gentoo.org/928072
Signed-off-by: Michael Orlitzky  gentoo.org>

 dev-lang/php/files/fix-musl-llvm.patch | 37 ++
 dev-lang/php/php-8.1.27-r2.ebuild  |  5 +++--
 dev-lang/php/php-8.2.17.ebuild |  7 +++
 dev-lang/php/php-8.3.4.ebuild  |  7 +++
 4 files changed, 54 insertions(+), 2 deletions(-)

diff --git a/dev-lang/php/files/fix-musl-llvm.patch 
b/dev-lang/php/files/fix-musl-llvm.patch
new file mode 100644
index ..bf299837829c
--- /dev/null
+++ b/dev-lang/php/files/fix-musl-llvm.patch
@@ -0,0 +1,37 @@
+From 684f0d9e5946e92008404b3d5a131edc4f34f7da Mon Sep 17 00:00:00 2001
+From: Arnaud Le Blanc 
+Date: Thu, 4 Apr 2024 16:10:28 +0200
+Subject: [PATCH] Fix stream_cookie_seeker signature under musl
+
+---
+ main/streams/cast.c | 10 +++---
+ 1 file changed, 3 insertions(+), 7 deletions(-)
+
+diff --git a/main/streams/cast.c b/main/streams/cast.c
+index 3bad65fbac1f5..8d9f4a9d2d54b 100644
+--- a/main/streams/cast.c
 b/main/streams/cast.c
+@@ -104,6 +104,9 @@ static ssize_t stream_cookie_writer(void *cookie, const 
char *buffer, size_t siz
+ 
+ # ifdef COOKIE_SEEKER_USES_OFF64_T
+ static int stream_cookie_seeker(void *cookie, off64_t *position, int whence)
++# else
++static int stream_cookie_seeker(void *cookie, off_t *position, int whence)
++# endif
+ {
+ 
+   *position = php_stream_seek((php_stream *)cookie, 
(zend_off_t)*position, whence);
+@@ -113,13 +116,6 @@ static int stream_cookie_seeker(void *cookie, off64_t 
*position, int whence)
+   }
+   return 0;
+ }
+-# else
+-static int stream_cookie_seeker(void *cookie, zend_off_t position, int whence)
+-{
+-
+-  return php_stream_seek((php_stream *)cookie, position, whence);
+-}
+-# endif
+ 
+ static int stream_cookie_closer(void *cookie)
+ {

diff --git a/dev-lang/php/php-8.1.27-r2.ebuild 
b/dev-lang/php/php-8.1.27-r2.ebuild
index 38bbbc21e31c..f434f0df4366 100644
--- a/dev-lang/php/php-8.1.27-r2.ebuild
+++ b/dev-lang/php/php-8.1.27-r2.ebuild
@@ -150,6 +150,7 @@ PATCHES=(
"${FILESDIR}/php-capstone-optional.patch"
"${FILESDIR}/php-8.1.27-gcc14-libxml.patch"
"${FILESDIR}/php-8.1.27-implicit-decls.patch"
+   "${FILESDIR}/fix-musl-llvm.patch"
 )
 
 # ARM/Windows functions that are expected to be undefined.
@@ -250,8 +251,8 @@ src_prepare() {
   ext/curl/tests/bug77535.phpt \
   ext/curl/tests/curl_error_basic.phpt \
   ext/session/tests/bug74514.phpt \
-  ext/session/tests/bug74936.phpt || die
-
+  ext/session/tests/bug74936.phpt \
+  ext/fileinfo/tests/bug78987.phpt || die
 }
 
 src_configure() {

diff --git a/dev-lang/php/php-8.2.17.ebuild b/dev-lang/php/php-8.2.17.ebuild
index f27df005dc4f..abe657f95e1d 100644
--- a/dev-lang/php/php-8.2.17.ebuild
+++ b/dev-lang/php/php-8.2.17.ebuild
@@ -151,6 +151,7 @@ PATCHES=(
"${FILESDIR}/php-capstone-optional.patch"
"${FILESDIR}/php-8.2.8-openssl-tests.patch"
"${FILESDIR}/php-8.1.27-implicit-decls.patch"
+   "${FILESDIR}/fix-musl-llvm.patch"
 )
 
 # ARM/Windows functions (bug 923335)
@@ -322,6 +323,12 @@ src_prepare() {
 
# https://github.com/php/php-src/issues/12801
rm ext/pcre/tests/gh11374.phpt || die
+
+   # This is a memory usage test with hard-coded limits. Whenever the
+   # limits are surpassed... they get increased... but in the meantime,
+   # the tests fail. This is not really a test that end users should
+   # be running pre-install, in my opinion. Bug 927461.
+   rm ext/fileinfo/tests/bug78987.phpt || die
 }
 
 src_configure() {

diff --git a/dev-lang/php/php-8.3.4.ebuild b/dev-lang/php/php-8.3.4.ebuild
index f4f263225218..7242d6432c71 100644
--- a/dev-lang/php/php-8.3.4.ebuild
+++ b/dev-lang/php/php-8.3.4.ebuild
@@ -146,6 +146,7 @@ PHP_MV="$(ver_cut 1)"
 
 PATCHES=(
"${FILESDIR}/php-iodbc-header-location.patch"
+   "${FILESDIR}/fix-musl-llvm.patch"
 )
 
 # ARM/Windows functions (bug 923335)
@@ -267,6 +268,12 @@ src_prepare() {
#   https://github.com/php/php-src/pull/13017
#
rm ext/dom/tests/DOMNode_isEqualNode.phpt || die
+
+   # This is a memory usage test with hard-coded limits. Whenever the
+   # limits are surpassed... they get increased... but in the meantime,
+   # the tests fail. This is not really a test that end users should
+   # be running pre-install, in my opinion. Bug 927461.
+   rm ext/fileinfo/tests/bug78987.phpt || die
 }
 
 src_configure() {



[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/

2024-04-01 Thread Michael Orlitzky
commit: 8b48069d406937f13bc10d14c0c8ad66b136e103
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Mon Apr  1 11:57:00 2024 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Mon Apr  1 11:59:27 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b48069d

dev-lang/php: add 8.3.4, drop 8.3.3-r1

In addition to the version bump, this commit drops support for the oci8
extension within PHP itself. This extension no longer builds with the
latest dev-db/oracle-instantclient (bug 928312, the ./configure check is
looking for 32-bit libs), and upstream PHP has moved the extension to
a separate PECL repository:

 * https://github.com/php/php-src/pull/13327
 * https://wiki.php.net/rfc/unbundle_imap_pspell_oci8

Anyone interested in Oracle support should work on packaging those two
PECL extensions.

Closes: https://bugs.gentoo.org/928312
Signed-off-by: Michael Orlitzky  gentoo.org>

 dev-lang/php/Manifest  |  2 +-
 .../php/{php-8.3.3-r1.ebuild => php-8.3.4.ebuild}  | 28 +-
 2 files changed, 2 insertions(+), 28 deletions(-)

diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index 527d4ce6c828..644a082dd64e 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -2,4 +2,4 @@ DIST php-8.1.26.tar.xz 11809448 BLAKE2B 
e1d50f1de572580a207586b3c3b57081f7b9f1b6
 DIST php-8.1.27.tar.xz 11915228 BLAKE2B 
83f4f3c25435b26dc526dc1fd7aff44cd03157349f9bb6454e216525a16c2bbc3bfac47cce6b5ea8bfdfcf3c7f27e342fc602ca7d2491fe89db06ea93f686f0e
 SHA512 
07fb2b8e10e2487635e26bfd8a27949a26b85f76bc3984ad8599224bb7a7f9498d84299335ae5a0bba16599275e9747ab141f73f4f2076ddf49ebec8e76fd0ed
 DIST php-8.2.15.tar.xz 12075384 BLAKE2B 
cef15868968538e232093bd66d862a88f0960325f2274eaf53a3d114d01787c58844aa3bce8bc09a723acd95801e1935a60e79fc189317e7f1ba19196dbfcdc4
 SHA512 
56c94bcafe07cf4bf5eb5fc6c67fcf16654c44a262ffb18188fc3ffac5e9bb11d39093bfb26c26bc8d2dec7e530d1a175180909262c9b5c30130cf5a4a293166
 DIST php-8.2.17.tar.xz 12092404 BLAKE2B 
352ad673c6eb4e827982b822c0d2f50f62b047e759bb056224f83f939b26a2348a36c3fea3950f3c55df2845a5eb56c103ffef5a81f192c07f02fb2cbaefa7a4
 SHA512 
113cd8c6a481770aba7e21f1bc22500c93dfa41ff85a7b54e1abbfd5b5a32f51501c91eb45c29a5e2d8ec5f61861060c193a96e27224c97f8cad7979f378bde8
-DIST php-8.3.3.tar.xz 12463880 BLAKE2B 
ac0baabe875be8ce42c26713f78733140d47f33636aa0e16e2685c83f558afea905707ca133b06ea28ad8de043d7db7d0931259c7c07a2de2c04a935d76db365
 SHA512 
42141cc46b6abb11fa51cc96c34424cbf9990150b973d84488fa39a07935b22552a1316978f5a4e48762bf3c94eee3d7dfe741c4ee1a12bf752ce1c2660cc8b0
+DIST php-8.3.4.tar.xz 12443980 BLAKE2B 
b3e7c491583081cc24cef24a1adaee91da4454518e6feb1320e3c2fe474c1e84b8cc861d3706976cee0df011da734321ae4ea5336fc17f9c799a6728eb74de44
 SHA512 
7254421c57de6c8f9f84079212ead38b397e053ad2dc202bd4e0c9d63aa5d9884a6a856fb93fcdbc9e671051436814188439bc5de480979e53fdcb5488cdc321

diff --git a/dev-lang/php/php-8.3.3-r1.ebuild b/dev-lang/php/php-8.3.4.ebuild
similarity index 95%
rename from dev-lang/php/php-8.3.3-r1.ebuild
rename to dev-lang/php/php-8.3.4.ebuild
index 8fe4000652a6..f4f263225218 100644
--- a/dev-lang/php/php-8.3.3-r1.ebuild
+++ b/dev-lang/php/php-8.3.4.ebuild
@@ -36,14 +36,13 @@ IUSE="${IUSE} acl apparmor argon2 avif bcmath berkdb bzip2 
calendar
+flatfile ftp gd gdbm gmp +iconv imap inifile
intl iodbc ipv6 +jit kerberos ldap ldap-sasl libedit lmdb
mhash mssql mysql mysqli nls
-   oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
+   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
valgrind webp +xml xmlreader xmlwriter 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 )
@@ -61,7 +60,6 @@ REQUIRED_USE="
xmlwriter? ( xml )
xslt? ( xml )
ldap-sasl? ( ldap )
-   oci8-instant-client? ( !ldap )
qdbm? ( !gdbm )
session-mm? ( session !threads )
mysql? ( || ( mysqli pdo ) )
@@ -104,7 +102,6 @@ COMMON_DEPEND="
lmdb? ( dev-db/lmdb:= )
mssql? ( dev-db/freetds[mssql] )
nls? ( sys-devel/gettext )
-   oci8-instant-client? ( dev-db/oracle-instantclient[sdk] )
odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( dev-db/unixODBC ) )
postgres? ( dev-db/postgresql:* )
qdbm? ( dev-db/qdbm )
@@ -261,14 +258,6 @@ src_prepare() {
   sapi/cli/tests/bug78323.phpt \
   || die
 
-   # Most Oracle tests are borked,
-   #
-   #  * https://github.com/php/php-src/issues/11804
-   #  * https://github.com/php/php-src/pull/11820
-   #  * https://github.com/ph

[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/

2024-04-01 Thread Michael Orlitzky
commit: 441e6105a62f55ac886dfe0d992169b49fd69ded
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Mon Apr  1 11:39:37 2024 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Mon Apr  1 11:50:46 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=441e6105

dev-lang/php: add 8.2.17, drop 8.2.16-r1

Signed-off-by: Michael Orlitzky  gentoo.org>

 dev-lang/php/Manifest| 2 +-
 dev-lang/php/{php-8.2.16-r1.ebuild => php-8.2.17.ebuild} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index 1924401cad65..527d4ce6c828 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -1,5 +1,5 @@
 DIST php-8.1.26.tar.xz 11809448 BLAKE2B 
e1d50f1de572580a207586b3c3b57081f7b9f1b680ffe8f9e82c88c9285af117dd7e9e2576fcb13119176cb9cd02b39481b6f40e9a1df81aa90b8c4d3e59e4b1
 SHA512 
5bc40077e57c0fccdf17810d688baea416f22ac248bb01b73d2e2590fc4cfabc7001c1c3833281a60870c74178f7b06cbc85474eba695aabf969ad0081a98417
 DIST php-8.1.27.tar.xz 11915228 BLAKE2B 
83f4f3c25435b26dc526dc1fd7aff44cd03157349f9bb6454e216525a16c2bbc3bfac47cce6b5ea8bfdfcf3c7f27e342fc602ca7d2491fe89db06ea93f686f0e
 SHA512 
07fb2b8e10e2487635e26bfd8a27949a26b85f76bc3984ad8599224bb7a7f9498d84299335ae5a0bba16599275e9747ab141f73f4f2076ddf49ebec8e76fd0ed
 DIST php-8.2.15.tar.xz 12075384 BLAKE2B 
cef15868968538e232093bd66d862a88f0960325f2274eaf53a3d114d01787c58844aa3bce8bc09a723acd95801e1935a60e79fc189317e7f1ba19196dbfcdc4
 SHA512 
56c94bcafe07cf4bf5eb5fc6c67fcf16654c44a262ffb18188fc3ffac5e9bb11d39093bfb26c26bc8d2dec7e530d1a175180909262c9b5c30130cf5a4a293166
-DIST php-8.2.16.tar.xz 12085228 BLAKE2B 
6fcf3f5be8443c70e88746fdd609016c322b86ebc0257ee8db0f8551c73804bae2ecb156ee835b09aedb23bb2026658c3f24a8f722dce80e427bdab844bc27ce
 SHA512 
99e5c9eee4c5a35b3e1939c748ded87c8bff4a340d677516ed24dcf4207c51403d38524c46d6e79de5efe90d7368ba82052ec8a29dd5955f549e8198c1e917f6
+DIST php-8.2.17.tar.xz 12092404 BLAKE2B 
352ad673c6eb4e827982b822c0d2f50f62b047e759bb056224f83f939b26a2348a36c3fea3950f3c55df2845a5eb56c103ffef5a81f192c07f02fb2cbaefa7a4
 SHA512 
113cd8c6a481770aba7e21f1bc22500c93dfa41ff85a7b54e1abbfd5b5a32f51501c91eb45c29a5e2d8ec5f61861060c193a96e27224c97f8cad7979f378bde8
 DIST php-8.3.3.tar.xz 12463880 BLAKE2B 
ac0baabe875be8ce42c26713f78733140d47f33636aa0e16e2685c83f558afea905707ca133b06ea28ad8de043d7db7d0931259c7c07a2de2c04a935d76db365
 SHA512 
42141cc46b6abb11fa51cc96c34424cbf9990150b973d84488fa39a07935b22552a1316978f5a4e48762bf3c94eee3d7dfe741c4ee1a12bf752ce1c2660cc8b0

diff --git a/dev-lang/php/php-8.2.16-r1.ebuild b/dev-lang/php/php-8.2.17.ebuild
similarity index 100%
rename from dev-lang/php/php-8.2.16-r1.ebuild
rename to dev-lang/php/php-8.2.17.ebuild



[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/

2024-03-11 Thread Michael Orlitzky
commit: 9eecf694c25c09ddcf2b713bc0960172e5922ada
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Mon Mar 11 01:53:15 2024 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Mon Mar 11 10:24:00 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9eecf694

dev-lang/php: simplify opcache installation

We don't need to specify the opcache path explicitly (or hack the ini
files) if we use the upstream "make install-modules" target that
installs opcache to the expected default path.

Signed-off-by: Michael Orlitzky  gentoo.org>

 .../php/{php-8.3.3.ebuild => php-8.3.3-r1.ebuild}  | 25 ++
 1 file changed, 7 insertions(+), 18 deletions(-)

diff --git a/dev-lang/php/php-8.3.3.ebuild b/dev-lang/php/php-8.3.3-r1.ebuild
similarity index 97%
rename from dev-lang/php/php-8.3.3.ebuild
rename to dev-lang/php/php-8.3.3-r1.ebuild
index 488c1dbec923..8fe4000652a6 100644
--- a/dev-lang/php/php-8.3.3.ebuild
+++ b/dev-lang/php/php-8.3.3-r1.ebuild
@@ -174,10 +174,6 @@ php_install_ini() {
local phpinisrc="php.ini-production-${phpsapi}"
cp php.ini-production "${phpinisrc}" || die
 
-   # Set the extension dir
-   sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" \
-   -i "${phpinisrc}" || die
-
# Set the include path to point to where we want to find PEAR
# packages
local sed_src='^;include_path = ".:/php.*'
@@ -198,7 +194,7 @@ php_install_ini() {
 
if use opcache; then
elog "Adding opcache to $PHP_EXT_INI_DIR"
-   echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" 
>> \
+   echo "zend_extension = opcache.so" >> \
 "${D}/${PHP_EXT_INI_DIR}"/opcache.ini
dosym "../ext/opcache.ini" \
  "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini"
@@ -508,6 +504,10 @@ src_configure() {
# in main/build-defs.h which is included in main/php.h which is
# included by basically everything; so, avoiding a rebuild after
# changing it is not an easy job.
+   #
+   # The upstream build system also does not support building the
+   # apache2 and embed SAPIs at the same time, presumably because they
+   # both produce a libphp.so.
local one_sapi
local sapi
mkdir "${WORKDIR}/sapis-build" || die
@@ -599,20 +599,15 @@ src_install() {
fi
done
 
-   # Makefile forgets to create this before trying to write to it...
-   dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
-
-   # Install php environment (without any sapis)
+   # Install SAPI-independent targets
cd "${WORKDIR}/sapis-build/$first_sapi" || die
emake INSTALL_ROOT="${D}" \
install-build install-headers install-programs
-
-   local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" 
--extension-dir)"
+   use opcache && emake INSTALL_ROOT="${D}" install-modules
 
# Create the directory where we'll put version-specific php scripts
keepdir "/usr/share/php${PHP_MV}"
 
-   local file=""
local sapi_list=""
 
for sapi in ${SAPIS}; do
@@ -678,12 +673,6 @@ src_install() {
fi
done
 
-   # Installing opcache module
-   if use opcache ; then
-   into "${PHP_DESTDIR#${EPREFIX}}"
-   dolib.so "modules/opcache$(get_libname)"
-   fi
-
# Install env.d files
newenvd "${FILESDIR}/20php5-envd" "20php${SLOT}"
sed -e "s|/lib/|/$(get_libdir)/|g" -i "${ED}/etc/env.d/20php${SLOT}" || 
die



[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/

2024-03-07 Thread Sam James
commit: 800402471e3f67f79eeb072ac7a30d42ebdae68e
Author: Sam James  gentoo  org>
AuthorDate: Thu Mar  7 20:23:25 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Mar  7 20:23:49 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80040247

dev-lang/php: Stabilize 8.2.15 x86, #920701

Signed-off-by: Sam James  gentoo.org>

 dev-lang/php/php-8.2.15.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-lang/php/php-8.2.15.ebuild b/dev-lang/php/php-8.2.15.ebuild
index 2fb8ad2ce5d0..38a2c837e671 100644
--- a/dev-lang/php/php-8.2.15.ebuild
+++ b/dev-lang/php/php-8.2.15.ebuild
@@ -20,7 +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"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~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"



[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/

2024-03-07 Thread Sam James
commit: c3ada8bb4870f87daa33abdeee12b0fe617081ea
Author: Sam James  gentoo  org>
AuthorDate: Thu Mar  7 18:41:17 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Mar  7 18:41:17 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3ada8bb

dev-lang/php: Stabilize 8.2.15 arm64, #920701

Signed-off-by: Sam James  gentoo.org>

 dev-lang/php/php-8.2.15.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-lang/php/php-8.2.15.ebuild b/dev-lang/php/php-8.2.15.ebuild
index 8fe44bc9dc97..2fb8ad2ce5d0 100644
--- a/dev-lang/php/php-8.2.15.ebuild
+++ b/dev-lang/php/php-8.2.15.ebuild
@@ -20,7 +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"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~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"



[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/

2024-03-07 Thread Michael Orlitzky
commit: b1e8e89eb4b21ef1b14b5eef8c1d12addab9e74d
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Thu Mar  7 13:41:39 2024 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Thu Mar  7 13:42:22 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1e8e89e

dev-lang/php: fix another implicit decl in 8.2.x

Closes: https://bugs.gentoo.org/926324
Signed-off-by: Michael Orlitzky  gentoo.org>

 dev-lang/php/{php-8.2.16.ebuild => php-8.2.16-r1.ebuild} | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dev-lang/php/php-8.2.16.ebuild b/dev-lang/php/php-8.2.16-r1.ebuild
similarity index 99%
rename from dev-lang/php/php-8.2.16.ebuild
rename to dev-lang/php/php-8.2.16-r1.ebuild
index 78da01537337..f27df005dc4f 100644
--- a/dev-lang/php/php-8.2.16.ebuild
+++ b/dev-lang/php/php-8.2.16-r1.ebuild
@@ -150,6 +150,7 @@ PATCHES=(
"${FILESDIR}/php-iodbc-header-location.patch"
"${FILESDIR}/php-capstone-optional.patch"
"${FILESDIR}/php-8.2.8-openssl-tests.patch"
+   "${FILESDIR}/php-8.1.27-implicit-decls.patch"
 )
 
 # ARM/Windows functions (bug 923335)



[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/files/, dev-lang/php/

2024-03-04 Thread Michael Orlitzky
commit: 65a1a144e66496d746998a54d2c5ad7cf53252cb
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Mon Mar  4 16:42:16 2024 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Mon Mar  4 16:49:07 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65a1a144

dev-lang/php: some more implicit function decl fixes for 8.1.x

Closes: https://bugs.gentoo.org/925877
Signed-off-by: Michael Orlitzky  gentoo.org>

 dev-lang/php/files/php-8.1.27-implicit-decls.patch | 72 ++
 .../{php-8.1.27-r1.ebuild => php-8.1.27-r2.ebuild} |  7 +++
 2 files changed, 79 insertions(+)

diff --git a/dev-lang/php/files/php-8.1.27-implicit-decls.patch 
b/dev-lang/php/files/php-8.1.27-implicit-decls.patch
new file mode 100644
index ..443b02ba17c2
--- /dev/null
+++ b/dev-lang/php/files/php-8.1.27-implicit-decls.patch
@@ -0,0 +1,72 @@
+From 79df2b9dcbe0388667c832b2c702ca3158330ed7 Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky 
+Date: Mon, 4 Mar 2024 11:48:01 -0500
+Subject: [PATCH] ext/iconv/config.m4: add missing stdio.h include.
+
+The next generation of C compilers is going to enforce the C standard
+more strictly:
+
+  https://wiki.gentoo.org/wiki/Modern_C_porting
+
+One warning that will eventually become an error is
+-Wimplicit-function-declaration. This is relatively easy to catch in
+most code (it will fail to compile), but inside of autoconf tests it
+can go unnoticed because many feature-test compilations fail by
+design. For example,
+
+  AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include ]],
+ [[iconv_ccs_init(NULL, NULL);]])]...
+
+is designed to fail if iconv_ccs_init() is not in iconv.h. On the
+other hand,
+
+  AC_RUN_IFELSE([AC_LANG_SOURCE([[
+  #include 
+  int main() {
+printf("%d", _libiconv_version);
+return 0;
+  }
+
+should pass if _libiconv_version is defined. If the user has
+-Werror=implicit-function-declaration in his CFLAGS, however,
+it will not:
+
+  $ export CFLAGS="$CFLAGS -Werror=implicit-function-declaration"
+  $ ./configure
+  ...
+  checking if using GNU libiconv... no
+
+This is because the stdio.h header that defines printf() is missing:
+
+  conftest.c:240:3: error: implicit declaration of function 'printf'
+  [-Werror=implicit-function-declaration]
+240 |   printf("%d", _libiconv_version);
+|   ^~
+  conftest.c:239:1: note: include '' or provide a declaration
+  of 'printf'
+
+This commit adds the include, correcting the test with any compiler
+that balks at implicit function definitions.
+
+(Backport to php-8.1.27)
+
+Closes GH-10751
+---
+ ext/iconv/config.m4 | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/ext/iconv/config.m4 b/ext/iconv/config.m4
+index ac57c81e..b8044bf2 100644
+--- a/ext/iconv/config.m4
 b/ext/iconv/config.m4
+@@ -30,6 +30,7 @@ if test "$PHP_ICONV" != "no"; then
+   AC_MSG_CHECKING([if using GNU libiconv])
+   AC_RUN_IFELSE([AC_LANG_SOURCE([[
+ #include 
++#include 
+ int main() {
+   printf("%d", _libiconv_version);
+   return 0;
+-- 
+2.43.0
+

diff --git a/dev-lang/php/php-8.1.27-r1.ebuild 
b/dev-lang/php/php-8.1.27-r2.ebuild
similarity index 99%
rename from dev-lang/php/php-8.1.27-r1.ebuild
rename to dev-lang/php/php-8.1.27-r2.ebuild
index ee3853ec5893..38bbbc21e31c 100644
--- a/dev-lang/php/php-8.1.27-r1.ebuild
+++ b/dev-lang/php/php-8.1.27-r2.ebuild
@@ -149,6 +149,7 @@ PATCHES=(
"${FILESDIR}/php-iodbc-header-location.patch"
"${FILESDIR}/php-capstone-optional.patch"
"${FILESDIR}/php-8.1.27-gcc14-libxml.patch"
+   "${FILESDIR}/php-8.1.27-implicit-decls.patch"
 )
 
 # ARM/Windows functions that are expected to be undefined.
@@ -158,6 +159,12 @@ QA_CONFIG_IMPL_DECL_SKIP=(
_controlfp_s
 )
 
+# Functions from alternate iconv implementations (bug 925268)
+QA_CONFIG_IMPL_DECL_SKIP+=(
+   iconv_ccs_init
+   cstoccsid
+)
+
 php_install_ini() {
local phpsapi="${1}"
 



[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/

2024-02-22 Thread Michael Orlitzky
commit: 5e22a3e7f0ceb1f050498bde29d3d2885a47c51e
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Thu Feb 22 20:15:24 2024 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Thu Feb 22 20:18:16 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e22a3e7

dev-lang/php: whitelist more implicitly defined functions in ./configure

Closes: https://bugs.gentoo.org/925268
Signed-off-by: Michael Orlitzky  gentoo.org>

 dev-lang/php/php-8.2.16.ebuild | 8 +++-
 dev-lang/php/php-8.3.3.ebuild  | 8 +++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/dev-lang/php/php-8.2.16.ebuild b/dev-lang/php/php-8.2.16.ebuild
index b577e38682dd..78da01537337 100644
--- a/dev-lang/php/php-8.2.16.ebuild
+++ b/dev-lang/php/php-8.2.16.ebuild
@@ -152,13 +152,19 @@ PATCHES=(
"${FILESDIR}/php-8.2.8-openssl-tests.patch"
 )
 
-# ARM/Windows functions that are expected to be undefined.
+# ARM/Windows functions (bug 923335)
 QA_CONFIG_IMPL_DECL_SKIP=(
__crc32d
_controlfp
_controlfp_s
 )
 
+# Functions from alternate iconv implementations (bug 925268)
+QA_CONFIG_IMPL_DECL_SKIP+=(
+   iconv_ccs_init
+   cstoccsid
+)
+
 php_install_ini() {
local phpsapi="${1}"
 

diff --git a/dev-lang/php/php-8.3.3.ebuild b/dev-lang/php/php-8.3.3.ebuild
index c914d8167246..488c1dbec923 100644
--- a/dev-lang/php/php-8.3.3.ebuild
+++ b/dev-lang/php/php-8.3.3.ebuild
@@ -151,13 +151,19 @@ PATCHES=(
"${FILESDIR}/php-iodbc-header-location.patch"
 )
 
-# ARM/Windows functions that are expected to be undefined.
+# ARM/Windows functions (bug 923335)
 QA_CONFIG_IMPL_DECL_SKIP=(
__crc32d
_controlfp
_controlfp_s
 )
 
+# Functions from alternate iconv implementations (bug 925268)
+QA_CONFIG_IMPL_DECL_SKIP+=(
+   iconv_ccs_init
+   cstoccsid
+)
+
 php_install_ini() {
local phpsapi="${1}"
 



[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/files/, dev-lang/php/

2024-02-18 Thread Michael Orlitzky
commit: 4a5ef8029ab6211cfc7b710e1c0e49375dd1d0a7
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Sun Feb 18 22:57:48 2024 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Sun Feb 18 23:54:38 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a5ef802

dev-lang/php: replace 8.2.15-r1 and 8.3.2-r1 with 8.2.16 and 8.3.3

Closes: https://bugs.gentoo.org/923335
Signed-off-by: Michael Orlitzky  gentoo.org>

 dev-lang/php/Manifest|  3 ++-
 dev-lang/php/files/php-8.2.15-gcc14-build-fix.patch  | 16 
 dev-lang/php/{php-8.2.15-r1.ebuild => php-8.2.16.ebuild} |  8 +++-
 dev-lang/php/{php-8.3.2-r1.ebuild => php-8.3.3.ebuild}   |  8 +++-
 4 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index f0d120a348b5..1924401cad65 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -1,4 +1,5 @@
 DIST php-8.1.26.tar.xz 11809448 BLAKE2B 
e1d50f1de572580a207586b3c3b57081f7b9f1b680ffe8f9e82c88c9285af117dd7e9e2576fcb13119176cb9cd02b39481b6f40e9a1df81aa90b8c4d3e59e4b1
 SHA512 
5bc40077e57c0fccdf17810d688baea416f22ac248bb01b73d2e2590fc4cfabc7001c1c3833281a60870c74178f7b06cbc85474eba695aabf969ad0081a98417
 DIST php-8.1.27.tar.xz 11915228 BLAKE2B 
83f4f3c25435b26dc526dc1fd7aff44cd03157349f9bb6454e216525a16c2bbc3bfac47cce6b5ea8bfdfcf3c7f27e342fc602ca7d2491fe89db06ea93f686f0e
 SHA512 
07fb2b8e10e2487635e26bfd8a27949a26b85f76bc3984ad8599224bb7a7f9498d84299335ae5a0bba16599275e9747ab141f73f4f2076ddf49ebec8e76fd0ed
 DIST php-8.2.15.tar.xz 12075384 BLAKE2B 
cef15868968538e232093bd66d862a88f0960325f2274eaf53a3d114d01787c58844aa3bce8bc09a723acd95801e1935a60e79fc189317e7f1ba19196dbfcdc4
 SHA512 
56c94bcafe07cf4bf5eb5fc6c67fcf16654c44a262ffb18188fc3ffac5e9bb11d39093bfb26c26bc8d2dec7e530d1a175180909262c9b5c30130cf5a4a293166
-DIST php-8.3.2.tar.xz 12440200 BLAKE2B 
90ab2fe220d99cc1da47162e04c768dc35ed4044ea9154f67bbc9124372859b85a33270bc38d41e9ab28df4b0defaf0e78cffe8eb8bd6fdfbec296a31ea4beab
 SHA512 
acf9013d35ae639558fd4816d12dcae03f8af7944c2639f33cd33517503c6170d30101da6c72ebdaf5542bcaf858a54a22ecc8f86822a128f52938bd6ea9606c
+DIST php-8.2.16.tar.xz 12085228 BLAKE2B 
6fcf3f5be8443c70e88746fdd609016c322b86ebc0257ee8db0f8551c73804bae2ecb156ee835b09aedb23bb2026658c3f24a8f722dce80e427bdab844bc27ce
 SHA512 
99e5c9eee4c5a35b3e1939c748ded87c8bff4a340d677516ed24dcf4207c51403d38524c46d6e79de5efe90d7368ba82052ec8a29dd5955f549e8198c1e917f6
+DIST php-8.3.3.tar.xz 12463880 BLAKE2B 
ac0baabe875be8ce42c26713f78733140d47f33636aa0e16e2685c83f558afea905707ca133b06ea28ad8de043d7db7d0931259c7c07a2de2c04a935d76db365
 SHA512 
42141cc46b6abb11fa51cc96c34424cbf9990150b973d84488fa39a07935b22552a1316978f5a4e48762bf3c94eee3d7dfe741c4ee1a12bf752ce1c2660cc8b0

diff --git a/dev-lang/php/files/php-8.2.15-gcc14-build-fix.patch 
b/dev-lang/php/files/php-8.2.15-gcc14-build-fix.patch
deleted file mode 100644
index 5f21f442ee06..
--- a/dev-lang/php/files/php-8.2.15-gcc14-build-fix.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-https://github.com/php/php-src/commit/72526609413e8a8cd768ed4966c17b1a9db6c12c.patch
-From: Remi Collet 
-Date: Mon, 22 Jan 2024 10:01:25 +0100
-Subject: [PATCH] Fix GH-13215 GCC 14 build
-
 a/Zend/zend_atomic.h
-+++ b/Zend/zend_atomic.h
-@@ -23,7 +23,7 @@
-   ((__GNUC__ == (x) && __GNUC_MINOR__ >= (y)) || (__GNUC__ > (x)))
- 
- /* Builtins are used to avoid library linkage */
--#if __has_feature(c_atomic)
-+#if __has_feature(c_atomic) && defined(__clang__)
- #define   HAVE_C11_ATOMICS 1
- #elif ZEND_GCC_PREREQ(4, 7)
- #define   HAVE_GNUC_ATOMICS 1

diff --git a/dev-lang/php/php-8.2.15-r1.ebuild b/dev-lang/php/php-8.2.16.ebuild
similarity index 99%
rename from dev-lang/php/php-8.2.15-r1.ebuild
rename to dev-lang/php/php-8.2.16.ebuild
index 66bb272f5852..b577e38682dd 100644
--- a/dev-lang/php/php-8.2.15-r1.ebuild
+++ b/dev-lang/php/php-8.2.16.ebuild
@@ -150,7 +150,13 @@ PATCHES=(
"${FILESDIR}/php-iodbc-header-location.patch"
"${FILESDIR}/php-capstone-optional.patch"
"${FILESDIR}/php-8.2.8-openssl-tests.patch"
-   "${FILESDIR}/php-8.2.15-gcc14-build-fix.patch"
+)
+
+# ARM/Windows functions that are expected to be undefined.
+QA_CONFIG_IMPL_DECL_SKIP=(
+   __crc32d
+   _controlfp
+   _controlfp_s
 )
 
 php_install_ini() {

diff --git a/dev-lang/php/php-8.3.2-r1.ebuild b/dev-lang/php/php-8.3.3.ebuild
similarity index 99%
rename from dev-lang/php/php-8.3.2-r1.ebuild
rename to dev-lang/php/php-8.3.3.ebuild
index e2dff19d343f..c914d8167246 100644
--- a/dev-lang/php/php-8.3.2-r1.ebuild
+++ b/dev-lang/php/php-8.3.3.ebuild
@@ -149,7 +149,13 @@ PHP_MV="$(ver_cut 1)"
 
 PATCHES=(
"${FILESDIR}/php-iodbc-header-location.patch"
-   "${FILESDIR}/php-8.2.15-gcc14-build-fix.patch"
+)
+
+# ARM/Windows functions that are expected to be undefined.
+QA_CONFIG_IMPL_DECL_SKIP=(
+   __crc32d
+   _controlfp
+   _controlfp_s

[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/

2024-02-18 Thread Michael Orlitzky
commit: e4569ff3821f4293e4d90831d9f7dff4ba7c2fe4
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Sun Feb 18 22:55:17 2024 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Sun Feb 18 23:54:20 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4569ff3

dev-lang/php: whitelist some implicit function declarations for php-8.1.x

Bug: https://bugs.gentoo.org/923335
Signed-off-by: Michael Orlitzky  gentoo.org>

 dev-lang/php/php-8.1.27-r1.ebuild | 7 +++
 1 file changed, 7 insertions(+)

diff --git a/dev-lang/php/php-8.1.27-r1.ebuild 
b/dev-lang/php/php-8.1.27-r1.ebuild
index 3e3a44b7b8b2..ee3853ec5893 100644
--- a/dev-lang/php/php-8.1.27-r1.ebuild
+++ b/dev-lang/php/php-8.1.27-r1.ebuild
@@ -151,6 +151,13 @@ PATCHES=(
"${FILESDIR}/php-8.1.27-gcc14-libxml.patch"
 )
 
+# ARM/Windows functions that are expected to be undefined.
+QA_CONFIG_IMPL_DECL_SKIP=(
+   __crc32d
+   _controlfp
+   _controlfp_s
+)
+
 php_install_ini() {
local phpsapi="${1}"
 



[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/

2024-02-18 Thread Florian Schmaus
commit: 0cb25fed90fc2b486db81b0280eac098493bc616
Author: Florian Schmaus  gentoo  org>
AuthorDate: Sun Feb 18 21:06:14 2024 +
Commit: Florian Schmaus  gentoo  org>
CommitDate: Sun Feb 18 21:06:57 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0cb25fed

dev-lang/php: stabilize 8.2.15 for amd64

Signed-off-by: Florian Schmaus  gentoo.org>

 dev-lang/php/php-8.2.15.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-lang/php/php-8.2.15.ebuild b/dev-lang/php/php-8.2.15.ebuild
index 319a89ce6357..8fe44bc9dc97 100644
--- a/dev-lang/php/php-8.2.15.ebuild
+++ b/dev-lang/php/php-8.2.15.ebuild
@@ -20,7 +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"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~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"



[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/

2024-02-11 Thread Michael Orlitzky
commit: 32fa4cdd6e101f6ba7ad73b69de81e946da6a9dd
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Sun Feb 11 13:20:28 2024 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Sun Feb 11 13:28:37 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32fa4cdd

dev-lang/php: declare USE=ipv6 locally to hide pkgcheck warnings

Signed-off-by: Michael Orlitzky  gentoo.org>

 dev-lang/php/metadata.xml | 5 +
 1 file changed, 5 insertions(+)

diff --git a/dev-lang/php/metadata.xml b/dev-lang/php/metadata.xml
index 872340a0fadf..b903ac6d3745 100644
--- a/dev-lang/php/metadata.xml
+++ b/dev-lang/php/metadata.xml
@@ -62,6 +62,11 @@
   media-libs/libjpeg-turbo and
   media-libs/libpng)
 
+
+
+  Support IPv6 connectivity in fopen and friends, and v6 address
+  conversions in functions like inet_pton and inet_ntop.
+
 
   Add dbm support for .ini files
 



[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/, dev-lang/php/files/

2024-02-07 Thread Michael Orlitzky
commit: 41aa2e2135771de335e4487e8e4363b1e75f6aec
Author: Brahmajit Das  gmail  com>
AuthorDate: Wed Feb  7 09:20:36 2024 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Thu Feb  8 00:29:19 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41aa2e21

dev-lang/php: Fix implicit declaration of function '__c11_atomic_load'

This is observed with GCC14 and upstream commit[0] fixing the bug is
merged only in RC branches.

[0]: 
https://github.com/php/php-src/commit/72526609413e8a8cd768ed4966c17b1a9db6c12c.patch

Closes: https://bugs.gentoo.org/919003
Closes: https://github.com/gentoo/gentoo/pull/35210
Signed-off-by: Brahmajit Das  gmail.com>
Signed-off-by: Michael Orlitzky  gentoo.org>

 .../php/files/php-8.2.15-gcc14-build-fix.patch |  16 +
 dev-lang/php/php-8.2.15-r1.ebuild  | 840 +
 dev-lang/php/php-8.3.2-r1.ebuild   | 802 
 3 files changed, 1658 insertions(+)

diff --git a/dev-lang/php/files/php-8.2.15-gcc14-build-fix.patch 
b/dev-lang/php/files/php-8.2.15-gcc14-build-fix.patch
new file mode 100644
index ..5f21f442ee06
--- /dev/null
+++ b/dev-lang/php/files/php-8.2.15-gcc14-build-fix.patch
@@ -0,0 +1,16 @@
+https://github.com/php/php-src/commit/72526609413e8a8cd768ed4966c17b1a9db6c12c.patch
+From: Remi Collet 
+Date: Mon, 22 Jan 2024 10:01:25 +0100
+Subject: [PATCH] Fix GH-13215 GCC 14 build
+
+--- a/Zend/zend_atomic.h
 b/Zend/zend_atomic.h
+@@ -23,7 +23,7 @@
+   ((__GNUC__ == (x) && __GNUC_MINOR__ >= (y)) || (__GNUC__ > (x)))
+ 
+ /* Builtins are used to avoid library linkage */
+-#if __has_feature(c_atomic)
++#if __has_feature(c_atomic) && defined(__clang__)
+ #define   HAVE_C11_ATOMICS 1
+ #elif ZEND_GCC_PREREQ(4, 7)
+ #define   HAVE_GNUC_ATOMICS 1

diff --git a/dev-lang/php/php-8.2.15-r1.ebuild 
b/dev-lang/php/php-8.2.15-r1.ebuild
new file mode 100644
index ..66bb272f5852
--- /dev/null
+++ b/dev-lang/php/php-8.2.15-r1.ebuild
@@ -0,0 +1,840 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+WANT_AUTOMAKE="none"
+
+inherit flag-o-matic multilib systemd autotools
+
+DESCRIPTION="The PHP language runtime engine"
+HOMEPAGE="https://www.php.net/";
+SRC_URI="https://www.php.net/distributions/${P}.tar.xz";
+
+LICENSE="PHP-3.01
+   BSD
+   Zend-2.0
+   bcmath? ( LGPL-2.1+ )
+   fpm? ( BSD-2 )
+   gd? ( gd )
+   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"
+
+# We can build the following SAPIs in the given order
+SAPIS="embed cli cgi fpm apache2 phpdbg"
+
+# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
+IUSE="${IUSE}
+   ${SAPIS/cli/+cli}
+   threads"
+
+IUSE="${IUSE} acl apparmor argon2 avif bcmath berkdb bzip2 calendar
+   cdb cjk +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
+   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
+   valgrind webp +xml xmlreader xmlwriter 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 )
+   webp? ( gd zlib )
+   cjk? ( gd zlib )
+   exif? ( gd zlib )
+   xpm? ( gd zlib )
+   gd? ( zlib )
+   simplexml? ( xml )
+   soap? ( xml )
+   xmlreader? ( xml )
+   xmlwriter? ( xml )
+   xslt? ( xml )
+   ldap-sasl? ( ldap )
+   oci8-instant-client? ( !ldap )
+   qdbm? ( !gdbm )
+   session-mm? ( session !threads )
+   mysql? ( || ( mysqli pdo ) )
+   firebird? ( pdo )
+   mssql? ( pdo )
+   test? ( cli )
+"
+
+RESTRICT="!test? ( test )"
+
+# The supported (that is, autodetected) versions of BDB are listed in
+# 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?]
+   >=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=] )
+ 

[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/

2024-02-07 Thread Michael Orlitzky
commit: 02b31a03283229422330dafd71bddcc0deeb14c2
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Wed Feb  7 18:04:19 2024 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Thu Feb  8 00:29:22 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02b31a03

dev-lang/php: drop 8.3.2

Signed-off-by: Michael Orlitzky  gentoo.org>

 dev-lang/php/php-8.3.2.ebuild | 801 --
 1 file changed, 801 deletions(-)

diff --git a/dev-lang/php/php-8.3.2.ebuild b/dev-lang/php/php-8.3.2.ebuild
deleted file mode 100644
index 2f308ebfbdf4..
--- a/dev-lang/php/php-8.3.2.ebuild
+++ /dev/null
@@ -1,801 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-WANT_AUTOMAKE="none"
-
-inherit flag-o-matic multilib systemd autotools
-
-DESCRIPTION="The PHP language runtime engine"
-HOMEPAGE="https://www.php.net/";
-SRC_URI="https://www.php.net/distributions/${P}.tar.xz";
-
-LICENSE="PHP-3.01
-   BSD
-   Zend-2.0
-   bcmath? ( LGPL-2.1+ )
-   fpm? ( BSD-2 )
-   gd? ( gd )
-   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"
-
-# We can build the following SAPIs in the given order
-SAPIS="embed cli cgi fpm apache2 phpdbg"
-
-# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
-IUSE="${IUSE}
-   ${SAPIS/cli/+cli}
-   threads"
-
-IUSE="${IUSE} acl apparmor argon2 avif bcmath berkdb bzip2 calendar
-   capstone cdb cjk +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
-   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
-   valgrind webp +xml xmlreader xmlwriter 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 )
-   webp? ( gd zlib )
-   cjk? ( gd zlib )
-   exif? ( gd zlib )
-   xpm? ( gd zlib )
-   gd? ( zlib )
-   simplexml? ( xml )
-   soap? ( xml )
-   xmlreader? ( xml )
-   xmlwriter? ( xml )
-   xslt? ( xml )
-   ldap-sasl? ( ldap )
-   oci8-instant-client? ( !ldap )
-   qdbm? ( !gdbm )
-   session-mm? ( session !threads )
-   mysql? ( || ( mysqli pdo ) )
-   firebird? ( pdo )
-   mssql? ( pdo )
-   test? ( cli )
-"
-
-RESTRICT="!test? ( test )"
-
-# The supported (that is, autodetected) versions of BDB are listed in
-# 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[apache2?,fpm?]
-   dev-libs/libpcre2[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:= )
-   avif? ( media-libs/libavif:= )
-   berkdb? ( || (  sys-libs/db:5.3 sys-libs/db:4.8 ) )
-   bzip2? ( app-arch/bzip2:0= )
-   capstone? ( dev-libs/capstone )
-   cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
-   curl? ( net-misc/curl )
-   enchant? ( app-text/enchant:2 )
-   ffi? ( dev-libs/libffi:= )
-   firebird? ( dev-db/firebird )
-   gd? ( media-libs/libjpeg-turbo:0= media-libs/libpng:0= )
-   gdbm? ( sys-libs/gdbm:0= )
-   gmp? ( dev-libs/gmp:0= )
-   iconv? ( virtual/libiconv )
-   imap? ( net-libs/c-client[kerberos=,ssl=] )
-   intl? ( dev-libs/icu:= )
-   kerberos? ( virtual/krb5 )
-   ldap? ( net-nds/openldap:= )
-   ldap-sasl? ( dev-libs/cyrus-sasl )
-   libedit? ( dev-libs/libedit )
-   lmdb? ( dev-db/lmdb:= )
-   mssql? ( dev-db/freetds[mssql] )
-   nls? ( sys-devel/gettext )
-   oci8-instant-client? ( dev-db/oracle-instantclient[sdk] )
-   odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( dev-db/unixODBC ) )
-   postgres? ( dev-db/postgresql:* )
-   qdbm? ( dev-db/qdbm )
-   readline? ( sys-libs/readline:0= )
-   session-mm? ( dev-libs/mm )
-   snmp? ( net-analyzer/net-snmp )
-   sodium? ( dev-libs/libsodium:=[-minimal(-)] )
-   spell? ( app-text/aspell )
-   sqlite? ( de

[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/

2024-02-07 Thread Michael Orlitzky
commit: 547a636153689918f1bb46d5cf4cea60312a1862
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Wed Feb  7 13:43:55 2024 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Wed Feb  7 14:43:34 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=547a6361

dev-lang/php: drop 8.1.27

Signed-off-by: Michael Orlitzky  gentoo.org>

 dev-lang/php/php-8.1.27.ebuild | 766 -
 1 file changed, 766 deletions(-)

diff --git a/dev-lang/php/php-8.1.27.ebuild b/dev-lang/php/php-8.1.27.ebuild
deleted file mode 100644
index ae56343d00b2..
--- a/dev-lang/php/php-8.1.27.ebuild
+++ /dev/null
@@ -1,766 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-WANT_AUTOMAKE="none"
-
-inherit flag-o-matic multilib systemd autotools
-
-DESCRIPTION="The PHP language runtime engine"
-HOMEPAGE="https://www.php.net/";
-SRC_URI="https://www.php.net/distributions/${P}.tar.xz";
-
-LICENSE="PHP-3.01
-   BSD
-   Zend-2.0
-   bcmath? ( LGPL-2.1+ )
-   fpm? ( BSD-2 )
-   gd? ( gd )
-   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"
-
-# We can build the following SAPIs in the given order
-SAPIS="embed cli cgi fpm apache2 phpdbg"
-
-# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
-IUSE="${IUSE}
-   ${SAPIS/cli/+cli}
-   threads"
-
-IUSE="${IUSE} acl apparmor argon2 avif 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
-   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"
-
-# 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 )
-   webp? ( gd zlib )
-   cjk? ( gd zlib )
-   exif? ( gd zlib )
-   xpm? ( gd zlib )
-   gd? ( zlib )
-   simplexml? ( xml )
-   soap? ( xml )
-   xmlreader? ( xml )
-   xmlwriter? ( xml )
-   xslt? ( xml )
-   ldap-sasl? ( ldap )
-   oci8-instant-client? ( !ldap )
-   qdbm? ( !gdbm )
-   session-mm? ( session !threads )
-   mysql? ( || ( mysqli pdo ) )
-   firebird? ( pdo )
-   mssql? ( pdo )
-"
-
-RESTRICT="!test? ( test )"
-
-# The supported (that is, autodetected) versions of BDB are listed in
-# 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?]
-   >=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 ) )
-   coverage? ( dev-util/lcov )
-   curl? ( >=net-misc/curl-7.29.0 )
-   enchant? ( app-text/enchant:2 )
-   ffi? ( >=dev-libs/libffi-3.0.11:= )
-   firebird? ( dev-db/firebird )
-   gd? ( media-libs/libjpeg-turbo:0= media-libs/libpng:0= )
-   gdbm? ( >=sys-libs/gdbm-1.8.0:0= )
-   gmp? ( dev-libs/gmp:0= )
-   iconv? ( virtual/libiconv )
-   imap? ( net-libs/c-client[kerberos=,ssl=] )
-   intl? ( dev-libs/icu:= )
-   kerberos? ( virtual/krb5 )
-   ldap? ( >=net-nds/openldap-1.2.11:= )
-   ldap-sasl? ( dev-libs/cyrus-sasl )
-   libedit? ( dev-libs/libedit )
-   lmdb? ( dev-db/lmdb:= )
-   mssql? ( dev-db/freetds[mssql] )
-   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:* )
-   qdbm? ( dev-db/qdbm )
-   readline? ( sys-libs/readline:0= )
-   session-mm? ( dev-libs/mm )
-   snmp? ( >=net-analyzer/net-snmp-5.2 )
-   sodium? ( dev-libs/libsodium:=[-minimal(-)] )
-   spell? ( >=app-text/aspell-0.50 )
-

[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/, dev-lang/php/files/

2024-02-07 Thread Michael Orlitzky
commit: d306a40ad0a2df3f2519749b7979375a4e099d57
Author: Brahmajit Das  gmail  com>
AuthorDate: Wed Feb  7 09:10:09 2024 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Wed Feb  7 14:43:31 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d306a40a

dev-lang/php: Fix incompatible function pointer types passing void

The was to include upstream commit 0a39890 which addresses the build
failiure.

Closes: https://bugs.gentoo.org/923884
Closes: https://github.com/gentoo/gentoo/pull/35209
Signed-off-by: Michael Orlitzky  gentoo.org>
Signed-off-by: Brahmajit Das  gmail.com>

 dev-lang/php/files/php-8.1.27-gcc14-libxml.patch |  57 ++
 dev-lang/php/php-8.1.27-r1.ebuild| 767 +++
 2 files changed, 824 insertions(+)

diff --git a/dev-lang/php/files/php-8.1.27-gcc14-libxml.patch 
b/dev-lang/php/files/php-8.1.27-gcc14-libxml.patch
new file mode 100644
index ..f477ba541bfa
--- /dev/null
+++ b/dev-lang/php/files/php-8.1.27-gcc14-libxml.patch
@@ -0,0 +1,57 @@
+https://github.com/php/php-src/commit/0a39890c967aa57225bb6bdf4821aff7a3a3c082.patch
+From: Niels Dossche <7771979+niels...@users.noreply.github.com>
+Date: Fri, 1 Dec 2023 18:03:35 +0100
+Subject: [PATCH] Fix libxml2 2.12 build due to API breaks
+
+See https://github.com/php/php-src/actions/runs/7062192818/job/19225478601
+--- a/ext/libxml/libxml.c
 b/ext/libxml/libxml.c
+@@ -472,7 +472,11 @@ static void _php_libxml_free_error(void *ptr)
+   xmlResetError((xmlErrorPtr) ptr);
+ }
+ 
+-static void _php_list_set_error_structure(xmlErrorPtr error, const char *msg)
++#if LIBXML_VERSION >= 21200
++static void _php_list_set_error_structure(const xmlError *error, const char 
*msg)
++#else
++static void _php_list_set_error_structure(xmlError *error, const char *msg)
++#endif
+ {
+   xmlError error_copy;
+   int ret;
+@@ -725,7 +729,11 @@ PHP_LIBXML_API void php_libxml_ctx_warning(void *ctx, 
const char *msg, ...)
+   va_end(args);
+ }
+ 
++#if LIBXML_VERSION >= 21200
++PHP_LIBXML_API void php_libxml_structured_error_handler(void *userData, const 
xmlError *error)
++#else
+ PHP_LIBXML_API void php_libxml_structured_error_handler(void *userData, 
xmlErrorPtr error)
++#endif
+ {
+   _php_list_set_error_structure(error, NULL);
+ 
+@@ -957,11 +965,9 @@ PHP_FUNCTION(libxml_use_internal_errors)
+ /* {{{ Retrieve last error from libxml */
+ PHP_FUNCTION(libxml_get_last_error)
+ {
+-  xmlErrorPtr error;
+-
+   ZEND_PARSE_PARAMETERS_NONE();
+ 
+-  error = xmlGetLastError();
++  const xmlError *error = xmlGetLastError();
+ 
+   if (error) {
+   object_init_ex(return_value, libxmlerror_class_entry);
+--- a/ext/soap/php_sdl.c
 b/ext/soap/php_sdl.c
+@@ -332,7 +332,7 @@ static void load_wsdl_ex(zval *this_ptr, char *struri, 
sdlCtx *ctx, int include)
+   sdl_restore_uri_credentials(ctx);
+ 
+   if (!wsdl) {
+-  xmlErrorPtr xmlErrorPtr = xmlGetLastError();
++  const xmlError *xmlErrorPtr = xmlGetLastError();
+ 
+   if (xmlErrorPtr) {
+   soap_error2(E_ERROR, "Parsing WSDL: Couldn't load from 
'%s' : %s", struri, xmlErrorPtr->message);

diff --git a/dev-lang/php/php-8.1.27-r1.ebuild 
b/dev-lang/php/php-8.1.27-r1.ebuild
new file mode 100644
index ..3e3a44b7b8b2
--- /dev/null
+++ b/dev-lang/php/php-8.1.27-r1.ebuild
@@ -0,0 +1,767 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+WANT_AUTOMAKE="none"
+
+inherit flag-o-matic multilib systemd autotools
+
+DESCRIPTION="The PHP language runtime engine"
+HOMEPAGE="https://www.php.net/";
+SRC_URI="https://www.php.net/distributions/${P}.tar.xz";
+
+LICENSE="PHP-3.01
+   BSD
+   Zend-2.0
+   bcmath? ( LGPL-2.1+ )
+   fpm? ( BSD-2 )
+   gd? ( gd )
+   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"
+
+# We can build the following SAPIs in the given order
+SAPIS="embed cli cgi fpm apache2 phpdbg"
+
+# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
+IUSE="${IUSE}
+   ${SAPIS/cli/+cli}
+   threads"
+
+IUSE="${IUSE} acl apparmor argon2 avif 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
+   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"
+
+# Without USE=readline or 

[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/

2024-01-30 Thread Sam James
commit: 35ee578c56edf291cfff2fb361ef13b4aa94b6d2
Author: Sam James  gentoo  org>
AuthorDate: Tue Jan 30 16:00:52 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jan 30 16:00:52 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35ee578c

dev-lang/php: Stabilize 8.2.15 arm, #920701

Signed-off-by: Sam James  gentoo.org>

 dev-lang/php/php-8.2.15.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-lang/php/php-8.2.15.ebuild b/dev-lang/php/php-8.2.15.ebuild
index a250eec54294..319a89ce6357 100644
--- a/dev-lang/php/php-8.2.15.ebuild
+++ b/dev-lang/php/php-8.2.15.ebuild
@@ -20,7 +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"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~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"



[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/

2024-01-24 Thread Michael Orlitzky
commit: 1658e7c1961e3bb4f4e0ca6c494cade3f87d9561
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Thu Jan 25 01:22:13 2024 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Thu Jan 25 02:07:33 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1658e7c1

dev-lang/php: add 8.2.15, drop 8.2.13-r2

Bug: https://bugs.gentoo.org/922742
Bug: https://bugs.gentoo.org/922812
Signed-off-by: Michael Orlitzky  gentoo.org>

 dev-lang/php/Manifest| 2 +-
 dev-lang/php/{php-8.2.13-r2.ebuild => php-8.2.15.ebuild} | 4 
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index ee648cd44a22..3df86f8438e4 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -1,4 +1,4 @@
 DIST php-8.1.20.tar.xz 11793228 BLAKE2B 
ecdaf43278b69e039e5440b441a89d02ea53e8246515a89f430d7affbaefa3e1637a6830f91dc9062961719ba5bf7c56993f3b47db96b56c14111f77c74a3096
 SHA512 
d93767c6ff4d305c209e1a0fcb17f19b1d417fa872b002413ebe7883e93900c210e8f122410ac54da373b9d10dd2f522ea2bafc9b66214fb466314d64907a558
 DIST php-8.1.26.tar.xz 11809448 BLAKE2B 
e1d50f1de572580a207586b3c3b57081f7b9f1b680ffe8f9e82c88c9285af117dd7e9e2576fcb13119176cb9cd02b39481b6f40e9a1df81aa90b8c4d3e59e4b1
 SHA512 
5bc40077e57c0fccdf17810d688baea416f22ac248bb01b73d2e2590fc4cfabc7001c1c3833281a60870c74178f7b06cbc85474eba695aabf969ad0081a98417
-DIST php-8.2.13.tar.xz 12069092 BLAKE2B 
24da2de8cb00bb2aac485360a14f75d6ce3df1bae78b4bf46e013888aa7f1e9d9e077ca40462fe36c59e19a7c45db05cbb0a64b140c07e4621baa99520a2865b
 SHA512 
8031e33d148c5acbfbb3ed00d7a266813c8919db86ba260ba65e1837d6db8d0bd66d8ddef66884466dd3fe51ece7882b03f8d8db6ff4383f80a68b7beafc03af
+DIST php-8.2.15.tar.xz 12075384 BLAKE2B 
cef15868968538e232093bd66d862a88f0960325f2274eaf53a3d114d01787c58844aa3bce8bc09a723acd95801e1935a60e79fc189317e7f1ba19196dbfcdc4
 SHA512 
56c94bcafe07cf4bf5eb5fc6c67fcf16654c44a262ffb18188fc3ffac5e9bb11d39093bfb26c26bc8d2dec7e530d1a175180909262c9b5c30130cf5a4a293166
 DIST php-8.3.2.tar.xz 12440200 BLAKE2B 
90ab2fe220d99cc1da47162e04c768dc35ed4044ea9154f67bbc9124372859b85a33270bc38d41e9ab28df4b0defaf0e78cffe8eb8bd6fdfbec296a31ea4beab
 SHA512 
acf9013d35ae639558fd4816d12dcae03f8af7944c2639f33cd33517503c6170d30101da6c72ebdaf5542bcaf858a54a22ecc8f86822a128f52938bd6ea9606c

diff --git a/dev-lang/php/php-8.2.13-r2.ebuild b/dev-lang/php/php-8.2.15.ebuild
similarity index 99%
rename from dev-lang/php/php-8.2.13-r2.ebuild
rename to dev-lang/php/php-8.2.15.ebuild
index e495796ce0d8..a250eec54294 100644
--- a/dev-lang/php/php-8.2.13-r2.ebuild
+++ b/dev-lang/php/php-8.2.15.ebuild
@@ -339,6 +339,10 @@ src_configure() {
$(use_enable threads zts)
)
 
+   # The slotted man/info pages will be missed by the default list of
+   # docompress paths.
+   docompress "${PHP_DESTDIR}/man" "${PHP_DESTDIR}/info"
+
our_conf+=(
$(use_with apparmor fpm-apparmor)
$(use_with argon2 password-argon2 "${EPREFIX}/usr")



[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/

2024-01-24 Thread Michael Orlitzky
commit: 1464fcc868cf288d2eb591add42fb1e39580c457
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Thu Jan 25 01:23:39 2024 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Thu Jan 25 02:15:21 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1464fcc8

dev-lang/php: add 8.1.27

Closes: https://bugs.gentoo.org/922742
Closes: https://bugs.gentoo.org/922812
Signed-off-by: Michael Orlitzky  gentoo.org>

 dev-lang/php/Manifest  |   1 +
 dev-lang/php/php-8.1.27.ebuild | 766 +
 2 files changed, 767 insertions(+)

diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index 3a2e7a24f7c3..f0d120a348b5 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -1,3 +1,4 @@
 DIST php-8.1.26.tar.xz 11809448 BLAKE2B 
e1d50f1de572580a207586b3c3b57081f7b9f1b680ffe8f9e82c88c9285af117dd7e9e2576fcb13119176cb9cd02b39481b6f40e9a1df81aa90b8c4d3e59e4b1
 SHA512 
5bc40077e57c0fccdf17810d688baea416f22ac248bb01b73d2e2590fc4cfabc7001c1c3833281a60870c74178f7b06cbc85474eba695aabf969ad0081a98417
+DIST php-8.1.27.tar.xz 11915228 BLAKE2B 
83f4f3c25435b26dc526dc1fd7aff44cd03157349f9bb6454e216525a16c2bbc3bfac47cce6b5ea8bfdfcf3c7f27e342fc602ca7d2491fe89db06ea93f686f0e
 SHA512 
07fb2b8e10e2487635e26bfd8a27949a26b85f76bc3984ad8599224bb7a7f9498d84299335ae5a0bba16599275e9747ab141f73f4f2076ddf49ebec8e76fd0ed
 DIST php-8.2.15.tar.xz 12075384 BLAKE2B 
cef15868968538e232093bd66d862a88f0960325f2274eaf53a3d114d01787c58844aa3bce8bc09a723acd95801e1935a60e79fc189317e7f1ba19196dbfcdc4
 SHA512 
56c94bcafe07cf4bf5eb5fc6c67fcf16654c44a262ffb18188fc3ffac5e9bb11d39093bfb26c26bc8d2dec7e530d1a175180909262c9b5c30130cf5a4a293166
 DIST php-8.3.2.tar.xz 12440200 BLAKE2B 
90ab2fe220d99cc1da47162e04c768dc35ed4044ea9154f67bbc9124372859b85a33270bc38d41e9ab28df4b0defaf0e78cffe8eb8bd6fdfbec296a31ea4beab
 SHA512 
acf9013d35ae639558fd4816d12dcae03f8af7944c2639f33cd33517503c6170d30101da6c72ebdaf5542bcaf858a54a22ecc8f86822a128f52938bd6ea9606c

diff --git a/dev-lang/php/php-8.1.27.ebuild b/dev-lang/php/php-8.1.27.ebuild
new file mode 100644
index ..ae56343d00b2
--- /dev/null
+++ b/dev-lang/php/php-8.1.27.ebuild
@@ -0,0 +1,766 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+WANT_AUTOMAKE="none"
+
+inherit flag-o-matic multilib systemd autotools
+
+DESCRIPTION="The PHP language runtime engine"
+HOMEPAGE="https://www.php.net/";
+SRC_URI="https://www.php.net/distributions/${P}.tar.xz";
+
+LICENSE="PHP-3.01
+   BSD
+   Zend-2.0
+   bcmath? ( LGPL-2.1+ )
+   fpm? ( BSD-2 )
+   gd? ( gd )
+   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"
+
+# We can build the following SAPIs in the given order
+SAPIS="embed cli cgi fpm apache2 phpdbg"
+
+# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
+IUSE="${IUSE}
+   ${SAPIS/cli/+cli}
+   threads"
+
+IUSE="${IUSE} acl apparmor argon2 avif 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
+   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"
+
+# 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 )
+   webp? ( gd zlib )
+   cjk? ( gd zlib )
+   exif? ( gd zlib )
+   xpm? ( gd zlib )
+   gd? ( zlib )
+   simplexml? ( xml )
+   soap? ( xml )
+   xmlreader? ( xml )
+   xmlwriter? ( xml )
+   xslt? ( xml )
+   ldap-sasl? ( ldap )
+   oci8-instant-client? ( !ldap )
+   qdbm? ( !gdbm )
+   session-mm? ( session !threads )
+   mysql? ( || ( mysqli pdo ) )
+   firebird? ( pdo )
+   mssql? ( pdo )
+"
+
+RESTRICT="!test? ( test )"
+
+# The supported (that is, autodetected) versions of BDB are listed in
+# 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?]
+   >=dev-libs/libpcre2-10.30[jit?,unicode]
+   virtual/libcrypt:=
+   fpm? ( acl? ( sys-apps/acl )

[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/

2024-01-24 Thread Michael Orlitzky
commit: eaae69a4083ffcf9c7a3a643774877849b2b1b08
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Thu Jan 25 01:22:39 2024 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Thu Jan 25 02:07:33 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eaae69a4

dev-lang/php: drop 8.1.20-r2

Signed-off-by: Michael Orlitzky  gentoo.org>

 dev-lang/php/Manifest |   1 -
 dev-lang/php/php-8.1.20-r2.ebuild | 759 --
 2 files changed, 760 deletions(-)

diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index 3df86f8438e4..3a2e7a24f7c3 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -1,4 +1,3 @@
-DIST php-8.1.20.tar.xz 11793228 BLAKE2B 
ecdaf43278b69e039e5440b441a89d02ea53e8246515a89f430d7affbaefa3e1637a6830f91dc9062961719ba5bf7c56993f3b47db96b56c14111f77c74a3096
 SHA512 
d93767c6ff4d305c209e1a0fcb17f19b1d417fa872b002413ebe7883e93900c210e8f122410ac54da373b9d10dd2f522ea2bafc9b66214fb466314d64907a558
 DIST php-8.1.26.tar.xz 11809448 BLAKE2B 
e1d50f1de572580a207586b3c3b57081f7b9f1b680ffe8f9e82c88c9285af117dd7e9e2576fcb13119176cb9cd02b39481b6f40e9a1df81aa90b8c4d3e59e4b1
 SHA512 
5bc40077e57c0fccdf17810d688baea416f22ac248bb01b73d2e2590fc4cfabc7001c1c3833281a60870c74178f7b06cbc85474eba695aabf969ad0081a98417
 DIST php-8.2.15.tar.xz 12075384 BLAKE2B 
cef15868968538e232093bd66d862a88f0960325f2274eaf53a3d114d01787c58844aa3bce8bc09a723acd95801e1935a60e79fc189317e7f1ba19196dbfcdc4
 SHA512 
56c94bcafe07cf4bf5eb5fc6c67fcf16654c44a262ffb18188fc3ffac5e9bb11d39093bfb26c26bc8d2dec7e530d1a175180909262c9b5c30130cf5a4a293166
 DIST php-8.3.2.tar.xz 12440200 BLAKE2B 
90ab2fe220d99cc1da47162e04c768dc35ed4044ea9154f67bbc9124372859b85a33270bc38d41e9ab28df4b0defaf0e78cffe8eb8bd6fdfbec296a31ea4beab
 SHA512 
acf9013d35ae639558fd4816d12dcae03f8af7944c2639f33cd33517503c6170d30101da6c72ebdaf5542bcaf858a54a22ecc8f86822a128f52938bd6ea9606c

diff --git a/dev-lang/php/php-8.1.20-r2.ebuild 
b/dev-lang/php/php-8.1.20-r2.ebuild
deleted file mode 100644
index 4de38b91c5c8..
--- a/dev-lang/php/php-8.1.20-r2.ebuild
+++ /dev/null
@@ -1,759 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-WANT_AUTOMAKE="none"
-
-inherit flag-o-matic multilib systemd autotools
-
-DESCRIPTION="The PHP language runtime engine"
-HOMEPAGE="https://www.php.net/";
-SRC_URI="https://www.php.net/distributions/${P}.tar.xz";
-
-LICENSE="PHP-3.01
-   BSD
-   Zend-2.0
-   bcmath? ( LGPL-2.1+ )
-   fpm? ( BSD-2 )
-   gd? ( gd )
-   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"
-
-# We can build the following SAPIs in the given order
-SAPIS="embed cli cgi fpm apache2 phpdbg"
-
-# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
-IUSE="${IUSE}
-   ${SAPIS/cli/+cli}
-   threads"
-
-IUSE="${IUSE} acl apparmor argon2 avif 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
-   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"
-
-# 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 )
-   webp? ( gd zlib )
-   cjk? ( gd zlib )
-   exif? ( gd zlib )
-   xpm? ( gd zlib )
-   gd? ( zlib )
-   simplexml? ( xml )
-   soap? ( xml )
-   xmlreader? ( xml )
-   xmlwriter? ( xml )
-   xslt? ( xml )
-   ldap-sasl? ( ldap )
-   oci8-instant-client? ( !ldap )
-   qdbm? ( !gdbm )
-   session-mm? ( session !threads )
-   mysql? ( || ( mysqli pdo ) )
-   firebird? ( pdo )
-   mssql? ( pdo )
-"
-
-RESTRICT="!test? ( test )"
-
-# The supported (that is, autodetected) versions of BDB are listed in
-# 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?]
-   >=dev-libs/libpcre2-10.30[jit?,unicode]
-   virtual/libcrypt:=
-   fpm? ( acl? ( sys-apps/acl ) apparmor? ( sys-libs/libapparmor ) )
-   apache2? ( www-serv

[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/

2024-01-24 Thread Michael Orlitzky
commit: 22a7c49a8fe26435a3fd01470a48f302b313ec31
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Thu Jan 25 00:56:32 2024 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Thu Jan 25 02:07:29 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22a7c49a

dev-lang/php: add 8.3.2, drop 8.3.0-r2

Bug: https://bugs.gentoo.org/922742
Bug: https://bugs.gentoo.org/922812
Signed-off-by: Michael Orlitzky  gentoo.org>

 dev-lang/php/Manifest  |  2 +-
 dev-lang/php/{php-8.3.0-r2.ebuild => php-8.3.2.ebuild} | 11 +++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index fd3ffb61811e..ee648cd44a22 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -1,4 +1,4 @@
 DIST php-8.1.20.tar.xz 11793228 BLAKE2B 
ecdaf43278b69e039e5440b441a89d02ea53e8246515a89f430d7affbaefa3e1637a6830f91dc9062961719ba5bf7c56993f3b47db96b56c14111f77c74a3096
 SHA512 
d93767c6ff4d305c209e1a0fcb17f19b1d417fa872b002413ebe7883e93900c210e8f122410ac54da373b9d10dd2f522ea2bafc9b66214fb466314d64907a558
 DIST php-8.1.26.tar.xz 11809448 BLAKE2B 
e1d50f1de572580a207586b3c3b57081f7b9f1b680ffe8f9e82c88c9285af117dd7e9e2576fcb13119176cb9cd02b39481b6f40e9a1df81aa90b8c4d3e59e4b1
 SHA512 
5bc40077e57c0fccdf17810d688baea416f22ac248bb01b73d2e2590fc4cfabc7001c1c3833281a60870c74178f7b06cbc85474eba695aabf969ad0081a98417
 DIST php-8.2.13.tar.xz 12069092 BLAKE2B 
24da2de8cb00bb2aac485360a14f75d6ce3df1bae78b4bf46e013888aa7f1e9d9e077ca40462fe36c59e19a7c45db05cbb0a64b140c07e4621baa99520a2865b
 SHA512 
8031e33d148c5acbfbb3ed00d7a266813c8919db86ba260ba65e1837d6db8d0bd66d8ddef66884466dd3fe51ece7882b03f8d8db6ff4383f80a68b7beafc03af
-DIST php-8.3.0.tar.xz 12431612 BLAKE2B 
c6c01b28edea15f05e8894bf69a9f4ea3ea6fb0a2bd70d9417ce9473d57636e08e19f62cac1dfee66d153e5aee4f1b99035ccc14bba1e41712971321deee264f
 SHA512 
8758bb0789787dda04f3d4a175f4d4a0bffadc8c3d272fefa000d6fd7b0c0a7096347c829c1ddfb3b60cf6300803d68ba6d8379f2a343e02d935ba77d01c5cf1
+DIST php-8.3.2.tar.xz 12440200 BLAKE2B 
90ab2fe220d99cc1da47162e04c768dc35ed4044ea9154f67bbc9124372859b85a33270bc38d41e9ab28df4b0defaf0e78cffe8eb8bd6fdfbec296a31ea4beab
 SHA512 
acf9013d35ae639558fd4816d12dcae03f8af7944c2639f33cd33517503c6170d30101da6c72ebdaf5542bcaf858a54a22ecc8f86822a128f52938bd6ea9606c

diff --git a/dev-lang/php/php-8.3.0-r2.ebuild b/dev-lang/php/php-8.3.2.ebuild
similarity index 98%
rename from dev-lang/php/php-8.3.0-r2.ebuild
rename to dev-lang/php/php-8.3.2.ebuild
index bbaa24f665a7..2f308ebfbdf4 100644
--- a/dev-lang/php/php-8.3.0-r2.ebuild
+++ b/dev-lang/php/php-8.3.2.ebuild
@@ -262,6 +262,13 @@ src_prepare() {
 
# https://github.com/php/php-src/issues/12801
rm ext/pcre/tests/gh11374.phpt || die
+
+   # A new test failure appearing in 8.3.2, mentioned on the PR
+   # where it was likely introduced:
+   #
+   #   https://github.com/php/php-src/pull/13017
+   #
+   rm ext/dom/tests/DOMNode_isEqualNode.phpt || die
 }
 
 src_configure() {
@@ -293,6 +300,10 @@ src_configure() {
$(use_enable threads zts)
)
 
+   # The slotted man/info pages will be missed by the default list of
+   # docompress paths.
+   docompress "${PHP_DESTDIR}/man" "${PHP_DESTDIR}/info"
+
our_conf+=(
$(use_with apparmor fpm-apparmor)
$(use_with argon2 password-argon2 "${EPREFIX}/usr")



[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/

2024-01-20 Thread Viorel Munteanu
commit: c5c33401f05b2ec526ebe6c98577b21bec531fe2
Author: Matoro Mahri  matoro  tk>
AuthorDate: Sat Jan 20 18:33:12 2024 +
Commit: Viorel Munteanu  gentoo  org>
CommitDate: Sun Jan 21 07:54:25 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5c33401

dev-lang/php: Stabilize 8.1.26-r1 ppc, #921178

Signed-off-by: Matoro Mahri  matoro.tk>
Signed-off-by: Viorel Munteanu  gentoo.org>

 dev-lang/php/php-8.1.26-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-lang/php/php-8.1.26-r1.ebuild 
b/dev-lang/php/php-8.1.26-r1.ebuild
index c892ece9f35c..4b24fb08bbe5 100644
--- a/dev-lang/php/php-8.1.26-r1.ebuild
+++ b/dev-lang/php/php-8.1.26-r1.ebuild
@@ -20,7 +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"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~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"



[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/

2024-01-15 Thread Sam James
commit: 29c7bd5b49c2dfe02b8c97ffda8592754ff3f7e0
Author: Matt Jolly  footclan  ninja>
AuthorDate: Tue Jan 16 05:22:17 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jan 16 07:59:24 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29c7bd5b

dev-lang/php: add 8.3.0-r2

dev-libs/libsodium is losing USE=minimal

Bug: https://bugs.gentoo.org/921614
Signed-off-by: Matt Jolly  footclan.ninja>
Signed-off-by: Sam James  gentoo.org>

 dev-lang/php/{php-8.3.0-r1.ebuild => php-8.3.0-r2.ebuild} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-lang/php/php-8.3.0-r1.ebuild b/dev-lang/php/php-8.3.0-r2.ebuild
similarity index 99%
rename from dev-lang/php/php-8.3.0-r1.ebuild
rename to dev-lang/php/php-8.3.0-r2.ebuild
index 0ed10cd2af85..bbaa24f665a7 100644
--- a/dev-lang/php/php-8.3.0-r1.ebuild
+++ b/dev-lang/php/php-8.3.0-r2.ebuild
@@ -111,7 +111,7 @@ COMMON_DEPEND="
readline? ( sys-libs/readline:0= )
session-mm? ( dev-libs/mm )
snmp? ( net-analyzer/net-snmp )
-   sodium? ( dev-libs/libsodium:=[-minimal] )
+   sodium? ( dev-libs/libsodium:=[-minimal(-)] )
spell? ( app-text/aspell )
sqlite? ( dev-db/sqlite )
ssl? ( dev-libs/openssl:0= )



[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/

2024-01-15 Thread Sam James
commit: 4468ba0548fb497cf12f9b8ebfc285558cfe43f3
Author: Matt Jolly  footclan  ninja>
AuthorDate: Tue Jan 16 05:19:40 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jan 16 07:59:23 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4468ba05

dev-lang/php: add 8.1.26-r1

dev-libs/libsodium is losing USE=minimal

Bug: https://bugs.gentoo.org/921614
Signed-off-by: Matt Jolly  footclan.ninja>
Signed-off-by: Sam James  gentoo.org>

 dev-lang/php/{php-8.1.26.ebuild => php-8.1.26-r1.ebuild} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-lang/php/php-8.1.26.ebuild b/dev-lang/php/php-8.1.26-r1.ebuild
similarity index 99%
rename from dev-lang/php/php-8.1.26.ebuild
rename to dev-lang/php/php-8.1.26-r1.ebuild
index 3b61d7af2e5e..6c427ecb6df1 100644
--- a/dev-lang/php/php-8.1.26.ebuild
+++ b/dev-lang/php/php-8.1.26-r1.ebuild
@@ -110,7 +110,7 @@ COMMON_DEPEND="
readline? ( sys-libs/readline:0= )
session-mm? ( dev-libs/mm )
snmp? ( >=net-analyzer/net-snmp-5.2 )
-   sodium? ( dev-libs/libsodium:=[-minimal] )
+   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= )



[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/

2024-01-15 Thread Sam James
commit: 2519d5b825d4a0dabc948ef1f72d2ed1f120f88d
Author: Matt Jolly  footclan  ninja>
AuthorDate: Tue Jan 16 05:20:35 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jan 16 07:59:24 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2519d5b8

dev-lang/php: add 8.2.13-r2

dev-libs/libsodium is losing USE=minimal

Bug: https://bugs.gentoo.org/921614
Signed-off-by: Matt Jolly  footclan.ninja>
Signed-off-by: Sam James  gentoo.org>

 dev-lang/php/{php-8.2.13-r1.ebuild => php-8.2.13-r2.ebuild} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-lang/php/php-8.2.13-r1.ebuild 
b/dev-lang/php/php-8.2.13-r2.ebuild
similarity index 99%
rename from dev-lang/php/php-8.2.13-r1.ebuild
rename to dev-lang/php/php-8.2.13-r2.ebuild
index 84a229cfcd7a..e495796ce0d8 100644
--- a/dev-lang/php/php-8.2.13-r1.ebuild
+++ b/dev-lang/php/php-8.2.13-r2.ebuild
@@ -110,7 +110,7 @@ COMMON_DEPEND="
readline? ( sys-libs/readline:0= )
session-mm? ( dev-libs/mm )
snmp? ( >=net-analyzer/net-snmp-5.2 )
-   sodium? ( dev-libs/libsodium:=[-minimal] )
+   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= )



[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/

2024-01-15 Thread Sam James
commit: dce94ccd70a018bfacb9cc0b2183a497676ddb81
Author: Matt Jolly  footclan  ninja>
AuthorDate: Tue Jan 16 05:17:58 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jan 16 07:59:23 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dce94ccd

dev-lang/php: add 8.1.20-r2

dev-libs/libsodium is losing USE=minimal

Bug: https://bugs.gentoo.org/921614
Signed-off-by: Matt Jolly  footclan.ninja>
Signed-off-by: Sam James  gentoo.org>

 dev-lang/php/{php-8.1.20-r1.ebuild => php-8.1.20-r2.ebuild} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-lang/php/php-8.1.20-r1.ebuild 
b/dev-lang/php/php-8.1.20-r2.ebuild
similarity index 99%
rename from dev-lang/php/php-8.1.20-r1.ebuild
rename to dev-lang/php/php-8.1.20-r2.ebuild
index ba1bebcdc20b..4de38b91c5c8 100644
--- a/dev-lang/php/php-8.1.20-r1.ebuild
+++ b/dev-lang/php/php-8.1.20-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -110,7 +110,7 @@ COMMON_DEPEND="
readline? ( sys-libs/readline:0= )
session-mm? ( dev-libs/mm )
snmp? ( >=net-analyzer/net-snmp-5.2 )
-   sodium? ( dev-libs/libsodium:=[-minimal] )
+   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= )



[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/

2024-01-10 Thread Sam James
commit: 23ead8b1d94cab57a484c3970034ed335dd988ca
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Wed Jan 10 13:20:10 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jan 10 15:02:55 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23ead8b1

dev-lang/php: stable 8.1.26 for sparc, bug #921178

Signed-off-by: Rolf Eike Beer  sf-mail.de>
Signed-off-by: Sam James  gentoo.org>

 dev-lang/php/php-8.1.26.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-lang/php/php-8.1.26.ebuild b/dev-lang/php/php-8.1.26.ebuild
index 9ead025a2ed1..3b61d7af2e5e 100644
--- a/dev-lang/php/php-8.1.26.ebuild
+++ b/dev-lang/php/php-8.1.26.ebuild
@@ -20,7 +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"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~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"



[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/

2024-01-06 Thread Sam James
commit: 443be710719334474be8649044c4b2bbd935067b
Author: Sam James  gentoo  org>
AuthorDate: Sun Jan  7 06:11:50 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jan  7 06:11:50 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=443be710

dev-lang/php: Stabilize 8.1.26 arm64, #921178

Signed-off-by: Sam James  gentoo.org>

 dev-lang/php/php-8.1.26.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-lang/php/php-8.1.26.ebuild b/dev-lang/php/php-8.1.26.ebuild
index f8f914921f9c..9ead025a2ed1 100644
--- a/dev-lang/php/php-8.1.26.ebuild
+++ b/dev-lang/php/php-8.1.26.ebuild
@@ -20,7 +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"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~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"



[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/

2024-01-03 Thread Arthur Zamarin
commit: 14fd569991578088415e8ec1d29ea4cc831add6e
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Wed Jan  3 18:51:36 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Wed Jan  3 18:51:36 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=14fd5699

dev-lang/php: Stabilize 8.1.26 amd64, #921178

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-lang/php/php-8.1.26.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-lang/php/php-8.1.26.ebuild b/dev-lang/php/php-8.1.26.ebuild
index 68fc0d60590b..f8f914921f9c 100644
--- a/dev-lang/php/php-8.1.26.ebuild
+++ b/dev-lang/php/php-8.1.26.ebuild
@@ -20,7 +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"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~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"



[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/

2024-01-03 Thread Arthur Zamarin
commit: ecc582803176f2377a2ccf29893e09c2452aee87
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Wed Jan  3 18:51:28 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Wed Jan  3 18:51:28 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ecc58280

dev-lang/php: Stabilize 8.1.26 arm, #921178

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-lang/php/php-8.1.26.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-lang/php/php-8.1.26.ebuild b/dev-lang/php/php-8.1.26.ebuild
index a0fa3a57e415..68fc0d60590b 100644
--- a/dev-lang/php/php-8.1.26.ebuild
+++ b/dev-lang/php/php-8.1.26.ebuild
@@ -20,7 +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"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~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"



[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/

2024-01-02 Thread Sam James
commit: 27f7a0c5bed2455ca18856acccda21861ac0b080
Author: Sam James  gentoo  org>
AuthorDate: Wed Jan  3 01:07:58 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jan  3 01:07:58 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27f7a0c5

dev-lang/php: Stabilize 8.1.26 x86, #921178

Signed-off-by: Sam James  gentoo.org>

 dev-lang/php/php-8.1.26.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-lang/php/php-8.1.26.ebuild b/dev-lang/php/php-8.1.26.ebuild
index 1e3a6c509724..a0fa3a57e415 100644
--- a/dev-lang/php/php-8.1.26.ebuild
+++ b/dev-lang/php/php-8.1.26.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -20,7 +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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~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"



[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/

2024-01-01 Thread Sam James
commit: 2a717430d8311c0eea224d1165dcce536d1f1b3e
Author: Sam James  gentoo  org>
AuthorDate: Tue Jan  2 05:19:39 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jan  2 05:19:39 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a717430

dev-lang/php: keyword 8.3.0-r1

Closes: https://bugs.gentoo.org/919313
Signed-off-by: Sam James  gentoo.org>

 dev-lang/php/php-8.3.0-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-lang/php/php-8.3.0-r1.ebuild b/dev-lang/php/php-8.3.0-r1.ebuild
index c694a628967e..c5abc844f96b 100644
--- a/dev-lang/php/php-8.3.0-r1.ebuild
+++ b/dev-lang/php/php-8.3.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -20,7 +20,7 @@ LICENSE="PHP-3.01
unicode? ( BSD-2 LGPL-2.1 )"
 
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux 
~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~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"



[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/

2023-12-08 Thread Michael Orlitzky
commit: 3f3dcbee1d366757fc869fa365717a7d31bae7c1
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Fri Dec  8 13:42:33 2023 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Fri Dec  8 13:46:42 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f3dcbee

dev-lang/php: always use the system libcrypt

Unbundling things has inherent value, but this in particular should lead
to better security. Thanks to hanno for noticing that it wasn't default!

The removal of --enable-ipv6 is unrelated and should be a no-op since we
append $(use_enable ipv6) to our econf args later on.

Closes: https://bugs.gentoo.org/919439
Signed-off-by: Michael Orlitzky  gentoo.org>

 dev-lang/php/{php-8.2.13.ebuild => php-8.2.13-r1.ebuild} | 2 +-
 dev-lang/php/{php-8.3.0.ebuild => php-8.3.0-r1.ebuild}   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-lang/php/php-8.2.13.ebuild b/dev-lang/php/php-8.2.13-r1.ebuild
similarity index 99%
rename from dev-lang/php/php-8.2.13.ebuild
rename to dev-lang/php/php-8.2.13-r1.ebuild
index 7d6a005d1c10..a0aadbfbb272 100644
--- a/dev-lang/php/php-8.2.13.ebuild
+++ b/dev-lang/php/php-8.2.13-r1.ebuild
@@ -335,7 +335,7 @@ src_configure() {
--localstatedir="${EPREFIX}/var"
--without-pear
--without-valgrind
-   --enable-ipv6
+   --with-external-libcrypt
$(use_enable threads zts)
)
 

diff --git a/dev-lang/php/php-8.3.0.ebuild b/dev-lang/php/php-8.3.0-r1.ebuild
similarity index 99%
rename from dev-lang/php/php-8.3.0.ebuild
rename to dev-lang/php/php-8.3.0-r1.ebuild
index 195326a5aff5..c694a628967e 100644
--- a/dev-lang/php/php-8.3.0.ebuild
+++ b/dev-lang/php/php-8.3.0-r1.ebuild
@@ -289,7 +289,7 @@ src_configure() {
--localstatedir="${EPREFIX}/var"
--without-pear
--without-valgrind
-   --enable-ipv6
+   --with-external-libcrypt
$(use_enable threads zts)
)
 



[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/

2023-12-05 Thread Michael Orlitzky
commit: d8a87a6f0c140f5a2911f2fb99a5b8f01348a34b
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Tue Dec  5 19:59:39 2023 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Wed Dec  6 02:00:41 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8a87a6f

dev-lang/php: add 8.3.0

Closes: https://bugs.gentoo.org/919148
Signed-off-by: Michael Orlitzky  gentoo.org>

 dev-lang/php/Manifest |   1 +
 dev-lang/php/php-8.3.0.ebuild | 790 ++
 2 files changed, 791 insertions(+)

diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index 73b9d4b3b1a1..fd3ffb61811e 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -1,3 +1,4 @@
 DIST php-8.1.20.tar.xz 11793228 BLAKE2B 
ecdaf43278b69e039e5440b441a89d02ea53e8246515a89f430d7affbaefa3e1637a6830f91dc9062961719ba5bf7c56993f3b47db96b56c14111f77c74a3096
 SHA512 
d93767c6ff4d305c209e1a0fcb17f19b1d417fa872b002413ebe7883e93900c210e8f122410ac54da373b9d10dd2f522ea2bafc9b66214fb466314d64907a558
 DIST php-8.1.26.tar.xz 11809448 BLAKE2B 
e1d50f1de572580a207586b3c3b57081f7b9f1b680ffe8f9e82c88c9285af117dd7e9e2576fcb13119176cb9cd02b39481b6f40e9a1df81aa90b8c4d3e59e4b1
 SHA512 
5bc40077e57c0fccdf17810d688baea416f22ac248bb01b73d2e2590fc4cfabc7001c1c3833281a60870c74178f7b06cbc85474eba695aabf969ad0081a98417
 DIST php-8.2.13.tar.xz 12069092 BLAKE2B 
24da2de8cb00bb2aac485360a14f75d6ce3df1bae78b4bf46e013888aa7f1e9d9e077ca40462fe36c59e19a7c45db05cbb0a64b140c07e4621baa99520a2865b
 SHA512 
8031e33d148c5acbfbb3ed00d7a266813c8919db86ba260ba65e1837d6db8d0bd66d8ddef66884466dd3fe51ece7882b03f8d8db6ff4383f80a68b7beafc03af
+DIST php-8.3.0.tar.xz 12431612 BLAKE2B 
c6c01b28edea15f05e8894bf69a9f4ea3ea6fb0a2bd70d9417ce9473d57636e08e19f62cac1dfee66d153e5aee4f1b99035ccc14bba1e41712971321deee264f
 SHA512 
8758bb0789787dda04f3d4a175f4d4a0bffadc8c3d272fefa000d6fd7b0c0a7096347c829c1ddfb3b60cf6300803d68ba6d8379f2a343e02d935ba77d01c5cf1

diff --git a/dev-lang/php/php-8.3.0.ebuild b/dev-lang/php/php-8.3.0.ebuild
new file mode 100644
index ..195326a5aff5
--- /dev/null
+++ b/dev-lang/php/php-8.3.0.ebuild
@@ -0,0 +1,790 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+WANT_AUTOMAKE="none"
+
+inherit flag-o-matic multilib systemd autotools
+
+DESCRIPTION="The PHP language runtime engine"
+HOMEPAGE="https://www.php.net/";
+SRC_URI="https://www.php.net/distributions/${P}.tar.xz";
+
+LICENSE="PHP-3.01
+   BSD
+   Zend-2.0
+   bcmath? ( LGPL-2.1+ )
+   fpm? ( BSD-2 )
+   gd? ( gd )
+   unicode? ( BSD-2 LGPL-2.1 )"
+
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~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"
+
+# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
+IUSE="${IUSE}
+   ${SAPIS/cli/+cli}
+   threads"
+
+IUSE="${IUSE} acl apparmor argon2 avif bcmath berkdb bzip2 calendar
+   capstone cdb cjk +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
+   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
+   valgrind webp +xml xmlreader xmlwriter 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 )
+   webp? ( gd zlib )
+   cjk? ( gd zlib )
+   exif? ( gd zlib )
+   xpm? ( gd zlib )
+   gd? ( zlib )
+   simplexml? ( xml )
+   soap? ( xml )
+   xmlreader? ( xml )
+   xmlwriter? ( xml )
+   xslt? ( xml )
+   ldap-sasl? ( ldap )
+   oci8-instant-client? ( !ldap )
+   qdbm? ( !gdbm )
+   session-mm? ( session !threads )
+   mysql? ( || ( mysqli pdo ) )
+   firebird? ( pdo )
+   mssql? ( pdo )
+   test? ( cli )
+"
+
+RESTRICT="!test? ( test )"
+
+# The supported (that is, autodetected) versions of BDB are listed in
+# 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[apache2?,fpm?]
+   dev-libs/libpcre2[jit?,unicode]
+   virtual/libcrypt:=
+   fpm? ( acl? ( sys-apps/acl ) apparmor? ( sys-libs/libapparmor ) 
selinux? ( sys-libs/libselinux

[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/

2023-12-05 Thread Michael Orlitzky
commit: 0b9ffc37e8a73e1e0054b38b359e1671dac517f9
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Tue Dec  5 21:04:08 2023 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Wed Dec  6 02:00:41 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b9ffc37

dev-lang/php: add USE=capstone to metadata.xml

Signed-off-by: Michael Orlitzky  gentoo.org>

 dev-lang/php/metadata.xml | 4 
 1 file changed, 4 insertions(+)

diff --git a/dev-lang/php/metadata.xml b/dev-lang/php/metadata.xml
index 07e9474b96c6..872340a0fadf 100644
--- a/dev-lang/php/metadata.xml
+++ b/dev-lang/php/metadata.xml
@@ -20,6 +20,10 @@
 
   Enable the BCMath Arbitrary Precision Mathematics extension
 
+
+  Support opcache JIT disassembly through
+  dev-libs/capstone
+
 
   Enable the Command-Line Interface (CLI) SAPI
 



[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/

2023-11-27 Thread Michael Orlitzky
commit: 779094ed5f2758315666955ee86374b5ad28d96a
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Mon Nov 27 16:43:25 2023 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Mon Nov 27 18:10:18 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=779094ed

dev-lang/php: add 8.1.26, drop 8.1.25

Bug: https://bugs.gentoo.org/918525
Signed-off-by: Michael Orlitzky  gentoo.org>

 dev-lang/php/Manifest | 2 +-
 dev-lang/php/{php-8.1.25.ebuild => php-8.1.26.ebuild} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index a483c8c2057b..73b9d4b3b1a1 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -1,3 +1,3 @@
 DIST php-8.1.20.tar.xz 11793228 BLAKE2B 
ecdaf43278b69e039e5440b441a89d02ea53e8246515a89f430d7affbaefa3e1637a6830f91dc9062961719ba5bf7c56993f3b47db96b56c14111f77c74a3096
 SHA512 
d93767c6ff4d305c209e1a0fcb17f19b1d417fa872b002413ebe7883e93900c210e8f122410ac54da373b9d10dd2f522ea2bafc9b66214fb466314d64907a558
-DIST php-8.1.25.tar.xz 11888112 BLAKE2B 
92326ed21cdab063cc9464c4630e74181416dfd0d2c6bd9f87df8633ba1d2f2bae92b1c81b041381263fa3f4d242bec686260f23e522880b6014450bfc597e8a
 SHA512 
c03f97d87f9e09121e00772d40cf21497870a8613106595c177b1bb8d1f6f2318b0d760959b2b3ecce2a5653788b2df232e32f34c43d0779240a86dc21feffde
+DIST php-8.1.26.tar.xz 11809448 BLAKE2B 
e1d50f1de572580a207586b3c3b57081f7b9f1b680ffe8f9e82c88c9285af117dd7e9e2576fcb13119176cb9cd02b39481b6f40e9a1df81aa90b8c4d3e59e4b1
 SHA512 
5bc40077e57c0fccdf17810d688baea416f22ac248bb01b73d2e2590fc4cfabc7001c1c3833281a60870c74178f7b06cbc85474eba695aabf969ad0081a98417
 DIST php-8.2.13.tar.xz 12069092 BLAKE2B 
24da2de8cb00bb2aac485360a14f75d6ce3df1bae78b4bf46e013888aa7f1e9d9e077ca40462fe36c59e19a7c45db05cbb0a64b140c07e4621baa99520a2865b
 SHA512 
8031e33d148c5acbfbb3ed00d7a266813c8919db86ba260ba65e1837d6db8d0bd66d8ddef66884466dd3fe51ece7882b03f8d8db6ff4383f80a68b7beafc03af

diff --git a/dev-lang/php/php-8.1.25.ebuild b/dev-lang/php/php-8.1.26.ebuild
similarity index 100%
rename from dev-lang/php/php-8.1.25.ebuild
rename to dev-lang/php/php-8.1.26.ebuild



[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/

2023-11-27 Thread Michael Orlitzky
commit: bc8acef384025797e60ba56bbf258757d05cef56
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Mon Nov 27 16:41:19 2023 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Mon Nov 27 18:10:10 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc8acef3

dev-lang/php: add 8.2.13, drop 8.2.12

Bug: https://bugs.gentoo.org/918525
Signed-off-by: Michael Orlitzky  gentoo.org>

 dev-lang/php/Manifest | 2 +-
 dev-lang/php/{php-8.2.12.ebuild => php-8.2.13.ebuild} | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index 4e03a5b141ad..a483c8c2057b 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -1,3 +1,3 @@
 DIST php-8.1.20.tar.xz 11793228 BLAKE2B 
ecdaf43278b69e039e5440b441a89d02ea53e8246515a89f430d7affbaefa3e1637a6830f91dc9062961719ba5bf7c56993f3b47db96b56c14111f77c74a3096
 SHA512 
d93767c6ff4d305c209e1a0fcb17f19b1d417fa872b002413ebe7883e93900c210e8f122410ac54da373b9d10dd2f522ea2bafc9b66214fb466314d64907a558
 DIST php-8.1.25.tar.xz 11888112 BLAKE2B 
92326ed21cdab063cc9464c4630e74181416dfd0d2c6bd9f87df8633ba1d2f2bae92b1c81b041381263fa3f4d242bec686260f23e522880b6014450bfc597e8a
 SHA512 
c03f97d87f9e09121e00772d40cf21497870a8613106595c177b1bb8d1f6f2318b0d760959b2b3ecce2a5653788b2df232e32f34c43d0779240a86dc21feffde
-DIST php-8.2.12.tar.xz 12048788 BLAKE2B 
5bcf3a1f1137b6c88682986922b4adad04084779c3f6d915cc05206dc715390cca92ee88ff03f1d06d69f2553c131eef49b382f3a2f5ec79440d3e5cce81a639
 SHA512 
d3fa01ade4094cb2a1b36f1d0bbfdf7c590997e13566ffcfdbd5a307b30ad9456099116f44fe2d612158a0017d9f05346932ce47768c760c7cfacfa56acf294e
+DIST php-8.2.13.tar.xz 12069092 BLAKE2B 
24da2de8cb00bb2aac485360a14f75d6ce3df1bae78b4bf46e013888aa7f1e9d9e077ca40462fe36c59e19a7c45db05cbb0a64b140c07e4621baa99520a2865b
 SHA512 
8031e33d148c5acbfbb3ed00d7a266813c8919db86ba260ba65e1837d6db8d0bd66d8ddef66884466dd3fe51ece7882b03f8d8db6ff4383f80a68b7beafc03af

diff --git a/dev-lang/php/php-8.2.12.ebuild b/dev-lang/php/php-8.2.13.ebuild
similarity index 99%
rename from dev-lang/php/php-8.2.12.ebuild
rename to dev-lang/php/php-8.2.13.ebuild
index b705912b84b2..7d6a005d1c10 100644
--- a/dev-lang/php/php-8.2.12.ebuild
+++ b/dev-lang/php/php-8.2.13.ebuild
@@ -305,6 +305,9 @@ src_prepare() {
#  * https://github.com/php/php-src/issues/11819
#
rm ext/oci8/tests/*.phpt || die
+
+   # https://github.com/php/php-src/issues/12801
+   rm ext/pcre/tests/gh11374.phpt || die
 }
 
 src_configure() {



[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/

2023-10-30 Thread Michael Orlitzky
commit: 9536e7f1ffc03f44bf6b3fbf6137d8472f51715d
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Mon Oct 30 11:14:51 2023 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Mon Oct 30 11:14:51 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9536e7f1

dev-lang/php: add 8.1.25, drop 8.1.24

Signed-off-by: Michael Orlitzky  gentoo.org>

 dev-lang/php/Manifest | 2 +-
 dev-lang/php/{php-8.1.24.ebuild => php-8.1.25.ebuild} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index 16fdc3e26045..2507a944a620 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -1,3 +1,3 @@
 DIST php-8.1.20.tar.xz 11793228 BLAKE2B 
ecdaf43278b69e039e5440b441a89d02ea53e8246515a89f430d7affbaefa3e1637a6830f91dc9062961719ba5bf7c56993f3b47db96b56c14111f77c74a3096
 SHA512 
d93767c6ff4d305c209e1a0fcb17f19b1d417fa872b002413ebe7883e93900c210e8f122410ac54da373b9d10dd2f522ea2bafc9b66214fb466314d64907a558
-DIST php-8.1.24.tar.xz 11793756 BLAKE2B 
b9eb32710aef2c298f73bc2c05c26bcc918bd06d6a9dda217e72bc3f1591502b2e8380e20f5717bf1887b0201ce656641dbec8a9ab360d8bdcdbc46417b7
 SHA512 
4a77498ddfdb171de9fa4d7c6e0155c4a5126fcd813c0370d0c7a23b3daec18e95f4b45df6a3473fc665687a3fe51ae1479f42f57658391d170ea9a8849f8fc8
+DIST php-8.1.25.tar.xz 11888112 BLAKE2B 
92326ed21cdab063cc9464c4630e74181416dfd0d2c6bd9f87df8633ba1d2f2bae92b1c81b041381263fa3f4d242bec686260f23e522880b6014450bfc597e8a
 SHA512 
c03f97d87f9e09121e00772d40cf21497870a8613106595c177b1bb8d1f6f2318b0d760959b2b3ecce2a5653788b2df232e32f34c43d0779240a86dc21feffde
 DIST php-8.2.11.tar.xz 12046180 BLAKE2B 
5795cb4cee5b4cc5d805fab5bf2ee2befda3cd41fb37727c19f9e214fd72455dd39c762c69aa0728df03b4ac834867b4687ba2d85847aa918affea24ba603548
 SHA512 
3c8db245854c0221a952e0f11fc8fbf8944caf73ae0049a710db0db5ce9c018207444dc8a60e2b3c63a6d025c5d09cd17b0542e1b7df8ad2e49635ef5faf7f45

diff --git a/dev-lang/php/php-8.1.24.ebuild b/dev-lang/php/php-8.1.25.ebuild
similarity index 100%
rename from dev-lang/php/php-8.1.24.ebuild
rename to dev-lang/php/php-8.1.25.ebuild



[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/

2023-10-30 Thread Michael Orlitzky
commit: 2b695ef0c05b084d47cb6a6f3003b01679da3d56
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Mon Oct 30 11:16:08 2023 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Mon Oct 30 11:16:08 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b695ef0

dev-lang/php: add 8.2.12, drop 8.2.11

Signed-off-by: Michael Orlitzky  gentoo.org>

 dev-lang/php/Manifest | 2 +-
 dev-lang/php/{php-8.2.11.ebuild => php-8.2.12.ebuild} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index 2507a944a620..4e03a5b141ad 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -1,3 +1,3 @@
 DIST php-8.1.20.tar.xz 11793228 BLAKE2B 
ecdaf43278b69e039e5440b441a89d02ea53e8246515a89f430d7affbaefa3e1637a6830f91dc9062961719ba5bf7c56993f3b47db96b56c14111f77c74a3096
 SHA512 
d93767c6ff4d305c209e1a0fcb17f19b1d417fa872b002413ebe7883e93900c210e8f122410ac54da373b9d10dd2f522ea2bafc9b66214fb466314d64907a558
 DIST php-8.1.25.tar.xz 11888112 BLAKE2B 
92326ed21cdab063cc9464c4630e74181416dfd0d2c6bd9f87df8633ba1d2f2bae92b1c81b041381263fa3f4d242bec686260f23e522880b6014450bfc597e8a
 SHA512 
c03f97d87f9e09121e00772d40cf21497870a8613106595c177b1bb8d1f6f2318b0d760959b2b3ecce2a5653788b2df232e32f34c43d0779240a86dc21feffde
-DIST php-8.2.11.tar.xz 12046180 BLAKE2B 
5795cb4cee5b4cc5d805fab5bf2ee2befda3cd41fb37727c19f9e214fd72455dd39c762c69aa0728df03b4ac834867b4687ba2d85847aa918affea24ba603548
 SHA512 
3c8db245854c0221a952e0f11fc8fbf8944caf73ae0049a710db0db5ce9c018207444dc8a60e2b3c63a6d025c5d09cd17b0542e1b7df8ad2e49635ef5faf7f45
+DIST php-8.2.12.tar.xz 12048788 BLAKE2B 
5bcf3a1f1137b6c88682986922b4adad04084779c3f6d915cc05206dc715390cca92ee88ff03f1d06d69f2553c131eef49b382f3a2f5ec79440d3e5cce81a639
 SHA512 
d3fa01ade4094cb2a1b36f1d0bbfdf7c590997e13566ffcfdbd5a307b30ad9456099116f44fe2d612158a0017d9f05346932ce47768c760c7cfacfa56acf294e

diff --git a/dev-lang/php/php-8.2.11.ebuild b/dev-lang/php/php-8.2.12.ebuild
similarity index 100%
rename from dev-lang/php/php-8.2.11.ebuild
rename to dev-lang/php/php-8.2.12.ebuild



[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/, dev-lang/php/files/, profiles/

2023-10-11 Thread Florian Schmaus
commit: 8d5067f23033a29e67f909d0c723079766226141
Author: Florian Schmaus  gentoo  org>
AuthorDate: Wed Oct 11 19:13:38 2023 +
Commit: Florian Schmaus  gentoo  org>
CommitDate: Wed Oct 11 19:13:50 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d5067f2

dev-lang/php: drop 8.0.29, 8.0.30

Signed-off-by: Florian Schmaus  gentoo.org>

 dev-lang/php/Manifest|   2 -
 dev-lang/php/files/php80-firebird-warnings.patch |  56 --
 dev-lang/php/php-8.0.29.ebuild   | 757 --
 dev-lang/php/php-8.0.30.ebuild   | 760 ---
 profiles/package.mask|   6 -
 5 files changed, 1581 deletions(-)

diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index 4d0f9f5015bf..16fdc3e26045 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -1,5 +1,3 @@
-DIST php-8.0.29.tar.xz 10803592 BLAKE2B 
6e15ce459aa5a51b2a07a4bfa1f6dba076dbbd4828ccdcb8dc4796f64ad3dbda6ee2b6789880591847a7de0d077072e63c46f13399b5b44a4ec34c83172fb6ac
 SHA512 
5f849753bbcc12e253160af072213bc1ede32e5051684129707d32fd6ce8e12867fcf7a5f6790b25071fdda0508dfffd3344e4bb850a747cb8f3c9aee970311d
-DIST php-8.0.30.tar.xz 10821076 BLAKE2B 
9a914ce99ec1d5d554f063ba324d95bd6d39912a13f34f9b3e09fa020c96c0a50ff919e8d829fd663522be2b68bea8934d7f67c52ad45b64d72946f0ba5f3925
 SHA512 
fb816e0a4e4dc506b0ea4425f26690edc6afadb5474ac84df0a1aa293abecd50d128b36074e3e0740c7228109d486ca446869a9c920419610a20ab5989870782
 DIST php-8.1.20.tar.xz 11793228 BLAKE2B 
ecdaf43278b69e039e5440b441a89d02ea53e8246515a89f430d7affbaefa3e1637a6830f91dc9062961719ba5bf7c56993f3b47db96b56c14111f77c74a3096
 SHA512 
d93767c6ff4d305c209e1a0fcb17f19b1d417fa872b002413ebe7883e93900c210e8f122410ac54da373b9d10dd2f522ea2bafc9b66214fb466314d64907a558
 DIST php-8.1.24.tar.xz 11793756 BLAKE2B 
b9eb32710aef2c298f73bc2c05c26bcc918bd06d6a9dda217e72bc3f1591502b2e8380e20f5717bf1887b0201ce656641dbec8a9ab360d8bdcdbc46417b7
 SHA512 
4a77498ddfdb171de9fa4d7c6e0155c4a5126fcd813c0370d0c7a23b3daec18e95f4b45df6a3473fc665687a3fe51ae1479f42f57658391d170ea9a8849f8fc8
 DIST php-8.2.11.tar.xz 12046180 BLAKE2B 
5795cb4cee5b4cc5d805fab5bf2ee2befda3cd41fb37727c19f9e214fd72455dd39c762c69aa0728df03b4ac834867b4687ba2d85847aa918affea24ba603548
 SHA512 
3c8db245854c0221a952e0f11fc8fbf8944caf73ae0049a710db0db5ce9c018207444dc8a60e2b3c63a6d025c5d09cd17b0542e1b7df8ad2e49635ef5faf7f45

diff --git a/dev-lang/php/files/php80-firebird-warnings.patch 
b/dev-lang/php/files/php80-firebird-warnings.patch
deleted file mode 100644
index 48e38c2135f8..
--- a/dev-lang/php/files/php80-firebird-warnings.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From c288b5294bb0e13ad2904a3ec79265f727baaea3 Mon Sep 17 00:00:00 2001
-From: Nikita Popov 
-Date: Mon, 14 Dec 2020 10:36:36 +0100
-Subject: [PATCH] Fix compile warnings in PDO Firebird
-

- ext/pdo_firebird/firebird_driver.c  | 9 +
- ext/pdo_firebird/php_pdo_firebird_int.h | 3 +--
- 2 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/ext/pdo_firebird/firebird_driver.c 
b/ext/pdo_firebird/firebird_driver.c
-index c299907f0fea1..390871cc200c8 100644
 a/ext/pdo_firebird/firebird_driver.c
-+++ b/ext/pdo_firebird/firebird_driver.c
-@@ -171,10 +171,11 @@ static const char classes_array[] = {
-   /* 127 */ 0
- };
- 
--inline char classes(char idx)
-+static inline char classes(char idx)
- {
--  if (idx > 127) return 0;
--  return classes_array[idx];
-+  unsigned char uidx = (unsigned char) idx;
-+  if (uidx > 127) return 0;
-+  return classes_array[uidx];
- }
- 
- typedef enum {
-@@ -1085,7 +1086,7 @@ static int pdo_firebird_handle_factory(pdo_dbh_t *dbh, 
zval *driver_options) /*
-   char errmsg[512];
-   const ISC_STATUS *s = H->isc_status;
-   fb_interpret(errmsg, sizeof(errmsg),&s);
--  zend_throw_exception_ex(php_pdo_get_exception(), 
H->isc_status[1], "SQLSTATE[%s] [%d] %s",
-+  zend_throw_exception_ex(php_pdo_get_exception(), 
H->isc_status[1], "SQLSTATE[%s] [%ld] %s",
-   "HY000", H->isc_status[1], errmsg);
-   }
- 
-diff --git a/ext/pdo_firebird/php_pdo_firebird_int.h 
b/ext/pdo_firebird/php_pdo_firebird_int.h
-index 094767fa355d3..70a895b4b9f83 100644
 a/ext/pdo_firebird/php_pdo_firebird_int.h
-+++ b/ext/pdo_firebird/php_pdo_firebird_int.h
-@@ -34,12 +34,11 @@
- #define SHORT_MAX (1 << (8*sizeof(short)-1))
- 
- #if SIZEOF_ZEND_LONG == 8 && !defined(PHP_WIN32)
--# define LL_MASK "l"
- # define LL_LIT(lit) lit ## L
- #else
--# define LL_MASK "ll"
- # define LL_LIT(lit) lit ## LL
- #endif
-+#define LL_MASK "ll"
- 
- /* Firebird API has a couple of missing const decls in its API */
- #define const_cast(s) ((char*)(s))

diff --git a/dev-lang/php/php-8.0.29.ebuild b/dev-lang/php/php-8.0.29.ebuild
deleted file mode 100644
index 7a01d64a53cc..
--- a/dev-lang/php/php-8.0.29.

[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/

2023-10-03 Thread Michael Orlitzky
commit: 168a8dabd7464406ee6a581e43d6fe35a1fb708e
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Tue Oct  3 12:29:57 2023 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Tue Oct  3 12:29:57 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=168a8dab

dev-lang/php: add 8.1.24, drop 8.1.23

Signed-off-by: Michael Orlitzky  gentoo.org>

 dev-lang/php/Manifest | 2 +-
 dev-lang/php/{php-8.1.23.ebuild => php-8.1.24.ebuild} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index 64d30eed7555..3285bfde2ee6 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -1,5 +1,5 @@
 DIST php-8.0.29.tar.xz 10803592 BLAKE2B 
6e15ce459aa5a51b2a07a4bfa1f6dba076dbbd4828ccdcb8dc4796f64ad3dbda6ee2b6789880591847a7de0d077072e63c46f13399b5b44a4ec34c83172fb6ac
 SHA512 
5f849753bbcc12e253160af072213bc1ede32e5051684129707d32fd6ce8e12867fcf7a5f6790b25071fdda0508dfffd3344e4bb850a747cb8f3c9aee970311d
 DIST php-8.0.30.tar.xz 10821076 BLAKE2B 
9a914ce99ec1d5d554f063ba324d95bd6d39912a13f34f9b3e09fa020c96c0a50ff919e8d829fd663522be2b68bea8934d7f67c52ad45b64d72946f0ba5f3925
 SHA512 
fb816e0a4e4dc506b0ea4425f26690edc6afadb5474ac84df0a1aa293abecd50d128b36074e3e0740c7228109d486ca446869a9c920419610a20ab5989870782
 DIST php-8.1.20.tar.xz 11793228 BLAKE2B 
ecdaf43278b69e039e5440b441a89d02ea53e8246515a89f430d7affbaefa3e1637a6830f91dc9062961719ba5bf7c56993f3b47db96b56c14111f77c74a3096
 SHA512 
d93767c6ff4d305c209e1a0fcb17f19b1d417fa872b002413ebe7883e93900c210e8f122410ac54da373b9d10dd2f522ea2bafc9b66214fb466314d64907a558
-DIST php-8.1.23.tar.xz 11871960 BLAKE2B 
b01939aa00a88a26b2d21831871b884284c2c6653f370faae8e9399a167108ea7369494bc7352ae6a7f99dbcbb497e4f8c0a139ff240b2f3be34b0815c0d3801
 SHA512 
deb1c205c289d5457e6341680d1a3344f21ff8abf904b45b78391fdae6e0c172c5d760f0b639669722f9a8600286515d63bdea46043e5d7b4db4666bc2dde7ea
+DIST php-8.1.24.tar.xz 11793756 BLAKE2B 
b9eb32710aef2c298f73bc2c05c26bcc918bd06d6a9dda217e72bc3f1591502b2e8380e20f5717bf1887b0201ce656641dbec8a9ab360d8bdcdbc46417b7
 SHA512 
4a77498ddfdb171de9fa4d7c6e0155c4a5126fcd813c0370d0c7a23b3daec18e95f4b45df6a3473fc665687a3fe51ae1479f42f57658391d170ea9a8849f8fc8
 DIST php-8.2.10.tar.xz 12041348 BLAKE2B 
25ef7b30a05749c2d8fa511de1a4f7eebab25a058a0bd19748da3d2d4d7199ac9f018064cbd3b02d0d6e22c0dc983f8e2efa6cb5b27ece9dfe7c7310e128ec23
 SHA512 
b9123f63afc99fdce34182f49a022611d584bd4a26f624d0010785599e9b10af7924f8307bbca920d75cb7b0cc23fa57efd5d6ef1d2dd89d5a508578bd36b146

diff --git a/dev-lang/php/php-8.1.23.ebuild b/dev-lang/php/php-8.1.24.ebuild
similarity index 100%
rename from dev-lang/php/php-8.1.23.ebuild
rename to dev-lang/php/php-8.1.24.ebuild



[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/

2023-10-03 Thread Michael Orlitzky
commit: e0a7a66a75466e7097428822645417474cee9829
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Tue Oct  3 12:30:36 2023 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Tue Oct  3 12:30:36 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0a7a66a

dev-lang/php: add 8.2.11, drop 8.2.10

Signed-off-by: Michael Orlitzky  gentoo.org>

 dev-lang/php/Manifest | 2 +-
 dev-lang/php/{php-8.2.10.ebuild => php-8.2.11.ebuild} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index 3285bfde2ee6..4d0f9f5015bf 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -2,4 +2,4 @@ DIST php-8.0.29.tar.xz 10803592 BLAKE2B 
6e15ce459aa5a51b2a07a4bfa1f6dba076dbbd48
 DIST php-8.0.30.tar.xz 10821076 BLAKE2B 
9a914ce99ec1d5d554f063ba324d95bd6d39912a13f34f9b3e09fa020c96c0a50ff919e8d829fd663522be2b68bea8934d7f67c52ad45b64d72946f0ba5f3925
 SHA512 
fb816e0a4e4dc506b0ea4425f26690edc6afadb5474ac84df0a1aa293abecd50d128b36074e3e0740c7228109d486ca446869a9c920419610a20ab5989870782
 DIST php-8.1.20.tar.xz 11793228 BLAKE2B 
ecdaf43278b69e039e5440b441a89d02ea53e8246515a89f430d7affbaefa3e1637a6830f91dc9062961719ba5bf7c56993f3b47db96b56c14111f77c74a3096
 SHA512 
d93767c6ff4d305c209e1a0fcb17f19b1d417fa872b002413ebe7883e93900c210e8f122410ac54da373b9d10dd2f522ea2bafc9b66214fb466314d64907a558
 DIST php-8.1.24.tar.xz 11793756 BLAKE2B 
b9eb32710aef2c298f73bc2c05c26bcc918bd06d6a9dda217e72bc3f1591502b2e8380e20f5717bf1887b0201ce656641dbec8a9ab360d8bdcdbc46417b7
 SHA512 
4a77498ddfdb171de9fa4d7c6e0155c4a5126fcd813c0370d0c7a23b3daec18e95f4b45df6a3473fc665687a3fe51ae1479f42f57658391d170ea9a8849f8fc8
-DIST php-8.2.10.tar.xz 12041348 BLAKE2B 
25ef7b30a05749c2d8fa511de1a4f7eebab25a058a0bd19748da3d2d4d7199ac9f018064cbd3b02d0d6e22c0dc983f8e2efa6cb5b27ece9dfe7c7310e128ec23
 SHA512 
b9123f63afc99fdce34182f49a022611d584bd4a26f624d0010785599e9b10af7924f8307bbca920d75cb7b0cc23fa57efd5d6ef1d2dd89d5a508578bd36b146
+DIST php-8.2.11.tar.xz 12046180 BLAKE2B 
5795cb4cee5b4cc5d805fab5bf2ee2befda3cd41fb37727c19f9e214fd72455dd39c762c69aa0728df03b4ac834867b4687ba2d85847aa918affea24ba603548
 SHA512 
3c8db245854c0221a952e0f11fc8fbf8944caf73ae0049a710db0db5ce9c018207444dc8a60e2b3c63a6d025c5d09cd17b0542e1b7df8ad2e49635ef5faf7f45

diff --git a/dev-lang/php/php-8.2.10.ebuild b/dev-lang/php/php-8.2.11.ebuild
similarity index 100%
rename from dev-lang/php/php-8.2.10.ebuild
rename to dev-lang/php/php-8.2.11.ebuild



[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/files/, profiles/, dev-lang/php/

2023-09-15 Thread David Seifert
commit: e8d2efcc6257f0f976c80d31349d65a24fde1c9c
Author: David Seifert  gentoo  org>
AuthorDate: Fri Sep 15 07:52:24 2023 +
Commit: David Seifert  gentoo  org>
CommitDate: Fri Sep 15 07:52:24 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8d2efcc

dev-lang/php: drop 7.4.33-r4, 7.4.33-r5, 7.4.33-r6

Signed-off-by: David Seifert  gentoo.org>

 dev-lang/php/Manifest  |   1 -
 dev-lang/php/files/bug81656-gcc-11.patch   |  53 --
 dev-lang/php/files/php-7.4.33-CVE-2022-31631.patch |  50 --
 dev-lang/php/files/php-7.4.33-CVE-2023-0567.patch  | 114 
 dev-lang/php/files/php-7.4.33-CVE-2023-0568.patch  |  37 -
 dev-lang/php/files/php-7.4.33-CVE-2023-0662.patch  |  48 --
 dev-lang/php/metadata.xml  |   3 -
 dev-lang/php/php-7.4.33-r4.ebuild  | 749 
 dev-lang/php/php-7.4.33-r5.ebuild  | 753 -
 dev-lang/php/php-7.4.33-r6.ebuild  | 751 
 profiles/package.mask  |   8 -
 11 files changed, 2567 deletions(-)

diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index 25c8dbe4043c..64d30eed7555 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -1,4 +1,3 @@
-DIST php-7.4.33.tar.xz 10420144 BLAKE2B 
e75817e79c698628c873c90afb3b5677480d03ecf07e8f2e26a062bc5b91affc6079e792e864f28cf12d45f86e5d01ede289ecdcefc06477986d193d22c982ef
 SHA512 
499b63b99e5d8e8082ff89d3a91b4cb9a593ea7553b96e48863414c13d2e50275904ed29070e2232e529ee91160f505e6060a4d129cb5bf098aa5b6ea0928d3d
 DIST php-8.0.29.tar.xz 10803592 BLAKE2B 
6e15ce459aa5a51b2a07a4bfa1f6dba076dbbd4828ccdcb8dc4796f64ad3dbda6ee2b6789880591847a7de0d077072e63c46f13399b5b44a4ec34c83172fb6ac
 SHA512 
5f849753bbcc12e253160af072213bc1ede32e5051684129707d32fd6ce8e12867fcf7a5f6790b25071fdda0508dfffd3344e4bb850a747cb8f3c9aee970311d
 DIST php-8.0.30.tar.xz 10821076 BLAKE2B 
9a914ce99ec1d5d554f063ba324d95bd6d39912a13f34f9b3e09fa020c96c0a50ff919e8d829fd663522be2b68bea8934d7f67c52ad45b64d72946f0ba5f3925
 SHA512 
fb816e0a4e4dc506b0ea4425f26690edc6afadb5474ac84df0a1aa293abecd50d128b36074e3e0740c7228109d486ca446869a9c920419610a20ab5989870782
 DIST php-8.1.20.tar.xz 11793228 BLAKE2B 
ecdaf43278b69e039e5440b441a89d02ea53e8246515a89f430d7affbaefa3e1637a6830f91dc9062961719ba5bf7c56993f3b47db96b56c14111f77c74a3096
 SHA512 
d93767c6ff4d305c209e1a0fcb17f19b1d417fa872b002413ebe7883e93900c210e8f122410ac54da373b9d10dd2f522ea2bafc9b66214fb466314d64907a558

diff --git a/dev-lang/php/files/bug81656-gcc-11.patch 
b/dev-lang/php/files/bug81656-gcc-11.patch
deleted file mode 100644
index 8dfe1deb2b33..
--- a/dev-lang/php/files/bug81656-gcc-11.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From bb00a649e0c1ac57718cd9971e7e6f933cb2dadd Mon Sep 17 00:00:00 2001
-From: Michael Wallner 
-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/files/php-7.4.33-CVE-2022-31631.patch 
b/dev-lang/php/files/php-7.4.33-CVE-2022-31631.patch
deleted file mode 100644
index 6aa309549c88..
--- a/dev-lang/php/files/php-7.4.

[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/

2023-09-13 Thread Michael Orlitzky
commit: bc39006375bfdb3d9cc5cffcbcfc9cf47a0d55cf
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Wed Sep 13 16:51:31 2023 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Wed Sep 13 19:35:12 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc390063

dev-lang/php: add 8.2.10, drop 8.2.9

Closes: https://bugs.gentoo.org/914115
Signed-off-by: Michael Orlitzky  gentoo.org>

 dev-lang/php/Manifest| 2 +-
 dev-lang/php/{php-8.2.9.ebuild => php-8.2.10.ebuild} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index 19cde794435e..87230f5a3aee 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -3,4 +3,4 @@ DIST php-8.0.29.tar.xz 10803592 BLAKE2B 
6e15ce459aa5a51b2a07a4bfa1f6dba076dbbd48
 DIST php-8.0.30.tar.xz 10821076 BLAKE2B 
9a914ce99ec1d5d554f063ba324d95bd6d39912a13f34f9b3e09fa020c96c0a50ff919e8d829fd663522be2b68bea8934d7f67c52ad45b64d72946f0ba5f3925
 SHA512 
fb816e0a4e4dc506b0ea4425f26690edc6afadb5474ac84df0a1aa293abecd50d128b36074e3e0740c7228109d486ca446869a9c920419610a20ab5989870782
 DIST php-8.1.20.tar.xz 11793228 BLAKE2B 
ecdaf43278b69e039e5440b441a89d02ea53e8246515a89f430d7affbaefa3e1637a6830f91dc9062961719ba5bf7c56993f3b47db96b56c14111f77c74a3096
 SHA512 
d93767c6ff4d305c209e1a0fcb17f19b1d417fa872b002413ebe7883e93900c210e8f122410ac54da373b9d10dd2f522ea2bafc9b66214fb466314d64907a558
 DIST php-8.1.21.tar.xz 11862320 BLAKE2B 
51195859c23a3216247a66f39e76bf4679f0365d390f31c7dee7437f22f45cee4e4f4de8cf42706e030355d9ec66b471d61fafc1b30da2eb65b339d99ace93c7
 SHA512 
aeb62947e12646a530b6f61efe9350e4a3632d421ee0bec6a1d26dc2fd680c782e12cbad06496f2d4ffcddf5182aa3438c19a59b0d593fc43789271241ec0383
-DIST php-8.2.9.tar.xz 12035468 BLAKE2B 
8b537fbd080cbe1e2b627c34110f41a13549ad6bd118803214bfeba3bb8564eef0c1d0d2ad14a500efc488078cd0e521e3a883865b4a79c2c4213cad670e334c
 SHA512 
26c53dc737d6144cc0a3ce9134f92f59eb29f62c44b7d6159b92a25bdb0fa80239d7f6b6b663adfe444e57e98b202381df9b35532f40168ea093ac56d4bced19
+DIST php-8.2.10.tar.xz 12041348 BLAKE2B 
25ef7b30a05749c2d8fa511de1a4f7eebab25a058a0bd19748da3d2d4d7199ac9f018064cbd3b02d0d6e22c0dc983f8e2efa6cb5b27ece9dfe7c7310e128ec23
 SHA512 
b9123f63afc99fdce34182f49a022611d584bd4a26f624d0010785599e9b10af7924f8307bbca920d75cb7b0cc23fa57efd5d6ef1d2dd89d5a508578bd36b146

diff --git a/dev-lang/php/php-8.2.9.ebuild b/dev-lang/php/php-8.2.10.ebuild
similarity index 100%
rename from dev-lang/php/php-8.2.9.ebuild
rename to dev-lang/php/php-8.2.10.ebuild



[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/

2023-09-13 Thread Michael Orlitzky
commit: 74ab5a960a574183cfc58de7a9554b3314cf520b
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Wed Sep 13 16:52:06 2023 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Wed Sep 13 19:35:17 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74ab5a96

dev-lang/php: add 8.1.23, drop 8.1.21

Signed-off-by: Michael Orlitzky  gentoo.org>

 dev-lang/php/Manifest | 2 +-
 dev-lang/php/{php-8.1.21.ebuild => php-8.1.23.ebuild} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index 87230f5a3aee..25c8dbe4043c 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -2,5 +2,5 @@ DIST php-7.4.33.tar.xz 10420144 BLAKE2B 
e75817e79c698628c873c90afb3b5677480d03ec
 DIST php-8.0.29.tar.xz 10803592 BLAKE2B 
6e15ce459aa5a51b2a07a4bfa1f6dba076dbbd4828ccdcb8dc4796f64ad3dbda6ee2b6789880591847a7de0d077072e63c46f13399b5b44a4ec34c83172fb6ac
 SHA512 
5f849753bbcc12e253160af072213bc1ede32e5051684129707d32fd6ce8e12867fcf7a5f6790b25071fdda0508dfffd3344e4bb850a747cb8f3c9aee970311d
 DIST php-8.0.30.tar.xz 10821076 BLAKE2B 
9a914ce99ec1d5d554f063ba324d95bd6d39912a13f34f9b3e09fa020c96c0a50ff919e8d829fd663522be2b68bea8934d7f67c52ad45b64d72946f0ba5f3925
 SHA512 
fb816e0a4e4dc506b0ea4425f26690edc6afadb5474ac84df0a1aa293abecd50d128b36074e3e0740c7228109d486ca446869a9c920419610a20ab5989870782
 DIST php-8.1.20.tar.xz 11793228 BLAKE2B 
ecdaf43278b69e039e5440b441a89d02ea53e8246515a89f430d7affbaefa3e1637a6830f91dc9062961719ba5bf7c56993f3b47db96b56c14111f77c74a3096
 SHA512 
d93767c6ff4d305c209e1a0fcb17f19b1d417fa872b002413ebe7883e93900c210e8f122410ac54da373b9d10dd2f522ea2bafc9b66214fb466314d64907a558
-DIST php-8.1.21.tar.xz 11862320 BLAKE2B 
51195859c23a3216247a66f39e76bf4679f0365d390f31c7dee7437f22f45cee4e4f4de8cf42706e030355d9ec66b471d61fafc1b30da2eb65b339d99ace93c7
 SHA512 
aeb62947e12646a530b6f61efe9350e4a3632d421ee0bec6a1d26dc2fd680c782e12cbad06496f2d4ffcddf5182aa3438c19a59b0d593fc43789271241ec0383
+DIST php-8.1.23.tar.xz 11871960 BLAKE2B 
b01939aa00a88a26b2d21831871b884284c2c6653f370faae8e9399a167108ea7369494bc7352ae6a7f99dbcbb497e4f8c0a139ff240b2f3be34b0815c0d3801
 SHA512 
deb1c205c289d5457e6341680d1a3344f21ff8abf904b45b78391fdae6e0c172c5d760f0b639669722f9a8600286515d63bdea46043e5d7b4db4666bc2dde7ea
 DIST php-8.2.10.tar.xz 12041348 BLAKE2B 
25ef7b30a05749c2d8fa511de1a4f7eebab25a058a0bd19748da3d2d4d7199ac9f018064cbd3b02d0d6e22c0dc983f8e2efa6cb5b27ece9dfe7c7310e128ec23
 SHA512 
b9123f63afc99fdce34182f49a022611d584bd4a26f624d0010785599e9b10af7924f8307bbca920d75cb7b0cc23fa57efd5d6ef1d2dd89d5a508578bd36b146

diff --git a/dev-lang/php/php-8.1.21.ebuild b/dev-lang/php/php-8.1.23.ebuild
similarity index 100%
rename from dev-lang/php/php-8.1.21.ebuild
rename to dev-lang/php/php-8.1.23.ebuild



[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/

2023-09-09 Thread David Seifert
commit: 92f6f6297b2161b3b04a452095b53f324a1c6363
Author: David Seifert  gentoo  org>
AuthorDate: Sat Sep  9 19:00:49 2023 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Sep  9 19:00:49 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92f6f629

dev-lang/php: drop 8.0.25, 8.0.28, 8.1.12, 8.1.16

Closes: https://github.com/gentoo/gentoo/pull/32702
Signed-off-by: David Seifert  gentoo.org>

 dev-lang/php/Manifest  |   4 -
 dev-lang/php/php-8.0.25.ebuild | 759 -
 dev-lang/php/php-8.0.28.ebuild | 759 -
 dev-lang/php/php-8.1.12.ebuild | 757 
 dev-lang/php/php-8.1.16.ebuild | 757 
 5 files changed, 3036 deletions(-)

diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index 953b51fa13f4..19cde794435e 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -1,10 +1,6 @@
 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.0.30.tar.xz 10821076 BLAKE2B 
9a914ce99ec1d5d554f063ba324d95bd6d39912a13f34f9b3e09fa020c96c0a50ff919e8d829fd663522be2b68bea8934d7f67c52ad45b64d72946f0ba5f3925
 SHA512 
fb816e0a4e4dc506b0ea4425f26690edc6afadb5474ac84df0a1aa293abecd50d128b36074e3e0740c7228109d486ca446869a9c920419610a20ab5989870782
-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
 DIST php-8.1.21.tar.xz 11862320 BLAKE2B 
51195859c23a3216247a66f39e76bf4679f0365d390f31c7dee7437f22f45cee4e4f4de8cf42706e030355d9ec66b471d61fafc1b30da2eb65b339d99ace93c7
 SHA512 
aeb62947e12646a530b6f61efe9350e4a3632d421ee0bec6a1d26dc2fd680c782e12cbad06496f2d4ffcddf5182aa3438c19a59b0d593fc43789271241ec0383
 DIST php-8.2.9.tar.xz 12035468 BLAKE2B 
8b537fbd080cbe1e2b627c34110f41a13549ad6bd118803214bfeba3bb8564eef0c1d0d2ad14a500efc488078cd0e521e3a883865b4a79c2c4213cad670e334c
 SHA512 
26c53dc737d6144cc0a3ce9134f92f59eb29f62c44b7d6159b92a25bdb0fa80239d7f6b6b663adfe444e57e98b202381df9b35532f40168ea093ac56d4bced19

diff --git a/dev-lang/php/php-8.0.25.ebuild b/dev-lang/php/php-8.0.25.ebuild
deleted file mode 100644
index a324fe5db937..
--- a/dev-lang/php/php-8.0.25.ebuild
+++ /dev/null
@@ -1,759 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-WANT_AUTOMAKE="none"
-
-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";
-
-LICENSE="PHP-3.01
-   BSD
-   Zend-2.0
-   bcmath? ( LGPL-2.1+ )
-   fpm? ( BSD-2 )
-   gd? ( gd )
-   unicode? ( BSD-2 LGPL-2.1 )"
-
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 
sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-

[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/

2023-09-09 Thread David Seifert
commit: 8f254c280b919a3c308ef3280a104e4ce2a72825
Author: David Seifert  gentoo  org>
AuthorDate: Sat Sep  9 18:41:45 2023 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Sep  9 18:41:45 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f254c28

dev-lang/php: stable arm/ppc (8.0.29+8.1.20-r1)

Closes: https://bugs.gentoo.org/908792
Signed-off-by: David Seifert  gentoo.org>

 dev-lang/php/php-8.0.29.ebuild| 2 +-
 dev-lang/php/php-8.1.20-r1.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-lang/php/php-8.0.29.ebuild b/dev-lang/php/php-8.0.29.ebuild
index c7f33d03fbfe..7a01d64a53cc 100644
--- a/dev-lang/php/php-8.0.29.ebuild
+++ b/dev-lang/php/php-8.0.29.ebuild
@@ -20,7 +20,7 @@ LICENSE="PHP-3.01
unicode? ( BSD-2 LGPL-2.1 )"
 
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~s390 
sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+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"

diff --git a/dev-lang/php/php-8.1.20-r1.ebuild 
b/dev-lang/php/php-8.1.20-r1.ebuild
index b04862db5694..ba1bebcdc20b 100644
--- a/dev-lang/php/php-8.1.20-r1.ebuild
+++ b/dev-lang/php/php-8.1.20-r1.ebuild
@@ -20,7 +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"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~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"



[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/

2023-09-07 Thread Michael Orlitzky
commit: 3a0a1c5bbced336389c9dd8569215daa4d9347f5
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Thu Sep  7 18:52:27 2023 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Thu Sep  7 18:52:27 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a0a1c5b

dev-lang/php: filter LTO flags

This is a better fix for bug 866683 (and now 913527).

Closes: https://bugs.gentoo.org/913527
Signed-off-by: Michael Orlitzky  gentoo.org>

 dev-lang/php/php-8.0.30.ebuild | 8 +++-
 dev-lang/php/php-8.1.21.ebuild | 8 +++-
 dev-lang/php/php-8.2.9.ebuild  | 8 +++-
 3 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/dev-lang/php/php-8.0.30.ebuild b/dev-lang/php/php-8.0.30.ebuild
index e6186d2f2624..a03e55d60986 100644
--- a/dev-lang/php/php-8.0.30.ebuild
+++ b/dev-lang/php/php-8.0.30.ebuild
@@ -241,6 +241,9 @@ src_configure() {
 
PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
 
+   # https://bugs.gentoo.org/866683, https://bugs.gentoo.org/913527
+   filter-lto
+
# The php-fpm config file wants localstatedir to be ${EPREFIX}/var
# and not the Gentoo default ${EPREFIX}/var/lib. See bug 572002.
local our_conf=(
@@ -255,11 +258,6 @@ src_configure() {
$(use_enable threads zts)
)
 
-   if is-flagq -flto; then
-   # https://bugs.gentoo.org/866683
-   our_conf+=( --disable-gcc-global-regs )
-   fi
-
our_conf+=(
$(use_with apparmor fpm-apparmor)
$(use_with argon2 password-argon2 "${EPREFIX}/usr")

diff --git a/dev-lang/php/php-8.1.21.ebuild b/dev-lang/php/php-8.1.21.ebuild
index db53ccbaa5bb..1e3a6c509724 100644
--- a/dev-lang/php/php-8.1.21.ebuild
+++ b/dev-lang/php/php-8.1.21.ebuild
@@ -245,6 +245,9 @@ src_configure() {
 
PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
 
+   # https://bugs.gentoo.org/866683, https://bugs.gentoo.org/913527
+   filter-lto
+
# The php-fpm config file wants localstatedir to be ${EPREFIX}/var
# and not the Gentoo default ${EPREFIX}/var/lib. See bug 572002.
local our_conf=(
@@ -259,11 +262,6 @@ src_configure() {
$(use_enable threads zts)
)
 
-   if is-flagq -flto; then
-   # https://bugs.gentoo.org/866683
-   our_conf+=( --disable-gcc-global-regs )
-   fi
-
our_conf+=(
$(use_with apparmor fpm-apparmor)
$(use_with argon2 password-argon2 "${EPREFIX}/usr")

diff --git a/dev-lang/php/php-8.2.9.ebuild b/dev-lang/php/php-8.2.9.ebuild
index e725e7b5c992..b705912b84b2 100644
--- a/dev-lang/php/php-8.2.9.ebuild
+++ b/dev-lang/php/php-8.2.9.ebuild
@@ -311,6 +311,9 @@ src_configure() {
addpredict /usr/share/snmp/mibs/.index #nowarn
addpredict /var/lib/net-snmp/mib_indexes #nowarn
 
+   # https://bugs.gentoo.org/866683, https://bugs.gentoo.org/913527
+   filter-lto
+
PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
 
# Don't allow ./configure to detect and use an existing version
@@ -333,11 +336,6 @@ src_configure() {
$(use_enable threads zts)
)
 
-   if is-flagq -flto; then
-   # https://bugs.gentoo.org/866683
-   our_conf+=( --disable-gcc-global-regs )
-   fi
-
our_conf+=(
$(use_with apparmor fpm-apparmor)
$(use_with argon2 password-argon2 "${EPREFIX}/usr")



[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/

2023-09-07 Thread Michael Orlitzky
commit: 3bd3679514ab4e4467e66387e08489e8af897500
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Thu Sep  7 18:56:20 2023 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Thu Sep  7 18:56:20 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3bd36795

dev-lang/php: fix indirect multilib inherit

Signed-off-by: Michael Orlitzky  gentoo.org>

 dev-lang/php/php-8.0.30.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-lang/php/php-8.0.30.ebuild b/dev-lang/php/php-8.0.30.ebuild
index a03e55d60986..fd4f849c96e5 100644
--- a/dev-lang/php/php-8.0.30.ebuild
+++ b/dev-lang/php/php-8.0.30.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 WANT_AUTOMAKE="none"
 
-inherit flag-o-matic systemd autotools
+inherit flag-o-matic multilib systemd autotools
 
 DESCRIPTION="The PHP language runtime engine"
 HOMEPAGE="https://www.php.net/";



[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/

2023-08-26 Thread Sam James
commit: 76a390f21be356fbdea69e1bed0b88d31fb366b5
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Thu Aug 24 13:21:23 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Aug 26 13:12:34 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76a390f2

dev-lang/php: stable 8.0.30 for sparc, bug #912332

Signed-off-by: Rolf Eike Beer  sf-mail.de>
Signed-off-by: Sam James  gentoo.org>

 dev-lang/php/php-8.0.30.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-lang/php/php-8.0.30.ebuild b/dev-lang/php/php-8.0.30.ebuild
index 8cdaf1ceb1d1..e6186d2f2624 100644
--- a/dev-lang/php/php-8.0.30.ebuild
+++ b/dev-lang/php/php-8.0.30.ebuild
@@ -20,7 +20,7 @@ LICENSE="PHP-3.01
unicode? ( BSD-2 LGPL-2.1 )"
 
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+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"



[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/

2023-08-22 Thread Michael Orlitzky
commit: d419a789867813ca3c8dbd7693152c6ec162796c
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Tue Aug 22 16:49:33 2023 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Tue Aug 22 17:35:42 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d419a789

dev-lang/php: add 8.2.9, drop 8.2.8-r2

 * New upstream security release.
 * Bring back USE=ipv6. Despite what pkgcheck thinks, this entails
   significant code changes.
 * Fix LTO build (bug 866683).

Bug: https://bugs.gentoo.org/866683
Signed-off-by: Michael Orlitzky  gentoo.org>

 dev-lang/php/Manifest  | 2 +-
 dev-lang/php/{php-8.2.8-r2.ebuild => php-8.2.9.ebuild} | 8 +++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index f83a1f6d7d21..953b51fa13f4 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -7,4 +7,4 @@ DIST php-8.1.12.tar.xz 11747176 BLAKE2B 
0505794826fb0fc92b04be5f7162af8aa92d782b
 DIST php-8.1.16.tar.xz 11760948 BLAKE2B 
ac0d352dae05115197852092b9b3c0b5091528326806c70eb34e0aba6007f718e927e67045d65976cb2104e4737a475b2224d4f05ff89ddf8c3066e0240c38e1
 SHA512 
4515da38803272abfafb069d1684c66dbb5086987b148c48dd7d8acf8f5316d255cf321ec57d6fbffe914a35551a533446ac13c34bb7c984e0d109247e8e64da
 DIST php-8.1.20.tar.xz 11793228 BLAKE2B 
ecdaf43278b69e039e5440b441a89d02ea53e8246515a89f430d7affbaefa3e1637a6830f91dc9062961719ba5bf7c56993f3b47db96b56c14111f77c74a3096
 SHA512 
d93767c6ff4d305c209e1a0fcb17f19b1d417fa872b002413ebe7883e93900c210e8f122410ac54da373b9d10dd2f522ea2bafc9b66214fb466314d64907a558
 DIST php-8.1.21.tar.xz 11862320 BLAKE2B 
51195859c23a3216247a66f39e76bf4679f0365d390f31c7dee7437f22f45cee4e4f4de8cf42706e030355d9ec66b471d61fafc1b30da2eb65b339d99ace93c7
 SHA512 
aeb62947e12646a530b6f61efe9350e4a3632d421ee0bec6a1d26dc2fd680c782e12cbad06496f2d4ffcddf5182aa3438c19a59b0d593fc43789271241ec0383
-DIST php-8.2.8.tar.xz 12034856 BLAKE2B 
c07bec5e9eeb74e611f7480da21b9bd2b2e101bf00fe909a62a52b62c2a44dde5760b151317b3c0d6fb13cc69e3d81397c1b09b46f410e9b935e2fc6bb5b131e
 SHA512 
d1539010761aaa525e286cf012953a097556c61608505a2b1a83f78b40b7a1c3338f494c4cf34abda764c762c4b0bacb09ce9286236d2a356ee61121236b6bcf
+DIST php-8.2.9.tar.xz 12035468 BLAKE2B 
8b537fbd080cbe1e2b627c34110f41a13549ad6bd118803214bfeba3bb8564eef0c1d0d2ad14a500efc488078cd0e521e3a883865b4a79c2c4213cad670e334c
 SHA512 
26c53dc737d6144cc0a3ce9134f92f59eb29f62c44b7d6159b92a25bdb0fa80239d7f6b6b663adfe444e57e98b202381df9b35532f40168ea093ac56d4bced19

diff --git a/dev-lang/php/php-8.2.8-r2.ebuild b/dev-lang/php/php-8.2.9.ebuild
similarity index 99%
rename from dev-lang/php/php-8.2.8-r2.ebuild
rename to dev-lang/php/php-8.2.9.ebuild
index 98c074915afd..e725e7b5c992 100644
--- a/dev-lang/php/php-8.2.8-r2.ebuild
+++ b/dev-lang/php/php-8.2.9.ebuild
@@ -34,7 +34,7 @@ IUSE="${IUSE} acl apparmor argon2 avif bcmath berkdb bzip2 
calendar
cdb cjk +ctype curl debug
enchant exif ffi +fileinfo +filter firebird
+flatfile ftp gd gdbm gmp +iconv imap inifile
-   intl iodbc +jit kerberos ldap ldap-sasl libedit lmdb
+   intl iodbc ipv6 +jit 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
@@ -333,6 +333,11 @@ src_configure() {
$(use_enable threads zts)
)
 
+   if is-flagq -flto; then
+   # https://bugs.gentoo.org/866683
+   our_conf+=( --disable-gcc-global-regs )
+   fi
+
our_conf+=(
$(use_with apparmor fpm-apparmor)
$(use_with argon2 password-argon2 "${EPREFIX}/usr")
@@ -355,6 +360,7 @@ src_configure() {
$(use_with iconv iconv \
$(use elibc_glibc || use elibc_musl || echo 
"${EPREFIX}/usr"))
$(use_enable intl)
+   $(use_enable ipv6)
$(use_with kerberos)
$(use_with xml libxml)
$(use_enable unicode mbstring)



[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/

2023-08-22 Thread Michael Orlitzky
commit: 0f5d2d85b5bdfec98186f218c5f355e057d5e017
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Tue Aug 22 16:52:27 2023 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Tue Aug 22 17:35:54 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f5d2d85

dev-lang/php: fix LTO build (8.0 and 8.1 series)

Closes: https://bugs.gentoo.org/866683
Signed-off-by: Michael Orlitzky  gentoo.org>

 dev-lang/php/php-8.0.30.ebuild | 5 +
 dev-lang/php/php-8.1.21.ebuild | 5 +
 2 files changed, 10 insertions(+)

diff --git a/dev-lang/php/php-8.0.30.ebuild b/dev-lang/php/php-8.0.30.ebuild
index b6ce4bcbf1b4..8cdaf1ceb1d1 100644
--- a/dev-lang/php/php-8.0.30.ebuild
+++ b/dev-lang/php/php-8.0.30.ebuild
@@ -255,6 +255,11 @@ src_configure() {
$(use_enable threads zts)
)
 
+   if is-flagq -flto; then
+   # https://bugs.gentoo.org/866683
+   our_conf+=( --disable-gcc-global-regs )
+   fi
+
our_conf+=(
$(use_with apparmor fpm-apparmor)
$(use_with argon2 password-argon2 "${EPREFIX}/usr")

diff --git a/dev-lang/php/php-8.1.21.ebuild b/dev-lang/php/php-8.1.21.ebuild
index 6fb08e8646fb..db53ccbaa5bb 100644
--- a/dev-lang/php/php-8.1.21.ebuild
+++ b/dev-lang/php/php-8.1.21.ebuild
@@ -259,6 +259,11 @@ src_configure() {
$(use_enable threads zts)
)
 
+   if is-flagq -flto; then
+   # https://bugs.gentoo.org/866683
+   our_conf+=( --disable-gcc-global-regs )
+   fi
+
our_conf+=(
$(use_with apparmor fpm-apparmor)
$(use_with argon2 password-argon2 "${EPREFIX}/usr")



[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/

2023-08-15 Thread Michael Orlitzky
commit: 78205d9878dfc9826ce1d7046d2f7c2b3dd5d073
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Tue Aug 15 23:51:49 2023 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Tue Aug 15 23:55:23 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78205d98

dev-lang/php: add 8.0.30

Fixes CVE-2023-3823 and CVE-2023-3824.

Bug: https://bugs.gentoo.org/912331
Signed-off-by: Michael Orlitzky  gentoo.org>

 dev-lang/php/Manifest  |   1 +
 dev-lang/php/php-8.0.30.ebuild | 757 +
 2 files changed, 758 insertions(+)

diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index 33835f26adcb..f83a1f6d7d21 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -2,6 +2,7 @@ DIST php-7.4.33.tar.xz 10420144 BLAKE2B 
e75817e79c698628c873c90afb3b5677480d03ec
 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.0.30.tar.xz 10821076 BLAKE2B 
9a914ce99ec1d5d554f063ba324d95bd6d39912a13f34f9b3e09fa020c96c0a50ff919e8d829fd663522be2b68bea8934d7f67c52ad45b64d72946f0ba5f3925
 SHA512 
fb816e0a4e4dc506b0ea4425f26690edc6afadb5474ac84df0a1aa293abecd50d128b36074e3e0740c7228109d486ca446869a9c920419610a20ab5989870782
 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.0.30.ebuild b/dev-lang/php/php-8.0.30.ebuild
new file mode 100644
index ..b6ce4bcbf1b4
--- /dev/null
+++ b/dev-lang/php/php-8.0.30.ebuild
@@ -0,0 +1,757 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+WANT_AUTOMAKE="none"
+
+inherit flag-o-matic systemd autotools
+
+DESCRIPTION="The PHP language runtime engine"
+HOMEPAGE="https://www.php.net/";
+SRC_URI="https://www.php.net/distributions/${P}.tar.xz";
+
+LICENSE="PHP-3.01
+   BSD
+   Zend-2.0
+   bcmath? ( LGPL-2.1+ )
+   fpm? ( BSD-2 )
+   gd? ( gd )
+   unicode? ( BSD-2 LGPL-2.1 )"
+
+SLOT="$(ver_cut 1-2)"
+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"
+
+# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
+IUSE="${IUSE}
+   ${SAPIS/cli/+cli}
+   threads"
+
+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
+   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"
+
+# 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 )
+   cli? ( ^^ ( readline libedit ) )
+  

[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/

2023-08-13 Thread Arthur Zamarin
commit: 0b836d341a9ae6c6b743199e7b21e212fac01702
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Aug 13 15:37:30 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Aug 13 15:37:30 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b836d34

dev-lang/php: Stabilize 8.0.29 x86, #908792

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-lang/php/php-8.0.29.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-lang/php/php-8.0.29.ebuild b/dev-lang/php/php-8.0.29.ebuild
index a759418e7e07..c7f33d03fbfe 100644
--- a/dev-lang/php/php-8.0.29.ebuild
+++ b/dev-lang/php/php-8.0.29.ebuild
@@ -20,7 +20,7 @@ LICENSE="PHP-3.01
unicode? ( BSD-2 LGPL-2.1 )"
 
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~s390 
sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+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"



[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/

2023-08-13 Thread Arthur Zamarin
commit: 0b6a9d234c1f3c6a3a40b1b61fe0d9e14797a9f4
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Aug 13 15:37:26 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Aug 13 15:37:26 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b6a9d23

dev-lang/php: Stabilize 8.0.29 amd64, #908792

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-lang/php/php-8.0.29.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-lang/php/php-8.0.29.ebuild b/dev-lang/php/php-8.0.29.ebuild
index ff9701dbae64..a759418e7e07 100644
--- a/dev-lang/php/php-8.0.29.ebuild
+++ b/dev-lang/php/php-8.0.29.ebuild
@@ -20,7 +20,7 @@ LICENSE="PHP-3.01
unicode? ( BSD-2 LGPL-2.1 )"
 
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~s390 
sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+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"



[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/

2023-08-13 Thread Arthur Zamarin
commit: 96acd4bbf5a5345cb15ac955a8ad66b1b1db69f3
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Aug 13 15:37:27 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Aug 13 15:37:27 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96acd4bb

dev-lang/php: Stabilize 8.1.20-r1 amd64, #908792

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-lang/php/php-8.1.20-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-lang/php/php-8.1.20-r1.ebuild 
b/dev-lang/php/php-8.1.20-r1.ebuild
index c26809bca6e3..9a16fdd98ae4 100644
--- a/dev-lang/php/php-8.1.20-r1.ebuild
+++ b/dev-lang/php/php-8.1.20-r1.ebuild
@@ -20,7 +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"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~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"



[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/

2023-08-13 Thread Arthur Zamarin
commit: 40511e69ca9e217334cc413094aaa8bb60a5558e
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Aug 13 15:37:31 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Aug 13 15:37:31 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40511e69

dev-lang/php: Stabilize 8.1.20-r1 x86, #908792

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-lang/php/php-8.1.20-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-lang/php/php-8.1.20-r1.ebuild 
b/dev-lang/php/php-8.1.20-r1.ebuild
index 9a16fdd98ae4..b04862db5694 100644
--- a/dev-lang/php/php-8.1.20-r1.ebuild
+++ b/dev-lang/php/php-8.1.20-r1.ebuild
@@ -20,7 +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"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~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"



[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/

2023-07-30 Thread Michael Orlitzky
commit: 615036dd66eb3c0a2cf6ef45b4535fe235235108
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Thu Jul 27 17:24:15 2023 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Mon Jul 31 00:49:12 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=615036dd

dev-lang/php: disable USE=coverage and hide /usr/bin/php.

Code coverage is "FOR DEVELOPERS ONLY!!", and requires GCC. It's not
really something we want to support for end users, and it's contributing
to bug 900210, so now it's gone. The rest of that bug is caused by PHP's
./configure script detecting an already-installed PHP (at /usr/bin/php)
and running it.

Obviously PHP isn't needed to build itself, so allowing it to detect and
(apparently) run an existing installation is only multiplying the insane
number of configurations we already support. To avoid that in the future
(and to fix bug 900210 right now), we hide the system "php" by
overriding its cache variable during ./configure.

Closes: https://bugs.gentoo.org/900210
Signed-off-by: Michael Orlitzky  gentoo.org>

 dev-lang/php/{php-8.2.8.ebuild => php-8.2.8-r1.ebuild} | 15 ---
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/dev-lang/php/php-8.2.8.ebuild b/dev-lang/php/php-8.2.8-r1.ebuild
similarity index 98%
rename from dev-lang/php/php-8.2.8.ebuild
rename to dev-lang/php/php-8.2.8-r1.ebuild
index b688e330dffc..af66d51134a2 100644
--- a/dev-lang/php/php-8.2.8.ebuild
+++ b/dev-lang/php/php-8.2.8-r1.ebuild
@@ -31,7 +31,7 @@ IUSE="${IUSE}
threads"
 
 IUSE="${IUSE} acl apparmor argon2 avif bcmath berkdb bzip2 calendar
-   cdb cjk coverage +ctype curl debug
+   cdb cjk +ctype curl debug
enchant exif ffi +fileinfo +filter firebird
+flatfile ftp gd gdbm gmp +iconv imap inifile
intl iodbc +jit kerberos ldap ldap-sasl libedit lmdb
@@ -86,7 +86,6 @@ COMMON_DEPEND="
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 )
ffi? ( >=dev-libs/libffi-3.0.11:= )
@@ -313,6 +312,11 @@ src_configure() {
 
PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
 
+   # Don't allow ./configure to detect and use an existing version
+   # of PHP; this can lead to all sorts of weird unpredictability
+   # as in bug 900210.
+   export ac_cv_prog_PHP=""
+
# The php-fpm config file wants localstatedir to be ${EPREFIX}/var
# and not the Gentoo default ${EPREFIX}/var/lib. See bug 572002.
local our_conf=(
@@ -335,7 +339,6 @@ src_configure() {
$(use_enable bcmath)
$(use_with bzip2 bz2 "${EPREFIX}/usr")
$(use_enable calendar)
-   $(use_enable coverage gcov)
$(use_enable ctype)
$(use_with curl)
$(use_enable xml dom)
@@ -519,9 +522,8 @@ src_configure() {
# changing it is not an easy job.
local one_sapi
local sapi
-   mkdir -p "${WORKDIR}/sapis-build" || die
+   mkdir "${WORKDIR}/sapis-build" || die
for one_sapi in $SAPIS ; do
-   einfo "Current SAPI: ${one_sapi}"
use "${one_sapi}" || continue
php_set_ini_dir "${one_sapi}"
 
@@ -529,7 +531,6 @@ src_configure() {
# the files that autotools creates. This was all originally
# based on the autotools-utils eclass.
BUILD_DIR="${WORKDIR}/sapis-build/${one_sapi}"
-   einfo "Copying sources to ${BUILD_DIR}"
cp -a "${S}" "${BUILD_DIR}" || die
 
local sapi_conf=(
@@ -569,7 +570,7 @@ src_configure() {
myeconfargs+=( "${sapi_conf[@]}" )
 
pushd "${BUILD_DIR}" > /dev/null || die
-   einfo "Running ./configure in ${BUILD_DIR}"
+   einfo "Running econf in ${BUILD_DIR}"
econf "${myeconfargs[@]}"
popd > /dev/null || die
done



[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/, dev-lang/php/files/

2023-07-30 Thread Michael Orlitzky
commit: 517dfe205cd1a9c476f44dfc0eae7b78bb23e910
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Wed Jul 26 12:53:33 2023 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Mon Jul 31 00:49:09 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=517dfe20

dev-lang/php: improve testing in the 8.2 slot.

We had basically given up on the PHP test suite due to a high number of
"expected" failures. I've tried to track most of these down and
report/fix them upstream. In the meantime, all known failing tests have
been disabled one-at-a-time, with pointers to the upstream issue/PR. And
with that done, the test suite is once again run in anger; if it fails,
the installation will too.

Signed-off-by: Michael Orlitzky  gentoo.org>

 dev-lang/php/files/php-8.2.8-openssl-tests.patch |  21 +++
 dev-lang/php/php-8.2.8.ebuild| 174 +++
 2 files changed, 135 insertions(+), 60 deletions(-)

diff --git a/dev-lang/php/files/php-8.2.8-openssl-tests.patch 
b/dev-lang/php/files/php-8.2.8-openssl-tests.patch
new file mode 100644
index ..ebade4c0cd45
--- /dev/null
+++ b/dev-lang/php/files/php-8.2.8-openssl-tests.patch
@@ -0,0 +1,21 @@
+commit 5a4083181b970411d6f3b1c1e3bdd199d5cd1a5e
+Author: Jakub Holubansky 
+Date:   Fri Mar 31 17:20:35 2023 +0200
+
+ext/openssl: pass ini options to extra processes in tests
+
+diff --git a/ext/openssl/tests/ServerClientTestCase.inc 
b/ext/openssl/tests/ServerClientTestCase.inc
+index 753366df6f..1b140b63f6 100644
+--- a/ext/openssl/tests/ServerClientTestCase.inc
 b/ext/openssl/tests/ServerClientTestCase.inc
+@@ -72,8 +72,9 @@ class ServerClientTestCase
+ );
+ } else {
+ $cmd = sprintf(
+-'%s "%s" %s %s',
++'%s %s "%s" %s %s',
+ PHP_BINARY,
++getenv('TEST_PHP_EXTRA_ARGS'),
+ __FILE__,
+ WORKER_ARGV_VALUE,
+ $worker

diff --git a/dev-lang/php/php-8.2.8.ebuild b/dev-lang/php/php-8.2.8.ebuild
index 11169ef1de48..b688e330dffc 100644
--- a/dev-lang/php/php-8.2.8.ebuild
+++ b/dev-lang/php/php-8.2.8.ebuild
@@ -67,6 +67,7 @@ REQUIRED_USE="
mysql? ( || ( mysqli pdo ) )
firebird? ( pdo )
mssql? ( pdo )
+   test? ( cli )
 "
 
 RESTRICT="!test? ( test )"
@@ -148,6 +149,7 @@ PHP_MV="$(ver_cut 1)"
 PATCHES=(
"${FILESDIR}/php-iodbc-header-location.patch"
"${FILESDIR}/php-capstone-optional.patch"
+   "${FILESDIR}/php-8.2.8-openssl-tests.patch"
 )
 
 php_install_ini() {
@@ -224,19 +226,85 @@ src_prepare() {
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
+   # missing skipif; fixed upstream already
+   rm sapi/cgi/tests/005.phpt || die
 
+   # These three get BORKED on no-ipv6 systems,
+   #
+   #   https://github.com/php/php-src/pull/11651
+   #
+   rm ext/sockets/tests/mcast_ipv6_recv.phpt \
+  ext/sockets/tests/mcast_ipv6_recv_limited.phpt \
+  ext/sockets/tests/mcast_ipv6_send.phpt \
+  || die
+
+   # fails in a network sandbox,
+   #
+   #   https://github.com/php/php-src/issues/11662
+   #
+   rm ext/sockets/tests/bug63000.phpt || die
+
+   # expected output needs to be updated,
+   #
+   #   https://github.com/php/php-src/pull/11648
+   #
+   rm ext/dba/tests/dba_tcadb.phpt || die
+
+   # Two IMAP tests missing SKIPIFs,
+   #
+   #   https://github.com/php/php-src/pull/11654
+   #
+   rm ext/imap/tests/imap_mutf7_to_utf8.phpt \
+  ext/imap/tests/imap_utf8_to_mutf7_basic.phpt \
+  || die
+
+   # broken upstream with icu-73.x,
+   #
+   #   https://github.com/php/php-src/issues/11128
+   #
+   rm ext/intl/tests/calendar_clear_variation1.phpt || die
+
+   # overly sensitive to INI values; fixes sent upstream:
+   #
+   #  https://github.com/php/php-src/pull/11631
+   #
+   rm ext/session/tests/{bug74514,bug74936,gh7787}.phpt || die
+
+   # This is sensitive to the current "nice" level:
+   #
+   #   https://github.com/php/php-src/issues/11630
+   #
+   rm ext/standard/tests/general_functions/proc_nice_basic.phpt || die
+
+   # Tests ignoring the "-n" flag we pass to run-tests.php,
+   #
+   #   https://github.com/php/php

[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/

2023-07-30 Thread Michael Orlitzky
commit: b86e0533bfe57f2889c0b29834f566be0f0ad55f
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Sun Jul 30 12:35:10 2023 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Mon Jul 31 00:49:13 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b86e0533

dev-lang/php: add valgrind support (8.2 slot only).

Closes: https://bugs.gentoo.org/906336
Signed-off-by: Michael Orlitzky  gentoo.org>

 dev-lang/php/{php-8.2.8-r1.ebuild => php-8.2.8-r2.ebuild} | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/dev-lang/php/php-8.2.8-r1.ebuild b/dev-lang/php/php-8.2.8-r2.ebuild
similarity index 99%
rename from dev-lang/php/php-8.2.8-r1.ebuild
rename to dev-lang/php/php-8.2.8-r2.ebuild
index 506f0c099e6a..98c074915afd 100644
--- a/dev-lang/php/php-8.2.8-r1.ebuild
+++ b/dev-lang/php/php-8.2.8-r2.ebuild
@@ -39,8 +39,8 @@ IUSE="${IUSE} acl apparmor argon2 avif bcmath berkdb bzip2 
calendar
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"
+   sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode
+   valgrind webp +xml xmlreader xmlwriter 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.
@@ -118,6 +118,7 @@ COMMON_DEPEND="
tokyocabinet? ( dev-db/tokyocabinet )
truetype? ( =media-libs/freetype-2* )
unicode? ( dev-libs/oniguruma:= )
+   valgrind? ( dev-util/valgrind )
webp? ( media-libs/libwebp:0= )
xml? ( >=dev-libs/libxml2-2.9.0 )
xpm? ( x11-libs/libXpm )
@@ -385,6 +386,7 @@ src_configure() {
$(use_with zip)
$(use_with zlib zlib "${EPREFIX}/usr")
$(use_enable debug)
+   $(use_with valgrind)
)
 
# DBA support



[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/

2023-07-30 Thread Michael Orlitzky
commit: 2979db2c1d18a27e1de54621afb330debe4f7649
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Sun Jul 30 01:05:44 2023 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Mon Jul 31 00:49:13 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2979db2c

dev-lang/php: new addpredict() for a rare corner case.

Signed-off-by: Michael Orlitzky  gentoo.org>

 dev-lang/php/php-8.2.8-r1.ebuild | 11 +++
 1 file changed, 11 insertions(+)

diff --git a/dev-lang/php/php-8.2.8-r1.ebuild b/dev-lang/php/php-8.2.8-r1.ebuild
index af66d51134a2..506f0c099e6a 100644
--- a/dev-lang/php/php-8.2.8-r1.ebuild
+++ b/dev-lang/php/php-8.2.8-r1.ebuild
@@ -581,6 +581,17 @@ src_compile() {
addpredict /usr/share/snmp/mibs/.index #nowarn
addpredict /var/lib/net-snmp/mib_indexes #nowarn
 
+   if use oci8-instant-client && use kerberos && use imap && use phar; then
+   # A conspiracy takes place when the first three of these flags
+   # are set together, causing the newly-built "php" to open
+   # /dev/urandom with mode rw when it starts. That's not actually
+   # a problem... unless you also have USE=phar, which runs that
+   # "php" to build some phar thingy in src_compile(). Later in
+   # src_test(), portage (at least) sets "addpredict /" so the
+   # problem does not repeat.
+   addpredict /dev/urandom #nowarn
+   fi
+
local sapi
for sapi in ${SAPIS} ; do
use "${sapi}" && emake -C "${WORKDIR}/sapis-build/${sapi}"



[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/

2023-07-07 Thread Michael Orlitzky
commit: 03d9f25399b6b5ea0f0ad461c93d4637d06fcbd6
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Fri Jul  7 17:30:47 2023 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Fri Jul  7 20:11:37 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03d9f253

dev-lang/php: add 8.1.21, php-8.2.8; drop 8.2.7-r1.

Signed-off-by: Michael Orlitzky  gentoo.org>

 dev-lang/php/Manifest   | 3 ++-
 dev-lang/php/{php-8.2.7-r1.ebuild => php-8.1.21.ebuild} | 9 -
 dev-lang/php/{php-8.2.7-r1.ebuild => php-8.2.8.ebuild}  | 0
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index 998dc250d9e9..33835f26adcb 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -5,4 +5,5 @@ DIST php-8.0.29.tar.xz 10803592 BLAKE2B 
6e15ce459aa5a51b2a07a4bfa1f6dba076dbbd48
 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
-DIST php-8.2.7.tar.xz 12016940 BLAKE2B 
c80dcdf7b862b25ff1219688ee648938125d52aa8efa6c74b8d08a038222a411851642744872a5684dbaf2c2762f950c0e4190337ef63fb905671361f1418e6a
 SHA512 
8533c0d7b6b0cbca8d01238342edebe1f123b093ab8f3cf5efab40b133989c3288214176b9e2a213b260b07b6bf140711f9b9580c2515a093f586bedc81d8a44
+DIST php-8.1.21.tar.xz 11862320 BLAKE2B 
51195859c23a3216247a66f39e76bf4679f0365d390f31c7dee7437f22f45cee4e4f4de8cf42706e030355d9ec66b471d61fafc1b30da2eb65b339d99ace93c7
 SHA512 
aeb62947e12646a530b6f61efe9350e4a3632d421ee0bec6a1d26dc2fd680c782e12cbad06496f2d4ffcddf5182aa3438c19a59b0d593fc43789271241ec0383
+DIST php-8.2.8.tar.xz 12034856 BLAKE2B 
c07bec5e9eeb74e611f7480da21b9bd2b2e101bf00fe909a62a52b62c2a44dde5760b151317b3c0d6fb13cc69e3d81397c1b09b46f410e9b935e2fc6bb5b131e
 SHA512 
d1539010761aaa525e286cf012953a097556c61608505a2b1a83f78b40b7a1c3338f494c4cf34abda764c762c4b0bacb09ce9286236d2a356ee61121236b6bcf

diff --git a/dev-lang/php/php-8.2.7-r1.ebuild b/dev-lang/php/php-8.1.21.ebuild
similarity index 99%
copy from dev-lang/php/php-8.2.7-r1.ebuild
copy to dev-lang/php/php-8.1.21.ebuild
index 11169ef1de48..6fb08e8646fb 100644
--- a/dev-lang/php/php-8.2.7-r1.ebuild
+++ b/dev-lang/php/php-8.1.21.ebuild
@@ -34,7 +34,7 @@ IUSE="${IUSE} acl apparmor argon2 avif 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 +jit kerberos ldap ldap-sasl libedit lmdb
+   intl iodbc ipv6 +jit 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
@@ -78,7 +78,7 @@ 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 ) )
+   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:= )
@@ -256,7 +256,6 @@ src_configure() {
--localstatedir="${EPREFIX}/var"
--without-pear
--without-valgrind
-   --enable-ipv6
$(use_enable threads zts)
)
 
@@ -283,6 +282,7 @@ src_configure() {
$(use_with iconv iconv \
$(use elibc_glibc || use elibc_musl || echo 
"${EPREFIX}/usr"))
$(use_enable intl)
+   $(use_enable ipv6)
$(use_with kerberos)
$(use_with xml libxml)
$(use_enable unicode mbstring)
@@ -293,7 +293,6 @@ src_configure() {
$(use_enable opcache)
$(use_with postgres pgsql "${EPREFIX}/usr")
$(use_enable posix)
-   $(use_with selinux fpm-selinux)
$(use_with spell pspell "${EPREFIX}/usr")
$(use_enable simplexml)

[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/

2023-06-30 Thread Sam James
commit: 6b60ac19065505109e36a468c4a72cdff0381eb3
Author: Sam James  gentoo  org>
AuthorDate: Fri Jun 30 10:20:32 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jun 30 10:21:00 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b60ac19

dev-lang/php: simplify https://forums.gentoo.org/viewtopic-p-8794032.html.

Signed-off-by: Sam James  gentoo.org>

 dev-lang/php/{php-7.4.33.ebuild => php-7.4.33-r4.ebuild}| 4 ++--
 dev-lang/php/{php-7.4.33-r2.ebuild => php-7.4.33-r5.ebuild} | 2 +-
 dev-lang/php/{php-7.4.33-r3.ebuild => php-7.4.33-r6.ebuild} | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dev-lang/php/php-7.4.33.ebuild b/dev-lang/php/php-7.4.33-r4.ebuild
similarity index 99%
rename from dev-lang/php/php-7.4.33.ebuild
rename to dev-lang/php/php-7.4.33-r4.ebuild
index 44eb6d5b3366..7fbca4442887 100644
--- a/dev-lang/php/php-7.4.33.ebuild
+++ b/dev-lang/php/php-7.4.33-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -114,7 +114,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.1:0= =app-text/aspell-0.50 )
sqlite? ( >=dev-db/sqlite-3.7.6.3 )
-   ssl? ( >=dev-libs/openssl-1.0.1:0= 

[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/

2023-06-18 Thread Arthur Zamarin
commit: 8be80010412558b31ba6f1179a0adb5ac2a75b47
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Jun 18 16:59:43 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Jun 18 16:59:43 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8be80010

dev-lang/php: Stabilize 8.1.20-r1 arm64, #908792

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-lang/php/php-8.1.20-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-lang/php/php-8.1.20-r1.ebuild 
b/dev-lang/php/php-8.1.20-r1.ebuild
index 10586a305767..cff862c8fed3 100644
--- a/dev-lang/php/php-8.1.20-r1.ebuild
+++ b/dev-lang/php/php-8.1.20-r1.ebuild
@@ -20,7 +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"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~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"



[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/

2023-06-18 Thread Arthur Zamarin
commit: 86a07408269ddce4b44c9360fe66b2617b7a8cc5
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Jun 18 16:59:32 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Jun 18 16:59:32 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86a07408

dev-lang/php: Stabilize 8.0.29 ppc64, #908792

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-lang/php/php-8.0.29.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-lang/php/php-8.0.29.ebuild b/dev-lang/php/php-8.0.29.ebuild
index b6ce4bcbf1b4..cbb6e7e4d57f 100644
--- a/dev-lang/php/php-8.0.29.ebuild
+++ b/dev-lang/php/php-8.0.29.ebuild
@@ -20,7 +20,7 @@ LICENSE="PHP-3.01
unicode? ( BSD-2 LGPL-2.1 )"
 
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+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"



[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/

2023-06-18 Thread Arthur Zamarin
commit: abfe80b07d005b956c3504066f86c1fb350995e9
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Jun 18 16:59:50 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Jun 18 16:59:50 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=abfe80b0

dev-lang/php: Stabilize 8.0.29 sparc, #908792

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-lang/php/php-8.0.29.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-lang/php/php-8.0.29.ebuild b/dev-lang/php/php-8.0.29.ebuild
index ec70ee661bdd..ff9701dbae64 100644
--- a/dev-lang/php/php-8.0.29.ebuild
+++ b/dev-lang/php/php-8.0.29.ebuild
@@ -20,7 +20,7 @@ LICENSE="PHP-3.01
unicode? ( BSD-2 LGPL-2.1 )"
 
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+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"



[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/

2023-06-18 Thread Arthur Zamarin
commit: 6ea201f7d4d559e29ebb478d5beb76fc81dda8bc
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Jun 18 16:59:49 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Jun 18 16:59:49 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ea201f7

dev-lang/php: Stabilize 7.4.33-r3 sparc, #908792

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-lang/php/php-7.4.33-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-lang/php/php-7.4.33-r3.ebuild 
b/dev-lang/php/php-7.4.33-r3.ebuild
index 4a5a94071d3a..6c9786ea4e3b 100644
--- a/dev-lang/php/php-7.4.33-r3.ebuild
+++ b/dev-lang/php/php-7.4.33-r3.ebuild
@@ -20,7 +20,7 @@ LICENSE="PHP-3.01
unicode? ( BSD-2 LGPL-2.1 )"
 
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+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"



[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/

2023-06-18 Thread Arthur Zamarin
commit: 27513f28368327762f843b9da40d2b13e6776994
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Jun 18 16:59:42 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Jun 18 16:59:42 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27513f28

dev-lang/php: Stabilize 7.4.33-r3 arm64, #908792

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-lang/php/php-7.4.33-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-lang/php/php-7.4.33-r3.ebuild 
b/dev-lang/php/php-7.4.33-r3.ebuild
index ba1e781d2596..4a5a94071d3a 100644
--- a/dev-lang/php/php-7.4.33-r3.ebuild
+++ b/dev-lang/php/php-7.4.33-r3.ebuild
@@ -20,7 +20,7 @@ LICENSE="PHP-3.01
unicode? ( BSD-2 LGPL-2.1 )"
 
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+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"



[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/

2023-06-18 Thread Arthur Zamarin
commit: f2ade9f2aa4b8b9be1be7d7d957ac67c176ed8a3
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Jun 18 16:59:32 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Jun 18 16:59:32 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2ade9f2

dev-lang/php: Stabilize 8.1.20-r1 ppc64, #908792

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-lang/php/php-8.1.20-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-lang/php/php-8.1.20-r1.ebuild 
b/dev-lang/php/php-8.1.20-r1.ebuild
index 6fb08e8646fb..10586a305767 100644
--- a/dev-lang/php/php-8.1.20-r1.ebuild
+++ b/dev-lang/php/php-8.1.20-r1.ebuild
@@ -20,7 +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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~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"



[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/

2023-06-18 Thread Arthur Zamarin
commit: 9d6de4a24c0a59cbec2baa6a912aef90029eaf71
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Jun 18 16:59:50 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Jun 18 16:59:50 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d6de4a2

dev-lang/php: Stabilize 8.1.20-r1 sparc, #908792

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-lang/php/php-8.1.20-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-lang/php/php-8.1.20-r1.ebuild 
b/dev-lang/php/php-8.1.20-r1.ebuild
index cff862c8fed3..c26809bca6e3 100644
--- a/dev-lang/php/php-8.1.20-r1.ebuild
+++ b/dev-lang/php/php-8.1.20-r1.ebuild
@@ -20,7 +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"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~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"



[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/

2023-06-18 Thread Arthur Zamarin
commit: fb70707f6de34c7f4301f829ba5534230e21c37e
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Jun 18 16:59:43 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Jun 18 16:59:43 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb70707f

dev-lang/php: Stabilize 8.0.29 arm64, #908792

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-lang/php/php-8.0.29.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-lang/php/php-8.0.29.ebuild b/dev-lang/php/php-8.0.29.ebuild
index cbb6e7e4d57f..ec70ee661bdd 100644
--- a/dev-lang/php/php-8.0.29.ebuild
+++ b/dev-lang/php/php-8.0.29.ebuild
@@ -20,7 +20,7 @@ LICENSE="PHP-3.01
unicode? ( BSD-2 LGPL-2.1 )"
 
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+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"



[gentoo-commits] repo/gentoo:master commit in: dev-lang/php/

2023-06-18 Thread Arthur Zamarin
commit: e9471fad61d9f1f235b52231fda096309492de34
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Jun 18 16:59:31 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Jun 18 16:59:31 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9471fad

dev-lang/php: Stabilize 7.4.33-r3 ppc64, #908792

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-lang/php/php-7.4.33-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-lang/php/php-7.4.33-r3.ebuild 
b/dev-lang/php/php-7.4.33-r3.ebuild
index a83e47e6d4f0..ba1e781d2596 100644
--- a/dev-lang/php/php-7.4.33-r3.ebuild
+++ b/dev-lang/php/php-7.4.33-r3.ebuild
@@ -20,7 +20,7 @@ LICENSE="PHP-3.01
unicode? ( BSD-2 LGPL-2.1 )"
 
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+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"



  1   2   3   4   5   6   7   8   9   10   >