gentoo resync : 31.08.2021

19 files changed, 400 insertions, 50 deletions

diff --git a/dev-php/Manifest.gz b/dev-php/Manifest.gz
index 41731753394e..5cc83ccfab57 100644
--- a/dev-php/Manifest.gz
+++ b/dev-php/Manifest.gz
diff --git a/dev-php/pecl-eio/Manifest b/dev-php/pecl-eio/Manifest
index 6a6e62365226..fdb9101124b4 100644
--- a/dev-php/pecl-eio/Manifest
+++ b/dev-php/pecl-eio/Manifest
@@ -1,3 +1,5 @@
 DIST eio-2.0.4.tgz 74118 BLAKE2B 0228f0ca91ed6410614242e7ea1ddadaa1d1aa8211b3ea6f730c0711e4339bc158d661c5addee685d750a51e654874d35a04cf011d2a02ad06ab3f249b893753 SHA512 a74464752af5792c527b9149a7edff574952cac0b5b09e1e7ff3b7c0a2cc88ab171d916d94d508b9f92aa40bd5262a5b9f8d4ba239908f13ebcb89c6513da4d0
+DIST eio-3.0.0RC2.tgz 89591 BLAKE2B 7923f8715870cfd744148980e3ad6de8373384d85e45abc687be2cde22fd425a33b8c80fbd1226e23dbac417533826dfbf639fed751bfc2a88e118750e38d626 SHA512 23e7d88720222ac3f58015ba140e3338e100cf72cf64276fd7e0f0d63a5e50f878ab0a4a742eac7b51484c56ee438fcc3f7cbf7b1da5db44e0178a5098a4a6ae
 EBUILD pecl-eio-2.0.4-r1.ebuild 493 BLAKE2B db326dd5383340a4f28028c490dc977b8e86e403c4cc10fe3d23cdc0fed8a84c084a5e7c4be8a37a894fa608ba623ab724a83eeb64de110a781cb16271994e28 SHA512 0ce554142872b0b4955e8744b9c9caeedae295a1d731b5738e517f69d08482e5317b2f556fa01dc052c28080e5fd05d1190ca4aeaa439894671b3486cf7bd7af
+EBUILD pecl-eio-3.0.0_rc2.ebuild 651 BLAKE2B a1fca0bc26b3003372376151ab0b36452c2c583c4ede5b58ef0b647eb61fad38923adc7e93975e1c24a6c59f63dca4e21b59ac6327c39c185a64f75c101fb660 SHA512 229f43452c8024d306a53a6b177600908ef5aa67828fe96d2351bf00b2e022aa94b86834eec323d6084c9f1bd1475d0119ed64cc5ee8f736e93ecce1e9d8bac9
 MISC metadata.xml 384 BLAKE2B 74a2d7fdbd62d0b6fba6517ba79f075a641aaf8ad94fa73cb6b4c288a9ea19d59e096e8f6a74558fbcd6dc545838802a961677d2884f55d49992f210f1f4213d SHA512 f8d7f2b4b39f64110a406cc2493c7c04761764dd96e9ab4085e8c5b049d6deb659c655f6631acd09ba0cb7145b43971f1daeeda219bc65dc90365838f13dc736
diff --git a/dev-php/pecl-eio/pecl-eio-3.0.0_rc2.ebuild b/dev-php/pecl-eio/pecl-eio-3.0.0_rc2.ebuild
new file mode 100644
index 000000000000..32a585eab37d
--- /dev/null
+++ b/dev-php/pecl-eio/pecl-eio-3.0.0_rc2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+MY_PN="${PN/pecl-}"
+MY_PV="${PV/_rc/RC}"
+MY_P="${MY_PN}-${MY_PV}"
+PHP_EXT_NAME="eio"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+PHP_EXT_PECL_FILENAME="${MY_P}.tgz"
+PHP_EXT_S="${WORKDIR}/${MY_P}"
+DOCS=( README.md )
+
+USE_PHP="php7-3 php7-4 php8-0"
+inherit php-ext-pecl-r3
+
+KEYWORDS="~amd64 ~x86"
+LICENSE="PHP-3.01"
+
+DESCRIPTION="PHP wrapper for libeio library"
+LICENSE="PHP-3"
+SLOT="0"
+IUSE="debug"
+
+S="${PHP_EXT_S}"
+
+src_configure() {
+	local PHP_EXT_ECONF_ARGS=("--with-eio" "$(use_enable debug eio-debug)" )
+	php-ext-source-r3_src_configure
+}
diff --git a/dev-php/pecl-mcrypt/Manifest b/dev-php/pecl-mcrypt/Manifest
index cd96229a9cf3..9082e9053859 100644
--- a/dev-php/pecl-mcrypt/Manifest
+++ b/dev-php/pecl-mcrypt/Manifest
@@ -1,3 +1,5 @@
 DIST mcrypt-1.0.3.tgz 33590 BLAKE2B 5de1108f53604fffea9e3cb64d9efdae2008da164acd47b27fd0df8f12a0f508345d63bee4d588c1eecd9a935f8be3b2db5c3d119c5b3013955c54085ebe9e9f SHA512 ef215b576b471d6e1ecac4bb097f518fa57fd551b678b7fdddd9d5058f6667b0ee757e887f00b61672b89cd86f1962cbfe0e355681fa47daba9873c3bf4db679
