gentoo resync : 19.03.2019

20 files changed, 348 insertions, 134 deletions

diff --git a/dev-php/Manifest.gz b/dev-php/Manifest.gz
index 6810d5962f36..26d81561954c 100644
--- a/dev-php/Manifest.gz
+++ b/dev-php/Manifest.gz
diff --git a/dev-php/PEAR-PEAR/Manifest b/dev-php/PEAR-PEAR/Manifest
index 8c4d9c19014a..b5475d29cc1e 100644
--- a/dev-php/PEAR-PEAR/Manifest
+++ b/dev-php/PEAR-PEAR/Manifest
@@ -2,6 +2,8 @@ AUX gentoo-libtool-mismatch-fix-v2.patch 510 BLAKE2B 59571998b848501efcdd4c304dc
 AUX pear.conf-r2 379 BLAKE2B fe57574f4e4ce095f7ddd9bc26606181a86e67f6c8e6dad57a713e187175b711d50d90c346759d430c32da0a740e7f79cffc7ccedc3b719d04dcd1792a9309f6 SHA512 81e4c95ccfd1a50d30d6e9db90fa099f3dd098bf4fa2c023f5369d0e96a197da91d2572ff3785bcfc83dba82abeca3932431083b5aa2aed155336697764666be
 DIST PEAR-1.10.6.tgz 291529 BLAKE2B 7a75c89df2b34b368564e745a727292e5c5ee3a145995c15d338901b235664d0a783ca0efc9cd1d321cc2c496e88395db376ce7bbd6ccbf55d484d7f1021cd2b SHA512 ccd436a2cb9d30b434a78483432c51a8fa5b3e96e79ca3b28131b8dcd37bbae0b782efd762eb92dc40db24d3f61025c64ec5d29aed10fd80a6b28c224c4f1e2a
 DIST PEAR-1.10.7.tgz 291786 BLAKE2B 7e760c2782832fab2a35f86e2f9072058d622918cdc2b61b7066d2f17787488d228186948e96e602bb412b76b806004642e7ba83db00950a822996869dae9cd4 SHA512 ebe93cff5546ad3a80d3d1c0284e34a46ec8dbdb7d015a11350231244baca75a57596e446c1386bc40650525f59c04617e73b1071a0fe77210dc5979edb5151f
+DIST PEAR-1.10.9.tgz 291931 BLAKE2B b9120d9b643be926e80aac33aafd0f22cacca11c10b857d99b6d51a7315467ad18d79246ab2752b962de92957fe14fc65e1d01570eb73b562b0e6e030dfb7162 SHA512 072d2eda510c05649f8d1481665bdd42efa060e6098b4b0d0353c95cf79d342ec601dd36dab3e6583b612582d2f03672a7b5de1518e3a0e8fd190ea698a17e60
 EBUILD PEAR-PEAR-1.10.6.ebuild 5891 BLAKE2B 2fdc55716f1b7fbfd359c27b1265fe8d72ff58d91f0c2b5d40fa353f164389b75a981e0c37555606326f3f1cf844e64db0ee16f9d1b9db27aaaeddf7720d986e SHA512 5c926169b5918fea5b1387ba7a363eeccbd51ad33598dc407ccd6fc92e7721fae92cbeb2f6c153f5ebf2b3c3f91c620ac4c603de9288cdd1044dbfe2dd72dc48
 EBUILD PEAR-PEAR-1.10.7.ebuild 5896 BLAKE2B c70be68cb99cd6a657cce7a2be0840f10427395f945fd1231250daa784af66be28cec0db41a14c8de0e960e2b3ff36011775df1b23648b91d5f23c1c5a80d6ab SHA512 d385674cfa1c442e446c01e5992bb3066b8f6d0ba0620d2d25b9531c6b82fca925012eca027687035025d87455326cf84b4896ab8b159359e29c06c3833b8b5f
+EBUILD PEAR-PEAR-1.10.9.ebuild 5900 BLAKE2B 684918622c4fc01b7796e4aed5235f30c5813d19b38b6a0d8e791b53bca97deb7c4855984c9a830a2c1cc50a6bc5f7f9244c25db0de3ddecf899c55ce0ad4037 SHA512 b8a2242c9c62e524e8fa585220616e185148158ec79ab7ebe929809f2b2d640aaed4099d2682434e3fe9a4d1b0736752655ccf73181b0e8c888e53c43da6f179
 MISC metadata.xml 306 BLAKE2B fdddffeab9925e2296436f14f6224e0cbdbe2d386e863de68a555cf8b1e5434409af998a4b73c9380d2118db0a021401b23034895038e31559e0de0919a8c597 SHA512 2e46d7a6fcadfed2ff7be17a5f0a82b5cbf6184b50384f868a6ad8821746badfe126279ef9c114ef9d9a42374931193dba4b84483d437797636b95e6e97247fa
