gentoo auto-resync : 17:08:2023 - 09:31:54

3 files changed, 49 insertions, 1 deletions

diff --git a/app-admin/drush/Manifest b/app-admin/drush/Manifest
index c51df6567f8f..c86ce5c3f0ed 100644
--- a/app-admin/drush/Manifest
+++ b/app-admin/drush/Manifest
@@ -1,9 +1,10 @@
 AUX array-syntax.patch 2166 BLAKE2B 40c40456ea5f2deacb4f83f74abdb58300a1fd03f93544e05d0e4e58ec266422d5b2cffa0652b49022a6096801d8506779e2da5f11cabfbc2e15fb36f1a78fe1 SHA512 8fb8e243b885a40490b0e55a12e65639879e6adae60f2784e6c960338c9e842bb480d9d18d83c1dd834b8114c37c59a4709881936895faf0c3262878de62414a
+AUX drush-6.7.0-batch-signature-fix.patch 1545 BLAKE2B a23c3f57fc3dfeec789019734cc294435a09abfaa66f0ec860efa6ce9eaec82d950e6f15afce870e4009cb895e7e6f4936bde07937fc2996f6a49d0550325a13 SHA512 22507ad189429a14af6a2b6344bb9c803b4536f55b25c3ecf68be47f69eedb45953b25e574b9b03ed43b7f0b600c3f0db116b7f14c0c130cd73008b38d27d4f1
 AUX drush-6.7.0-dont-pass-null-to-strtoupper.patch 1076 BLAKE2B 3f2335b9d84e95705f38830d692902db9e460686e5b619840dc83116774a0fe5a7389bfe11cc213e2fcad398000a3b13d4c7cfba3c194d0df95d334fffad2b5f SHA512 5f506583a025f989d027519d5b64014274ddd69065890cc1ae3db1f89959b021dae849a25b9a35885f92b4e6ceb137990d13e0d1c0f7b0eb1b60bfac281ab008
 AUX drush-6.7.0-gzip-mime.patch 775 BLAKE2B 6ed1f540ecff96f798c6dedb97da136b8f43e46bc5696f8aeedaab2419641880d161562ea04b44cc565bb76a693bf1ac9183d1efefbe1d744977381b45be8a3d SHA512 67002c5653301823b9b8efee4c0c00ef0dda9ca05f516eb13d5a9b82dc5837c28c59fea038f881c90e0313bbcd30ff434d58a1736b00c6be73b8da3c46a9291d
 AUX drush-6.7.0-php8.0.patch 3341 BLAKE2B 681c7bef6f7007e52767c4429015791a8ceb1bbc3ca80c7a8a924e880b811433e67485e5211368dbf89f2f03400f960e06395d64fb67d6fbcb8d85a1c0ce08d1 SHA512 73d74911945a1e74c2ef361e0f1cf89656356062fdcb4c1f36ac9a07d7f62bd29488283fcbffbb2f41700a9a89f6273d8203052fbcadada48bb2002a098a64d4
 AUX update-bash-completion-script-for-2.1.patch 1332 BLAKE2B a54fa2cab268542a37f1020012cf7744106966419d2ba8415a2e2ead882feb3f3dc9bd9b1ab17f8592e5d021855f5361b05304efcc810362224935069ef1b897 SHA512 2e19a6be652684c1b1a2a9d6605c1404272391950408cd6ae964b2bdd9f95b1e59deec5111c1eaa563a92837ea394fcb2315a3032b2ab02996509b98eb7d1cf0
 DIST drush-6.7.0.tar.gz 511581 BLAKE2B d3a589e3de35afe120d790f96ffa7e88b530da1e1d04815b1dea2f05cd081ad7dc6f4b39fa6f19b5620b9913b952ab289ec538f1b7c0c0f298d3cd0129eb7026 SHA512 203870190dd8987ad3da71f7625476c1f94bc75513447a740fd8c16268fb9705bcbc3b2bffc49a44045998e3fa49fd5ee9d4c0634a1fb39605ba8e10b7373fa5
 EBUILD drush-6.7.0-r4.ebuild 1731 BLAKE2B 209588f8a0e5a2ec602600d8a5d10e465517230f102a7ab3af0753561469c2ad1fd06ca48dd06be0c18e79ef9f95c65a1bc142ce66adf7333606c08085a947d3 SHA512 492a35026e2c3e781c082a17e2a3d15fbad235bb5ed56bc50f98b501fb7c8f97efd0b98a807257fcbe0d0b420504a5ddeeef67339592dac7f49ad9a78defe0eb
