gentoo resync : 06.04.2022

11 files changed, 18 insertions, 129 deletions

diff --git a/dev-php/Manifest.gz b/dev-php/Manifest.gz
index 8be2f022628e..0bed54f7e31e 100644
--- a/dev-php/Manifest.gz
+++ b/dev-php/Manifest.gz
diff --git a/dev-php/PEAR-HTML_Common2/Manifest b/dev-php/PEAR-HTML_Common2/Manifest
index 753b9b0fc12c..6f0359e5ac90 100644
--- a/dev-php/PEAR-HTML_Common2/Manifest
+++ b/dev-php/PEAR-HTML_Common2/Manifest
@@ -1,5 +1,5 @@
-DIST HTML_Common2-2.1.2.tgz 8579 BLAKE2B 43d71ca1010e3cb4d73f25417b601872485f9c8990cb3117d112a84f2eca67437687d423146c1f67f8053116d4aef04b4859982805c7009047a682385878dc8e SHA512 f6082e44578dfa063f4f1a896ea477c485122e3d2cc89764c16ee76c3153d60276cbc290b4f3b8c18536aaeffb6797b9c56b8b0f2ffe1ef953fe02a5fb32b864
 DIST HTML_Common2-2.2.0.tgz 8884 BLAKE2B fc0c7d3573e8da0ec315dff4a59e54187cc9e378f2d576f30af7faaa8fce033a62aaed239d9613ff591e6c11b71f44cf78a35a4998abe9adb9550c7509e907df SHA512 7ebee98688a58484b92a50abd632ef21b166f9e20a47025e3e47af60b8dbb6108f3ceb5603b64602fee2275c2398fdd1831cfa3d2c151f266f2a7961823751d3
-EBUILD PEAR-HTML_Common2-2.1.2.ebuild 445 BLAKE2B c5119c780af4f92115c6385fa1670014ca17505dd578e790b5c1a95ae55fa2042fc963aeba59ca2d2316d60d74463a8b02075ce05c476dc12e551685b63092d3 SHA512 7b01dd97b32e7449f68a11312ffd4b10886f7811d5ec3065b9eae97b664c8f315de6c57405e331b35c485053c715ec98b38dff791dabd7f5afcefe2492f0a785
+DIST HTML_Common2-2.3.0.tgz 9085 BLAKE2B 577f83d110196c6edb0056f4e352fe3dbca3ec49d9b3fd6821f75b7b846f35bf6082c7a96962cedc891dab927e00b5987e57394f42f0401ba317b1496104f4f9 SHA512 b8d7a288d842a07de34a7a6b94ed9ac311a1fb3928a099f583a1d9ab6ce8514f938f7c8425cfa179647cdd5ecd514ed71ea2bb2ec968f49e27879dee7937b1a9
 EBUILD PEAR-HTML_Common2-2.2.0.ebuild 499 BLAKE2B 860e2cde4e111a63400bad148b49bca4db7aa54dd4161b919586f3d4267c8025509acd4c0089f1dca37db29510ed5563cf9dd7613602bbe8a3ff90d3bf4b9722 SHA512 16604903034bcc21e6d071241d928e774b08465e4fbfbe9d786cf4e06e5cb0dfdd918b9125dbdb0cf175f5102fc9164f9d4663edfa24fb7d3c5e3a699386b134
+EBUILD PEAR-HTML_Common2-2.3.0.ebuild 499 BLAKE2B 8a421c3c22feb5756be582c3dad87332b71afaac67e85c6d874be1f6d052c0ba5fc86ca3d255f49d7b9f95bfd5d2fb0d9c3e9e7f42435111e07ccfc0eaa51d32 SHA512 52a891b22ccb9db96b5119fde5b10ba214796b05cc8f4b6aba9ea5433119622a5ad54d1553adecfa8f9d0943066b856207bd72257a961a13425d43d1e08b751c
 MISC metadata.xml 236 BLAKE2B 55612da78a71f8cee31c387a5862636996734210d765fac66d8c7706acc5151e6a9e7ff5123aeb097c911495c6220ba3b5d2f1355f46e8ab6bdb240e1697e26d SHA512 2782b20a65dca663ff7c64b7e67db05641abed478fd5996e5750b2e52ba870829f89125baa8967dd29fd20ef9b46ad233b0dd08801308b7756717ec2f292446c