+DIST mcrypt-1.0.4.tgz 27056 BLAKE2B 3faa77299ef1b5ab3f5a427b57d64f5f5ec54bc41f83924bfd285289c168341c0f044970fb0c37ca8561e68be165a40b2d6fd423ed6d5aa74225d5a3fb349546 SHA512 6a8244761035640366041a5f26057ab14bb85eaaa973ddf604e152b786ef750ec775ae91d7582044700d6fdef902425f3a9d6839113a52e0a9f957bf9d0c189a
 EBUILD pecl-mcrypt-1.0.3.ebuild 726 BLAKE2B 869726eb6c6e36082f3ca9e1c23f993d46b9733de66a087a4e0139f8703f2bfb4759ca15d259bd4c9f2a13e5d752ef63e33e533a3dff150f5c8e9d3a3490e397 SHA512 a1dfe478a62d2f93bfe5cdf93da2ad15a0d731f2f4869c1a37be2fef187b61884d87e86e661d19b122b53123035eb0fed8fb7738133198f8e71762a3d9309727
+EBUILD pecl-mcrypt-1.0.4.ebuild 529 BLAKE2B 98566f6d80cab2ea9dfe3c942bb69f04b648c3e8551409b38d04cea62ab816e004126e1516f0617fcdc1ef3c989865d25ea1c780780bec7269a1b857f6d3cee9 SHA512 376f11b1df559092041c96c1171baab6e100d56fbeb6b4d8e1e6c7ce903513672725bbc751a04ae374b950109c60936565d6c28879d4e0057d01fc62e98ca7bc
 MISC metadata.xml 409 BLAKE2B afb1dccf077ef8a65f22ca59276ec5f33bd6dc4e2916b80615b508cfd6cc9c55f7a9720ec9dda5fcdaf805600af4d05d2b997a454865e2e22f115f42fcccc5e2 SHA512 fb0dbbe2d864a9a8afc0598ac495d26f8ea2dd29dc0939e6ec4fbcee4ddf1b2bda231a8661f8f2788d3832c51d6415de62957d8d33c8d876f81a35a2b139c4b7
diff --git a/dev-php/pecl-mcrypt/pecl-mcrypt-1.0.4.ebuild b/dev-php/pecl-mcrypt/pecl-mcrypt-1.0.4.ebuild
new file mode 100644
index 000000000000..e7895b657c1a
--- /dev/null
+++ b/dev-php/pecl-mcrypt/pecl-mcrypt-1.0.4.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PHP_EXT_NAME="mcrypt"
+USE_PHP="php7-3 php7-4 php8-0"
+MY_P="${PN/pecl-/}-${PV/_rc/RC}"
+PHP_EXT_ECONF_ARGS=()
+PHP_EXT_PECL_FILENAME="${MY_P}.tgz"
+PHP_EXT_S="${WORKDIR}/${MY_P}"
+
+inherit php-ext-pecl-r3
+
+DESCRIPTION="Bindings for the libmcrypt library"
+LICENSE="PHP-3.01"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+DEPEND="dev-libs/libmcrypt"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
diff --git a/dev-php/pecl-memcached/Manifest b/dev-php/pecl-memcached/Manifest
index 0ce519a59732..883e5d1fc8b8 100644
--- a/dev-php/pecl-memcached/Manifest
+++ b/dev-php/pecl-memcached/Manifest
@@ -1,3 +1,6 @@
+AUX 3.1.5-fix-tests.patch 1032 BLAKE2B 15b91b77b645ea298f2334df6d4a0b804735d38dca3067f1cac7fb8fdf30d5ccb4895cc431b5dd6cc0bd8b5be9983b48e157694bc437fc057aed0c9879480bc4 SHA512 1fd27bbae55a0e0ed12ca8422fc8969b9d69ae2c26d9b991648bc2cd7d39f6ede621e453aa12a6ec027c69791988f5db4117c32a31aab20836bdd565d7c62dc2
 DIST memcached-3.1.5.tgz 83015 BLAKE2B 80f5cbed8e34f867962792d95d242015690f64ab3b462e09813a11b8b86234b0b05b0f6a78f7c6184482b66ba8015064b37f77bbb816a3aee2edd0ce97ab0cbc SHA512 87d5fd079fcaad81139785d6766da71b23a1a0fe907d4b22f3a787af148a20412c11df11c4d98c165241658baf0d87c8a6b29de15db07a0f9d1fabc8aec8f0e9
+DIST pecl-memcached-3.1.5_p20210807.tar.gz 99221 BLAKE2B 7a6a92701d17ce2c108cda862d52cebbae38e993e4182fd23ce78ea1cbebbdba6d46a71258b7dd388ff38f2b7b04c94ca822954ff931111fd9bfc64d578a6f26 SHA512 3c124f969efcd3bcc513e3e347828ac6e0a5540379f7d3a83c306d65a02ece3c76f87e3db52153c5d2f2c03c5fafb646f6b3b33c0b1d5afbb71ffa22d2df6f90
 EBUILD pecl-memcached-3.1.5-r1.ebuild 1582 BLAKE2B 7cb8c180c14bf80a1e4447bfde1c1087f483c582b3f748c819b2e1d9393e5eb5c8a3ac7c4c0cd99d8dd62ecfd2eb302cf83224fdf7de370d21e9a2520b6990cf SHA512 b9aa92fafe9a68a647e3e76212b40c36b65ebcfed423d82a22fe3aad146149a1d915a895cf77c06830b9a0bb589d992d4470e640365f3beb7f46d5c5b3e70662
