gentoo resync : 20.03.2022

9 files changed, 11 insertions, 277 deletions

diff --git a/dev-php/xdebug/Manifest b/dev-php/xdebug/Manifest
index c3c21c8703d0..775d282483a1 100644
--- a/dev-php/xdebug/Manifest
+++ b/dev-php/xdebug/Manifest
@@ -1,15 +1,6 @@
-AUX 2.6.0-xdebug.ini 1623 BLAKE2B 6d8c3352dc55778e29cce92794ae36421a6e696244e3c7e1dd4e98d2ff0a6c86ce91e4e4ff2749cd58135e838ff61e2cad5bca8879caf9928d82e2f4bf17af80 SHA512 fe715f986fc5fbc0b92f8d708281feb5b9f6e0a054537ad7883c11acd035d0ddfc20812d64b35a616e0e8048b6332a097a0103329e2c96221571eeecbaaa963f
 AUX 3.0-xdebug.ini 1207 BLAKE2B 5ebcd3d89e1f49ea67c517d9fe6f552b82341e47cc1d46f033731ba5d9bf901404e41f29a48a073d2da0645082b2938ab4734334a57f578461abce38cbc2f05d SHA512 40ccbbdee2f7c29fd3b5db963918835bddd3b6d76b4a6e15fd3f2127ffd72d0cc17ef33947b07da23b0d912b940dd5434b717c095ac3ad35985f0d3ecd111e79
-DIST xdebug-2.9.6.tar.gz 436208 BLAKE2B 00cfb42c41bfb44f285b97779d6ba625641fc34494465e9e791ab5458c6a608e432df0ad45c561df2f8c9aba04ab34b3a98bb5e6bfb92ace39a3ad4145f3514a SHA512 13ed07a1489ba7bc0b4e85bf56306c733e7894cea8cb442649635196606b12d92e5618ab2485e7cde4aaee2ac6752993aecd933c24fd64b5113ef619339403d2
-DIST xdebug-2.9.8.tar.gz 438295 BLAKE2B 8645052faceb354817ddb448f46af5b849507d31255b43ac59bcef4ece7837ef835ae2ad624ed8a95f8f98d552ef0e7195a4ade7df9176bc300d855a0156f405 SHA512 c431d51a0d9c5ac1c7fc529c2819db480cbfff6f65c35c3c0dbef4e78427aa28ede164f397f92c409e58e386a6be34ecd2ded0ee35e01df1cbf92a49fd2f2aab
-DIST xdebug-3.0.2.tar.gz 435761 BLAKE2B 0476d29b3a960d83fd0818098a3d076f48f4d67057a2b6ec79571b011a9f364b18d3319771ad18e7145aa0f0f45fab7ed13d814b863731abe1721aafa8b59408 SHA512 723e00885a49a5626870cc4cb0f7fd49a3173c8d4e9b4022009430fdeaa1b152828de18e6e7fa709be8bb11989c89dc2d9940de9cc3d592174b5dafbc3d2c52d
-DIST xdebug-3.0.3.tar.gz 437261 BLAKE2B 7ccfa8acbbe8b40eb086c9d4f47d363ec52850f5b0b91480bebfa416d7b88edf20deb6ee5fb5514dd1885f7a5b77c4b18caecf958d7dcf463c44c259d0fe2b89 SHA512 2ea5c6e2d6481aeeb5b2d8e39f5c5686d9b7480aea0c159f3da6e830700594b24129c1c4242ff8413b52aa2ed0ea872bf72a17fe23facb69c1cae75a917bde5d
-DIST xdebug-3.0.4.tar.gz 438559 BLAKE2B 0b4dc4a014f2459691bf43bb76d70a4080a6191b5f6cf4998751e73cdfcbecb7a6274e6f398476a2c68d014ddb25662e08e45b68fbc73c9b38c79c94b0682124 SHA512 f7f935903adb18f0920c919c3e5c923b70667dd82772bef7ae73fe40441ad1cb73f030aa206046720d4bfcf8b33f56d454cbb5f65dbdc275b7c1fd1907ff4ddb
 DIST xdebug-3.1.1.tar.gz 468120 BLAKE2B 038774612158c2c9b406e29dd70e2a3e182ce121bc92036eeb3362be0ba513a223cb2da41bdfe914d6861ae9d94ff33c5301cc23725ee771f47876c8095ae0b8 SHA512 b91bca3bac184723b3f6dc0c5db012f2ec0895ed55cd4ff83f73d35462b9cea654476c848f7d61559a4bd8661ce335fc71a45a7cab1165f4197d265e31eccc71
