[gentoo-commits] repo/gentoo:master commit in: sys-apps/ack/

2023-05-11 Thread Brian Evans
commit: 8f103502168c3205fd077291f273e5e771d1ab92
Author: Brian Evans  gentoo  org>
AuthorDate: Thu May 11 13:19:55 2023 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Thu May 11 13:19:55 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f103502

sys-apps/ack: Version bump for 3.7.0; drop 3.5.0

Signed-off-by: Brian Evans  gentoo.org>

 sys-apps/ack/Manifest   | 2 +-
 sys-apps/ack/{ack-3.5.0.ebuild => ack-3.7.0.ebuild} | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sys-apps/ack/Manifest b/sys-apps/ack/Manifest
index c7a55f8018af..f4061f54f6dd 100644
--- a/sys-apps/ack/Manifest
+++ b/sys-apps/ack/Manifest
@@ -1,2 +1,2 @@
-DIST ack-v3.5.0.tar.gz 249718 BLAKE2B 
dedd11b424f7274c45dabfd0ddf2c92ee9d15ccf40d251c79159aef6e93071c963291722a2024db1d4828ae02c1310d3fec366ca8bd5f249da2c0c73f7e303cb
 SHA512 
f5b9321fc62cf2ab86fa7dc933dd44245314ebd26bee2d8769f85c15fc8b4493d0757ca4430708f0ebea5692f9c73ad17cc00bc46d1f611b8489b30811df307d
 DIST ack-v3.6.0.tar.gz 251556 BLAKE2B 
6e65633ea9b8b24b03d3ff60c0554eb05009ebbaacbeede8109bdfd36340ac6151f3be9b461349793d6a222d4fb9b21579d44cff3aa541b7bdbc94d16269d2d1
 SHA512 
1cef0d873be47c8e27d5c3b3b47ea965cf39755d1556c3f653c28d75e1cea9b1ff183297c897d919e220cfcb556e3d5b88eb0b5343d933a05fa2c1fff1234173
+DIST ack-v3.7.0.tar.gz 252426 BLAKE2B 
0f13e2bfea838a4748b757dc396e56944f9c8f3bfb29569d4f5ddccd2d669906e782b0cb75da0076ec4de8f8fce27de6ab36ed23352e22b32d46273d60b23a1a
 SHA512 
3d97309956ce65f972a7636d195b13031f4441981d5bdddf0b67e577c32c88972f7ed02ffafbbf73c4db9a22f200f95cce9c8eb2a6f47fd60143d93469038f57

diff --git a/sys-apps/ack/ack-3.5.0.ebuild b/sys-apps/ack/ack-3.7.0.ebuild
similarity index 83%
rename from sys-apps/ack/ack-3.5.0.ebuild
rename to sys-apps/ack/ack-3.7.0.ebuild
index af03295ad884..f55f1beafcec 100644
--- a/sys-apps/ack/ack-3.5.0.ebuild
+++ b/sys-apps/ack/ack-3.7.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 DIST_AUTHOR=PETDANCE
 DIST_VERSION="v${PV}"
 inherit perl-module
@@ -11,7 +11,7 @@ HOMEPAGE="https://beyondgrep.com;
 
 LICENSE="Artistic-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~riscv x86 ~amd64-linux ~x86-linux 
~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~riscv ~x86 ~amd64-linux ~x86-linux 
~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 



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

2023-05-05 Thread Brian Evans
commit: e3633b3970dbbde652043324504ce21064668f8f
Author: Brian Evans  gentoo  org>
AuthorDate: Fri May  5 13:11:26 2023 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Fri May  5 13:18:36 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3633b39

dev-lang/php: Backport capstone detection added upstream

This is a trimmed down version of mjo's patch to apply to a wider array
of versions.  The oprofile bits omiitted are not important as defines
block their calling and the defines are removed from the configure.

Fixes: https://bugs.gentoo.org/905725
Signed-off-by: Brian Evans  gentoo.org>

 dev-lang/php/files/php-capstone-optional.patch | 78 ++
 dev-lang/php/php-8.1.18.ebuild |  1 +
 dev-lang/php/php-8.2.5.ebuild  |  1 +
 3 files changed, 80 insertions(+)

diff --git a/dev-lang/php/files/php-capstone-optional.patch 
b/dev-lang/php/files/php-capstone-optional.patch
new file mode 100644
index ..a4719bbb6857
--- /dev/null
+++ b/dev-lang/php/files/php-capstone-optional.patch
@@ -0,0 +1,78 @@
+diff --git a/ext/opcache/config.m4 b/ext/opcache/config.m4
+index 444ded9976ac..fb3324cf82a3 100644
+--- a/ext/opcache/config.m4
 b/ext/opcache/config.m4
+@@ -18,6 +18,12 @@ PHP_ARG_ENABLE([opcache-jit],
+   [yes],
+   [no])
+ 
++PHP_ARG_WITH([opcache-capstone],,
++  [AS_HELP_STRING([--with-opcache-capstone],
++[support opcache JIT disassembly through capstone])],
++  [no],
++  [no])
++
+ if test "$PHP_OPCACHE" != "no"; then
+ 
+   dnl Always build as shared extension
+@@ -68,41 +74,18 @@ if test "$PHP_OPCACHE" != "no"; then
+   DASM_FLAGS="$DASM_FLAGS -D ZTS=1"
+ fi
+ 
+-PKG_CHECK_MODULES([CAPSTONE], [capstone >= 3.0.0],
+-[have_capstone="yes"], [have_capstone="no"])
+-if test "$have_capstone" = "yes"; then
+-AC_DEFINE(HAVE_CAPSTONE, 1, [ ])
++AS_IF([test x"$with_opcache_capstone" = "xyes"],[
++  PKG_CHECK_MODULES([CAPSTONE],[capstone >= 3.0.0],[
++AC_DEFINE([HAVE_CAPSTONE], [1], [Capstone is available])
+ PHP_EVAL_LIBLINE($CAPSTONE_LIBS, OPCACHE_SHARED_LIBADD)
+ PHP_EVAL_INCLINE($CAPSTONE_CFLAGS)
+-fi
+-
+-PHP_SUBST(DASM_FLAGS)
+-PHP_SUBST(DASM_ARCH)
+-
+-AC_MSG_CHECKING(for opagent in default path)
+-for i in /usr/local /usr; do
+-  if test -r $i/include/opagent.h; then
+-OPAGENT_DIR=$i
+-AC_MSG_RESULT(found in $i)
+-break
+-  fi
+-done
+-if test -z "$OPAGENT_DIR"; then
+-  AC_MSG_RESULT(not found)
+-else
+-  PHP_CHECK_LIBRARY(opagent, op_write_native_code,
+-  [
+-AC_DEFINE(HAVE_OPROFILE,1,[ ])
+-PHP_ADD_INCLUDE($OPAGENT_DIR/include)
+-PHP_ADD_LIBRARY_WITH_PATH(opagent, $OPAGENT_DIR/$PHP_LIBDIR/oprofile, 
OPCACHE_SHARED_LIBADD)
+-PHP_SUBST(OPCACHE_SHARED_LIBADD)
+-  ],[
+-AC_MSG_RESULT(not found)
+   ],[
+--L$OPAGENT_DIR/$PHP_LIBDIR/oprofile
++AC_MSG_ERROR([capstone >= 3.0 required but not found])
+   ])
+-fi
++])
+ 
++PHP_SUBST(DASM_FLAGS)
++PHP_SUBST(DASM_ARCH)
+   fi
+ 
+   AC_CHECK_FUNCS([mprotect memfd_create])
+diff --git a/ext/opcache/jit/Makefile.frag b/ext/opcache/jit/Makefile.frag
+index 98c5cdaea249..f9ae2e0cf4b9 100644
+--- a/ext/opcache/jit/Makefile.frag
 b/ext/opcache/jit/Makefile.frag
+@@ -11,7 +11,6 @@ $(builddir)/jit/zend_jit.lo: \
+   $(srcdir)/jit/zend_jit_disasm.c \
+   $(srcdir)/jit/zend_jit_gdb.c \
+   $(srcdir)/jit/zend_jit_perf_dump.c \
+-  $(srcdir)/jit/zend_jit_oprofile.c \
+   $(srcdir)/jit/zend_jit_vtune.c \
+   $(srcdir)/jit/zend_jit_trace.c \
+   $(srcdir)/jit/zend_elf.c

diff --git a/dev-lang/php/php-8.1.18.ebuild b/dev-lang/php/php-8.1.18.ebuild
index 20d68c6387fd..7a0c8ba9fcf7 100644
--- a/dev-lang/php/php-8.1.18.ebuild
+++ b/dev-lang/php/php-8.1.18.ebuild
@@ -147,6 +147,7 @@ PHP_MV="$(ver_cut 1)"
 
 PATCHES=(
"${FILESDIR}/php-iodbc-header-location.patch"
+   "${FILESDIR}/php-capstone-optional.patch"
 )
 
 php_install_ini() {

diff --git a/dev-lang/php/php-8.2.5.ebuild b/dev-lang/php/php-8.2.5.ebuild
index bb2d5ee06588..d8e80841110d 100644
--- a/dev-lang/php/php-8.2.5.ebuild
+++ b/dev-lang/php/php-8.2.5.ebuild
@@ -148,6 +148,7 @@ PHP_MV="$(ver_cut 1)"
 
 PATCHES=(
"${FILESDIR}/php-iodbc-header-location.patch"
+   "${FILESDIR}/php-capstone-optional.patch"
 )
 
 php_install_ini() {



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

2023-05-04 Thread Brian Evans
commit: dcb2c860d3d9db82007a0ec96a9a81cfb283fd69
Author: Brian Evans  gentoo  org>
AuthorDate: Fri May  5 03:09:23 2023 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Fri May  5 03:09:23 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dcb2c860

dev-lang/php: Version bump for 8.1.18

Signed-off-by: Brian Evans  gentoo.org>

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

diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index fc3a5d0a6727..d5f84e05e6bc 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -5,5 +5,6 @@ DIST php-8.0.28.tar.xz 10801568 BLAKE2B 
de03f5ad262e830c70d24b9e2dd997897e5613d8
 DIST php-8.1.12.tar.xz 11747176 BLAKE2B 
0505794826fb0fc92b04be5f7162af8aa92d782bb228243348d85b46866cd47089fcb7febd6886a8179babf64cb227bcdbf5d5f60d44dfefe1c947a3a708e3c1
 SHA512 
437b6a8146b58479f4d1acb7b35d68954f1f7bc13a8f3dddc66e1677d7e9b6a11154861f9e894cbd59b9c28d4df3fd5422f9b5553004e9fc8d0320ab59b9f907
 DIST php-8.1.14.tar.xz 11752004 BLAKE2B 
5ba60621c641b25c2d8ab0c82e97d59131587718c75cc013dc4ba1ad68e668e7f86b67f01f02c434e65c8a9075581a7f2decb2b8c3706e325e25e9f717cdfd82
 SHA512 
75a5dc3b0490cd8105d4f6c5446522b38953d78fe7b568798db749740f365c818b251d86aba72f5e555c5fe4e4a28e352a9510803bf3cdfe37d125824ae84d61
 DIST php-8.1.16.tar.xz 11760948 BLAKE2B 
ac0d352dae05115197852092b9b3c0b5091528326806c70eb34e0aba6007f718e927e67045d65976cb2104e4737a475b2224d4f05ff89ddf8c3066e0240c38e1
 SHA512 
4515da38803272abfafb069d1684c66dbb5086987b148c48dd7d8acf8f5316d255cf321ec57d6fbffe914a35551a533446ac13c34bb7c984e0d109247e8e64da
+DIST php-8.1.18.tar.xz 11782240 BLAKE2B 
fc3355e34427198d87c51aaa5d5f02cb590859892d3d04fe067af555c7ad4e1e6908836faf534c29c720d2b9cfee1f3ed9de559d49902edef45520955d6c7f81
 SHA512 
e30dba23ab8711a04c21ad040d69807f479760a20f363fe3f91a297e9e6463d9558299b15231e00e2b1c95d03309e03bde8cbbe4043fce3e1b965236ece1d0f3
 DIST php-8.2.4.tar.xz 11991796 BLAKE2B 
4e1aa90472e2dbacb23f95736c399ac2b0f6e9577f58b502c26b5a2731b7c1eabb34bbdb75a13a5903870937a063ef8f321bf22bb23a74404592542186065ff6
 SHA512 
997435f3f921f305147a520497c68031aad6d1212365ddf04674d919fd2787d169d2898536a59709b5530857c5746a25cf43e726a2c3a30bcf3372107b2cd388
 DIST php-8.2.5.tar.xz 12001192 BLAKE2B 
9c404801a9c3fefcc5bf166de257617e5fb34e76a01147e7778ebf09a97e2499f79fec1f4e7ee1945aa8083f8e7a33acbd4d9cdecdf215cb9dcb240c927d6c22
 SHA512 
ae8aac35a58b342fbfb725044eecdb1065690c461b26e4225445bda3a1719e43eacc4ad5536ccce326cf56a18c20d424b85b1a53277100c7186fc4d54b2d77f0

diff --git a/dev-lang/php/php-8.1.18.ebuild b/dev-lang/php/php-8.1.18.ebuild
new file mode 100644
index ..20d68c6387fd
--- /dev/null
+++ b/dev-lang/php/php-8.1.18.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
+
+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 ~loong ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+# We can build the following SAPIs in the given order
+SAPIS="embed cli cgi fpm apache2 phpdbg"
+
+# 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 ) )
+   !cli? ( ?? ( readline libedit ) )
+   truetype? ( gd zlib )
+   webp? ( gd zlib )
+   cjk? ( gd zlib )
+   exif? ( gd zlib )
+   xpm? ( gd zlib )
+   gd? ( zlib )
+  

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

2023-05-04 Thread Brian Evans
commit: d910190068b36540cade28f1ea5efc6aabf71438
Author: Brian Evans  gentoo  org>
AuthorDate: Fri May  5 02:33:33 2023 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Fri May  5 02:33:33 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9101900

dev-lang/php: Version bump for 8.2.5

Signed-off-by: Brian Evans  gentoo.org>

 dev-lang/php/Manifest |   1 +
 dev-lang/php/php-8.2.5.ebuild | 759 ++
 2 files changed, 760 insertions(+)

diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index feb7193af5a2..fc3a5d0a6727 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -6,3 +6,4 @@ DIST php-8.1.12.tar.xz 11747176 BLAKE2B 
0505794826fb0fc92b04be5f7162af8aa92d782b
 DIST php-8.1.14.tar.xz 11752004 BLAKE2B 
5ba60621c641b25c2d8ab0c82e97d59131587718c75cc013dc4ba1ad68e668e7f86b67f01f02c434e65c8a9075581a7f2decb2b8c3706e325e25e9f717cdfd82
 SHA512 
75a5dc3b0490cd8105d4f6c5446522b38953d78fe7b568798db749740f365c818b251d86aba72f5e555c5fe4e4a28e352a9510803bf3cdfe37d125824ae84d61
 DIST php-8.1.16.tar.xz 11760948 BLAKE2B 
ac0d352dae05115197852092b9b3c0b5091528326806c70eb34e0aba6007f718e927e67045d65976cb2104e4737a475b2224d4f05ff89ddf8c3066e0240c38e1
 SHA512 
4515da38803272abfafb069d1684c66dbb5086987b148c48dd7d8acf8f5316d255cf321ec57d6fbffe914a35551a533446ac13c34bb7c984e0d109247e8e64da
 DIST php-8.2.4.tar.xz 11991796 BLAKE2B 
4e1aa90472e2dbacb23f95736c399ac2b0f6e9577f58b502c26b5a2731b7c1eabb34bbdb75a13a5903870937a063ef8f321bf22bb23a74404592542186065ff6
 SHA512 
997435f3f921f305147a520497c68031aad6d1212365ddf04674d919fd2787d169d2898536a59709b5530857c5746a25cf43e726a2c3a30bcf3372107b2cd388
+DIST php-8.2.5.tar.xz 12001192 BLAKE2B 
9c404801a9c3fefcc5bf166de257617e5fb34e76a01147e7778ebf09a97e2499f79fec1f4e7ee1945aa8083f8e7a33acbd4d9cdecdf215cb9dcb240c927d6c22
 SHA512 
ae8aac35a58b342fbfb725044eecdb1065690c461b26e4225445bda3a1719e43eacc4ad5536ccce326cf56a18c20d424b85b1a53277100c7186fc4d54b2d77f0

diff --git a/dev-lang/php/php-8.2.5.ebuild b/dev-lang/php/php-8.2.5.ebuild
new file mode 100644
index ..bb2d5ee06588
--- /dev/null
+++ b/dev-lang/php/php-8.2.5.ebuild
@@ -0,0 +1,759 @@
+# 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
+
+MY_PV=${PV/_rc/RC}
+DESCRIPTION="The PHP language runtime engine"
+HOMEPAGE="https://www.php.net/;
+SRC_URI="https://www.php.net/distributions/${P}.tar.xz;
+#SRC_URI="https://downloads.php.net/~pierrick/php-${MY_PV}.tar.xz;
+
+LICENSE="PHP-3.01
+   BSD
+   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"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+# 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 +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 ) )
+   !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 

[gentoo-commits] repo/gentoo:master commit in: lxde-base/lxdm/, lxde-base/lxdm/files/

2023-03-25 Thread Brian Evans
commit: f9f0e0bab1bb8213223e5fe44b3f2d7b7d44ead4
Author: Brian Evans  gentoo  org>
AuthorDate: Sun Mar 26 01:28:45 2023 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Sun Mar 26 01:28:45 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9f0e0ba

lxde-base/lxdm: Patch socket header failure on musl + clang:16

Makes struct members explicit

Closes: https://bugs.gentoo.org/896032
Patch-by: Sam James  gentoo.org>
Signed-off-by: Brian Evans  gentoo.org>

 lxde-base/lxdm/files/lxdm-0.5.3-portable-msghdr.patch | 18 ++
 lxde-base/lxdm/lxdm-0.5.3-r4.ebuild   | 14 +-
 2 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/lxde-base/lxdm/files/lxdm-0.5.3-portable-msghdr.patch 
b/lxde-base/lxdm/files/lxdm-0.5.3-portable-msghdr.patch
new file mode 100644
index ..dc7f8ad016e9
--- /dev/null
+++ b/lxde-base/lxdm/files/lxdm-0.5.3-portable-msghdr.patch
@@ -0,0 +1,18 @@
+--- a/src/lxcom.c
 b/src/lxcom.c
+@@ -117,7 +117,15 @@
+   char ctrl[/*CMSG_SPACE(sizeof(LXDM_CRED))*/1024];
+   struct sockaddr_un peer;
+   struct iovec v={buf,sizeof(buf)};
+-  struct msghdr h={,sizeof(peer),,1,ctrl,sizeof(ctrl),0};
++  struct msghdr h={
++  .msg_name = ,
++  .msg_namelen = sizeof(peer),
++  .msg_iov = ,
++  .msg_iovlen = 1,
++  .msg_control = ctrl,
++  .msg_controllen = sizeof(ctrl),
++  .msg_flags = 0
++  };
+   struct cmsghdr *cmptr;
+   int ret;

diff --git a/lxde-base/lxdm/lxdm-0.5.3-r4.ebuild 
b/lxde-base/lxdm/lxdm-0.5.3-r4.ebuild
index 1242ecf466fa..f4ccc1ad9647 100644
--- a/lxde-base/lxdm/lxdm-0.5.3-r4.ebuild
+++ b/lxde-base/lxdm/lxdm-0.5.3-r4.ebuild
@@ -42,15 +42,19 @@ DOCS=( AUTHORS README TODO )
 
 REQUIRED_USE="?? ( elogind systemd ) elogind? ( pam ) systemd? ( pam )"
 
+PATCHES=(
+   # Fix consolekit and selinux
+   "${FILESDIR}/${P}-pam.patch"
+   # Apply all upstream fixes in git until 2016-11-11
+   "${FILESDIR}/lxdm-0.5.3-upstream-fixes.patch"
+   "${FILESDIR}/lxdm-0.5.3-portable-msghdr.patch"
+)
+
 src_prepare() {
# Upstream bug, tarball contains pre-made lxdm.conf
rm "${S}"/data/lxdm.conf || die
 
-   # Fix consolekit and selinux
-   eapply "${FILESDIR}/${P}-pam.patch"
-   # Apply all upstream fixes in git until 2016-11-11
-   eapply "${FILESDIR}/lxdm-0.5.3-upstream-fixes.patch"
-   eapply_user
+   default
 
# this replaces the bootstrap/autogen script in most packages
eautoreconf



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

2023-03-08 Thread Brian Evans
commit: c7f6c7851908d69cb9555704f08334b2afdec5d6
Author: Brian Evans  gentoo  org>
AuthorDate: Wed Mar  8 18:08:12 2023 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Wed Mar  8 18:08:12 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7f6c785

dev-php/pecl-ssh2: Update targets

Closes: https://bugs.gentoo.org/899738
Signed-off-by: Brian Evans  gentoo.org>

 dev-php/pecl-ssh2/pecl-ssh2-1.3.1-r1.ebuild | 19 +++
 dev-php/pecl-ssh2/pecl-ssh2-.ebuild |  4 ++--
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/dev-php/pecl-ssh2/pecl-ssh2-1.3.1-r1.ebuild 
b/dev-php/pecl-ssh2/pecl-ssh2-1.3.1-r1.ebuild
new file mode 100644
index ..405a6b3e9a07
--- /dev/null
+++ b/dev-php/pecl-ssh2/pecl-ssh2-1.3.1-r1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+PHP_EXT_NAME="ssh2"
+
+USE_PHP="php7-4 php8-0 php8-1 php8-2"
+
+inherit php-ext-pecl-r3
+
+DESCRIPTION="PHP bindings for the libssh2 library"
+LICENSE="PHP-3.01"
+SLOT="7"
+IUSE=""
+KEYWORDS="~amd64 ~x86"
+# Upstream notes say there are errors with gcrypt backend
+DEPEND=">=net-libs/libssh2-1.2[-gcrypt]"
+RDEPEND="${DEPEND}"

diff --git a/dev-php/pecl-ssh2/pecl-ssh2-.ebuild 
b/dev-php/pecl-ssh2/pecl-ssh2-.ebuild
index b5c9256a3d98..8206375e6835 100644
--- a/dev-php/pecl-ssh2/pecl-ssh2-.ebuild
+++ b/dev-php/pecl-ssh2/pecl-ssh2-.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="8"
 
 PHP_EXT_NAME="ssh2"
 
-USE_PHP="php7-4 php8-0 php8-1"
+USE_PHP="php7-4 php8-0 php8-1 php8-2"
 EGIT_REPO_URI="https://github.com/php/pecl-networking-ssh2.git;
 
 inherit php-ext-source-r3 git-r3



[gentoo-commits] repo/gentoo:master commit in: dev-db/mycli/

2023-02-25 Thread Brian Evans
commit: 473755ced3b693389f729b1b941567fc7927c6dc
Author: Brian Evans  gentoo  org>
AuthorDate: Sat Feb 25 22:27:18 2023 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Sat Feb 25 22:28:09 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=473755ce

dev-db/mycli: Drop old

Signed-off-by: Brian Evans  gentoo.org>

 dev-db/mycli/Manifest   |  3 --
 dev-db/mycli/mycli-1.24.1.ebuild| 57 ---
 dev-db/mycli/mycli-1.25.0-r1.ebuild | 67 -
 dev-db/mycli/mycli-1.25.0.ebuild| 57 ---
 4 files changed, 184 deletions(-)

diff --git a/dev-db/mycli/Manifest b/dev-db/mycli/Manifest
index 03364b7d7786..cc2468208fc5 100644
--- a/dev-db/mycli/Manifest
+++ b/dev-db/mycli/Manifest
@@ -1,4 +1 @@
-DIST mycli-1.24.1.tar.gz 275983 BLAKE2B 
cc03ebd0f4de1fabbd1c186139aac04a50d01529190972cac63765a4d3e688e994c112d001489bf1dfb17541370e0c348a368d85a86b7eed335b775b96897765
 SHA512 
5f8ffb98fd285d2e556bef7cefdc77588983c0028c7c24084710633fb469ae3c5ab2232ca23e87406d44d87e503c113039e6884ec9efd603f45b3ab7ed7c0925
-DIST mycli-1.25.0.gh.tar.gz 277022 BLAKE2B 
eabb07003741bc041fcfc7be92beade5bdf0c19d0be00b1a98037d38b164043e5280254b9c8446254928253f6059c33ae9395df780a2f30c5d9cbebffe020895
 SHA512 
e20b1466f0f2bf81f0d65bd23f97eae6b0943029c89d9d45f84368abc5f12c3054c09a45c4daea47831a192417e2e5be7bcd6622ea518e57b68f975a028d3f79
-DIST mycli-1.25.0.tar.gz 277022 BLAKE2B 
eabb07003741bc041fcfc7be92beade5bdf0c19d0be00b1a98037d38b164043e5280254b9c8446254928253f6059c33ae9395df780a2f30c5d9cbebffe020895
 SHA512 
e20b1466f0f2bf81f0d65bd23f97eae6b0943029c89d9d45f84368abc5f12c3054c09a45c4daea47831a192417e2e5be7bcd6622ea518e57b68f975a028d3f79
 DIST mycli-1.26.1.gh.tar.gz 279221 BLAKE2B 
2bb178110b5aba3e381541a7892cc1d8bed8e41c499d1dc36fa39435805a118536de44bf21b2ca2652afefcd15f8bc86ed77de876f703740e796444ff8cea6b0
 SHA512 
bce9def37718444f2445ed3a7ad91c54df4cc3dc5d207a4a2e0fc72eb27b75fca687958241fc40f5494efcdf9e4bae251f3cf94c13b967dd922d5ff653348c77

diff --git a/dev-db/mycli/mycli-1.24.1.ebuild b/dev-db/mycli/mycli-1.24.1.ebuild
deleted file mode 100644
index 43d494e9b859..
--- a/dev-db/mycli/mycli-1.24.1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-DISTUTILS_SINGLE_IMPL=yes
-inherit distutils-r1
-
-MY_PV=$(ver_cut 1-3)
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-DESCRIPTION="CLI for MySQL Database with auto-completion and syntax 
highlighting"
-HOMEPAGE="https://www.mycli.net;
-SRC_URI="https://github.com/dbcli/${PN}/archive/v${MY_PV}.tar.gz -> 
${P}.tar.gz"
-
-LICENSE="BSD MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="ssh"
-
-RDEPEND="
-   $(python_gen_cond_dep '
-   >=dev-python/cli_helpers-2.0.1[${PYTHON_USEDEP}]
-   >=dev-python/click-7.0[${PYTHON_USEDEP}]
-   >=dev-python/configobj-5.0.6[${PYTHON_USEDEP}]
-   >=dev-python/cryptography-1.0.0[${PYTHON_USEDEP}]
-   >=dev-python/prompt-toolkit-3.0.0[${PYTHON_USEDEP}]
-   =dev-python/pygments-2.0[${PYTHON_USEDEP}]
-   >=dev-python/pymysql-0.9.2[${PYTHON_USEDEP}]
-   dev-python/pyperclip[${PYTHON_USEDEP}]
-   >=dev-python/sqlparse-0.3.0[${PYTHON_USEDEP}]
-   https://www.mycli.net/
-   https://github.com/dbcli/mycli/
-   https://pypi.org/project/mycli/
-"
-SRC_URI="
-   https://github.com/dbcli/mycli/archive/v${PV}.tar.gz
-   -> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="ssh"
-
-RDEPEND="
-   $(python_gen_cond_dep '
-   >=dev-python/cli_helpers-2.2.1[${PYTHON_USEDEP}]
-   >=dev-python/click-7.0[${PYTHON_USEDEP}]
-   >=dev-python/configobj-5.0.6[${PYTHON_USEDEP}]
-   >=dev-python/cryptography-1.0.0[${PYTHON_USEDEP}]
-   >=dev-python/prompt-toolkit-3.0.0[${PYTHON_USEDEP}]
-   =dev-python/pygments-2.0[${PYTHON_USEDEP}]
-   >=dev-python/pymysql-0.9.2[${PYTHON_USEDEP}]
-   dev-python/pyperclip[${PYTHON_USEDEP}]
-   >=dev-python/sqlparse-0.3.0[${PYTHON_USEDEP}]
-   https://www.mycli.net;
-SRC_URI="https://github.com/dbcli/${PN}/archive/v${MY_PV}.tar.gz -> 
${P}.tar.gz"
-
-LICENSE="BSD MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="ssh"
-
-RDEPEND="
-   $(python_gen_cond_dep '
-   >=dev-python/cli_helpers-2.2.1[${PYTHON_USEDEP}]
-   >=dev-python/click-7.0[${PYTHON_USEDEP}]
-   >=dev-python/configobj-5.0.6[${PYT

[gentoo-commits] repo/gentoo:master commit in: dev-db/mycli/

2023-02-25 Thread Brian Evans
commit: 37a1e664185bf20ce8cd13aa2321571faf707811
Author: Brian Evans  gentoo  org>
AuthorDate: Sat Feb 25 22:26:12 2023 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Sat Feb 25 22:28:09 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37a1e664

dev-db/mycli: Version bump for 1.26.1

Closes: https://bugs.gentoo.org/id=896674
Signed-off-by: Brian Evans  gentoo.org>

 dev-db/mycli/Manifest   |  1 +
 dev-db/mycli/{mycli-.ebuild => mycli-1.26.1.ebuild} | 12 
 dev-db/mycli/mycli-.ebuild  |  2 +-
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/dev-db/mycli/Manifest b/dev-db/mycli/Manifest
index 45e3f918e0a0..03364b7d7786 100644
--- a/dev-db/mycli/Manifest
+++ b/dev-db/mycli/Manifest
@@ -1,3 +1,4 @@
 DIST mycli-1.24.1.tar.gz 275983 BLAKE2B 
cc03ebd0f4de1fabbd1c186139aac04a50d01529190972cac63765a4d3e688e994c112d001489bf1dfb17541370e0c348a368d85a86b7eed335b775b96897765
 SHA512 
5f8ffb98fd285d2e556bef7cefdc77588983c0028c7c24084710633fb469ae3c5ab2232ca23e87406d44d87e503c113039e6884ec9efd603f45b3ab7ed7c0925
 DIST mycli-1.25.0.gh.tar.gz 277022 BLAKE2B 
eabb07003741bc041fcfc7be92beade5bdf0c19d0be00b1a98037d38b164043e5280254b9c8446254928253f6059c33ae9395df780a2f30c5d9cbebffe020895
 SHA512 
e20b1466f0f2bf81f0d65bd23f97eae6b0943029c89d9d45f84368abc5f12c3054c09a45c4daea47831a192417e2e5be7bcd6622ea518e57b68f975a028d3f79
 DIST mycli-1.25.0.tar.gz 277022 BLAKE2B 
eabb07003741bc041fcfc7be92beade5bdf0c19d0be00b1a98037d38b164043e5280254b9c8446254928253f6059c33ae9395df780a2f30c5d9cbebffe020895
 SHA512 
e20b1466f0f2bf81f0d65bd23f97eae6b0943029c89d9d45f84368abc5f12c3054c09a45c4daea47831a192417e2e5be7bcd6622ea518e57b68f975a028d3f79
+DIST mycli-1.26.1.gh.tar.gz 279221 BLAKE2B 
2bb178110b5aba3e381541a7892cc1d8bed8e41c499d1dc36fa39435805a118536de44bf21b2ca2652afefcd15f8bc86ed77de876f703740e796444ff8cea6b0
 SHA512 
bce9def37718444f2445ed3a7ad91c54df4cc3dc5d207a4a2e0fc72eb27b75fca687958241fc40f5494efcdf9e4bae251f3cf94c13b967dd922d5ff653348c77

diff --git a/dev-db/mycli/mycli-.ebuild b/dev-db/mycli/mycli-1.26.1.ebuild
similarity index 87%
copy from dev-db/mycli/mycli-.ebuild
copy to dev-db/mycli/mycli-1.26.1.ebuild
index ede861eeb297..437959885397 100644
--- a/dev-db/mycli/mycli-.ebuild
+++ b/dev-db/mycli/mycli-1.26.1.ebuild
@@ -5,9 +5,9 @@ EAPI=8
 
 DISTUTILS_SINGLE_IMPL=yes
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 
-inherit distutils-r1 git-r3
+inherit distutils-r1
 
 DESCRIPTION="CLI for MySQL Database with auto-completion and syntax 
highlighting"
 HOMEPAGE="
@@ -15,15 +15,19 @@ HOMEPAGE="
https://github.com/dbcli/mycli/
https://pypi.org/project/mycli/
 "
-EGIT_REPO_URI="https://github.com/dbcli/mycli.git;
+SRC_URI="
+   https://github.com/dbcli/mycli/archive/v${PV}.tar.gz
+   -> ${P}.gh.tar.gz
+"
 
 LICENSE="BSD MIT"
 SLOT="0"
+KEYWORDS="~amd64 ~x86"
 IUSE="ssh"
 
 RDEPEND="
$(python_gen_cond_dep '
-   >=dev-python/cli_helpers-2.0.1[${PYTHON_USEDEP}]
+   >=dev-python/cli_helpers-2.2.1[${PYTHON_USEDEP}]
>=dev-python/click-7.0[${PYTHON_USEDEP}]
>=dev-python/configobj-5.0.6[${PYTHON_USEDEP}]
>=dev-python/cryptography-1.0.0[${PYTHON_USEDEP}]

diff --git a/dev-db/mycli/mycli-.ebuild b/dev-db/mycli/mycli-.ebuild
index ede861eeb297..a7e9fc8f8841 100644
--- a/dev-db/mycli/mycli-.ebuild
+++ b/dev-db/mycli/mycli-.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 DISTUTILS_SINGLE_IMPL=yes
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 
 inherit distutils-r1 git-r3
 



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

2023-02-20 Thread Brian Evans
commit: bdbaee4b01c055bf4ec879f26f180de62954e93f
Author: Brian Evans  gentoo  org>
AuthorDate: Mon Feb 20 20:38:54 2023 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Mon Feb 20 20:40:22 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bdbaee4b

dev-php/scrypt: Version bump for 2.0.0 and update live

Non-maintainer commit

Signed-off-by: Brian Evans  gentoo.org>

 dev-php/scrypt/Manifest|  1 +
 dev-php/scrypt/scrypt-2.0.0.ebuild | 18 ++
 dev-php/scrypt/scrypt-.ebuild  |  6 +++---
 3 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/dev-php/scrypt/Manifest b/dev-php/scrypt/Manifest
index 2b70ca8e86eb..02e75d2c03b0 100644
--- a/dev-php/scrypt/Manifest
+++ b/dev-php/scrypt/Manifest
@@ -1 +1,2 @@
 DIST scrypt-1.4.2.tgz 21585 BLAKE2B 
6297b15aac8470eedc619c498badc4e453476a390cab0cfe7fabef00012131ff9e363834b9423a566dba603ea2a4351eee416419cc1e6c1245a9aba54d63a5ab
 SHA512 
34a87e63250dcfb21b3d36f90a4e5f4bac9f0623917ceb0d613d49112ce0e13df9a93fb0730fb797be6337d023dc490fb881902b5492309fe8bf3e6fd5e685a0
+DIST scrypt-2.0.0.tgz 23229 BLAKE2B 
71a40869004cbcb3fb6b303e1d59c0687b9817b89b38ebedc0001a732f4d4fba134ba124b09a6b4970da9892654631b41d0ce8e79d60eaccf788344972cb0760
 SHA512 
88b559f112f768eb1b61652ee5a6a75edbfd6133aca39c0d740dd083e3d2f718232a607a05a306cd40faeb4cab48f98de04f0799011d86543385583a99fb508f

diff --git a/dev-php/scrypt/scrypt-2.0.0.ebuild 
b/dev-php/scrypt/scrypt-2.0.0.ebuild
new file mode 100644
index ..3fc681c01f83
--- /dev/null
+++ b/dev-php/scrypt/scrypt-2.0.0.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PHP_EXT_ECONF_ARGS="--enable-scrypt"
+USE_PHP="php7-4 php8-0 php8-1 php8-2"
+
+inherit php-ext-pecl-r3
+
+DESCRIPTION="A PHP wrapper for the scrypt hashing algorithm"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-util/re2c"

diff --git a/dev-php/scrypt/scrypt-.ebuild 
b/dev-php/scrypt/scrypt-.ebuild
index 900385d5cf23..16afe4e90e07 100644
--- a/dev-php/scrypt/scrypt-.ebuild
+++ b/dev-php/scrypt/scrypt-.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PHP_EXT_ECONF_ARGS="--enable-scrypt"
-USE_PHP="php7-3 php7-4 php8-0"
+USE_PHP="php8-0 php8-1 php8-2"
 EGIT_REPO_URI="https://github.com/DomBlack/php-scrypt.git;
 
 inherit git-r3 php-ext-pecl-r3



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

2023-02-20 Thread Brian Evans
commit: c53a711a505f1387ff0aae51af2d42f599ba2ac9
Author: Brian Evans  gentoo  org>
AuthorDate: Mon Feb 20 20:39:45 2023 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Mon Feb 20 20:40:23 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c53a711a

dev-php/scrypt: Drop old

Non-maintainer commit

Signed-off-by: Brian Evans  gentoo.org>

 dev-php/scrypt/Manifest|  1 -
 dev-php/scrypt/files/scrypt-1.4.2-php8-0.patch | 49 --
 dev-php/scrypt/scrypt-1.4.2.ebuild | 20 ---
 3 files changed, 70 deletions(-)

diff --git a/dev-php/scrypt/Manifest b/dev-php/scrypt/Manifest
index 02e75d2c03b0..00e5ed387f21 100644
--- a/dev-php/scrypt/Manifest
+++ b/dev-php/scrypt/Manifest
@@ -1,2 +1 @@
-DIST scrypt-1.4.2.tgz 21585 BLAKE2B 
6297b15aac8470eedc619c498badc4e453476a390cab0cfe7fabef00012131ff9e363834b9423a566dba603ea2a4351eee416419cc1e6c1245a9aba54d63a5ab
 SHA512 
34a87e63250dcfb21b3d36f90a4e5f4bac9f0623917ceb0d613d49112ce0e13df9a93fb0730fb797be6337d023dc490fb881902b5492309fe8bf3e6fd5e685a0
 DIST scrypt-2.0.0.tgz 23229 BLAKE2B 
71a40869004cbcb3fb6b303e1d59c0687b9817b89b38ebedc0001a732f4d4fba134ba124b09a6b4970da9892654631b41d0ce8e79d60eaccf788344972cb0760
 SHA512 
88b559f112f768eb1b61652ee5a6a75edbfd6133aca39c0d740dd083e3d2f718232a607a05a306cd40faeb4cab48f98de04f0799011d86543385583a99fb508f

diff --git a/dev-php/scrypt/files/scrypt-1.4.2-php8-0.patch 
b/dev-php/scrypt/files/scrypt-1.4.2-php8-0.patch
deleted file mode 100644
index a5e1ea665897..
--- a/dev-php/scrypt/files/scrypt-1.4.2-php8-0.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 5010f9fa0743518d149d994728ca930503adde1e Mon Sep 17 00:00:00 2001
-From: Remi Collet 
-Date: Tue, 22 Sep 2020 14:55:32 +0200
-Subject: [PATCH] trivial fix for PHP 8
-

- crypto/crypto_scrypt-sse.c | 1 +
- php_scrypt.h   | 5 +
- php_scrypt_utils.c | 1 +
- 3 files changed, 7 insertions(+)
-
-diff --git a/crypto/crypto_scrypt-sse.c b/crypto/crypto_scrypt-sse.c
-index a52ce81..709a04f 100644
 a/crypto/crypto_scrypt-sse.c
-+++ b/crypto/crypto_scrypt-sse.c
-@@ -44,6 +44,7 @@
- #include "sysendian.h"
- 
- #include "crypto_scrypt.h"
-+#include "php_scrypt.h"
- 
- static void blkcpy(void *, void *, size_t);
- static void blkxor(void *, void *, size_t);
-diff --git a/php_scrypt.h b/php_scrypt.h
-index a1117c8..6cc1c4c 100644
 a/php_scrypt.h
-+++ b/php_scrypt.h
-@@ -35,4 +35,9 @@ PHP_FUNCTION(scrypt_pickparams);
- extern zend_module_entry scrypt_module_entry;
- #define phpext_scrypt_ptr _module_entry
- 
-+#ifndef TSRMLS_CC
-+#define TSRMLS_CC
-+#define TSRMLS_FETCH()
-+#endif
-+
- #endif
-diff --git a/php_scrypt_utils.c b/php_scrypt_utils.c
-index 797e2c7..34fe347 100644
 a/php_scrypt_utils.c
-+++ b/php_scrypt_utils.c
-@@ -25,6 +25,7 @@
-  */
- 
- #include "php_scrypt_utils.h"
-+#include "php_scrypt.h"
- 
- /*
-  * Casts a long into a uint64_t.

diff --git a/dev-php/scrypt/scrypt-1.4.2.ebuild 
b/dev-php/scrypt/scrypt-1.4.2.ebuild
deleted file mode 100644
index 026a54355943..
--- a/dev-php/scrypt/scrypt-1.4.2.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PHP_EXT_ECONF_ARGS="--enable-scrypt"
-USE_PHP="php7-3 php7-4 php8-0"
-
-inherit php-ext-pecl-r3
-
-DESCRIPTION="A PHP wrapper fo the scrypt hashing algorithm"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-util/re2c"
-
-PATCHES=( "${FILESDIR}"/"${P}"-php8-0.patch )



[gentoo-commits] repo/gentoo:master commit in: virtual/httpd-php/

2023-02-20 Thread Brian Evans
commit: 7fa7d7e13477f29625c69a42db798755383db729
Author: Brian Evans  gentoo  org>
AuthorDate: Mon Feb 20 19:50:35 2023 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Mon Feb 20 19:51:14 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7fa7d7e1

Revert "virtual/httpd-php: fix VirtualKeywordsUpdate (arm64, sparc)"

This reverts commit 7e73f1adbba88b9080a354bc5f811e3c4b3b30b4.

Signed-off-by: Brian Evans  gentoo.org>

 virtual/httpd-php/httpd-php-8.2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/virtual/httpd-php/httpd-php-8.2.ebuild 
b/virtual/httpd-php/httpd-php-8.2.ebuild
index d1b86d23f234..679236a80223 100644
--- a/virtual/httpd-php/httpd-php-8.2.ebuild
+++ b/virtual/httpd-php/httpd-php-8.2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="8"
 
 DESCRIPTION="Virtual to provide PHP-enabled webservers"
 SLOT="${PV}"
-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"
 
 RDEPEND="|| ( dev-lang/php:${SLOT}[fpm]
  dev-lang/php:${SLOT}[apache2]



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

2023-02-20 Thread Brian Evans
commit: 698c6e0833dada07c78b62aa1582fdf672442fb8
Author: Brian Evans  gentoo  org>
AuthorDate: Mon Feb 20 19:42:38 2023 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Mon Feb 20 19:43:14 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=698c6e08

dev-lang/php: Drop old

Signed-off-by: Brian Evans  gentoo.org>

 dev-lang/php/Manifest  |   4 -
 dev-lang/php/php-8.0.26.ebuild | 759 -
 dev-lang/php/php-8.1.13.ebuild | 757 
 dev-lang/php/php-8.2.0.ebuild  | 759 -
 dev-lang/php/php-8.2.1.ebuild  | 759 -
 5 files changed, 3038 deletions(-)

diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index f7e65e2ed2c7..cad8b5f8643a 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -1,12 +1,8 @@
 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.26.tar.xz 10868588 BLAKE2B 
423af3b7de23f59717aaf59c8c661ec8ab0fd7acdf1e48282b1c730b2efc48f88b953452e77dbb9dbd4e1633ba68dd8adbc58c05642e787974f9783a075d042c
 SHA512 
2c285bd0d4516e188b8f9fe45db12bb0631c8298c97b3fcf99b7d56bed8c90920649d613c19821cbb38592211f5a3e7980679f2a59ad2d920da5b669251a99d5
 DIST php-8.0.27.tar.xz 10802096 BLAKE2B 
343a05759a074b746a38578f5fa88382ad91f44f23aee65a7a9b54fa80e991c944b61c6d5979710516a795506dcc8a2c628997e222981ae99bcdfad47afb606d
 SHA512 
443d4fe5d3165e2806e6ce03356f38b1d70fb4c86054f10b22e62191d5961bb51b10a31c49f3d74e6360836254db3107a8910589966481ebc7f5e06886b5e026
 DIST php-8.0.28.tar.xz 10801568 BLAKE2B 
de03f5ad262e830c70d24b9e2dd997897e5613d8bbc998ab7e59df703db89d587c6c8955e6f82f0cf6630eed82f33e21567ccf7a873ca07f4d0659f7bf4bd974
 SHA512 
d66e41cdccc332fccaf03bb24356652b17be5267cba5a47d80f1b74732b674f6a23c91e4a151ca442e629de8e8bcf6daecf0b34cbcbc9e33f53b8da9f06dc6b9
 DIST php-8.1.12.tar.xz 11747176 BLAKE2B 
0505794826fb0fc92b04be5f7162af8aa92d782bb228243348d85b46866cd47089fcb7febd6886a8179babf64cb227bcdbf5d5f60d44dfefe1c947a3a708e3c1
 SHA512 
437b6a8146b58479f4d1acb7b35d68954f1f7bc13a8f3dddc66e1677d7e9b6a11154861f9e894cbd59b9c28d4df3fd5422f9b5553004e9fc8d0320ab59b9f907
-DIST php-8.1.13.tar.xz 11802424 BLAKE2B 
2d2d00fd1574deef1ef86f6813e1d2a1e20a8202ce80e5ce2e1359307135b47d6f1495ff7dfe23f52c2127226494856f215588fe21af3d519a8259e1e67ab819
 SHA512 
a8966798ed8e723a362952f9d381a59cbfd63d921466d68a5bc4527960f4fe1b48a1f188284c74b0723e93524787e4cf1c1322ecd6ec1c9be199fd67df0a0542
 DIST php-8.1.14.tar.xz 11752004 BLAKE2B 
5ba60621c641b25c2d8ab0c82e97d59131587718c75cc013dc4ba1ad68e668e7f86b67f01f02c434e65c8a9075581a7f2decb2b8c3706e325e25e9f717cdfd82
 SHA512 
75a5dc3b0490cd8105d4f6c5446522b38953d78fe7b568798db749740f365c818b251d86aba72f5e555c5fe4e4a28e352a9510803bf3cdfe37d125824ae84d61
 DIST php-8.1.16.tar.xz 11760948 BLAKE2B 
ac0d352dae05115197852092b9b3c0b5091528326806c70eb34e0aba6007f718e927e67045d65976cb2104e4737a475b2224d4f05ff89ddf8c3066e0240c38e1
 SHA512 
4515da38803272abfafb069d1684c66dbb5086987b148c48dd7d8acf8f5316d255cf321ec57d6fbffe914a35551a533446ac13c34bb7c984e0d109247e8e64da
-DIST php-8.2.0.tar.xz 11920436 BLAKE2B 
18f9395ecd86bd3f5e5b581cb60c410a4eba2260b70cf5c3b6f320004d8e8126431fd77371f3b694de2422a450655a37e1c9783e8cebc204b3b754b812709aa0
 SHA512 
0b201ca1de5210c2b44a6223556720c3409e21db3d8f976894f29ad43eebb8b60334b971aa90bc115ef113e3f06624c80175d04530466b5a02743f2fcd4c9806
-DIST php-8.2.1.tar.xz 12031632 BLAKE2B 
87dfc1018fa4313d02da584b6f7c8a2ee48dcca99ff1753d210ea0e2faaeaee8df79d608892da558c69bbc9f0c3738d14a2834737575e9b5ebcd7927e99fb04e
 SHA512 
9927ccb9e5581c24d0ef3e408a7a1b32bc99f43ce88e83e4430dbd4faa3a2498b299ad6b3a70696facded139100c85bb7ae66223a72b2c043ccab0d80a2c2826
 DIST php-8.2.3.tar.xz 12038240 BLAKE2B 
97df5470813bcfb3f07b62ba9a5ab5f5931cf4c6df5abb7354c41080f8bdd8fe4e311841b217448993bc57f98f238fa107f29614bc19cab2902de519d826e67c
 SHA512 
4e3ae840ac486868d5bedc2ae771e3ff5d4939ba4c2f7c769b7052322a5eccc8fba253df311a77f3ea852bf42f9dec34653baf828f68c9c191d3a425a8968d4c

diff --git a/dev-lang/php/php-8.0.26.ebuild b/dev-lang/php/php-8.0.26.ebuild
deleted file mode 100644
index 54100cfe9d3f..
--- a/dev-lang/php/php-8.0.26.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&

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

2023-02-20 Thread Brian Evans
commit: c8a5c3e91728ad636d1e36b7b793d3b7688ca45b
Author: Brian Evans  gentoo  org>
AuthorDate: Mon Feb 20 19:41:08 2023 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Mon Feb 20 19:43:14 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8a5c3e9

dev-lang/php: Version bump for 8.2.3

Bug: https://bugs.gentoo.org/895416
Signed-off-by: Brian Evans  gentoo.org>

 dev-lang/php/Manifest |   1 +
 dev-lang/php/php-8.2.3.ebuild | 759 ++
 2 files changed, 760 insertions(+)

diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index f8ad8d0efb0a..f7e65e2ed2c7 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -9,3 +9,4 @@ DIST php-8.1.14.tar.xz 11752004 BLAKE2B 
5ba60621c641b25c2d8ab0c82e97d59131587718
 DIST php-8.1.16.tar.xz 11760948 BLAKE2B 
ac0d352dae05115197852092b9b3c0b5091528326806c70eb34e0aba6007f718e927e67045d65976cb2104e4737a475b2224d4f05ff89ddf8c3066e0240c38e1
 SHA512 
4515da38803272abfafb069d1684c66dbb5086987b148c48dd7d8acf8f5316d255cf321ec57d6fbffe914a35551a533446ac13c34bb7c984e0d109247e8e64da
 DIST php-8.2.0.tar.xz 11920436 BLAKE2B 
18f9395ecd86bd3f5e5b581cb60c410a4eba2260b70cf5c3b6f320004d8e8126431fd77371f3b694de2422a450655a37e1c9783e8cebc204b3b754b812709aa0
 SHA512 
0b201ca1de5210c2b44a6223556720c3409e21db3d8f976894f29ad43eebb8b60334b971aa90bc115ef113e3f06624c80175d04530466b5a02743f2fcd4c9806
 DIST php-8.2.1.tar.xz 12031632 BLAKE2B 
87dfc1018fa4313d02da584b6f7c8a2ee48dcca99ff1753d210ea0e2faaeaee8df79d608892da558c69bbc9f0c3738d14a2834737575e9b5ebcd7927e99fb04e
 SHA512 
9927ccb9e5581c24d0ef3e408a7a1b32bc99f43ce88e83e4430dbd4faa3a2498b299ad6b3a70696facded139100c85bb7ae66223a72b2c043ccab0d80a2c2826
+DIST php-8.2.3.tar.xz 12038240 BLAKE2B 
97df5470813bcfb3f07b62ba9a5ab5f5931cf4c6df5abb7354c41080f8bdd8fe4e311841b217448993bc57f98f238fa107f29614bc19cab2902de519d826e67c
 SHA512 
4e3ae840ac486868d5bedc2ae771e3ff5d4939ba4c2f7c769b7052322a5eccc8fba253df311a77f3ea852bf42f9dec34653baf828f68c9c191d3a425a8968d4c

diff --git a/dev-lang/php/php-8.2.3.ebuild b/dev-lang/php/php-8.2.3.ebuild
new file mode 100644
index ..b67b15fa8e18
--- /dev/null
+++ b/dev-lang/php/php-8.2.3.ebuild
@@ -0,0 +1,759 @@
+# 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
+
+MY_PV=${PV/_rc/RC}
+DESCRIPTION="The PHP language runtime engine"
+HOMEPAGE="https://www.php.net/;
+SRC_URI="https://www.php.net/distributions/${P}.tar.xz;
+#SRC_URI="https://downloads.php.net/~pierrick/php-${MY_PV}.tar.xz;
+
+LICENSE="PHP-3.01
+   BSD
+   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"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+# 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 +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 ) )
+   !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

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

2023-02-20 Thread Brian Evans
commit: 6cb938cd4f61ab78f72abb7c421e03d6d57499e9
Author: Brian Evans  gentoo  org>
AuthorDate: Mon Feb 20 18:48:48 2023 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Mon Feb 20 19:43:14 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6cb938cd

dev-lang/php: Version bump for 8.1.16

Bug: https://bugs.gentoo.org/895416
Signed-off-by: Brian Evans  gentoo.org>

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

diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index e56b4faf5155..f8ad8d0efb0a 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -6,5 +6,6 @@ DIST php-8.0.28.tar.xz 10801568 BLAKE2B 
de03f5ad262e830c70d24b9e2dd997897e5613d8
 DIST php-8.1.12.tar.xz 11747176 BLAKE2B 
0505794826fb0fc92b04be5f7162af8aa92d782bb228243348d85b46866cd47089fcb7febd6886a8179babf64cb227bcdbf5d5f60d44dfefe1c947a3a708e3c1
 SHA512 
437b6a8146b58479f4d1acb7b35d68954f1f7bc13a8f3dddc66e1677d7e9b6a11154861f9e894cbd59b9c28d4df3fd5422f9b5553004e9fc8d0320ab59b9f907
 DIST php-8.1.13.tar.xz 11802424 BLAKE2B 
2d2d00fd1574deef1ef86f6813e1d2a1e20a8202ce80e5ce2e1359307135b47d6f1495ff7dfe23f52c2127226494856f215588fe21af3d519a8259e1e67ab819
 SHA512 
a8966798ed8e723a362952f9d381a59cbfd63d921466d68a5bc4527960f4fe1b48a1f188284c74b0723e93524787e4cf1c1322ecd6ec1c9be199fd67df0a0542
 DIST php-8.1.14.tar.xz 11752004 BLAKE2B 
5ba60621c641b25c2d8ab0c82e97d59131587718c75cc013dc4ba1ad68e668e7f86b67f01f02c434e65c8a9075581a7f2decb2b8c3706e325e25e9f717cdfd82
 SHA512 
75a5dc3b0490cd8105d4f6c5446522b38953d78fe7b568798db749740f365c818b251d86aba72f5e555c5fe4e4a28e352a9510803bf3cdfe37d125824ae84d61
+DIST php-8.1.16.tar.xz 11760948 BLAKE2B 
ac0d352dae05115197852092b9b3c0b5091528326806c70eb34e0aba6007f718e927e67045d65976cb2104e4737a475b2224d4f05ff89ddf8c3066e0240c38e1
 SHA512 
4515da38803272abfafb069d1684c66dbb5086987b148c48dd7d8acf8f5316d255cf321ec57d6fbffe914a35551a533446ac13c34bb7c984e0d109247e8e64da
 DIST php-8.2.0.tar.xz 11920436 BLAKE2B 
18f9395ecd86bd3f5e5b581cb60c410a4eba2260b70cf5c3b6f320004d8e8126431fd77371f3b694de2422a450655a37e1c9783e8cebc204b3b754b812709aa0
 SHA512 
0b201ca1de5210c2b44a6223556720c3409e21db3d8f976894f29ad43eebb8b60334b971aa90bc115ef113e3f06624c80175d04530466b5a02743f2fcd4c9806
 DIST php-8.2.1.tar.xz 12031632 BLAKE2B 
87dfc1018fa4313d02da584b6f7c8a2ee48dcca99ff1753d210ea0e2faaeaee8df79d608892da558c69bbc9f0c3738d14a2834737575e9b5ebcd7927e99fb04e
 SHA512 
9927ccb9e5581c24d0ef3e408a7a1b32bc99f43ce88e83e4430dbd4faa3a2498b299ad6b3a70696facded139100c85bb7ae66223a72b2c043ccab0d80a2c2826

diff --git a/dev-lang/php/php-8.1.16.ebuild b/dev-lang/php/php-8.1.16.ebuild
new file mode 100644
index ..20d68c6387fd
--- /dev/null
+++ b/dev-lang/php/php-8.1.16.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
+
+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 ~loong ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+# We can build the following SAPIs in the given order
+SAPIS="embed cli cgi fpm apache2 phpdbg"
+
+# 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 ) )
+   !cli? ( ?? ( readline libedit ) )
+   truetype? ( gd zlib )
+   webp? ( gd zlib )
+   cjk? ( gd zlib )
+   exif? ( gd zlib )
+   xpm?

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

2023-02-20 Thread Brian Evans
commit: 5fe23c565f19e1b0af60f3081854aab95f94c903
Author: Brian Evans  gentoo  org>
AuthorDate: Mon Feb 20 18:27:49 2023 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Mon Feb 20 19:43:13 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5fe23c56

dev-lang/php: Version bump for 8.0.28

Bug: https://bugs.gentoo.org/895416
Signed-off-by: Brian Evans  gentoo.org>

 dev-lang/php/Manifest  |   1 +
 dev-lang/php/php-8.0.28.ebuild | 759 +
 2 files changed, 760 insertions(+)

diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index b550d36543fd..e56b4faf5155 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.26.tar.xz 10868588 BLAKE2B 
423af3b7de23f59717aaf59c8c661ec8ab0fd7acdf1e48282b1c730b2efc48f88b953452e77dbb9dbd4e1633ba68dd8adbc58c05642e787974f9783a075d042c
 SHA512 
2c285bd0d4516e188b8f9fe45db12bb0631c8298c97b3fcf99b7d56bed8c90920649d613c19821cbb38592211f5a3e7980679f2a59ad2d920da5b669251a99d5
 DIST php-8.0.27.tar.xz 10802096 BLAKE2B 
343a05759a074b746a38578f5fa88382ad91f44f23aee65a7a9b54fa80e991c944b61c6d5979710516a795506dcc8a2c628997e222981ae99bcdfad47afb606d
 SHA512 
443d4fe5d3165e2806e6ce03356f38b1d70fb4c86054f10b22e62191d5961bb51b10a31c49f3d74e6360836254db3107a8910589966481ebc7f5e06886b5e026
+DIST php-8.0.28.tar.xz 10801568 BLAKE2B 
de03f5ad262e830c70d24b9e2dd997897e5613d8bbc998ab7e59df703db89d587c6c8955e6f82f0cf6630eed82f33e21567ccf7a873ca07f4d0659f7bf4bd974
 SHA512 
d66e41cdccc332fccaf03bb24356652b17be5267cba5a47d80f1b74732b674f6a23c91e4a151ca442e629de8e8bcf6daecf0b34cbcbc9e33f53b8da9f06dc6b9
 DIST php-8.1.12.tar.xz 11747176 BLAKE2B 
0505794826fb0fc92b04be5f7162af8aa92d782bb228243348d85b46866cd47089fcb7febd6886a8179babf64cb227bcdbf5d5f60d44dfefe1c947a3a708e3c1
 SHA512 
437b6a8146b58479f4d1acb7b35d68954f1f7bc13a8f3dddc66e1677d7e9b6a11154861f9e894cbd59b9c28d4df3fd5422f9b5553004e9fc8d0320ab59b9f907
 DIST php-8.1.13.tar.xz 11802424 BLAKE2B 
2d2d00fd1574deef1ef86f6813e1d2a1e20a8202ce80e5ce2e1359307135b47d6f1495ff7dfe23f52c2127226494856f215588fe21af3d519a8259e1e67ab819
 SHA512 
a8966798ed8e723a362952f9d381a59cbfd63d921466d68a5bc4527960f4fe1b48a1f188284c74b0723e93524787e4cf1c1322ecd6ec1c9be199fd67df0a0542
 DIST php-8.1.14.tar.xz 11752004 BLAKE2B 
5ba60621c641b25c2d8ab0c82e97d59131587718c75cc013dc4ba1ad68e668e7f86b67f01f02c434e65c8a9075581a7f2decb2b8c3706e325e25e9f717cdfd82
 SHA512 
75a5dc3b0490cd8105d4f6c5446522b38953d78fe7b568798db749740f365c818b251d86aba72f5e555c5fe4e4a28e352a9510803bf3cdfe37d125824ae84d61

diff --git a/dev-lang/php/php-8.0.28.ebuild b/dev-lang/php/php-8.0.28.ebuild
new file mode 100644
index ..d4cadfe62448
--- /dev/null
+++ b/dev-lang/php/php-8.0.28.ebuild
@@ -0,0 +1,759 @@
+# Copyright 1999-2023 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}"
+
+# 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 ow

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

2023-02-20 Thread Brian Evans
commit: b711589df12322ac7ca3cbe4e5889a623dc81a96
Author: Brian Evans  gentoo  org>
AuthorDate: Mon Feb 20 18:07:03 2023 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Mon Feb 20 19:43:13 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b711589d

dev-lang/php: Revbump for backporting CVE patches to 7.4

Bug: https://bugs.gentoo.org/895416
Signed-off-by: Brian Evans  gentoo.org>

 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/php-7.4.33-r2.ebuild | 753 ++
 4 files changed, 952 insertions(+)

diff --git a/dev-lang/php/files/php-7.4.33-CVE-2023-0567.patch 
b/dev-lang/php/files/php-7.4.33-CVE-2023-0567.patch
new file mode 100644
index ..a0e72f380089
--- /dev/null
+++ b/dev-lang/php/files/php-7.4.33-CVE-2023-0567.patch
@@ -0,0 +1,114 @@
+diff --git a/ext/standard/crypt_blowfish.c b/ext/standard/crypt_blowfish.c
+index 3806a290aee4..351d40308089 100644
+--- a/ext/standard/crypt_blowfish.c
 b/ext/standard/crypt_blowfish.c
+@@ -371,7 +371,6 @@ static const unsigned char BF_atoi64[0x60] = {
+ #define BF_safe_atoi64(dst, src) \
+ { \
+   tmp = (unsigned char)(src); \
+-  if (tmp == '$') break; /* PHP hack */ \
+   if ((unsigned int)(tmp -= 0x20) >= 0x60) return -1; \
+   tmp = BF_atoi64[tmp]; \
+   if (tmp > 63) return -1; \
+@@ -399,13 +398,6 @@ static int BF_decode(BF_word *dst, const char *src, int 
size)
+   *dptr++ = ((c3 & 0x03) << 6) | c4;
+   } while (dptr < end);
+ 
+-  if (end - dptr == size) {
+-  return -1;
+-  }
+-
+-  while (dptr < end) /* PHP hack */
+-  *dptr++ = 0;
+-
+   return 0;
+ }
+ 
+diff --git a/ext/standard/tests/crypt/bcrypt_salt_dollar.phpt 
b/ext/standard/tests/crypt/bcrypt_salt_dollar.phpt
+new file mode 100644
+index ..32e335f4b087
+--- /dev/null
 b/ext/standard/tests/crypt/bcrypt_salt_dollar.phpt
+@@ -0,0 +1,82 @@
++--TEST--
++bcrypt correctly rejects salts containing $
++--FILE--
++
++--EXPECT--
++string(8) "$2y$04$$"
++string(2) "*0"
++bool(false)
++string(9) "$2y$04$0$"
++string(2) "*0"
++bool(false)
++string(10) "$2y$04$00$"
++string(2) "*0"
++bool(false)
++string(11) "$2y$04$000$"
++string(2) "*0"
++bool(false)
++string(12) "$2y$04$$"
++string(2) "*0"
++bool(false)
++string(13) "$2y$04$0$"
++string(2) "*0"
++bool(false)
++string(14) "$2y$04$00$"
++string(2) "*0"
++bool(false)
++string(15) "$2y$04$000$"
++string(2) "*0"
++bool(false)
++string(16) "$2y$04$$"
++string(2) "*0"
++bool(false)
++string(17) "$2y$04$0$"
++string(2) "*0"
++bool(false)
++string(18) "$2y$04$00$"
++string(2) "*0"
++bool(false)
++string(19) "$2y$04$000$"
++string(2) "*0"
++bool(false)
++string(20) "$2y$04$$"
++string(2) "*0"
++bool(false)
++string(21) "$2y$04$0$"
++string(2) "*0"
++bool(false)
++string(22) "$2y$04$00$"
++string(2) "*0"
++bool(false)
++string(23) "$2y$04$000$"
++string(2) "*0"
++bool(false)
++string(24) "$2y$04$$"
++string(2) "*0"
++bool(false)
++string(25) "$2y$04$0$"
++string(2) "*0"
++bool(false)
++string(26) "$2y$04$00$"
++string(2) "*0"
++bool(false)
++string(27) "$2y$04$000$"
++string(2) "*0"
++bool(false)
++string(28) "$2y$04$$"
++string(2) "*0"
++bool(false)
++string(29) "$2y$04$0$"
++string(2) "*0"
++bool(false)
++string(30) "$2y$04$00$"
++string(60) "$2y$04$0u2a2UpVexIt9k3FMJeAVr3c04F5tcI8K"
++bool(false)

diff --git a/dev-lang/php/files/php-7.4.33-CVE-2023-0568.patch 
b/dev-lang/php/files/php-7.4.33-CVE-2023-0568.patch
new file mode 100644
index ..67c172ae214f
--- /dev/null
+++ b/dev-lang/php/files/php-7.4.33-CVE-2023-0568.patch
@@ -0,0 +1,37 @@
+From a92acbad873a05470af1a47cb785a18eadd827b5 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Tim=20D=C3=BCsterhus?= 
+Date: Mon, 23 Jan 2023 22:13:57 +0100
+Subject: [PATCH] crypt: Fix possible buffer overread in php_crypt()
+
+---
+ ext/standard/crypt.c   | 1 +
+ ext/standard/tests/password/password_bcrypt_short.phpt | 8 
+ 2 files changed, 9 insertions(+)
+ create mode 100644 ext/standard/tests/password/password_b

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

2023-01-05 Thread Brian Evans
commit: 335f8c2846f9c33f907d5deb92ead13a690f12c7
Author: Brian Evans  gentoo  org>
AuthorDate: Fri Jan  6 00:08:12 2023 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Fri Jan  6 00:08:12 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=335f8c28

dev-lang/php: Version bump for 8.2.1

Bug: https://bugs.gentoo.org/889882
Signed-off-by: Brian Evans  gentoo.org>

 dev-lang/php/Manifest |   1 +
 dev-lang/php/php-8.2.1.ebuild | 759 ++
 2 files changed, 760 insertions(+)

diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index 20b0911dbad1..b550d36543fd 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -6,3 +6,4 @@ DIST php-8.1.12.tar.xz 11747176 BLAKE2B 
0505794826fb0fc92b04be5f7162af8aa92d782b
 DIST php-8.1.13.tar.xz 11802424 BLAKE2B 
2d2d00fd1574deef1ef86f6813e1d2a1e20a8202ce80e5ce2e1359307135b47d6f1495ff7dfe23f52c2127226494856f215588fe21af3d519a8259e1e67ab819
 SHA512 
a8966798ed8e723a362952f9d381a59cbfd63d921466d68a5bc4527960f4fe1b48a1f188284c74b0723e93524787e4cf1c1322ecd6ec1c9be199fd67df0a0542
 DIST php-8.1.14.tar.xz 11752004 BLAKE2B 
5ba60621c641b25c2d8ab0c82e97d59131587718c75cc013dc4ba1ad68e668e7f86b67f01f02c434e65c8a9075581a7f2decb2b8c3706e325e25e9f717cdfd82
 SHA512 
75a5dc3b0490cd8105d4f6c5446522b38953d78fe7b568798db749740f365c818b251d86aba72f5e555c5fe4e4a28e352a9510803bf3cdfe37d125824ae84d61
 DIST php-8.2.0.tar.xz 11920436 BLAKE2B 
18f9395ecd86bd3f5e5b581cb60c410a4eba2260b70cf5c3b6f320004d8e8126431fd77371f3b694de2422a450655a37e1c9783e8cebc204b3b754b812709aa0
 SHA512 
0b201ca1de5210c2b44a6223556720c3409e21db3d8f976894f29ad43eebb8b60334b971aa90bc115ef113e3f06624c80175d04530466b5a02743f2fcd4c9806
+DIST php-8.2.1.tar.xz 12031632 BLAKE2B 
87dfc1018fa4313d02da584b6f7c8a2ee48dcca99ff1753d210ea0e2faaeaee8df79d608892da558c69bbc9f0c3738d14a2834737575e9b5ebcd7927e99fb04e
 SHA512 
9927ccb9e5581c24d0ef3e408a7a1b32bc99f43ce88e83e4430dbd4faa3a2498b299ad6b3a70696facded139100c85bb7ae66223a72b2c043ccab0d80a2c2826

diff --git a/dev-lang/php/php-8.2.1.ebuild b/dev-lang/php/php-8.2.1.ebuild
new file mode 100644
index ..f316a161e5cf
--- /dev/null
+++ b/dev-lang/php/php-8.2.1.ebuild
@@ -0,0 +1,759 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+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;
+#SRC_URI="https://downloads.php.net/~pierrick/php-${MY_PV}.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"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+# 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 +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 ) )
+   !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

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

2023-01-05 Thread Brian Evans
commit: 7cb74e0dfb7422871ba57d0dc76fc8531576f32e
Author: Brian Evans  gentoo  org>
AuthorDate: Thu Jan  5 20:46:07 2023 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Thu Jan  5 21:30:13 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7cb74e0d

dev-lang/php: Apply CVE-2022-31631 patch to 7.4.33

Bug: https://bugs.gentoo.org/889882
Signed-off-by: Brian Evans  gentoo.org>

 dev-lang/php/files/php-7.4.33-CVE-2022-31631.patch |  50 ++
 dev-lang/php/php-7.4.33-r1.ebuild  | 750 +
 2 files changed, 800 insertions(+)

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
new file mode 100644
index ..6aa309549c88
--- /dev/null
+++ b/dev-lang/php/files/php-7.4.33-CVE-2022-31631.patch
@@ -0,0 +1,50 @@
+From 921b6813da3237a83e908998483f46ae3d8bacba Mon Sep 17 00:00:00 2001
+From: "Christoph M. Becker" 
+Date: Mon, 31 Oct 2022 17:20:23 +0100
+Subject: [PATCH] Fix #81740: PDO::quote() may return unquoted string
+
+`sqlite3_snprintf()` expects its first parameter to be `int`; we need
+to avoid overflow.
+---
+ ext/pdo_sqlite/sqlite_driver.c |  3 +++
+ ext/pdo_sqlite/tests/bug81740.phpt | 17 +
+ 2 files changed, 20 insertions(+)
+ create mode 100644 ext/pdo_sqlite/tests/bug81740.phpt
+
+diff --git a/ext/pdo_sqlite/sqlite_driver.c b/ext/pdo_sqlite/sqlite_driver.c
+index 4233ff10ff2e..5a72a1eda23f 100644
+--- a/ext/pdo_sqlite/sqlite_driver.c
 b/ext/pdo_sqlite/sqlite_driver.c
+@@ -232,6 +232,9 @@ static char *pdo_sqlite_last_insert_id(pdo_dbh_t *dbh, 
const char *name, size_t
+ /* NB: doesn't handle binary strings... use prepared stmts for that */
+ static int sqlite_handle_quoter(pdo_dbh_t *dbh, const char *unquoted, size_t 
unquotedlen, char **quoted, size_t *quotedlen, enum pdo_param_type paramtype )
+ {
++  if (unquotedlen > (INT_MAX - 3) / 2) {
++  return 0;
++  }
+   *quoted = safe_emalloc(2, unquotedlen, 3);
+   sqlite3_snprintf(2*unquotedlen + 3, *quoted, "'%q'", unquoted);
+   *quotedlen = strlen(*quoted);
+diff --git a/ext/pdo_sqlite/tests/bug81740.phpt 
b/ext/pdo_sqlite/tests/bug81740.phpt
+new file mode 100644
+index ..99fb07c3048b
+--- /dev/null
 b/ext/pdo_sqlite/tests/bug81740.phpt
+@@ -0,0 +1,17 @@
++--TEST--
++Bug #81740 (PDO::quote() may return unquoted string)
++--SKIPIF--
++
++--INI--
++memory_limit=-1
++--FILE--
++quote($string));
++?>
++--EXPECT--
++bool(false)

diff --git a/dev-lang/php/php-7.4.33-r1.ebuild 
b/dev-lang/php/php-7.4.33-r1.ebuild
new file mode 100644
index ..782d2e8f7e1d
--- /dev/null
+++ b/dev-lang/php/php-7.4.33-r1.ebuild
@@ -0,0 +1,750 @@
+# 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}"
+
+# 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 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 +json kerberos ldap ldap-sasl libedit lmdb
+   mhash mssql mysql mysqli nls
+   oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
+   readline selinux +session session-mm sharedmem
+   +simplexml snmp soap sockets sodium spell sqlite ssl
+   sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode webp
+   +xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib"
+
+# Without USE=readline or libedit, the interactive "php -a" CLI will hang.
+# The Oracle instant client provides its own incompatible ldap library.
+REQUIRED_USE="
+   || ( cli cgi fpm apache2 embed phpdbg )
+   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 )
+   xm

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

2023-01-05 Thread Brian Evans
commit: ea29351e6d832a664c9205ece3e60ef28ca8917a
Author: Brian Evans  gentoo  org>
AuthorDate: Thu Jan  5 21:29:41 2023 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Thu Jan  5 21:30:13 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea29351e

dev-lang/php: Version bump for 8.1.14

Bug: https://bugs.gentoo.org/889882
Signed-off-by: Brian Evans  gentoo.org>

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

diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index 7b27cb84ee81..20b0911dbad1 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -4,4 +4,5 @@ DIST php-8.0.26.tar.xz 10868588 BLAKE2B 
423af3b7de23f59717aaf59c8c661ec8ab0fd7ac
 DIST php-8.0.27.tar.xz 10802096 BLAKE2B 
343a05759a074b746a38578f5fa88382ad91f44f23aee65a7a9b54fa80e991c944b61c6d5979710516a795506dcc8a2c628997e222981ae99bcdfad47afb606d
 SHA512 
443d4fe5d3165e2806e6ce03356f38b1d70fb4c86054f10b22e62191d5961bb51b10a31c49f3d74e6360836254db3107a8910589966481ebc7f5e06886b5e026
 DIST php-8.1.12.tar.xz 11747176 BLAKE2B 
0505794826fb0fc92b04be5f7162af8aa92d782bb228243348d85b46866cd47089fcb7febd6886a8179babf64cb227bcdbf5d5f60d44dfefe1c947a3a708e3c1
 SHA512 
437b6a8146b58479f4d1acb7b35d68954f1f7bc13a8f3dddc66e1677d7e9b6a11154861f9e894cbd59b9c28d4df3fd5422f9b5553004e9fc8d0320ab59b9f907
 DIST php-8.1.13.tar.xz 11802424 BLAKE2B 
2d2d00fd1574deef1ef86f6813e1d2a1e20a8202ce80e5ce2e1359307135b47d6f1495ff7dfe23f52c2127226494856f215588fe21af3d519a8259e1e67ab819
 SHA512 
a8966798ed8e723a362952f9d381a59cbfd63d921466d68a5bc4527960f4fe1b48a1f188284c74b0723e93524787e4cf1c1322ecd6ec1c9be199fd67df0a0542
+DIST php-8.1.14.tar.xz 11752004 BLAKE2B 
5ba60621c641b25c2d8ab0c82e97d59131587718c75cc013dc4ba1ad68e668e7f86b67f01f02c434e65c8a9075581a7f2decb2b8c3706e325e25e9f717cdfd82
 SHA512 
75a5dc3b0490cd8105d4f6c5446522b38953d78fe7b568798db749740f365c818b251d86aba72f5e555c5fe4e4a28e352a9510803bf3cdfe37d125824ae84d61
 DIST php-8.2.0.tar.xz 11920436 BLAKE2B 
18f9395ecd86bd3f5e5b581cb60c410a4eba2260b70cf5c3b6f320004d8e8126431fd77371f3b694de2422a450655a37e1c9783e8cebc204b3b754b812709aa0
 SHA512 
0b201ca1de5210c2b44a6223556720c3409e21db3d8f976894f29ad43eebb8b60334b971aa90bc115ef113e3f06624c80175d04530466b5a02743f2fcd4c9806

diff --git a/dev-lang/php/php-8.1.14.ebuild b/dev-lang/php/php-8.1.14.ebuild
new file mode 100644
index ..bdf85e055446
--- /dev/null
+++ b/dev-lang/php/php-8.1.14.ebuild
@@ -0,0 +1,757 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+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 ~loong ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+# We can build the following SAPIs in the given order
+SAPIS="embed cli cgi fpm apache2 phpdbg"
+
+# 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 ) )
+   !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 )
+  

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

2023-01-05 Thread Brian Evans
commit: 227858dba6257113140653f501de91625567cc5c
Author: Brian Evans  gentoo  org>
AuthorDate: Thu Jan  5 21:11:33 2023 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Thu Jan  5 21:30:13 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=227858db

dev-lang/php: Version bump for 8.0.27

Bug: https://bugs.gentoo.org/889882
Signed-off-by: Brian Evans  gentoo.org>

 dev-lang/php/Manifest  |   1 +
 dev-lang/php/php-8.0.27.ebuild | 759 +
 2 files changed, 760 insertions(+)

diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index 2d36c44b94c9..7b27cb84ee81 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -1,6 +1,7 @@
 DIST php-7.4.33.tar.xz 10420144 BLAKE2B 
e75817e79c698628c873c90afb3b5677480d03ecf07e8f2e26a062bc5b91affc6079e792e864f28cf12d45f86e5d01ede289ecdcefc06477986d193d22c982ef
 SHA512 
499b63b99e5d8e8082ff89d3a91b4cb9a593ea7553b96e48863414c13d2e50275904ed29070e2232e529ee91160f505e6060a4d129cb5bf098aa5b6ea0928d3d
 DIST php-8.0.25.tar.xz 10802888 BLAKE2B 
c1f283613c43551cccd52955deaae364781fffd4f73befa5e103211ed2b972272189973639d840ef1839b038e1872a6a28424939ea133f0bf86d82b56bb591fb
 SHA512 
43bb0637e424e2a637e05f3faf0ca2c5309f2d9cc03def9fc9af9b756003ea6efe730b608c70177c3c1b9cb03cef31c27cd6507cca9d9f0fd854aadb5e51aee3
 DIST php-8.0.26.tar.xz 10868588 BLAKE2B 
423af3b7de23f59717aaf59c8c661ec8ab0fd7acdf1e48282b1c730b2efc48f88b953452e77dbb9dbd4e1633ba68dd8adbc58c05642e787974f9783a075d042c
 SHA512 
2c285bd0d4516e188b8f9fe45db12bb0631c8298c97b3fcf99b7d56bed8c90920649d613c19821cbb38592211f5a3e7980679f2a59ad2d920da5b669251a99d5
+DIST php-8.0.27.tar.xz 10802096 BLAKE2B 
343a05759a074b746a38578f5fa88382ad91f44f23aee65a7a9b54fa80e991c944b61c6d5979710516a795506dcc8a2c628997e222981ae99bcdfad47afb606d
 SHA512 
443d4fe5d3165e2806e6ce03356f38b1d70fb4c86054f10b22e62191d5961bb51b10a31c49f3d74e6360836254db3107a8910589966481ebc7f5e06886b5e026
 DIST php-8.1.12.tar.xz 11747176 BLAKE2B 
0505794826fb0fc92b04be5f7162af8aa92d782bb228243348d85b46866cd47089fcb7febd6886a8179babf64cb227bcdbf5d5f60d44dfefe1c947a3a708e3c1
 SHA512 
437b6a8146b58479f4d1acb7b35d68954f1f7bc13a8f3dddc66e1677d7e9b6a11154861f9e894cbd59b9c28d4df3fd5422f9b5553004e9fc8d0320ab59b9f907
 DIST php-8.1.13.tar.xz 11802424 BLAKE2B 
2d2d00fd1574deef1ef86f6813e1d2a1e20a8202ce80e5ce2e1359307135b47d6f1495ff7dfe23f52c2127226494856f215588fe21af3d519a8259e1e67ab819
 SHA512 
a8966798ed8e723a362952f9d381a59cbfd63d921466d68a5bc4527960f4fe1b48a1f188284c74b0723e93524787e4cf1c1322ecd6ec1c9be199fd67df0a0542
 DIST php-8.2.0.tar.xz 11920436 BLAKE2B 
18f9395ecd86bd3f5e5b581cb60c410a4eba2260b70cf5c3b6f320004d8e8126431fd77371f3b694de2422a450655a37e1c9783e8cebc204b3b754b812709aa0
 SHA512 
0b201ca1de5210c2b44a6223556720c3409e21db3d8f976894f29ad43eebb8b60334b971aa90bc115ef113e3f06624c80175d04530466b5a02743f2fcd4c9806

diff --git a/dev-lang/php/php-8.0.27.ebuild b/dev-lang/php/php-8.0.27.ebuild
new file mode 100644
index ..54100cfe9d3f
--- /dev/null
+++ b/dev-lang/php/php-8.0.27.ebuild
@@ -0,0 +1,759 @@
+# 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}"
+
+# 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

[gentoo-commits] repo/gentoo:master commit in: lxde-base/lxdm/

2022-12-31 Thread Brian Evans
commit: b1f3d3cac3397c61cba3d5c40604d43b494b7af0
Author: Brian Evans  gentoo  org>
AuthorDate: Sun Jan  1 05:22:44 2023 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Sun Jan  1 05:22:44 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1f3d3ca

lxde-base/lxdm: Fix copyright year

Signed-off-by: Brian Evans  gentoo.org>

 lxde-base/lxdm/lxdm-0.5.3-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lxde-base/lxdm/lxdm-0.5.3-r4.ebuild 
b/lxde-base/lxdm/lxdm-0.5.3-r4.ebuild
index acee960e6acb..1242ecf466fa 100644
--- a/lxde-base/lxdm/lxdm-0.5.3-r4.ebuild
+++ b/lxde-base/lxdm/lxdm-0.5.3-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



[gentoo-commits] repo/gentoo:master commit in: lxde-base/lxdm/

2022-12-31 Thread Brian Evans
commit: d8336ecf624f4c7f93cda87868288aeac12b4a92
Author: Brian Evans  gentoo  org>
AuthorDate: Sun Jan  1 05:20:31 2023 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Sun Jan  1 05:20:31 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8336ecf

lxde-base/lxdm: Revbump for dependency fix

Closes: https://bugs.gentoo.org/889184
Signed-off-by: Brian Evans  gentoo.org>

 lxde-base/lxdm/{lxdm-0.5.3-r3.ebuild => lxdm-0.5.3-r4.ebuild} | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lxde-base/lxdm/lxdm-0.5.3-r3.ebuild 
b/lxde-base/lxdm/lxdm-0.5.3-r4.ebuild
similarity index 96%
rename from lxde-base/lxdm/lxdm-0.5.3-r3.ebuild
rename to lxde-base/lxdm/lxdm-0.5.3-r4.ebuild
index 2c6641a0a084..acee960e6acb 100644
--- a/lxde-base/lxdm/lxdm-0.5.3-r3.ebuild
+++ b/lxde-base/lxdm/lxdm-0.5.3-r4.ebuild
@@ -19,10 +19,10 @@ IUSE="debug elogind nls pam systemd"
 # They are directly referenced in the C code of the greeter and config util
 DEPEND="
dev-libs/glib:2
-   x11-libs/cairo
+   x11-libs/cairo[X(-)]
x11-libs/gdk-pixbuf:2
-   x11-libs/gtk+:3
-   x11-libs/pango
+   x11-libs/gtk+:3[X(-)]
+   x11-libs/pango[X(-)]
x11-libs/libX11
x11-libs/libxcb:0=
virtual/libcrypt:0=



[gentoo-commits] repo/gentoo:master commit in: mail-client/s-nail/

2022-12-29 Thread Brian Evans
commit: 87007380eafc9e42710c4c7b8bad2236285ac4be
Author: Brian Evans  gentoo  org>
AuthorDate: Thu Dec 29 15:33:19 2022 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Thu Dec 29 15:33:19 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87007380

mail-client/s-nail: Ensure a -O value exists in CFLAGS

Bug: https://bugs.gentoo.org/888613
Signed-off-by: Brian Evans  gentoo.org>

 mail-client/s-nail/s-nail-14.9.24.ebuild | 10 ++
 1 file changed, 10 insertions(+)

diff --git a/mail-client/s-nail/s-nail-14.9.24.ebuild 
b/mail-client/s-nail/s-nail-14.9.24.ebuild
index 34059f4f450e..58bc90639ae8 100644
--- a/mail-client/s-nail/s-nail-14.9.24.ebuild
+++ b/mail-client/s-nail/s-nail-14.9.24.ebuild
@@ -33,8 +33,18 @@ BDEPEND="
 "
 
 src_configure() {
+   has_cflag() {
+   local x var="CFLAGS[*]"
+   for x in ${!var} ; do
+   [[ ${x} == $1 ]] && return 0
+   done
+   return 1
+   }
+
# Fails to build without replace Bug 860357
replace-flags -O[0gs] -O1
+   # A valid -O option is necessary Bug 888613
+   has_cflag -O* || append-cflags -O1
append-cflags -std=c99
local confopts=(
CC="$(tc-getCC)"



[gentoo-commits] repo/gentoo:master commit in: mail-client/s-nail/

2022-12-27 Thread Brian Evans
commit: 831e7bd103b23e933592b14b275d103d27625a41
Author: Brian Evans  gentoo  org>
AuthorDate: Tue Dec 27 14:11:43 2022 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Tue Dec 27 14:11:43 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=831e7bd1

mail-client/s-nail: Fix building with certain CFLAGS

Filter out -O[0sg] with replacement of -O1

Closes: https://bugs.gentoo.org/860357
Signed-off-by: Brian Evans  gentoo.org>

 mail-client/s-nail/s-nail-14.9.24.ebuild | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/mail-client/s-nail/s-nail-14.9.24.ebuild 
b/mail-client/s-nail/s-nail-14.9.24.ebuild
index 6d95aeba874e..34059f4f450e 100644
--- a/mail-client/s-nail/s-nail-14.9.24.ebuild
+++ b/mail-client/s-nail/s-nail-14.9.24.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit toolchain-funcs
+inherit toolchain-funcs flag-o-matic
 
 HOMEPAGE="https://www.sdaoden.eu/code.html;
 DESCRIPTION="Enhanced mailx-compatible mail client based on Heirloom mailx 
(nail)"
@@ -33,9 +33,11 @@ BDEPEND="
 "
 
 src_configure() {
+   # Fails to build without replace Bug 860357
+   replace-flags -O[0gs] -O1
+   append-cflags -std=c99
local confopts=(
CC="$(tc-getCC)"
-   EXTRA_CFLAGS=-std=c99
strip=/bin/true
OPT_AUTOCC=no
VAL_PREFIX="${EPREFIX}"/usr



[gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm2-abrmd/

2022-12-22 Thread Brian Evans
commit: aecc9b78f8f042e6a74d5a192ec35aa05dda928b
Author: Brian Evans  gentoo  org>
AuthorDate: Thu Dec 22 18:30:47 2022 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Thu Dec 22 18:30:47 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aecc9b78

app-crypt/tpm2-abrmd: Restore install functionality

Non-maintainer commit.

The basic install is bypassed in 3.0.0 for some reason.
Restore the default install and la cleanup

Signed-off-by: Brian Evans  gentoo.org>

 .../{tpm2-abrmd-3.0.0.ebuild => tpm2-abrmd-3.0.0-r1.ebuild}   | 4 
 1 file changed, 4 insertions(+)

diff --git a/app-crypt/tpm2-abrmd/tpm2-abrmd-3.0.0.ebuild 
b/app-crypt/tpm2-abrmd/tpm2-abrmd-3.0.0-r1.ebuild
similarity index 96%
rename from app-crypt/tpm2-abrmd/tpm2-abrmd-3.0.0.ebuild
rename to app-crypt/tpm2-abrmd/tpm2-abrmd-3.0.0-r1.ebuild
index 454cad2eeaee..56f9d03e0cbe 100644
--- a/app-crypt/tpm2-abrmd/tpm2-abrmd-3.0.0.ebuild
+++ b/app-crypt/tpm2-abrmd/tpm2-abrmd-3.0.0-r1.ebuild
@@ -50,6 +50,10 @@ src_configure() {
 }
 
 src_install() {
+   default
+
+   find "${D}" -name '*.la' -delete || die
+
newinitd "${FILESDIR}"/${PN}.initd ${PN}
newconfd "${FILESDIR}"/${PN}.confd ${PN}
 }



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

2022-12-13 Thread Brian Evans
commit: 6a43f0c27da369f2428587735b2cf6f46c8c49a3
Author: Brian Evans  gentoo  org>
AuthorDate: Tue Dec 13 16:00:22 2022 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Tue Dec 13 16:00:22 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a43f0c2

dev-php/pecl-radius: Patch 8.0 support from upstream repo

Adds in additional support missing upstream

Closes: https://bugs.gentoo.org/881465
Signed-off-by: Brian Evans  gentoo.org>

 dev-php/pecl-radius/files/1.4.0-php8.patch | 289 +
 .../pecl-radius/pecl-radius-1.4.0_beta1-r3.ebuild  |  10 +-
 2 files changed, 298 insertions(+), 1 deletion(-)

diff --git a/dev-php/pecl-radius/files/1.4.0-php8.patch 
b/dev-php/pecl-radius/files/1.4.0-php8.patch
new file mode 100644
index ..08ff55866beb
--- /dev/null
+++ b/dev-php/pecl-radius/files/1.4.0-php8.patch
@@ -0,0 +1,289 @@
+From 6cfaa16a21780f09f76a7703da255e07910b8b4d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Bruno=20Pr=C3=A9mont?= 
+Date: Mon, 25 Jan 2021 19:37:14 +0100
+Subject: [PATCH] Fix compatibility with PHP-8
+
+With PHP-7.x missing arginfo has been triggering warnings:
+  NOTICE: PHP message: PHP Warning:  Missing arginfo for radius_auth_open() in 
Unknown on line 0
+With PHP-8 this has become mandatory.
+---
+ radius.c | 216 +++
+ 1 file changed, 188 insertions(+), 28 deletions(-)
+
+diff --git a/radius.c b/radius.c
+index 89ee0d6..4bfb429 100644
+--- a/radius.c
 b/radius.c
+@@ -61,39 +61,199 @@ ZEND_DECLARE_MODULE_GLOBALS(radius)
+ /* True global resources - no need for thread safety here */
+ static int le_radius;
+ 
++/* {{{ arginfo */
++ZEND_BEGIN_ARG_INFO_EX(arginfo_radius_auth_open, 0, 0, 0)
++ZEND_END_ARG_INFO()
++
++ZEND_BEGIN_ARG_INFO_EX(arginfo_radius_acct_open, 0, 0, 0)
++ZEND_END_ARG_INFO()
++
++ZEND_BEGIN_ARG_INFO_EX(arginfo_radius_close, 0, 0, 1)
++  ZEND_ARG_INFO(0, radius_handle)
++ZEND_END_ARG_INFO()
++
++ZEND_BEGIN_ARG_INFO_EX(arginfo_radius_strerror, 0, 0, 1)
++  ZEND_ARG_INFO(0, radius_handle)
++ZEND_END_ARG_INFO()
++
++ZEND_BEGIN_ARG_INFO_EX(arginfo_radius_config, 0, 0, 2)
++  ZEND_ARG_INFO(0, radius_handle)
++  ZEND_ARG_INFO(0, file)
++ZEND_END_ARG_INFO()
++
++ZEND_BEGIN_ARG_INFO_EX(arginfo_radius_add_server, 0, 0, 6)
++  ZEND_ARG_INFO(0, radius_handle)
++  ZEND_ARG_INFO(0, hostname)
++  ZEND_ARG_INFO(0, port)
++  ZEND_ARG_INFO(0, secret)
++  ZEND_ARG_INFO(0, timeout)
++  ZEND_ARG_INFO(0, max_tries)
++ZEND_END_ARG_INFO()
++
++ZEND_BEGIN_ARG_INFO_EX(arginfo_radius_create_request, 0, 0, 2)
++  ZEND_ARG_INFO(0, radius_handle)
++  ZEND_ARG_INFO(0, type)
++ZEND_END_ARG_INFO()
++
++ZEND_BEGIN_ARG_INFO_EX(arginfo_radius_put_string, 0, 0, 3)
++  ZEND_ARG_INFO(0, radius_handle)
++  ZEND_ARG_INFO(0, type)
++  ZEND_ARG_INFO(0, value)
++  ZEND_ARG_INFO(0, options)
++  ZEND_ARG_INFO(0, tag)
++ZEND_END_ARG_INFO()
++
++ZEND_BEGIN_ARG_INFO_EX(arginfo_radius_put_int, 0, 0, 3)
++  ZEND_ARG_INFO(0, radius_handle)
++  ZEND_ARG_INFO(0, type)
++  ZEND_ARG_INFO(0, value)
++  ZEND_ARG_INFO(0, options)
++  ZEND_ARG_INFO(0, tag)
++ZEND_END_ARG_INFO()
++
++ZEND_BEGIN_ARG_INFO_EX(arginfo_radius_put_attr, 0, 0, 3)
++  ZEND_ARG_INFO(0, radius_handle)
++  ZEND_ARG_INFO(0, type)
++  ZEND_ARG_INFO(0, value)
++  ZEND_ARG_INFO(0, options)
++  ZEND_ARG_INFO(0, tag)
++ZEND_END_ARG_INFO()
++
++ZEND_BEGIN_ARG_INFO_EX(arginfo_radius_put_addr, 0, 0, 3)
++  ZEND_ARG_INFO(0, radius_handle)
++  ZEND_ARG_INFO(0, type)
++  ZEND_ARG_INFO(0, addr)
++  ZEND_ARG_INFO(0, options)
++  ZEND_ARG_INFO(0, tag)
++ZEND_END_ARG_INFO()
++
++ZEND_BEGIN_ARG_INFO_EX(arginfo_radius_put_vendor_string, 0, 0, 4)
++  ZEND_ARG_INFO(0, radius_handle)
++  ZEND_ARG_INFO(0, vendor)
++  ZEND_ARG_INFO(0, type)
++  ZEND_ARG_INFO(0, value)
++  ZEND_ARG_INFO(0, options)
++  ZEND_ARG_INFO(0, tag)
++ZEND_END_ARG_INFO()
++
++ZEND_BEGIN_ARG_INFO_EX(arginfo_radius_put_vendor_int, 0, 0, 4)
++  ZEND_ARG_INFO(0, radius_handle)
++  ZEND_ARG_INFO(0, vendor)
++  ZEND_ARG_INFO(0, type)
++  ZEND_ARG_INFO(0, value)
++  ZEND_ARG_INFO(0, options)
++  ZEND_ARG_INFO(0, tag)
++ZEND_END_ARG_INFO()
++
++ZEND_BEGIN_ARG_INFO_EX(arginfo_radius_put_vendor_attr, 0, 0, 4)
++  ZEND_ARG_INFO(0, radius_handle)
++  ZEND_ARG_INFO(0, vendor)
++  ZEND_ARG_INFO(0, type)
++  ZEND_ARG_INFO(0, value)
++  ZEND_ARG_INFO(0, options)
++  ZEND_ARG_INFO(0, tag)
++ZEND_END_ARG_INFO()
++
++ZEND_BEGIN_ARG_INFO_EX(arginfo_radius_put_vendor_addr, 0, 0, 4)
++  ZEND_ARG_INFO(0, radius_handle)
++  ZEND_ARG_INFO(0, vendor)
++  ZEND_ARG_INFO(0, type)
++  ZEND_ARG_INFO(0, addr)
++  ZEND_ARG_INFO(0, options)
++  ZEND_ARG_INFO(0, tag)
++ZEND_END_ARG_INFO()
++
++ZEND_BEGIN_ARG_INFO_EX(arginfo_radius_send_request, 0, 0, 1)
++  ZEND_ARG_INFO(0, radi

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

2022-12-12 Thread Brian Evans
commit: dc351e01753360498357371230dcfdf1012360ba
Author: Brian Evans  gentoo  org>
AuthorDate: Mon Dec 12 19:31:18 2022 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Mon Dec 12 19:31:18 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc351e01

dev-php/pecl-amqp: Adjust targets

Signed-off-by: Brian Evans  gentoo.org>

 dev-php/pecl-amqp/pecl-amqp-1.11.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-php/pecl-amqp/pecl-amqp-1.11.0.ebuild 
b/dev-php/pecl-amqp/pecl-amqp-1.11.0.ebuild
index 293de01fbd8b..a65d3a6ae1a3 100644
--- a/dev-php/pecl-amqp/pecl-amqp-1.11.0.ebuild
+++ b/dev-php/pecl-amqp/pecl-amqp-1.11.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="8"
 
-USE_PHP="php7-3 php7-4 php8-0 php8-1"
+USE_PHP="php7-4 php8-0 php8-1 php8-2"
 MY_P="${PN/pecl-/}-${PV/_rc/RC}"
 
 inherit php-ext-pecl-r3



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

2022-12-12 Thread Brian Evans
commit: f1d5603f848ba91c4d74a4c72313ad701ef4c130
Author: Brian Evans  gentoo  org>
AuthorDate: Mon Dec 12 18:27:39 2022 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Mon Dec 12 18:27:39 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1d5603f

dev-php/pecl-event: Version bump for 3.0.8

Signed-off-by: Brian Evans  gentoo.org>

 dev-php/pecl-event/Manifest|  1 +
 dev-php/pecl-event/pecl-event-3.0.8.ebuild | 49 ++
 2 files changed, 50 insertions(+)

diff --git a/dev-php/pecl-event/Manifest b/dev-php/pecl-event/Manifest
index c8252cf30fdf..52fd71865ff0 100644
--- a/dev-php/pecl-event/Manifest
+++ b/dev-php/pecl-event/Manifest
@@ -1,2 +1,3 @@
 DIST event-3.0.2r1.tgz 198176 BLAKE2B 
ca93fa75fc1210476bddfafb89f9fd7a9a9ed9b23023ce37c5b5fe94c782d3a95a3a9bee8263cca3329b96b848cb213de7fac73c6594a8fee0c7c299b5f44215
 SHA512 
b117119814763bffe1c2c44766a822f638cd0873eeede29aab139fceb09a09df264f0d7b7e882b21dd9a7e96f45d692b45193509c3f53e0f3b10feb59c1a4ae4
 DIST event-3.0.6.tgz 198565 BLAKE2B 
a8629572f63c3c342f5a137c5eaaf1af6d22d5df192cd37c36453d67db28ee030c7be13a26653a0de8e4984c24f9e633f7b0e757457aa668e2ce694d36b89cea
 SHA512 
a7c7b062e44409d8d7525b3bb5ec80916dfcb5cdc53088a486ae940fa3a0a7944ec30727cd96d4e125187b8fa2e3a0fce6fc8981f803ad416a2cc040b78f93eb
+DIST event-3.0.8.tgz 199567 BLAKE2B 
520949b55d27629e089993a49fe55114f8fb45cf5788dd57b30b0977fcfc9074757b4cc2efb6d5a126eea5343926f326d1651546650e9dbc8baa0ef7b06649f5
 SHA512 
45b4c07cac6dfca386cf9e6c792abc72c6f68d1443a1c67fd645f5e6f05ae9d45fb346b50b35cc6818ca70ebbff93c42afd801e70e9ebc63f997366996193593

diff --git a/dev-php/pecl-event/pecl-event-3.0.8.ebuild 
b/dev-php/pecl-event/pecl-event-3.0.8.ebuild
new file mode 100644
index ..767b51e42dd5
--- /dev/null
+++ b/dev-php/pecl-event/pecl-event-3.0.8.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+PHP_EXT_NAME="event"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+DOCS=( README.md )
+
+USE_PHP="php7-4 php8-0 php8-1 php8-2"
+PHP_EXT_NEEDED_USE="sockets(-)?"
+
+inherit php-ext-pecl-r3
+
+KEYWORDS="~amd64 ~ia64 ~x86"
+LICENSE="PHP-3.01"
+
+DESCRIPTION="PHP wrapper for libevent2"
+SLOT="0"
+IUSE="debug examples +extra +sockets +ssl threads"
+
+DEPEND="
+   >=dev-libs/libevent-2.0.2
+   ssl? ( dev-libs/openssl:0= )"
+
+RDEPEND="
+   ${DEPEND}
+   !dev-php/pecl-libevent"
+
+src_configure() {
+   local PHP_EXT_ECONF_ARGS=(
+   --with-event-core
+   $(use_enable debug event-debug)
+   $(use_with extra event-extra)
+   $(use_with ssl event-openssl)
+   $(use_with threads event-pthreads)
+   $(use_enable sockets event-sockets)
+   )
+   php-ext-source-r3_src_configure
+}
+
+src_test() {
+   local slot
+   for slot in $(php_get_slots); do
+   php_init_slot_env "${slot}"
+   SKIP_ONLINE_TESTS="yes" NO_INTERACTION="yes" emake test
+   done
+}



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

2022-12-12 Thread Brian Evans
commit: 1c8dd2fcb2df324af81383b68532291f08041e79
Author: Brian Evans  gentoo  org>
AuthorDate: Mon Dec 12 18:21:10 2022 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Mon Dec 12 18:21:10 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c8dd2fc

dev-php/pecl-rrd: Adjust targets on 2.0.3

Signed-off-by: Brian Evans  gentoo.org>

 dev-php/pecl-rrd/pecl-rrd-2.0.3.ebuild | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/dev-php/pecl-rrd/pecl-rrd-2.0.3.ebuild 
b/dev-php/pecl-rrd/pecl-rrd-2.0.3.ebuild
index 034811552435..7cdb21a8d0eb 100644
--- a/dev-php/pecl-rrd/pecl-rrd-2.0.3.ebuild
+++ b/dev-php/pecl-rrd/pecl-rrd-2.0.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI="8"
 
-USE_PHP="php7-3 php7-4 php8-0"
+USE_PHP="php7-4 php8-0 php8-1 php8-2"
 
 inherit php-ext-pecl-r3
 
@@ -14,6 +14,7 @@ KEYWORDS="~amd64 ~x86"
 
 DEPEND="net-analyzer/rrdtool[graph(-)]"
 RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 #PATCHES=( "${FILESDIR}/${PV}" )
 PHP_EXT_ECONF_ARGS=()



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

2022-12-12 Thread Brian Evans
commit: 731ea1fd1a18c905a92b155c9c98a153b73b1a31
Author: Brian Evans  gentoo  org>
AuthorDate: Mon Dec 12 17:08:26 2022 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Mon Dec 12 17:08:26 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=731ea1fd

dev-php/pecl-geos: Drop old

Signed-off-by: Brian Evans  gentoo.org>

 dev-php/geos-php/Manifest  |   1 -
 .../0001-fix-test-for-7.3-int-vs-integer.patch |  34 --
 ...essage-with-php-7-Wformat-warnings-raised.patch |  37 --
 ...ll-arginfo-and-fix-build-with-PHP-8-part2.patch | 422 -
 ...-add-all-arginfo-and-fix-build-with-PHP-8.patch | 341 -
 .../files/1.0.0/0004-fix-for-8.0.0RC1.patch|  25 --
 ...nd_parse_parameters-call-to-use-zend_long.patch | 123 --
 dev-php/geos-php/geos-php-1.0.0-r1.ebuild  |  36 --
 8 files changed, 1019 deletions(-)

diff --git a/dev-php/geos-php/Manifest b/dev-php/geos-php/Manifest
index 85c773361b2a..4aeef013a477 100644
--- a/dev-php/geos-php/Manifest
+++ b/dev-php/geos-php/Manifest
@@ -1,2 +1 @@
-DIST geos-php-1.0.0.tar.gz 40870 BLAKE2B 
c6d526470bdb7e4aecce6ce5f2132f90a6c40e5a2b3a8169bbb7ae101394340aad8a23309130c7f1421e19162b5559f9e87e58fb704e91b1fc03b612543551e8
 SHA512 
4ceb9e1152d0b534bc3a5e372be0b98770b1883ec4dda1177c9399d95d947b9feee412accf003d27b55b1a901c90259a9b38792b453dac11cb8af26af3cd91ec
 DIST geos-php-1.0.0_p20220909.tar.gz 43257 BLAKE2B 
b1ee853e6d09f2bcc2bc32ad5eea29c3cb35d742d3037f836c575099de0b806519dc23a1fc9c322d377eb39c4b935029b47043c3ee5ab232537196686c627feb
 SHA512 
4beae67902eaf1201d997db4ccf8e332e98699da031377878e0e144ae2f488bdf00b4a4d58b87082140ee18a4c04211f61de029fd523db90531245a450839001

diff --git 
a/dev-php/geos-php/files/1.0.0/0001-fix-test-for-7.3-int-vs-integer.patch 
b/dev-php/geos-php/files/1.0.0/0001-fix-test-for-7.3-int-vs-integer.patch
deleted file mode 100644
index e08f1b739051..
--- a/dev-php/geos-php/files/1.0.0/0001-fix-test-for-7.3-int-vs-integer.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From d9eb2378092d39678d1e2cf834c555f83d85b1a1 Mon Sep 17 00:00:00 2001
-From: Remi Collet 
-Date: Fri, 22 Jun 2018 11:43:23 +0200
-Subject: [PATCH 1/2] fix test for 7.3 (int vs integer)
-

- tests/004_WKBWriter.phpt | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/tests/004_WKBWriter.phpt b/tests/004_WKBWriter.phpt
-index d2b3c85..3a72e2d 100644
 a/tests/004_WKBWriter.phpt
-+++ b/tests/004_WKBWriter.phpt
-@@ -139,7 +139,7 @@ class WKBWriterTest extends GEOSTest
- $writer->write(1);
- $this->assertTrue(false);
- } catch (ErrorException $e) {
--$this->assertContains('expects parameter 1 to be object, integer 
given', $e->getMessage());
-+$this->assertContains('expects parameter 1 to be object, int', 
$e->getMessage());
- }
- }
- 
-@@ -151,7 +151,7 @@ class WKBWriterTest extends GEOSTest
- $writer->writeHEX(1);
- $this->assertTrue(false);
- } catch (ErrorException $e) {
--$this->assertContains('expects parameter 1 to be object, integer 
given', $e->getMessage());
-+$this->assertContains('expects parameter 1 to be object, int', 
$e->getMessage());
- }
- }
- }
--- 
-2.14.4
-

diff --git 
a/dev-php/geos-php/files/1.0.0/0002-fix-error-message-with-php-7-Wformat-warnings-raised.patch
 
b/dev-php/geos-php/files/1.0.0/0002-fix-error-message-with-php-7-Wformat-warnings-raised.patch
deleted file mode 100644
index 78509b766224..
--- 
a/dev-php/geos-php/files/1.0.0/0002-fix-error-message-with-php-7-Wformat-warnings-raised.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From f881f614f11472090394538d4424f408cb61d581 Mon Sep 17 00:00:00 2001
-From: Remi Collet 
-Date: Fri, 22 Jun 2018 11:44:27 +0200
-Subject: [PATCH 2/2] fix error message with php 7+ (-Wformat warnings raised
- by 7.3)
-

- geos.c | 8 
- 1 file changed, 8 insertions(+)
-
-diff --git a/geos.c b/geos.c
-index 2c81428..fc679e8 100755
 a/geos.c
-+++ b/geos.c
-@@ -189,11 +189,19 @@ getRelay(zval* val, zend_class_entry* ce) {
- 
- if ( proxy->std.ce != ce ) {
- php_error_docref(NULL TSRMLS_CC, E_ERROR,
-+#if PHP_VERSION_ID >= 7
-+"Relay object is not an %s", ZSTR_VAL(ce->name));
-+#else
- "Relay object is not an %s", ce->name);
-+#endif
- }
- if ( ! proxy->relay ) {
- php_error_docref(NULL TSRMLS_CC, E_ERROR,
-+#if PHP_VERSION_ID >= 7
-+"Relay object for object of type %s is not set", 
ZSTR_VAL(ce->name));
-+#else
- "Relay object for object of type %s is not set", ce->name);
-+#endif
- }
- return proxy->relay;
- }
--- 
-2.14.4
-

diff --git 
a/dev-php/geos-php/files/1.0.0/0003-add-all-arginfo-and-fix-build-with-PHP-8-part2.patch
 
b/dev-p

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

2022-12-12 Thread Brian Evans
commit: cc0ae0f4156e02def719aeb697d40ede1f4ecd77
Author: Brian Evans  gentoo  org>
AuthorDate: Mon Dec 12 17:07:05 2022 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Mon Dec 12 17:07:05 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc0ae0f4

dev-php/geos-php: Add new snapshot

Signed-off-by: Brian Evans  gentoo.org>

 dev-php/geos-php/Manifest|  1 +
 dev-php/geos-php/geos-php-1.0.0_p20220909.ebuild | 32 
 2 files changed, 33 insertions(+)

diff --git a/dev-php/geos-php/Manifest b/dev-php/geos-php/Manifest
index 87ff289e412d..85c773361b2a 100644
--- a/dev-php/geos-php/Manifest
+++ b/dev-php/geos-php/Manifest
@@ -1 +1,2 @@
 DIST geos-php-1.0.0.tar.gz 40870 BLAKE2B 
c6d526470bdb7e4aecce6ce5f2132f90a6c40e5a2b3a8169bbb7ae101394340aad8a23309130c7f1421e19162b5559f9e87e58fb704e91b1fc03b612543551e8
 SHA512 
4ceb9e1152d0b534bc3a5e372be0b98770b1883ec4dda1177c9399d95d947b9feee412accf003d27b55b1a901c90259a9b38792b453dac11cb8af26af3cd91ec
+DIST geos-php-1.0.0_p20220909.tar.gz 43257 BLAKE2B 
b1ee853e6d09f2bcc2bc32ad5eea29c3cb35d742d3037f836c575099de0b806519dc23a1fc9c322d377eb39c4b935029b47043c3ee5ab232537196686c627feb
 SHA512 
4beae67902eaf1201d997db4ccf8e332e98699da031377878e0e144ae2f488bdf00b4a4d58b87082140ee18a4c04211f61de029fd523db90531245a450839001

diff --git a/dev-php/geos-php/geos-php-1.0.0_p20220909.ebuild 
b/dev-php/geos-php/geos-php-1.0.0_p20220909.ebuild
new file mode 100644
index ..230ada5c529e
--- /dev/null
+++ b/dev-php/geos-php/geos-php-1.0.0_p20220909.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+PHP_EXT_NAME="geos"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+
+USE_PHP="php7-4 php8-0 php8-1 php8-2"
+
+S="${WORKDIR}/php-geos"
+
+inherit php-ext-source-r3
+
+KEYWORDS="~amd64 ~x86"
+SNAPSHOT="ee5ca8f3739a4e3c1cdeb0abf4f1a47d9ca751a5"
+DESCRIPTION="A PHP interface to GEOS - Geometry Engine, Open Source"
+HOMEPAGE="https://libgeos.org/;
+SRC_URI="https://git.osgeo.org/gitea/geos/php-geos/archive/${SNAPSHOT}.tar.gz 
-> ${P}.tar.gz"
+LICENSE="LGPL-2.1"
+SLOT="0"
+
+RDEPEND="sci-libs/geos[-php(-)]"
+DEPEND="sci-libs/geos[-php(-)]"
+DOCS=( README.md CREDITS NEWS TODO )
+PHP_EXT_ECONF_ARGS=()
+
+src_prepare() {
+   # Test always fails with geos-3.8 or greater
+   rm "${S}/tests/001_Geometry.phpt" || die
+   php-ext-source-r3_src_prepare
+}



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

2022-12-09 Thread Brian Evans
commit: fe76413cfb9fcc73e20626489c715b8b7eb9ca22
Author: Brian Evans  gentoo  org>
AuthorDate: Fri Dec  9 21:43:08 2022 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Fri Dec  9 21:44:44 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe76413c

dev-php/pecl-yaz: Version bump for 1.2.4

Signed-off-by: Brian Evans  gentoo.org>

 dev-php/pecl-yaz/Manifest  |  1 +
 dev-php/pecl-yaz/pecl-yaz-1.2.4.ebuild | 30 ++
 2 files changed, 31 insertions(+)

diff --git a/dev-php/pecl-yaz/Manifest b/dev-php/pecl-yaz/Manifest
index e23f2509034d..cc4a6c61a04b 100644
--- a/dev-php/pecl-yaz/Manifest
+++ b/dev-php/pecl-yaz/Manifest
@@ -1 +1,2 @@
 DIST yaz-1.2.3.tgz 20059 BLAKE2B 
3fbf6d57e8519f6d363dbf308cb6ba259098521ae352f8886e8e12ca2a0d8119eaa31fc30301aea6979b32c6c321c4de0ad63ebe72e8f52cbb630d7f136f3e60
 SHA512 
5e6ebccac05fa44b0758b6817530e8cb436e45ead659f6a5029383515213bcce8c8cc7ceb8ef5ff4ec2335ad5c3009c6ccf8786116b115c24a013329d107bd7a
+DIST yaz-1.2.4.tgz 20204 BLAKE2B 
f36a0db6b8c49a8a4235f49ef07e28196954e9e25bcbe1a2fe94d69d14224b777f692bdc135b17b4d12d1684bb2abd52fd7966a3d78460e563d8475e31cb0ce6
 SHA512 
c7e17681ec82805ba74d643b427d6fdb4c4542a7efcf690cf9e4ac8adf61b9a9bfe3268ed317dc5220a85f9962f86387c3054f50e98cd986b29f8fb3f5be6b1e

diff --git a/dev-php/pecl-yaz/pecl-yaz-1.2.4.ebuild 
b/dev-php/pecl-yaz/pecl-yaz-1.2.4.ebuild
new file mode 100644
index ..757dad0ff483
--- /dev/null
+++ b/dev-php/pecl-yaz/pecl-yaz-1.2.4.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PHP_EXT_NAME="yaz"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+DOCS=( README )
+
+USE_PHP="php7-4 php8-0 php8-1 php8-2"
+
+inherit php-ext-pecl-r3
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+DESCRIPTION="This extension implements a Z39.50 client for PHP using the YAZ 
toolkit"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+DEPEND=">=dev-libs/yaz-3.0.2:0="
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+# Needs network access to z3950.indexdata.com
+PROPERTIES="test_network"
+RESTRICT="test"
+
+PHP_EXT_ECONF_ARGS="--with-yaz=/usr"



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

2022-12-09 Thread Brian Evans
commit: 6ae970c38f84d92c445d66254dba22048e93af4e
Author: Brian Evans  gentoo  org>
AuthorDate: Fri Dec  9 21:23:49 2022 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Fri Dec  9 21:23:49 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ae970c3

dev-php/pecl-stomp: Drop old version

Signed-off-by: Brian Evans  gentoo.org>

 dev-php/pecl-stomp/Manifest|   1 -
 .../pecl-stomp/files/pecl-stomp-2.0.2-php8.patch   | 369 -
 dev-php/pecl-stomp/pecl-stomp-2.0.2-r1.ebuild  |  31 --
 3 files changed, 401 deletions(-)

diff --git a/dev-php/pecl-stomp/Manifest b/dev-php/pecl-stomp/Manifest
index a9923eb89b0a..f600cd840773 100644
--- a/dev-php/pecl-stomp/Manifest
+++ b/dev-php/pecl-stomp/Manifest
@@ -1,2 +1 @@
-DIST stomp-2.0.2.tgz 23609 BLAKE2B 
b6ed89b5b8fd0bb501b2337e87107797eedc6ac53c81ba86d2e755cfa2dd716bf4e409cee623430791e0b4854833ef44ed7f6f9e1d89fcd2250d598af0dcaea6
 SHA512 
577a781b45ef394cd833fb69c808da9b8a8ff69b31b1093c5eef3f7b5d1b37cd0b45c32a03883f56f86213e32bb18aaf0a80010c6bec7efa7239ea48bc57b4b4
 DIST stomp-2.0.3.tgz 23518 BLAKE2B 
f0253d0e6d1bb51d95007ce2580cb4e5a271547b73705d1ab5be36975cd58068e5fceea64b1451e438fb17601c1b1f513f287b189e3d2922747f735a48e582ef
 SHA512 
e34a63d776cb79da7676d200e4aa2b4a9d4272014fff30eb4c07bc27417d8dc4e7738fb8d62e283cdaac0a411a7bd6e06ef5b06171caa629a404601d14da71d6

diff --git a/dev-php/pecl-stomp/files/pecl-stomp-2.0.2-php8.patch 
b/dev-php/pecl-stomp/files/pecl-stomp-2.0.2-php8.patch
deleted file mode 100644
index 9d38a2d7ff41..
--- a/dev-php/pecl-stomp/files/pecl-stomp-2.0.2-php8.patch
+++ /dev/null
@@ -1,369 +0,0 @@
-From 13681a79d9389603d9788802f0a114671a753df1 Mon Sep 17 00:00:00 2001
-From: Remi Collet 
-Date: Fri, 25 Sep 2020 16:06:39 +0200
-Subject: [PATCH] Fix compatibility with PHP 8 - cleanup remaining TSRMLS
- macros - fix read/update_property parameters - adapt test suite for exception
- in arg. parsing - fix callback
-

- php_stomp.c| 38 --
- stomp.c|  6 +++---
- stomp.h|  4 ++--
- tests/003-connect/003.phpt |  2 +-
- tests/005-close/001.phpt   |  8 +--
- tests/007-subscribe/001.phpt   |  2 +-
- tests/008-unsubscribe/001.phpt |  2 +-
- tests/010-timeout/001.phpt | 24 -
- tests/010-timeout/002.phpt | 26 ++-
- 9 files changed, 67 insertions(+), 45 deletions(-)
-
-diff --git a/php_stomp.c b/php_stomp.c
-index 0dcefed..b99a9ff 100644
 a/php_stomp.c
-+++ b/php_stomp.c
-@@ -97,7 +97,7 @@
-   zval _object, *object = &_object; \
-   THROW_STOMP_EXCEPTION(object, errno, msg) \
- if (details) { \
--zend_update_property_string(stomp_ce_exception, object, 
"details", sizeof("details")-1, (char *) details ); \
-+zend_update_property_string(stomp_ce_exception, 
OBJ_FOR_PROP(object), "details", sizeof("details")-1, (char *) details ); \
- } \
- }
- 
-@@ -107,6 +107,12 @@
- #define STOMP_URL_STR(a) ZSTR_VAL(a)
- #endif
- 
-+#if PHP_VERSION_ID < 8
-+#define OBJ_FOR_PROP(zv) (zv)
-+#else
-+#define OBJ_FOR_PROP(zv) Z_OBJ_P(zv)
-+#endif
-+
- static int le_stomp;
- static zend_object_handlers stomp_obj_handlers;
- 
-@@ -564,7 +570,7 @@ PHP_FUNCTION(stomp_connect)
-   zval excobj;
-   THROW_STOMP_EXCEPTION(, stomp->errnum, 
stomp->error);
-   if (stomp->error_details) {
--  zend_update_property_string(stomp_ce_exception, 
, "details", sizeof("details")-1, stomp->error_details );
-+  zend_update_property_string(stomp_ce_exception, 
OBJ_FOR_PROP(), "details", sizeof("details")-1, stomp->error_details );
-   }
-   return;
-   }
-@@ -578,7 +584,7 @@ PHP_FUNCTION(stomp_connect)
-   if ((error_msg = zend_hash_str_find(res->headers, 
ZEND_STRL("message"))) != NULL) {
-   THROW_STOMP_EXCEPTION(, 0, 
ZSTR_VAL(Z_STR_P(error_msg)));
-   if (res->body) {
--  
zend_update_property_string(stomp_ce_exception, , "details", 
sizeof("details")-1, (char *) res->body );
-+  
zend_update_property_string(stomp_ce_exception, OBJ_FOR_PROP(), 
"details", sizeof("details")-1, (char *) res->body );
-   }
-   }
-   stomp_free_frame(res);
-@@ -735,17 +741,17 @@ PHP_FUNCTION(stomp_send)
-   frame.body_length = Z_STRLEN_P(msg);
-   } else if (Z_TYPE_P(msg) == IS_OBJECT && 
instanceof_function(Z_OBJCE

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

2022-12-09 Thread Brian Evans
commit: 490ac72a3ba093a315337bf989721610239e99fd
Author: Brian Evans  gentoo  org>
AuthorDate: Fri Dec  9 21:21:49 2022 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Fri Dec  9 21:23:26 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=490ac72a

dev-php/pecl-stomp: Version bump for 2.0.3

Signed-off-by: Brian Evans  gentoo.org>

 dev-php/pecl-stomp/Manifest|  1 +
 dev-php/pecl-stomp/pecl-stomp-2.0.3.ebuild | 29 +
 2 files changed, 30 insertions(+)

diff --git a/dev-php/pecl-stomp/Manifest b/dev-php/pecl-stomp/Manifest
index 5b21b5de59df..a9923eb89b0a 100644
--- a/dev-php/pecl-stomp/Manifest
+++ b/dev-php/pecl-stomp/Manifest
@@ -1 +1,2 @@
 DIST stomp-2.0.2.tgz 23609 BLAKE2B 
b6ed89b5b8fd0bb501b2337e87107797eedc6ac53c81ba86d2e755cfa2dd716bf4e409cee623430791e0b4854833ef44ed7f6f9e1d89fcd2250d598af0dcaea6
 SHA512 
577a781b45ef394cd833fb69c808da9b8a8ff69b31b1093c5eef3f7b5d1b37cd0b45c32a03883f56f86213e32bb18aaf0a80010c6bec7efa7239ea48bc57b4b4
+DIST stomp-2.0.3.tgz 23518 BLAKE2B 
f0253d0e6d1bb51d95007ce2580cb4e5a271547b73705d1ab5be36975cd58068e5fceea64b1451e438fb17601c1b1f513f287b189e3d2922747f735a48e582ef
 SHA512 
e34a63d776cb79da7676d200e4aa2b4a9d4272014fff30eb4c07bc27417d8dc4e7738fb8d62e283cdaac0a411a7bd6e06ef5b06171caa629a404601d14da71d6

diff --git a/dev-php/pecl-stomp/pecl-stomp-2.0.3.ebuild 
b/dev-php/pecl-stomp/pecl-stomp-2.0.3.ebuild
new file mode 100644
index ..fc45df0a10a7
--- /dev/null
+++ b/dev-php/pecl-stomp/pecl-stomp-2.0.3.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_PHP="php7-4 php8-0 php8-1 php8-2"
+PHP_EXT_NAME="stomp"
+PHP_EXT_NEEDED_USE="ssl(-)?"
+DOCS=( CREDITS doc/classes.php doc/functions.php )
+
+inherit php-ext-pecl-r3
+
+KEYWORDS="~amd64 ~x86"
+
+DESCRIPTION="PHP extension to communicate with Stomp message brokers"
+LICENSE="PHP-3.01"
+SLOT="7"
+IUSE="examples ssl test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="virtual/pkgconfig"
+
+src_configure() {
+   local PHP_EXT_ECONF_ARGS=(
+   --enable-stomp
+   --with-openssl-dir=$(usex ssl yes no)
+   )
+   php-ext-source-r3_src_configure
+}



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

2022-12-09 Thread Brian Evans
commit: a2b77a0fc681d3ed79e765f7dc45e1cd5ba38981
Author: Brian Evans  gentoo  org>
AuthorDate: Fri Dec  9 15:59:18 2022 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Fri Dec  9 15:59:18 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2b77a0f

dev-lang/php: Version bump for 8.2.0

Signed-off-by: Brian Evans  gentoo.org>

 dev-lang/php/Manifest |   1 +
 dev-lang/php/php-8.2.0.ebuild | 759 ++
 2 files changed, 760 insertions(+)

diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index ed8610ecdc4d..c48caef0d585 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -3,5 +3,6 @@ DIST php-8.0.25.tar.xz 10802888 BLAKE2B 
c1f283613c43551cccd52955deaae364781fffd4
 DIST php-8.0.26.tar.xz 10868588 BLAKE2B 
423af3b7de23f59717aaf59c8c661ec8ab0fd7acdf1e48282b1c730b2efc48f88b953452e77dbb9dbd4e1633ba68dd8adbc58c05642e787974f9783a075d042c
 SHA512 
2c285bd0d4516e188b8f9fe45db12bb0631c8298c97b3fcf99b7d56bed8c90920649d613c19821cbb38592211f5a3e7980679f2a59ad2d920da5b669251a99d5
 DIST php-8.1.12.tar.xz 11747176 BLAKE2B 
0505794826fb0fc92b04be5f7162af8aa92d782bb228243348d85b46866cd47089fcb7febd6886a8179babf64cb227bcdbf5d5f60d44dfefe1c947a3a708e3c1
 SHA512 
437b6a8146b58479f4d1acb7b35d68954f1f7bc13a8f3dddc66e1677d7e9b6a11154861f9e894cbd59b9c28d4df3fd5422f9b5553004e9fc8d0320ab59b9f907
 DIST php-8.1.13.tar.xz 11802424 BLAKE2B 
2d2d00fd1574deef1ef86f6813e1d2a1e20a8202ce80e5ce2e1359307135b47d6f1495ff7dfe23f52c2127226494856f215588fe21af3d519a8259e1e67ab819
 SHA512 
a8966798ed8e723a362952f9d381a59cbfd63d921466d68a5bc4527960f4fe1b48a1f188284c74b0723e93524787e4cf1c1322ecd6ec1c9be199fd67df0a0542
+DIST php-8.2.0.tar.xz 11920436 BLAKE2B 
18f9395ecd86bd3f5e5b581cb60c410a4eba2260b70cf5c3b6f320004d8e8126431fd77371f3b694de2422a450655a37e1c9783e8cebc204b3b754b812709aa0
 SHA512 
0b201ca1de5210c2b44a6223556720c3409e21db3d8f976894f29ad43eebb8b60334b971aa90bc115ef113e3f06624c80175d04530466b5a02743f2fcd4c9806
 DIST php-8.2.0RC5.tar.xz 12018772 BLAKE2B 
b06248998af682afd934f92a86dc94f53a8406f67817c3268319a48b250b96a4112b9a15c79de3b76f55960abf5e9de63fba7ebcf57c80f83073ec9f8defb31a
 SHA512 
7840cea3efef5de7be062c149335acd78daea27733a093b0fce8ace9781c4b8feb64936480cc5a1a5030ae88b658668c7ffc25a94b5e3c068877644e58fc
 DIST php-8.2.0RC7.tar.xz 12020100 BLAKE2B 
9418cff99330cb7efbbb0a4a04107b1dfe52ab4ada9e908d3f3418006a8a57341507a7c665003dd3d332a0d645b2fad5479314a7d7c92c89815fac4e91749231
 SHA512 
2b8f2f5fd82e8712d471792dc4f4155ed559ef8387918a32872116c9c7d5804f8b92e02a2b70813e07caed4d74d1b4fd5c5b3e44248b0b6c926e154bc0855c7f

diff --git a/dev-lang/php/php-8.2.0.ebuild b/dev-lang/php/php-8.2.0.ebuild
new file mode 100644
index ..f316a161e5cf
--- /dev/null
+++ b/dev-lang/php/php-8.2.0.ebuild
@@ -0,0 +1,759 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+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;
+#SRC_URI="https://downloads.php.net/~pierrick/php-${MY_PV}.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"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+# 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 +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 ) )
+   !cli? ( ?? ( readline libedit ) )
+   truetype? ( gd zlib )
+   webp? ( gd zlib )
+   cjk? ( gd zlib )
+ 

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

2022-12-09 Thread Brian Evans
commit: 024338122d425b57bbd682ffd4a78b8990e45f78
Author: Brian Evans  gentoo  org>
AuthorDate: Fri Dec  9 16:01:36 2022 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Fri Dec  9 16:01:36 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02433812

dev-lang/php: Drop old 8.2 RC builds

Signed-off-by: Brian Evans  gentoo.org>

 dev-lang/php/Manifest |   2 -
 dev-lang/php/php-8.2.0_rc5.ebuild | 759 --
 dev-lang/php/php-8.2.0_rc7.ebuild | 759 --
 3 files changed, 1520 deletions(-)

diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index c48caef0d585..2d36c44b94c9 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -4,5 +4,3 @@ DIST php-8.0.26.tar.xz 10868588 BLAKE2B 
423af3b7de23f59717aaf59c8c661ec8ab0fd7ac
 DIST php-8.1.12.tar.xz 11747176 BLAKE2B 
0505794826fb0fc92b04be5f7162af8aa92d782bb228243348d85b46866cd47089fcb7febd6886a8179babf64cb227bcdbf5d5f60d44dfefe1c947a3a708e3c1
 SHA512 
437b6a8146b58479f4d1acb7b35d68954f1f7bc13a8f3dddc66e1677d7e9b6a11154861f9e894cbd59b9c28d4df3fd5422f9b5553004e9fc8d0320ab59b9f907
 DIST php-8.1.13.tar.xz 11802424 BLAKE2B 
2d2d00fd1574deef1ef86f6813e1d2a1e20a8202ce80e5ce2e1359307135b47d6f1495ff7dfe23f52c2127226494856f215588fe21af3d519a8259e1e67ab819
 SHA512 
a8966798ed8e723a362952f9d381a59cbfd63d921466d68a5bc4527960f4fe1b48a1f188284c74b0723e93524787e4cf1c1322ecd6ec1c9be199fd67df0a0542
 DIST php-8.2.0.tar.xz 11920436 BLAKE2B 
18f9395ecd86bd3f5e5b581cb60c410a4eba2260b70cf5c3b6f320004d8e8126431fd77371f3b694de2422a450655a37e1c9783e8cebc204b3b754b812709aa0
 SHA512 
0b201ca1de5210c2b44a6223556720c3409e21db3d8f976894f29ad43eebb8b60334b971aa90bc115ef113e3f06624c80175d04530466b5a02743f2fcd4c9806
-DIST php-8.2.0RC5.tar.xz 12018772 BLAKE2B 
b06248998af682afd934f92a86dc94f53a8406f67817c3268319a48b250b96a4112b9a15c79de3b76f55960abf5e9de63fba7ebcf57c80f83073ec9f8defb31a
 SHA512 
7840cea3efef5de7be062c149335acd78daea27733a093b0fce8ace9781c4b8feb64936480cc5a1a5030ae88b658668c7ffc25a94b5e3c068877644e58fc
-DIST php-8.2.0RC7.tar.xz 12020100 BLAKE2B 
9418cff99330cb7efbbb0a4a04107b1dfe52ab4ada9e908d3f3418006a8a57341507a7c665003dd3d332a0d645b2fad5479314a7d7c92c89815fac4e91749231
 SHA512 
2b8f2f5fd82e8712d471792dc4f4155ed559ef8387918a32872116c9c7d5804f8b92e02a2b70813e07caed4d74d1b4fd5c5b3e44248b0b6c926e154bc0855c7f

diff --git a/dev-lang/php/php-8.2.0_rc5.ebuild 
b/dev-lang/php/php-8.2.0_rc5.ebuild
deleted file mode 100644
index 07c1880a3098..
--- a/dev-lang/php/php-8.2.0_rc5.ebuild
+++ /dev/null
@@ -1,759 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-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;
-SRC_URI="https://downloads.php.net/~pierrick/php-${MY_PV}.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"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-# 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 +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 ) )
-   !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? ( 

[gentoo-commits] repo/gentoo:master commit in: profiles/, profiles/base/

2022-12-09 Thread Brian Evans
commit: 1b5a1185e8de4f5eb2e096ad8029addc8ce991c5
Author: Brian Evans  gentoo  org>
AuthorDate: Fri Dec  9 16:04:26 2022 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Fri Dec  9 16:04:26 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b5a1185

profiles: Remove PHP masks; add stable mask on target

Signed-off-by: Brian Evans  gentoo.org>

 profiles/base/use.mask| 4 
 profiles/base/use.stable.mask | 4 
 profiles/package.mask | 5 -
 3 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/profiles/base/use.mask b/profiles/base/use.mask
index 4476441274c0..6e4d45c14449 100644
--- a/profiles/base/use.mask
+++ b/profiles/base/use.mask
@@ -10,10 +10,6 @@
 # Bug #875053
 video_cards_nv
 
-# Brian Evans  (2022-09-30)
-# PHP 8.2 is in RC
-php_targets_php8-2
-
 # Sam James  (2022-08-02)
 # Masked for testing. The split of some packages may still
 # change. bug #838970.

diff --git a/profiles/base/use.stable.mask b/profiles/base/use.stable.mask
index 96afc27ef07f..9f302287fcb8 100644
--- a/profiles/base/use.stable.mask
+++ b/profiles/base/use.stable.mask
@@ -4,6 +4,10 @@
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in use.mask
 
+# Brian Evans  (2022-12-09)
+# PHP 8.2 is in testing
+php_targets_php8-2
+
 # Alfredo Tupone  (2022-12-4)
 # sys-devel/gcc:12 is not stable yet
 ada_target_gcc_12_2_0

diff --git a/profiles/package.mask b/profiles/package.mask
index 96edd3182a7e..2aa0f92b38cf 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -571,11 +571,6 @@ x11-drivers/xf86-video-nv
 =sys-apps/portage-3.0.37
 =sys-apps/portage-3.0.38
 
-# Brian Evans  (2022-09-30)
-# Mask RC versions for initial testing
- (2022-09-18)
 # Unfixed root privilege escalation, bug #631552
 sys-cluster/slurm



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

2022-12-05 Thread Brian Evans
commit: 7476547d5775fb678c9ccd79e2ab6af470ce0688
Author: Brian Evans  gentoo  org>
AuthorDate: Mon Dec  5 20:24:23 2022 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Mon Dec  5 20:24:23 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7476547d

dev-php/PEAR-Net_Sieve: Version bump for 1.4.6

This is from the main upstream instead of the fork that 1.5.x
versions in the repository are based on.  This is newer than the fork.

Signed-off-by: Brian Evans  gentoo.org>

 dev-php/PEAR-Net_Sieve/Manifest|  1 +
 dev-php/PEAR-Net_Sieve/PEAR-Net_Sieve-1.4.6.ebuild | 21 +
 2 files changed, 22 insertions(+)

diff --git a/dev-php/PEAR-Net_Sieve/Manifest b/dev-php/PEAR-Net_Sieve/Manifest
index 0e5ca8850625..6a3fc26f6329 100644
--- a/dev-php/PEAR-Net_Sieve/Manifest
+++ b/dev-php/PEAR-Net_Sieve/Manifest
@@ -1,2 +1,3 @@
+DIST Net_Sieve-1.4.6.tgz 16556 BLAKE2B 
fd83f934f1b6bce9459113036a04bf9a59695789f5e3f2308ecd382af8d129ae95a1da73c49b41de83c078551f143c7546f531bb3ba975bfe73eae8b5572de1c
 SHA512 
8d10c00336fd9a8f3a6e4da2e549112bb8d16f96f4bba7854cb9a95d2385b50f88e2c10b2d75e90913dbe927925ac40e0b2e4536fe1b8aa44bc5e31db0f28851
 DIST PEAR-Net_Sieve-1.5.2.tar.gz 16332 BLAKE2B 
24d385225fbf3c4bf5612927826ced468ccb5addeac9cd49c6fb617304fa77f4a44a11e3adf09173f65315d8a0755e44e93d0a7ae1c60f1a954849bee2380053
 SHA512 
672d2f6f4c3241f748fbdebd804f2186dd2a5f8b7be6a75cb9187ed16e61502e4a338bfaa1815190b74ab534cb7277b534b0542309098797fcb63582dc81bdbe
 DIST PEAR-Net_Sieve-1.5.4.tar.gz 16306 BLAKE2B 
6ecd4ef669211b01089f29c48735b7259c392510f09df9aa0f1126fef8e3ebbf83803ab47bdd37c9b798a2add4c3d19e1a04960290a202070e17ee1f8041d02d
 SHA512 
c981ba421946cc1eb1f2101cf25cbfbbcf56b74f92a8a257b19a8b43fb04ad2d8c9d93a2f44903589bb6014c53cc6ae96c44b1c31c389510439f1f2da57b3353

diff --git a/dev-php/PEAR-Net_Sieve/PEAR-Net_Sieve-1.4.6.ebuild 
b/dev-php/PEAR-Net_Sieve/PEAR-Net_Sieve-1.4.6.ebuild
new file mode 100644
index ..2a267b616095
--- /dev/null
+++ b/dev-php/PEAR-Net_Sieve/PEAR-Net_Sieve-1.4.6.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit php-pear-r2
+
+DESCRIPTION="An API for talking to sieve (RFC 3028) servers"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="sasl"
+
+RDEPEND="dev-php/PEAR-Net_Socket
+   sasl? ( dev-php/PEAR-Auth_SASL )"
+
+src_install() {
+   insinto /usr/share/php/Net
+   doins Sieve.php
+   php-pear-r2_install_packagexml
+}



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

2022-12-05 Thread Brian Evans
commit: 71bf0ca43c1b1b548fbdd31aed2538532da607fa
Author: Brian Evans  gentoo  org>
AuthorDate: Mon Dec  5 18:40:37 2022 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Mon Dec  5 18:40:37 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71bf0ca4

dev-php/PEAR-Mail: Version bump for 1.5.0

Signed-off-by: Brian Evans  gentoo.org>

 dev-php/PEAR-Mail/Manifest |  1 +
 dev-php/PEAR-Mail/PEAR-Mail-1.5.0.ebuild   | 27 
 .../files/PEAR-Mail-1.5.0-fix-tests.patch  | 74 ++
 3 files changed, 102 insertions(+)

diff --git a/dev-php/PEAR-Mail/Manifest b/dev-php/PEAR-Mail/Manifest
index 49efc8d48e61..9b34160740d0 100644
--- a/dev-php/PEAR-Mail/Manifest
+++ b/dev-php/PEAR-Mail/Manifest
@@ -1 +1,2 @@
 DIST Mail-1.4.1.tgz 21756 BLAKE2B 
247df343a7b09760501918681cadc3a649ff9f2bd9974aa714a3661e64af6f1503edeb8ef0030f0ce113c43467cada3e7d62c6a60e751b5c8e6980c14f97fdbb
 SHA512 
851fa64bcf042fba58a70833c12ec5d7af6382e14e6157eeeb5be51b22cdfa5677c5d1eeba8c1f9eef6d55c2d732a4d5d6ea28c726aef232b233c170f7b82307
+DIST Mail-1.5.0.tgz 23221 BLAKE2B 
fad07a2cbf2188f6f0dea3705ca5bd72d05505e2a9968f2b43c94045027e2506941e17854ef13cf65bc2ff99218e3663b0859e93563036bcbefa7911cc4f2b84
 SHA512 
07462b920a879182cb06576c6c91a52d1c0411afcefe9d701ae57633eb28cc0f08f163e9b808c00c38cfd7e886fc17ac4e7151dfda5905396b7819b365afa919

diff --git a/dev-php/PEAR-Mail/PEAR-Mail-1.5.0.ebuild 
b/dev-php/PEAR-Mail/PEAR-Mail-1.5.0.ebuild
new file mode 100644
index ..a6b279e7630b
--- /dev/null
+++ b/dev-php/PEAR-Mail/PEAR-Mail-1.5.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit php-pear-r2 edos2unix
+
+DESCRIPTION="Class that provides multiple interfaces for sending emails"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND=">=dev-php/PEAR-Net_SMTP-1.4.1"
+BDEPEND="test? ( ${RDEPEND} dev-php/PEAR-PEAR )"
+
+src_prepare() {
+   # test files are DOS line-endings and default patch strips without this 
line
+   patch -p1 --binary < "${FILESDIR}/PEAR-Mail-1.5.0-fix-tests.patch"
+   default
+}
+
+src_test() {
+   peardev run-tests tests || die
+}

diff --git a/dev-php/PEAR-Mail/files/PEAR-Mail-1.5.0-fix-tests.patch 
b/dev-php/PEAR-Mail/files/PEAR-Mail-1.5.0-fix-tests.patch
new file mode 100644
index ..121d2299206e
--- /dev/null
+++ b/dev-php/PEAR-Mail/files/PEAR-Mail-1.5.0-fix-tests.patch
@@ -0,0 +1,74 @@
+diff --git a/tests/9137.phpt b/tests/9137.phpt
+index ba54c05..2e4c0a5 100644
+--- a/tests/9137.phpt
 b/tests/9137.phpt
+@@ -18,7 +18,8 @@ for ($i = 0; $i < count($addresses); $i++) {
+ $address = "\"" . addslashes($addresses[$i]['name']) . "\" ".
+ "<".$addresses[$i]['email'].">";
+ 
+-$parsedAddresses = Mail_RFC822::parseAddressList($address);
++$parser = new Mail_RFC822();
++$parsedAddresses = $parser->parseAddressList($address);
+ if (is_a($parsedAddresses, 'PEAR_Error')) {
+ echo $address." :: Failed to validate\n";
+ } else {
+diff --git a/tests/9137_2.phpt b/tests/9137_2.phpt
+index cc9dcbc..9c3c32d 100644
+--- a/tests/9137_2.phpt
 b/tests/9137_2.phpt
+@@ -18,7 +18,8 @@ $addresses = array(
+ for ($i = 0; $i < count($addresses); $i++) {
+ // construct the address
+ $address = $addresses[$i]['raw'];
+-$parsedAddresses = Mail_RFC822::parseAddressList($address);
++$parser = new Mail_RFC822();
++$parsedAddresses = $parser->parseAddressList($address);
+ if (PEAR::isError($parsedAddresses)) {
+ echo $address." :: Failed to validate\n";
+ } else {
+diff --git a/tests/bug17178.phpt b/tests/bug17178.phpt
+index 4572dda..425f329 100644
+--- a/tests/bug17178.phpt
 b/tests/bug17178.phpt
+@@ -4,7 +4,8 @@ Mail_RFC822::parseAddressList does not accept RFC-valid group 
syntax
+ parseAddressList("empty-group:;","invalid",false,false));
+ 
+ --EXPECT--
+ array(0) {
+diff --git a/tests/bug17317.phpt b/tests/bug17317.phpt
+index 331e803..045a939 100644
+--- a/tests/bug17317.phpt
 b/tests/bug17317.phpt
+@@ -4,9 +4,10 @@ Mail_RFC822::parseAddressList invalid periods in mail address
+ parseAddressList('.n...@example.com');
++$result[] = $parser->parseAddressList('na...@example.com');
++$result[] = $parser->parseAddressList('name..n...@example.com');
+ 
+ foreach ($result as $r) {
+ if (is_a($r, 'PEAR_Error')) {
+diff --git a/tests/validateQuotedString.phpt b/tests/validateQuotedString.phpt
+index 8b892bd..e0adb79 100644
+--- a/tests/validateQuotedString.phpt
 b/tests/validateQuotedString.phpt
+@@ -5,7 +5,8 @@ Mail_RFC8

[gentoo-commits] repo/gentoo:master commit in: mail-client/s-nail/

2022-12-04 Thread Brian Evans
commit: 9f935df73f0c4b05c1fde306368ce773eb06e7d2
Author: Brian Evans  gentoo  org>
AuthorDate: Mon Dec  5 01:15:13 2022 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Mon Dec  5 01:17:56 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f935df7

mail-client/s-nail: Fix split-usr error

Skip duplicated symlink

Closes: https://bugs.gentoo.org/884365
Signed-off-by: Brian Evans  gentoo.org>

 mail-client/s-nail/s-nail-14.9.24.ebuild | 8 +---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/mail-client/s-nail/s-nail-14.9.24.ebuild 
b/mail-client/s-nail/s-nail-14.9.24.ebuild
index bcd89a795767..6d95aeba874e 100644
--- a/mail-client/s-nail/s-nail-14.9.24.ebuild
+++ b/mail-client/s-nail/s-nail-14.9.24.ebuild
@@ -12,7 +12,7 @@ LICENSE="BSD BSD-4 ISC RSA"
 SRC_URI="https://ftp.sdaoden.eu/${P}.tar.xz;
 SLOT="0"
 KEYWORDS="~amd64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
-IUSE="idn kerberos net ssl"
+IUSE="idn kerberos net +split-usr ssl"
 
 RDEPEND="
sys-libs/ncurses:0=
@@ -81,8 +81,10 @@ src_install() {
 
dodoc INSTALL NEWS README THANKS
 
-   dodir /bin
-   dosym ../usr/bin/mailx /bin/mail
+   if use split-usr ; then
+   dodir /bin
+   dosym ../usr/bin/mailx /bin/mail
+   fi
dosym s-nail /usr/bin/mailx
dosym mailx /usr/bin/mail
dosym mailx /usr/bin/Mail



[gentoo-commits] repo/gentoo:master commit in: mail-client/s-nail/

2022-12-04 Thread Brian Evans
commit: 080d7cae743cbe3a21195d3a9968420875c76772
Author: Brian Evans  gentoo  org>
AuthorDate: Mon Dec  5 01:17:13 2022 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Mon Dec  5 01:17:56 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=080d7cae

mail-client/s-nail: Drop old

Signed-off-by: Brian Evans  gentoo.org>

 mail-client/s-nail/Manifest  |  1 -
 mail-client/s-nail/s-nail-14.9.22.ebuild | 93 
 2 files changed, 94 deletions(-)

diff --git a/mail-client/s-nail/Manifest b/mail-client/s-nail/Manifest
index fc9b751b8fd0..013239401976 100644
--- a/mail-client/s-nail/Manifest
+++ b/mail-client/s-nail/Manifest
@@ -1,2 +1 @@
-DIST s-nail-14.9.22.tar.xz 799296 BLAKE2B 
4db1b74be9de38d8879b00852545840aa50022f44efc42bc338575111e391db527ba850033a9f25e6d0269f68673a13bbdcd2609c0e74fb88c409040be2d165b
 SHA512 
016e3403fbb3d9954c160690184545fdb4fc384ffb13b146ac8b60b40e43ad1b1a8967f4660904d40a99071eb1addf2b1dd98b06c6033a1a886379c05fc0c9be
 DIST s-nail-14.9.24.tar.xz 803100 BLAKE2B 
4d82c747ff082a1a13d8832eb2bf1e96f05d6b3cf61c77a67bc061b1971032b41d8f5fe5520b96b9b74bc4d0661a4a9ef0f8f93b5e7b9eef66906b78260cef2f
 SHA512 
03f6a6f446391b6f91ed3c8875c3e7fdfac9d4e77ea1d52a7e98aa84cfd0edae137d5b9afba3bdc9a31ab67cee5237930b74b42ae3acb54aee4758553a4f1df2

diff --git a/mail-client/s-nail/s-nail-14.9.22.ebuild 
b/mail-client/s-nail/s-nail-14.9.22.ebuild
deleted file mode 100644
index 5dd4cf9fe267..
--- a/mail-client/s-nail/s-nail-14.9.22.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-HOMEPAGE="https://www.sdaoden.eu/code.html;
-DESCRIPTION="Enhanced mailx-compatible mail client based on Heirloom mailx 
(nail)"
-LICENSE="BSD BSD-4 ISC RSA"
-
-SRC_URI="https://ftp.sdaoden.eu/${P}.tar.xz;
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="idn kerberos net ssl"
-
-RDEPEND="
-   sys-libs/ncurses:0=
-   virtual/libiconv
-   idn? ( net-dns/libidn2 )
-   net? (
-   ssl? ( dev-libs/openssl:0= )
-   kerberos? ( virtual/krb5 )
-   )
-   !mail-client/mailx
-   !net-mail/mailutils
-   !mail-client/nail
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-   app-arch/xz-utils[extra-filters(-)]
-   app-alternatives/awk
-"
-
-src_configure() {
-   local confopts=(
-   CC="$(tc-getCC)"
-   EXTRA_CFLAGS=-std=c99
-   strip=/bin/true
-   OPT_AUTOCC=no
-   VAL_PREFIX="${EPREFIX}"/usr
-   VAL_SYSCONFDIR="${EPREFIX}"/etc
-   VAL_MTA="${EPREFIX}/usr/sbin/sendmail"
-   VAL_MAIL='/var/spool/mail'
-   VAL_PAGER=less
-   $(usex idn VAL_IDNA=idn2 OPT_IDNA=no)
-   VERBOSE=1
-   )
-
-   if use net; then
-   confopts+=( OPT_TLS=$(usex ssl require no)
-   OPT_GSSAPI=$(usex kerberos require no)
-   )
-   else
-   confopts+=( OPT_NET=no )
-   fi
-
-   tc-is-cross-compiler && confopts+=( OPT_CROSS_BUILD=yes )
-
-   # Cannot use emake or bad options saved Bug 879065
-   make "${confopts[@]}" config || die
-}
-
-src_compile() {
-   emake build
-}
-
-src_install() {
-   # Use /usr/sbin/sendmail by default and provide an example
-   cat <<- EOSMTP >> nail.rc
-
-   # Use the local sendmail (/usr/sbin/sendmail) binary by default.
-   # (Uncomment the following line to use a SMTP server)
-   #set smtp=localhost
-
-   # Ask for CC: list too.
-   set askcc
-   EOSMTP
-
-   emake DESTDIR="${D}" install
-
-   dodoc INSTALL NEWS README THANKS
-
-   dodir /bin
-   dosym ../usr/bin/mailx /bin/mail
-   dosym s-nail /usr/bin/mailx
-   dosym mailx /usr/bin/mail
-   dosym mailx /usr/bin/Mail
-
-   dosym s-nail.1 /usr/share/man/man1/mailx.1
-   dosym mailx.1 /usr/share/man/man1/mail.1
-   dosym mailx.1 /usr/share/man/man1/Mail.1
-}



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

2022-11-29 Thread Brian Evans
commit: 5bf062704da2e42fc2dfde0416a89e4bf433168d
Author: Brian Evans  gentoo  org>
AuthorDate: Tue Nov 29 17:54:39 2022 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Tue Nov 29 17:55:44 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5bf06270

dev-lang/php: Version bump for 8.2.0 RC7

Signed-off-by: Brian Evans  gentoo.org>

 dev-lang/php/Manifest |   1 +
 dev-lang/php/php-8.2.0_rc7.ebuild | 759 ++
 2 files changed, 760 insertions(+)

diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index 5af53a2ada87..ed8610ecdc4d 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -4,3 +4,4 @@ DIST php-8.0.26.tar.xz 10868588 BLAKE2B 
423af3b7de23f59717aaf59c8c661ec8ab0fd7ac
 DIST php-8.1.12.tar.xz 11747176 BLAKE2B 
0505794826fb0fc92b04be5f7162af8aa92d782bb228243348d85b46866cd47089fcb7febd6886a8179babf64cb227bcdbf5d5f60d44dfefe1c947a3a708e3c1
 SHA512 
437b6a8146b58479f4d1acb7b35d68954f1f7bc13a8f3dddc66e1677d7e9b6a11154861f9e894cbd59b9c28d4df3fd5422f9b5553004e9fc8d0320ab59b9f907
 DIST php-8.1.13.tar.xz 11802424 BLAKE2B 
2d2d00fd1574deef1ef86f6813e1d2a1e20a8202ce80e5ce2e1359307135b47d6f1495ff7dfe23f52c2127226494856f215588fe21af3d519a8259e1e67ab819
 SHA512 
a8966798ed8e723a362952f9d381a59cbfd63d921466d68a5bc4527960f4fe1b48a1f188284c74b0723e93524787e4cf1c1322ecd6ec1c9be199fd67df0a0542
 DIST php-8.2.0RC5.tar.xz 12018772 BLAKE2B 
b06248998af682afd934f92a86dc94f53a8406f67817c3268319a48b250b96a4112b9a15c79de3b76f55960abf5e9de63fba7ebcf57c80f83073ec9f8defb31a
 SHA512 
7840cea3efef5de7be062c149335acd78daea27733a093b0fce8ace9781c4b8feb64936480cc5a1a5030ae88b658668c7ffc25a94b5e3c068877644e58fc
+DIST php-8.2.0RC7.tar.xz 12020100 BLAKE2B 
9418cff99330cb7efbbb0a4a04107b1dfe52ab4ada9e908d3f3418006a8a57341507a7c665003dd3d332a0d645b2fad5479314a7d7c92c89815fac4e91749231
 SHA512 
2b8f2f5fd82e8712d471792dc4f4155ed559ef8387918a32872116c9c7d5804f8b92e02a2b70813e07caed4d74d1b4fd5c5b3e44248b0b6c926e154bc0855c7f

diff --git a/dev-lang/php/php-8.2.0_rc7.ebuild 
b/dev-lang/php/php-8.2.0_rc7.ebuild
new file mode 100644
index ..07c1880a3098
--- /dev/null
+++ b/dev-lang/php/php-8.2.0_rc7.ebuild
@@ -0,0 +1,759 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+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;
+SRC_URI="https://downloads.php.net/~pierrick/php-${MY_PV}.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"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+# 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 +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 ) )
+   !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

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

2022-11-29 Thread Brian Evans
commit: 97c7a19509b4aff1423f4e50941f9c244f2b62f8
Author: Brian Evans  gentoo  org>
AuthorDate: Tue Nov 29 17:00:55 2022 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Tue Nov 29 17:55:44 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97c7a195

dev-lang/php: Version bump for 8.1.13

Signed-off-by: Brian Evans  gentoo.org>

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

diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index b559ae988930..5af53a2ada87 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -2,4 +2,5 @@ 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.26.tar.xz 10868588 BLAKE2B 
423af3b7de23f59717aaf59c8c661ec8ab0fd7acdf1e48282b1c730b2efc48f88b953452e77dbb9dbd4e1633ba68dd8adbc58c05642e787974f9783a075d042c
 SHA512 
2c285bd0d4516e188b8f9fe45db12bb0631c8298c97b3fcf99b7d56bed8c90920649d613c19821cbb38592211f5a3e7980679f2a59ad2d920da5b669251a99d5
 DIST php-8.1.12.tar.xz 11747176 BLAKE2B 
0505794826fb0fc92b04be5f7162af8aa92d782bb228243348d85b46866cd47089fcb7febd6886a8179babf64cb227bcdbf5d5f60d44dfefe1c947a3a708e3c1
 SHA512 
437b6a8146b58479f4d1acb7b35d68954f1f7bc13a8f3dddc66e1677d7e9b6a11154861f9e894cbd59b9c28d4df3fd5422f9b5553004e9fc8d0320ab59b9f907
+DIST php-8.1.13.tar.xz 11802424 BLAKE2B 
2d2d00fd1574deef1ef86f6813e1d2a1e20a8202ce80e5ce2e1359307135b47d6f1495ff7dfe23f52c2127226494856f215588fe21af3d519a8259e1e67ab819
 SHA512 
a8966798ed8e723a362952f9d381a59cbfd63d921466d68a5bc4527960f4fe1b48a1f188284c74b0723e93524787e4cf1c1322ecd6ec1c9be199fd67df0a0542
 DIST php-8.2.0RC5.tar.xz 12018772 BLAKE2B 
b06248998af682afd934f92a86dc94f53a8406f67817c3268319a48b250b96a4112b9a15c79de3b76f55960abf5e9de63fba7ebcf57c80f83073ec9f8defb31a
 SHA512 
7840cea3efef5de7be062c149335acd78daea27733a093b0fce8ace9781c4b8feb64936480cc5a1a5030ae88b658668c7ffc25a94b5e3c068877644e58fc

diff --git a/dev-lang/php/php-8.1.13.ebuild b/dev-lang/php/php-8.1.13.ebuild
new file mode 100644
index ..bdf85e055446
--- /dev/null
+++ b/dev-lang/php/php-8.1.13.ebuild
@@ -0,0 +1,757 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+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 ~loong ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+# We can build the following SAPIs in the given order
+SAPIS="embed cli cgi fpm apache2 phpdbg"
+
+# 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 ) )
+   !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?

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

2022-11-29 Thread Brian Evans
commit: fdc565bac5dcfff42591804ca0666556e8634320
Author: Brian Evans  gentoo  org>
AuthorDate: Tue Nov 29 16:05:00 2022 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Tue Nov 29 17:55:44 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fdc565ba

dev-lang/php: Version bump for 8.0.26

Signed-off-by: Brian Evans  gentoo.org>

 dev-lang/php/Manifest  |   1 +
 dev-lang/php/php-8.0.26.ebuild | 759 +
 2 files changed, 760 insertions(+)

diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index 27123a42c225..b559ae988930 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -1,4 +1,5 @@
 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.26.tar.xz 10868588 BLAKE2B 
423af3b7de23f59717aaf59c8c661ec8ab0fd7acdf1e48282b1c730b2efc48f88b953452e77dbb9dbd4e1633ba68dd8adbc58c05642e787974f9783a075d042c
 SHA512 
2c285bd0d4516e188b8f9fe45db12bb0631c8298c97b3fcf99b7d56bed8c90920649d613c19821cbb38592211f5a3e7980679f2a59ad2d920da5b669251a99d5
 DIST php-8.1.12.tar.xz 11747176 BLAKE2B 
0505794826fb0fc92b04be5f7162af8aa92d782bb228243348d85b46866cd47089fcb7febd6886a8179babf64cb227bcdbf5d5f60d44dfefe1c947a3a708e3c1
 SHA512 
437b6a8146b58479f4d1acb7b35d68954f1f7bc13a8f3dddc66e1677d7e9b6a11154861f9e894cbd59b9c28d4df3fd5422f9b5553004e9fc8d0320ab59b9f907
 DIST php-8.2.0RC5.tar.xz 12018772 BLAKE2B 
b06248998af682afd934f92a86dc94f53a8406f67817c3268319a48b250b96a4112b9a15c79de3b76f55960abf5e9de63fba7ebcf57c80f83073ec9f8defb31a
 SHA512 
7840cea3efef5de7be062c149335acd78daea27733a093b0fce8ace9781c4b8feb64936480cc5a1a5030ae88b658668c7ffc25a94b5e3c068877644e58fc

diff --git a/dev-lang/php/php-8.0.26.ebuild b/dev-lang/php/php-8.0.26.ebuild
new file mode 100644
index ..54100cfe9d3f
--- /dev/null
+++ b/dev-lang/php/php-8.0.26.ebuild
@@ -0,0 +1,759 @@
+# 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}"
+
+# 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 ) )
+   !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 

[gentoo-commits] repo/gentoo:master commit in: app-emulation/qemu/

2022-11-23 Thread Brian Evans
commit: 02154447b98eefc3da490904d229d5b6aff0619a
Author: Brian Evans  gentoo  org>
AuthorDate: Thu Nov 24 01:49:48 2022 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Thu Nov 24 01:49:48 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02154447

app-emulation/qemu: Drop caps and seccomp USE

Non-maintainer commit

This follows with the vhost-user-fs drop as it made these USE required.
Instead of having users get errors, just drop the USE and make
the deps and configure options always installed.

Bug: https://bugs.gentoo.org/873190
Signed-off-by: Brian Evans  gentoo.org>

 app-emulation/qemu/qemu-7.1.0-r2.ebuild | 20 
 app-emulation/qemu/qemu-7.2.0_rc1-r1.ebuild | 20 
 app-emulation/qemu/qemu-.ebuild | 20 
 3 files changed, 36 insertions(+), 24 deletions(-)

diff --git a/app-emulation/qemu/qemu-7.1.0-r2.ebuild 
b/app-emulation/qemu/qemu-7.1.0-r2.ebuild
index a71f1773c462..7937c736489c 100644
--- a/app-emulation/qemu/qemu-7.1.0-r2.ebuild
+++ b/app-emulation/qemu/qemu-7.1.0-r2.ebuild
@@ -52,12 +52,12 @@ SLOT="0"
 
 [[ ${QEMU_DOCS_PREBUILT} == 1 ]] && QEMU_DOC_USEFLAG="doc"
 
-IUSE="accessibility +aio alsa bpf bzip2 capstone +caps +curl debug 
${QEMU_DOC_USEFLAG}
+IUSE="accessibility +aio alsa bpf bzip2 capstone +curl debug 
${QEMU_DOC_USEFLAG}
+fdt fuse glusterfs +gnutls gtk infiniband iscsi io-uring
jack jemalloc +jpeg
lzo multipath
ncurses nfs nls numa opengl +oss pam +pin-upstream-blobs
-   plugins +png pulseaudio python rbd sasl +seccomp sdl sdl-image selinux
+   plugins +png pulseaudio python rbd sasl sdl sdl-image selinux
+slirp
smartcard snappy spice ssh static static-user systemtap test udev usb
usbredir vde +vhost-net virgl virtfs +vnc vte xattr xen
@@ -117,7 +117,7 @@ IUSE+=" ${use_softmmu_targets} ${use_user_targets}"
 RESTRICT="!test? ( test )"
 # Allow no targets to be built so that people can get a tools-only build.
 # Block USE flag configurations known to not work.
-REQUIRED_USE="caps seccomp
+REQUIRED_USE="
${PYTHON_REQUIRED_USE}
qemu_softmmu_targets_arm? ( fdt )
qemu_softmmu_targets_microblaze? ( fdt )
@@ -131,7 +131,7 @@ REQUIRED_USE="caps seccomp
static? ( static-user !alsa !gtk !jack !opengl !pam !pulseaudio 
!plugins !rbd !snappy !udev )
static-user? ( !plugins )
virgl? ( opengl )
-   virtfs? ( caps xattr )
+   virtfs? ( xattr )
vnc? ( gnutls )
vte? ( gtk )
multipath? ( udev )
@@ -156,6 +156,8 @@ ALL_DEPEND="
 # Dependencies required for qemu tools (qemu-nbd, qemu-img, qemu-io, ...)
 # softmmu targets (qemu-system-*).
 SOFTMMU_TOOLS_DEPEND="
+   sys-libs/libcap-ng[static-libs(+)]
+   >=sys-libs/libseccomp-2.1.0[static-libs(+)]
>=x11-libs/pixman-0.28.0[static-libs(+)]
accessibility? (
app-accessibility/brltty[api]
@@ -166,7 +168,6 @@ SOFTMMU_TOOLS_DEPEND="
bpf? ( dev-libs/libbpf:= )
bzip2? ( app-arch/bzip2[static-libs(+)] )
capstone? ( dev-libs/capstone:= )
-   caps? ( sys-libs/libcap-ng[static-libs(+)] )
curl? ( >=net-misc/curl-7.15.4[static-libs(+)] )
fdt? ( >=sys-apps/dtc-1.5.1[static-libs(+)] )
fuse? ( >=sys-fs/fuse-3.1:3[static-libs(+)] )
@@ -209,7 +210,6 @@ SOFTMMU_TOOLS_DEPEND="
media-libs/libsdl2[static-libs(+)]
)
sdl-image? ( media-libs/sdl2-image[static-libs(+)] )
-   seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] )
slirp? ( net-libs/libslirp[static-libs(+)] )
smartcard? ( >=app-emulation/libcacard-2.5.0[static-libs(+)] )
snappy? ( app-arch/snappy:= )
@@ -555,7 +555,6 @@ qemu_src_configure() {
$(conf_softmmu bpf)
$(conf_notuser bzip2)
$(conf_notuser capstone)
-   $(conf_notuser caps cap-ng)
$(conf_notuser curl)
$(conf_tools doc docs)
$(conf_notuser fdt)
@@ -582,7 +581,6 @@ qemu_src_configure() {
$(conf_notuser sasl vnc-sasl)
$(conf_notuser sdl)
$(conf_softmmu sdl-image)
-   $(conf_notuser seccomp)
$(conf_notuser slirp slirp system)
$(conf_notuser smartcard)
$(conf_notuser snappy)
@@ -627,6 +625,8 @@ qemu_src_configure() {
--disable-system
--disable-blobs
--disable-tools
+   --disable-cap-ng
+   --disable-seccomp
)
local static_flag="static-user"
;;
@@ -635,6 +635,8 @@ qemu_src_configure() {
--disable-linux-user
--e

[gentoo-commits] repo/gentoo:master commit in: profiles/

2022-11-21 Thread Brian Evans
commit: e991193fa370babc67f76552915256b5bd184640
Author: Brian Evans  gentoo  org>
AuthorDate: Mon Nov 21 17:19:32 2022 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Mon Nov 21 17:23:25 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e991193f

profiles: Add additional packages to the dev-php/agavi list

dev-php/PEAR-PEAR_PackageFileManager2 and
dev-php/PEAR-PEAR_PackageFileManager_Plugins are abandoned upstream, not used
and have issues with latest releases of PHP.

Bug: https://bugs.gentoo.org/737854
Signed-off-by: Brian Evans  gentoo.org>

 profiles/package.mask | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/profiles/package.mask b/profiles/package.mask
index 472326f9fd82..95a511b6dd1b 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -102,6 +102,8 @@ media-sound/umix
 dev-php/agavi
 dev-php/phing
 dev-php/PEAR-PEAR_PackageFileManager
+dev-php/PEAR-PEAR_PackageFileManager2
+dev-php/PEAR-PEAR_PackageFileManager_Plugins
 dev-php/PEAR-VersionControl_SVN
 dev-php/phpmd
 dev-php/simpletest



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

2022-11-19 Thread Brian Evans
commit: dd1a44d939cae653057dd20dbad8b3440d8c7e41
Author: Brian Evans  gentoo  org>
AuthorDate: Sun Nov 20 03:18:47 2022 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Sun Nov 20 03:18:47 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd1a44d9

dev-lang/php: Set max openssl version on 7.4 and 8.0 slots

Only affects build time and forced rebuild in place catches installed versions

Closes: https://bugs.gentoo.org/797676
Bug: https://github.com/php/php-src/issues/9503
Signed-off-by: Brian Evans  gentoo.org>

 dev-lang/php/php-7.4.33.ebuild | 2 +-
 dev-lang/php/php-8.0.25.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-lang/php/php-7.4.33.ebuild b/dev-lang/php/php-7.4.33.ebuild
index dee33f40a1fd..44eb6d5b3366 100644
--- a/dev-lang/php/php-7.4.33.ebuild
+++ b/dev-lang/php/php-7.4.33.ebuild
@@ -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= )
+   ssl? ( >=dev-libs/openssl-1.0.1:0= 

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

2022-11-18 Thread Brian Evans
commit: 782bbfabc6969db4a521238fa5e5bdc6c295e942
Author: Brian Evans  gentoo  org>
AuthorDate: Fri Nov 18 16:10:27 2022 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Fri Nov 18 16:10:27 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=782bbfab

dev-lang/php: Drop old versions

Bug: https://bugs.gentoo.org/877853
Signed-off-by: Brian Evans  gentoo.org>

 dev-lang/php/Manifest  |   3 -
 dev-lang/php/php-7.4.32.ebuild | 748 
 dev-lang/php/php-8.0.24.ebuild | 758 -
 dev-lang/php/php-8.1.11.ebuild | 756 
 4 files changed, 2265 deletions(-)

diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index a9b1eed71fc3..27123a42c225 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -1,7 +1,4 @@
-DIST php-7.4.32.tar.xz 10419092 BLAKE2B 
7657360e661274a34ab17e0e5a103e037d83876187b5413f020c246a91f02b00ac4f0cf34848729d0ccb86d8b9830e5a0ba8a85cc030ec9bd61ec7d4d1a07f5e
 SHA512 
052fbb6120b9943927685f736574871bc2b0c60d4ef18b54ec3f3d92398842286189fd426647c3c91eec38b11ce607090c4cd339040c92bda852574b96c36f67
 DIST php-7.4.33.tar.xz 10420144 BLAKE2B 
e75817e79c698628c873c90afb3b5677480d03ecf07e8f2e26a062bc5b91affc6079e792e864f28cf12d45f86e5d01ede289ecdcefc06477986d193d22c982ef
 SHA512 
499b63b99e5d8e8082ff89d3a91b4cb9a593ea7553b96e48863414c13d2e50275904ed29070e2232e529ee91160f505e6060a4d129cb5bf098aa5b6ea0928d3d
-DIST php-8.0.24.tar.xz 10895332 BLAKE2B 
efdf65b8d715ed9dd817437beac4949de54d3d96d2289bfcaac5cf7cfaa4015d8e507b7dc43f02760afb5f0be5a5b146abb19324e37a6331e18d5db8ca3cde9d
 SHA512 
f4922c03b613aae35005b6b39630c0de7c25929b7f4edd9c5062a747a747df065ae9b52c17c34433ecb801bc54fce2fa34ae46165deb527f0fe2c86e5da73400
 DIST php-8.0.25.tar.xz 10802888 BLAKE2B 
c1f283613c43551cccd52955deaae364781fffd4f73befa5e103211ed2b972272189973639d840ef1839b038e1872a6a28424939ea133f0bf86d82b56bb591fb
 SHA512 
43bb0637e424e2a637e05f3faf0ca2c5309f2d9cc03def9fc9af9b756003ea6efe730b608c70177c3c1b9cb03cef31c27cd6507cca9d9f0fd854aadb5e51aee3
-DIST php-8.1.11.tar.xz 11797016 BLAKE2B 
d9e3839931370cb833692b7829d98d29a3e942368ed656777303766cfb931ef94e10a44782f0232ef0610b8170c0ffb3fe3320fca0ec7081e4b5dfc19861495d
 SHA512 
2a9eb4642b4077077f6551ca9a40fd2c48272cc1ee443117362331259efbec88bad0141b09f7a9ff710cde044f9463e1e668f7066b2429ea4274dec7291725cc
 DIST php-8.1.12.tar.xz 11747176 BLAKE2B 
0505794826fb0fc92b04be5f7162af8aa92d782bb228243348d85b46866cd47089fcb7febd6886a8179babf64cb227bcdbf5d5f60d44dfefe1c947a3a708e3c1
 SHA512 
437b6a8146b58479f4d1acb7b35d68954f1f7bc13a8f3dddc66e1677d7e9b6a11154861f9e894cbd59b9c28d4df3fd5422f9b5553004e9fc8d0320ab59b9f907
 DIST php-8.2.0RC5.tar.xz 12018772 BLAKE2B 
b06248998af682afd934f92a86dc94f53a8406f67817c3268319a48b250b96a4112b9a15c79de3b76f55960abf5e9de63fba7ebcf57c80f83073ec9f8defb31a
 SHA512 
7840cea3efef5de7be062c149335acd78daea27733a093b0fce8ace9781c4b8feb64936480cc5a1a5030ae88b658668c7ffc25a94b5e3c068877644e58fc

diff --git a/dev-lang/php/php-7.4.32.ebuild b/dev-lang/php/php-7.4.32.ebuild
deleted file mode 100644
index f51948c4f530..
--- a/dev-lang/php/php-7.4.32.ebuild
+++ /dev/null
@@ -1,748 +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}"
-
-# 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 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 +json kerberos ldap ldap-sasl libedit lmdb
-   mhash mssql mysql mysqli nls
-   oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
-   readline selinux +session session-mm sharedmem
-   +simplexml snmp soap sockets sodium spell sqlite ssl
-   sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode webp
-   +xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib"
-
-# Without USE=readline or libedit, the int

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

2022-11-05 Thread Brian Evans
commit: 36a571a3c53b01f7299002c6cb64ce300116150c
Author: Brian Evans  gentoo  org>
AuthorDate: Sat Nov  5 22:42:42 2022 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Sat Nov  5 22:42:42 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36a571a3

dev-php/snuffleupagus: Drop old

Signed-off-by: Brian Evans  gentoo.org>

 dev-php/snuffleupagus/Manifest |  1 -
 .../snuffleupagus/snuffleupagus-0.7.1-r1.ebuild| 74 --
 2 files changed, 75 deletions(-)

diff --git a/dev-php/snuffleupagus/Manifest b/dev-php/snuffleupagus/Manifest
index ac8092978a6c..af5d6f90c9d0 100644
--- a/dev-php/snuffleupagus/Manifest
+++ b/dev-php/snuffleupagus/Manifest
@@ -1,2 +1 @@
-DIST snuffleupagus-0.7.1.tar.gz 11962220 BLAKE2B 
8504721ca08e727a5a6fa58c216a5dac7be3fe6e5a98cffcb17e44a2235628c26f02afd2159e9b1fbe8e40e26bc7c4e34a4ff027ee27b8ec29cf89865dbb8514
 SHA512 
21510e214f94dd50a4aa05226188c9433a6a261c0bd3d58973ed4536754b3e12356e3f625480c370b66c570482694c25d336a771fbbbeb27e1d524b1f82c7869
 DIST snuffleupagus-0.8.3.tar.gz 11987086 BLAKE2B 
989dbb57a8375cb394dfb41f07de5c048b66936a8e5b3dd14fb3609149dd371203f7a30d1fbcfe8ef6faa2ba5864c68b209b1b209541c348c0277c8bd12b568a
 SHA512 
426ab7509e31f712dbef1505bf60f00d3a31481de1fbb0b438e45fb45a50fbdc16204d6af18490c5522a41e62d83107f280a20ac2ffc2795da68407b0dac81d6

diff --git a/dev-php/snuffleupagus/snuffleupagus-0.7.1-r1.ebuild 
b/dev-php/snuffleupagus/snuffleupagus-0.7.1-r1.ebuild
deleted file mode 100644
index d18383730d41..
--- a/dev-php/snuffleupagus/snuffleupagus-0.7.1-r1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PHP_EXT_NAME="${PN}"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-PHP_EXT_ECONF_ARGS=( --enable-${PN} )
-PHP_EXT_S="${S}/src"
-
-USE_PHP="php7-4 php8-0"
-
-inherit php-ext-source-r3
-
-KEYWORDS="~amd64"
-
-DESCRIPTION="A PHP module to drastically raise the cost of attacks against 
websites"
-HOMEPAGE="https://snuffleupagus.readthedocs.io/index.html;
-SRC_URI="https://github.com/jvoisin/${PN}/archive/refs/tags/v${PV}.tar.gz -> 
${P}.tar.gz"
-
-LICENSE="LGPL-3 PHP-3.01"
-SLOT="0"
-
-src_prepare() {
-   # fix file locations tests look for
-   ln -s "${P}/config" "${WORKDIR}/config" || die
-   # Fix path dependent tests
-   sed -i -e 's~src/tests/~~' \
-   src/tests/session_encryption/crypt_session_read_uncrypt.phpt || 
die
-   sed -i -e 's~%a/src~%a~' \
-   src/tests/disable_function/disabled_functions_runtime.phpt || 
die
-   php-ext-source-r3_src_prepare
-}
-
-src_install() {
-   addtoinifile() {
-   local inifile="${WORKDIR}/${1}"
-   local inidir="${inifile%/*}"
-
-   mkdir -p "${inidir}" || die "failed to create INI directory 
${inidir}"
-
-   local my_added="${2}=${3}"
-   echo "${my_added}" >> "${inifile}" || die "failed to append to 
${inifile}"
-   einfo "Added '${my_added}' to /${1}"
-
-   insinto "/${1%/*}"
-   doins "${inifile}"
-   }
-   einstalldocs
-   local slot x cfgdir
-   php-ext-source-r3_src_install
-   # Add the rules file which vary by install version
-   for slot in $(php_get_slots); do
-   php_init_slot_env "${slot}"
-   for x in ${PHP_EXT_SAPIS} ; do
-   cfgdir="/etc/php/${x}-${slot}"
-   if [[ -f "${ED}${cfgdir}/ext/${PHP_INI_NAME}.ini" ]]; 
then
-   addtoinifile 
"${cfgdir#/}/ext/${PHP_INI_NAME}.ini" \
-   "sp.configuration_file" 
"${cfgdir}/${PN}.rules"
-   insinto "${cfgdir}"
-   case ${PHP_CURRENTSLOT:0:1} in
-   8) newins 
"${S}/config/default_php8.rules" "${PN}.rules" ;;
-   *) newins "${S}/config/default.rules" 
"${PN}.rules" ;;
-   esac
-   fi
-   done
-   done
-}
-
-pkg_postinst() {
-   elog "This extension is configured with recommended rules enabled by 
default."
-   elog "Feel free to customize as necessary.  Please test outside of 
production first."
-   elog "Failure to test may cause unexpected results to loosely coded 
sites."
-}



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

2022-11-05 Thread Brian Evans
commit: 9d9355aa3fee7424f1c2a2ae1c1c3446efbbe2fc
Author: Brian Evans  gentoo  org>
AuthorDate: Sat Nov  5 22:40:39 2022 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Sat Nov  5 22:40:39 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d9355aa

dev-php/snuffleupagus: Version bump for 0.8.3

Includes fixes for dependencies as well

Closes: https://bugs.gentoo.org/879899
Signed-off-by: Brian Evans  gentoo.org>

 dev-php/snuffleupagus/Manifest   |  1 +
 dev-php/snuffleupagus/snuffleupagus-0.8.3.ebuild | 78 
 2 files changed, 79 insertions(+)

diff --git a/dev-php/snuffleupagus/Manifest b/dev-php/snuffleupagus/Manifest
index 893d570b5b49..ac8092978a6c 100644
--- a/dev-php/snuffleupagus/Manifest
+++ b/dev-php/snuffleupagus/Manifest
@@ -1 +1,2 @@
 DIST snuffleupagus-0.7.1.tar.gz 11962220 BLAKE2B 
8504721ca08e727a5a6fa58c216a5dac7be3fe6e5a98cffcb17e44a2235628c26f02afd2159e9b1fbe8e40e26bc7c4e34a4ff027ee27b8ec29cf89865dbb8514
 SHA512 
21510e214f94dd50a4aa05226188c9433a6a261c0bd3d58973ed4536754b3e12356e3f625480c370b66c570482694c25d336a771fbbbeb27e1d524b1f82c7869
+DIST snuffleupagus-0.8.3.tar.gz 11987086 BLAKE2B 
989dbb57a8375cb394dfb41f07de5c048b66936a8e5b3dd14fb3609149dd371203f7a30d1fbcfe8ef6faa2ba5864c68b209b1b209541c348c0277c8bd12b568a
 SHA512 
426ab7509e31f712dbef1505bf60f00d3a31481de1fbb0b438e45fb45a50fbdc16204d6af18490c5522a41e62d83107f280a20ac2ffc2795da68407b0dac81d6

diff --git a/dev-php/snuffleupagus/snuffleupagus-0.8.3.ebuild 
b/dev-php/snuffleupagus/snuffleupagus-0.8.3.ebuild
new file mode 100644
index ..00e1998355c4
--- /dev/null
+++ b/dev-php/snuffleupagus/snuffleupagus-0.8.3.ebuild
@@ -0,0 +1,78 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PHP_EXT_NAME="${PN}"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+PHP_EXT_ECONF_ARGS=( --enable-${PN} )
+PHP_EXT_S="${S}/src"
+PHP_EXT_NEEDED_USE="session(+)"
+
+USE_PHP="php7-4 php8-0 php8-1"
+
+inherit php-ext-source-r3
+
+KEYWORDS="~amd64"
+
+DESCRIPTION="A PHP module to drastically raise the cost of attacks against 
websites"
+HOMEPAGE="https://snuffleupagus.readthedocs.io/index.html;
+SRC_URI="https://github.com/jvoisin/${PN}/archive/refs/tags/v${PV}.tar.gz -> 
${P}.tar.gz"
+
+LICENSE="LGPL-3 PHP-3.01"
+SLOT="0"
+
+src_prepare() {
+   # fix file locations tests look for
+   ln -s "${P}/config" "${WORKDIR}/config" || die
+   # Fix path dependent tests
+   sed -i -e 's~src/tests/~~' \
+   src/tests/session_encryption/crypt_session_read_uncrypt.phpt || 
die
+   sed -i -e 's~%a/src~%a~' \
+   src/tests/disable_function/disabled_functions_runtime.phpt || 
die
+   # Fix bad test reference
+   sed -i -e 's~%src/~%s~' \
+   src/tests/deny_writable/deny_writable_execution_simulation.phpt 
|| die
+   php-ext-source-r3_src_prepare
+}
+
+src_install() {
+   addtoinifile() {
+   local inifile="${WORKDIR}/${1}"
+   local inidir="${inifile%/*}"
+
+   mkdir -p "${inidir}" || die "failed to create INI directory 
${inidir}"
+
+   local my_added="${2}=${3}"
+   echo "${my_added}" >> "${inifile}" || die "failed to append to 
${inifile}"
+   einfo "Added '${my_added}' to /${1}"
+
+   insinto "/${1%/*}"
+   doins "${inifile}"
+   }
+   einstalldocs
+   local slot x cfgdir
+   php-ext-source-r3_src_install
+   # Add the rules file which vary by install version
+   for slot in $(php_get_slots); do
+   php_init_slot_env "${slot}"
+   for x in ${PHP_EXT_SAPIS} ; do
+   cfgdir="/etc/php/${x}-${slot}"
+   if [[ -f "${ED}${cfgdir}/ext/${PHP_INI_NAME}.ini" ]]; 
then
+   addtoinifile 
"${cfgdir#/}/ext/${PHP_INI_NAME}.ini" \
+   "sp.configuration_file" 
"${cfgdir}/${PN}.rules"
+   insinto "${cfgdir}"
+   case ${PHP_CURRENTSLOT:0:1} in
+   8) newins 
"${S}/config/default_php8.rules" "${PN}.rules" ;;
+   *) newins "${S}/config/default.rules" 
"${PN}.rules" ;;
+   esac
+   fi
+   done
+   done
+}
+
+pkg_postinst() {
+   elog "This extension is configured with recommended rules enabled by 
default."
+   elog "Feel free to customize as necessary.  Please test outside of 
production first."
+   elog "Failure to test may cause unexpected results to loosely coded 
sites."
+}



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

2022-11-03 Thread Brian Evans
commit: d9788a266bffae184d77b33abfb39cd38003be75
Author: Brian Evans  gentoo  org>
AuthorDate: Thu Nov  3 13:01:49 2022 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Thu Nov  3 13:02:14 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9788a26

dev-lang/php: Version bump for 7.4.33

Bug: https://bugs.gentoo.org/877853
Signed-off-by: Brian Evans  gentoo.org>

 dev-lang/php/Manifest  |   1 +
 dev-lang/php/php-7.4.33.ebuild | 749 +
 2 files changed, 750 insertions(+)

diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index 4f94a4299e92..a9b1eed71fc3 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -1,4 +1,5 @@
 DIST php-7.4.32.tar.xz 10419092 BLAKE2B 
7657360e661274a34ab17e0e5a103e037d83876187b5413f020c246a91f02b00ac4f0cf34848729d0ccb86d8b9830e5a0ba8a85cc030ec9bd61ec7d4d1a07f5e
 SHA512 
052fbb6120b9943927685f736574871bc2b0c60d4ef18b54ec3f3d92398842286189fd426647c3c91eec38b11ce607090c4cd339040c92bda852574b96c36f67
+DIST php-7.4.33.tar.xz 10420144 BLAKE2B 
e75817e79c698628c873c90afb3b5677480d03ecf07e8f2e26a062bc5b91affc6079e792e864f28cf12d45f86e5d01ede289ecdcefc06477986d193d22c982ef
 SHA512 
499b63b99e5d8e8082ff89d3a91b4cb9a593ea7553b96e48863414c13d2e50275904ed29070e2232e529ee91160f505e6060a4d129cb5bf098aa5b6ea0928d3d
 DIST php-8.0.24.tar.xz 10895332 BLAKE2B 
efdf65b8d715ed9dd817437beac4949de54d3d96d2289bfcaac5cf7cfaa4015d8e507b7dc43f02760afb5f0be5a5b146abb19324e37a6331e18d5db8ca3cde9d
 SHA512 
f4922c03b613aae35005b6b39630c0de7c25929b7f4edd9c5062a747a747df065ae9b52c17c34433ecb801bc54fce2fa34ae46165deb527f0fe2c86e5da73400
 DIST php-8.0.25.tar.xz 10802888 BLAKE2B 
c1f283613c43551cccd52955deaae364781fffd4f73befa5e103211ed2b972272189973639d840ef1839b038e1872a6a28424939ea133f0bf86d82b56bb591fb
 SHA512 
43bb0637e424e2a637e05f3faf0ca2c5309f2d9cc03def9fc9af9b756003ea6efe730b608c70177c3c1b9cb03cef31c27cd6507cca9d9f0fd854aadb5e51aee3
 DIST php-8.1.11.tar.xz 11797016 BLAKE2B 
d9e3839931370cb833692b7829d98d29a3e942368ed656777303766cfb931ef94e10a44782f0232ef0610b8170c0ffb3fe3320fca0ec7081e4b5dfc19861495d
 SHA512 
2a9eb4642b4077077f6551ca9a40fd2c48272cc1ee443117362331259efbec88bad0141b09f7a9ff710cde044f9463e1e668f7066b2429ea4274dec7291725cc

diff --git a/dev-lang/php/php-7.4.33.ebuild b/dev-lang/php/php-7.4.33.ebuild
new file mode 100644
index ..609c605be729
--- /dev/null
+++ b/dev-lang/php/php-7.4.33.ebuild
@@ -0,0 +1,749 @@
+# 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}"
+
+# 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 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 +json kerberos ldap ldap-sasl libedit lmdb
+   mhash mssql mysql mysqli nls
+   oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
+   readline selinux +session session-mm sharedmem
+   +simplexml snmp soap sockets sodium spell sqlite ssl
+   sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode webp
+   +xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib"
+
+# Without USE=readline or libedit, the interactive "php -a" CLI will hang.
+# The Oracle instant client provides its own incompatible ldap library.
+REQUIRED_USE="
+   || ( cli cgi fpm apache2 embed phpdbg )
+   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 )
+   xmlrpc? ( xml iconv )
+   xmlreader? ( xml )
+   xmlwriter? ( xml )
+   xslt? ( xml )
+   ldap-sasl? ( ldap )
+   oci8-instant-client? ( !ldap )
+   qdbm? ( !gdbm )
+   session-mm? ( session !threads )
+   mysql? ( || ( mysqli pdo ) )
+   firebird?

[gentoo-commits] repo/gentoo:master commit in: mail-client/s-nail/

2022-11-02 Thread Brian Evans
commit: 287f4227bfb24c2757206a124d4fa1e96fa3673b
Author: Brian Evans  gentoo  org>
AuthorDate: Wed Nov  2 19:22:15 2022 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Wed Nov  2 19:22:15 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=287f4227

mail-client/s-nail: Revert test setting from previous commit

Signed-off-by: Brian Evans  gentoo.org>

 mail-client/s-nail/s-nail-14.9.24.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-client/s-nail/s-nail-14.9.24.ebuild 
b/mail-client/s-nail/s-nail-14.9.24.ebuild
index 919009f5d74b..78877855757c 100644
--- a/mail-client/s-nail/s-nail-14.9.24.ebuild
+++ b/mail-client/s-nail/s-nail-14.9.24.ebuild
@@ -62,7 +62,7 @@ src_configure() {
 }
 
 src_compile() {
-   TMPDIR=/tmp emake build
+   emake build
 }
 
 src_install() {



[gentoo-commits] repo/gentoo:master commit in: mail-client/s-nail/

2022-11-02 Thread Brian Evans
commit: be85a7b83178e93eab93f2d415d581da0c43426a
Author: Brian Evans  gentoo  org>
AuthorDate: Wed Nov  2 19:16:34 2022 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Wed Nov  2 19:16:34 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be85a7b8

mail-client/s-nail: Fix building with sys-devel/make-4.4

The config target saves MAKEFLAGS to a file and this is referenced incorrectly
later.  make 4.4 could then look for a jobserver file that no longer exists
if -j > 1.

Run make directly instead of emake to avoid pollution in config.

Closes: https://bugs.gentoo.org/879065
Signed-off-by: Brian Evans  gentoo.org>

 mail-client/s-nail/s-nail-14.9.22.ebuild | 3 ++-
 mail-client/s-nail/s-nail-14.9.24.ebuild | 5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/mail-client/s-nail/s-nail-14.9.22.ebuild 
b/mail-client/s-nail/s-nail-14.9.22.ebuild
index dd455d2c17f5..822c7e20fc58 100644
--- a/mail-client/s-nail/s-nail-14.9.22.ebuild
+++ b/mail-client/s-nail/s-nail-14.9.22.ebuild
@@ -57,7 +57,8 @@ src_configure() {
 
tc-is-cross-compiler && confopts+=( OPT_CROSS_BUILD=yes )
 
-   emake "${confopts[@]}" config
+   # Cannot use emake or bad options saved Bug 879065
+   make "${confopts[@]}" config || die
 }
 
 src_compile() {

diff --git a/mail-client/s-nail/s-nail-14.9.24.ebuild 
b/mail-client/s-nail/s-nail-14.9.24.ebuild
index 04362d1fe000..919009f5d74b 100644
--- a/mail-client/s-nail/s-nail-14.9.24.ebuild
+++ b/mail-client/s-nail/s-nail-14.9.24.ebuild
@@ -57,11 +57,12 @@ src_configure() {
 
tc-is-cross-compiler && confopts+=( OPT_CROSS_BUILD=yes )
 
-   emake "${confopts[@]}" config
+   # Cannot use emake or bad options saved Bug 879065
+   make "${confopts[@]}" config || die
 }
 
 src_compile() {
-   emake build
+   TMPDIR=/tmp emake build
 }
 
 src_install() {



[gentoo-commits] repo/gentoo:master commit in: virtual/httpd-php/

2022-10-28 Thread Brian Evans
commit: 8fc5969c3edb004d496ba79505cf1918b28038d5
Author: Brian Evans  gentoo  org>
AuthorDate: Fri Oct 28 19:35:24 2022 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Fri Oct 28 19:35:24 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8fc5969c

virtual/httpd-php: Extend keyword for ~loong

Signed-off-by: Brian Evans  gentoo.org>

 virtual/httpd-php/httpd-php-8.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/virtual/httpd-php/httpd-php-8.2.ebuild 
b/virtual/httpd-php/httpd-php-8.2.ebuild
index dab8a6159b46..679236a80223 100644
--- a/virtual/httpd-php/httpd-php-8.2.ebuild
+++ b/virtual/httpd-php/httpd-php-8.2.ebuild
@@ -5,7 +5,7 @@ EAPI="8"
 
 DESCRIPTION="Virtual to provide PHP-enabled webservers"
 SLOT="${PV}"
-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 ~loong ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 RDEPEND="|| ( dev-lang/php:${SLOT}[fpm]
  dev-lang/php:${SLOT}[apache2]



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

2022-10-28 Thread Brian Evans
commit: cc6da9230435494f3f96907f94c82b967328aee8
Author: Brian Evans  gentoo  org>
AuthorDate: Fri Oct 28 19:21:59 2022 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Fri Oct 28 19:21:59 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc6da923

dev-lang/php: Version bump for latest 8.2.0 RC

Always enable ipv6 and disable valgrind as well

Signed-off-by: Brian Evans  gentoo.org>

 dev-lang/php/Manifest   | 2 +-
 dev-lang/php/{php-8.2.0_rc3.ebuild => php-8.2.0_rc5.ebuild} | 9 +
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index ece20c5c96dc..4f94a4299e92 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -3,4 +3,4 @@ DIST php-8.0.24.tar.xz 10895332 BLAKE2B 
efdf65b8d715ed9dd817437beac4949de54d3d96
 DIST php-8.0.25.tar.xz 10802888 BLAKE2B 
c1f283613c43551cccd52955deaae364781fffd4f73befa5e103211ed2b972272189973639d840ef1839b038e1872a6a28424939ea133f0bf86d82b56bb591fb
 SHA512 
43bb0637e424e2a637e05f3faf0ca2c5309f2d9cc03def9fc9af9b756003ea6efe730b608c70177c3c1b9cb03cef31c27cd6507cca9d9f0fd854aadb5e51aee3
 DIST php-8.1.11.tar.xz 11797016 BLAKE2B 
d9e3839931370cb833692b7829d98d29a3e942368ed656777303766cfb931ef94e10a44782f0232ef0610b8170c0ffb3fe3320fca0ec7081e4b5dfc19861495d
 SHA512 
2a9eb4642b4077077f6551ca9a40fd2c48272cc1ee443117362331259efbec88bad0141b09f7a9ff710cde044f9463e1e668f7066b2429ea4274dec7291725cc
 DIST php-8.1.12.tar.xz 11747176 BLAKE2B 
0505794826fb0fc92b04be5f7162af8aa92d782bb228243348d85b46866cd47089fcb7febd6886a8179babf64cb227bcdbf5d5f60d44dfefe1c947a3a708e3c1
 SHA512 
437b6a8146b58479f4d1acb7b35d68954f1f7bc13a8f3dddc66e1677d7e9b6a11154861f9e894cbd59b9c28d4df3fd5422f9b5553004e9fc8d0320ab59b9f907
-DIST php-8.2.0RC3.tar.xz 12013188 BLAKE2B 
4d3caf32858d8a42ee229d793ea2b9238ec56ccd8dea2cead3eb5fd1660391968a399e6178d8d2da9a2c5a749055fdc97848bb629fc3ffbda4d640d91bf84e11
 SHA512 
f0efde3cc30563d1e30a72f368b1dca483d8fe7ebd65c54ee86212d9476f260aed993bd62a2685f50c53a599174b91cb2f0d10f1e83fc68b4403f715a7045f35
+DIST php-8.2.0RC5.tar.xz 12018772 BLAKE2B 
b06248998af682afd934f92a86dc94f53a8406f67817c3268319a48b250b96a4112b9a15c79de3b76f55960abf5e9de63fba7ebcf57c80f83073ec9f8defb31a
 SHA512 
7840cea3efef5de7be062c149335acd78daea27733a093b0fce8ace9781c4b8feb64936480cc5a1a5030ae88b658668c7ffc25a94b5e3c068877644e58fc

diff --git a/dev-lang/php/php-8.2.0_rc3.ebuild 
b/dev-lang/php/php-8.2.0_rc5.ebuild
similarity index 98%
rename from dev-lang/php/php-8.2.0_rc3.ebuild
rename to dev-lang/php/php-8.2.0_rc5.ebuild
index 84430f30f486..07c1880a3098 100644
--- a/dev-lang/php/php-8.2.0_rc3.ebuild
+++ b/dev-lang/php/php-8.2.0_rc5.ebuild
@@ -22,7 +22,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 ~loong ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 S="${WORKDIR}/${PN}-${MY_PV}"
 
@@ -38,7 +38,7 @@ 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
+   intl iodbc +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
@@ -95,7 +95,7 @@ COMMON_DEPEND="
gdbm? ( >=sys-libs/gdbm-1.8.0:0= )
gmp? ( dev-libs/gmp:0= )
iconv? ( virtual/libiconv )
-   imap? ( >=virtual/imap-c-client-2[kerberos=,ssl=] )
+   imap? ( net-libs/c-client[kerberos=,ssl=] )
intl? ( dev-libs/icu:= )
kerberos? ( virtual/krb5 )
ldap? ( >=net-nds/openldap-1.2.11:= )
@@ -255,6 +255,8 @@ src_configure() {
--with-libdir="$(get_libdir)"
--localstatedir="${EPREFIX}/var"
--without-pear
+   --without-valgrind
+   --enable-ipv6
$(use_enable threads zts)
)
 
@@ -280,7 +282,6 @@ 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/

2022-10-28 Thread Brian Evans
commit: 7f2e081926e4380728f98037cda3e3b7aaf4410f
Author: Brian Evans  gentoo  org>
AuthorDate: Fri Oct 28 17:47:34 2022 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Fri Oct 28 18:22:16 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f2e0819

dev-lang/php: Version bump for 8.0.25

Bug: https://bugs.gentoo.org/877853
Bug: https://bugs.gentoo.org/878133
Signed-off-by: Brian Evans  gentoo.org>

 dev-lang/php/Manifest  |   1 +
 dev-lang/php/php-8.0.25.ebuild | 759 +
 2 files changed, 760 insertions(+)

diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index 10b116543689..2a708dbd13ff 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -1,4 +1,5 @@
 DIST php-7.4.32.tar.xz 10419092 BLAKE2B 
7657360e661274a34ab17e0e5a103e037d83876187b5413f020c246a91f02b00ac4f0cf34848729d0ccb86d8b9830e5a0ba8a85cc030ec9bd61ec7d4d1a07f5e
 SHA512 
052fbb6120b9943927685f736574871bc2b0c60d4ef18b54ec3f3d92398842286189fd426647c3c91eec38b11ce607090c4cd339040c92bda852574b96c36f67
 DIST php-8.0.24.tar.xz 10895332 BLAKE2B 
efdf65b8d715ed9dd817437beac4949de54d3d96d2289bfcaac5cf7cfaa4015d8e507b7dc43f02760afb5f0be5a5b146abb19324e37a6331e18d5db8ca3cde9d
 SHA512 
f4922c03b613aae35005b6b39630c0de7c25929b7f4edd9c5062a747a747df065ae9b52c17c34433ecb801bc54fce2fa34ae46165deb527f0fe2c86e5da73400
+DIST php-8.0.25.tar.xz 10802888 BLAKE2B 
c1f283613c43551cccd52955deaae364781fffd4f73befa5e103211ed2b972272189973639d840ef1839b038e1872a6a28424939ea133f0bf86d82b56bb591fb
 SHA512 
43bb0637e424e2a637e05f3faf0ca2c5309f2d9cc03def9fc9af9b756003ea6efe730b608c70177c3c1b9cb03cef31c27cd6507cca9d9f0fd854aadb5e51aee3
 DIST php-8.1.11.tar.xz 11797016 BLAKE2B 
d9e3839931370cb833692b7829d98d29a3e942368ed656777303766cfb931ef94e10a44782f0232ef0610b8170c0ffb3fe3320fca0ec7081e4b5dfc19861495d
 SHA512 
2a9eb4642b4077077f6551ca9a40fd2c48272cc1ee443117362331259efbec88bad0141b09f7a9ff710cde044f9463e1e668f7066b2429ea4274dec7291725cc
 DIST php-8.2.0RC3.tar.xz 12013188 BLAKE2B 
4d3caf32858d8a42ee229d793ea2b9238ec56ccd8dea2cead3eb5fd1660391968a399e6178d8d2da9a2c5a749055fdc97848bb629fc3ffbda4d640d91bf84e11
 SHA512 
f0efde3cc30563d1e30a72f368b1dca483d8fe7ebd65c54ee86212d9476f260aed993bd62a2685f50c53a599174b91cb2f0d10f1e83fc68b4403f715a7045f35

diff --git a/dev-lang/php/php-8.0.25.ebuild b/dev-lang/php/php-8.0.25.ebuild
new file mode 100644
index ..6ab4042b4d70
--- /dev/null
+++ b/dev-lang/php/php-8.0.25.ebuild
@@ -0,0 +1,759 @@
+# 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}"
+
+# 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 ) )
+   !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?

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

2022-10-28 Thread Brian Evans
commit: 933e9dbff1dade86d2492c6a6f18dbc69f70caed
Author: Brian Evans  gentoo  org>
AuthorDate: Fri Oct 28 18:20:34 2022 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Fri Oct 28 18:22:16 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=933e9dbf

dev-lang/php: Version bump for 8.1.12

Bug: https://bugs.gentoo.org/877853
Bug: https://bugs.gentoo.org/878133
Signed-off-by: Brian Evans  gentoo.org>

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

diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index 2a708dbd13ff..ece20c5c96dc 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -2,4 +2,5 @@ DIST php-7.4.32.tar.xz 10419092 BLAKE2B 
7657360e661274a34ab17e0e5a103e037d838761
 DIST php-8.0.24.tar.xz 10895332 BLAKE2B 
efdf65b8d715ed9dd817437beac4949de54d3d96d2289bfcaac5cf7cfaa4015d8e507b7dc43f02760afb5f0be5a5b146abb19324e37a6331e18d5db8ca3cde9d
 SHA512 
f4922c03b613aae35005b6b39630c0de7c25929b7f4edd9c5062a747a747df065ae9b52c17c34433ecb801bc54fce2fa34ae46165deb527f0fe2c86e5da73400
 DIST php-8.0.25.tar.xz 10802888 BLAKE2B 
c1f283613c43551cccd52955deaae364781fffd4f73befa5e103211ed2b972272189973639d840ef1839b038e1872a6a28424939ea133f0bf86d82b56bb591fb
 SHA512 
43bb0637e424e2a637e05f3faf0ca2c5309f2d9cc03def9fc9af9b756003ea6efe730b608c70177c3c1b9cb03cef31c27cd6507cca9d9f0fd854aadb5e51aee3
 DIST php-8.1.11.tar.xz 11797016 BLAKE2B 
d9e3839931370cb833692b7829d98d29a3e942368ed656777303766cfb931ef94e10a44782f0232ef0610b8170c0ffb3fe3320fca0ec7081e4b5dfc19861495d
 SHA512 
2a9eb4642b4077077f6551ca9a40fd2c48272cc1ee443117362331259efbec88bad0141b09f7a9ff710cde044f9463e1e668f7066b2429ea4274dec7291725cc
+DIST php-8.1.12.tar.xz 11747176 BLAKE2B 
0505794826fb0fc92b04be5f7162af8aa92d782bb228243348d85b46866cd47089fcb7febd6886a8179babf64cb227bcdbf5d5f60d44dfefe1c947a3a708e3c1
 SHA512 
437b6a8146b58479f4d1acb7b35d68954f1f7bc13a8f3dddc66e1677d7e9b6a11154861f9e894cbd59b9c28d4df3fd5422f9b5553004e9fc8d0320ab59b9f907
 DIST php-8.2.0RC3.tar.xz 12013188 BLAKE2B 
4d3caf32858d8a42ee229d793ea2b9238ec56ccd8dea2cead3eb5fd1660391968a399e6178d8d2da9a2c5a749055fdc97848bb629fc3ffbda4d640d91bf84e11
 SHA512 
f0efde3cc30563d1e30a72f368b1dca483d8fe7ebd65c54ee86212d9476f260aed993bd62a2685f50c53a599174b91cb2f0d10f1e83fc68b4403f715a7045f35

diff --git a/dev-lang/php/php-8.1.12.ebuild b/dev-lang/php/php-8.1.12.ebuild
new file mode 100644
index ..bdf85e055446
--- /dev/null
+++ b/dev-lang/php/php-8.1.12.ebuild
@@ -0,0 +1,757 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+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 ~loong ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+# We can build the following SAPIs in the given order
+SAPIS="embed cli cgi fpm apache2 phpdbg"
+
+# 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 ) )
+   !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? ( 

[gentoo-commits] repo/gentoo:master commit in: sys-apps/ack/

2022-10-19 Thread Brian Evans
commit: fa8aa4a07d091e602457533f50ac01729e10cf24
Author: Brian Evans  gentoo  org>
AuthorDate: Wed Oct 19 17:40:53 2022 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Wed Oct 19 17:40:53 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa8aa4a0

sys-apps/ack: Version bump for 3.6.0

Signed-off-by: Brian Evans  gentoo.org>

 sys-apps/ack/Manifest |  1 +
 sys-apps/ack/ack-3.6.0.ebuild | 29 +
 2 files changed, 30 insertions(+)

diff --git a/sys-apps/ack/Manifest b/sys-apps/ack/Manifest
index 9380f8c02104..21e34a025cfc 100644
--- a/sys-apps/ack/Manifest
+++ b/sys-apps/ack/Manifest
@@ -1,2 +1,3 @@
 DIST ack-v3.4.0.tar.gz 251106 BLAKE2B 
192d1e851ef5bd3547e21fe49cf276180eb278af783209046c02e4a1ae1471c7b24aaf6825223aad96dedea9fd266576a2021dcb808b0e229312e8237e2f7afd
 SHA512 
cc8de5a784f63a8f48b9548e930972578866d0fcc520febc6002d1ce4f9b55aabb0c8e87860586a668d94b5091c66194c05a07c584fe30fad2c5d786aee95db5
 DIST ack-v3.5.0.tar.gz 249718 BLAKE2B 
dedd11b424f7274c45dabfd0ddf2c92ee9d15ccf40d251c79159aef6e93071c963291722a2024db1d4828ae02c1310d3fec366ca8bd5f249da2c0c73f7e303cb
 SHA512 
f5b9321fc62cf2ab86fa7dc933dd44245314ebd26bee2d8769f85c15fc8b4493d0757ca4430708f0ebea5692f9c73ad17cc00bc46d1f611b8489b30811df307d
+DIST ack-v3.6.0.tar.gz 251556 BLAKE2B 
6e65633ea9b8b24b03d3ff60c0554eb05009ebbaacbeede8109bdfd36340ac6151f3be9b461349793d6a222d4fb9b21579d44cff3aa541b7bdbc94d16269d2d1
 SHA512 
1cef0d873be47c8e27d5c3b3b47ea965cf39755d1556c3f653c28d75e1cea9b1ff183297c897d919e220cfcb556e3d5b88eb0b5343d933a05fa2c1fff1234173

diff --git a/sys-apps/ack/ack-3.6.0.ebuild b/sys-apps/ack/ack-3.6.0.ebuild
new file mode 100644
index ..316b7d2e3340
--- /dev/null
+++ b/sys-apps/ack/ack-3.6.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+DIST_AUTHOR=PETDANCE
+DIST_VERSION="v${PV}"
+inherit perl-module
+
+DESCRIPTION="ack is a tool like grep, optimized for programmers"
+HOMEPAGE="https://beyondgrep.com;
+
+LICENSE="Artistic-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~riscv ~x86 ~amd64-linux ~x86-linux 
~x64-macos"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND=">=dev-perl/File-Next-1.180.0"
+DEPEND="${RDEPEND}
+   test? ( dev-perl/IO-Tty )"
+
+PATCHES=( "${FILESDIR}"/${PN}-3.3.0-gentoo.patch )
+
+src_test() {
+   # Tests fail when run in parallel and if dev-perl/IO-Tty is installed
+   # which enables interactive tests that need to read from stdin. If 
IO-Tty
+   # is not installed the related tests are skipped.
+   MAKEOPTS+=" -j1" perl-module_src_test
+}



[gentoo-commits] repo/gentoo:master commit in: sys-apps/ack/

2022-10-19 Thread Brian Evans
commit: 54c05f350dbfcfad8886a81ef153fd93366c1b92
Author: Brian Evans  gentoo  org>
AuthorDate: Wed Oct 19 17:42:39 2022 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Wed Oct 19 17:42:39 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54c05f35

sys-apps/ack: Drop old

Signed-off-by: Brian Evans  gentoo.org>

 sys-apps/ack/Manifest |  1 -
 sys-apps/ack/ack-3.4.0.ebuild | 29 -
 2 files changed, 30 deletions(-)

diff --git a/sys-apps/ack/Manifest b/sys-apps/ack/Manifest
index 21e34a025cfc..c7a55f8018af 100644
--- a/sys-apps/ack/Manifest
+++ b/sys-apps/ack/Manifest
@@ -1,3 +1,2 @@
-DIST ack-v3.4.0.tar.gz 251106 BLAKE2B 
192d1e851ef5bd3547e21fe49cf276180eb278af783209046c02e4a1ae1471c7b24aaf6825223aad96dedea9fd266576a2021dcb808b0e229312e8237e2f7afd
 SHA512 
cc8de5a784f63a8f48b9548e930972578866d0fcc520febc6002d1ce4f9b55aabb0c8e87860586a668d94b5091c66194c05a07c584fe30fad2c5d786aee95db5
 DIST ack-v3.5.0.tar.gz 249718 BLAKE2B 
dedd11b424f7274c45dabfd0ddf2c92ee9d15ccf40d251c79159aef6e93071c963291722a2024db1d4828ae02c1310d3fec366ca8bd5f249da2c0c73f7e303cb
 SHA512 
f5b9321fc62cf2ab86fa7dc933dd44245314ebd26bee2d8769f85c15fc8b4493d0757ca4430708f0ebea5692f9c73ad17cc00bc46d1f611b8489b30811df307d
 DIST ack-v3.6.0.tar.gz 251556 BLAKE2B 
6e65633ea9b8b24b03d3ff60c0554eb05009ebbaacbeede8109bdfd36340ac6151f3be9b461349793d6a222d4fb9b21579d44cff3aa541b7bdbc94d16269d2d1
 SHA512 
1cef0d873be47c8e27d5c3b3b47ea965cf39755d1556c3f653c28d75e1cea9b1ff183297c897d919e220cfcb556e3d5b88eb0b5343d933a05fa2c1fff1234173

diff --git a/sys-apps/ack/ack-3.4.0.ebuild b/sys-apps/ack/ack-3.4.0.ebuild
deleted file mode 100644
index 054e17840055..
--- a/sys-apps/ack/ack-3.4.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-DIST_AUTHOR=PETDANCE
-DIST_VERSION="v${PV}"
-inherit perl-module
-
-DESCRIPTION="ack is a tool like grep, optimized for programmers"
-HOMEPAGE="https://beyondgrep.com;
-
-LICENSE="Artistic-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa x86 ~amd64-linux ~x86-linux 
~x64-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-perl/File-Next-1.180.0"
-DEPEND="${RDEPEND}
-   test? ( dev-perl/IO-Tty )"
-
-PATCHES=( "${FILESDIR}"/${PN}-3.3.0-gentoo.patch )
-
-src_test() {
-   # Tests fail when run in parallel and if dev-perl/IO-Tty is installed
-   # which enables interactive tests that need to read from stdin. If 
IO-Tty
-   # is not installed the related tests are skipped.
-   MAKEOPTS+=" -j1" perl-module_src_test
-}



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

2022-09-30 Thread Brian Evans
commit: 381d51ea868d35beb755abb17bf1f01053ebace4
Author: Brian Evans  gentoo  org>
AuthorDate: Fri Sep 30 19:49:36 2022 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Fri Sep 30 19:49:36 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=381d51ea

dev-lang/php: Version bump for 8.0.24

Bug: https://bugs.gentoo.org/873376
Signed-off-by: Brian Evans  gentoo.org>

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

diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index 189383264881..b019e754a296 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -4,6 +4,7 @@ DIST php-8.0.20.tar.xz 10879064 BLAKE2B 
3b18d6593ddc78e1c289b87ba8bb65e55cbd815d
 DIST php-8.0.21.tar.xz 10785364 BLAKE2B 
ea8a640b47c96b235b49ce3a98accbfa4aa967c7e917684e19667a74ca0f77e070847dabdf15c3dbd56cff01ef662e79e9408d3e57e870e51893e969291a0932
 SHA512 
c1c1577f3d6af445d8ac15338877186f2a639a76ad980328011cb0a5e9592bdb24c1cda7ae8a0c495c881497d54cbca6e1373ede71bf097e69a040368841d567
 DIST php-8.0.22.tar.xz 10785228 BLAKE2B 
3dbbcd47d138ffe8765942fec820a654e8ebffacb912be82f007fa6b5afd2f8daa4378ffd09a910edbb05affb9983e1585f7b2cbb3f30f12f1d3e88ebcdef15a
 SHA512 
e4f117331aed84542034524df96e14a73fe4770205c38576659cec90e376e205a8c4a16191119a73d1115e731b3d16cbdaac4a2e4267738e9b9beb22b0add5a7
 DIST php-8.0.23.tar.xz 10860624 BLAKE2B 
421ea129075f674901c25c04665b773ea92ea403466cd56f00df7590bf5613c7d241fec3790e172df21e15e12687ea74ee5e1bb431e530dbb293b3d6d4546b1a
 SHA512 
269020756d184fd72de9ccfc83746e01415ae0f37aaa57cfb3e524e49f0f2a6e6b22c95c09b451f9f54d2c82e1452caa9b8e9f178be546883dfc22a4c9e49575
+DIST php-8.0.24.tar.xz 10895332 BLAKE2B 
efdf65b8d715ed9dd817437beac4949de54d3d96d2289bfcaac5cf7cfaa4015d8e507b7dc43f02760afb5f0be5a5b146abb19324e37a6331e18d5db8ca3cde9d
 SHA512 
f4922c03b613aae35005b6b39630c0de7c25929b7f4edd9c5062a747a747df065ae9b52c17c34433ecb801bc54fce2fa34ae46165deb527f0fe2c86e5da73400
 DIST php-8.1.10.tar.xz 11736192 BLAKE2B 
3cf768a42d9491a7790844a1df430e780e3d857e3c111d8f43248ee7bf6e66233a39128b3a13c55167083a676bad42ab38aad6d96c67134a7d91035e2d973cff
 SHA512 
d41595365a5a032a593dfaa13106ae66e78db59d3539a2d37cb5a536c38934b8a6ed90cf4e91fc4539cb2f018517ee4c6e696a4d2b6541bfa3c6fa5f1f9ca378
 DIST php-8.1.11.tar.xz 11797016 BLAKE2B 
d9e3839931370cb833692b7829d98d29a3e942368ed656777303766cfb931ef94e10a44782f0232ef0610b8170c0ffb3fe3320fca0ec7081e4b5dfc19861495d
 SHA512 
2a9eb4642b4077077f6551ca9a40fd2c48272cc1ee443117362331259efbec88bad0141b09f7a9ff710cde044f9463e1e668f7066b2429ea4274dec7291725cc
 DIST php-8.1.8.tar.xz 11722100 BLAKE2B 
117e0823b47485d4fc469edfbc5e9051b5d35588bf36a2d9e12282b83c12056cfc2a4376bf0e21b5f947190a906e3e4fdde7bec20b7ea7e9ab36912e865c2c13
 SHA512 
4ef03b4c412bdbcdf6c3dc4784b3218a0519e6b91a0682e796270d4426c05c62309b4835ea31271857a5f2535d00f20a9f9b4a79703a49c3e40f16fafa948dd4

diff --git a/dev-lang/php/php-8.0.24.ebuild b/dev-lang/php/php-8.0.24.ebuild
new file mode 100644
index ..c9ead2270c39
--- /dev/null
+++ b/dev-lang/php/php-8.0.24.ebuild
@@ -0,0 +1,758 @@
+# 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}"
+
+# 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 ow

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

2022-09-30 Thread Brian Evans
commit: 5874e955ff42eb9db20e3f6c5564bff2d65226b6
Author: Brian Evans  gentoo  org>
AuthorDate: Fri Sep 30 17:09:49 2022 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Fri Sep 30 17:14:20 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5874e955

dev-lang/php: Add 8.2 RC3

Signed-off-by: Brian Evans  gentoo.org>

 dev-lang/php/Manifest |   1 +
 dev-lang/php/php-8.2.0_rc3.ebuild | 758 ++
 2 files changed, 759 insertions(+)

diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index 5db56f3277e5..189383264881 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -8,3 +8,4 @@ DIST php-8.1.10.tar.xz 11736192 BLAKE2B 
3cf768a42d9491a7790844a1df430e780e3d857e
 DIST php-8.1.11.tar.xz 11797016 BLAKE2B 
d9e3839931370cb833692b7829d98d29a3e942368ed656777303766cfb931ef94e10a44782f0232ef0610b8170c0ffb3fe3320fca0ec7081e4b5dfc19861495d
 SHA512 
2a9eb4642b4077077f6551ca9a40fd2c48272cc1ee443117362331259efbec88bad0141b09f7a9ff710cde044f9463e1e668f7066b2429ea4274dec7291725cc
 DIST php-8.1.8.tar.xz 11722100 BLAKE2B 
117e0823b47485d4fc469edfbc5e9051b5d35588bf36a2d9e12282b83c12056cfc2a4376bf0e21b5f947190a906e3e4fdde7bec20b7ea7e9ab36912e865c2c13
 SHA512 
4ef03b4c412bdbcdf6c3dc4784b3218a0519e6b91a0682e796270d4426c05c62309b4835ea31271857a5f2535d00f20a9f9b4a79703a49c3e40f16fafa948dd4
 DIST php-8.1.9.tar.xz 11787892 BLAKE2B 
f35911f272e0c0118841d713e52a347b001324d9456613b749e06031a6a2a292e4c813c950e329889af46f2e585eb3de92f825cff9bcb51f09b74e056fedda75
 SHA512 
a75731edbfa6e8841d4c836336b07fd7aec4668b3d38487e630015cfc9d76fdfd04bae946d4fe783679df05adee7e2617b42ca4d3c2415c0f88ed5bffad87d7d
+DIST php-8.2.0RC3.tar.xz 12013188 BLAKE2B 
4d3caf32858d8a42ee229d793ea2b9238ec56ccd8dea2cead3eb5fd1660391968a399e6178d8d2da9a2c5a749055fdc97848bb629fc3ffbda4d640d91bf84e11
 SHA512 
f0efde3cc30563d1e30a72f368b1dca483d8fe7ebd65c54ee86212d9476f260aed993bd62a2685f50c53a599174b91cb2f0d10f1e83fc68b4403f715a7045f35

diff --git a/dev-lang/php/php-8.2.0_rc3.ebuild 
b/dev-lang/php/php-8.2.0_rc3.ebuild
new file mode 100644
index ..84430f30f486
--- /dev/null
+++ b/dev-lang/php/php-8.2.0_rc3.ebuild
@@ -0,0 +1,758 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+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;
+SRC_URI="https://downloads.php.net/~pierrick/php-${MY_PV}.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}"
+
+# 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 ) )
+   !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 

[gentoo-commits] repo/gentoo:master commit in: profiles/

2022-09-30 Thread Brian Evans
commit: 7a89505d5b680b7afc1874b94df1edd4d2516e5d
Author: Brian Evans  gentoo  org>
AuthorDate: Fri Sep 30 17:13:45 2022 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Fri Sep 30 17:14:20 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a89505d

profiles: Mask virtual/httpd-php 8.2 slot

Signed-off-by: Brian Evans  gentoo.org>

 profiles/package.mask | 1 +
 1 file changed, 1 insertion(+)

diff --git a/profiles/package.mask b/profiles/package.mask
index ac3890bca7c4..4579ccf47ade 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -36,6 +36,7 @@
 # Brian Evans  (2022-09-30)
 # Mask RC versions for initial testing
  (2022-09-29)
 # Unfetchable mirror-restricted distfile.  No action from maintainer



[gentoo-commits] repo/gentoo:master commit in: virtual/httpd-php/

2022-09-30 Thread Brian Evans
commit: 2533b3b7e53278437ef6e657cc6c1833f27ceb7b
Author: Brian Evans  gentoo  org>
AuthorDate: Fri Sep 30 17:12:20 2022 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Fri Sep 30 17:14:20 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2533b3b7

virtual/httpd-php: Add 8.2 slot

Signed-off-by: Brian Evans  gentoo.org>

 virtual/httpd-php/httpd-php-8.2.ebuild | 12 
 1 file changed, 12 insertions(+)

diff --git a/virtual/httpd-php/httpd-php-8.2.ebuild 
b/virtual/httpd-php/httpd-php-8.2.ebuild
new file mode 100644
index ..dab8a6159b46
--- /dev/null
+++ b/virtual/httpd-php/httpd-php-8.2.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+DESCRIPTION="Virtual to provide PHP-enabled webservers"
+SLOT="${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+
+RDEPEND="|| ( dev-lang/php:${SLOT}[fpm]
+ dev-lang/php:${SLOT}[apache2]
+ dev-lang/php:${SLOT}[cgi] )"



[gentoo-commits] repo/gentoo:master commit in: profiles/desc/, profiles/, profiles/base/

2022-09-30 Thread Brian Evans
commit: 0430657c2a5f2a492b1a19f24a3edf7ab4cb8e92
Author: Brian Evans  gentoo  org>
AuthorDate: Fri Sep 30 17:08:35 2022 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Fri Sep 30 17:14:20 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0430657c

profiles: Prepare for adding PHP 8.2 RC

Signed-off-by: Brian Evans  gentoo.org>

 profiles/base/use.mask | 4 
 profiles/desc/php_targets.desc | 1 +
 profiles/package.mask  | 4 
 3 files changed, 9 insertions(+)

diff --git a/profiles/base/use.mask b/profiles/base/use.mask
index 95771e8b8e49..7f933c6c7e3e 100644
--- a/profiles/base/use.mask
+++ b/profiles/base/use.mask
@@ -4,6 +4,10 @@
 # This file is only for generic masks. For arch-specific masks (i.e.
 # mask everywhere, unmask on arch/*) use arch/base.
 
+# Brian Evans  (2022-09-30)
+# PHP 8.2 is in RC
+php_targets_php8-2
+
 # Sam James  (2022-08-02)
 # Masked for testing. The split of some packages may still
 # change. bug #838970.

diff --git a/profiles/desc/php_targets.desc b/profiles/desc/php_targets.desc
index 301a3e58a8ff..78c3a07424c3 100644
--- a/profiles/desc/php_targets.desc
+++ b/profiles/desc/php_targets.desc
@@ -3,6 +3,7 @@
 
 # This file contains descriptions of the PHP_TARGETS USE_EXPAND flags
 
+php8-2 - Build against PHP 8.2
 php8-1 - Build against PHP 8.1
 php8-0 - Build against PHP 8.0
 php7-4 - Build against PHP 7.4

diff --git a/profiles/package.mask b/profiles/package.mask
index 663599209444..ac3890bca7c4 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -33,6 +33,10 @@
 
 #--- END OF EXAMPLES ---
 
+# Brian Evans  (2022-09-30)
+# Mask RC versions for initial testing
+ (2022-09-29)
 # Unfetchable mirror-restricted distfile.  No action from maintainer
 # in over a year.



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

2022-09-29 Thread Brian Evans
commit: fe94a60bc978b8b1aa9bd45f4f5ae6503325863e
Author: Brian Evans  gentoo  org>
AuthorDate: Thu Sep 29 17:29:26 2022 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Thu Sep 29 17:29:26 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe94a60b

dev-lang/php: Version bump for 8.1.11

Signed-off-by: Brian Evans  gentoo.org>

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

diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index d9e319aba5d5..5db56f3277e5 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -5,5 +5,6 @@ DIST php-8.0.21.tar.xz 10785364 BLAKE2B 
ea8a640b47c96b235b49ce3a98accbfa4aa967c7
 DIST php-8.0.22.tar.xz 10785228 BLAKE2B 
3dbbcd47d138ffe8765942fec820a654e8ebffacb912be82f007fa6b5afd2f8daa4378ffd09a910edbb05affb9983e1585f7b2cbb3f30f12f1d3e88ebcdef15a
 SHA512 
e4f117331aed84542034524df96e14a73fe4770205c38576659cec90e376e205a8c4a16191119a73d1115e731b3d16cbdaac4a2e4267738e9b9beb22b0add5a7
 DIST php-8.0.23.tar.xz 10860624 BLAKE2B 
421ea129075f674901c25c04665b773ea92ea403466cd56f00df7590bf5613c7d241fec3790e172df21e15e12687ea74ee5e1bb431e530dbb293b3d6d4546b1a
 SHA512 
269020756d184fd72de9ccfc83746e01415ae0f37aaa57cfb3e524e49f0f2a6e6b22c95c09b451f9f54d2c82e1452caa9b8e9f178be546883dfc22a4c9e49575
 DIST php-8.1.10.tar.xz 11736192 BLAKE2B 
3cf768a42d9491a7790844a1df430e780e3d857e3c111d8f43248ee7bf6e66233a39128b3a13c55167083a676bad42ab38aad6d96c67134a7d91035e2d973cff
 SHA512 
d41595365a5a032a593dfaa13106ae66e78db59d3539a2d37cb5a536c38934b8a6ed90cf4e91fc4539cb2f018517ee4c6e696a4d2b6541bfa3c6fa5f1f9ca378
+DIST php-8.1.11.tar.xz 11797016 BLAKE2B 
d9e3839931370cb833692b7829d98d29a3e942368ed656777303766cfb931ef94e10a44782f0232ef0610b8170c0ffb3fe3320fca0ec7081e4b5dfc19861495d
 SHA512 
2a9eb4642b4077077f6551ca9a40fd2c48272cc1ee443117362331259efbec88bad0141b09f7a9ff710cde044f9463e1e668f7066b2429ea4274dec7291725cc
 DIST php-8.1.8.tar.xz 11722100 BLAKE2B 
117e0823b47485d4fc469edfbc5e9051b5d35588bf36a2d9e12282b83c12056cfc2a4376bf0e21b5f947190a906e3e4fdde7bec20b7ea7e9ab36912e865c2c13
 SHA512 
4ef03b4c412bdbcdf6c3dc4784b3218a0519e6b91a0682e796270d4426c05c62309b4835ea31271857a5f2535d00f20a9f9b4a79703a49c3e40f16fafa948dd4
 DIST php-8.1.9.tar.xz 11787892 BLAKE2B 
f35911f272e0c0118841d713e52a347b001324d9456613b749e06031a6a2a292e4c813c950e329889af46f2e585eb3de92f825cff9bcb51f09b74e056fedda75
 SHA512 
a75731edbfa6e8841d4c836336b07fd7aec4668b3d38487e630015cfc9d76fdfd04bae946d4fe783679df05adee7e2617b42ca4d3c2415c0f88ed5bffad87d7d

diff --git a/dev-lang/php/php-8.1.11.ebuild b/dev-lang/php/php-8.1.11.ebuild
new file mode 100644
index ..08ae68bc439d
--- /dev/null
+++ b/dev-lang/php/php-8.1.11.ebuild
@@ -0,0 +1,756 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+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}"
+
+# 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 ) )
+   !cli? ( ?? ( readline libedit ) )
+   truetype? ( gd zlib )
+   webp? ( gd zlib )
+   cjk? ( gd zlib )
+   exif? ( gd zlib )
+   xpm? ( gd zlib )
+   gd? ( zlib )
+   

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

2022-09-29 Thread Brian Evans
commit: 6d148e5f3eeb4db3cad1672ca234cea261a1320e
Author: Brian Evans  gentoo  org>
AuthorDate: Thu Sep 29 17:10:13 2022 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Thu Sep 29 17:10:13 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d148e5f

dev-lang/php: Version bump for 7.4.32

Signed-off-by: Brian Evans  gentoo.org>

 dev-lang/php/Manifest  |   1 +
 dev-lang/php/php-7.4.32.ebuild | 748 +
 2 files changed, 749 insertions(+)

diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index 1245496afb1d..d9e319aba5d5 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -1,4 +1,5 @@
 DIST php-7.4.30.tar.xz 10419136 BLAKE2B 
5860ead4051173d3139f93be24f15c7ed2044a9e6b3488234aaca73dff8abace3adf00bde782c3fc950d81d2dfdb67979bb5b99c3587d07f5ccbe782d9cba37d
 SHA512 
7bce44a23c07193c10c57459f08b08fdce4e3a269d6829a61371d1b1f117ecf4e167805a40e1a5e7687f534aee9d5f5745a3f4dcb344e9e781c105bc964ed738
+DIST php-7.4.32.tar.xz 10419092 BLAKE2B 
7657360e661274a34ab17e0e5a103e037d83876187b5413f020c246a91f02b00ac4f0cf34848729d0ccb86d8b9830e5a0ba8a85cc030ec9bd61ec7d4d1a07f5e
 SHA512 
052fbb6120b9943927685f736574871bc2b0c60d4ef18b54ec3f3d92398842286189fd426647c3c91eec38b11ce607090c4cd339040c92bda852574b96c36f67
 DIST php-8.0.20.tar.xz 10879064 BLAKE2B 
3b18d6593ddc78e1c289b87ba8bb65e55cbd815d2b06d4f9759265e9ae76ea6b78dc9f52652be1b1a721ccfe736f80d2a8f59c01ba4c38a8ff46710753bcc9ed
 SHA512 
24153733111bb5104298679fb5ee02d8abad4e6b2a8e0a07c2a6076e1c9104309abe56bcb7b5fe17670c266e5e9981c520ed0ac12b699ae0050953ff99ef04fa
 DIST php-8.0.21.tar.xz 10785364 BLAKE2B 
ea8a640b47c96b235b49ce3a98accbfa4aa967c7e917684e19667a74ca0f77e070847dabdf15c3dbd56cff01ef662e79e9408d3e57e870e51893e969291a0932
 SHA512 
c1c1577f3d6af445d8ac15338877186f2a639a76ad980328011cb0a5e9592bdb24c1cda7ae8a0c495c881497d54cbca6e1373ede71bf097e69a040368841d567
 DIST php-8.0.22.tar.xz 10785228 BLAKE2B 
3dbbcd47d138ffe8765942fec820a654e8ebffacb912be82f007fa6b5afd2f8daa4378ffd09a910edbb05affb9983e1585f7b2cbb3f30f12f1d3e88ebcdef15a
 SHA512 
e4f117331aed84542034524df96e14a73fe4770205c38576659cec90e376e205a8c4a16191119a73d1115e731b3d16cbdaac4a2e4267738e9b9beb22b0add5a7

diff --git a/dev-lang/php/php-7.4.32.ebuild b/dev-lang/php/php-7.4.32.ebuild
new file mode 100644
index ..143ce5adb1d0
--- /dev/null
+++ b/dev-lang/php/php-7.4.32.ebuild
@@ -0,0 +1,748 @@
+# 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}"
+
+# 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 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 +json kerberos ldap ldap-sasl libedit lmdb
+   mhash mssql mysql mysqli nls
+   oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
+   readline selinux +session session-mm sharedmem
+   +simplexml snmp soap sockets sodium spell sqlite ssl
+   sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode webp
+   +xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib"
+
+# Without USE=readline or libedit, the interactive "php -a" CLI will hang.
+# The Oracle instant client provides its own incompatible ldap library.
+REQUIRED_USE="
+   || ( cli cgi fpm apache2 embed phpdbg )
+   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 )
+   xmlrpc? ( xml iconv )
+   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

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

2022-09-10 Thread Brian Evans
commit: a07b974ba46558e71c4d89286c6a6c4fb023b1b8
Author: Brian Evans  gentoo  org>
AuthorDate: Sun Sep 11 00:56:39 2022 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Sun Sep 11 00:56:39 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a07b974b

dev-lang/php: Version bump for 8.0.23

Signed-off-by: Brian Evans  gentoo.org>

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

diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index 79a99b49a1a3..1245496afb1d 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -2,6 +2,7 @@ DIST php-7.4.30.tar.xz 10419136 BLAKE2B 
5860ead4051173d3139f93be24f15c7ed2044a9e
 DIST php-8.0.20.tar.xz 10879064 BLAKE2B 
3b18d6593ddc78e1c289b87ba8bb65e55cbd815d2b06d4f9759265e9ae76ea6b78dc9f52652be1b1a721ccfe736f80d2a8f59c01ba4c38a8ff46710753bcc9ed
 SHA512 
24153733111bb5104298679fb5ee02d8abad4e6b2a8e0a07c2a6076e1c9104309abe56bcb7b5fe17670c266e5e9981c520ed0ac12b699ae0050953ff99ef04fa
 DIST php-8.0.21.tar.xz 10785364 BLAKE2B 
ea8a640b47c96b235b49ce3a98accbfa4aa967c7e917684e19667a74ca0f77e070847dabdf15c3dbd56cff01ef662e79e9408d3e57e870e51893e969291a0932
 SHA512 
c1c1577f3d6af445d8ac15338877186f2a639a76ad980328011cb0a5e9592bdb24c1cda7ae8a0c495c881497d54cbca6e1373ede71bf097e69a040368841d567
 DIST php-8.0.22.tar.xz 10785228 BLAKE2B 
3dbbcd47d138ffe8765942fec820a654e8ebffacb912be82f007fa6b5afd2f8daa4378ffd09a910edbb05affb9983e1585f7b2cbb3f30f12f1d3e88ebcdef15a
 SHA512 
e4f117331aed84542034524df96e14a73fe4770205c38576659cec90e376e205a8c4a16191119a73d1115e731b3d16cbdaac4a2e4267738e9b9beb22b0add5a7
+DIST php-8.0.23.tar.xz 10860624 BLAKE2B 
421ea129075f674901c25c04665b773ea92ea403466cd56f00df7590bf5613c7d241fec3790e172df21e15e12687ea74ee5e1bb431e530dbb293b3d6d4546b1a
 SHA512 
269020756d184fd72de9ccfc83746e01415ae0f37aaa57cfb3e524e49f0f2a6e6b22c95c09b451f9f54d2c82e1452caa9b8e9f178be546883dfc22a4c9e49575
 DIST php-8.1.10.tar.xz 11736192 BLAKE2B 
3cf768a42d9491a7790844a1df430e780e3d857e3c111d8f43248ee7bf6e66233a39128b3a13c55167083a676bad42ab38aad6d96c67134a7d91035e2d973cff
 SHA512 
d41595365a5a032a593dfaa13106ae66e78db59d3539a2d37cb5a536c38934b8a6ed90cf4e91fc4539cb2f018517ee4c6e696a4d2b6541bfa3c6fa5f1f9ca378
 DIST php-8.1.8.tar.xz 11722100 BLAKE2B 
117e0823b47485d4fc469edfbc5e9051b5d35588bf36a2d9e12282b83c12056cfc2a4376bf0e21b5f947190a906e3e4fdde7bec20b7ea7e9ab36912e865c2c13
 SHA512 
4ef03b4c412bdbcdf6c3dc4784b3218a0519e6b91a0682e796270d4426c05c62309b4835ea31271857a5f2535d00f20a9f9b4a79703a49c3e40f16fafa948dd4
 DIST php-8.1.9.tar.xz 11787892 BLAKE2B 
f35911f272e0c0118841d713e52a347b001324d9456613b749e06031a6a2a292e4c813c950e329889af46f2e585eb3de92f825cff9bcb51f09b74e056fedda75
 SHA512 
a75731edbfa6e8841d4c836336b07fd7aec4668b3d38487e630015cfc9d76fdfd04bae946d4fe783679df05adee7e2617b42ca4d3c2415c0f88ed5bffad87d7d

diff --git a/dev-lang/php/php-8.0.23.ebuild b/dev-lang/php/php-8.0.23.ebuild
new file mode 100644
index ..c9ead2270c39
--- /dev/null
+++ b/dev-lang/php/php-8.0.23.ebuild
@@ -0,0 +1,758 @@
+# 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}"
+
+# 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.
+REQU

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

2022-09-10 Thread Brian Evans
commit: 5994eccf962086fb2d6b323ae88f04dacf797e89
Author: Brian Evans  gentoo  org>
AuthorDate: Sun Sep 11 00:10:59 2022 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Sun Sep 11 00:10:59 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5994eccf

dev-lang/php: Version bump for 8.1.10

Signed-off-by: Brian Evans  gentoo.org>

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

diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index d2c77843d8a7..79a99b49a1a3 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -2,5 +2,6 @@ DIST php-7.4.30.tar.xz 10419136 BLAKE2B 
5860ead4051173d3139f93be24f15c7ed2044a9e
 DIST php-8.0.20.tar.xz 10879064 BLAKE2B 
3b18d6593ddc78e1c289b87ba8bb65e55cbd815d2b06d4f9759265e9ae76ea6b78dc9f52652be1b1a721ccfe736f80d2a8f59c01ba4c38a8ff46710753bcc9ed
 SHA512 
24153733111bb5104298679fb5ee02d8abad4e6b2a8e0a07c2a6076e1c9104309abe56bcb7b5fe17670c266e5e9981c520ed0ac12b699ae0050953ff99ef04fa
 DIST php-8.0.21.tar.xz 10785364 BLAKE2B 
ea8a640b47c96b235b49ce3a98accbfa4aa967c7e917684e19667a74ca0f77e070847dabdf15c3dbd56cff01ef662e79e9408d3e57e870e51893e969291a0932
 SHA512 
c1c1577f3d6af445d8ac15338877186f2a639a76ad980328011cb0a5e9592bdb24c1cda7ae8a0c495c881497d54cbca6e1373ede71bf097e69a040368841d567
 DIST php-8.0.22.tar.xz 10785228 BLAKE2B 
3dbbcd47d138ffe8765942fec820a654e8ebffacb912be82f007fa6b5afd2f8daa4378ffd09a910edbb05affb9983e1585f7b2cbb3f30f12f1d3e88ebcdef15a
 SHA512 
e4f117331aed84542034524df96e14a73fe4770205c38576659cec90e376e205a8c4a16191119a73d1115e731b3d16cbdaac4a2e4267738e9b9beb22b0add5a7
+DIST php-8.1.10.tar.xz 11736192 BLAKE2B 
3cf768a42d9491a7790844a1df430e780e3d857e3c111d8f43248ee7bf6e66233a39128b3a13c55167083a676bad42ab38aad6d96c67134a7d91035e2d973cff
 SHA512 
d41595365a5a032a593dfaa13106ae66e78db59d3539a2d37cb5a536c38934b8a6ed90cf4e91fc4539cb2f018517ee4c6e696a4d2b6541bfa3c6fa5f1f9ca378
 DIST php-8.1.8.tar.xz 11722100 BLAKE2B 
117e0823b47485d4fc469edfbc5e9051b5d35588bf36a2d9e12282b83c12056cfc2a4376bf0e21b5f947190a906e3e4fdde7bec20b7ea7e9ab36912e865c2c13
 SHA512 
4ef03b4c412bdbcdf6c3dc4784b3218a0519e6b91a0682e796270d4426c05c62309b4835ea31271857a5f2535d00f20a9f9b4a79703a49c3e40f16fafa948dd4
 DIST php-8.1.9.tar.xz 11787892 BLAKE2B 
f35911f272e0c0118841d713e52a347b001324d9456613b749e06031a6a2a292e4c813c950e329889af46f2e585eb3de92f825cff9bcb51f09b74e056fedda75
 SHA512 
a75731edbfa6e8841d4c836336b07fd7aec4668b3d38487e630015cfc9d76fdfd04bae946d4fe783679df05adee7e2617b42ca4d3c2415c0f88ed5bffad87d7d

diff --git a/dev-lang/php/php-8.1.10.ebuild b/dev-lang/php/php-8.1.10.ebuild
new file mode 100644
index ..08ae68bc439d
--- /dev/null
+++ b/dev-lang/php/php-8.1.10.ebuild
@@ -0,0 +1,756 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+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}"
+
+# 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 ) )
+   !cli? ( ?? ( readline libedit ) )
+   truetype? ( gd zlib )
+   webp? ( gd zlib )
+   cjk? ( gd zlib )
+   exif? ( gd zlib )
+   xpm? ( gd zlib )
+   gd? ( zlib )
+   

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

2022-08-30 Thread Brian Evans
commit: 8bc53d5a8d3e44354862a518f375386c5903c7f8
Author: Brian Evans  gentoo  org>
AuthorDate: Tue Aug 30 12:32:19 2022 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Tue Aug 30 12:32:19 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8bc53d5a

dev-php/jpgraph: Recreate patch for 4.3.5 for corefonts path

Closes: https://bugs.gentoo.org/867145
Signed-off-by: Brian Evans  gentoo.org>

 dev-php/jpgraph/files/gentoo_ttf_dir-4.3.5.patch | 31 
 dev-php/jpgraph/jpgraph-4.3.5.ebuild |  2 +-
 2 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/dev-php/jpgraph/files/gentoo_ttf_dir-4.3.5.patch 
b/dev-php/jpgraph/files/gentoo_ttf_dir-4.3.5.patch
new file mode 100644
index ..ba4e37c98fba
--- /dev/null
+++ b/dev-php/jpgraph/files/gentoo_ttf_dir-4.3.5.patch
@@ -0,0 +1,31 @@
+From fd1fc5e3c72ac4511f86852b1704821c440bdb3d Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky 
+Date: Tue, 3 Jan 2017 12:56:18 -0500
+Subject: [PATCH 1/1] Set TTF_DIR to the Gentoo corefonts location.
+
+The default value of TTF_DIR in jpg-config.inc.php points to
+/usr/share/fonts/truetype, a location that does not exist on
+Gentoo. Since JpGraph largely only supports the Microsoft
+corefonts, we point it to /usr/share/fonts/corefonts instead.
+If the user does not have the corefonts installed, this is no
+great loss: neither location exists.
+---
+ src/jpg-config.inc.php | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/jpg-config.inc.php b/src/jpg-config.inc.php
+index ea16c1e..98cbdc7 100755
+--- a/src/jpg-config.inc.php
 b/src/jpg-config.inc.php
+@@ -36,7 +36,7 @@
+ //
+ //
+ // define('CACHE_DIR','/tmp/jpgraph_cache/');
+- define('TTF_DIR','/usr/share/fonts/truetype/msttcorefonts/');
++define('TTF_DIR','/usr/share/fonts/corefonts/');
+ // define('MBTTF_DIR','/usr/share/fonts/TrueType/');
+ 
+ //-
+-- 
+2.10.2
+

diff --git a/dev-php/jpgraph/jpgraph-4.3.5.ebuild 
b/dev-php/jpgraph/jpgraph-4.3.5.ebuild
index 534e39c0355d..2143d3e2edb4 100644
--- a/dev-php/jpgraph/jpgraph-4.3.5.ebuild
+++ b/dev-php/jpgraph/jpgraph-4.3.5.ebuild
@@ -27,7 +27,7 @@ src_prepare() {
# break without warning when the user e.g. removes corefonts. By
# applying the patch conditionally, we ensure a dependency on
# media-fonts/corefonts before anything will work.
-   use truetype && eapply "${FILESDIR}/gentoo_ttf_dir.patch"
+   use truetype && eapply "${FILESDIR}/gentoo_ttf_dir-4.3.5.patch"
 
# Some of the documentation and examples are shipped in the "src"
# directory. We want them outside of that tree so that we can simply



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

2022-08-04 Thread Brian Evans
commit: 626717b30badc95edcf5099105834156e4e8331e
Author: Brian Evans  gentoo  org>
AuthorDate: Thu Aug  4 17:55:36 2022 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Thu Aug  4 17:56:11 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=626717b3

dev-lang/php: Version bump for 8.0.22

Signed-off-by: Brian Evans  gentoo.org>

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

diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index 440f3f16edd7..d2c77843d8a7 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -1,5 +1,6 @@
 DIST php-7.4.30.tar.xz 10419136 BLAKE2B 
5860ead4051173d3139f93be24f15c7ed2044a9e6b3488234aaca73dff8abace3adf00bde782c3fc950d81d2dfdb67979bb5b99c3587d07f5ccbe782d9cba37d
 SHA512 
7bce44a23c07193c10c57459f08b08fdce4e3a269d6829a61371d1b1f117ecf4e167805a40e1a5e7687f534aee9d5f5745a3f4dcb344e9e781c105bc964ed738
 DIST php-8.0.20.tar.xz 10879064 BLAKE2B 
3b18d6593ddc78e1c289b87ba8bb65e55cbd815d2b06d4f9759265e9ae76ea6b78dc9f52652be1b1a721ccfe736f80d2a8f59c01ba4c38a8ff46710753bcc9ed
 SHA512 
24153733111bb5104298679fb5ee02d8abad4e6b2a8e0a07c2a6076e1c9104309abe56bcb7b5fe17670c266e5e9981c520ed0ac12b699ae0050953ff99ef04fa
 DIST php-8.0.21.tar.xz 10785364 BLAKE2B 
ea8a640b47c96b235b49ce3a98accbfa4aa967c7e917684e19667a74ca0f77e070847dabdf15c3dbd56cff01ef662e79e9408d3e57e870e51893e969291a0932
 SHA512 
c1c1577f3d6af445d8ac15338877186f2a639a76ad980328011cb0a5e9592bdb24c1cda7ae8a0c495c881497d54cbca6e1373ede71bf097e69a040368841d567
+DIST php-8.0.22.tar.xz 10785228 BLAKE2B 
3dbbcd47d138ffe8765942fec820a654e8ebffacb912be82f007fa6b5afd2f8daa4378ffd09a910edbb05affb9983e1585f7b2cbb3f30f12f1d3e88ebcdef15a
 SHA512 
e4f117331aed84542034524df96e14a73fe4770205c38576659cec90e376e205a8c4a16191119a73d1115e731b3d16cbdaac4a2e4267738e9b9beb22b0add5a7
 DIST php-8.1.8.tar.xz 11722100 BLAKE2B 
117e0823b47485d4fc469edfbc5e9051b5d35588bf36a2d9e12282b83c12056cfc2a4376bf0e21b5f947190a906e3e4fdde7bec20b7ea7e9ab36912e865c2c13
 SHA512 
4ef03b4c412bdbcdf6c3dc4784b3218a0519e6b91a0682e796270d4426c05c62309b4835ea31271857a5f2535d00f20a9f9b4a79703a49c3e40f16fafa948dd4
 DIST php-8.1.9.tar.xz 11787892 BLAKE2B 
f35911f272e0c0118841d713e52a347b001324d9456613b749e06031a6a2a292e4c813c950e329889af46f2e585eb3de92f825cff9bcb51f09b74e056fedda75
 SHA512 
a75731edbfa6e8841d4c836336b07fd7aec4668b3d38487e630015cfc9d76fdfd04bae946d4fe783679df05adee7e2617b42ca4d3c2415c0f88ed5bffad87d7d

diff --git a/dev-lang/php/php-8.0.22.ebuild b/dev-lang/php/php-8.0.22.ebuild
new file mode 100644
index ..c9ead2270c39
--- /dev/null
+++ b/dev-lang/php/php-8.0.22.ebuild
@@ -0,0 +1,758 @@
+# 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}"
+
+# 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 ) )
+   !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 )
+  

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

2022-08-04 Thread Brian Evans
commit: 05382de84c156c99378bee7656c4eba4baef9a8f
Author: Brian Evans  gentoo  org>
AuthorDate: Thu Aug  4 16:38:14 2022 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Thu Aug  4 17:56:11 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05382de8

dev-lang/php: Version bump for 8.1.9

Signed-off-by: Brian Evans  gentoo.org>

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

diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index 79d898306f06..440f3f16edd7 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -2,3 +2,4 @@ DIST php-7.4.30.tar.xz 10419136 BLAKE2B 
5860ead4051173d3139f93be24f15c7ed2044a9e
 DIST php-8.0.20.tar.xz 10879064 BLAKE2B 
3b18d6593ddc78e1c289b87ba8bb65e55cbd815d2b06d4f9759265e9ae76ea6b78dc9f52652be1b1a721ccfe736f80d2a8f59c01ba4c38a8ff46710753bcc9ed
 SHA512 
24153733111bb5104298679fb5ee02d8abad4e6b2a8e0a07c2a6076e1c9104309abe56bcb7b5fe17670c266e5e9981c520ed0ac12b699ae0050953ff99ef04fa
 DIST php-8.0.21.tar.xz 10785364 BLAKE2B 
ea8a640b47c96b235b49ce3a98accbfa4aa967c7e917684e19667a74ca0f77e070847dabdf15c3dbd56cff01ef662e79e9408d3e57e870e51893e969291a0932
 SHA512 
c1c1577f3d6af445d8ac15338877186f2a639a76ad980328011cb0a5e9592bdb24c1cda7ae8a0c495c881497d54cbca6e1373ede71bf097e69a040368841d567
 DIST php-8.1.8.tar.xz 11722100 BLAKE2B 
117e0823b47485d4fc469edfbc5e9051b5d35588bf36a2d9e12282b83c12056cfc2a4376bf0e21b5f947190a906e3e4fdde7bec20b7ea7e9ab36912e865c2c13
 SHA512 
4ef03b4c412bdbcdf6c3dc4784b3218a0519e6b91a0682e796270d4426c05c62309b4835ea31271857a5f2535d00f20a9f9b4a79703a49c3e40f16fafa948dd4
+DIST php-8.1.9.tar.xz 11787892 BLAKE2B 
f35911f272e0c0118841d713e52a347b001324d9456613b749e06031a6a2a292e4c813c950e329889af46f2e585eb3de92f825cff9bcb51f09b74e056fedda75
 SHA512 
a75731edbfa6e8841d4c836336b07fd7aec4668b3d38487e630015cfc9d76fdfd04bae946d4fe783679df05adee7e2617b42ca4d3c2415c0f88ed5bffad87d7d

diff --git a/dev-lang/php/php-8.1.9.ebuild b/dev-lang/php/php-8.1.9.ebuild
new file mode 100644
index ..08ae68bc439d
--- /dev/null
+++ b/dev-lang/php/php-8.1.9.ebuild
@@ -0,0 +1,756 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+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}"
+
+# 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 ) )
+   !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="
+ 

[gentoo-commits] repo/gentoo:master commit in: sys-libs/ldb/files/

2022-07-29 Thread Brian Evans
commit: 794581c03259bb80763ed5387bc6d7e33a52f63a
Author: Brian Evans  gentoo  org>
AuthorDate: Fri Jul 29 19:19:04 2022 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Fri Jul 29 19:20:04 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=794581c0

sys-libs/ldb: Rename patch file to expected value in ebuild

Non-maintainer commit

Signed-off-by: Brian Evans  gentoo.org>

 ...-skip-wav-tevent-check.patch => ldb-2.5.2-skip-waf-tevent-check.patch} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/sys-libs/ldb/files/ldb-2.5.2-skip-wav-tevent-check.patch 
b/sys-libs/ldb/files/ldb-2.5.2-skip-waf-tevent-check.patch
similarity index 100%
rename from sys-libs/ldb/files/ldb-2.5.2-skip-wav-tevent-check.patch
rename to sys-libs/ldb/files/ldb-2.5.2-skip-waf-tevent-check.patch



[gentoo-commits] repo/gentoo:master commit in: dev-php/maxmind-db-reader/

2022-07-18 Thread Brian Evans
commit: 3704d7ab608b34a2052263bcc5a261b82541d948
Author: Brian Evans  gentoo  org>
AuthorDate: Mon Jul 18 12:20:41 2022 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Mon Jul 18 12:20:41 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3704d7ab

dev-php/maxmind-db-reader: Keyword ~x86

Tested-by: Matthias Hanft  hanft.de>
Signed-off-by: Brian Evans  gentoo.org>

 dev-php/maxmind-db-reader/maxmind-db-reader-1.11.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-php/maxmind-db-reader/maxmind-db-reader-1.11.0.ebuild 
b/dev-php/maxmind-db-reader/maxmind-db-reader-1.11.0.ebuild
index d1d1a6a98315..5f26157309f5 100644
--- a/dev-php/maxmind-db-reader/maxmind-db-reader-1.11.0.ebuild
+++ b/dev-php/maxmind-db-reader/maxmind-db-reader-1.11.0.ebuild
@@ -20,7 +20,7 @@ 
SRC_URI="https://github.com/maxmind/${MY_PN}/archive/v${PV}.tar.gz -> ${MY_P}.ta
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="extension test"
 RESTRICT="!test? ( test )"
 



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

2022-07-13 Thread Brian Evans
commit: 4b524ba550d8c0f9ac780c8866dce2c6f8571215
Author: Brian Evans  gentoo  org>
AuthorDate: Wed Jul 13 17:43:00 2022 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Wed Jul 13 17:43:00 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b524ba5

dev-php/pecl-mailparse: Drop old

Signed-off-by: Brian Evans  gentoo.org>

 dev-php/pecl-mailparse/Manifest|  1 -
 dev-php/pecl-mailparse/pecl-mailparse-3.1.1.ebuild | 22 --
 2 files changed, 23 deletions(-)

diff --git a/dev-php/pecl-mailparse/Manifest b/dev-php/pecl-mailparse/Manifest
index e6bbf6a62e3f..f1fc620973bb 100644
--- a/dev-php/pecl-mailparse/Manifest
+++ b/dev-php/pecl-mailparse/Manifest
@@ -1,2 +1 @@
-DIST mailparse-3.1.1.tgz 941192 BLAKE2B 
00b5a506031cd03439e3d67172c17aeeb6af3b950694251f7654007642bf80fff3cda900fc97ba177b91ca970e47416132080793ce64d8038e7aecbf2fdaf6c0
 SHA512 
01ddb8d4d27a74c14f70b02b49322c60fc79affab374205fee91b9da21e5148e08dba024f6bc620e4f26c2c937675e09092c52ca69172d2f7797c3e2bf374bee
 DIST mailparse-3.1.3.tgz 943785 BLAKE2B 
03cb7d4d4ac78d04f710155fdd9282250dc686dbab3a6d9dfb8e3ff82fda07faf02680ad86a810cd7ee2f38c8980fbdc9ad67399f3164506e523a98ce3ffb0a9
 SHA512 
93659e479d8ab61ae473f6dc002b7198903eebdcfb4aa515e76952f5050fd1a815baccfcb57bd32fb9be6108dfed6dc73172067a58c9e6098058999bb3802000

diff --git a/dev-php/pecl-mailparse/pecl-mailparse-3.1.1.ebuild 
b/dev-php/pecl-mailparse/pecl-mailparse-3.1.1.ebuild
deleted file mode 100644
index 35e848549fa6..
--- a/dev-php/pecl-mailparse/pecl-mailparse-3.1.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-WANT_AUTOMAKE="none"
-PHP_EXT_NAME="mailparse"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-PHP_EXT_ECONF_ARGS=""
-USE_PHP="php7-2 php7-3 php7-4 php8-0"
-PHP_EXT_NEEDED_USE="unicode"
-DOCS=( README.md )
-
-inherit php-ext-pecl-r3
-
-KEYWORDS="amd64 ppc ppc64 x86"
-
-DESCRIPTION="PHP extension for parsing and working with RFC822 and MIME 
compliant messages"
-LICENSE="PHP-3.01"
-SLOT="7"
-IUSE=""



[gentoo-commits] repo/gentoo:master commit in: profiles/

2022-07-11 Thread Brian Evans
commit: 1546ef6d98f5ac266f2ca7a951e616cfe5bce4f6
Author: Brian Evans  gentoo  org>
AuthorDate: Mon Jul 11 13:33:21 2022 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Mon Jul 11 13:34:06 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1546ef6d

profiles: Last-rites for dev-php/pecl-geoip

Signed-off-by: Brian Evans  gentoo.org>

 profiles/package.mask | 7 +++
 1 file changed, 7 insertions(+)

diff --git a/profiles/package.mask b/profiles/package.mask
index ce6e4622a62b..79e046700580 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -33,6 +33,13 @@
 
 #--- END OF EXAMPLES ---
 
+# Brian Evans  (2022-07-11)
+# The database behind this extension is no longer available
+# Please migrate to dev-php/maxmind-db-reader optionally with its
+# bundled extension. Bug 857636
+# Removal on 2022-08-10.
+dev-php/pecl-geoip
+
 # David Seifert  (2022-07-11)
 # Crashes with latest emboss, no other distro packages this,
 # ancient release, bug #361411, removal on 2022-08-10.



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

2022-07-09 Thread Brian Evans
commit: 4cdeacff00b3466376b13bed5d05ce970f6e3ceb
Author: Brian Evans  gentoo  org>
AuthorDate: Sat Jul  9 12:48:56 2022 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Sat Jul  9 12:51:59 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4cdeacff

dev-lang/php: Drop old

Bug: https://bugs.gentoo.org/857054
Signed-off-by: Brian Evans  gentoo.org>

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

diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index 6833102a87c3..79d898306f06 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -1,5 +1,4 @@
 DIST php-7.4.30.tar.xz 10419136 BLAKE2B 
5860ead4051173d3139f93be24f15c7ed2044a9e6b3488234aaca73dff8abace3adf00bde782c3fc950d81d2dfdb67979bb5b99c3587d07f5ccbe782d9cba37d
 SHA512 
7bce44a23c07193c10c57459f08b08fdce4e3a269d6829a61371d1b1f117ecf4e167805a40e1a5e7687f534aee9d5f5745a3f4dcb344e9e781c105bc964ed738
 DIST php-8.0.20.tar.xz 10879064 BLAKE2B 
3b18d6593ddc78e1c289b87ba8bb65e55cbd815d2b06d4f9759265e9ae76ea6b78dc9f52652be1b1a721ccfe736f80d2a8f59c01ba4c38a8ff46710753bcc9ed
 SHA512 
24153733111bb5104298679fb5ee02d8abad4e6b2a8e0a07c2a6076e1c9104309abe56bcb7b5fe17670c266e5e9981c520ed0ac12b699ae0050953ff99ef04fa
 DIST php-8.0.21.tar.xz 10785364 BLAKE2B 
ea8a640b47c96b235b49ce3a98accbfa4aa967c7e917684e19667a74ca0f77e070847dabdf15c3dbd56cff01ef662e79e9408d3e57e870e51893e969291a0932
 SHA512 
c1c1577f3d6af445d8ac15338877186f2a639a76ad980328011cb0a5e9592bdb24c1cda7ae8a0c495c881497d54cbca6e1373ede71bf097e69a040368841d567
-DIST php-8.1.7.tar.xz 11718520 BLAKE2B 
145fdff9ec4ce72d4f4626b1cb11674240db4830c5ffda1cdfaa807b195d40ea70afe69ae702a2ba256961ba810b9de5151bef20352eaa98553c837c65d730e3
 SHA512 
1d72db220f3485310e02b67c41dd6434c26b7118f673ba7f425ff6b79cc96c86fc45bfe9c90b302d719eb9b7a5334f363a92ac309c367aacc93ab31a72a63c45
 DIST php-8.1.8.tar.xz 11722100 BLAKE2B 
117e0823b47485d4fc469edfbc5e9051b5d35588bf36a2d9e12282b83c12056cfc2a4376bf0e21b5f947190a906e3e4fdde7bec20b7ea7e9ab36912e865c2c13
 SHA512 
4ef03b4c412bdbcdf6c3dc4784b3218a0519e6b91a0682e796270d4426c05c62309b4835ea31271857a5f2535d00f20a9f9b4a79703a49c3e40f16fafa948dd4

diff --git a/dev-lang/php/php-8.1.7.ebuild b/dev-lang/php/php-8.1.7.ebuild
deleted file mode 100644
index baff332bc988..
--- a/dev-lang/php/php-8.1.7.ebuild
+++ /dev/null
@@ -1,759 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-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}"
-
-# 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 ) )
-   !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 )&

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

2022-07-07 Thread Brian Evans
commit: 8794d29e1945fb875af32a7e5edb938245081662
Author: Brian Evans  gentoo  org>
AuthorDate: Thu Jul  7 19:28:20 2022 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Thu Jul  7 19:28:20 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8794d29e

dev-lang/php: Version bump for 8.1.8

Signed-off-by: Brian Evans  gentoo.org>

 dev-lang/php/Manifest |   1 +
 dev-lang/php/php-8.1.8.ebuild | 759 ++
 2 files changed, 760 insertions(+)

diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index d4e94998b8d8..6833102a87c3 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -2,3 +2,4 @@ DIST php-7.4.30.tar.xz 10419136 BLAKE2B 
5860ead4051173d3139f93be24f15c7ed2044a9e
 DIST php-8.0.20.tar.xz 10879064 BLAKE2B 
3b18d6593ddc78e1c289b87ba8bb65e55cbd815d2b06d4f9759265e9ae76ea6b78dc9f52652be1b1a721ccfe736f80d2a8f59c01ba4c38a8ff46710753bcc9ed
 SHA512 
24153733111bb5104298679fb5ee02d8abad4e6b2a8e0a07c2a6076e1c9104309abe56bcb7b5fe17670c266e5e9981c520ed0ac12b699ae0050953ff99ef04fa
 DIST php-8.0.21.tar.xz 10785364 BLAKE2B 
ea8a640b47c96b235b49ce3a98accbfa4aa967c7e917684e19667a74ca0f77e070847dabdf15c3dbd56cff01ef662e79e9408d3e57e870e51893e969291a0932
 SHA512 
c1c1577f3d6af445d8ac15338877186f2a639a76ad980328011cb0a5e9592bdb24c1cda7ae8a0c495c881497d54cbca6e1373ede71bf097e69a040368841d567
 DIST php-8.1.7.tar.xz 11718520 BLAKE2B 
145fdff9ec4ce72d4f4626b1cb11674240db4830c5ffda1cdfaa807b195d40ea70afe69ae702a2ba256961ba810b9de5151bef20352eaa98553c837c65d730e3
 SHA512 
1d72db220f3485310e02b67c41dd6434c26b7118f673ba7f425ff6b79cc96c86fc45bfe9c90b302d719eb9b7a5334f363a92ac309c367aacc93ab31a72a63c45
+DIST php-8.1.8.tar.xz 11722100 BLAKE2B 
117e0823b47485d4fc469edfbc5e9051b5d35588bf36a2d9e12282b83c12056cfc2a4376bf0e21b5f947190a906e3e4fdde7bec20b7ea7e9ab36912e865c2c13
 SHA512 
4ef03b4c412bdbcdf6c3dc4784b3218a0519e6b91a0682e796270d4426c05c62309b4835ea31271857a5f2535d00f20a9f9b4a79703a49c3e40f16fafa948dd4

diff --git a/dev-lang/php/php-8.1.8.ebuild b/dev-lang/php/php-8.1.8.ebuild
new file mode 100644
index ..7e88fdac09a1
--- /dev/null
+++ b/dev-lang/php/php-8.1.8.ebuild
@@ -0,0 +1,759 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+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}"
+
+# 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 ) )
+   !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="
+ 

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

2022-07-07 Thread Brian Evans
commit: dd118257e7c87977d1e85d625c594477e521c119
Author: Brian Evans  gentoo  org>
AuthorDate: Thu Jul  7 19:09:54 2022 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Thu Jul  7 19:09:54 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd118257

dev-lang/php: Version bump for 8.0.21

Signed-off-by: Brian Evans  gentoo.org>

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

diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index daa553c2..d4e94998b8d8 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -1,3 +1,4 @@
 DIST php-7.4.30.tar.xz 10419136 BLAKE2B 
5860ead4051173d3139f93be24f15c7ed2044a9e6b3488234aaca73dff8abace3adf00bde782c3fc950d81d2dfdb67979bb5b99c3587d07f5ccbe782d9cba37d
 SHA512 
7bce44a23c07193c10c57459f08b08fdce4e3a269d6829a61371d1b1f117ecf4e167805a40e1a5e7687f534aee9d5f5745a3f4dcb344e9e781c105bc964ed738
 DIST php-8.0.20.tar.xz 10879064 BLAKE2B 
3b18d6593ddc78e1c289b87ba8bb65e55cbd815d2b06d4f9759265e9ae76ea6b78dc9f52652be1b1a721ccfe736f80d2a8f59c01ba4c38a8ff46710753bcc9ed
 SHA512 
24153733111bb5104298679fb5ee02d8abad4e6b2a8e0a07c2a6076e1c9104309abe56bcb7b5fe17670c266e5e9981c520ed0ac12b699ae0050953ff99ef04fa
+DIST php-8.0.21.tar.xz 10785364 BLAKE2B 
ea8a640b47c96b235b49ce3a98accbfa4aa967c7e917684e19667a74ca0f77e070847dabdf15c3dbd56cff01ef662e79e9408d3e57e870e51893e969291a0932
 SHA512 
c1c1577f3d6af445d8ac15338877186f2a639a76ad980328011cb0a5e9592bdb24c1cda7ae8a0c495c881497d54cbca6e1373ede71bf097e69a040368841d567
 DIST php-8.1.7.tar.xz 11718520 BLAKE2B 
145fdff9ec4ce72d4f4626b1cb11674240db4830c5ffda1cdfaa807b195d40ea70afe69ae702a2ba256961ba810b9de5151bef20352eaa98553c837c65d730e3
 SHA512 
1d72db220f3485310e02b67c41dd6434c26b7118f673ba7f425ff6b79cc96c86fc45bfe9c90b302d719eb9b7a5334f363a92ac309c367aacc93ab31a72a63c45

diff --git a/dev-lang/php/php-8.0.21.ebuild b/dev-lang/php/php-8.0.21.ebuild
new file mode 100644
index ..c9ead2270c39
--- /dev/null
+++ b/dev-lang/php/php-8.0.21.ebuild
@@ -0,0 +1,758 @@
+# 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}"
+
+# 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 ) )
+   !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/li

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

2022-06-30 Thread Brian Evans
commit: b086a8ca8daca446a524eec9d11abb973e210536
Author: Brian Evans  gentoo  org>
AuthorDate: Thu Jun 30 15:09:12 2022 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Thu Jun 30 15:09:12 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b086a8ca

dev-php/pecl-mailparse: Fix whitespace on metadata

Signed-off-by: Brian Evans  gentoo.org>

 dev-php/pecl-mailparse/metadata.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-php/pecl-mailparse/metadata.xml 
b/dev-php/pecl-mailparse/metadata.xml
index 2297893a91a9..0e51a348d85f 100644
--- a/dev-php/pecl-mailparse/metadata.xml
+++ b/dev-php/pecl-mailparse/metadata.xml
@@ -6,6 +6,6 @@
PHP


-   php/pecl-mail-mailparse
+   php/pecl-mail-mailparse

 



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

2022-06-30 Thread Brian Evans
commit: 2fdaa3ba3f1bb3e762a5a9ba08c195155649ee0c
Author: Brian Evans  gentoo  org>
AuthorDate: Thu Jun 30 14:32:00 2022 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Thu Jun 30 14:32:00 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2fdaa3ba

dev-php/pecl-http: Fix whitespace in metadata

Signed-off-by: Brian Evans  gentoo.org>

 dev-php/pecl-http/metadata.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-php/pecl-http/metadata.xml b/dev-php/pecl-http/metadata.xml
index dc824b3a1b7c..a6713ca675f7 100644
--- a/dev-php/pecl-http/metadata.xml
+++ b/dev-php/pecl-http/metadata.xml
@@ -6,6 +6,6 @@
PHP


-   m6w6/ext-http
+   m6w6/ext-http

 



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

2022-06-30 Thread Brian Evans
commit: 0fd800760494b3f345c6ad005b05284515d3a111
Author: Brian Evans  gentoo  org>
AuthorDate: Thu Jun 30 14:07:57 2022 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Thu Jun 30 14:07:57 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0fd80076

dev-php/mailparse: Add upstream metadata

Signed-off-by: Brian Evans  gentoo.org>

 dev-php/pecl-mailparse/metadata.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/dev-php/pecl-mailparse/metadata.xml 
b/dev-php/pecl-mailparse/metadata.xml
index 222c77f3742a..2297893a91a9 100644
--- a/dev-php/pecl-mailparse/metadata.xml
+++ b/dev-php/pecl-mailparse/metadata.xml
@@ -5,4 +5,7 @@
php-b...@gentoo.org
PHP

+   
+   php/pecl-mail-mailparse
+   
 



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

2022-06-30 Thread Brian Evans
commit: 9a3762333f076078fc31d4f51c3f84debe2ef506
Author: Brian Evans  gentoo  org>
AuthorDate: Thu Jun 30 14:22:10 2022 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Thu Jun 30 14:22:10 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a376233

dev-php/pecl-event: Update metadata

Signed-off-by: Brian Evans  gentoo.org>

 dev-php/pecl-event/metadata.xml | 29 ++---
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/dev-php/pecl-event/metadata.xml b/dev-php/pecl-event/metadata.xml
index e88266cbe688..d2fc50b19cc3 100644
--- a/dev-php/pecl-event/metadata.xml
+++ b/dev-php/pecl-event/metadata.xml
@@ -1,15 +1,22 @@
 
 https://www.gentoo.org/dtd/metadata.dtd;>
 
-
-rrosma...@gmail.com
-Ruslan Osmanov
-
-
-proxy-ma...@gentoo.org
-Proxy Maintainers
-
-
-Add support of the Libevent extra API
-
+   
+   rrosma...@gmail.com
+   Ruslan Osmanov
+   
+   
+   proxy-ma...@gentoo.org
+   Proxy Maintainers
+   
+   
+   php-b...@gentoo.org
+   PHP
+   
+   
+   Add support of the Libevent extra API
+   
+   
+   osmanov/pecl-event
+   
 



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

2022-06-30 Thread Brian Evans
commit: fd587747b2356a0faaa40ffa734eb3c84cfacb99
Author: Brian Evans  gentoo  org>
AuthorDate: Thu Jun 30 13:26:40 2022 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Thu Jun 30 14:04:32 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd587747

dev-php/pecl-ssh2: Update live ebuild and add upstream metadata

Signed-off-by: Brian Evans  gentoo.org>

 dev-php/pecl-ssh2/metadata.xml  | 3 +++
 dev-php/pecl-ssh2/pecl-ssh2-.ebuild | 8 
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/dev-php/pecl-ssh2/metadata.xml b/dev-php/pecl-ssh2/metadata.xml
index 77793b997e9e..4d08220c3f76 100644
--- a/dev-php/pecl-ssh2/metadata.xml
+++ b/dev-php/pecl-ssh2/metadata.xml
@@ -5,4 +5,7 @@
php-b...@gentoo.org
PHP
 
+
+   php/pecl-networking-ssh2
+
 

diff --git a/dev-php/pecl-ssh2/pecl-ssh2-.ebuild 
b/dev-php/pecl-ssh2/pecl-ssh2-.ebuild
index 3d6ba5b1e14c..b5c9256a3d98 100644
--- a/dev-php/pecl-ssh2/pecl-ssh2-.ebuild
+++ b/dev-php/pecl-ssh2/pecl-ssh2-.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI="8"
 
 PHP_EXT_NAME="ssh2"
 
-USE_PHP="php7-3 php7-4 php8-0"
-EGIT_REPO_URI="https://git.php.net/repository/pecl/networking/ssh2.git;
+USE_PHP="php7-4 php8-0 php8-1"
+EGIT_REPO_URI="https://github.com/php/pecl-networking-ssh2.git;
 
 inherit php-ext-source-r3 git-r3
 



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

2022-06-30 Thread Brian Evans
commit: 5d307ddd727e8c573f8ff83683dabcdd2d151b58
Author: Brian Evans  gentoo  org>
AuthorDate: Thu Jun 30 14:04:09 2022 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Thu Jun 30 14:04:32 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d307ddd

dev-php/pecl-http: Version bump for 3.3.0

Signed-off-by: Brian Evans  gentoo.org>

 dev-php/pecl-http/Manifest   |  1 +
 dev-php/pecl-http/metadata.xml   |  3 ++
 dev-php/pecl-http/pecl-http-3.3.0.ebuild | 74 
 3 files changed, 78 insertions(+)

diff --git a/dev-php/pecl-http/Manifest b/dev-php/pecl-http/Manifest
index b019015d7974..199b3a293893 100644
--- a/dev-php/pecl-http/Manifest
+++ b/dev-php/pecl-http/Manifest
@@ -1,4 +1,5 @@
 DIST pecl_http-3.2.4.tgz 220631 BLAKE2B 
996236cf9dd2f7d9bfaf046306e99c3ccf778261df19df8fd828b5811798f784841d89a6890e7347bd20cc6da71c966ea3ac9b17bf058e0bb766db7e1a8a6c49
 SHA512 
59c41d57c94a6e50e2f0b261130a24791b2845246f783b55e7f644f9a897d3650da364c5b38a860761b4a23f9266ed05000d6348bae2a7941e59d6bf5fb61a9e
 DIST pecl_http-3.2.5.tgz 220593 BLAKE2B 
3dfeefa69b0566f15f1dda73e7e4da2723033424e704039fbb42177e4996b434ea3450e40aa16844fe52c9fabac96d16ba5154a0112f00ff3838cf7bde149938
 SHA512 
13e99cd567a708cba56150a2127d060cdc78f9f5908371e5fb5fb3f02f27f8aa1b48c5eb147f61e9b5c9d5f2c627049f846d810f0135072cc9e4cd967e2bfa1d
+DIST pecl_http-3.3.0.tgz 225653 BLAKE2B 
b8d3875b2716edda98a2f813e2f5947e65684da12be087b2ec51c405223574b2e44dee3ae0a653a538e9c3acafafcec1ff40778d45d8389b239a1ea4578c2831
 SHA512 
e774ba0514994f219cbd2d8bef872308be8617ea22894db72473042154842c62d918d4c0b87f8c592182fa81fd1487b672252d587857e1b306dce6d38e2f53fb
 DIST pecl_http-4.2.1.tgz 224452 BLAKE2B 
58d2e1159aa64b9893b2b8b67c8444801308084ac13a743760c25cb3d0456fb586f69dc6b9e77db53341e4e9e45ce68f954c47b4e2663afe86de67d63db5e8e2
 SHA512 
2ad7e57fae313a7b46ba88e528e124ac9d83804827131a6ef478ccf3cf5883dec2d928b8ceb377ee7f5947c76f24d640d77533a9946612419e526786a79877e6
 DIST pecl_http-4.2.2.tgz 224436 BLAKE2B 
26ef3bb38778f0374938ba3f3bddba37c3a2044c7b9ffe2aacbca2566251d26d37882bf66773b8ed62d46855e8f14ad9b577cdb1ef3db9eba9850c0b30e57284
 SHA512 
1203367d590c7d80ffe7a21e7ac352ba053e3daeb778bf99e08fc13582e665e1429f850e51e36304bdec15e6646b648f2c444b46fa263e5441d008ac41a00f4b

diff --git a/dev-php/pecl-http/metadata.xml b/dev-php/pecl-http/metadata.xml
index 222c77f3742a..dc824b3a1b7c 100644
--- a/dev-php/pecl-http/metadata.xml
+++ b/dev-php/pecl-http/metadata.xml
@@ -5,4 +5,7 @@
php-b...@gentoo.org
PHP

+   
+   m6w6/ext-http
+   
 

diff --git a/dev-php/pecl-http/pecl-http-3.3.0.ebuild 
b/dev-php/pecl-http/pecl-http-3.3.0.ebuild
new file mode 100644
index ..be789fd1c79e
--- /dev/null
+++ b/dev-php/pecl-http/pecl-http-3.3.0.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+PHP_EXT_NAME="http"
+PHP_EXT_PECL_PKG="pecl_http"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+PHP_INI_NAME="50-http"
+
+USE_PHP="php7-4 php8-0 php8-1"
+
+inherit php-ext-pecl-r3
+
+USE_PHP="php7-4"
+
+KEYWORDS="~amd64 ~x86"
+
+DESCRIPTION="Extended HTTP Support for PHP"
+LICENSE="BSD-2 MIT"
+SLOT="7"
+IUSE="ssl curl_ssl_gnutls curl_ssl_nss +curl_ssl_openssl"
+
+# Patch gets cookies working with curl 7.77, but further interop work was done 
later
+# Just set min version for this short time to live branch
+COMMON_DEPEND="app-arch/brotli:=
+   dev-libs/libevent
+   dev-php/pecl-propro:7[php_targets_php7-4(-)?]
+   >=dev-php/pecl-raphf-2.0.1:7[php_targets_php7-4(-)?]
+   net-dns/libidn2
+   sys-libs/zlib
+   ssl? ( 
>=net-misc/curl-7.77[ssl,curl_ssl_gnutls(-)=,curl_ssl_nss(-)=,curl_ssl_openssl(-)=]
 )
+   !ssl? ( >=net-misc/curl-7.77[-ssl] )
+"
+DEPEND="php_targets_php7-4? ( ${COMMON_DEPEND} 
dev-lang/php:7.4[session(-),iconv(-)] )"
+RDEPEND="${DEPEND}
+   php_targets_php8-0? ( dev-php/pecl-http:8[php_targets_php8-0(-)] )
+   php_targets_php8-1? ( dev-php/pecl-http:8[php_targets_php8-1(-)] )"
+
+PHP_EXT_ECONF_ARGS=( --with-http --without-http-shared-deps
+   --without-http-libidn-dir --without-http-libicu-dir
+   --without-http-libidnkit2-dir --without-http-libidnkit-dir )
+
+src_prepare() {
+   if use php_targets_php7-4 ; then
+   php-ext-source-r3_src_prepare
+   else
+   default_src_prepare
+   fi
+}
+
+src_install() {
+   if use php_targets_php7-4 ; then
+   php-ext-pecl-r3_src_install
+   fi
+}
+
+src_test() {
+   # Cannot use eclass function due to required modules
+   # All tests SKIP otherwise
+   for slot in $(php_get_slots); do
+   php_init_slot_env "${slo

[gentoo-commits] repo/gentoo:master commit in: profiles/base/

2022-06-29 Thread Brian Evans
commit: 32343bb2be31ab8e0a83bf82f43aec8e6256c239
Author: Brian Evans  gentoo  org>
AuthorDate: Wed Jun 29 13:05:48 2022 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Wed Jun 29 13:06:07 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32343bb2

Revert "profiles: Fix issue of pecl-redis and igbinary targets"

This reverts commit 460f9558fb7461492a403700b8450b8128e0e42b.

Signed-off-by: Brian Evans  gentoo.org>

 profiles/base/package.use.stable.mask | 4 
 1 file changed, 4 deletions(-)

diff --git a/profiles/base/package.use.stable.mask 
b/profiles/base/package.use.stable.mask
index 5470271414c2..ca177488de12 100644
--- a/profiles/base/package.use.stable.mask
+++ b/profiles/base/package.use.stable.mask
@@ -4,10 +4,6 @@
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in package.use.mask
 
-# Brian Evans  (2022-06-28)
-# Needs newer igbinary stable with target
-dev-php/pecl-redis php_targets_php8-1
-
 # Matt Turner  (2022-05-11)
 # app-text/pandoc is not stable
 app-text/nuspell doc



[gentoo-commits] repo/gentoo:master commit in: profiles/base/

2022-06-29 Thread Brian Evans
commit: 171358c7f69190ce62c4c0847c460b5799964a5f
Author: Brian Evans  gentoo  org>
AuthorDate: Wed Jun 29 13:05:20 2022 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Wed Jun 29 13:06:07 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=171358c7

Revert "Revert "profiles: Unmask php8-1 PHP_TARGETS USE""

This reverts commit 3462fa09e8a7764525b554d7f0187981eeb5fdb9.

Signed-off-by: Brian Evans  gentoo.org>

 profiles/base/use.stable.mask | 4 
 1 file changed, 4 deletions(-)

diff --git a/profiles/base/use.stable.mask b/profiles/base/use.stable.mask
index db3f89d740ed..ca3c1c75167c 100644
--- a/profiles/base/use.stable.mask
+++ b/profiles/base/use.stable.mask
@@ -9,10 +9,6 @@
 python_targets_python3_11
 python_single_target_python3_11
 
-# Brian Evans  (2021-11-29)
-# Mask 8.1 as it is currently unstable only
-php_targets_php8-1
-
 # Sergei Trofimovich  (2020-04-13)
 # dev-vcs/darcs (dev-lang/ghc) has no stable keywords.
 darcs



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

2022-06-29 Thread Brian Evans
commit: 3eeb33f6160b836cc6eff5710f6975ff98ac236c
Author: Brian Evans  gentoo  org>
AuthorDate: Wed Jun 29 13:02:09 2022 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Wed Jun 29 13:04:29 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3eeb33f6

dev-php/igbinary: Drop old

Signed-off-by: Brian Evans  gentoo.org>

 dev-php/igbinary/Manifest |  1 -
 dev-php/igbinary/igbinary-3.2.6-r1.ebuild | 22 --
 dev-php/igbinary/igbinary-3.2.6.ebuild| 22 --
 3 files changed, 45 deletions(-)

diff --git a/dev-php/igbinary/Manifest b/dev-php/igbinary/Manifest
index e81ad5f20515..79719ceff369 100644
--- a/dev-php/igbinary/Manifest
+++ b/dev-php/igbinary/Manifest
@@ -1,2 +1 @@
-DIST igbinary-3.2.6.tar.gz 245899 BLAKE2B 
05fd24a640ab9e1f2402645bf322b0a959be69c068ff203552f2806240d8504f1ff3c7b209d9b050ba7815a90bcec2aab823a24a2a2a1cc149da90d25166f18a
 SHA512 
b6c9e7b68716052d93a8535af4666fa3d5b4071bc181819cdc0ecd7f8e1c099001905ff2134eec6343daa77102a423ad0903f8800808c30806d3cb7faa4c7a06
 DIST igbinary-3.2.7.tar.gz 248481 BLAKE2B 
40936fb78b9f01d717daac78f8b707f902d78714e5202fbb1344042c2d30a3b723f9c5b6fd982f7a5002aab65e414ba7f9bda354fec4db82ba3f03fc09663a43
 SHA512 
1bdb60fa4ac76ef405b55b4a7e7f07c73ccc945a3fad8635934cf83a05ae554ac1a0b64c4b55229f0bd2a3269189d3266a492b064a0338fdb2bf4dfe5c3733e4

diff --git a/dev-php/igbinary/igbinary-3.2.6-r1.ebuild 
b/dev-php/igbinary/igbinary-3.2.6-r1.ebuild
deleted file mode 100644
index eecc1a37e244..
--- a/dev-php/igbinary/igbinary-3.2.6-r1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PHP_EXT_NAME="${PN}"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-DOCS=( CREDITS NEWS README.md )
-PHP_EXT_ECONF_ARGS=( --enable-${PN} )
-
-USE_PHP="php7-3 php7-4 php8-0 php8-1"
-
-inherit php-ext-source-r3
-
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-DESCRIPTION="A fast drop-in replacement for the standard PHP serialize"
-HOMEPAGE="https://github.com/igbinary/igbinary;
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"

diff --git a/dev-php/igbinary/igbinary-3.2.6.ebuild 
b/dev-php/igbinary/igbinary-3.2.6.ebuild
deleted file mode 100644
index c3306aa89d1c..
--- a/dev-php/igbinary/igbinary-3.2.6.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PHP_EXT_NAME="${PN}"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-DOCS=( CREDITS NEWS README.md )
-PHP_EXT_ECONF_ARGS=( --enable-${PN} )
-
-USE_PHP="php7-3 php7-4 php8-0"
-
-inherit php-ext-source-r3
-
-KEYWORDS="amd64 arm arm64 x86"
-
-DESCRIPTION="A fast drop-in replacement for the standard PHP serialize"
-HOMEPAGE="https://github.com/igbinary/igbinary;
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"



[gentoo-commits] repo/gentoo:master commit in: profiles/base/

2022-06-29 Thread Brian Evans
commit: fa3fc49263ec1e934482195876d4a8233e343cb6
Author: Brian Evans  gentoo  org>
AuthorDate: Wed Jun 29 13:02:58 2022 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Wed Jun 29 13:04:30 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa3fc492

Revert "profiles: Unmask php8-1 PHP_TARGETS USE"

This reverts commit 781f471f6a06d623580e072f24e4534dbd1ab280.

Signed-off-by: Brian Evans  gentoo.org>

 profiles/base/use.stable.mask | 4 
 1 file changed, 4 insertions(+)

diff --git a/profiles/base/use.stable.mask b/profiles/base/use.stable.mask
index ca3c1c75167c..db3f89d740ed 100644
--- a/profiles/base/use.stable.mask
+++ b/profiles/base/use.stable.mask
@@ -9,6 +9,10 @@
 python_targets_python3_11
 python_single_target_python3_11
 
+# Brian Evans  (2021-11-29)
+# Mask 8.1 as it is currently unstable only
+php_targets_php8-1
+
 # Sergei Trofimovich  (2020-04-13)
 # dev-vcs/darcs (dev-lang/ghc) has no stable keywords.
 darcs



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

2022-06-29 Thread Brian Evans
commit: 6970f393986186a94b83acc34c319039de75c7fc
Author: Brian Evans  gentoo  org>
AuthorDate: Wed Jun 29 12:59:56 2022 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Wed Jun 29 12:59:56 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6970f393

dev-php/pecl-apcu: Drop old

Signed-off-by: Brian Evans  gentoo.org>

 dev-php/pecl-apcu/Manifest|  2 -
 dev-php/pecl-apcu/pecl-apcu-5.1.19.ebuild | 63 ---
 dev-php/pecl-apcu/pecl-apcu-5.1.20.ebuild | 63 ---
 3 files changed, 128 deletions(-)

diff --git a/dev-php/pecl-apcu/Manifest b/dev-php/pecl-apcu/Manifest
index effbc39b4daf..ae62b97debbb 100644
--- a/dev-php/pecl-apcu/Manifest
+++ b/dev-php/pecl-apcu/Manifest
@@ -1,3 +1 @@
-DIST apcu-5.1.19.tgz 96583 BLAKE2B 
330c08a4e557691d0b402111877b3caf56b211256db17cce52a76aeefce7237505eca4ecd71f3770ef3c405182a1604a92cc458cb9bca435b42370fe917e21a7
 SHA512 
45077e3bd0eac207539e2eafe21968c71f49b8c8920168dbafa87961b041f1d348b6bf1c130104744bc541e1f690854f0a29062e9520db81c04edeee3ef2ed99
-DIST apcu-5.1.20.tgz 96727 BLAKE2B 
b8223856e0aaa52f90dffa674bbd9b047caa8c91d81b637eafc2f59fbbfdfe0d6ce30e990a87cb4833e895fcfd944f7d57eb6f7356b3e2361d6be5a535bb3a63
 SHA512 
3e10b7e5dc7481b1250610ef83954875f427b9114d6b232bad9064fc33d8c8906bcc317f94a6cfc9f76c720fa06a44270d259cf2ceef6c1ec9dcadc49254ee1b
 DIST apcu-5.1.21.tgz 92516 BLAKE2B 
32d73b89bde9ef4eb01c9ad766930e87300b86776c95929607a8aaefba5043e3a7947d064416ac083ff38876fdb41bb03dab1552ac82e54f809269b4c925
 SHA512 
a6ffe8349760d27cde0d86017a59a68e9639bf385e606622d807094f4e5fb305bb25b9ce00077d0856f4d223d44329f7a6314c229b62c78d8e2b085593c92bb3

diff --git a/dev-php/pecl-apcu/pecl-apcu-5.1.19.ebuild 
b/dev-php/pecl-apcu/pecl-apcu-5.1.19.ebuild
deleted file mode 100644
index c7fb42739132..
--- a/dev-php/pecl-apcu/pecl-apcu-5.1.19.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PHP_EXT_NAME="apcu"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-DOCS=( NOTICE README.md TECHNOTES.txt )
-
-USE_PHP="php7-2 php7-3 php7-4 php8-0"
-
-inherit php-ext-pecl-r3
-
-KEYWORDS="amd64 arm64 x86"
-
-DESCRIPTION="Stripped down version of APC supporting only user cache"
-LICENSE="PHP-3.01"
-SLOT="7"
-
-LOCKS="pthreadmutex pthreadrw spinlock semaphore"
-
-LUSE=""
-for l in ${LOCKS}; do
-   LUSE+="lock-${l} "
-done
-
-IUSE="+mmap ${LUSE/lock-pthreadrw/+lock-pthreadrw}"
-
-REQUIRED_USE="^^ ( $LUSE )"
-
-src_prepare() {
-   php-ext-source-r3_src_prepare
-   # Remove broken tests from php 7.4 due to trivial output differences
-   if use php_targets_php7-4 ; then
-   php_init_slot_env "php7.4"
-   rm "${PHP_EXT_S}"/tests/apc_entry_00{2,3}.phpt || die
-   fi
-}
-
-src_configure() {
-   local PHP_EXT_ECONF_ARGS=(
-   --enable-apcu
-   $(use_enable mmap apcu-mmap)
-   $(use_enable lock-spinlock apcu-spinlocks)
-   )
-   # Broken upstream autoconf test disables if present at all
-   use lock-pthreadrw || PHP_EXT_ECONF_ARGS+=( --disable-apcu-rwlocks )
-
-   php-ext-source-r3_src_configure
-}
-
-src_install() {
-   php-ext-pecl-r3_src_install
-
-   insinto /usr/share/php7/apcu
-   doins apc.php
-}
-
-pkg_postinst() {
-   elog "The apc.php file shipped with this release of pecl-apcu was"
-   elog "installed to ${EPREFIX}/usr/share/php7/apcu/."
-}

diff --git a/dev-php/pecl-apcu/pecl-apcu-5.1.20.ebuild 
b/dev-php/pecl-apcu/pecl-apcu-5.1.20.ebuild
deleted file mode 100644
index ab9a31c49a50..
--- a/dev-php/pecl-apcu/pecl-apcu-5.1.20.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PHP_EXT_NAME="apcu"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-DOCS=( NOTICE README.md TECHNOTES.txt )
-
-USE_PHP="php7-2 php7-3 php7-4 php8-0"
-
-inherit php-ext-pecl-r3
-
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-DESCRIPTION="Stripped down version of APC supporting only user cache"
-LICENSE="PHP-3.01"
-SLOT="7"
-
-LOCKS="pthreadmutex pthreadrw spinlock semaphore"
-
-LUSE=""
-for l in ${LOCKS}; do
-   LUSE+="lock-${l} "
-done
-
-IUSE="+mmap ${LUSE/lock-pthreadrw/+lock-pthreadrw}"
-
-REQUIRED_USE="^^ ( $LUSE )"
-
-src_prepare() {
-   php-ext-source-r3_src_prepare
-   # Remove broken tests from php 7.4 due to trivial output differences
-   if use php_targets_php7-4 ; then
-   php_init_slot_env "php7.4"
-   rm "${PHP_EXT_S}"

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

2022-06-28 Thread Brian Evans
commit: 8bf82ab70e81e2852e7249dfc30b8d246020e866
Author: Brian Evans  gentoo  org>
AuthorDate: Wed Jun 29 01:24:14 2022 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Wed Jun 29 01:24:14 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8bf82ab7

dev-php/pecl-apcu: Drop old PHP targets

Signed-off-by: Brian Evans  gentoo.org>

 dev-php/pecl-apcu/pecl-apcu-5.1.21.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-php/pecl-apcu/pecl-apcu-5.1.21.ebuild 
b/dev-php/pecl-apcu/pecl-apcu-5.1.21.ebuild
index 76efe265be57..8f7d2af61a28 100644
--- a/dev-php/pecl-apcu/pecl-apcu-5.1.21.ebuild
+++ b/dev-php/pecl-apcu/pecl-apcu-5.1.21.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,7 +8,7 @@ PHP_EXT_INI="yes"
 PHP_EXT_ZENDEXT="no"
 DOCS=( NOTICE README.md TECHNOTES.txt )
 
-USE_PHP="php7-2 php7-3 php7-4 php8-0 php8-1"
+USE_PHP="php7-4 php8-0 php8-1"
 
 inherit php-ext-pecl-r3
 



[gentoo-commits] repo/gentoo:master commit in: profiles/base/

2022-06-28 Thread Brian Evans
commit: 460f9558fb7461492a403700b8450b8128e0e42b
Author: Brian Evans  gentoo  org>
AuthorDate: Tue Jun 28 12:59:56 2022 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Tue Jun 28 13:01:06 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=460f9558

profiles: Fix issue of pecl-redis and igbinary targets

Signed-off-by: Brian Evans  gentoo.org>

 profiles/base/package.use.stable.mask | 4 
 1 file changed, 4 insertions(+)

diff --git a/profiles/base/package.use.stable.mask 
b/profiles/base/package.use.stable.mask
index ca177488de12..5470271414c2 100644
--- a/profiles/base/package.use.stable.mask
+++ b/profiles/base/package.use.stable.mask
@@ -4,6 +4,10 @@
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in package.use.mask
 
+# Brian Evans  (2022-06-28)
+# Needs newer igbinary stable with target
+dev-php/pecl-redis php_targets_php8-1
+
 # Matt Turner  (2022-05-11)
 # app-text/pandoc is not stable
 app-text/nuspell doc



[gentoo-commits] repo/gentoo:master commit in: profiles/base/

2022-06-28 Thread Brian Evans
commit: 781f471f6a06d623580e072f24e4534dbd1ab280
Author: Brian Evans  gentoo  org>
AuthorDate: Tue Jun 28 12:31:51 2022 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Tue Jun 28 12:31:51 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=781f471f

profiles: Unmask php8-1 PHP_TARGETS USE

Signed-off-by: Brian Evans  gentoo.org>
Closes: https://bugs.gentoo.org/854696

 profiles/base/use.stable.mask | 4 
 1 file changed, 4 deletions(-)

diff --git a/profiles/base/use.stable.mask b/profiles/base/use.stable.mask
index db3f89d740ed..ca3c1c75167c 100644
--- a/profiles/base/use.stable.mask
+++ b/profiles/base/use.stable.mask
@@ -9,10 +9,6 @@
 python_targets_python3_11
 python_single_target_python3_11
 
-# Brian Evans  (2021-11-29)
-# Mask 8.1 as it is currently unstable only
-php_targets_php8-1
-
 # Sergei Trofimovich  (2020-04-13)
 # dev-vcs/darcs (dev-lang/ghc) has no stable keywords.
 darcs



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

2022-06-22 Thread Brian Evans
commit: 2041671986c43c382dfd33abf5fa3cb73a6849fe
Author: Brian Evans  gentoo  org>
AuthorDate: Wed Jun 22 13:44:25 2022 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Wed Jun 22 13:44:25 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20416719

dev-lang/php: Drop old vulnerable versions

Signed-off-by: Brian Evans  gentoo.org>

 dev-lang/php/Manifest |   2 -
 dev-lang/php/php-7.4.28-r1.ebuild | 746 -
 dev-lang/php/php-8.0.16-r1.ebuild | 758 --
 3 files changed, 1506 deletions(-)

diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index 3211cb57d317..daa553c2 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -1,5 +1,3 @@
-DIST php-7.4.28.tar.xz 10418352 BLAKE2B 
27673b5a891723a4c20a19fa22708f733b8ff12e16e5bbd727ed841845bcb8802ea98e8c2a4936b184704cde96f8725a2c338470ba573e8d3a0732a3f449e7e5
 SHA512 
e7fa281a3be9ec46b7fa69619fd417fc04200dc64fd153f9670184d84b0aa3d5f3698536cf18476a96d8a42ba40b856ff57ab18e8e8a485dd9b95467d1952fa8
 DIST php-7.4.30.tar.xz 10419136 BLAKE2B 
5860ead4051173d3139f93be24f15c7ed2044a9e6b3488234aaca73dff8abace3adf00bde782c3fc950d81d2dfdb67979bb5b99c3587d07f5ccbe782d9cba37d
 SHA512 
7bce44a23c07193c10c57459f08b08fdce4e3a269d6829a61371d1b1f117ecf4e167805a40e1a5e7687f534aee9d5f5745a3f4dcb344e9e781c105bc964ed738
-DIST php-8.0.16.tar.xz 10864076 BLAKE2B 
e5820ecd40632e458a0ada1d1886cd054520ab7f1492766fd8d5c3561977359abddd886b47f7d7255bcc80d00c96afeceb5cbd515eb779ed4ac15db9e01f1fe3
 SHA512 
68952638f2965752be26dc0a49f938eb4f251f2d5a7b309a2983c4f9bc064738c9da2e8015ec9b2ecc0dc06e014ace3c0348222166b898a4a38c31ab8b0fd139
 DIST php-8.0.20.tar.xz 10879064 BLAKE2B 
3b18d6593ddc78e1c289b87ba8bb65e55cbd815d2b06d4f9759265e9ae76ea6b78dc9f52652be1b1a721ccfe736f80d2a8f59c01ba4c38a8ff46710753bcc9ed
 SHA512 
24153733111bb5104298679fb5ee02d8abad4e6b2a8e0a07c2a6076e1c9104309abe56bcb7b5fe17670c266e5e9981c520ed0ac12b699ae0050953ff99ef04fa
 DIST php-8.1.7.tar.xz 11718520 BLAKE2B 
145fdff9ec4ce72d4f4626b1cb11674240db4830c5ffda1cdfaa807b195d40ea70afe69ae702a2ba256961ba810b9de5151bef20352eaa98553c837c65d730e3
 SHA512 
1d72db220f3485310e02b67c41dd6434c26b7118f673ba7f425ff6b79cc96c86fc45bfe9c90b302d719eb9b7a5334f363a92ac309c367aacc93ab31a72a63c45

diff --git a/dev-lang/php/php-7.4.28-r1.ebuild 
b/dev-lang/php/php-7.4.28-r1.ebuild
deleted file mode 100644
index e0fc215450d6..
--- a/dev-lang/php/php-7.4.28-r1.ebuild
+++ /dev/null
@@ -1,746 +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}"
-
-# 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 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 +json kerberos ldap ldap-sasl libedit lmdb
-   mhash mssql mysql mysqli nls
-   oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
-   readline selinux +session session-mm sharedmem
-   +simplexml snmp soap sockets sodium spell sqlite ssl
-   sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode webp
-   +xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib"
-
-# Without USE=readline or libedit, the interactive "php -a" CLI will hang.
-# The Oracle instant client provides its own incompatible ldap library.
-REQUIRED_USE="
-   || ( cli cgi fpm apache2 embed phpdbg )
-   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 )
-   xmlrpc? ( xml iconv )
-   xmlreader? ( xml )
-   xmlwriter? ( xml )
-   xslt? ( xml )
-   ldap-sasl? ( ldap )
-   oci8-instant-client? ( !ldap )
-   qdbm? ( !gdbm )
-   session-mm? ( session !threads )
-  

[gentoo-commits] repo/gentoo:master commit in: sys-power/acpilight/

2022-06-21 Thread Brian Evans
commit: a3db635a835144c5698141571dc31a65edb452c0
Author: Brian Evans  gentoo  org>
AuthorDate: Tue Jun 21 12:55:05 2022 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Tue Jun 21 12:55:05 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3db635a

sys-power/acpilight: Fix QA warning and drop old revision

Closes: https://bugs.gentoo.org/852281
Signed-off-by: Brian Evans  gentoo.org>

 sys-power/acpilight/acpilight-1.2-r3.ebuild | 57 -
 sys-power/acpilight/acpilight-1.2-r4.ebuild |  5 +++
 2 files changed, 5 insertions(+), 57 deletions(-)

diff --git a/sys-power/acpilight/acpilight-1.2-r3.ebuild 
b/sys-power/acpilight/acpilight-1.2-r3.ebuild
deleted file mode 100644
index c54de4cb4446..
--- a/sys-power/acpilight/acpilight-1.2-r3.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_7 python3_8 python3_9 )
-
-inherit python-single-r1 udev
-
-MY_P="${PN}-v${PV}"
-
-DESCRIPTION="Replacement for xbacklight that uses the ACPI interface to set 
brightness"
-HOMEPAGE="https://gitlab.com/wavexx/acpilight/;
-SRC_URI="https://gitlab.com/wavexx/acpilight/-/archive/v${PV}/${MY_P}.tar.gz;
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-S="${WORKDIR}/${MY_P}"
-
-RDEPEND="virtual/udev
-   acct-group/video
-   !dev-libs/light
-   ${PYTHON_DEPS}
-   !x11-apps/xbacklight"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-DOCS=( README.rst NEWS.rst )
-
-PATCHES=( "${FILESDIR}/acpilight-1.2-fix-log10-of-zero.patch" )
-
-# Disable Makefile that installs by default
-src_compile() { :; }
-
-src_install() {
-   python_doscript xbacklight
-   udev_dorules "${S}"/90-backlight.rules
-   doman xbacklight.1
-   einstalldocs
-   newinitd "${FILESDIR}"/acpilight.initd acpilight
-   newconfd "${FILESDIR}"/acpilight.confd acpilight
-}
-
-pkg_postinst() {
-   udev_reload
-   einfo
-   elog "To use the xbacklight binary as a regular user, you must be a 
part of the video group"
-   einfo
-   elog "If this utility does not find any backlights to manipulate,"
-   elog "verify you have kernel support on the device and display driver 
enabled."
-   einfo
-   elog "To take advantage of the OpenRC init script, and automate the 
process of"
-   elog "saving and restoring the brightness level you should add 
acpilight"
-   elog "to the boot runlevel. You can do this as root like so:"
-   elog "# rc-update add acpilight boot"
-   einfo
-}

diff --git a/sys-power/acpilight/acpilight-1.2-r4.ebuild 
b/sys-power/acpilight/acpilight-1.2-r4.ebuild
index d8d22ccaa34a..16457c2bda89 100644
--- a/sys-power/acpilight/acpilight-1.2-r4.ebuild
+++ b/sys-power/acpilight/acpilight-1.2-r4.ebuild
@@ -55,3 +55,8 @@ pkg_postinst() {
elog "# rc-update add acpilight boot"
einfo
 }
+
+pkg_postrm() {
+   # Triggers a QA warning if missing
+   udev_reload
+}



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

2022-06-17 Thread Brian Evans
commit: 76a85812becbd12f300ee619fa78e0973c3e2cdf
Author: Brian Evans  gentoo  org>
AuthorDate: Fri Jun 17 13:20:01 2022 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Fri Jun 17 15:33:07 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76a85812

dev-lang/php: Version bump for 7.4.30

Bug: https://bugs.gentoo.org/850772
Signed-off-by: Brian Evans  gentoo.org>

 dev-lang/php/Manifest  |   1 +
 dev-lang/php/php-7.4.30.ebuild | 746 +
 2 files changed, 747 insertions(+)

diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index 5c9c1ea06473..461aa492570f 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -1,4 +1,5 @@
 DIST php-7.4.28.tar.xz 10418352 BLAKE2B 
27673b5a891723a4c20a19fa22708f733b8ff12e16e5bbd727ed841845bcb8802ea98e8c2a4936b184704cde96f8725a2c338470ba573e8d3a0732a3f449e7e5
 SHA512 
e7fa281a3be9ec46b7fa69619fd417fc04200dc64fd153f9670184d84b0aa3d5f3698536cf18476a96d8a42ba40b856ff57ab18e8e8a485dd9b95467d1952fa8
+DIST php-7.4.30.tar.xz 10419136 BLAKE2B 
5860ead4051173d3139f93be24f15c7ed2044a9e6b3488234aaca73dff8abace3adf00bde782c3fc950d81d2dfdb67979bb5b99c3587d07f5ccbe782d9cba37d
 SHA512 
7bce44a23c07193c10c57459f08b08fdce4e3a269d6829a61371d1b1f117ecf4e167805a40e1a5e7687f534aee9d5f5745a3f4dcb344e9e781c105bc964ed738
 DIST php-8.0.16.tar.xz 10864076 BLAKE2B 
e5820ecd40632e458a0ada1d1886cd054520ab7f1492766fd8d5c3561977359abddd886b47f7d7255bcc80d00c96afeceb5cbd515eb779ed4ac15db9e01f1fe3
 SHA512 
68952638f2965752be26dc0a49f938eb4f251f2d5a7b309a2983c4f9bc064738c9da2e8015ec9b2ecc0dc06e014ace3c0348222166b898a4a38c31ab8b0fd139
 DIST php-8.0.18.tar.xz 10871224 BLAKE2B 
89477d4b93de93fe9ad9a0c90864381038d93967018f8452cbc5a56b8ca11972976447a8fcd75368b8991cd2dfffaa392cb8962dc4d5b2dc184c3a6ed87277aa
 SHA512 
fda43f5bcb2aba7c2777331b41d2d8bb35c0b8508feef1a2fbff15105acfd7a41e0a4f1f9111e5cf1091e5df04ac4c737ec939c5bd5d85535b3b3ebb0450bc21
 DIST php-8.0.19.tar.xz 10778992 BLAKE2B 
346632113cdb10f7e21df803240f3ee683ec2976386d7dded2702b8185ff7964313a344c999af02444b07f80de9effa8ff1272b2dfd80db2122128223a5aa57b
 SHA512 
106aa7c9f4804b8ce3518d7e6da4dc8f2a4df2f0b5d7369776737e0b13d4cd6be375694b78271fd1d007d4e0892009dc2a7214c1652462ebf128b74f845787e8

diff --git a/dev-lang/php/php-7.4.30.ebuild b/dev-lang/php/php-7.4.30.ebuild
new file mode 100644
index ..60c26217d26a
--- /dev/null
+++ b/dev-lang/php/php-7.4.30.ebuild
@@ -0,0 +1,746 @@
+# 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}"
+
+# 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 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 +json kerberos ldap ldap-sasl libedit lmdb
+   mhash mssql mysql mysqli nls
+   oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
+   readline selinux +session session-mm sharedmem
+   +simplexml snmp soap sockets sodium spell sqlite ssl
+   sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode webp
+   +xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib"
+
+# Without USE=readline or libedit, the interactive "php -a" CLI will hang.
+# The Oracle instant client provides its own incompatible ldap library.
+REQUIRED_USE="
+   || ( cli cgi fpm apache2 embed phpdbg )
+   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 )
+   xmlrpc? ( xml iconv )
+   xmlreader? ( xml )
+   xmlwriter? ( xml )
+   xslt? ( xml )
+   ldap-sasl? ( ldap )
+   oci8-instant-client? ( !ldap )
+   qdbm? ( !gdbm )
+   session-mm? ( session !threads )
+   mysql? ( || ( mysqli pdo ) )
+   firebird?

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

2022-06-17 Thread Brian Evans
commit: d1051285f2c6040d26cf195813fc95eb5655d065
Author: Brian Evans  gentoo  org>
AuthorDate: Fri Jun 17 13:39:26 2022 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Fri Jun 17 15:33:08 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1051285

dev-lang/php: Version bump for 8.0.20

Bug: https://bugs.gentoo.org/850772
Signed-off-by: Brian Evans  gentoo.org>

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

diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index 461aa492570f..a4615961176a 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -3,5 +3,6 @@ DIST php-7.4.30.tar.xz 10419136 BLAKE2B 
5860ead4051173d3139f93be24f15c7ed2044a9e
 DIST php-8.0.16.tar.xz 10864076 BLAKE2B 
e5820ecd40632e458a0ada1d1886cd054520ab7f1492766fd8d5c3561977359abddd886b47f7d7255bcc80d00c96afeceb5cbd515eb779ed4ac15db9e01f1fe3
 SHA512 
68952638f2965752be26dc0a49f938eb4f251f2d5a7b309a2983c4f9bc064738c9da2e8015ec9b2ecc0dc06e014ace3c0348222166b898a4a38c31ab8b0fd139
 DIST php-8.0.18.tar.xz 10871224 BLAKE2B 
89477d4b93de93fe9ad9a0c90864381038d93967018f8452cbc5a56b8ca11972976447a8fcd75368b8991cd2dfffaa392cb8962dc4d5b2dc184c3a6ed87277aa
 SHA512 
fda43f5bcb2aba7c2777331b41d2d8bb35c0b8508feef1a2fbff15105acfd7a41e0a4f1f9111e5cf1091e5df04ac4c737ec939c5bd5d85535b3b3ebb0450bc21
 DIST php-8.0.19.tar.xz 10778992 BLAKE2B 
346632113cdb10f7e21df803240f3ee683ec2976386d7dded2702b8185ff7964313a344c999af02444b07f80de9effa8ff1272b2dfd80db2122128223a5aa57b
 SHA512 
106aa7c9f4804b8ce3518d7e6da4dc8f2a4df2f0b5d7369776737e0b13d4cd6be375694b78271fd1d007d4e0892009dc2a7214c1652462ebf128b74f845787e8
+DIST php-8.0.20.tar.xz 10879064 BLAKE2B 
3b18d6593ddc78e1c289b87ba8bb65e55cbd815d2b06d4f9759265e9ae76ea6b78dc9f52652be1b1a721ccfe736f80d2a8f59c01ba4c38a8ff46710753bcc9ed
 SHA512 
24153733111bb5104298679fb5ee02d8abad4e6b2a8e0a07c2a6076e1c9104309abe56bcb7b5fe17670c266e5e9981c520ed0ac12b699ae0050953ff99ef04fa
 DIST php-8.1.5.tar.xz 11752684 BLAKE2B 
b81dcad2fb188cbae261af83ffea764826bd12ec59e888a735102f491c53545aafbf9d85fa3c7d9277d15474c5bcf0e888d584f83ecc82d607fe969c7b15e73e
 SHA512 
184d3738dbd8207a84cfb11dcc1edf352c57da49f484fe791d8c786ab8921189fdaf459b98e3bd6a5f73ae968510e8a8566f41a69640c74adb35363d6c07c439
 DIST php-8.1.6.tar.xz 11708824 BLAKE2B 
61420753dae098cfd40a916f3a05b123462dbd5e7d08be6e8cbce8ec559b0538d3d5cb3f137b13326d6fba2c87a932cced0728341f8ba916f6cecf98add4fd1e
 SHA512 
df5ab8e90aced1cc904c6abd25f42b0c59a327fe4f7b518591c23820e711952f3b1e70b31a1c2e90282621891400b492fb099cbadafcd0ef7991ccc2962156de

diff --git a/dev-lang/php/php-8.0.20.ebuild b/dev-lang/php/php-8.0.20.ebuild
new file mode 100644
index ..c9ead2270c39
--- /dev/null
+++ b/dev-lang/php/php-8.0.20.ebuild
@@ -0,0 +1,758 @@
+# 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}"
+
+# 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 ) )
+   !cli? ( ?? ( readline libedit ) )
+   truetype? ( gd zlib )
+   webp? ( gd zlib )
+   cjk? ( gd zlib )
+   exif? ( gd zlib )
+   xpm?

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

2022-06-17 Thread Brian Evans
commit: e3463760f4fd52f3b83b056529995564b24da5e0
Author: Brian Evans  gentoo  org>
AuthorDate: Fri Jun 17 15:32:14 2022 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Fri Jun 17 15:33:08 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3463760

dev-lang/php: Drop old unstable versions

Signed-off-by: Brian Evans  gentoo.org>

 dev-lang/php/Manifest  |   4 -
 dev-lang/php/php-8.0.18.ebuild | 758 
 dev-lang/php/php-8.0.19.ebuild | 758 
 dev-lang/php/php-8.1.5.ebuild  | 759 -
 dev-lang/php/php-8.1.6.ebuild  | 759 -
 5 files changed, 3038 deletions(-)

diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index a8bdf1ca4e1b..3211cb57d317 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -1,9 +1,5 @@
 DIST php-7.4.28.tar.xz 10418352 BLAKE2B 
27673b5a891723a4c20a19fa22708f733b8ff12e16e5bbd727ed841845bcb8802ea98e8c2a4936b184704cde96f8725a2c338470ba573e8d3a0732a3f449e7e5
 SHA512 
e7fa281a3be9ec46b7fa69619fd417fc04200dc64fd153f9670184d84b0aa3d5f3698536cf18476a96d8a42ba40b856ff57ab18e8e8a485dd9b95467d1952fa8
 DIST php-7.4.30.tar.xz 10419136 BLAKE2B 
5860ead4051173d3139f93be24f15c7ed2044a9e6b3488234aaca73dff8abace3adf00bde782c3fc950d81d2dfdb67979bb5b99c3587d07f5ccbe782d9cba37d
 SHA512 
7bce44a23c07193c10c57459f08b08fdce4e3a269d6829a61371d1b1f117ecf4e167805a40e1a5e7687f534aee9d5f5745a3f4dcb344e9e781c105bc964ed738
 DIST php-8.0.16.tar.xz 10864076 BLAKE2B 
e5820ecd40632e458a0ada1d1886cd054520ab7f1492766fd8d5c3561977359abddd886b47f7d7255bcc80d00c96afeceb5cbd515eb779ed4ac15db9e01f1fe3
 SHA512 
68952638f2965752be26dc0a49f938eb4f251f2d5a7b309a2983c4f9bc064738c9da2e8015ec9b2ecc0dc06e014ace3c0348222166b898a4a38c31ab8b0fd139
-DIST php-8.0.18.tar.xz 10871224 BLAKE2B 
89477d4b93de93fe9ad9a0c90864381038d93967018f8452cbc5a56b8ca11972976447a8fcd75368b8991cd2dfffaa392cb8962dc4d5b2dc184c3a6ed87277aa
 SHA512 
fda43f5bcb2aba7c2777331b41d2d8bb35c0b8508feef1a2fbff15105acfd7a41e0a4f1f9111e5cf1091e5df04ac4c737ec939c5bd5d85535b3b3ebb0450bc21
-DIST php-8.0.19.tar.xz 10778992 BLAKE2B 
346632113cdb10f7e21df803240f3ee683ec2976386d7dded2702b8185ff7964313a344c999af02444b07f80de9effa8ff1272b2dfd80db2122128223a5aa57b
 SHA512 
106aa7c9f4804b8ce3518d7e6da4dc8f2a4df2f0b5d7369776737e0b13d4cd6be375694b78271fd1d007d4e0892009dc2a7214c1652462ebf128b74f845787e8
 DIST php-8.0.20.tar.xz 10879064 BLAKE2B 
3b18d6593ddc78e1c289b87ba8bb65e55cbd815d2b06d4f9759265e9ae76ea6b78dc9f52652be1b1a721ccfe736f80d2a8f59c01ba4c38a8ff46710753bcc9ed
 SHA512 
24153733111bb5104298679fb5ee02d8abad4e6b2a8e0a07c2a6076e1c9104309abe56bcb7b5fe17670c266e5e9981c520ed0ac12b699ae0050953ff99ef04fa
-DIST php-8.1.5.tar.xz 11752684 BLAKE2B 
b81dcad2fb188cbae261af83ffea764826bd12ec59e888a735102f491c53545aafbf9d85fa3c7d9277d15474c5bcf0e888d584f83ecc82d607fe969c7b15e73e
 SHA512 
184d3738dbd8207a84cfb11dcc1edf352c57da49f484fe791d8c786ab8921189fdaf459b98e3bd6a5f73ae968510e8a8566f41a69640c74adb35363d6c07c439
-DIST php-8.1.6.tar.xz 11708824 BLAKE2B 
61420753dae098cfd40a916f3a05b123462dbd5e7d08be6e8cbce8ec559b0538d3d5cb3f137b13326d6fba2c87a932cced0728341f8ba916f6cecf98add4fd1e
 SHA512 
df5ab8e90aced1cc904c6abd25f42b0c59a327fe4f7b518591c23820e711952f3b1e70b31a1c2e90282621891400b492fb099cbadafcd0ef7991ccc2962156de
 DIST php-8.1.7.tar.xz 11718520 BLAKE2B 
145fdff9ec4ce72d4f4626b1cb11674240db4830c5ffda1cdfaa807b195d40ea70afe69ae702a2ba256961ba810b9de5151bef20352eaa98553c837c65d730e3
 SHA512 
1d72db220f3485310e02b67c41dd6434c26b7118f673ba7f425ff6b79cc96c86fc45bfe9c90b302d719eb9b7a5334f363a92ac309c367aacc93ab31a72a63c45

diff --git a/dev-lang/php/php-8.0.18.ebuild b/dev-lang/php/php-8.0.18.ebuild
deleted file mode 100644
index e748ac33a469..
--- a/dev-lang/php/php-8.0.18.ebuild
+++ /dev/null
@@ -1,758 +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}"
-
-# 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 

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

2022-06-17 Thread Brian Evans
commit: 4fcb3c9c1056d5cfbffe79808ecf7a7df85f4627
Author: Brian Evans  gentoo  org>
AuthorDate: Fri Jun 17 15:30:33 2022 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Fri Jun 17 15:33:08 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4fcb3c9c

dev-lang/php: Version bump for 8.1.7

Bug: https://bugs.gentoo.org/850772
Signed-off-by: Brian Evans  gentoo.org>

 dev-lang/php/Manifest |   1 +
 dev-lang/php/php-8.1.7.ebuild | 759 ++
 2 files changed, 760 insertions(+)

diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index a4615961176a..a8bdf1ca4e1b 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -6,3 +6,4 @@ DIST php-8.0.19.tar.xz 10778992 BLAKE2B 
346632113cdb10f7e21df803240f3ee683ec2976
 DIST php-8.0.20.tar.xz 10879064 BLAKE2B 
3b18d6593ddc78e1c289b87ba8bb65e55cbd815d2b06d4f9759265e9ae76ea6b78dc9f52652be1b1a721ccfe736f80d2a8f59c01ba4c38a8ff46710753bcc9ed
 SHA512 
24153733111bb5104298679fb5ee02d8abad4e6b2a8e0a07c2a6076e1c9104309abe56bcb7b5fe17670c266e5e9981c520ed0ac12b699ae0050953ff99ef04fa
 DIST php-8.1.5.tar.xz 11752684 BLAKE2B 
b81dcad2fb188cbae261af83ffea764826bd12ec59e888a735102f491c53545aafbf9d85fa3c7d9277d15474c5bcf0e888d584f83ecc82d607fe969c7b15e73e
 SHA512 
184d3738dbd8207a84cfb11dcc1edf352c57da49f484fe791d8c786ab8921189fdaf459b98e3bd6a5f73ae968510e8a8566f41a69640c74adb35363d6c07c439
 DIST php-8.1.6.tar.xz 11708824 BLAKE2B 
61420753dae098cfd40a916f3a05b123462dbd5e7d08be6e8cbce8ec559b0538d3d5cb3f137b13326d6fba2c87a932cced0728341f8ba916f6cecf98add4fd1e
 SHA512 
df5ab8e90aced1cc904c6abd25f42b0c59a327fe4f7b518591c23820e711952f3b1e70b31a1c2e90282621891400b492fb099cbadafcd0ef7991ccc2962156de
+DIST php-8.1.7.tar.xz 11718520 BLAKE2B 
145fdff9ec4ce72d4f4626b1cb11674240db4830c5ffda1cdfaa807b195d40ea70afe69ae702a2ba256961ba810b9de5151bef20352eaa98553c837c65d730e3
 SHA512 
1d72db220f3485310e02b67c41dd6434c26b7118f673ba7f425ff6b79cc96c86fc45bfe9c90b302d719eb9b7a5334f363a92ac309c367aacc93ab31a72a63c45

diff --git a/dev-lang/php/php-8.1.7.ebuild b/dev-lang/php/php-8.1.7.ebuild
new file mode 100644
index ..7e88fdac09a1
--- /dev/null
+++ b/dev-lang/php/php-8.1.7.ebuild
@@ -0,0 +1,759 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+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}"
+
+# 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 ) )
+   !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 #5648

[gentoo-commits] repo/gentoo:master commit in: dev-util/imediff2/, dev-util/imediff2/files/

2022-05-21 Thread Brian Evans
commit: 16b5b03885a6220bd72c987409d430ce94eeb396
Author: Brian Evans  gentoo  org>
AuthorDate: Sat May 21 13:39:20 2022 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Sat May 21 13:39:20 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16b5b038

dev-util/imediff2: Drop old

Signed-off-by: Brian Evans  gentoo.org>

 dev-util/imediff2/Manifest   |   1 -
 dev-util/imediff2/files/1.1.2-python-3.patch | 155 ---
 dev-util/imediff2/imediff2-1.1.2-r6.ebuild   |  39 ---
 3 files changed, 195 deletions(-)

diff --git a/dev-util/imediff2/Manifest b/dev-util/imediff2/Manifest
index f550529bdba8..90751ecabb58 100644
--- a/dev-util/imediff2/Manifest
+++ b/dev-util/imediff2/Manifest
@@ -1,2 +1 @@
 DIST imediff2_1.1.2.1.orig.tar.gz 20393 BLAKE2B 
560eef8600bac8ad302907563bd8520ef7881009c8a35c74427d0d5d9e8d4303446f1eb39c01fec201c798f286023765776a84b1e1aaa9e2d585a45870375f16
 SHA512 
ad0e22f5f2f16efb976a0d6d16c34798cc8aace4251a99cb7764df6841f93c2a6bb9dc8cbb59d8f3ae5a5ad7c161a05b9c3c7b36cc7bdf98eac3ef3b735ef6c4
-DIST imediff2_1.1.2.orig.tar.gz 17974 BLAKE2B 
f83b6ab652b1dd044587e75e4e7551a8132e1860b14f0d85d37f35383bd161a672860162e93554cf4db844d6a4700fa1876a30874c50fcb8442b4190a9b19185
 SHA512 
54d196d67107283bc3339eba30acb1c60972f256a268e86da397e0bdafa05220facc7979638a6a917b0c2dc7171edc3aa6b188295c9f40e9debf87a63731e748

diff --git a/dev-util/imediff2/files/1.1.2-python-3.patch 
b/dev-util/imediff2/files/1.1.2-python-3.patch
deleted file mode 100644
index 811f41583129..
--- a/dev-util/imediff2/files/1.1.2-python-3.patch
+++ /dev/null
@@ -1,155 +0,0 @@
 a/imediff2 2017-11-14 09:28:57.007929569 -0500
-+++ b/imediff2 2017-11-14 10:11:12.618496692 -0500
-@@ -18,20 +18,20 @@
- # License along with the program; if not, write to the Free Software
- # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- 
--VERSION = '1.1.1'
-+VERSION = '1.1.2'
- PACKAGE = 'imediff2'
- 
--import curses.wrapper
-+import sys
-+if sys.version_info<(3,0,0):
-+  import curses.wrapper
- import curses
- import tempfile
- import gettext
- import difflib
- import getopt
--import string
- import types
- import time
- import pty
--import sys
- import os
- import errno
- 
-@@ -121,19 +122,19 @@
- def read_lines( filename ):
-   global assume_empty
-   try:
--fp = file( filename )
-+fp = open( filename )
- l = fp.readlines()
- fp.close()
- return l
--  except IOError, (error, message):
--if error == errno.ENOENT and assume_empty:
-+  except IOError as e:
-+if e.errno == errno.ENOENT and assume_empty:
-   return ""
- else:
--  sys.stderr.write(_("Could not read '%s': %s\n") % (filename, message))
-+  sys.stderr.write(_("Could not read '%s': %s\n") % (filename, 
e.strerror))
-   sys.exit(3)
- 
- def strip_end_lines( txt ):
--  return string.replace(string.replace(txt,"%c"%10,""),"%c"%13,"")
-+  return txt.replace("%c"%10,"").replace("%c"%13,"")
- 
- def main(stdscr, lines_a, lines_b, start_mode):
-   global sel, active_chunks, x,y, lines, textpad, contw,conth
-@@ -237,7 +238,7 @@
- active_chunks.append( [j, j+len(line_list), i] )
- 
-   for l in line_list:
--lines.append( [string.expandtabs(strip_end_lines(l)),
-+lines.append( [strip_end_lines(l).expandtabs(),
-   decor, color_pair] )
- j+=1
- 
-@@ -287,9 +287,9 @@
-   def sel_next( dir ):
- global sel, active_chunks
- if dir == 'up':
--  rng = range(sel-1, -1, -1)
-+  rng = list(range(sel-1, -1, -1))
- else:
--  rng = range(sel+1, len(active_chunks))
-+  rng = list(range(sel+1, len(active_chunks)))
- for j in rng:
-   if active_chunks[j][1] > y and active_chunks[j][0] < y+winh:
- sel = j
-@@ -442,7 +441,7 @@
- elif c == ord('h') or c == ord('?') or c == curses.KEY_HELP:
-   helpw = 0
-   helph = 0
--  for l in string.split(helptext(), "%c"%10):
-+  for l in helptext().split("%c"%10):
- helpw = max(helpw, len(l))
- helph += 1
-   helppad = curses.newpad(helph+2, helpw+2)
-@@ -512,21 +513,21 @@
- try:
-   opts, args = getopt.getopt(sys.argv[1:], "hmuo:abcNV",
- ["help","mono","unresolved","output=", "version", "new-file"])
--except getopt.GetoptError, e:
--  print _("Error: ") + str(e)
--  print usagetext()
-+except getopt.GetoptError as e:
-+  print((_("Error: ") + str(e)))
-+  print((usagetext()))
-   sys.exit(2)
- 
- for o, a in opts:
-   if o in ("-h", "--help"):
--print usagetext()
-+print((usagetext()))
- sys.exit()
-   elif o in ("-V", "--version"):
--print "%s %s" % (PACKAGE, VERSION)
-+print(("%s %s&quo

[gentoo-commits] repo/gentoo:master commit in: dev-util/imediff2/

2022-05-21 Thread Brian Evans
commit: aa6968f4c5473e8cb3deb9b91fc53cfec7fdc09f
Author: Brian Evans  gentoo  org>
AuthorDate: Sat May 21 13:37:58 2022 +
Commit:     Brian Evans  gentoo  org>
CommitDate: Sat May 21 13:37:58 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa6968f4

dev-util/imediff2: Expand python targets

Closes: https://bugs.gentoo.org/845954
Signed-off-by: Brian Evans  gentoo.org>

 dev-util/imediff2/imediff2-1.1.2.1.ebuild | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dev-util/imediff2/imediff2-1.1.2.1.ebuild 
b/dev-util/imediff2/imediff2-1.1.2.1.ebuild
index ea0b4c610181..5a59a527a4a8 100644
--- a/dev-util/imediff2/imediff2-1.1.2.1.ebuild
+++ b/dev-util/imediff2/imediff2-1.1.2.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9,10} )
 PYTHON_REQ_USE="ncurses"
 
 inherit python-single-r1



  1   2   3   4   5   6   7   8   9   10   >