+EBUILD pecl-memcached-3.1.5_p20210807.ebuild 2511 BLAKE2B 85175013cef923982265442f9551ed434c134a329aeae53c24580e921dc8284e9cb5a25b8ab974534983767e04e3834e3eaa4aed7d62d141fbe6d83080d5a95f SHA512 9c8fe68e8cc390820af6185c2bf4a4a8114c708d5410242c3cc29477b2a5a89f0330d6a9a9035113dd2cbf5428d7365f2f795589a32611823d11aaafae8e122b
 MISC metadata.xml 568 BLAKE2B 7568c14297b6c9d91a289ecccaf51548928f633f034b9468725bf149060a66782a36bf4496e39a55e4d658ae7336d105566f14d413fc299dc4ca85ad689932b8 SHA512 177558b878967a84ceb4f9bce0fe15b2bc8e3539863d66c0de1fc273601f2cb24aef9ef1c4cf7a4817a2c1fbd8e0635d35c0dae6cd6ea72ffe70111944cdbcd9
diff --git a/dev-php/pecl-memcached/files/3.1.5-fix-tests.patch b/dev-php/pecl-memcached/files/3.1.5-fix-tests.patch
new file mode 100644
index 000000000000..08a881c182d8
--- /dev/null
+++ b/dev-php/pecl-memcached/files/3.1.5-fix-tests.patch
@@ -0,0 +1,41 @@
+--- a/tests/experimental/session_gc.phpt	2021-08-23 01:05:26.000000000 -0400
++++ b/tests/experimental/session_gc.phpt	2021-08-27 14:30:01.504619748 -0400
+@@ -20,22 +20,23 @@
+ 
+ session_start();
+ $_SESSION['foo'] = 1;
+-var_dump($_SESSION);
++$session1 = $_SESSION;
+ session_write_close();
+ 
+ $_SESSION = NULL;
+-var_dump($_SESSION);
++$session2 = $_SESSION;
+ 
+ session_start();
+-var_dump($_SESSION);
++$session3 = $_SESSION;
+ session_write_close();
+ 
+ sleep(3);
+ 
+ session_start();
+-var_dump($_SESSION);
++$session4 = $_SESSION;
+ session_write_close();
+ 
++var_dump($session1, $session2, $session3, $session4);
+ 
+ --EXPECT--
+ array(1) {
+--- a/tests/experimental/extreme_floats.phpt	2021-08-23 01:05:26.000000000 -0400
++++ b/tests/experimental/extreme_floats.phpt	2021-08-27 14:40:03.223499433 -0400
+@@ -2,6 +2,8 @@
+ Extreme floats: max, min, Inf, -Inf, and NaN
+ --SKIPIF--
+ <?php include dirname(dirname(__FILE__)) . "/skipif.inc";?>
++--INI--
++serialize_precision = 14
+ --FILE--
+ <?php
+ include dirname(dirname(__FILE__)) . '/config.inc';
diff --git a/dev-php/pecl-memcached/pecl-memcached-3.1.5_p20210807.ebuild b/dev-php/pecl-memcached/pecl-memcached-3.1.5_p20210807.ebuild
new file mode 100644
index 000000000000..246535a68f31
--- /dev/null
+++ b/dev-php/pecl-memcached/pecl-memcached-3.1.5_p20210807.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PHP_EXT_NAME="memcached"
+DOCS=( ChangeLog README.markdown )
+
+USE_PHP="php7-3 php7-4 php8-0"
+inherit php-ext-pecl-r3
+
+DESCRIPTION="Interface PHP with memcached via libmemcached library"
+LICENSE="PHP-3.01"
+SLOT="7"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="igbinary json sasl +session test"
+REPO_COMMIT="9cd4a01d99b701a2c1a42799afe80635dcfecfe4"
+SRC_URI="https://github.com/php-memcached-dev/php-memcached/archive/${REPO_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND=">=dev-libs/libmemcached-1.0.14[sasl(-)?]
+	sys-libs/zlib
+"
+
+RDEPEND="
+	php_targets_php7-3? (
+		${COMMON_DEPEND} dev-lang/php:7.3[session(-)?,json(-)?]
+		igbinary? ( dev-php/igbinary[php_targets_php7-3(-)] )
+	)
+	php_targets_php7-4? (
+		${COMMON_DEPEND} dev-lang/php:7.4[session(-)?,json(-)?]
+		igbinary? ( dev-php/igbinary[php_targets_php7-4(-)] )
+	)
+	php_targets_php8-0? (
+		${COMMON_DEPEND} dev-lang/php:8.0[session(-)?]
+		igbinary? ( dev-php/igbinary[php_targets_php8-0(-)] )
+	)"
+DEPEND="${RDEPEND} test? ( net-misc/memcached )"
+
+PATCHES=( "${FILESDIR}/3.1.5-fix-tests.patch" )
+
+src_unpack() {
+	default
+	mv "${WORKDIR}/php-memcached-${REPO_COMMIT}" "${S}" || die
+	ln -s "${S}/tests/skipif.inc" "${S}/tests/experimental/skipif.inc" || die
+	ln -s "${S}/tests/skipif.inc" "${S}/tests/experimental/serializer/skipif.inc" || die
+	local x
+	local broken_tests=(
+	# Known broken tests. https://github.com/php-memcached-dev/php-memcached/issues/386
+		get_bykey_cas getdelayed_bykey_cas getdelayed_cbthrows
+		stats stats_badserver getmulti_badserver
+	# Excessive warnings make them "BORK"
+		serializer/serializer_php_bad_serialize serializer/serializer_php_bad_unserialize
+	)
+	for x in "${broken_tests[@]}" ; do
+		rm "${S}/tests/experimental/${x}.phpt" || die
+	done
+}
+
+src_configure() {
+	local PHP_EXT_ECONF_ARGS="--enable-memcached
+		$(use_enable session memcached-session)
+		$(use_enable sasl memcached-sasl)
+		$(use_enable json memcached-json)
+		$(use_enable igbinary memcached-igbinary)"
+
+	php-ext-source-r3_src_configure
+}
+
+src_test() {
+	touch "${T}/memcached.pid" || die
+	local memcached_opts=( -d -P "${T}/memcached.pid" -p 11211 -l 127.0.0.1 -U 11211 )
+	[[ ${EUID} == 0 ]] && memcached_opts+=( -u portage )
+	memcached "${memcached_opts[@]}" || die "Can't start memcached test server"
+
+	local exit_status
+	php-ext-source-r3_src_test
+	exit_status=$?
+
+	kill "$(<"${T}/memcached.pid")"
+	return ${exit_status}
+}
diff --git a/dev-php/pecl-pam/Manifest b/dev-php/pecl-pam/Manifest
index 273396dd1e08..0b701f2edb17 100644
--- a/dev-php/pecl-pam/Manifest
+++ b/dev-php/pecl-pam/Manifest
@@ -1,4 +1,6 @@
 AUX 1.0.3-php7.patch 3519 BLAKE2B 649f278a88e12ecbf895ab372aaa97c9f1f7cdcf4724eeda63368daefc89e89c3e5aae9e09cb7026058ca18aa4569423d75ee125795b56d8e2d372ccc93123f1 SHA512 9877b6bede71f402166253521aec667e4f9da99fbbf4fc0e74b9a5c48e498df717f869969b5d7a6432427a50030370771774f77ecb876ef133288eab174c9289
 DIST pam-1.0.3.tgz 6671 BLAKE2B f416fd0e47d3fda6a1d86e44a7ca17fc9a0428f976f18e2b663a2fd1e09b790cd069ca16d930d6dca6554762ca59bda987929e52365ed813949c1a93291c1dcc SHA512 3580582f1456b31be30a713cadaaca106527f2d4f3f12032b5d3617cc361aaf49539a9db3dd27221ce40320187abaac0f6ad4e23cdfe5eaa94436e3eaef3fb9c
+DIST pam-2.2.3.tgz 9422 BLAKE2B 4d10ad40bdfbaa54225723a46a78dbe1609d89cf75d0ca73345e3346fb437a5500e451357b3b0bbcce88c13f8a54dec5b39e9c0741a6e89c0b3936cbb05da91a SHA512 1adc72b1517e224f36f960134d3444d36e6fa5a6868ce4bc1b87edbbfb09406910774061988300094ebf637ee54c5f5a43e0c42c8e2ab78c81a0910063d48c51
 EBUILD pecl-pam-1.0.3-r3.ebuild 812 BLAKE2B 6d52c1f5d02e63635c002d83bdac8fc7511f7959de6a20a8d4058f9c5712ca56dd5789358eb1f48e478fde5b715be65351eeee791f84355bec3591f8f8db08d5 SHA512 84b7600da8c34fe1b8f0ce519fc6e47f0e3151e501340e9a7270b537a77619ff1d37b0eec1957d886ed5bb8afb8d69777b711cacb9f6d9a175e1d0976cbadec3
+EBUILD pecl-pam-2.2.3.ebuild 682 BLAKE2B 3ece15c40041c28cf9f3d3d4d9752401c62a577883e851618a72485c66bf4a0f9254969e2ac8e3a81ba86959fe80c2e84593740955dfc6480afa7d480276ad42 SHA512 38c1fd7a12bb5d2a183723992b8623ae18d543633dec16a616b76865ebce329092366808236f6cc537d35110da55bb20f6968b4a68448c616d4da06f11de9b4d
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/pecl-pam/pecl-pam-2.2.3.ebuild b/dev-php/pecl-pam/pecl-pam-2.2.3.ebuild
new file mode 100644
index 000000000000..54ba34e572c7
--- /dev/null
+++ b/dev-php/pecl-pam/pecl-pam-2.2.3.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PHP_EXT_NAME="pam"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+PHP_EXT_ECONF_ARGS=( --with-pam=/usr )
+DOCS=( README )
+
+USE_PHP="php7-3 php7-4 php8-0"
+
+inherit php-ext-pecl-r3 pam
+
+KEYWORDS="~amd64 ~x86"
+
+DESCRIPTION="This extension provides PAM (Pluggable Authentication Modules) integration"
+LICENSE="PHP-3.01"
+SLOT="0"
+IUSE=""
+
+DEPEND="sys-libs/pam"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	#Fix DOS line endings
+	sed -i 's/\r$//' -- pam.c || die
+	php-ext-source-r3_src_prepare
+}
+
+src_install() {
+	pamd_mimic_system php auth account password
+	php-ext-pecl-r3_src_install
+}
diff --git a/dev-php/pecl-ps/Manifest b/dev-php/pecl-ps/Manifest
index 152366dd2e71..22f170329ef5 100644
--- a/dev-php/pecl-ps/Manifest
+++ b/dev-php/pecl-ps/Manifest
@@ -1,3 +1,3 @@
 DIST ps-1.4.1.tgz 578991 BLAKE2B 549fae78ffb6e91f39b6292d969b9b80adba1a5911fb52e99c5fcbc940b9470205556e3e11c2940fadc7cc084400bc08ae7255b79e175d705c9bacb8eb3d6e71 SHA512 e9eeb5ad1c9314af0fcfd33e461b560f6cc599a679bc0a5541994fa698e3da63b7cb523f617647bdb2ac1c8fc090263e314ddf956a1e6126f8813de92e49f3af
