gentoo resync : 31.05.2021

9 files changed, 124 insertions, 8 deletions

diff --git a/dev-php/Manifest.gz b/dev-php/Manifest.gz
index 0c11bbaa2e02..5b5207df1702 100644
--- a/dev-php/Manifest.gz
+++ b/dev-php/Manifest.gz
diff --git a/dev-php/composer/Manifest b/dev-php/composer/Manifest
index e6fd9e8c76e2..58d04d790311 100644
--- a/dev-php/composer/Manifest
+++ b/dev-php/composer/Manifest
@@ -2,6 +2,8 @@ AUX autoload-r1.php 973 BLAKE2B d01d694be6f50af0e995dc24da1545b666609ce0098b4206
 AUX autoload.php.tpl 253 BLAKE2B 421f8bd3aa659c6add54e46094ee1d8806ab4fd33ee915515fbe94d241b6a1d5f222b85a720733c5e48369f3a737d5696cf4f8343df7fe809b3a7e4ec38854a1 SHA512 0cfa3e377406d7eada27c56c50b57943b096ea35ec23b2bfe1c926bc4eb276151578d3cfbfa28c76b3358875db35b9e2460204d50571da2d3df6d9a665514da9
 DIST composer-1.10.22.tar.gz 429521 BLAKE2B da7a340b63fd2540886e0fe9252a115bffdfdddfb9cc5063b296fa4026275390641a761260597f9f4421bfcde62c5f8c9fd4757e41a8278ff0063f905d3a5b50 SHA512 e1a9e22d3e0673a0bbdbc4a97a330e15ce2b6b9e81a6bfc97a6d5918713d02fc414a36393e8760830418d9bde0664cbbcd8e454d6c6be14db585565a3eeb452b
 DIST composer-2.0.13.tar.gz 497819 BLAKE2B ab51556ff65b0c2822d5419bb6dde2c775c91ed210af6ab84f272db0ea823866d75090173663d517cd36163bbe04ce06f597c670fce45b595716baaf05253d8e SHA512 b16425e0553f69c23e636cc51711e2e433125ac55a29d21c66eead4b40080379449868810e9b443996e3959feae2be6ed9c9a100bc5e3f84d210654dd160887f
+DIST composer-2.0.14.tar.gz 498661 BLAKE2B 0b454ed6a00b5cab169a4ff82e9a3d7ceb0d885bd1fe8f70ed495bc28e13a93f477c24df7d9510d0611941addc894d914b6856ef823762f0aeb596fef9332526 SHA512 7eb87f8454d38a091bf97ad470c41f6d1b82bc153618312093935d2b7b5890bf3d1eba25f9bd8e46c5f8ae462729e85ea19eb03184a4484332694a6369a82917
 EBUILD composer-1.10.22.ebuild 1233 BLAKE2B 8ca659735c9256070bdf634a96eb790a23ef4a5f6e9bc1c4d488d2082d97d87a043b8becc944f9e33479516b40c29b2ddd93c7fe4219c1a3b143c333464b160d SHA512 5cf952c3bda93befd1a77ed5330905f3be8bddb254cdb3d52c6ea6c24eba0bfd32cb936fbbbe18e18dcdf1362b5e423b45f47346f1fd5e5192753c66f51e00e6
 EBUILD composer-2.0.13.ebuild 2228 BLAKE2B f12244d8bada90f5ebd47e5c4d4b706c48153e6f56948103bf17e6ebd6fdbc44056e97ad67bd4fd423bcce9fba03584369c9025d3ed936f8ba1c1bca14a79b7a SHA512 8eee72c7edfd358f0dbb69c334d3df62dd3e0c1d74ac17ef49ca53655934ef5ae6e6c1a4d2263e766afcb0204eb72cd886ca9f1a0ad5e825d41a7eb38243d344