diff --git a/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.9.ebuild b/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.9.ebuild
new file mode 100644
index 000000000000..941bc91e9d57
--- /dev/null
+++ b/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.9.ebuild
@@ -0,0 +1,177 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="${PN/PEAR-/}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="PEAR Base System"
+HOMEPAGE="http://pear.php.net/package/${MY_PN}"
+SRC_URI="http://pear.php.net/get/${MY_P}.tgz"
+LICENSE="MIT"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+SLOT="0"
+IUSE=""
+
+DEPEND=""
+RDEPEND="dev-lang/php:*[cli,xml,zlib]
+	>=dev-php/PEAR-Archive_Tar-1.4.0
+	>=dev-php/PEAR-Console_Getopt-1.4.1
+	dev-php/PEAR-Exception
+	>=dev-php/PEAR-Structures_Graph-1.1.0
+	>=dev-php/PEAR-XML_Util-1.3.0"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=( "${FILESDIR}/gentoo-libtool-mismatch-fix-v2.patch" )
+
+pkg_setup() {
+	[[ -z "${PEAR_CACHEDIR}" ]] && PEAR_CACHEDIR="${EPREFIX}/var/cache/pear"
+	[[ -z "${PEAR_DOWNLOADDIR}" ]] && PEAR_DOWNLOADDIR="${EPREFIX}/var/tmp/pear"
+	[[ -z "${PEAR_TEMPDIR}" ]] && PEAR_TEMPDIR="${EPREFIX}/tmp"
+
+	elog
+	elog "cache_dir is set to: ${PEAR_CACHEDIR}"
+	elog "download_dir is set to: ${PEAR_DOWNLOADDIR}"
+	elog "temp_dir is set to: ${PEAR_TEMPDIR}"
+	elog
+	elog "If you want to change the above values, you need to set"
+	elog "PEAR_CACHEDIR, PEAR_DOWNLOADDIR and PEAR_TEMPDIR variable(s)"
+	elog "accordingly in /etc/portage/make.conf and re-emerge ${PN}."
+	elog
+}
+
+src_prepare() {
+	default
+	# Exception.php is part of dev-php/PEAR-Exception.
+	rm PEAR/Exception.php || die "failed to remove PEAR/Exception.php"
+}
+
+src_install() {
+	insinto /usr/share/php
+	doins -r PEAR/
+	doins -r OS/
+	doins PEAR.php System.php
+	doins scripts/pearcmd.php
+	doins scripts/peclcmd.php
+
+	newbin scripts/pear.sh pear
+	newbin scripts/peardev.sh peardev
+	newbin scripts/pecl.sh pecl
+
+	# adjust some scripts for current version
+	[[ -z "${PEAR}" ]] && PEAR="${PV}"
+	for i in pearcmd.php peclcmd.php ; do
+		sed "s:@pear_version@:${PEAR}:g" -i "${D}/usr/share/php/${i}" \
+			|| die "failed to sed pear_version"
+	done
+
+	for i in pear peardev pecl ; do
+		sed "s:@bin_dir@:${EPREFIX}/usr/bin:g" -i "${D}/usr/bin/${i}" \
+			|| die "failed to sed @bin_dir@ in ${i}"
+		sed "s:@php_dir@:${EPREFIX}/usr/share/php:g" -i "${D}/usr/bin/${i}" \
+			|| die "failed to sed @php_dir@ in ${i}"
+	done
+
+	sed "s:-d output_buffering=1:-d output_buffering=1 -d memory_limit=32M:g" \
+		-i "${D}/usr/bin/pear" \
+		|| die "failed to set PHP ini values in pear executable"
+
+	sed "s:@package_version@:${PEAR}:g" \
+		-i "${D}/usr/share/php/PEAR/Command/Package.php" \
+		|| die "failed to sed @package_version@"
+
+	sed "s:@PEAR-VER@:${PEAR}:g" \
+		-i "${D}/usr/share/php/PEAR/Dependency2.php" \
+		|| die "failed to sed @PEAR-VER@ in Dependency2.php"
+
+	sed "s:@PEAR-VER@:${PEAR}:g" \
+		-i "${D}/usr/share/php/PEAR/PackageFile/Parser/v1.php" \
+		|| die "failed to sed @PEAR-VER@ in v1.php"
+
+	sed "s:@PEAR-VER@:${PEAR}:g" \
+		-i "${D}/usr/share/php/PEAR/PackageFile/Parser/v2.php" \
+		|| die "failed to sed @PEAR-VER@ in v2.php"
+
+	# finalize install
+	insinto /etc
+	newins "${FILESDIR}"/pear.conf-r2 pear.conf
+
+	sed "s|s:PHPCLILEN:\"PHPCLI\"|s:${#PHPCLI}:\"${PHPCLI}\"|g" \
+		-i "${D}/etc/pear.conf" \
+		|| die "failed to sed PHPCLILEN in pear.conf"
+
+	sed "s|s:CACHEDIRLEN:\"CACHEDIR\"|s:${#PEAR_CACHEDIR}:\"${PEAR_CACHEDIR}\"|g" \
+		-i "${D}/etc/pear.conf" \
+		|| die "failed to sed CACHEDIRLEN in pear.conf"
+
+	sed "s|s:DOWNLOADDIRLEN:\"DOWNLOADDIR\"|s:${#PEAR_DOWNLOADDIR}:\"${PEAR_DOWNLOADDIR}\"|g" \
+		-i "${D}/etc/pear.conf" \
+		|| die "failed to sed DOWNLOADDIRLEN in pear.conf"
+
+	sed "s|s:TEMPDIRLEN:\"TEMPDIR\"|s:${#PEAR_TEMPDIR}:\"${PEAR_TEMPDIR}\"|g" \
+		-i "${D}/etc/pear.conf" \
+		|| die "failed to sed TEMPDIRLEN in pear.conf"
+
+	# Change the paths for eprefix!
+	sed "s|s:19:\"/usr/share/php/docs\"|s:$(( ${#EPREFIX}+19 )):\"${EPREFIX}/usr/share/php/docs\"|g" \
+		-i "${D}/etc/pear.conf" \
+		|| die "failed to sed the docs path (prefix) in pear.conf"
+
+	sed "s|s:19:\"/usr/share/php/data\"|s:$(( ${#EPREFIX}+19 )):\"${EPREFIX}/usr/share/php/data\"|g" \
+		-i "${D}/etc/pear.conf" \
+		|| die "failed to sed the data path (prefix) in pear.conf"
+
+	sed "s|s:20:\"/usr/share/php/tests\"|s:$(( ${#EPREFIX}+20 )):\"${EPREFIX}/usr/share/php/tests\"|g" \
+		-i "${D}/etc/pear.conf" \
+		|| die "failed to sed the tests path (prefix) in pear.conf"
+
+	sed "s|s:14:\"/usr/share/php\"|s:$(( ${#EPREFIX}+14 )):\"${EPREFIX}/usr/share/php\"|g" \
+		-i "${D}/etc/pear.conf" \
+		|| die "failed to sed the PHP include path (prefix) in pear.conf"
+
+	sed "s|s:8:\"/usr/bin\"|s:$(( ${#EPREFIX}+8 )):\"${EPREFIX}/usr/bin\"|g" \
+		-i "${D}/etc/pear.conf" \
+		|| die "failed to sed the bin path (prefix) in pear.conf"
+
+	[[ "${PEAR_TEMPDIR}" != "/tmp" ]] && keepdir "${PEAR_TEMPDIR#${EPREFIX}}"
+	keepdir "${PEAR_CACHEDIR#${EPREFIX}}"
+	diropts -m1777
+	keepdir "${PEAR_DOWNLOADDIR#${EPREFIX}}"
+
+	insinto /usr/share/php/.packagexml
+	newins "${WORKDIR}/package.xml" "${MY_P}.xml"
+}
+
+pkg_config() {
+	# Update PEAR/PECL channels as needed, add new ones to the list if needed
+	elog "Updating PEAR/PECL channels"
+	local pearchans="pear.php.net pecl.php.net pear.symfony-project.com"
+
+	for chan in ${pearchans} ; do
+		# The first command may fail if, for example, the channels have
+		# already been initialized.
+		pear channel-discover ${chan}
+		pear channel-update ${chan} || die "failed to update channels: ${chan}"
+	done
+}
+
+pkg_postinst() {
+	pear clear-cache || die "failed to clear PEAR cache"
+
+	elog "Run 'emerge --config =${PF}' to automatically update the PEAR/PECL channels while online."
+
+	# Register the package from the package.xml file
+	# It is not critical to complete so only warn on failure
+	if [[ -f "${EROOT}/usr/share/php/.packagexml/${MY_P}.xml" ]] ; then
+		"${EROOT}/usr/bin/peardev" install -nrO --force \
+			"${EROOT}/usr/share/php/.packagexml/${MY_P}.xml" 2> /dev/null \
+			|| ewarn "Failed to insert package into local PEAR database"
+	fi
+}
+
+pkg_prerm() {
+	# Uninstall known dependency
+	"${EROOT}/usr/bin/peardev" uninstall -nrO "pear.php.net/PEAR"
+}
diff --git a/dev-php/PEAR-Text_Wiki/Manifest b/dev-php/PEAR-Text_Wiki/Manifest
index e2e7f4c7a4fb..de1a1f5516f8 100644
--- a/dev-php/PEAR-Text_Wiki/Manifest
+++ b/dev-php/PEAR-Text_Wiki/Manifest
@@ -1,3 +1,5 @@
 DIST Text_Wiki-1.2.2_p20170904.tar.gz 86810 BLAKE2B 3277fbfae5683c147c1537a7f789b8b9500bfa39014832ed08d91028882813f60727f9ff503d38dde5f017fd5f1ec69d61775a14094b0d267a1b0019f10090c8 SHA512 8e731a6cc9ec0e964d86de5eb96f285155f61d21e229499132f5b06ef8ff520658a42c9c6fb60d73b9bc8828ec9b616bc11e4f04bdd6e74836d52fc53a92dd71