-EBUILD pecl-ps-1.4.1.ebuild 1259 BLAKE2B 80274d9d01ecf1ea502bf512e7ada18887fddba3fcd5f33a6ab82ccd6e495d7583bf8bab37d3290002f0b33476952c67df21a988f6776140620899263efe81b3 SHA512 bcb5b6ad87e547a0afe005f1fa46683a37c117d157fe5b2d77942948a9ea1410daaa846c7c34be6221667cbac28d94939603d97459823254c26c46ef97edf827
+EBUILD pecl-ps-1.4.1-r1.ebuild 482 BLAKE2B d468f58e4169eb1902b75bc28061a9a4b2a0500fe1e8ae51b678c49a9624a1a3e0bdc36f4ff96e5436425e1c04141f57ad66b4b17659fac12a9a9bb59ec61340 SHA512 9d793f9bbb0d353602a1ba53f7e9e5f280f5bb9d7dc940ebea46710ec7480e481086cc028e6b05cd018476672e20efceb30e3c68350c8a0fc4f90f8b850eaffa
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/pecl-ps/pecl-ps-1.4.1-r1.ebuild b/dev-php/pecl-ps/pecl-ps-1.4.1-r1.ebuild
new file mode 100644
index 000000000000..34f9154d7935
--- /dev/null
+++ b/dev-php/pecl-ps/pecl-ps-1.4.1-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PHP_EXT_NAME="ps"
+USE_PHP="php7-3 php7-4"
+
+inherit php-ext-pecl-r3
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+DESCRIPTION="PHP extension for creating PostScript files"
+LICENSE="BSD"
+SLOT="7"
+IUSE="examples"
+
+DEPEND="dev-libs/pslib"
+RDEPEND="${DEPEND}"
+PHP_EXT_ECONF_ARGS=""
+
+src_test() {
+	# tests/004.phpt depends on set numeric format
+	LC_ALL=C php-ext-pecl-r3_src_test
+}
diff --git a/dev-php/pecl-ps/pecl-ps-1.4.1.ebuild b/dev-php/pecl-ps/pecl-ps-1.4.1.ebuild
deleted file mode 100644
index fd04378b47c9..000000000000
--- a/dev-php/pecl-ps/pecl-ps-1.4.1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PHP_EXT_NAME="ps"
-USE_PHP="php5-6 php7-1 php7-2 php7-3 php7-4"
-
-inherit php-ext-pecl-r3
-
-# Only really build for >=7.0
-USE_PHP="php7-1 php7-2 php7-3 php7-4"
-
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-
-DESCRIPTION="PHP extension for creating PostScript files"
-LICENSE="BSD"
-SLOT="7"
-IUSE="examples"
-
-DEPEND="
-	php_targets_php7-1? ( dev-libs/pslib )
-	php_targets_php7-2? ( dev-libs/pslib )
-	php_targets_php7-3? ( dev-libs/pslib )
-	php_targets_php7-4? ( dev-libs/pslib )
-"
-RDEPEND="${DEPEND} php_targets_php5-6? ( dev-php/pecl-ps:0[php_targets_php5-6] )"
-PHP_EXT_ECONF_ARGS=""
-
-src_prepare() {
-	if use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3 || use php_targets_php7-4 ; then
-		php-ext-source-r3_src_prepare
-	else
-		default_src_prepare
-	fi
-}
-
-src_install() {
-	if use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3 || use php_targets_php7-4 ; then
-		php-ext-pecl-r3_src_install
-	fi
-}
-
-src_test() {
-	if use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3 || use php_targets_php7-4 ; then
-		# tests/004.phpt depends on set numeric format
-		LC_ALL=C php-ext-pecl-r3_src_test
-	fi
-}
diff --git a/dev-php/theseer-Autoload/Manifest b/dev-php/theseer-Autoload/Manifest
index 0dd934746658..8ffce2ca0303 100644
--- a/dev-php/theseer-Autoload/Manifest
+++ b/dev-php/theseer-Autoload/Manifest
@@ -3,5 +3,7 @@ AUX fedora.php.tpl 256 BLAKE2B 0a6ffe677079d10668cc7caa0ec6bc22951ae9b78f2a6ce03
 AUX fedora2.php.tpl 241 BLAKE2B c7e7dce85f2b7c2f33f9760e7f4c0440fff18ad9679045a7c47be871d6bb3b32d031aded4a410bfd0b2de8affb2cec6b38630864d1b0517c3cf1aad7bf42b924 SHA512 e5c369fd822fbe1ed895f6d97ceff84593f7e74b6e1a3d9bf918dee2063643b6fd991a90bc33fe970b29529760b42a1a6dcac360246bfe67bd8f9248b6b77077
 AUX theseer-Autoload-1.26.0-autoload.php.patch 273 BLAKE2B 02ef287623dded15446172c54344be51bca15723f9de69aee7c75b4b2b6c1c4fef3d1d3df84bcf2da892c9708e5c5916933648e4cf4421ff62580af594ce9007 SHA512 8f8e6d278b2596dee872c14bc794a21d012f29a2e2cf0b56669796e97ceabbb0efade766492b247817f7c6f77b85a12d1d583717914016501b4007659f813abe
 DIST theseer-Autoload-1.26.0.tar.gz 43119 BLAKE2B 7b2413bc2fb281472cee03010c175aae1c8304ab0629c31f09e11497bd6f46d58bae8625da610f5a513b19fc8aafc45c35be7271ba13188466f576e7b4a7392f SHA512 c8fcb3ad39c140517d695c44e6dea3797ea0135ff64246478e55cbf167e4b9fbb3e5027732c201f66b404039a313952c7125f13fdeb1cd96633dbccfdda6f143