+EBUILD composer-2.0.14.ebuild 2228 BLAKE2B befd0486765faf001bcf4f2cb98ceea1d4535ceb142e6bca6ded35413a5e8c42009850e902b49fe59418b69e76e5043f0d7f585a2a61888b98d9e82edf80a0b9 SHA512 e007b668692c68b321be874639cf77366d81172b1314e316f04e785e4ba9e065785d95509d24624eadab38ee8ce154ec0f5797438a7b7dfc59fc85dac092f5a6
 MISC metadata.xml 804 BLAKE2B 7d5f809e3017ddb3836c494f03798eabd9f604ba6987ee1c0b6a21b0b6697e7142557f03b066e7b236c9330cf8505a87c906591fd571545294b70f3b70f2377f SHA512 cada8e3b771827502011a1f074082ef7193b014b7ac2e1efe3f17e6fc126d712e64afa0ec6177e8c0d37681d5d57daa04637e89cb10a783c6278c58606e12ab5
diff --git a/dev-php/composer/composer-2.0.14.ebuild b/dev-php/composer/composer-2.0.14.ebuild
new file mode 100644
index 000000000000..a86e72a98bc0
--- /dev/null
+++ b/dev-php/composer/composer-2.0.14.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2021 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"
+
+BDEPEND="dev-php/theseer-Autoload"
+
+RDEPEND="dev-lang/php:*[curl]
+	>=dev-php/ca-bundle-1.0
+	dev-php/fedora-autoloader
+	>=dev-php/jsonlint-1.4
+	>=dev-php/json-schema-5.2.10
+	>=dev-php/metadata-minifier-1.0
+	>=dev-php/phar-utils-1.0
+	>=dev-php/psr-log-1.0
+	>=dev-php/reactphp-promise-2.7
+	>=dev-php/semver-3.0
+	>=dev-php/spdx-licenses-1.2
+	>=dev-php/symfony-console-2.8.52
+	>=dev-php/symfony-filesystem-2.8.52
+	>=dev-php/symfony-finder-2.8.52
+	>=dev-php/symfony-process-2.8.52
+	>=dev-php/xdebug-handler-2"
+
+src_prepare() {
+	default
+
+	mkdir vendor || die
+
+	phpab \
+		--output vendor/autoload.php \
+		--template "${FILESDIR}"/autoload.php.tpl \
+		--basedir src \
+		src \
+		|| die
+
+	cat >> vendor/autoload.php <<EOF || die "failed to extend autoload.php"
+
+// Dependencies
+\Fedora\Autoloader\Dependencies::required([
+	'/usr/share/php/Composer/CaBundle/autoload.php',
+	'/usr/share/php/Composer/MetadataMinifier/autoload.php',
+	'/usr/share/php/Composer/Semver/autoload.php',
+	'/usr/share/php/Composer/Spdx/autoload.php',
+	'/usr/share/php/Composer/XdebugHandler/autoload.php',
+	'/usr/share/php/JsonSchema/autoload.php',
+	'/usr/share/php/Psr/Log/autoload.php',
+	'/usr/share/php/Seld/JsonLint/autoload.php',
+	'/usr/share/php/Seld/PharUtils/autoload.php',
+	'/usr/share/php/Symfony/Component/Console/autoload.php',
+	'/usr/share/php/Symfony/Component/Filesystem/autoload.php',
+	'/usr/share/php/Symfony/Component/Finder/autoload.php',
+	'/usr/share/php/Symfony/Component/Process/autoload.php',
+	'/usr/share/php/React/Promise/autoload.php'
+]);
+EOF
+}
+
+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 LICENSE res src vendor
+
+	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/libvirt-php/Manifest b/dev-php/libvirt-php/Manifest
index e6adcd784f60..22a2d87bfd4c 100644
--- a/dev-php/libvirt-php/Manifest
+++ b/dev-php/libvirt-php/Manifest
@@ -1,7 +1,7 @@
 AUX remove-imagick-check.patch 331 BLAKE2B 2d9c164055c3f54baf259326abe22d5aa478141df7f6ea05ba33f040701947038490c1898e89a7019cc1e41008fde5cb43c338730ef7ec3020f5005edd612d9c SHA512 1e949f8c704a2e6b541a276b8cb53e9cf09f009dadc01f4f50ad02e92258cfe30130b2d22b811e0b5b07e1bad4023fad05040c6031bd0063999212c2d6483bcf
 DIST libvirt-php-0.5.4.tar.gz 780793 BLAKE2B 8bb4577c26cc0ef8f2a0ae813ade7f5fdea9a2a7d70c97cab1033fde21d9a1c27b8c2ad7a8284096e143e955202bb564767b4d7e1a4bb9e15993895adc119288 SHA512 b5b204549e6810668203d1df8404a5cb71f646ae7e01ea223c6e9b9eec9b1f6500cc5bb4559859959d821a213ff992f22a97e4b683da2c683be3732710943487
 DIST libvirt-php-0.5.5.tar.gz 761250 BLAKE2B 9899d2f0e5ea387333decce5071afc81d4160d54ef570dcbe04422dc3e93479ee57520f9bf33a0275ee86cd4b1c87e5a3f7d5118e0cd87658faed44d2ccd4807 SHA512 2ea263561a0bf5d155314e06dcf3c3b5c278640bc5edfa674cdd777cb6d0810bda0492c6cf77a02bc88fb6aa99b0ff1f0cbaeea87ff2e45bff9b5774a2507684