-EBUILD xdebug-2.9.6.ebuild 1194 BLAKE2B 3bc713d7a87b093287f00a41372c72c0245d7a8db887c90110eb047df2a1511d0aa313623c289839668fbc8d79e9a53be4d90ef3de02e8a0b087dcecfd1d066b SHA512 ca1870abca6bf2f68ee42cbd81db5eb65cf91d2fde533f1dd7eb14b5067f830b134716115629270d415e8ec5d0a0653a175a40f36c6f37a3a9ea9e6ad1c8215d
-EBUILD xdebug-2.9.8.ebuild 1198 BLAKE2B c248c825f3437ff09276529712c5baac9d2e8067842cdab6c62779939c9accc53d18e5bd6b650a6a7df98b3fff633686d89a276e001fce3fee45e35d77353d33 SHA512 ea107d25c3d47c2f1b8f62a689d7d796ef7c76b7301f991f3162770a5a4cd9232e392234e9c21342a1aac3a4d2bf3aaa912d58df132ca09ed60d9a1da59fd7f3
-EBUILD xdebug-3.0.2-r1.ebuild 1539 BLAKE2B af6fa2bcce4eb467ce2d27f32d30ab0c6b064869d4dc2ba1409fd6d40fc0cbcf0cffe4679b174f93eb8a0ac657d518ae14f0acd66830d3d9c9996c6d8976ebf3 SHA512 7ba76f4089b5955252daa240ba838340d2d7eefa6223380d7b8df5d4af0e3a38732908517e520da516b63fc68b46d0f845b71d788c617435d575099b9201e2ea
-EBUILD xdebug-3.0.3.ebuild 1539 BLAKE2B af6fa2bcce4eb467ce2d27f32d30ab0c6b064869d4dc2ba1409fd6d40fc0cbcf0cffe4679b174f93eb8a0ac657d518ae14f0acd66830d3d9c9996c6d8976ebf3 SHA512 7ba76f4089b5955252daa240ba838340d2d7eefa6223380d7b8df5d4af0e3a38732908517e520da516b63fc68b46d0f845b71d788c617435d575099b9201e2ea
-EBUILD xdebug-3.0.4.ebuild 1539 BLAKE2B af6fa2bcce4eb467ce2d27f32d30ab0c6b064869d4dc2ba1409fd6d40fc0cbcf0cffe4679b174f93eb8a0ac657d518ae14f0acd66830d3d9c9996c6d8976ebf3 SHA512 7ba76f4089b5955252daa240ba838340d2d7eefa6223380d7b8df5d4af0e3a38732908517e520da516b63fc68b46d0f845b71d788c617435d575099b9201e2ea
-EBUILD xdebug-3.1.1.ebuild 1546 BLAKE2B d56bc1642335887588ce55e0fe95bc3dce1ca6855cc35358013dac6044c99b27748d4d7e01aa3f537abac424064b7479fed7c73268e5aeba384d6ad277d31915 SHA512 7ddf2d464b82f101f482802f4c2e1e1f37b8ad5598107ae74b790681f4522e32b91cf37b4ee562eac4f0e43c94491138d10f60b468cdc550e1e9495a8ac822a1
-MISC metadata.xml 240 BLAKE2B f60f325331d493a555e53c29c7cf2742a415356da28a467505f1441f3fd790fd0d59050df84854bdc379d19d94a46121216479807975a2922d5a2fefde83416b SHA512 fada9d69055f2be962b95aac82f260ec5db7a3f4392d10f0458a1d125938fa17539f7ec486000f3a95cff85a3fbb6bbf1f6f4fe6c2de7aa420a7543a3e89d03e
+DIST xdebug-3.1.3.tar.gz 470305 BLAKE2B abc799f966c20ba868d57e707ebc35e1f2d4ef5567bcd373ae5ae2ada58fbd4a4a807cfdf520cb883f08bc5296f219d190865462eab7d11ff2cb8c12a33b671b SHA512 cd2e85ce37f5122bcaa8300061be3b244bf9a58060e4e7286b3b52e9ab592f9a8ad43b62d53f13c7be878bb8662ff7aba187b73040bea79a3244df3d6b59e27b
+EBUILD xdebug-3.1.1.ebuild 1542 BLAKE2B 2914474496f6ba6a1ed2bf99e648cba05e3b85f979aa5c2a6188fa2fe26e18bdd52ba2a2274155f1e5cfdc9b06662598b619e2d6485d6b1fefea06cd429e6c65 SHA512 0703b8d75e17ef21295f64ca681cfed2c545e98293793d2da75f6a47ed10719158f3ac88ae5c809404d0561b20c95f814887e024c34f8792c9de17e8da2e3cb8
+EBUILD xdebug-3.1.3.ebuild 1546 BLAKE2B 2788885758e5cdd516620d5f6af2d123fbaa0aeb8400b024570c4974544b84ab392e269e6cf3b1ff58fb7d3bc043e8eb20f64fb952910f22d9d3bb0f74a3d1bf SHA512 31bbd85506e95264b6dd5c188952cf3701e2f6b1996eae1ad322c3c3f25bdbbd40bded272928ee96177dc721e99f16897b266119c7e68a8730b2729a89697ddf
+MISC metadata.xml 318 BLAKE2B 3b475c99c023007f79d0a677e7ed0b977622befdb5b70003253548b748ec16e796bfacd7585b14ad97693002a61ed4136668723a05ef59901d04300fab13a04c SHA512 a00cf5299b46138af793fe348350bb9a19d5c1710fe531cac7fbc8f0d8b9a3147df7374e7bc0f1d1122d3b5e992c482e921c2482b5fde0d7642b542b65428cbb
diff --git a/dev-php/xdebug/files/2.6.0-xdebug.ini b/dev-php/xdebug/files/2.6.0-xdebug.ini
deleted file mode 100644
index e37ada0ef8fe..000000000000
--- a/dev-php/xdebug/files/2.6.0-xdebug.ini
+++ /dev/null
@@ -1,54 +0,0 @@
-;xdebug.auto_trace = 0
-;xdebug.cli_color = 0
-;xdebug.collect_assignments = 0
-;xdebug.collect_includes = 1
-;xdebug.collect_params = 0
-;xdebug.collect_return = 0
-;xdebug.collect_vars = 0
-;xdebug.coverage_enable = 1
-xdebug.default_enable = 0
-;xdebug.dump.* = Empty
-;xdebug.dump_globals = 1
-;xdebug.dump_once = 1
-;xdebug.dump_undefined = 0
-;xdebug.extended_info = 1
-;xdebug.file_link_format = 
-;xdebug.force_display_errors = 0
-;xdebug.force_error_reporting = 0
-;xdebug.halt_level = 0
-;xdebug.idekey = *complex*
-;xdebug.manual_url = http://www.php.net
-;xdebug.max_nesting_level = 256
-;xdebug.max_stack_frames = -1
-;xdebug.overload_var_dump = 2
-;xdebug.profiler_aggregate = 0
-;xdebug.profiler_append = 0
-;xdebug.profiler_enable = 0
-;xdebug.profiler_enable_trigger = 0
-;xdebug.profiler_enable_trigger_value = ""
-;xdebug.profiler_output_dir = /tmp
-;xdebug.profiler_output_name = cachegrind.out.%p
-;xdebug.remote_addr_header = ""
-;xdebug.remote_autostart = 0
-;xdebug.remote_connect_back = 0
-;xdebug.remote_cookie_expire_time = 3600
-;xdebug.remote_enable = 0
-;xdebug.remote_handler = dbgp
-;xdebug.remote_host = localhost
-;xdebug.remote_log = 
-;xdebug.remote_mode = req
-;xdebug.remote_port = 9000
-;xdebug.scream = 0
-;xdebug.show_error_trace = 0
-;xdebug.show_exception_trace = 0
-;xdebug.show_local_vars = 0
-;xdebug.show_mem_delta = 0
-;xdebug.trace_enable_trigger = 0
-;xdebug.trace_enable_trigger_value = ""
-;xdebug.trace_format = 0
-;xdebug.trace_options = 0
-;xdebug.trace_output_dir = /tmp
-;xdebug.trace_output_name = trace.%c
-;xdebug.var_display_max_children = 128
-;xdebug.var_display_max_data = 512
-;xdebug.var_display_max_depth = 3
diff --git a/dev-php/xdebug/metadata.xml b/dev-php/xdebug/metadata.xml
index 222c77f3742a..8bdfa70e6be3 100644
--- a/dev-php/xdebug/metadata.xml
+++ b/dev-php/xdebug/metadata.xml
@@ -5,4 +5,7 @@
 		<email>php-bugs@gentoo.org</email>
 		<name>PHP</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">xdebug/xdebug</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-php/xdebug/xdebug-2.9.6.ebuild b/dev-php/xdebug/xdebug-2.9.6.ebuild