+DIST theseer-Autoload-1.26.3.tar.gz 43810 BLAKE2B b2d7fe33b9663a3c324656abe63e4ae89533b773007362b546cb9401de0a8fd8f0c00f8f385c4a45c39be675d062cf5dd5a739972fc12611331065f244515d63 SHA512 00a6fbf86cc0f5958c5d0d049af0370ef510fe21a05d7dcbeb1b0771f979ea6638f5db74d913c56b10d9212a68b5d918cdfefec241b1383faf0e97b4305895bd
 EBUILD theseer-Autoload-1.26.0-r1.ebuild 1874 BLAKE2B 3714b3b8bff2f1c0b9398bdc99a2ad428c0eff559cebc36ec9c9ee61aa6428fd6d3b06b74478dfbc694a2079cd0fc790bb1202a8cfe8bf932fe56851edef5ae5 SHA512 b418754870a0e68f22c7f05644331c6303b065a183342867a6acbcd0ce5abfdc75045d443dce98e31af9b3bd5ac80ad2ffe4aaaea8f4fbe126583bf1c13a16b1
+EBUILD theseer-Autoload-1.26.3.ebuild 1879 BLAKE2B e7adeb66bc17cde88c77079cba0290cefea5b74b4b211b38e846d934e22af6e3d2c16607b7b7920951da3807d61672d499386608c08d2e2fc5d3389a3024ff1c SHA512 f75e4189a179a9238dbc36035e08fbff7935aaa6fdbc7797e769fedfd18b5da8af9052b51160207b3d6fab18071c6f4f129676c4ade5b839b050ce28eb49dc9d
 MISC metadata.xml 344 BLAKE2B 6de9b08e902efb12368cca1d23ba9f17e22aedb613cdc2e5de7a6a0412af570dc4cf3b0f0ca6371574c9587c4dc59393cceb2edaf678ade5fdfbba205cef3476 SHA512 78c9486aa19c85376809e7910c6ff0ce043fc629a483cba29e64f912f08ae314bd4db27f9a2c3a6aa557e8b4e38b954476dc65790b9a44e610e1d74b428e003c