diff --git a/dev-php/PEAR-HTML_Common2/PEAR-HTML_Common2-2.1.2.ebuild b/dev-php/PEAR-HTML_Common2/PEAR-HTML_Common2-2.3.0.ebuild
index 821e6e7c7feb..b567da04e6c7 100644
--- a/dev-php/PEAR-HTML_Common2/PEAR-HTML_Common2-2.1.2.ebuild
+++ b/dev-php/PEAR-HTML_Common2/PEAR-HTML_Common2-2.3.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit php-pear-r2
 
@@ -9,9 +9,11 @@ DESCRIPTION="Abstract base class for HTML classes (PHP5 port of PEAR-HTML_Common
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-DEPEND="test? ( dev-php/phpunit )"
+#IUSE="test"
+#RESTRICT="!test? ( test )"
+# Tests fail with current phpunit
+RESTRICT="test"
+#BDEPEND="test? ( dev-php/phpunit )"
 
 src_test() {
 	phpunit tests/AllTests.php || die
diff --git a/dev-php/pecl-apcu/Manifest b/dev-php/pecl-apcu/Manifest
index f9de79a8e1c8..7936e90f48bd 100644
--- a/dev-php/pecl-apcu/Manifest
+++ b/dev-php/pecl-apcu/Manifest
@@ -1,7 +1,7 @@
 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 32d73b89bde9ef4eb01c9ad766930e87300b86776c95929607a8aaefba5043e3a7947d064416ac083ff38876fdb41bb03dab1552ac000082e54f809269b4c925 SHA512 a6ffe8349760d27cde0d86017a59a68e9639bf385e606622d807094f4e5fb305bb25b9ce00077d0856f4d223d44329f7a6314c229b62c78d8e2b085593c92bb3
-EBUILD pecl-apcu-5.1.19.ebuild 1545 BLAKE2B 1c074393bafc9563524a1f1d72271032189adce78b462c698babe9014349db09553d642b5a0978a0600326010cb971f81b16f7be0a2d88cf6d063f86848d2019 SHA512 25fb01fd624396446e0842eeb45b1c29f9526b0f864f55983ce69075454dda61d7148c991552fc4272b3f7ae58a513b56083f31cbe7ca0a5d6f5a03524d99899
-EBUILD pecl-apcu-5.1.20.ebuild 1553 BLAKE2B 015a8869645b8b2d79cee0d91b2eff4df743de8525d88d20b03dc9ba6f40ec377bcf1123d505d61a46c407c170167b1ca7b79a21a767320d401c9492c846018e SHA512 40ddab32f53bf4c7f0fde674c4916e5e385a3cdf8bb760e7e0b25f4303d9de73cb6f882b8f8ae80e4af633d788d48daaed08166afc6da755f50b75976a46403e
-EBUILD pecl-apcu-5.1.21.ebuild 1560 BLAKE2B 1be86a20eb978a8906485287031f2376e285b6c8989a62b203ef1e88b2582964cf055ae87c768c4a22381a402f21244974b1218110f632242349a0fb13607b3b SHA512 e32d20058ebba152466f1964b866cd8012d4ef5846c5c4763f5fe33379ccc198412872fc5db8ba6ffb5f37136f15c2962a38f926ebbac061b1b0e5951b70d4a2
+EBUILD pecl-apcu-5.1.19.ebuild 1379 BLAKE2B c35394d62233ba369b1ddc761ac97a3f8c67d6e3ca96e8da01c6e9d196fe133e91b034f15a24e43802c53586fdd1d6e24085cbd46a695f3c9ce2f150b0699898 SHA512 2d23cbbccc66e43338b5ca5ef61b8457ccb6aeec1a89cfc79a94ac8851c006d4877a8187c4e9244164dc1e80a96e92f25518a13f1048652ab03cb0aa87d1ecf8
+EBUILD pecl-apcu-5.1.20.ebuild 1387 BLAKE2B 2a37b104188decca39d9ac9d0b453282b97258c55eca44849051432b1fc7817bfd47ad9ad36c9079d251bc584ed62487376a8079c0eb36643533ac771a3600de SHA512 8897d25c134c1c90736d5d5ea49925e4f6ed55e1d95bb659d4a17029bd5ab0a0fecbbab467307a44deb5d7cd72fb827117d25925751d0d28ccbcb6cabbcd5d34
+EBUILD pecl-apcu-5.1.21.ebuild 1394 BLAKE2B da17294886d24252f76e06678d55d663cafa021a088bb8e0d630ef271154793aedbbebd8573a45959cfa2a02805c69b3fffd74f6a98c75552fd61688bc513a65 SHA512 371828e202554938e570b43ebc8e7c5cb9b0a61f8c405375de90c9de21500afc32befcacff5d170a57aa7a6e9842471e1f85bfb083459724b29fd52b9fd0d91e
 MISC metadata.xml 541 BLAKE2B 533f563e606b35d23c766aa177ea80b56b17ff352e907f2aed65c82be8bb6b01bcb61d69c6be6560b8e975ac279cf3a00ba5976d4a50c0f3ae68677ae7557cd8 SHA512 5dde6ecb39edb11fc4222cf869449f43fe3923623cea2a8ee4d4a4b8d7bf11bcc6d40f135cb5dc4cc81b161ed50489230bba443274c914d0015046ea44c868d8
diff --git a/dev-php/pecl-apcu/pecl-apcu-5.1.19.ebuild b/dev-php/pecl-apcu/pecl-apcu-5.1.19.ebuild
index 777b8df0cd0c..c7fb42739132 100644
--- a/dev-php/pecl-apcu/pecl-apcu-5.1.19.ebuild
+++ b/dev-php/pecl-apcu/pecl-apcu-5.1.19.ebuild
@@ -60,8 +60,4 @@ src_install() {
 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."
 }
diff --git a/dev-php/pecl-apcu/pecl-apcu-5.1.20.ebuild b/dev-php/pecl-apcu/pecl-apcu-5.1.20.ebuild
index 210505694b1c..ab9a31c49a50 100644
--- a/dev-php/pecl-apcu/pecl-apcu-5.1.20.ebuild
+++ b/dev-php/pecl-apcu/pecl-apcu-5.1.20.ebuild
@@ -60,8 +60,4 @@ src_install() {
 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."
 }
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 525f58c9e981..76efe265be57 100644
--- a/dev-php/pecl-apcu/pecl-apcu-5.1.21.ebuild
+++ b/dev-php/pecl-apcu/pecl-apcu-5.1.21.ebuild
@@ -60,8 +60,4 @@ src_install() {
 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."
 }
diff --git a/dev-php/twig/Manifest b/dev-php/twig/Manifest
index 380f8473ca54..9a214c523c2b 100644
--- a/dev-php/twig/Manifest
+++ b/dev-php/twig/Manifest
@@ -1,7 +1,4 @@
 AUX Autoloader.php 503 BLAKE2B 57679179226098eea818df53154b98afd3249f12a219fc894a7529bdcb8ceb39c7c5c20f14263ce03875983ab0acaeaa6e09ca8446ee5b9a591b6e284e7f9238 SHA512 054a9420a23b67c57ca0780fdbc3c817436dea71780714654469efa23c0d17173e1c87b2f3c6ce48e26e4dd49a92f1f17e2e23472a666513e9fb8903a4f11699
-DIST twig-1.40.1.tar.gz 274081 BLAKE2B 0e73bd9fff58677446ba03ed560bff17c1879192b79cca9f718ccd330e1eac64ee1195d7034fa52ec009e323868d1cc1bedc182e90f0a77c8b54d6aa16022554 SHA512 de174e5dd14562a155515a3238aa07ef5a22c3bf0eff8ecc320f1a972e56f1ec759a53ee24579c6434e286b3775044e88c753fd08930037314b45c9577b310b1
-DIST twig-1.42.3.tar.gz 278164 BLAKE2B 4bff9f7f85ce8ca00871e9342ec11a68d4b930f7761bc7404f504322483d328570e9e540e2518b5e1ad513002ce95686b7a1a47ff7aa4b28c16b2871ba759b01 SHA512 9dc892d80445f9fa9a3bde5cfdc49f2975a43f36123c1f4bbbb40740269e9aa4355d0d8668552e535f74a8ff27cc8ee1dc6983b50567993c1deab09569a7c5e3
-EBUILD twig-1.40.1-r1.ebuild 1372 BLAKE2B 75e3c4f3f38c36f0423ac633ed6ce78b0e8c53dd31823fcb30d8977c47161ab89917c04f5cabd48679f6bb70d552c8f5eee507cc1dea033192e2759618b90565 SHA512 2eb497b3edc86f26f4c39e7cbe477904dfaf8399e92a7452fd30eea4fdfb8d64f808a3889d996d2b144252c48b05723f812bc0dc105afe3fc6a374d171e48273
-EBUILD twig-1.42.3-r1.ebuild 1381 BLAKE2B 7eed6dba35c53dd75bc0537106c71f21e884098dbc624e6a0bb74c20df3e8b9a9470a4b0406db30552b9e1fd426b35395b948b41922705d81f0263d76b947173 SHA512 2913e54cb00cfc43599ebecfbd1af319bae8e01250aa666524edd6f5f483adac859f98fcb53672f9fb87a43e6829bb8246438d1ea60202323da3086eaee16813
-EBUILD twig-1.42.3.ebuild 1372 BLAKE2B 75e3c4f3f38c36f0423ac633ed6ce78b0e8c53dd31823fcb30d8977c47161ab89917c04f5cabd48679f6bb70d552c8f5eee507cc1dea033192e2759618b90565 SHA512 2eb497b3edc86f26f4c39e7cbe477904dfaf8399e92a7452fd30eea4fdfb8d64f808a3889d996d2b144252c48b05723f812bc0dc105afe3fc6a374d171e48273
+DIST twig-1.44.6.tar.gz 126880 BLAKE2B a838a5ae8bc82b6e0a39b55ba7d3817dd0ac0c2995881662fc5e7327a5dea83dea4740952282c9320016b379c08f02cb53a850004ecd2c919ca84da6267d0a56 SHA512 a443a700b71f982ea47187d9753ba9903e879f272ed53ff399211f5a76e7dd84774d5071a24cb8d5df6ffa754ce989fac152d0fe124ca460b8f167a553be86e7
+EBUILD twig-1.44.6.ebuild 1380 BLAKE2B 0db79b98e60fe42c1260922ae5a40bdc19c46619d735f92ad7317f2fe5b2c57c677cec695f642cd3ffa221fafe86769b32eee38045df13c1695e1b6f5cd25691 SHA512 9ebecbaa4b6eee4f12926d158173edfd7c2bbd27692249fb9cd9ed9794939c46e72afcbdc016c3f94c8cfa2097d6b9f5467218ca58ebbf50ccf7b8d622144e89
 MISC metadata.xml 439 BLAKE2B 27da78ff42447ff34923822ed56ad44183aa7d93ac23ab32bcc1b433a4df1e6e44b853cc36754497b0911ebc9dcbe143149bde1cdcd86eb479d11dc72d347758 SHA512 bedb9bc4acd125c8c1b548767f99e18a4cbbd6cb77a7e6e1631b7b4c58442900ead5d3954a84c6a5c79aadef9d6d4be848a1dbc5d8796d87e39545ca082147ae
diff --git a/dev-php/twig/twig-1.40.1-r1.ebuild b/dev-php/twig/twig-1.40.1-r1.ebuild
deleted file mode 100644
index 5935eab4bd1d..000000000000
--- a/dev-php/twig/twig-1.40.1-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN="Twig"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-DESCRIPTION="PHP templating engine with syntax similar to Django"
-HOMEPAGE="http://twig.sensiolabs.org/"
-SRC_URI="https://github.com/twigphp/${MY_PN}/archive/v${PV}.tar.gz
-	-> ${P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-RDEPEND="dev-lang/php:*[ctype] dev-php/fedora-autoloader"
-DEPEND="test? ( dev-php/phpunit ${RDEPEND} )"
-# Test fail due to missing Symphony dependencies
-RESTRICT="test"
-
-src_install() {
-	# The autoloader requires the 'T' in "Twig" capitalized.
-	insinto "/usr/share/php/${MY_PN}/lib"
-	doins -r lib/"${MY_PN}"/*
-	insinto "/usr/share/php/${MY_PN}/src"
-	doins -r src/*
-	insinto "/usr/share/php/${MY_PN}"
-	doins "${FILESDIR}/Autoloader.php"
-
-	dodoc README.rst CHANGELOG
-
-	# This installs the reStructuredText source documents. There's got
-	# to be some way to turn them into HTML using Sphinx, but upstream
-	# doesn't provide for it.
-	use doc && dodoc -r doc
-}
-
-src_test() {
-	cp "${FILESDIR}/Autoloader.php" "${S}" || die
-	phpunit --bootstrap Autoloader.php || die "test suite failed"
-	rm "${S}/Autoloader.php" || die
-}
-
-pkg_postinst() {
-	elog "${PN} has been installed in /usr/share/php/${MY_PN}/."
-	elog "To use it in a script, require('${MY_PN}/Autoloader.php')"
-}
diff --git a/dev-php/twig/twig-1.42.3.ebuild b/dev-php/twig/twig-1.42.3.ebuild
deleted file mode 100644
index 5935eab4bd1d..000000000000
--- a/dev-php/twig/twig-1.42.3.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN="Twig"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-DESCRIPTION="PHP templating engine with syntax similar to Django"
-HOMEPAGE="http://twig.sensiolabs.org/"
-SRC_URI="https://github.com/twigphp/${MY_PN}/archive/v${PV}.tar.gz
-	-> ${P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-RDEPEND="dev-lang/php:*[ctype] dev-php/fedora-autoloader"
-DEPEND="test? ( dev-php/phpunit ${RDEPEND} )"
-# Test fail due to missing Symphony dependencies
-RESTRICT="test"
-
-src_install() {
-	# The autoloader requires the 'T' in "Twig" capitalized.
-	insinto "/usr/share/php/${MY_PN}/lib"
-	doins -r lib/"${MY_PN}"/*
-	insinto "/usr/share/php/${MY_PN}/src"
-	doins -r src/*
-	insinto "/usr/share/php/${MY_PN}"
-	doins "${FILESDIR}/Autoloader.php"
-
-	dodoc README.rst CHANGELOG
-
-	# This installs the reStructuredText source documents. There's got
-	# to be some way to turn them into HTML using Sphinx, but upstream
-	# doesn't provide for it.
-	use doc && dodoc -r doc
-}
-
-src_test() {
-	cp "${FILESDIR}/Autoloader.php" "${S}" || die
-	phpunit --bootstrap Autoloader.php || die "test suite failed"
-	rm "${S}/Autoloader.php" || die
-}
-
-pkg_postinst() {
-	elog "${PN} has been installed in /usr/share/php/${MY_PN}/."
-	elog "To use it in a script, require('${MY_PN}/Autoloader.php')"
-}
diff --git a/dev-php/twig/twig-1.42.3-r1.ebuild b/dev-php/twig/twig-1.44.6.ebuild
index 1b651a90eb5c..6bdc6cf5c7c3 100644
--- a/dev-php/twig/twig-1.42.3-r1.ebuild
+++ b/dev-php/twig/twig-1.44.6.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 MY_PN="Twig"
 S="${WORKDIR}/${MY_PN}-${PV}"
 
 DESCRIPTION="PHP templating engine with syntax similar to Django"
-HOMEPAGE="http://twig.sensiolabs.org/"
+HOMEPAGE="https://twig.symfony.com/"
 SRC_URI="https://github.com/twigphp/${MY_PN}/archive/v${PV}.tar.gz
 	-> ${P}.tar.gz"
 LICENSE="BSD"
@@ -16,7 +16,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE="doc test"
 
 RDEPEND="dev-lang/php:*[ctype] dev-php/fedora-autoloader"
-DEPEND="test? ( dev-php/phpunit ${RDEPEND} )"
+BDEPEND="test? ( dev-php/phpunit ${RDEPEND} )"
 # Test fail due to missing Symphony dependencies
 RESTRICT="test"