gentoo resync : 15.12.2019

4 files changed, 10 insertions, 97 deletions

diff --git a/dev-php/xdebug/Manifest b/dev-php/xdebug/Manifest
index 58ccc3618322..655a0d80c69d 100644
--- a/dev-php/xdebug/Manifest
+++ b/dev-php/xdebug/Manifest
@@ -1,15 +1,12 @@
-AUX 2.4.1-xdebug.ini 1285 BLAKE2B 830f55244b0ccece6f3123cef1489440372468aa3d4f02115e8695ff610505b91e36fb65e7f110b46e3fc5888d6c366eeaa5592dd7f40e2eb2133bb0711dd8aa SHA512 1eff8bc1e3cf9a3fae2ff2bc33e7ea47636e15496aa2a8efc039974fc2734632890d1da8bd6b07db6402c38c8e07631be38916f16a54d66068d0fad15d446bfc
 AUX 2.6.0-xdebug.ini 1623 BLAKE2B 6d8c3352dc55778e29cce92794ae36421a6e696244e3c7e1dd4e98d2ff0a6c86ce91e4e4ff2749cd58135e838ff61e2cad5bca8879caf9928d82e2f4bf17af80 SHA512 fe715f986fc5fbc0b92f8d708281feb5b9f6e0a054537ad7883c11acd035d0ddfc20812d64b35a616e0e8048b6332a097a0103329e2c96221571eeecbaaa963f
-DIST xdebug-2.5.3.tgz 279085 BLAKE2B cbbfb15e92c3f80cda502340396a6137e2234442fd98bc3fe4b2e08e76cba6292fb5176992aadba7193308ec4c9ab32356922a4416a21b23603e9b48a0d73c06 SHA512 b301a5abb92e123bbe2b36f7838b56d370a0f2c0c4d3c350b5014f4b86d31daa66e9bff995eed67a570558f6a72ca46a097266e6ab94c413f1dcb99c0fbd4f22
-DIST xdebug-2.5.5.tgz 279491 BLAKE2B 2492911db7afca2bc96761788c4ec7eac92cb22a6d65b69070b74f702df2bae1ba7dff9f5edfe83542229dbb7ebb3850b6ed1cf19a5e5969413aac3f2d39fc73 SHA512 9faab421bd90c03734c047d8c6dcc021c8bc665eb36781c692f194d04c7dca24fe1eb920ca8dc407e5bf4ae0912c4b917587f940f34b07171a8881d4cf8695d1
 DIST xdebug-2.6.1.tgz 283961 BLAKE2B 4478d591591102a9efa248820831e4d43d89eb9b80379c92fe85c888377a31d855ac4ea98c13ad87da68f7e7f659483cfa36fd4651f245d5603fcada2e2fcf73 SHA512 31f26e592b3888d7cc74c6a7c51e0cc1151cf8a32100dda78098fb5b3e307cf8d0445b97247986c75b303a787f89b3937bc042dc52f19ca995753a6843bbd80b
 DIST xdebug-2.7.0.tar.gz 411943 BLAKE2B d01ad4f84a93356d0ce885cd0b3fb4e72bb55c7df0cb264750f91711e25955c3c5941ca40d5374ead6f4a0c2c70ec30c4133e626d5a925fe0c539541567692de SHA512 44ba3a1e7ca111250c53369df603851d84cb1ea91b691ef9f7695a6565369bf20a30e8bd2b9398ecc4440df4a566674876dd47ad8e60fe116c6784167461d5db
 DIST xdebug-2.7.2.tar.gz 416082 BLAKE2B c84e8a7b5e2fbc0989c47d9dff8c8d52d6e44a9fea1f7be483cec60b8b75e8665c71a536d0ca0c1b835990f747cadb29900d64b5ab0f47a4be172e7e1c0d38b2 SHA512 b099904b552750b9ff09181f068deddb155c820d20f6a4dcc37579771607e4e9c43af1cf226e74c012abd188b240c46b13207b9e55bdf010a696b739f1ea5e88
 DIST xdebug-2.8.0.tar.gz 440563 BLAKE2B a90fd84a56635fe4c7036b517da8c980affe5307d0f27c471e792d75c1fae45effabb4fff4954340920cb259baae7d8268274a3f2eec7490a9b84920438e6a49 SHA512 ec97de4c092a9256cc0c22ed87c59ac41b60103c82c7e57d1be66c4e6b098dfa82bedde9a9a0856cce34b83711f2d6719154aad45a688e9eaa5ad014abeff58b
