7 files changed, 93 insertions, 4 deletions
diff --git a/dev-php/Manifest.gz b/dev-php/Manifest.gz
index 75be492ad478..a3fcfcfd6ff9 100644
--- a/dev-php/Manifest.gz
+++ b/dev-php/Manifest.gz
diff --git a/dev-php/xdebug-client/Manifest b/dev-php/xdebug-client/Manifest
index 3d9c57c3f777..45a29021dfae 100644
--- a/dev-php/xdebug-client/Manifest
+++ b/dev-php/xdebug-client/Manifest
@@ -1,7 +1,9 @@
 DIST xdebug-2.9.4.tar.gz 434622 BLAKE2B bd0d0c6a46867ffba88693f142346d11b5abfab3254c549b74ff9169536c42903b1fb1cb94c3344060590b63e287878ea05c6ef7ad8343234bada3857e0dbe75 SHA512 cf19fb9fd12c32e04c18f296694d0667dfe6e14617da932804d17526c88ab19dd2307ad43d036a8c0cb1f871a964523473879da8815f346faf83ec3b9e3952e3
 DIST xdebug-2.9.5.tar.gz 434947 BLAKE2B 08fd7cc92880c9b00180d495341fc7e54998cf3c2294b824d94c3c4ed982ae5b087084b776bcc4f8f4e1aa420396c803d330bc76748cf972cccab4e3f1416d38 SHA512 2a937d08468d3a2963559a56bdf9c9aa6ede3f0ee63797aa14831bcab33a5ede65b87791171a0c794eefdfcffa65bb4d0c06b5377fe03ade65f4defa6e328c72
 DIST xdebug-2.9.6.tar.gz 436208 BLAKE2B 00cfb42c41bfb44f285b97779d6ba625641fc34494465e9e791ab5458c6a608e432df0ad45c561df2f8c9aba04ab34b3a98bb5e6bfb92ace39a3ad4145f3514a SHA512 13ed07a1489ba7bc0b4e85bf56306c733e7894cea8cb442649635196606b12d92e5618ab2485e7cde4aaee2ac6752993aecd933c24fd64b5113ef619339403d2
+DIST xdebug-2.9.7.tar.gz 437517 BLAKE2B 6d3cb615b6b75354e5dc993a2de9f90b5865ee1a98935c084a9d7a4e1d03cceb71278b06da1d5e47f2b4105937f6d24cb8d767c7179fa55798e61a599e173c13 SHA512 ec23f7b5b2e2b109a753e12f1cb01377db52716600fbb31ca5b9a749e9d98e0eb60942b272c25a42efcb56add016310c79eda2c7385a3e0fc18e563f2f486d1e
 EBUILD xdebug-client-2.9.4.ebuild 814 BLAKE2B 70a121144f1144210566d3c97e38551da0c7910a23e35896e12c2973205d86d3f92f8fadee8d5249ba1b7668d923265b420285f755b857d34f65ba7db1485f0d SHA512 186c937cfcf12e626d098456a096ce27244c308d528c48126cf839d67badd7b9ff3de593ea58227f94391d1b8c85a4c48d08fd67e7904c4d3cdf6d6ef198d2fe
 EBUILD xdebug-client-2.9.5.ebuild 818 BLAKE2B 8cb831537f4919e004b7b6b683d9cca39d3abc7a82a1ca22181e0d626bd0781396128fe8d6fa6ec8396b7025460f3b7e4e295126489c6b85ce8b8f8347b463f2 SHA512 7440d82ecf5685dc1832e34912aa9aff85e0bdb2da42ee5fd02249aa3e07945b3ac095300bdd3344e0583d5a64c58abe28e5cdbf4be96131b7c90db840e663ac