-EBUILD drush-6.7.0-r5.ebuild 1788 BLAKE2B 2a7658b577625606c8cfeda4034e28ff52add96e2db8012d9afcf2092adae9924902ed921f6fc6fb8e3bca27b1ff7b3b9c642c220862dfa6269efc20c5f82286 SHA512 4bf2da1a45cdb1176d37fed7a953462f3a9d63d0e3d036d84fa03c728ab68cf3bed5b522c80aa8ccbedbb32b91e1a48d1a4ac45901dae359d3623c993c2d494e
+EBUILD drush-6.7.0-r6.ebuild 1834 BLAKE2B 63823d3a978773f3d91ad4c3591f8d7b5f301b83bab07caf140db30ba767e45c6273a1ecd707c090f5fa2cbaf20dd2e3cec76ba363956ebf49a71854c4575263 SHA512 c00eb1447ba68c748946dc68e8f24b9fc848b65fefe598684713ce007db211f2675ed285ea0402e29ec7ff7d4e69b4e884be16869a057bfd22e6ad2427f909dd
 MISC metadata.xml 532 BLAKE2B c6ca539149d500608519aa982f4a3ef7f8e15b472d5140b8569371df6585c9f80ea57d7802fee00267bfe76290f2b9836be20250472bd261500fd5de84b974f7 SHA512 ec95e30855e93d1d04eac73b3dcf538c2ab38fbeb44acb7f3f7f3c3c04af9a5adba7dc96181cc02f136ffd901e22aab362dadef70aa9f84b0dde78a70bd36716
diff --git a/app-admin/drush/drush-6.7.0-r5.ebuild b/app-admin/drush/drush-6.7.0-r6.ebuild
index a4f2be23bf54..88c5b8c4ab9b 100644
--- a/app-admin/drush/drush-6.7.0-r5.ebuild
+++ b/app-admin/drush/drush-6.7.0-r6.ebuild
@@ -24,6 +24,7 @@ PATCHES=(
 	"${FILESDIR}/${P}-php8.0.patch"
 	"${FILESDIR}/${P}-gzip-mime.patch"
 	"${FILESDIR}/${P}-dont-pass-null-to-strtoupper.patch"
+	"${FILESDIR}/${P}-batch-signature-fix.patch"
 )
 
 src_prepare() {
diff --git a/app-admin/drush/files/drush-6.7.0-batch-signature-fix.patch b/app-admin/drush/files/drush-6.7.0-batch-signature-fix.patch
new file mode 100644
index 000000000000..8d5aa74fed46
--- /dev/null
+++ b/app-admin/drush/files/drush-6.7.0-batch-signature-fix.patch
@@ -0,0 +1,46 @@
+From 31d7a945230eaf1f8ab94d5f782619434f7f2b8c Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky <michael@orlitzky.com>
+Date: Wed, 16 Aug 2023 21:21:39 -0400
+Subject: [PATCH 1/1] includes/batch.inc: synchronize sub and superclass
+ parameter names
+
+The DrushBatchContext class overrides the offsetSet() method of its
+superclass, ArrayObject, but changes the first parameter's name from
+$key to $name. This makes php-8.1 unhappy:
+
+  Error: Return type of DrushBatchContext::offsetSet($name, $value)
+  should either be compatible with ArrayObject::offsetSet(mixed $key,
+  mixed $value): void, or the #[\ReturnTypeWillChange] attribute should
+  be used to temporarily suppress the notice in .../batch.inc, line 37
+
+Renaming the parameter to $key throughout the function fixes the issue.
+---
+ includes/batch.inc | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/includes/batch.inc b/includes/batch.inc
+index dd4adc9..785f411 100644
+--- a/includes/batch.inc
++++ b/includes/batch.inc
+@@ -34,14 +34,14 @@
+  * @see _drush_batch_worker().
+  */
+ class DrushBatchContext extends ArrayObject {
+-  function offsetSet($name, $value) {
+-    if ($name == 'message') {
++  function offsetSet($key, $value) {
++    if ($key == 'message') {
+       drush_log(strip_tags($value), 'ok');
+     }
+-    elseif ($name == 'error_message') {
++    elseif ($key == 'error_message') {
+       drush_set_error('DRUSH_BATCH_ERROR', strip_tags($value));
+     }
+-    parent::offsetSet($name, $value);
++    parent::offsetSet($key, $value);
+   }
+ }
+ 
+-- 
+2.41.0
+