-EBUILD libvirt-php-0.5.4.ebuild 1430 BLAKE2B 03a918a8f68b1a6cdbb0b5947497c6af1c8d94de78bd92c6444e57acd7b47a48c6faf4e4d4e0e6737659c8b5276c378fae8d710537031f0c9a3b620fece3de8e SHA512 73025d7466fc468dc74154ead58ddd8149e4c8d0dd8358512a565ddddfe873e16ba066ce943a4a8e383e15f90a6700242ab9ee4e73fc82d828e9667fc154bb01
-EBUILD libvirt-php-0.5.5.ebuild 1521 BLAKE2B f4061f4f4477921b1cb2f39c7957bf2be76707fbca6ce2e3512b6195793358fc3acb014ee94c819b4fd2a2bdaabcd2f4b7477ed397cce9e200d3c2db59125d29 SHA512 19b18cb7aae218b2072beefb6506e8ab82d6434c1c3d09ad9a24b678d96d11f31db5fff9fcd3c6529dd24bebd81715bb01c3a8903d9573ced05909e2a3e9216f
-EBUILD libvirt-php-9999.ebuild 1474 BLAKE2B 8d3ec9a0bae7ee4f3af1e26985417d074a45c95e46ed9fc79df54f8433f12b5b6be6f5f36fc665ce4e78dd2a8eac0bf4865622601d6aa249bc6ac3b61796db63 SHA512 373f79c2c63638eb7464c8bb63d4d6ad4fa8ecb853921fae5e321b77d27fef23bbfa7508b1b22cce43807fc2a2c6c264c6b6c834275f871e854dba71b8683a4f
+EBUILD libvirt-php-0.5.4-r1.ebuild 1412 BLAKE2B 7787eae4d938017a3ceb98835d90a2124952fc89b6160a97a6756d48d59495aae5e91846a63dc47915ae7fcf4c4cc16557147abfa3a60171248543e5ec738a89 SHA512 48964a88b87317f4c0af513793266862e2a0476f2ad29857e34688321554c63d19017811c24af8431e4021dbbfaee8151c61996fce7eabea90165ea9b111b7dc
+EBUILD libvirt-php-0.5.5-r1.ebuild 1503 BLAKE2B 6a5e46742e68f5f39b9d048f363416c479a83ee8d28ea9f22b3402628c08d5e4dfad0dc7031e475bed834a66b885850f69ffd3fb27d3c538589a0ccb84220373 SHA512 f68900a360319de263359ed32eed3670bc4e3994eef470417d832607549da44d43cec7269f3198bce7af9bc91ffc5f94c0904c026b6436f4661bbbe8ee5da7d0
+EBUILD libvirt-php-9999.ebuild 1456 BLAKE2B 290b01dd35b344f164a34fbc650f18d77ffc4a81856e5f9725b39169c676ed3405e840b327ffa6ca4be1638e5e0ff2a7d32ec2bad9ba5ca213fae7d32c08139e SHA512 91567d8f0938c3f023a47f5f8d0b9c66c15314bdda2b7bde3b44a91ebbfcf76ddf5c0dc25f1c071fc484723697729d23a33913f72560a3cb0d85146841ac29aa
 MISC metadata.xml 371 BLAKE2B a19266222702c53095b36860a4be3dcacd9808273258ec4819f23fd792226d7c3b667e169c69b91419defd64569fc4c9f2e8bf9fb69361fb68bfb5945467a897 SHA512 0d2df32d913253928112d928dbccbb42b19bb62e6d76334966f87fc6df8378a2cda0b057df17bd565976006da61c9fd3a30425b153852c8389557fe85dd3115b