-EBUILD xdebug-client-2.9.6.ebuild 816 BLAKE2B c6c993780dabbc342d3e0ee54663bf3a171f31fc2911dfc7162811920fe46febca578de32dd1a4565bc5cb5f4520201de3f86d5c36c94ade2d2cb20192e20e60 SHA512 350d633f0d7675d6d63f673e73e75fd8d4c0d39692ac66c37a689ac8826dbc1a7e2b48abe79db47ae8621a996fe7c8113786a121c1ec1b07317f4b61f426fb81
+EBUILD xdebug-client-2.9.6.ebuild 814 BLAKE2B 70a121144f1144210566d3c97e38551da0c7910a23e35896e12c2973205d86d3f92f8fadee8d5249ba1b7668d923265b420285f755b857d34f65ba7db1485f0d SHA512 186c937cfcf12e626d098456a096ce27244c308d528c48126cf839d67badd7b9ff3de593ea58227f94391d1b8c85a4c48d08fd67e7904c4d3cdf6d6ef198d2fe
+EBUILD xdebug-client-2.9.7.ebuild 818 BLAKE2B 8cb831537f4919e004b7b6b683d9cca39d3abc7a82a1ca22181e0d626bd0781396128fe8d6fa6ec8396b7025460f3b7e4e295126489c6b85ce8b8f8347b463f2 SHA512 7440d82ecf5685dc1832e34912aa9aff85e0bdb2da42ee5fd02249aa3e07945b3ac095300bdd3344e0583d5a64c58abe28e5cdbf4be96131b7c90db840e663ac
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/xdebug-client/xdebug-client-2.9.6.ebuild b/dev-php/xdebug-client/xdebug-client-2.9.6.ebuild
index e98e6f9c2dac..e78a7cba61c8 100644
--- a/dev-php/xdebug-client/xdebug-client-2.9.6.ebuild
+++ b/dev-php/xdebug-client/xdebug-client-2.9.6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-KEYWORDS="amd64 ~hppa ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~hppa ppc ppc64 x86"
 
 MY_PN="xdebug"
 MY_PV="${PV/_/}"
diff --git a/dev-php/xdebug-client/xdebug-client-2.9.7.ebuild b/dev-php/xdebug-client/xdebug-client-2.9.7.ebuild
new file mode 100644
index 000000000000..ad1c2866a297
--- /dev/null
+++ b/dev-php/xdebug-client/xdebug-client-2.9.7.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+
+MY_PN="xdebug"
+MY_PV="${PV/_/}"
+MY_PV="${MY_PV/rc/RC}"
+
+inherit autotools
+
+DESCRIPTION="Xdebug client for the Common Debugger Protocol (DBGP)"
+HOMEPAGE="https://xdebug.org/"
+# Using tarball from GitHub for tests
+#SRC_URI="http://pecl.php.net/get/xdebug-${MY_PV}.tgz"
+SRC_URI="https://github.com/xdebug/xdebug/archive/${MY_PV}.tar.gz -> ${MY_PN}-${PV}.tar.gz"
+LICENSE="Xdebug"
+SLOT="0"
+IUSE="libedit"
+
+S="${WORKDIR}/${MY_PN}-${MY_PV}/debugclient"
+
+DEPEND="libedit? ( dev-libs/libedit ) net-libs/libnsl:0="
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_with libedit)
+}
+
+src_install() {
+	newbin debugclient xdebug
+}
diff --git a/dev-php/xdebug/Manifest b/dev-php/xdebug/Manifest
index 7ec10ac3b64f..39aa6d5106b6 100644
--- a/dev-php/xdebug/Manifest
+++ b/dev-php/xdebug/Manifest
@@ -2,7 +2,9 @@ AUX 2.6.0-xdebug.ini 1623 BLAKE2B 6d8c3352dc55778e29cce92794ae36421a6e696244e3c7
 DIST xdebug-2.9.4.tar.gz 434622 BLAKE2B bd0d0c6a46867ffba88693f142346d11b5abfab3254c549b74ff9169536c42903b1fb1cb94c3344060590b63e287878ea05c6ef7ad8343234bada3857e0dbe75 SHA512 cf19fb9fd12c32e04c18f296694d0667dfe6e14617da932804d17526c88ab19dd2307ad43d036a8c0cb1f871a964523473879da8815f346faf83ec3b9e3952e3
 DIST xdebug-2.9.5.tar.gz 434947 BLAKE2B 08fd7cc92880c9b00180d495341fc7e54998cf3c2294b824d94c3c4ed982ae5b087084b776bcc4f8f4e1aa420396c803d330bc76748cf972cccab4e3f1416d38 SHA512 2a937d08468d3a2963559a56bdf9c9aa6ede3f0ee63797aa14831bcab33a5ede65b87791171a0c794eefdfcffa65bb4d0c06b5377fe03ade65f4defa6e328c72
 DIST xdebug-2.9.6.tar.gz 436208 BLAKE2B 00cfb42c41bfb44f285b97779d6ba625641fc34494465e9e791ab5458c6a608e432df0ad45c561df2f8c9aba04ab34b3a98bb5e6bfb92ace39a3ad4145f3514a SHA512 13ed07a1489ba7bc0b4e85bf56306c733e7894cea8cb442649635196606b12d92e5618ab2485e7cde4aaee2ac6752993aecd933c24fd64b5113ef619339403d2
