gentoo resync : 12.03.2021

5 files changed, 72 insertions, 3 deletions

diff --git a/dev-php/Manifest.gz b/dev-php/Manifest.gz
index 9cc0fd4e91a4..52eef2405a15 100644
--- a/dev-php/Manifest.gz
+++ b/dev-php/Manifest.gz
diff --git a/dev-php/PEAR-PHP_Debug/Manifest b/dev-php/PEAR-PHP_Debug/Manifest
index 9191864f6b11..5fa529c66695 100644
--- a/dev-php/PEAR-PHP_Debug/Manifest
+++ b/dev-php/PEAR-PHP_Debug/Manifest
@@ -1,3 +1,3 @@
 DIST PHP_Debug-1.0.3.tgz 48967 BLAKE2B b98d02a05f1aa35749e058d33a28418f2f3f956356789394cc9d17a496663322cf2bfbb5b6ce044ec1f8da14977af85f3659df7b0c272dfd30232258df599157 SHA512 740991812218abe21babc9892a3a814c8ed9180a7d68acafee933c4cec3c86282134bb46b2058cae8ff97a134a3c04b72d8113126184f6aff27fea9f1203344c
-EBUILD PEAR-PHP_Debug-1.0.3-r3.ebuild 500 BLAKE2B 217db3c09cc788d60f9b281cae06998a3433a22ee5f1b2c8b2eb0c4a1714a11be4ee9fb5fb260c4ace385a4bfc893a44226c4bba021a2e65d0ec049cbc5d3688 SHA512 2dedd33c7808fb38b95418ca72f6a9b2fe67daa51855a983d0b558503a02999618ce2944016b1be045b8d175a719eb17dee317a1cb4e0764fd2a3c3b8ab00d54
+EBUILD PEAR-PHP_Debug-1.0.3-r3.ebuild 496 BLAKE2B 5a5d2b33b9d61270cb7c04d2d4648a880b7f0547e2613c5bd0d7c818cf086145a8aedba5378c8d35512f67747bcdacd3664ce28eac2d60e10abcfca35d01b653 SHA512 f72d50fb8dafb01ee868903980991ee5885b3d0bb8aaadbfd75e2bf85491eee9fa1beec0638ccb865ac55c80a3a3433abe3a1bbd0054f44e5777df01b0c92152
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/PEAR-PHP_Debug/PEAR-PHP_Debug-1.0.3-r3.ebuild b/dev-php/PEAR-PHP_Debug/PEAR-PHP_Debug-1.0.3-r3.ebuild
index a09ecc06ad4f..1d8a11e168f5 100644
--- a/dev-php/PEAR-PHP_Debug/PEAR-PHP_Debug-1.0.3-r3.ebuild
+++ b/dev-php/PEAR-PHP_Debug/PEAR-PHP_Debug-1.0.3-r3.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
 inherit php-pear-r2
 
-DESCRIPTION="Provides traces, timings, executed queries, watched variables etc. "
+DESCRIPTION="Provides traces, timings, executed queries, watched variables etc."
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-php/pecl-apcu/Manifest b/dev-php/pecl-apcu/Manifest
index 245347c8afdc..92aa0482a6ec 100644
--- a/dev-php/pecl-apcu/Manifest
+++ b/dev-php/pecl-apcu/Manifest
@@ -1,3 +1,5 @@
 DIST apcu-5.1.19.tgz 96583 BLAKE2B 330c08a4e557691d0b402111877b3caf56b211256db17cce52a76aeefce7237505eca4ecd71f3770ef3c405182a1604a92cc458cb9bca435b42370fe917e21a7 SHA512 45077e3bd0eac207539e2eafe21968c71f49b8c8920168dbafa87961b041f1d348b6bf1c130104744bc541e1f690854f0a29062e9520db81c04edeee3ef2ed99
+DIST apcu-5.1.20.tgz 96727 BLAKE2B b8223856e0aaa52f90dffa674bbd9b047caa8c91d81b637eafc2f59fbbfdfe0d6ce30e990a87cb4833e895fcfd944f7d57eb6f7356b3e2361d6be5a535bb3a63 SHA512 3e10b7e5dc7481b1250610ef83954875f427b9114d6b232bad9064fc33d8c8906bcc317f94a6cfc9f76c720fa06a44270d259cf2ceef6c1ec9dcadc49254ee1b
 EBUILD pecl-apcu-5.1.19.ebuild 1545 BLAKE2B 1c074393bafc9563524a1f1d72271032189adce78b462c698babe9014349db09553d642b5a0978a0600326010cb971f81b16f7be0a2d88cf6d063f86848d2019 SHA512 25fb01fd624396446e0842eeb45b1c29f9526b0f864f55983ce69075454dda61d7148c991552fc4272b3f7ae58a513b56083f31cbe7ca0a5d6f5a03524d99899
+EBUILD pecl-apcu-5.1.20.ebuild 1548 BLAKE2B 415ea30ee20bccefecaa81dbc19e8d14fbbaf028b343c75d8cf27a05931fcc9e0502ebb0fb73f58eb30c63b714d3a292bb8415f1a6620655038bfc49baba6583 SHA512 a3abb54c9ad31912075ac5715e894fe6dbdca757f3f9a7e1826a2e4df6f99c291329d6069432a1907d171817c7bccb8bb7f249819d1a1741c3b0a76065ea20dd
 MISC metadata.xml 540 BLAKE2B a29196911604b13d643db1b09cdae2c578c52f3b3ce92f9d6ae534c6fe9872435a46b15dca79ce8ccf5ca02070f2e694f518c69524ea9380eff8e597d8d4124d SHA512 acd09a9a8e52ddc7e4cde2f048db7f7721fcbe3e24b7b628bf1c14b17381a75b463dede6faa0acfecf8e270693001c30b83758f8ad761979fcbdccb454098e56
diff --git a/dev-php/pecl-apcu/pecl-apcu-5.1.20.ebuild b/dev-php/pecl-apcu/pecl-apcu-5.1.20.ebuild
new file mode 100644
index 000000000000..d36dd950e472
--- /dev/null
+++ b/dev-php/pecl-apcu/pecl-apcu-5.1.20.ebuild
@@ -0,0 +1,67 @@
+# 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/."
+	elog
+	elog "If you depend on the apc_* functions,"
+	elog "please install dev-php/pecl-apcu_bc as this extension no longer"
+	elog "provides backwards compatibility."
+}