deleted file mode 100644
index e721f2c63e7b..000000000000
--- a/dev-php/xdebug/xdebug-2.9.6.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PHP_EXT_NAME="xdebug"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="yes"
-PHP_EXT_INIFILE="2.6.0-xdebug.ini"
-
-USE_PHP="php7-2 php7-3 php7-4"
-
-MY_PV="${PV/_/}"
-MY_PV="${MY_PV/rc/RC}"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-inherit php-ext-source-r3
-
-KEYWORDS="amd64 ~hppa ppc ppc64 x86"
-
-DESCRIPTION="A PHP debugging and profiling extension"
-HOMEPAGE="https://xdebug.org/"
-# Using tarball from GitHub for tests
-#SRC_URI="https://pecl.php.net/get/${PN}-${MY_PV}.tgz"
-SRC_URI="https://github.com/xdebug/xdebug/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="Xdebug"
-SLOT="0"
-IUSE=""
-
-# Tests are known to fail
-RESTRICT="test"
-
-DEPEND=""
-RDEPEND="${DEPEND}
-		~dev-php/xdebug-client-${PV}"
-DOCS=( README.rst CREDITS )
-PHP_EXT_ECONF_ARGS=()
-
-pkg_postinst() {
-	ewarn "We have set xdebug.default_enable to 0 (off), as xdebug can be"
-	ewarn "installed as a dependency, and not all users will want xdebug to be"
-	ewarn "enabled by default. If you want to enable it, you should edit the"
-	ewarn "ini file and set xdebug.default_enable to 1. Alternatively you can"
-	ewarn "call xdebug_enable() in your code."
-}
diff --git a/dev-php/xdebug/xdebug-2.9.8.ebuild b/dev-php/xdebug/xdebug-2.9.8.ebuild
deleted file mode 100644
index 2edd756ef66e..000000000000
--- a/dev-php/xdebug/xdebug-2.9.8.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PHP_EXT_NAME="xdebug"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="yes"
-PHP_EXT_INIFILE="2.6.0-xdebug.ini"
-
-USE_PHP="php7-2 php7-3 php7-4"
-
-MY_PV="${PV/_/}"
-MY_PV="${MY_PV/rc/RC}"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-inherit php-ext-source-r3
-
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
-
-DESCRIPTION="A PHP debugging and profiling extension"
-HOMEPAGE="https://xdebug.org/"
-# Using tarball from GitHub for tests
-#SRC_URI="https://pecl.php.net/get/${PN}-${MY_PV}.tgz"
-SRC_URI="https://github.com/xdebug/xdebug/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="Xdebug"
-SLOT="0"
-IUSE=""
-
-# Tests are known to fail
-RESTRICT="test"
-
-DEPEND=""
-RDEPEND="${DEPEND}
-		~dev-php/xdebug-client-${PV}"
-DOCS=( README.rst CREDITS )
-PHP_EXT_ECONF_ARGS=()
-
-pkg_postinst() {
-	ewarn "We have set xdebug.default_enable to 0 (off), as xdebug can be"
-	ewarn "installed as a dependency, and not all users will want xdebug to be"
-	ewarn "enabled by default. If you want to enable it, you should edit the"
-	ewarn "ini file and set xdebug.default_enable to 1. Alternatively you can"
-	ewarn "call xdebug_enable() in your code."
-}
diff --git a/dev-php/xdebug/xdebug-3.0.2-r1.ebuild b/dev-php/xdebug/xdebug-3.0.2-r1.ebuild
deleted file mode 100644
index c4a24b3dd8dc..000000000000
--- a/dev-php/xdebug/xdebug-3.0.2-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PHP_EXT_NAME="xdebug"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="yes"
-PHP_EXT_INIFILE="3.0-xdebug.ini"
-
-USE_PHP="php7-3 php7-4 php8-0"
-PHP_EXT_NEEDED_USE="-threads(-)"
-
-MY_PV="${PV/_/}"
-MY_PV="${MY_PV/rc/RC}"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-inherit php-ext-source-r3
-
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
-
-DESCRIPTION="A PHP debugging and profiling extension"
-HOMEPAGE="https://xdebug.org/"
-# Using tarball from GitHub for tests
-#SRC_URI="https://pecl.php.net/get/${PN}-${MY_PV}.tgz"
-SRC_URI="https://github.com/xdebug/xdebug/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="Xdebug"
-SLOT="0"
-IUSE=""
-
-# Tests are known to fail
-RESTRICT="test"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-DOCS=( README.rst CREDITS )
-PHP_EXT_ECONF_ARGS=()
-
-src_test() {
-	local slot
-	for slot in $(php_get_slots); do
-		php_init_slot_env "${slot}"
-		TEST_PHP_EXECUTABLE="${PHPCLI}" \
-		TEST_PHP_CGI_EXECUTABLE="${PHPCGI}" \
-		TEST_PHPDBG_EXECUTABLE="${PHPCLI}dbg" \
-		 "${PHPCLI}" run-xdebug-tests.php
-	done
-}
-
-pkg_postinst() {
-	ewarn "We have set xdebug.mode to off, as xdebug can be"
-	ewarn "installed as a dependency, and not all users will want xdebug to be"
-	ewarn "enabled by default. If you want to enable it, you should edit the"
-	ewarn "ini file and set xdebug.mode to one or more modes e.g. develop,debug,trace"
-	elog ""
-	elog "The 3.0 major release changes many options."
-	elog "Review https://xdebug.org/docs/upgrade_guide for differences from 2.x"
-}
diff --git a/dev-php/xdebug/xdebug-3.0.4.ebuild b/dev-php/xdebug/xdebug-3.0.4.ebuild
deleted file mode 100644
index c4a24b3dd8dc..000000000000
--- a/dev-php/xdebug/xdebug-3.0.4.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PHP_EXT_NAME="xdebug"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="yes"
-PHP_EXT_INIFILE="3.0-xdebug.ini"
-
-USE_PHP="php7-3 php7-4 php8-0"
-PHP_EXT_NEEDED_USE="-threads(-)"
-
-MY_PV="${PV/_/}"
-MY_PV="${MY_PV/rc/RC}"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-inherit php-ext-source-r3
-
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
-
-DESCRIPTION="A PHP debugging and profiling extension"
-HOMEPAGE="https://xdebug.org/"
-# Using tarball from GitHub for tests
-#SRC_URI="https://pecl.php.net/get/${PN}-${MY_PV}.tgz"
-SRC_URI="https://github.com/xdebug/xdebug/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="Xdebug"
-SLOT="0"
-IUSE=""
-
-# Tests are known to fail
-RESTRICT="test"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-DOCS=( README.rst CREDITS )
-PHP_EXT_ECONF_ARGS=()
-
-src_test() {
-	local slot
-	for slot in $(php_get_slots); do
-		php_init_slot_env "${slot}"
-		TEST_PHP_EXECUTABLE="${PHPCLI}" \
-		TEST_PHP_CGI_EXECUTABLE="${PHPCGI}" \
-		TEST_PHPDBG_EXECUTABLE="${PHPCLI}dbg" \
-		 "${PHPCLI}" run-xdebug-tests.php
-	done
-}
-
-pkg_postinst() {
-	ewarn "We have set xdebug.mode to off, as xdebug can be"
-	ewarn "installed as a dependency, and not all users will want xdebug to be"
-	ewarn "enabled by default. If you want to enable it, you should edit the"
-	ewarn "ini file and set xdebug.mode to one or more modes e.g. develop,debug,trace"
-	elog ""
-	elog "The 3.0 major release changes many options."
-	elog "Review https://xdebug.org/docs/upgrade_guide for differences from 2.x"
-}
diff --git a/dev-php/xdebug/xdebug-3.1.1.ebuild b/dev-php/xdebug/xdebug-3.1.1.ebuild
index 00bf4b8a058b..5e6b98736460 100644
--- a/dev-php/xdebug/xdebug-3.1.1.ebuild
+++ b/dev-php/xdebug/xdebug-3.1.1.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"
@@ -17,7 +17,7 @@ S="${WORKDIR}/${PN}-${MY_PV}"
 
 inherit php-ext-source-r3
 
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~hppa ppc ppc64 x86"
 
 DESCRIPTION="A PHP debugging and profiling extension"
 HOMEPAGE="https://xdebug.org/"
diff --git a/dev-php/xdebug/xdebug-3.0.3.ebuild b/dev-php/xdebug/xdebug-3.1.3.ebuild
index c4a24b3dd8dc..43fe02c18eb5 100644
--- a/dev-php/xdebug/xdebug-3.0.3.ebuild
+++ b/dev-php/xdebug/xdebug-3.1.3.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"
@@ -7,7 +7,7 @@ PHP_EXT_INI="yes"
 PHP_EXT_ZENDEXT="yes"
 PHP_EXT_INIFILE="3.0-xdebug.ini"
 
-USE_PHP="php7-3 php7-4 php8-0"
+USE_PHP="php7-3 php7-4 php8-0 php8-1"
 PHP_EXT_NEEDED_USE="-threads(-)"
 
 MY_PV="${PV/_/}"