gentoo resync : 25.04.2020

8 files changed, 107 insertions, 38 deletions

diff --git a/dev-php/Manifest.gz b/dev-php/Manifest.gz
index f6b35af26c6d..facc02a0795f 100644
--- a/dev-php/Manifest.gz
+++ b/dev-php/Manifest.gz
diff --git a/dev-php/awl/Manifest b/dev-php/awl/Manifest
index 5ec5e958d7c6..755cf7f55de3 100644
--- a/dev-php/awl/Manifest
+++ b/dev-php/awl/Manifest
@@ -1,5 +1,3 @@
-DIST awl-0.59.tar.xz 124652 BLAKE2B 45b6271c175c23597c56f3d2ecc906ffc7d32feb4d8d51529e8ff861791b901f7076a1ed2aaa2309101c7d0e8aa1a48327f2d2cc4fca2738fffc55fe7665c310 SHA512 98a7bf336d5677146e06d3d8f320b67ae2a034d2b7ad32d64998993ed29431fbcf8f7c8f972ccfa55d81af32f1b413e265850181a505022e9ad350a8a670e6b6
-DIST awl-0.60.tar.xz 124772 BLAKE2B d24dcaa34f65720e76d8304f990c22fd0bab836b92a60e05acac39ced0924b6ce881328ca5fc5368ada4aee6b647e75406cbf07b96582ca03dd3bf0b3532e039 SHA512 b2a44c02cc3a8c0d4fef3ae1f9bbc121a6f4a25607c47c0b45625b272a754ce645443a95b074f89319877221e8b74bd0101c5a0ec741d80b7ea37f193dc1af42
-EBUILD awl-0.59.ebuild 667 BLAKE2B 8a2ee9172261d663e458c212a6a25ce5211f3a98bcb2d55f8141111a33a29f2d6a465f660bc87fbc345827e0a00fd7a587009b55c4d5586040fe2989b6874ac3 SHA512 f2a75a0c4bed202f83e54ff1b19dea5b6c022ed18ba88d97340d5edbe0111aec6c8195498f965270648647d0df47338e68c5f7e16a00926319991b840f765750
-EBUILD awl-0.60.ebuild 668 BLAKE2B a98565e479487e42120e291b259bde5dc4e1d400e4507be90c333071be50d921c702beb69ad36c92d24c6c11de1d96d41a93b1d35c216ced93c3cd68b97c10bc SHA512 c8d4b18179bc08a2e90e1538d58330f71f88edccde18ee3756a7d133b607e65d9cea8344f4610cda3660dc3739dd4981414f38eaf0740f681ceeaaeec47ea7a6
+DIST awl-0.61.tar.xz 124340 BLAKE2B af5d9c063280c93deb55929acf4826b6ba003676a15fcda48019a2a7788d8913d20a05c4aae98f2345d931b8f593bd32622a033fe421b55d0c687b10c7e1be05 SHA512 3492512ec04e523a30562d49aac1be617a2cee80fa363b0fbf13b25b44818a4c85af018193f79a6442419b1f7022cd7ec417e3c34641eb8096750441dcbd22bc
+EBUILD awl-0.61.ebuild 668 BLAKE2B c88023c6ead521c77705cf27d516c4b6db7fa6340da7933cc3b399acba382324237d026be97c5df4d8f2e5720ac3747f0a486aa1d862688df66a6729cc30e10f SHA512 0a094638b648624915c7f56ea957c2500becd5664e9dc383b5c5e685e4ec2b0780594990cfbb2e0f712ff577c151a2d9e85845839c9cd90814fcb85f886e39d0
 MISC metadata.xml 607 BLAKE2B 7dbb1cbff742ad363e2ceba2259f44ca5de4abf9d77b61fc6e67b427b9c065589f0bbdb9ef0c2a998c0fa5d2dceccc37b9f9f07b9abea983e961ca9c32e3860d SHA512 329e26d79c646dee99fb39942b7f3e4c754fbee5b747d1575537c5b177ac6d0cbc6711a468630d6f15d0b31fd531c75b1b7237dbb54249ffff3ac8b63a53dc84