+DIST xdebug-2.9.7.tar.gz 437517 BLAKE2B 6d3cb615b6b75354e5dc993a2de9f90b5865ee1a98935c084a9d7a4e1d03cceb71278b06da1d5e47f2b4105937f6d24cb8d767c7179fa55798e61a599e173c13 SHA512 ec23f7b5b2e2b109a753e12f1cb01377db52716600fbb31ca5b9a749e9d98e0eb60942b272c25a42efcb56add016310c79eda2c7385a3e0fc18e563f2f486d1e
 EBUILD xdebug-2.9.4.ebuild 1151 BLAKE2B 98c639f2e4b8af9bc775d502a89583f88c1933d1d9c8b0e271aa597012d6d7212fc347afdddaa009bc8cf54dbc556307b3bf85852e92ebd5b8d5f289c33da1fc SHA512 f892dc8ba343d01733bef047addad1166e738d97ef6071faa510d8fa75dc7b92b74369033bfb51e6414d959e1507a9e98882fd9c3210ee848ae50200d591d30b
 EBUILD xdebug-2.9.5.ebuild 1155 BLAKE2B 82a9636995566fd9143a02281c2114f98dfdea9f6d721f3e5916dbeac3d6d07d1a24a73cad866fad8729c472daa416c89ab95c41f0d84e258d4075a5a95dadfb SHA512 76d4db91e8346cc5a8ce97abe00994ac5773b9c55359ff596d61b6e2bf73539fbe968dc6aa00f98b372bc390381c9ec70f6ec0db1d92e3de20e3a1d82f6275be
-EBUILD xdebug-2.9.6.ebuild 1196 BLAKE2B 654411dcc751b53d70ac058851b82c06776e165d40e92c3c1e99de70e3f315ce03d6176c71ad47b16fb635cdd2c9bc4ffa23f8480db234503ae381858c0b7ccd SHA512 ee62475ed4909f03bce56226ebf6001c5eff8de96c7f3fbb89b8f71a3ca721a4aed14d089b57383d1825f448b571f5f42b860fc67386dc2dbc7eb05e200dbc55
+EBUILD xdebug-2.9.6.ebuild 1194 BLAKE2B 3bc713d7a87b093287f00a41372c72c0245d7a8db887c90110eb047df2a1511d0aa313623c289839668fbc8d79e9a53be4d90ef3de02e8a0b087dcecfd1d066b SHA512 ca1870abca6bf2f68ee42cbd81db5eb65cf91d2fde533f1dd7eb14b5067f830b134716115629270d415e8ec5d0a0653a175a40f36c6f37a3a9ea9e6ad1c8215d
+EBUILD xdebug-2.9.7.ebuild 1198 BLAKE2B c248c825f3437ff09276529712c5baac9d2e8067842cdab6c62779939c9accc53d18e5bd6b650a6a7df98b3fff633686d89a276e001fce3fee45e35d77353d33 SHA512 ea107d25c3d47c2f1b8f62a689d7d796ef7c76b7301f991f3162770a5a4cd9232e392234e9c21342a1aac3a4d2bf3aaa912d58df132ca09ed60d9a1da59fd7f3
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/xdebug/xdebug-2.9.6.ebuild b/dev-php/xdebug/xdebug-2.9.6.ebuild
index 3f73c2a7fe9b..e721f2c63e7b 100644
--- a/dev-php/xdebug/xdebug-2.9.6.ebuild
+++ b/dev-php/xdebug/xdebug-2.9.6.ebuild
@@ -16,7 +16,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-2.9.7.ebuild b/dev-php/xdebug/xdebug-2.9.7.ebuild
new file mode 100644
index 000000000000..2edd756ef66e
--- /dev/null
+++ b/dev-php/xdebug/xdebug-2.9.7.ebuild
@@ -0,0 +1,45 @@
+# 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."
+}