Diff php-8.0.30 with a php-8.1.20-r1

/usr/portage/dev-lang/php/php-8.1.20-r1.ebuild 2023-10-09 14:52:29.472368350 +0300
20 20
	unicode? ( BSD-2 LGPL-2.1 )"
21 21

  
22 22
SLOT="$(ver_cut 1-2)"
23
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
23
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
24 24

  
25 25
# We can build the following SAPIs in the given order
26 26
SAPIS="embed cli cgi fpm apache2 phpdbg"
......
30 30
	${SAPIS/cli/+cli}
31 31
	threads"
32 32

  
33
IUSE="${IUSE} acl apparmor argon2 bcmath berkdb bzip2 calendar cdb cjk
34
	coverage +ctype curl debug
33
IUSE="${IUSE} acl apparmor argon2 avif bcmath berkdb bzip2 calendar
34
	cdb cjk coverage +ctype curl debug
35 35
	enchant exif ffi +fileinfo +filter firebird
36 36
	+flatfile ftp gd gdbm gmp +iconv imap inifile
37 37
	intl iodbc ipv6 +jit kerberos ldap ldap-sasl libedit lmdb
......
46 46
# The Oracle instant client provides its own incompatible ldap library.
47 47
REQUIRED_USE="
48 48
	|| ( cli cgi fpm apache2 embed phpdbg )
49
	avif? ( gd zlib )
49 50
	cli? ( ^^ ( readline libedit ) )
50 51
	!cli? ( ?? ( readline libedit ) )
51 52
	truetype? ( gd zlib )
......
80 81
	fpm? ( acl? ( sys-apps/acl ) apparmor? ( sys-libs/libapparmor ) )
81 82
	apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] )
82 83
	argon2? ( app-crypt/argon2:= )
84
	avif? ( media-libs/libavif:= )
83 85
	berkdb? ( || (	sys-libs/db:5.3 sys-libs/db:4.8 ) )
84 86
	bzip2? ( app-arch/bzip2:0= )
85 87
	cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
......
111 113
	sodium? ( dev-libs/libsodium:=[-minimal] )
112 114
	spell? ( >=app-text/aspell-0.50 )
113 115
	sqlite? ( >=dev-db/sqlite-3.7.6.3 )
114
	ssl? ( >=dev-libs/openssl-1.0.1:0= <dev-libs/openssl-3.0 )
116
	ssl? ( >=dev-libs/openssl-1.0.2:0= )
115 117
	tidy? ( app-text/htmltidy )
116 118
	tokyocabinet? ( dev-db/tokyocabinet )
117 119
	truetype? ( =media-libs/freetype-2* )
......
124 126
	zlib? ( >=sys-libs/zlib-1.2.0.4:0= )
125 127
"
126 128

  
129
IDEPEND=">=app-eselect/eselect-php-0.9.7[apache2?,fpm?]"
130

  
127 131
RDEPEND="${COMMON_DEPEND}
128 132
	virtual/mta
129 133
	fpm? (
......
143 147

  
144 148
PATCHES=(
145 149
	"${FILESDIR}/php-iodbc-header-location.patch"
146
	"${FILESDIR}/php80-firebird-warnings.patch"
150
	"${FILESDIR}/php-capstone-optional.patch"
147 151
)
148 152

  
149 153
php_install_ini() {
......
241 245

  
242 246
	PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
243 247

  
244
	# https://bugs.gentoo.org/866683, https://bugs.gentoo.org/913527
245
	filter-lto
246

  
247 248
	# The php-fpm config file wants localstatedir to be ${EPREFIX}/var
248 249
	# and not the Gentoo default ${EPREFIX}/var/lib. See bug 572002.
249 250
	local our_conf=(
......
261 262
	our_conf+=(
262 263
		$(use_with apparmor fpm-apparmor)
263 264
		$(use_with argon2 password-argon2 "${EPREFIX}/usr")
265
		$(use_with avif)
264 266
		$(use_enable bcmath)
265 267
		$(use_with bzip2 bz2 "${EPREFIX}/usr")
266 268
		$(use_enable calendar)
......
359 361
	fi
360 362

  
361 363
	# MySQL support
362
	local mysqllib="mysqlnd"
363
	local mysqlilib="mysqlnd"
364

  
365
	our_conf+=( $(use_with mysqli mysqli "${mysqlilib}") )
364
	our_conf+=( $(use_with mysqli mysqli "mysqlnd") )
366 365

  
367 366
	local mysqlsock="${EPREFIX}/var/run/mysqld/mysqld.sock"
368 367
	if use mysql || use mysqli ; then
......
397 396
	if use pdo ; then
398 397
		our_conf+=(
399 398
			$(use_with mssql pdo-dblib "${EPREFIX}/usr")
400
			$(use_with mysql pdo-mysql "${mysqllib}")
399
			$(use_with mysql pdo-mysql "mysqlnd")
401 400
			$(use_with postgres pdo-pgsql)
402 401
			$(use_with sqlite pdo-sqlite)
403 402
			$(use_with firebird pdo-firebird "${EPREFIX}/usr")
Thank you!