diff --git a/dev-php/theseer-Autoload/theseer-Autoload-1.26.3.ebuild b/dev-php/theseer-Autoload/theseer-Autoload-1.26.3.ebuild
new file mode 100644
index 000000000000..f8aad573f6e7
--- /dev/null
+++ b/dev-php/theseer-Autoload/theseer-Autoload-1.26.3.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN="Autoload"
+
+DESCRIPTION="PHP Autoload Builder"
+HOMEPAGE="https://github.com/theseer/Autoload"
+SRC_URI="https://github.com/theseer/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+CDEPEND="dev-lang/php:*[cli]
+	>=dev-php/theseer-DirectoryScanner-1.3
+	<dev-php/theseer-DirectoryScanner-2
+	>=dev-php/zetacomponents-Base-1.8
+	<dev-php/zetacomponents-Base-2
+	>=dev-php/zetacomponents-ConsoleTools-1.7.1
+	<dev-php/zetacomponents-ConsoleTools-2"
+
+BDEPEND="${CDEPEND}
+	test? (
+		>=dev-php/phpunit-8
+		<dev-php/phpunit-9
+	)"
+
+RDEPEND="${CDEPEND}"
+
+PATCHES=( "${FILESDIR}"/${PN}-1.26.0-autoload.php.patch )
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_prepare() {
+	default
+
+	# Set version
+	sed -i \
+		-e "s/%development%/${PV}/" \
+		phpab.php \
+		composer/bin/phpab \
+		|| die
+
+	cp --target-directory src/templates/ci \
+		"${FILESDIR}"/fedora.php.tpl \
+		"${FILESDIR}"/fedora2.php.tpl \
+		|| die
+
+	# Mimick layout to bootstrap phpab
+	mkdir --parents \
+		vendor/theseer/directoryscanner \
+		vendor/zetacomponents/base \
+		vendor/zetacomponents/console-tools \
+		|| die
+
+	ln -s /usr/share/php/TheSeer/DirectoryScanner	vendor/theseer/directoryscanner/src || die
+	ln -s /usr/share/php/ezc/Base			vendor/zetacomponents/base/src || die
+	ln -s /usr/share/php/ezc/ConsoleTools		vendor/zetacomponents/console-tools/src  || die
+
+	./phpab.php \
+		--output src/autoload.php \
+		--template "${FILESDIR}"/autoload.php.tpl \
+		--basedir src \
+		src || die
+}
+
+src_test() {
+	phpunit --no-coverage --verbose || die "Unit testing failed!"
+}
+
+src_install() {
+	insinto /usr/share/php/TheSeer/${MY_PN}
+	doins -r src/*
+
+	dobin "${S}"/composer/bin/phpab
+
+	einstalldocs
+}
diff --git a/dev-php/theseer-DirectoryScanner/Manifest b/dev-php/theseer-DirectoryScanner/Manifest
index aba7ab1e4e47..88b5c91c4ca1 100644
--- a/dev-php/theseer-DirectoryScanner/Manifest
+++ b/dev-php/theseer-DirectoryScanner/Manifest
@@ -1,3 +1,5 @@
 DIST theseer-DirectoryScanner-1.3.2.tar.gz 9262 BLAKE2B 5b16781d9ccd030ea779b286b9d22c528468db52e39c6761e91e0f9f83d4a50e1775382eca4eea0f027cc508f7dd35e416664451f83bdfae8607cf074e5ed9cb SHA512 720db8baa40983918e5c0d7cfac194e26d877becf6e55868ca21c1ab0a4366b86a8aad2c700e38a6360e280d372db0f1be6c80dbb81d279c277bf9f56a6cbadf
+DIST theseer-DirectoryScanner-1.3.3.tar.gz 9281 BLAKE2B a58cecc35ac96752cc09ef6cd0c6a607014e6b8317559803810089fab1d1d19f33369580bd90fbd328b3f106e3664e65da6750c7ad52c62f446497738a8e60b7 SHA512 260820a468f163641d2a249dab2b812ef3589cb251f4995681a9fc344b38a8aa1dfb7bf52bef702adc627ea39fd8a2bb4f2b18117edba83fe6a1db5e8f69efdd
 EBUILD theseer-DirectoryScanner-1.3.2.ebuild 569 BLAKE2B 9cc7868d3e01379bf6cdc8004a18722ae44ceee0f8378e3b411842e9d6f6b327ed3e2d2c3471dd4d3391b525e46f107ea3e0d6406323229de50dacacd3fde250 SHA512 c69db59545394701099c913ddf3217ca5d41de653f3397f598739ecb3b6e858f9690a2962868c6d22e81461116b80d21806e9264717740367375c96c92f94026
+EBUILD theseer-DirectoryScanner-1.3.3.ebuild 575 BLAKE2B 7451919720907eb5de6a495ff7932391a87ad3314ce52630167647440b66802e80f7c68d8809b6db6c4426c1228446d4e59ff2cf1545b1fc3c1ed6c67b6f0d3b SHA512 4e38212853d6e48ae16c9c59aec758958661309d10f80919bdc5cea15f5ff4a1e6203b205425cb420a99cbfc72ca634ae12fb1c9afb5a417e73b006b718b1a89
 MISC metadata.xml 352 BLAKE2B 826141ca0e388135b0d4c4dcc3fd27e8c3f1d2ba34a62162209882cc6f0555392ae48844eb737fa6866762551bf3ef1ffe2a930cfff2088eb09d307faa3c8f0c SHA512 7fd0e055d4ec27bee84b621cdbed8f276c0f0abc67fbd7548a40d1367cd8c682a2e286f7b85341b4509c711845a1c358d23de02e6fd9eb9738f9425736a80953
diff --git a/dev-php/theseer-DirectoryScanner/theseer-DirectoryScanner-1.3.3.ebuild b/dev-php/theseer-DirectoryScanner/theseer-DirectoryScanner-1.3.3.ebuild
new file mode 100644
index 000000000000..57a47c3aee00
--- /dev/null
+++ b/dev-php/theseer-DirectoryScanner/theseer-DirectoryScanner-1.3.3.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN="DirectoryScanner"
+
+DESCRIPTION="A recursive directory scanner and filter"
+HOMEPAGE="https://github.com/theseer/DirectoryScanner"
+SRC_URI="https://github.com/theseer/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+RDEPEND="dev-lang/php:*"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_install() {
+	insinto /usr/share/php/TheSeer/${MY_PN}
+	doins -r src/*
+
+	einstalldocs
+}
diff --git a/dev-php/theseer-tokenizer/Manifest b/dev-php/theseer-tokenizer/Manifest
index 1c2769b6c0f9..fbf83a772e73 100644
--- a/dev-php/theseer-tokenizer/Manifest
+++ b/dev-php/theseer-tokenizer/Manifest
@@ -2,7 +2,9 @@ AUX autoload.php 740 BLAKE2B 1776060d0cbd86a165e293cf24ba31c7c6eef748f7d34681d11
 DIST theseer-tokenizer-1.1.0.tar.gz 10163 BLAKE2B b2360f901d60f784db2045912707a8e293a55967d60d4e72168a1c4b0c9a2d5bdb739fbed9bfec02075476e7bf6762eb1cc7e36870b84fcc341b609527579ca2 SHA512 8b500565dc0d6c8513db3aa72a7ee1fa04510a712ce9b0977feccddc6b2dae53825e39182d43508e196f326776115789e81697116418f6f9f63d08f0c05d0543
 DIST theseer-tokenizer-1.1.3.tar.gz 10553 BLAKE2B 4bed1623abe110cec432a97fbd28752618420a188b450c935c77b5771d6986be9a51c8f100fd81a89d892b0c1e2b46b0124e3c35e3cbe2138eee2d520c74933a SHA512 e29fd41b311bac8021f4c0593d79a9c1bde4b6ccf4774e94d27a0e8a97bac3844109f9312c4aab6e239365630394b602b56a084c291dc13fb439dc8ac22944e3
 DIST theseer-tokenizer-1.2.0.tar.gz 7156 BLAKE2B 61474e3ebed5262b4d250f0057fbe68df6b2b2d6026cba28efbfc35c865bc9491e3b3f7871591a7aa52383c3bb748cf5dfb95f36d680bdbb9755b585b5b8f4f8 SHA512 e0deeffc151a1831cc7226037c75b534aa0d28d9639de45a1f0a6f5865d3df3cfbd7225e075b094603d512b0beb449e91205f40366ef1c7c865c8994e0710ff7
+DIST theseer-tokenizer-1.2.1.tar.gz 7537 BLAKE2B 204b39ca71cb6e99696c8bda19e5319e83302cd9fd4689343d3864ec81996d433ea8cfa2578abec2bef440271a1abe3169c3c871fd931c1ab73705cb7c36e4eb SHA512 7c7382f8f2e96984862d187fffb08b020cac8c0a0d93b58f9b1a244a46f8fcbfbe1c18d005acce8f8e1ef9aec2b9be99b7f2312e28f54a66f5a97ee263ed5239
 EBUILD theseer-tokenizer-1.1.0.ebuild 834 BLAKE2B 79ca12311b476cf6528502bfb4302b7e4d65a96c20e9c5c18494bb52d898181099730d78dbffaa6d0e2060c993b85c2629c84269c1e9629df396058c5f2b80ce SHA512 9cb0686954506ccdc4ce6a2e972bf54c482e260205700e521085609872c88f7d59fc966077a1ba062d621502a2f59d5048f2af2279ef08061f7b42a19df655e2
 EBUILD theseer-tokenizer-1.1.3.ebuild 834 BLAKE2B 02ed175c1a5d4c8395b1d049125316dc19a1b87404ca27950869a0ea7e98972bee58ea656f386341f6d623627c797722e69861f59dc96c280296423cbdfb3ac2 SHA512 9b5fff439ac870a1cb80cab1bd048207616bd810e627e4c8c1ab72080565888e12b626d670292d68574a814444a6e299c4feaf073aef1b6e4df0407e9656c95d
 EBUILD theseer-tokenizer-1.2.0.ebuild 805 BLAKE2B aed1ac6e06ed8cef37bb091daca130d9d7f2bf9e64a78bde0b9c1b539fc869283e8c3ded87944747e23ab9fba7cac64af226f514f26dadc18a7de2d520e96133 SHA512 87ba6d245b5a0f1451dec4cfd3cc164e2505cb8816a813043d89362f1d13236d453616d22978d443cd82f5a08e7b5fc7ace69badfd24fa0a43054e7fb8c0fe10
+EBUILD theseer-tokenizer-1.2.1.ebuild 811 BLAKE2B ccc407ce7c2edba8b65763d5906867d9dd515b9f51d26ed7338a56147b6cdc449739c9734a51cf1d906ac359880fc244f7b444abac5822e6b435c3818da7e672 SHA512 0fe156bc4c7527d9029b3f31cb6f7853b52d25e1af0a68d6be93beef7a8cd7ce726834ac0190e842e7f962f7b3d4ff6e70afadeb33a58070bf40f7fb033786b5
 MISC metadata.xml 345 BLAKE2B 00fc567d4c2a299386f12b8ef965350b96c728f13ea8cbe8de3ef1f9679c9f8a0d8589c30848730958912423c924ab95b5e2736d199e4b3c3f2390e874e96788 SHA512 d92145e182ab3fb70af9692db83adf85f4ce93e1f5161fceb5d5c454bc76385089191be7a6536c1bf3af868ddca1c93db605686f57fd7127694e2bff4aab63fa
diff --git a/dev-php/theseer-tokenizer/theseer-tokenizer-1.2.1.ebuild b/dev-php/theseer-tokenizer/theseer-tokenizer-1.2.1.ebuild
new file mode 100644
index 000000000000..2da5b5180736
--- /dev/null
+++ b/dev-php/theseer-tokenizer/theseer-tokenizer-1.2.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Convert tokenized PHP source code into XML and other formats"
+HOMEPAGE="https://github.com/theseer/tokenizer"
+SRC_URI="https://github.com/theseer/tokenizer/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+CDEPEND="dev-lang/php:*
+	dev-php/fedora-autoloader"
+
+BDEPEND="dev-php/theseer-Autoload"
+
+RDEPEND="${CDEPEND}"
+
+S="${WORKDIR}/tokenizer-${PV}"
+
+src_prepare() {
+	default
+
+	phpab \
+		--output src/autoload.php \
+		--template fedora2 \
+		--basedir src \
+		src || die
+}
+
+src_install() {
+	insinto /usr/share/php/TheSeer/Tokenizer
+	doins -r src/*
+
+	einstalldocs
+}