diff --git a/dev-php/awl/awl-0.59.ebuild b/dev-php/awl/awl-0.59.ebuild
deleted file mode 100644
index bc69ce04890d..000000000000
--- a/dev-php/awl/awl-0.59.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Andrew McMillan's Web Libraries"
-HOMEPAGE="https://gitlab.com/davical-project/awl"
-SRC_URI="https://www.davical.org/downloads/${PN}_${PV}.orig.tar.xz -> ${P}.tar.xz"
-
-LICENSE="GPL-2 GPL-2+ GPL-3+ LGPL-2+ LGPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? ( dev-php/phpunit )"
-RDEPEND="dev-lang/php:*[pdo,postgres,xml]"
-
-S="${WORKDIR}"
-
-src_compile() {
-	:
-}
-
-src_test() {
-	phpunit tests/ || die "test suite failed"
-}
-
-src_install() {
-	einstalldocs
-	insinto /usr/share/php/${PN}
-	doins -r dba inc
-}
diff --git a/dev-php/awl/awl-0.60.ebuild b/dev-php/awl/awl-0.61.ebuild
index ab257406be35..52ae69f3df6a 100644
--- a/dev-php/awl/awl-0.60.ebuild
+++ b/dev-php/awl/awl-0.61.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/dev-php/composer/Manifest b/dev-php/composer/Manifest
index 80729ef9b811..0f8969306dff 100644
--- a/dev-php/composer/Manifest
+++ b/dev-php/composer/Manifest
@@ -1,6 +1,8 @@
 AUX autoload-r1.php 973 BLAKE2B d01d694be6f50af0e995dc24da1545b666609ce0098b4206a1843b249fedcbf983f1826a3158e98ad7cfe675057b12fe52ff82b6b66e2d582ccf983b929c2f90 SHA512 06f9e2862521c54b765f55fe1c1e02728befd296916d0f41357d4e6004f2d00ddaa533ed5210e92e4642eb548a2d5fabf80604fc09ef7e871742716f4c02d112
 DIST composer-1.10.1.tar.gz 421852 BLAKE2B a40f59ab0af5eba777f1926bab78e55fd1973e53b324eec73fdca70678fc1cfe6f892790a61a66dbdbe07caa03343bfd109318daec99c2c18707785c6bf149e0 SHA512 ebc3ee48bf0d2597e7221e9ac0ab7188e7a99096d5dacdee4176b4c7b4d252d079c117b5bd9131ff38d8963f95930fa9c83fa51ed542d4f7d58276561de1f2b8
+DIST composer-1.10.5.tar.gz 423065 BLAKE2B 0c8595f3583a692f89294455984aeff2ad9cbf2a39541355cbb736e717baacae8245fa81e6b9fde11dd5bb56ad3a074262f6f8ecb65b4bef9c782ef39887deec SHA512 cdadb2d146afcc140316b83d3b4f4c018d79e8222f6a6207cdd52db75ae9c78e787a509d88a3fe113f8218df2ace56ba2dd043e1b6e6c3dbb5129fd51d8e9925
 DIST composer-1.9.3.tar.gz 412212 BLAKE2B fc293a38baaf87cc2581304e1438d48e94a85ca2c5da4eff388b1307dadacb67327d9612211af70f1734872c7a377b8713492839c2d330c9e0e7226206cdc1f6 SHA512 42a37b2187895e06f2dc8c5225a1328377afc408ad28af12d9ef5d15fe083dcf22459ce0f482abfd528683113af5f9fd1a19758294c59c69b59a5bb32e65f2cc
 EBUILD composer-1.10.1.ebuild 1232 BLAKE2B 584b0a2251e7f63a1bdc9d5c32524690d4dabe7668220fdf8678c0fc8749044334db0b5d39385e8fc181b3c25ec3d955e7dc73f9e0d2bde5d27724b4566fedee SHA512 597a47db43a02071beec253a84b1c548ccba8c6e9604a538055a6de268bba0e0c87b04dae897c15d95a807730c789ad6a15a4eb6b6eb0a850ea94571f7de73ac