+DIST Text_Wiki-1.2.3.tgz 89906 BLAKE2B 8db39418478085bebbbb32f8d80fbf9f6b9058adf9071f7f7493a4e493fbd088e231759752ddc41aad6c58b1ddab953111df006f901545c896e266b75dc70f26 SHA512 619f5323648b1344c572a1aa03626dc00a4dd9f201814fee5a3b962f69085943a1c7d1ef06e7c0cc4be7628bc76889972f1750aa9f7f67348381df1af4a4bd73
 EBUILD PEAR-Text_Wiki-1.2.2_p20170904.ebuild 763 BLAKE2B 73b4d3a410e24afdf0008fde5b7fce25c63075db2f33eba44f6581d161569ca0ae3b2d407ce5ad8e72899920e0b0b6717efc6b3751134ce9f3f18967969d7a5d SHA512 57592893c62bea481e5b58d82c41cd73f5bce078e353fdf28334941aea3c47a10d660455ae94e2eb6def445388a6ababa9c705f527c7b61f95e8ef6efa9304f6
+EBUILD PEAR-Text_Wiki-1.2.3.ebuild 458 BLAKE2B eb0d2e8feaab81e947a495479b18b7a8515e100ea42f4ae082f487a9e4acb444fbad332d837b5533c7a35d6e3a5878ef8e814403d3139b245e684261dcdd5f6e SHA512 9dfb2c17a6c049a7f705882357475fd0ab7684573c406c3c7ee87c0a8f2b1320524cc7ceaa28ed0d49038541f5675c768caeb33748b73e52c78944ac6de52396
 MISC metadata.xml 326 BLAKE2B a47b62c42ef2f751077622f4a770ffe42148d1d185948fd956e3b6caa57b37962af47733e129851e8931c449fd958d76f5261a1483d0dce20dbd73ff07d688ec SHA512 0d6ef943c1e68ec438ea1ef9627745be5abd72124e378313cb68895452db19873da7ca975f5865ca191b8b9b6855665064000a7d2071df334f486a5b172c7aeb