-EBUILD xdebug-2.5.3.ebuild 1035 BLAKE2B 33b476351fde796721bf602b127488496a65ad078cf2f6a2c49ba1d8f80252f08416b6c73c8424dd8a31d1ee4950dae9aa12c651c303db1c14a219c07ff25a96 SHA512 d6ba05f536ce9ab502ac4a0008b04544f37755b007a3c2efea9e75cc5e9d5b7f9c2f2bc58d76b682addef1681d747af8c6682cbf7073bee234c1571d99836081
-EBUILD xdebug-2.5.5.ebuild 1039 BLAKE2B 1e6a6b488a3e8041378d044646831021f047bbb3e923e8f5587540f35fb2234e5be4ff2017a2c293d1b3b2656d7161e1474daa724df5c0dcf1658ebe8686d38a SHA512 13d6f35f02f8869dec0c46283a8ca5c198d4d87d0be0e374c5f355c94f4e84f176713199733df72bb4eaf06a042c43c8037c2cb4a58eb621c9d14362185aa7f8
+DIST xdebug-2.9.0.tar.gz 434220 BLAKE2B a537438dcd45d55521cf5f12ae9ca864d02dbccb3e971134d415b14deb69b366cbe55f1ec9e12457570ef7ef46e83a5ba32c6d63f80d7787e407d1fb9b9c1a4f SHA512 07719e58f637e9957ea92cde67c680d030ad5647b364061ba229c88590fbbc823b33f7b368913d213d64cea8c0ca92df59118df48b93c20e649c650b3333ce51
 EBUILD xdebug-2.6.1.ebuild 1032 BLAKE2B 71cd322d334d47194e8fa317e5f0722fa944f4612c2bd45cb1d56241495c891702ca2ad5e647e1356af0d51307f7e752c1e37f57b5044ea8f085209332091cb1 SHA512 b0ffe7473f0c0e79d470fd6f7ab9526918817bb6256a88b69e1f53e99d2e8270530174e991093b8be8af3ef54d6f85e3d5a5affd9fe703e51babeaaf5c431aa8
 EBUILD xdebug-2.7.0.ebuild 1155 BLAKE2B fc9630f3e3bc442702447fbc152608a8af8e169a7e7508d6b79e1b06c02db2ac749eb49707470eb0d2a68384417b5f92a281e61eeb88acd63e7bd61165babcfe SHA512 5bb3d8f9e131b328990b78991f377fe7230394d3a1395beaf8ca57410d6960919bf3b914e84442c4ce6a1a8af8e75a6cc49e1609be9131be86f601a7a7360973
 EBUILD xdebug-2.7.2.ebuild 1155 BLAKE2B fc9630f3e3bc442702447fbc152608a8af8e169a7e7508d6b79e1b06c02db2ac749eb49707470eb0d2a68384417b5f92a281e61eeb88acd63e7bd61165babcfe SHA512 5bb3d8f9e131b328990b78991f377fe7230394d3a1395beaf8ca57410d6960919bf3b914e84442c4ce6a1a8af8e75a6cc49e1609be9131be86f601a7a7360973
 EBUILD xdebug-2.8.0.ebuild 1162 BLAKE2B 52d56fb3b8976d67c81136664082dd29d66623f31f039db6cbcc2eb3ea776f64f6bb929c2a1ba396f991a7aaf0e935bbab58360d734539d0d7ce3e331f43d0b3 SHA512 fecb4d764e55e7ee68075da0cfe1dfb5051cea6a9b13835398edd34a41e5d39b8051780bbb0c48bf459130626d12abd249b95257458d36564f4354a2283dab4d