+EBUILD composer-1.10.5.ebuild 1232 BLAKE2B 584b0a2251e7f63a1bdc9d5c32524690d4dabe7668220fdf8678c0fc8749044334db0b5d39385e8fc181b3c25ec3d955e7dc73f9e0d2bde5d27724b4566fedee SHA512 597a47db43a02071beec253a84b1c548ccba8c6e9604a538055a6de268bba0e0c87b04dae897c15d95a807730c789ad6a15a4eb6b6eb0a850ea94571f7de73ac
 EBUILD composer-1.9.3.ebuild 1232 BLAKE2B 584b0a2251e7f63a1bdc9d5c32524690d4dabe7668220fdf8678c0fc8749044334db0b5d39385e8fc181b3c25ec3d955e7dc73f9e0d2bde5d27724b4566fedee SHA512 597a47db43a02071beec253a84b1c548ccba8c6e9604a538055a6de268bba0e0c87b04dae897c15d95a807730c789ad6a15a4eb6b6eb0a850ea94571f7de73ac
 MISC metadata.xml 774 BLAKE2B 8a1f75c0c7da6f0d193a981c6db3888d62e2223b6368c4a7dece62ae33cc9a2a8c0b34714170462f262569954e70cc9b976012ff864ccfa36a46da3c719169ae SHA512 1a17bfae65923a3bea593c57d7ecf4fb2aeef43d0537636105e52294de295cbfeaed4b3c36ffb8675a563f657f4f969e62096cee20b9ab178c962acf2f68ac3a
diff --git a/dev-php/composer/composer-1.10.5.ebuild b/dev-php/composer/composer-1.10.5.ebuild
new file mode 100644
index 000000000000..29915836e3cf
--- /dev/null
+++ b/dev-php/composer/composer-1.10.5.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2020 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="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( 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/pecl-redis/Manifest b/dev-php/pecl-redis/Manifest
index 2dbfc5c4e1ba..2354e1c6fab5 100644
--- a/dev-php/pecl-redis/Manifest
+++ b/dev-php/pecl-redis/Manifest
@@ -3,9 +3,11 @@ DIST redis-4.2.0.tgz 235569 BLAKE2B 14089171b9654affeb8c2b3861a698a3ba8d6ac23523
 DIST redis-4.3.0.tgz 241883 BLAKE2B 3f3ef7f67ba1167cb031e6816ee9f90d24eecc002064720e68a65bf8db16b0f826c90a5f3b7bed771f535aca8cbc9b62654fa2c234a42af8168baf0315a25c17 SHA512 30ce5863540485463704e6f90cff3a8d1f5bda34360c987e848ab290c8240f323b6eb2df1e90cc4c0922b3413652132d937488943f5db4e242c460c592da54ca
 DIST redis-5.0.2.tgz 243270 BLAKE2B 5c01dc23d5c86f407bddd6a54455f37427a5cae3786e393afc34fae23771062cae9cbe1b55a3c0578b5ecc1ada97328f63fe10e8e91af8fcd0f4b275850f0b50 SHA512 ea5601a520a95443abf5b2f17516ffe047ce50df721519a82b68124b9a406d52628697b486e37cd1ea2798a5ddce82549a516835a9d348925adedbdf5ef2d2b0
 DIST redis-5.1.1.tgz 245205 BLAKE2B b7177be5282b081562a446b1b37c7b46ba0ef382e55f27989d5586346a10f842d050ee46e881e480ea6b768e1259458df565d02193eda13a95704cd5455c1ca2 SHA512 eb6aa538d2ae4115634fd5841e3ccccf788cad13b99e0485fb2af43def85e93328012e5cef66d1be4bdd494be6f68de329a066e41b710e434f94f3ed3401bfee