diff --git a/dev-php/PEAR-Text_Wiki/PEAR-Text_Wiki-1.2.3.ebuild b/dev-php/PEAR-Text_Wiki/PEAR-Text_Wiki-1.2.3.ebuild
new file mode 100644
index 000000000000..3eaca2e83436
--- /dev/null
+++ b/dev-php/PEAR-Text_Wiki/PEAR-Text_Wiki-1.2.3.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit php-pear-r2
+
+DESCRIPTION="Abstracts parsing and rendering rules for Wiki markup in structured plain text"
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+
+DEPEND="test? ( dev-php/phpunit dev-php/PEAR-PEAR )"
+
+src_test() {
+	peardev run-tests tests || die
+	phpunit tests/*.php || die
+}
diff --git a/dev-php/composer/Manifest b/dev-php/composer/Manifest
index bc71e2e1a87e..3b2cb8186a49 100644
--- a/dev-php/composer/Manifest
+++ b/dev-php/composer/Manifest
@@ -6,10 +6,12 @@ DIST composer-1.7.2.tar.gz 401211 BLAKE2B b3470a45dcffe8758c3e498a6298f726928a03
 DIST composer-1.7.3.tar.gz 402233 BLAKE2B b9ae601e5710f12acd6da189a64217fee0198a0eb14227d905b3faab1dd5a4e6b573c4be89968f3b66b4e5612189fc7c284c2aa7d63c2247bce1cc56913acc5f SHA512 7dd6200abdae845e71bc9cb9d329547ee82a3186db93b535af92bdf01d5e0fecc1d7f7ddcbce54c05e60cf75dea9aba0f27ad86746b61b2301effe8d4c115949
 DIST composer-1.8.0.tar.gz 404169 BLAKE2B 977d04d3477e0660eb33e4cb746a5f7cf1cc15544b0afdc48ce7dc7774750b685c36db7796280dd825e2b5b5d310f65521a6c12ca92ca9d2b15c2213c64bec4f SHA512 d8589c75174fd36f5ce10c8f4e18045b8c86167ccc7d6cadb4eed8828d4d7b4b44b0b477b6bd0ebf6d0981a381b35f662205d6b4324c92c86ea3fbc8c3aeb6e4
 DIST composer-1.8.3.tar.gz 405927 BLAKE2B 00be1624fb96212edffd7059b718e74ed69643810de2ddfd6ffa1fb16ac689d2298d420452e7461bb427cc2e8186f4d2c9be072054fe7310bc74c32b80a1a497 SHA512 bb3ddcddcd30c211deae5a75fdfb178c39f0714efd59cb2a4abebdcdc9e18cf9437cae26ed21881fe06278472c150de2935f70b48c3f3c5d7e2a1ea92ee26605
+DIST composer-1.8.4.tar.gz 406561 BLAKE2B 2521da6a50371102c2a8bf61aeeba0c5846692dcbaaa13e83d09a42480c518f91889bd6d6461aef60958d1f68801f77a646c7940c5992a8da25adf050550050b SHA512 b1061fd190b05d2fc309ff76bf246f6d02547249fe52c347715c2dc2e4f5149b3c4e4f43f255874749caeb44ce05cfcbdb8da1d96a9f88a2213a9601e123ef9c
 EBUILD composer-1.6.3.ebuild 1155 BLAKE2B 18766c885a71fa4d17165f8244c9774dbad115ae6b66b000c5b27cf7b204da33b03b61f1b24dc274e9b6d571c1f1308690ec8ee9b1bdd57efca174e0cbb4fe2a SHA512 1e9e91f1b0f8fb37bf79983ac246b543d9bc958a90fb8136f393a2dd103671daa72e3134bcf403e612aeab810d368c8806b34908e1505e01ffe1c018930d465e
 EBUILD composer-1.6.5.ebuild 1155 BLAKE2B 18766c885a71fa4d17165f8244c9774dbad115ae6b66b000c5b27cf7b204da33b03b61f1b24dc274e9b6d571c1f1308690ec8ee9b1bdd57efca174e0cbb4fe2a SHA512 1e9e91f1b0f8fb37bf79983ac246b543d9bc958a90fb8136f393a2dd103671daa72e3134bcf403e612aeab810d368c8806b34908e1505e01ffe1c018930d465e
 EBUILD composer-1.7.2.ebuild 1177 BLAKE2B dc6041ecb976eca609e0da23ddc706bc06c35aa9227db41b3601efde2afc879bb6506a316b8b555f6b23c3571835b3b3e03c4292c06b425cce01f5d52d639dbe SHA512 ae2da2f3b91755a9a685d54c951ade473f4105f448aa4cbd8b49c9643f8ae1648e7257e25548363f0570281f3780b50bc7ff0644afdf8081d53d256e3fdb9254
 EBUILD composer-1.7.3.ebuild 1174 BLAKE2B 1e6f4617e815a83a69ba7eed6d248a3079d5a9192d9c88870ea1df72e6477558783f7d988f670b275dbe13b2ee3181e4da3d9381be565822fd2b4f55f0a22cc5 SHA512 44bdde80de9eb5beeaf60f3afdfc2d0c1e09ec5dea428da2d979e199b384e714f6b959e60f4e27a0a1a258ce9076d196cfa66ad488885c244f2aa2d945d06a5d
 EBUILD composer-1.8.0.ebuild 1174 BLAKE2B 078e9c8cbf921512b98933c8e58197bbcb2027dfc6881bcc4b1f7b922c7476f68bad0d0614d871e8df9a0d444637ea975ef62972f55f01cd79c43bd972233e8c SHA512 0d6ced0951e40a33cb59cee465690444e1205f809ce7d1333001ff54f2f87dd2e8810230195ecc2e7cd02d041c8a38971aa9a719d9ab69db0838cfad6aaf6280
 EBUILD composer-1.8.3.ebuild 1186 BLAKE2B 95033b8bbb6de3402a1ef98d764eaa9d3a9679103f455aa556872c13cf5357edd08561166b5e28893d3415ba285cf2df0d3f234c83930c29059b9bd35112922b SHA512 7cd233abfaffe7e5e3016cd881c380f23576720d223079ad7cf91805c2fb87d2f06e54092da2266e5a005229ca87b9e7954e8ff72e0e4f1c45ce5043a9e5613b
+EBUILD composer-1.8.4.ebuild 1186 BLAKE2B 26986b0e257117a1a5ff3e99c63a4924a7220ccc48810609e5c75025f7010f42960d4ddd38afe1d95c53e311b6a196528402e05cd3cd943f080c4f5bf33565ff SHA512 23d0a046a45563ca06ac3a91f16c47e6970807a6ae06d3117d02fc868f397cc0ef982677483679510aca9ab4aebf844aaf962e070aa09a21f1f2d603d1cd249a
 MISC metadata.xml 774 BLAKE2B 8a1f75c0c7da6f0d193a981c6db3888d62e2223b6368c4a7dece62ae33cc9a2a8c0b34714170462f262569954e70cc9b976012ff864ccfa36a46da3c719169ae SHA512 1a17bfae65923a3bea593c57d7ecf4fb2aeef43d0537636105e52294de295cbfeaed4b3c36ffb8675a563f657f4f969e62096cee20b9ab178c962acf2f68ac3a
diff --git a/dev-php/composer/composer-1.8.4.ebuild b/dev-php/composer/composer-1.8.4.ebuild
new file mode 100644
index 000000000000..2c139b8b8825
--- /dev/null
+++ b/dev-php/composer/composer-1.8.4.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Dependency Manager for PHP"
+HOMEPAGE="https://github.com/composer/composer"
+SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	dev-lang/php:*[curl]
+	>=dev-php/ca-bundle-1.1.3
+	>=dev-php/psr-log-1.1.0
+	dev-php/fedora-autoloader
+	>=dev-php/json-schema-5.2.7
+	>=dev-php/jsonlint-1.7.1
+	>=dev-php/phar-utils-1.0.1
+	>=dev-php/semver-1.4.2
+	>=dev-php/spdx-licenses-1.5.0
+	>=dev-php/symfony-console-2.8.48
+	>=dev-php/symfony-filesystem-2.8.48
+	>=dev-php/symfony-finder-2.8.49
+	>=dev-php/symfony-process-2.8.48
+	>=dev-php/xdebug-handler-1.3.1"
+
+src_install() {
+	insinto "/usr/share/${PN}"
+
+	# Composer expects the LICENSE file to be there, and the
+	# easiest thing to do is to give it what it wants.
+	doins -r src res LICENSE
+
+	insinto "/usr/share/${PN}/vendor"
+	newins "${FILESDIR}"/autoload-r1.php autoload.php
+
+	exeinto "/usr/share/${PN}/bin"
+	doexe "bin/${PN}"
+	dosym "../share/${PN}/bin/${PN}" "/usr/bin/${PN}"
+
+	dodoc CHANGELOG.md README.md doc/*.md
+	dodoc -r doc/articles doc/faqs
+}
diff --git a/dev-php/ming-php/Manifest b/dev-php/ming-php/Manifest
index 23098085ab0d..37bc890e24b5 100644
--- a/dev-php/ming-php/Manifest
+++ b/dev-php/ming-php/Manifest
@@ -3,5 +3,5 @@ AUX php_ext-config.m4 2939 BLAKE2B cb3e65a0397b753fb6675425e3eaab0c68349b7d14f38
 DIST ming-0_4_7.tar.gz 14903570 BLAKE2B 48e7b3c2b8a81fa63da18dd140064c572efe563eb621f33b4bc57cdcad8d6cb828e8f62fc63b47144389b0eefa5b571c47e39013ec2724611d20e74928275213 SHA512 232cf45daabd7b60203c9382aa6568455a42ddcd1bd60eec9bfe3f5e80376fcc9ff6304efbafca1ac8a504e2e167bc394e4902e0d067303d9582551461e09d3c
 DIST ming-0_4_8.tar.gz 14908459 BLAKE2B df89beab98a7fbdcbefccad3a2fb013453405a7dba757131a61f06d9e40b7e1fe7beeadab42c113b12cff24b91cb1e76e9fabee0e1b4af58e2127eba13cc27bc SHA512 e395acde9119ad32f4cedd500bcceee70bdd563222a41dda899cc318d5e34eb580abc38ac39c6dec7821913a0a70d2f953fc81f52255b623e34f7c3aaafbc9c0
 EBUILD ming-php-0.4.7.ebuild 1332 BLAKE2B 4eb3cb1d05c52660df43e15e172154564754261cc0630669f212c31a5d551fd389966bac27becca64e5ab531a8039feb5b2cd214bd970ef21a5772f1410ad648 SHA512 0793f4410f866ae8fbe38e083c5c0a828d9e0d643aeeb1973d9b644854e336fbe3fa2f812e4a26948474af242ba7bf202c3f8dbfb4c3ad1ca63f74c4a10c3b28
-EBUILD ming-php-0.4.8.ebuild 1386 BLAKE2B 0171247c6d5a43cdb6d8f7c3806321ec7585483b57c9d4676c95dba80cb71a8e22564a73229f064b357fa4f873d5342f2ccd172daff967a6faca345f3fd559e2 SHA512 16ada646ebefd7b309ddab630475d36cece991e2e015f80dedd57defcf3463905001a30da6677b437444675a70cc7e0b1857020b2b14b718bc5fc72ba6879ab9
+EBUILD ming-php-0.4.8.ebuild 1385 BLAKE2B 5c750a25ebcbcfcf79efaf5bd5c8d22b0289e0c58faaf3283b557eebd8896f3e8280d7d5e0c7b4a4132ee219fd5f65de48076f189ea8221151342ea13dea8e01 SHA512 4dfdc96e0c56bd023fce96f5933e9e50183a950d81de9f89a17a127467d60a6105d82b6d0e4eecd4d763340a22e2af5976cad1d7fd9d97699ee9ab8a4b8ccac1
 MISC metadata.xml 475 BLAKE2B 3f1db2ece7aef5e9f24e7fc1b2649422102cacb521ba830ae36a7cb7683957bcb89366d980c305fb9ad2a7fee9ecb87176e934f6ba328a6a2039d36f9c3ca207 SHA512 f5586b50f459b96dd287bb1ee2d1a166cb8086584c76f5b5b68cf1d8271afe22903f77d8641aee3c2d68ffd2b41441aed5f641a303b6f43243d67d65d41748c4
diff --git a/dev-php/ming-php/ming-php-0.4.8.ebuild b/dev-php/ming-php/ming-php-0.4.8.ebuild
index 9bee315bfb27..656761cd0b1d 100644
--- a/dev-php/ming-php/ming-php-0.4.8.ebuild
+++ b/dev-php/ming-php/ming-php-0.4.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/libming/libming/archive/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND="media-libs/ming"
diff --git a/dev-php/pecl-redis/Manifest b/dev-php/pecl-redis/Manifest
index 8f137be6e494..8c4fec24a652 100644
--- a/dev-php/pecl-redis/Manifest
+++ b/dev-php/pecl-redis/Manifest
@@ -1,11 +1,7 @@
 DIST redis-3.1.6.tgz 199920 BLAKE2B 00aa81cdbedc03b4a672a58be98d8f01d2076038622b9d1e9673c0628c096152f12f9f5ff540af639da73b4458fcb1fce9c1c8b49a95db48970bab07806ac8d0 SHA512 4263d150c93f11dd06587925ad9a3cd8fbba2e4a18b2f23e6adfaeb25d566a1c2d256551a50ae1b9c770fd0f9bc4c92f483c46d60be9d4f5b5ba056231b7d527
-DIST redis-4.0.0.tgz 212340 BLAKE2B 996138b3dd92e839fbebaf5d562cfbe90e66384233c83612c8726fa41f10c106d0195c87449fc7886b3e832fd551b962ef50c161372c04c899c9fe7fd1140101 SHA512 e4bf2294f696e468174c0fff9ed33831cf81c3548ce30ede01bc3c45a15cb87b9b9ea02899c451f63211be8cb37e953be138e93c16d9e0f12772b7b6d03e8dcd
-DIST redis-4.0.2.tgz 212617 BLAKE2B 5778cf08e93fe8343e8fa07f1314c39b2d6d9a150d70c5b2084274afb163f1132a4be81385563f74d3b1d8f2dc32bf6578e98a123b43a941635fd85ebb229771 SHA512 3b296926ddd6a69a4d633da8bf6257c9b2962dffb4dd38c20eaf821a8c64262b476a7fb10ab4412ceb2d1307aef26c3d1d4b72141d29dab262d521a08df13a6a
-DIST redis-4.1.1.tgz 220894 BLAKE2B 82cedf5128a62f0814c3b42792c4adb66fa58f76fdd211366c0ecd6d02130272504e20dca50a27a7ee7f16039ecfc28384743548df227dd0fa5fa1f9a2ca505c SHA512 f4cc438c81c8b5119889be1004ac1b3ac689554a31ad81516ce50249fa748c225883413da687f15a00279eff0269e5d4c992809f8d88cc49e848def511d3e623
 DIST redis-4.2.0.tgz 235569 BLAKE2B 14089171b9654affeb8c2b3861a698a3ba8d6ac235238fed7e6799cf3f2f74b240facb408acbbc987cc2d5383f197564aa81d828bfe84f91fd1bbff8dbdf563c SHA512 b6325e5e1f9209a3431cbc236dab4578f796aa748481f9a3fcda6d297bf544b0f77269bc56c6e9ff32430dbe74bd08f6d22e9b04b0ecfb735aa562f680f56f8b
+DIST redis-4.3.0.tgz 241883 BLAKE2B 3f3ef7f67ba1167cb031e6816ee9f90d24eecc002064720e68a65bf8db16b0f826c90a5f3b7bed771f535aca8cbc9b62654fa2c234a42af8168baf0315a25c17 SHA512 30ce5863540485463704e6f90cff3a8d1f5bda34360c987e848ab290c8240f323b6eb2df1e90cc4c0922b3413652132d937488943f5db4e242c460c592da54ca
 EBUILD pecl-redis-3.1.6-r1.ebuild 1504 BLAKE2B 39cd4e0402cde5507b4de802e6ec1a9855f293ea1710f1987690c9c4dca507c72045b87b423c89950e76facff3699ec782df904904c4f361f304f9a3f0095f2f SHA512 6588808380496dbf7f46e85483393a1c2fbe10720959a113cdf19e527a43e72e11fa948a168d965d3dbd1c1d3809051246d2a1ed504fb0958a728b20191b2ec1
-EBUILD pecl-redis-4.0.0-r1.ebuild 1638 BLAKE2B 3072def07f464db1a3148b4c1ac52db50bf47c858db808696505597e67d0adee8b5a10bb72105cfe7e51973d26233ae35410efd6599ca9c3e53ae5665b64219e SHA512 580d168d0eccc106f367457986faaadbbb9ef0cd0263e25a91202388f03363a4ad5bbc62ffa25a7c8b22d76f573bb6a5efe7202f97fbfe47789fd92abe21bbd0
-EBUILD pecl-redis-4.0.2.ebuild 1641 BLAKE2B 3f295bc8a957011d8eb7e86d268cb2411093e0e1b89ba25bbc5b143131fdc6769f5f5c79f56b99cdfdf3d6effa434224c524d6b946f525300f2ed3c408bf1ac2 SHA512 256b408e3d849a86fefec8383831e1a561c8b95d13e777e412fd820fd82e95977189d4a1eb5de5ac71b385f87ee6d41caa23ff7820a627ae95ef668ebc36db17
-EBUILD pecl-redis-4.1.1.ebuild 1751 BLAKE2B b30c07a980135d4ca190a41319f0d49910d6cd14560f3515b47c186c4265f9565a7fbde1f646ee1220a2f96a85e1ad482990d3989f04f68a682420a9b7c2cb55 SHA512 a7280f779e7b83314109a48aea2a3ceaf7bcbf45eafe30ceae295e63aab70302cf505e2253fe25cacb377b0943424ac5d91dc53a7a6dde436a6f8367b3b7ee56
-EBUILD pecl-redis-4.2.0.ebuild 1748 BLAKE2B e49cc0c892fecef16ec16c2c2369d5836a7e3382161a661fa7ca9c6aac5ba00b3619e89f85cce26fb320a1947473c3fa20b2823ca4507ec4b31209f720c9ca79 SHA512 4c97fe5be053ad572e5e96a2ef5c56daf9dac7afa5a9efa1332365618781a336c30ba133857929754fb8f73b8fb32de070b170fbc0c2d55874babf439884e7e0
+EBUILD pecl-redis-4.2.0.ebuild 1747 BLAKE2B d785de1e3b9e85782a7af70a6ee3382ce8531a54d27577abd8f06c8d6e5ede63469445ab63b6a2024abbc83dde9b0f3575e7dcf4fe0fcb3f31d542f706d3e4f7 SHA512 569786473550db55ea8f4361f15441f009d6b120a97a76a17006b644f49dfe0889c0e6e586d831bd62de6935fa18ebec78c3232da03a19254a23c68b7a7dc024
+EBUILD pecl-redis-4.3.0.ebuild 1638 BLAKE2B 91c61e08270fbd775be92db55362cc4e3938ab1119ff65f5b38c4d73a7c39deba7a19673ec611baf1a0b425205fce4a04d04e4478d96c063959b36789487cecd SHA512 e00b2cef43e844256e4fb7de433b3f545d8c184a8e2eeb3cefc1bda672d56b2df17c6762ad3960ee0ee8bd44f735b498a10e83af2118dbe544f30474dc1cf409
 MISC metadata.xml 324 BLAKE2B fc4145f462dd06f7a34385a0d8e2cbc6da6744094e84851891d5513f7be39c89cebe439e566fc2ead0afdb8ee3885b4a4d448e63d4c1a1d20a5bb8791c12d313 SHA512 916879a4b7ed11e30634a1c95637e9426932bac3c6aba2c7e686d9835097873e142f062e7d81e3ac99c3aef972b40db67b3809116cff4a3742ba6c669d999066
diff --git a/dev-php/pecl-redis/pecl-redis-4.0.0-r1.ebuild b/dev-php/pecl-redis/pecl-redis-4.0.0-r1.ebuild
deleted file mode 100644
index 4cf2aa9cb6cf..000000000000
--- a/dev-php/pecl-redis/pecl-redis-4.0.0-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PHP_EXT_NAME="redis"
-USE_PHP="php5-6 php7-0 php7-1 php7-2"
-DOCS=( arrays.markdown cluster.markdown README.markdown CREDITS )
-MY_P="${PN/pecl-/}-${PV/_rc/RC}"
-PHP_EXT_PECL_FILENAME="${MY_P}.tgz"
-PHP_EXT_S="${WORKDIR}/${MY_P}"
-
-inherit php-ext-pecl-r3
-
-DESCRIPTION="PHP extension for interfacing with Redis"
-LICENSE="PHP-3.01"
-SLOT="0"
-KEYWORDS="~amd64 ~arm"
-IUSE="igbinary +session"
-
-DEPEND="
-	php_targets_php5-6? ( dev-lang/php:5.6[session?] igbinary? ( dev-php/igbinary[php_targets_php5-6] ) )
-	php_targets_php7-0? ( dev-lang/php:7.0[session?] igbinary? ( dev-php/igbinary[php_targets_php7-0] ) )
-	php_targets_php7-1? ( dev-lang/php:7.1[session?] igbinary? ( dev-php/igbinary[php_targets_php7-1] ) )
-	php_targets_php7-2? ( dev-lang/php:7.2[session?] igbinary? ( dev-php/igbinary[php_targets_php7-2] ) )
-"
-RDEPEND="${DEPEND} !dev-php/pecl-redis:7"
-
-# The test suite requires network access.
-RESTRICT=test
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	local PHP_EXT_ECONF_ARGS=(
-		--enable-redis
-		$(use_enable igbinary redis-igbinary)
-		$(use_enable session redis-session)
-	)
-	php-ext-source-r3_src_configure
-}
-
-src_test(){
-	local slot
-	for slot in $(php_get_slots); do
-		php_init_slot_env "${slot}"
-		# Run tests for Redis class
-		${PHPCLI} -d extension=modules/redis.so \
-				  tests/TestRedis.php \
-				  --class Redis \
-				  --host ${PECL_REDIS_HOST} || die 'test suite failed'
-	done
-}
-
-pkg_postinst() {
-	elog "This version comes with breaking API changes."
-	elog "Be sure to verify any applications upon upgrading."
-}
diff --git a/dev-php/pecl-redis/pecl-redis-4.0.2.ebuild b/dev-php/pecl-redis/pecl-redis-4.0.2.ebuild
deleted file mode 100644
index 7c75c710c648..000000000000
--- a/dev-php/pecl-redis/pecl-redis-4.0.2.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PHP_EXT_NAME="redis"
-USE_PHP="php5-6 php7-0 php7-1 php7-2"
-DOCS=( arrays.markdown cluster.markdown README.markdown CREDITS )
-MY_P="${PN/pecl-/}-${PV/_rc/RC}"
-PHP_EXT_PECL_FILENAME="${MY_P}.tgz"
-PHP_EXT_S="${WORKDIR}/${MY_P}"
-
-inherit php-ext-pecl-r3
-
-DESCRIPTION="PHP extension for interfacing with Redis"
-LICENSE="PHP-3.01"
-SLOT="0"
-KEYWORDS="~amd64 ~arm"
-IUSE="igbinary +session"
-
-DEPEND="
-	php_targets_php5-6? ( dev-lang/php:5.6[session?] igbinary? ( dev-php/igbinary[php_targets_php5-6] ) )
-	php_targets_php7-0? ( dev-lang/php:7.0[session?] igbinary? ( dev-php/igbinary[php_targets_php7-0] ) )
-	php_targets_php7-1? ( dev-lang/php:7.1[session?] igbinary? ( dev-php/igbinary[php_targets_php7-1] ) )
-	php_targets_php7-2? ( dev-lang/php:7.2[session?] igbinary? ( dev-php/igbinary[php_targets_php7-2] ) )
-"
-RDEPEND="${DEPEND} !dev-php/pecl-redis:7"
-
-# The test suite requires network access.
-RESTRICT=test
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	local PHP_EXT_ECONF_ARGS=(
-		--enable-redis
-		$(use_enable igbinary redis-igbinary)
-		$(use_enable session redis-session)
-	)
-	php-ext-source-r3_src_configure
-}
-
-src_test(){
-	local slot
-	for slot in $(php_get_slots); do
-		php_init_slot_env "${slot}"
-		# Run tests for Redis class
-		${PHPCLI} -d extension=modules/redis.so \
-				  tests/TestRedis.php \
-				  --class Redis \
-				  --host ${PECL_REDIS_HOST} || die 'test suite failed'
-	done
-}
-
-pkg_postinst() {
-	elog "The 4.0 release comes with breaking API changes."
-	elog "Be sure to verify any applications upon upgrading."
-}
diff --git a/dev-php/pecl-redis/pecl-redis-4.2.0.ebuild b/dev-php/pecl-redis/pecl-redis-4.2.0.ebuild
index efc6fc7869d2..f92d9dd8a0a7 100644
--- a/dev-php/pecl-redis/pecl-redis-4.2.0.ebuild
+++ b/dev-php/pecl-redis/pecl-redis-4.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ inherit php-ext-pecl-r3
 DESCRIPTION="PHP extension for interfacing with Redis"
 LICENSE="PHP-3.01"
 SLOT="0"
-KEYWORDS="~amd64 ~arm"
+KEYWORDS="amd64 ~arm"
 IUSE="igbinary +session"
 
 DEPEND="
diff --git a/dev-php/pecl-redis/pecl-redis-4.1.1.ebuild b/dev-php/pecl-redis/pecl-redis-4.3.0.ebuild
index 5679d6c4a9f6..d3b1f62b953a 100644
--- a/dev-php/pecl-redis/pecl-redis-4.1.1.ebuild
+++ b/dev-php/pecl-redis/pecl-redis-4.3.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 PHP_EXT_NAME="redis"
-USE_PHP="php5-6 php7-0 php7-1 php7-2 php7-3"
+USE_PHP="php5-6 php7-1 php7-2 php7-3"
 DOCS=( arrays.markdown cluster.markdown README.markdown CREDITS )
 MY_P="${PN/pecl-/}-${PV/_rc/RC}"
 PHP_EXT_PECL_FILENAME="${MY_P}.tgz"
@@ -20,7 +20,6 @@ IUSE="igbinary +session"
 
 DEPEND="
 	php_targets_php5-6? ( dev-lang/php:5.6[session?] igbinary? ( dev-php/igbinary[php_targets_php5-6] ) )
-	php_targets_php7-0? ( dev-lang/php:7.0[session?] igbinary? ( dev-php/igbinary[php_targets_php7-0] ) )
 	php_targets_php7-1? ( dev-lang/php:7.1[session?] igbinary? ( dev-php/igbinary[php_targets_php7-1] ) )
 	php_targets_php7-2? ( dev-lang/php:7.2[session?] igbinary? ( dev-php/igbinary[php_targets_php7-2] ) )
 	php_targets_php7-3? ( dev-lang/php:7.3[session?] igbinary? ( dev-php/igbinary[php_targets_php7-3] ) )
diff --git a/dev-php/smarty/Manifest b/dev-php/smarty/Manifest
index 0ab9b54306c2..dfb23762155f 100644
--- a/dev-php/smarty/Manifest
+++ b/dev-php/smarty/Manifest
@@ -6,5 +6,5 @@ DIST smarty-3.1.33.tar.gz 249999 BLAKE2B 1e174b190238c8b20d5dae9c0c9fdf264c4716b
 EBUILD smarty-3.1.30.ebuild 1331 BLAKE2B 59393ee7db8482c6af06ce4430e638ce02ca1ea3f9dbc1264f867bd94aa5b55a3b9321f90f6fc4a1a8c9e7c6bfdeb64342b67e2117e1b3b5586258d8b692bb22 SHA512 e79707cc1e841806d654a597c7b7c2e0e3465a5bd6354652247d6e697bf8e6b3727ff52cf441aa72abb470d0ff1c325526489e3169062ee537ca80b98685e7dd
 EBUILD smarty-3.1.31.ebuild 1339 BLAKE2B b64063186aaac934f8604f67ebe1b53cf171d024db96388eac4950508ec9278f3f85e61df1147bb395ea9d84447281860e2d9994a21d06de36ec59d26900c228 SHA512 fb0c063f295956b275023751ca12cdc7110de17430214a42020840221697892ffc5045f16fa09cbd4b19b409188e9607adcf640f824c668395e8b62d560d7b1e
 EBUILD smarty-3.1.32.ebuild 1339 BLAKE2B b64063186aaac934f8604f67ebe1b53cf171d024db96388eac4950508ec9278f3f85e61df1147bb395ea9d84447281860e2d9994a21d06de36ec59d26900c228 SHA512 fb0c063f295956b275023751ca12cdc7110de17430214a42020840221697892ffc5045f16fa09cbd4b19b409188e9607adcf640f824c668395e8b62d560d7b1e
-EBUILD smarty-3.1.33.ebuild 1340 BLAKE2B 83eb7d4890f80d6cd5375e863bed7f5f2f0362615236fe073565ab371ed4f86ea0ccbb15da06323c12b0c93a7c023aac86d7a69c1421187e43b1bcd64d467c5d SHA512 9123d7606e4e39383bc98404b75222d91f024b890ddabd1d6ba7c4343fba049f9de738083d6d8f2730b9b80df5eb5a369f99ff30c2571be7d5c44e87b3ae1249
+EBUILD smarty-3.1.33.ebuild 1331 BLAKE2B e7cb9a8f13cc937d5ee25eb4f91cea6bcc9a4dfb5df5e19f88e2b101bdbf70631b51a3a91bbbdf69a5354f1dca2e8b059a6d00ef6b725ae9e253893f9cc119d5 SHA512 85f6a4b7c9f2a3aea26da75834deafdd60a513d237ece9827af808ef441d200e1e90e3be16bae244ee1bf2f0b2c38a59bce1dfa5c009d253b497e67ccdfd20a7
 MISC metadata.xml 581 BLAKE2B c8e02efefe221a4cea961b32c448d3a69f2dbec795a1a012c727777dfc4a448fd0bb23816564843f0a3fe6eb67453175ee84417e7ffe0e72aa48f8f131b72aaa SHA512 1bf0fea8d62a06b1b67ee417eeb44dbb476ba590b35808f7c7bc1b40a6758b2c3f931e8290c2908a14828f8e2789eb8e2c6d5a26e106f97359f45a476fd31401
diff --git a/dev-php/smarty/smarty-3.1.33.ebuild b/dev-php/smarty/smarty-3.1.33.ebuild
index 930a87c95ae0..e08863838f5c 100644
--- a/dev-php/smarty/smarty-3.1.33.ebuild
+++ b/dev-php/smarty/smarty-3.1.33.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/smarty-php/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 hppa ia64 ppc ppc64 sparc ~x86"
 IUSE="doc"
 
 BDEPEND="doc? ( app-arch/unzip )"
diff --git a/dev-php/xdebug-client/Manifest b/dev-php/xdebug-client/Manifest
index 14bef5faf0d6..185fa29de144 100644
--- a/dev-php/xdebug-client/Manifest
+++ b/dev-php/xdebug-client/Manifest
@@ -1,11 +1,13 @@
 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.0_rc1.tar.gz 383009 BLAKE2B f8ec78ea1214089fb59cafa8be2f8e4f90c0dbda326a707bd768238da42d23d04cc0dc8e448444e764a1bd474e3bcb98c4b6491d131a28799a01670174e8755a SHA512 38cf59f02953331f16efffa6e6cd9d730fe4b000fe6ae6e364076ae57387b01270b60b0925a516f022bed82165ab448c5c2f52d2108e0231be7a49f1e78a7dbb
 DIST xdebug-2.7.0_rc2.tar.gz 409026 BLAKE2B 221bb95b7c32c7339300397b4737f1f6803831bee5c5ea87ea3c56bc3d8d00dbc49946358a4f21b2bf7cc723e7b7d2dbc2502fe7f1121c2ead1567d0924ad75a SHA512 148b994094e393c7c46b384fa74ee204fa60310014b98266b966d7f7e046abf50d19b1ec2b0422c53415b70522f229d528fca20e54e6b20aaf2fe9ed5774922e
 EBUILD xdebug-client-2.5.3.ebuild 590 BLAKE2B 389fed0cf51727d612749239904af1a245bc46e5f40c6217b500133088019a6669718e9d87a63538d3fc60232c71f2f2579667c7b7d49cb12dba94d489b34be5 SHA512 31af43a9a78289e95185b71e58fa83b61ffda0f6bdf0c7c4597b307a65a1742eb0840904d8c02f2d1ea5997c50bac1cfb1d809880199efbff7f3ecbf765f4012
 EBUILD xdebug-client-2.5.5-r1.ebuild 613 BLAKE2B 8f768a6cb784e74dec4f686adebaa20ca718997a3a1c127c1c46e5c4a2014c5f26517b6bd74eb10a4b0547432286c74bf003f3e36430f54f2f9a6c1ebfba6cda SHA512 d0881929e891f0c0452780a0d84e572b67d85bee27e99789f7370be1e7458071f465df2a69b1d16922297adb99d1814fdefc29223246eb958547160736e2d7e9
 EBUILD xdebug-client-2.6.1.ebuild 606 BLAKE2B ed52f2ee0fa29ad7c1d6eded2a57c4461e0bce96017084c82ce04f334bc7df458f9a343191969e71f37eabb6f7e30522241942548e388ed516393f6844311cb2 SHA512 e6fa101dd1a18fdd60de9ca6c246a62956c766ceeeb87a11f4f6d7a0f5700137e7dca8c4057a30467a39cc227bde15d4eabf1260effde54b460086b6292bb7ab
+EBUILD xdebug-client-2.7.0.ebuild 818 BLAKE2B 308aa6a2f2be4a7bad1fc4176598ba2a19df48da73e9ec2c53f332827476acc1091552b2135d569686ebdb6b2e3727aa8d8e6da462c9350e4ac788b4159888ba SHA512 d855107da8bf9ad7210989395dc76dec93e2dc7d069416f89f47ea4813ed544dc7fc416e886312a040475a4de0e4ddd12bb5b21a27c96c35e31784b7dfae9270
 EBUILD xdebug-client-2.7.0_rc1.ebuild 818 BLAKE2B 308aa6a2f2be4a7bad1fc4176598ba2a19df48da73e9ec2c53f332827476acc1091552b2135d569686ebdb6b2e3727aa8d8e6da462c9350e4ac788b4159888ba SHA512 d855107da8bf9ad7210989395dc76dec93e2dc7d069416f89f47ea4813ed544dc7fc416e886312a040475a4de0e4ddd12bb5b21a27c96c35e31784b7dfae9270
 EBUILD xdebug-client-2.7.0_rc2.ebuild 818 BLAKE2B 308aa6a2f2be4a7bad1fc4176598ba2a19df48da73e9ec2c53f332827476acc1091552b2135d569686ebdb6b2e3727aa8d8e6da462c9350e4ac788b4159888ba SHA512 d855107da8bf9ad7210989395dc76dec93e2dc7d069416f89f47ea4813ed544dc7fc416e886312a040475a4de0e4ddd12bb5b21a27c96c35e31784b7dfae9270
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/xdebug-client/xdebug-client-2.7.0.ebuild b/dev-php/xdebug-client/xdebug-client-2.7.0.ebuild
new file mode 100644
index 000000000000..76b7388ac4ab
--- /dev/null
+++ b/dev-php/xdebug-client/xdebug-client-2.7.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2019 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 3c03c51d57b0..37ba964cfec8 100644
--- a/dev-php/xdebug/Manifest
+++ b/dev-php/xdebug/Manifest
@@ -3,11 +3,13 @@ AUX 2.6.0-xdebug.ini 1623 BLAKE2B 6d8c3352dc55778e29cce92794ae36421a6e696244e3c7
 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.0_rc1.tar.gz 383009 BLAKE2B f8ec78ea1214089fb59cafa8be2f8e4f90c0dbda326a707bd768238da42d23d04cc0dc8e448444e764a1bd474e3bcb98c4b6491d131a28799a01670174e8755a SHA512 38cf59f02953331f16efffa6e6cd9d730fe4b000fe6ae6e364076ae57387b01270b60b0925a516f022bed82165ab448c5c2f52d2108e0231be7a49f1e78a7dbb
 DIST xdebug-2.7.0_rc2.tar.gz 409026 BLAKE2B 221bb95b7c32c7339300397b4737f1f6803831bee5c5ea87ea3c56bc3d8d00dbc49946358a4f21b2bf7cc723e7b7d2dbc2502fe7f1121c2ead1567d0924ad75a SHA512 148b994094e393c7c46b384fa74ee204fa60310014b98266b966d7f7e046abf50d19b1ec2b0422c53415b70522f229d528fca20e54e6b20aaf2fe9ed5774922e
 EBUILD xdebug-2.5.3.ebuild 1035 BLAKE2B 33b476351fde796721bf602b127488496a65ad078cf2f6a2c49ba1d8f80252f08416b6c73c8424dd8a31d1ee4950dae9aa12c651c303db1c14a219c07ff25a96 SHA512 d6ba05f536ce9ab502ac4a0008b04544f37755b007a3c2efea9e75cc5e9d5b7f9c2f2bc58d76b682addef1681d747af8c6682cbf7073bee234c1571d99836081
 EBUILD xdebug-2.5.5.ebuild 1039 BLAKE2B 1e6a6b488a3e8041378d044646831021f047bbb3e923e8f5587540f35fb2234e5be4ff2017a2c293d1b3b2656d7161e1474daa724df5c0dcf1658ebe8686d38a SHA512 13d6f35f02f8869dec0c46283a8ca5c198d4d87d0be0e374c5f355c94f4e84f176713199733df72bb4eaf06a042c43c8037c2cb4a58eb621c9d14362185aa7f8
 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.0_rc1.ebuild 1155 BLAKE2B fc9630f3e3bc442702447fbc152608a8af8e169a7e7508d6b79e1b06c02db2ac749eb49707470eb0d2a68384417b5f92a281e61eeb88acd63e7bd61165babcfe SHA512 5bb3d8f9e131b328990b78991f377fe7230394d3a1395beaf8ca57410d6960919bf3b914e84442c4ce6a1a8af8e75a6cc49e1609be9131be86f601a7a7360973
 EBUILD xdebug-2.7.0_rc2.ebuild 1155 BLAKE2B fc9630f3e3bc442702447fbc152608a8af8e169a7e7508d6b79e1b06c02db2ac749eb49707470eb0d2a68384417b5f92a281e61eeb88acd63e7bd61165babcfe SHA512 5bb3d8f9e131b328990b78991f377fe7230394d3a1395beaf8ca57410d6960919bf3b914e84442c4ce6a1a8af8e75a6cc49e1609be9131be86f601a7a7360973
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/xdebug/xdebug-2.7.0.ebuild b/dev-php/xdebug/xdebug-2.7.0.ebuild
new file mode 100644
index 000000000000..a8568aa85f52
--- /dev/null
+++ b/dev-php/xdebug/xdebug-2.7.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2019 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-1 php7-2 php7-3"
+
+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=""
+
+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."
+}