+EBUILD xdebug-2.9.0.ebuild 1162 BLAKE2B 52d56fb3b8976d67c81136664082dd29d66623f31f039db6cbcc2eb3ea776f64f6bb929c2a1ba396f991a7aaf0e935bbab58360d734539d0d7ce3e331f43d0b3 SHA512 fecb4d764e55e7ee68075da0cfe1dfb5051cea6a9b13835398edd34a41e5d39b8051780bbb0c48bf459130626d12abd249b95257458d36564f4354a2283dab4d
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/xdebug/files/2.4.1-xdebug.ini b/dev-php/xdebug/files/2.4.1-xdebug.ini
deleted file mode 100644
index 62042aee217b..000000000000
--- a/dev-php/xdebug/files/2.4.1-xdebug.ini
+++ /dev/null
@@ -1,46 +0,0 @@
-xdebug.auto_trace="0"
-xdebug.trace_output_dir="/tmp"
-xdebug.trace_output_name="trace.%c"
-xdebug.trace_format="0"
-xdebug.trace_options="0"
-xdebug.collect_includes="1"
-xdebug.collect_params="0"
-xdebug.collect_return="0"
-xdebug.collect_vars="0"
-xdebug.default_enable="1"
-xdebug.extended_info="1"
-xdebug.manual_url="http://www.php.net"
-xdebug.max_nesting_level="256"
-xdebug.show_error_trace="0"
-xdebug.show_exception_trace="0"
-xdebug.show_local_vars="0"
-xdebug.show_mem_delta="0"
-xdebug.dump.COOKIE="NULL"
-xdebug.dump.ENV="NULL"
-xdebug.dump.FILES="NULL"
-xdebug.dump.GET="NULL"
-xdebug.dump.POST="NULL"
-xdebug.dump.REQUEST="NULL"
-xdebug.dump.SERVER="NULL"
-xdebug.dump.SESSION="NULL"
-xdebug.dump_globals="1"
-xdebug.dump_once="1"
-xdebug.dump_undefined="0"
-xdebug.overload_var_dump="2"
-xdebug.profiler_enable="0"
-xdebug.profiler_output_dir="/tmp"
-xdebug.profiler_output_name="cachegrind.out.%p"
-xdebug.profiler_enable_trigger="0"
-xdebug.profiler_append="0"
-xdebug.profiler_aggregate="0"
-xdebug.remote_enable="0"
-xdebug.remote_handler="dbgp"
-xdebug.remote_host="localhost"
-xdebug.remote_mode="req"
-xdebug.remote_port="9000"
-xdebug.remote_autostart="0"
-xdebug.remote_log=""
-xdebug.idekey=""
-xdebug.var_display_max_data="512"
-xdebug.var_display_max_depth="2"
-xdebug.var_display_max_children="128"
diff --git a/dev-php/xdebug/xdebug-2.5.3.ebuild b/dev-php/xdebug/xdebug-2.5.3.ebuild
deleted file mode 100644
index e7772abc27d4..000000000000
--- a/dev-php/xdebug/xdebug-2.5.3.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PHP_EXT_NAME="xdebug"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="yes"
-PHP_EXT_INIFILE="2.4.1-xdebug.ini"
-
-USE_PHP="php7-1 php7-0 php5-6"
-
-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="http://www.xdebug.org/"
-SRC_URI="http://pecl.php.net/get/${PN}-${MY_PV}.tgz"
-LICENSE="Xdebug"
-SLOT="0"
-IUSE=""
-
-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.5.5.ebuild b/dev-php/xdebug/xdebug-2.9.0.ebuild
index 2f3ece25477e..a95298dda05b 100644
--- a/dev-php/xdebug/xdebug-2.5.5.ebuild
+++ b/dev-php/xdebug/xdebug-2.9.0.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 PHP_EXT_NAME="xdebug"
 PHP_EXT_INI="yes"
 PHP_EXT_ZENDEXT="yes"
-PHP_EXT_INIFILE="2.4.1-xdebug.ini"
+PHP_EXT_INIFILE="2.6.0-xdebug.ini"
 
-USE_PHP="php7-1 php7-0 php5-6"
+USE_PHP="php7-1 php7-2 php7-3 php7-4"
 
 MY_PV="${PV/_/}"
 MY_PV="${MY_PV/rc/RC}"
@@ -19,8 +19,10 @@ inherit php-ext-source-r3
 KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
 
 DESCRIPTION="A PHP debugging and profiling extension"
-HOMEPAGE="http://www.xdebug.org/"
-SRC_URI="http://pecl.php.net/get/${PN}-${MY_PV}.tgz"
+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=""