+DIST redis-5.2.1.tgz 251570 BLAKE2B 297d6130469735a53f6dfb6ffea8c7c813363099eb76f25619f0cbb05cd06f5ecad9c0f30c370e33985523cf26488cf133aa0a48a99075bc6d5796309e3d914d SHA512 de90bf65cce0cb8c5ea28415e4f7bfff23c8bb3dc96ddca3158f94be2e4bd051e13ec3f34429b0e8ceb436096520e3998f544f377d5ef7d4d1df4edba7f66bc2
 EBUILD pecl-redis-3.1.6-r1.ebuild 1502 BLAKE2B d9560e8026436626eb730d8bdf8e74847d47aeba0fc4b22e81b1d5647ba1b80bab258d2e3d963bb6903a02de2f49e1d37ea9b3619cade7802d1e914bc9cd515c SHA512 663cf82f078677db0e59843f6c71b706145f67123e65454f16e8ccace80e762445ed877d2c33163daf834fecc9c5cca912863aba52637ded68d0b3a7414a25f8
 EBUILD pecl-redis-4.2.0.ebuild 1748 BLAKE2B 096523340747ea170d8e91350093de309b4b578fbca901f309258f5ba04e921d3b8c2d7ab2384504e5c6c47aa3e271a9cb5237498e1f6b3760aa3bfacff7212c SHA512 ff386f1d8483ccd28aa06e553271c3adfaf09f96e961171441c6a9756c01908451d8ce1bd317b43af89bc0450746fbaf10eb67cc8183a2e1575e1ff845f7c593
 EBUILD pecl-redis-4.3.0.ebuild 1639 BLAKE2B 6d826f43adc0f6d8eb33b138586f522f02be28ba3f454009e0a85ba401b0dedfc1d92b882a573b6edfd9f0004c2e17faa5ac4406865660eccfde5adc0e3263c9 SHA512 7f18e631bb8b9db06806bb22825ae7e9120c84b73fe68980cbe5f1c479de0f6c0149316447f3234e0953789aabeec5ef00cc1bd7f710be5d0631f0070f28a13e
 EBUILD pecl-redis-5.0.2.ebuild 1289 BLAKE2B e2d46465d021c42039ccf1a630ce734b8e56fa777ab2139db35b3a91ecb6b45a1a06294bb24ab2bc874aaf959aa5387704baf0c22f7f8100a8f4ee05abd23d00 SHA512 f88f09308838ce1b9ad0cd582935833c1a968ab87517db8a0027e607f2ec658ba75558bdd9f2a0b7b7a7ff2fbb9eb3e3252c64ebeb8f6d1483655a3b221c4d51
 EBUILD pecl-redis-5.1.1.ebuild 1289 BLAKE2B e2d46465d021c42039ccf1a630ce734b8e56fa777ab2139db35b3a91ecb6b45a1a06294bb24ab2bc874aaf959aa5387704baf0c22f7f8100a8f4ee05abd23d00 SHA512 f88f09308838ce1b9ad0cd582935833c1a968ab87517db8a0027e607f2ec658ba75558bdd9f2a0b7b7a7ff2fbb9eb3e3252c64ebeb8f6d1483655a3b221c4d51
+EBUILD pecl-redis-5.2.1.ebuild 1262 BLAKE2B d29de451a8f863b87a77a356f52b781c94fd448c3ba1e4ab5c74a35e0d977d64a70412fc2b51f7e2267eda03dd2e886d1faa11bb4fe5bdf186682052f3b7b52b SHA512 1d975f3afc197a779295686e9645f24dd82611e326e1c89c387f3dcc8ce20f32cf68ebd5d2fe2f8451329c7d6c655ee998cd602ba0821227319ff84c85f705a0
 MISC metadata.xml 383 BLAKE2B b7a47896565db2f132479963a5479262864421a8388bd262ba9aa8eb6445e0d351478530475b5dba12cc9cbbc33089a904f9945816d3009c75f09dcea9c4cfdc SHA512 da5c3918a6652f1f3ae58a5bcd2c5eb3308d764df1a14bae1658f5f2022ee364b6cd288c4a3c700cf27b70b2f967f66668c17ea9850fc48910005310d16125b0
diff --git a/dev-php/pecl-redis/pecl-redis-5.2.1.ebuild b/dev-php/pecl-redis/pecl-redis-5.2.1.ebuild
new file mode 100644
index 000000000000..ec5cd6b371d3
--- /dev/null
+++ b/dev-php/pecl-redis/pecl-redis-5.2.1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PHP_EXT_NAME="redis"
+USE_PHP="php7-2 php7-3 php7-4"
+PHP_EXT_NEEDED_USE="json?,session?"
+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 +json +session"
+
+DEPEND="
+	igbinary? ( >=dev-php/igbinary-3.0.1-r1[php_targets_php7-2?,php_targets_php7-3?,php_targets_php7-4?] )
+"
+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 json redis-json)
+		$(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
+}