diff --git a/dev-php/libvirt-php/libvirt-php-0.5.4.ebuild b/dev-php/libvirt-php/libvirt-php-0.5.4-r1.ebuild
index 70b89e90a22c..cc5be73d2db7 100644
--- a/dev-php/libvirt-php/libvirt-php-0.5.4.ebuild
+++ b/dev-php/libvirt-php/libvirt-php-0.5.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -43,6 +43,7 @@ src_unpack() {
 
 src_prepare() {
 	php-ext-source-r3_src_prepare
+
 	local slot
 	for slot in $(php_get_slots); do
 		php_init_slot_env "${slot}"
@@ -57,10 +58,12 @@ src_install() {
 		insinto "${EXT_DIR}"
 		doins "src/.libs/${PHP_EXT_NAME}.so"
 	done
+
 	php-ext-source-r3_createinifiles
 	einstalldocs
+
 	if use doc ; then
-		docinto /usr/share/doc/${PF}/html
+		docinto html
 		dodoc -r docs/*
 	fi
 }
diff --git a/dev-php/libvirt-php/libvirt-php-0.5.5.ebuild b/dev-php/libvirt-php/libvirt-php-0.5.5-r1.ebuild
index df9088443f65..093337c9e3c3 100644
--- a/dev-php/libvirt-php/libvirt-php-0.5.5.ebuild
+++ b/dev-php/libvirt-php/libvirt-php-0.5.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -43,6 +43,7 @@ src_unpack() {
 
 src_prepare() {
 	php-ext-source-r3_src_prepare
+
 	local slot
 	for slot in $(php_get_slots); do
 		php_init_slot_env "${slot}"
@@ -62,10 +63,12 @@ src_install() {
 		insinto "${EXT_DIR}"
 		doins "src/.libs/${PHP_EXT_NAME}.so"
 	done
+
 	php-ext-source-r3_createinifiles
 	einstalldocs
+
 	if use doc ; then
-		docinto /usr/share/doc/${PF}/html
+		docinto html
 		dodoc -r docs/*
 	fi
 }
diff --git a/dev-php/libvirt-php/libvirt-php-9999.ebuild b/dev-php/libvirt-php/libvirt-php-9999.ebuild
index 395c151a9cef..0d75a2ce62a7 100644
--- a/dev-php/libvirt-php/libvirt-php-9999.ebuild
+++ b/dev-php/libvirt-php/libvirt-php-9999.ebuild
@@ -41,6 +41,7 @@ src_unpack() {
 
 src_prepare() {
 	php-ext-source-r3_src_prepare
+
 	local slot
 	for slot in $(php_get_slots); do
 		php_init_slot_env "${slot}"
@@ -55,10 +56,12 @@ src_install() {
 		insinto "${EXT_DIR}"
 		doins "src/.libs/${PHP_EXT_NAME}.so"
 	done
+
 	php-ext-source-r3_createinifiles
 	einstalldocs
+
 	if use doc ; then
-		docinto /usr/share/doc/${PF}/html
+		docinto html
 		dodoc -r docs/*
 	fi
 }
diff --git a/dev-php/xdebug-handler/Manifest b/dev-php/xdebug-handler/Manifest
index 76f89c9510f3..bebe86fd7791 100644
--- a/dev-php/xdebug-handler/Manifest
+++ b/dev-php/xdebug-handler/Manifest
@@ -1,4 +1,6 @@
 AUX autoload.php 273 BLAKE2B e898a6f52339faf4a22f81207bef6a9c8620e5756b30c462f420f8b6c865ee7af33f3d23e7b251e096f25882310789da5e2f50e064ab614d59eede463befc26a SHA512 a7a63031a709deaaa2cc8a673f22252df716fd7e2d531e6207052dc3acb361cb8384e7456b949e19e00753b9693fdd0d7c65e6105c7f32d86b8800b4373ab57d
 DIST xdebug-handler-1.4.3.tar.gz 13660 BLAKE2B 2edbd2755102ced0183e6d7ade341ed830b4c1d923f453868d29f39aa7de5159758fd162a369246adf4551a8a06c0bc6f1a29921369e47ba645f9aed2707a5b3 SHA512 ed92ca769276e66611de3cf9d44a03fd163516b973486ac5339dfe9cd9fbab8fb5f754799f59505f03aa5eb4ad175e804c6e61d0a5db63a558edf7ef1aff438c
+DIST xdebug-handler-2.0.1.tar.gz 14212 BLAKE2B 01200a86794145132a4c8d1b851a3131d73c23ca33d27fa9da26988f48a6c0df3552322f8fad0559ac00adf1605f35a65aa21591bc221d239ad2d8cbf4c303cd SHA512 6cc1d336a82f1edf6fb9dd317d0275c79754eb7a01fa34e0cc85c24b0a02363ccb2ff42e8b692d90077745f4db8409e7e66bef64f30a89b364eff71a4af7f4f1
 EBUILD xdebug-handler-1.4.3.ebuild 581 BLAKE2B f3d38d96a7fdad9b32d04042d87c1ec35eafc5404a0f1f17fcce7212aa3db9e4f1750584cca044680da2887224f51bffab3235bf49a17eb181f88a8a7a3a4091 SHA512 4f07479ea7beebdcc6b28ff6a145a19c103f28e51caabbf311a9ad8eeb8bd34fc54b3f0ae13b32febe4ad9d2b07ea6374fd68d13f22e684051836eda15683333
+EBUILD xdebug-handler-2.0.1.ebuild 583 BLAKE2B 401593cd32d8d83bcd72dbc8c294e0f2c65d20abb7c0fd47395ab36283da5edf45be1d6431864aa96f2a10b0f7fcd4ca8f2c0d6debb9ce71ddc90fe9df34265f SHA512 e741bd7c3a359f9dafe07a4851fa89e7f58486af7ebb02254b0f8510f50f7b3846f6b5e3e322057d21d512a5d87e2600e9ff4bb86ad3816bd1dbd95323432b8b
 MISC metadata.xml 506 BLAKE2B 157d7956eb9b73d81fa1ce8a11ef4dd47823dbbf90e1b14faac17b5e8ac4123bcc2251853a2734d78b2bdee40fcd48b12965fbc4e944aaf9f08505f7b46fbe19 SHA512 357e0451d64f922af8c28a37ab95c9004c3b2eef8c2a2f1fbc767b30b40e38103e9bb51f71d6039e043cf702d44d528885ed5345d7ced0fff93c118166eb447a
diff --git a/dev-php/xdebug-handler/xdebug-handler-2.0.1.ebuild b/dev-php/xdebug-handler/xdebug-handler-2.0.1.ebuild
new file mode 100644
index 000000000000..ad9f7604ad52
--- /dev/null
+++ b/dev-php/xdebug-handler/xdebug-handler-2.0.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Restart a CLI process without loading the xdebug extension"
+HOMEPAGE="https://github.com/composer/xdebug-handler"
+SRC_URI="https://github.com/composer/xdebug-handler/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-lang/php:*
+	dev-php/fedora-autoloader
+	>=dev-php/psr-log-1.0.2"
+
+src_install() {
+	insinto /usr/share/php/Composer/XdebugHandler
+	doins src/*.php "${FILESDIR}/autoload.php"
+	dodoc README.md
+}