gentoo auto-resync : 27:09:2022 - 09:09:50

4 files changed, 183 insertions, 0 deletions

diff --git a/app-admin/drush/Manifest b/app-admin/drush/Manifest
index 4a204ac4b134..0bc4b51b6282 100644
--- a/app-admin/drush/Manifest
+++ b/app-admin/drush/Manifest
@@ -1,5 +1,8 @@
 AUX array-syntax.patch 2166 BLAKE2B 40c40456ea5f2deacb4f83f74abdb58300a1fd03f93544e05d0e4e58ec266422d5b2cffa0652b49022a6096801d8506779e2da5f11cabfbc2e15fb36f1a78fe1 SHA512 8fb8e243b885a40490b0e55a12e65639879e6adae60f2784e6c960338c9e842bb480d9d18d83c1dd834b8114c37c59a4709881936895faf0c3262878de62414a
+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-r3.ebuild 1662 BLAKE2B 0751cb188decdb40fdadb7262e76f64dd4714969280d6c86fffa244da69548a231f80410db736fe02d9642d6e3af2f865c708d2c6a7d8596e6d11688a4897546 SHA512 9d679410746ed141b629e4aea2af3ef847062740dc8a7825bc0803f42f117f362309e8741f0dea904ae0d115ac6adc8e5cd0488dd71b90ebc6650f04fbf78820
+EBUILD drush-6.7.0-r4.ebuild 1733 BLAKE2B 97f38bdd2d65cef49d74f05fda5d3aa235cd0caf75665c0fbd1b6b759a10413c4e2a2dc40b710007e1b257d692c7791fe67a596e9837e28315cfc7811e22260a SHA512 a3fe8e7f3eeaae6d8e93d9851b5343d06ba4452e5e2f1e8c79fce8240315b8638101e6c80cd72edc05989a7caf53b1387431804c26314b39c5d145b43c7a0605
 MISC metadata.xml 532 BLAKE2B c6ca539149d500608519aa982f4a3ef7f8e15b472d5140b8569371df6585c9f80ea57d7802fee00267bfe76290f2b9836be20250472bd261500fd5de84b974f7 SHA512 ec95e30855e93d1d04eac73b3dcf538c2ab38fbeb44acb7f3f7f3c3c04af9a5adba7dc96181cc02f136ffd901e22aab362dadef70aa9f84b0dde78a70bd36716
diff --git a/app-admin/drush/drush-6.7.0-r4.ebuild b/app-admin/drush/drush-6.7.0-r4.ebuild
new file mode 100644
index 000000000000..06b318dd0663
--- /dev/null
+++ b/app-admin/drush/drush-6.7.0-r4.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit bash-completion-r1
+
+DESCRIPTION="Command line shell and scripting interface for Drupal"
+HOMEPAGE="https://github.com/drush-ops/drush"
+SRC_URI="https://github.com/drush-ops/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="dev-lang/php[cli,ctype,json(+),simplexml]
+	dev-php/PEAR-Console_Table"
+
+PATCHES=(
+	"${FILESDIR}/update-bash-completion-script-for-2.1.patch"
+	"${FILESDIR}/array-syntax.patch"
+	"${FILESDIR}/${P}-php8.0.patch"
+	"${FILESDIR}/${P}-gzip-mime.patch"
+)
+
+src_prepare() {
+	default
+
+	# dodoc compresses all of the documentation, so we fix the filenames
+	# in a few places.
+	#
+	# First, the README location in bootstrap.inc.
+	sed -i -e \
+		"s!/share/doc/drush!/share/doc/${PF}!" \
+		-e "s!README\.md!\0.bz2!g" \
+		includes/bootstrap.inc || die
+
+	# Next, the list of documentation in docs.drush.inc. Note that
+	# html files don't get compressed.
+	sed -i \
+		-e "s!\.bashrc'!.bashrc.bz2'!" \
+		-e "s!\.inc'!.inc.bz2'!" \
+		-e "s!\.ini'!.ini.bz2'!" \
+		-e "s!\.md'!.md.bz2'!" \
+		-e "s!\.php'!.php.bz2'!" \
+		-e "s!\.script'!.script.bz2'!" \
+		-e "s!\.txt'!.txt.bz2'!" \
+		commands/core/docs.drush.inc || die
+}
+
+src_install() {
+	# Always install the examples; they're referenced within the source
+	# code and too difficult to exorcise.
+	dodoc -r README.md docs examples
+
+	insinto /usr/share/drush
+	doins -r classes commands includes lib misc
+	doins drush_logo-black.png drush.info drush.php
+
+	exeinto /usr/share/drush
+	doexe drush
+	dosym ../share/drush/drush /usr/bin/drush
+
+	keepdir /etc/drush
+	newbashcomp drush.complete.sh drush
+}
diff --git a/app-admin/drush/files/drush-6.7.0-gzip-mime.patch b/app-admin/drush/files/drush-6.7.0-gzip-mime.patch
new file mode 100644
index 000000000000..53601c80fbda
--- /dev/null
+++ b/app-admin/drush/files/drush-6.7.0-gzip-mime.patch
@@ -0,0 +1,25 @@
+From 48a16a67ec072428339cc165743fedab6264edfe Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky <michael@orlitzky.com>
+Date: Mon, 26 Sep 2022 20:01:41 -0400
+Subject: [PATCH 1/4] includes/drush.inc: support application/gzip MIME type.
+
+This type is actually registered, as opposed to application/x-gzip.
+---
+ includes/drush.inc | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/includes/drush.inc b/includes/drush.inc
+index f869b37..a748a0c 100644
+--- a/includes/drush.inc
++++ b/includes/drush.inc
+@@ -930,6 +930,7 @@ function drush_file_is_tarball($path) {
+   $content_type = drush_mime_content_type($path);
+   $supported = array(
+     'application/x-bzip2',
++    'application/gzip',
+     'application/x-gzip',
+     'application/x-tar',
+     'application/x-zip',
+-- 
+2.35.1
+
diff --git a/app-admin/drush/files/drush-6.7.0-php8.0.patch b/app-admin/drush/files/drush-6.7.0-php8.0.patch
new file mode 100644
index 000000000000..33a4ee7ba98b
--- /dev/null
+++ b/app-admin/drush/files/drush-6.7.0-php8.0.patch
@@ -0,0 +1,87 @@
+From 7be49f4d78111372fc58d91132daf6c4230b08ba Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky <michael@orlitzky.com>
+Date: Mon, 26 Sep 2022 19:08:09 -0400
+Subject: [PATCH 1/3] includes/drush.inc: replace create_function() with
+ function(){...}
+
+---
+ includes/drush.inc | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/includes/drush.inc b/includes/drush.inc
+index a748a0c..7b8dda3 100644
+--- a/includes/drush.inc
++++ b/includes/drush.inc
+@@ -987,9 +987,9 @@ function drush_tarball_extract($path, $destination = FALSE, $listing = FALSE, $t
+       // Remove the header line.
+       array_shift($output);
+       // Remove the prefix verb from each line.
+-      $output = array_map(create_function('$str', 'return substr($str, strpos($str, ":") + 3 + ' . strlen($destination) . ');'), $output);
++      $output = array_map(function($str){ return substr($str, strpos($str, ":") + 3 + strlen($destination)) ; }, $output);
+       // Remove any remaining blank lines.
+-      $return = array_filter($output, create_function('$str', 'return $str != "";'));
++      $return = array_filter($output, function($str){return $str != "";});
+     }
+   }
+   // Otherwise we have a possibly-compressed Tar file.
+-- 
+2.35.1
+
+From f118117814ef690ec71f484dc3c4906f82d9c726 Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky <michael@orlitzky.com>
+Date: Mon, 26 Sep 2022 19:32:13 -0400
+Subject: [PATCH 2/3] includes/backend.inc: replace usage of each().
+
+---
+ includes/backend.inc | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/includes/backend.inc b/includes/backend.inc
+index d004850..0ca010d 100644
+--- a/includes/backend.inc
++++ b/includes/backend.inc
+@@ -355,8 +355,8 @@ function _drush_backend_proc_open($cmds, $process_limit, $context = NULL) {
+     if (count($cmds) && (count($open_processes) < $process_limit)) {
+       // Pop the site and command (key / value) from the cmds array
+       end($cmds);
+-      list($site, $cmd) = each($cmds);
+-      unset($cmds[$site]);
++      $site = key($cmds);
++      $cmd = array_pop($cmds);
+ 
+       if (is_array($cmd)) {
+         $c = $cmd['cmd'];
+-- 
+2.35.1
+
+From 7d718639b68bd09c262005cff133d24ffdf800f1 Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky <michael@orlitzky.com>
+Date: Mon, 26 Sep 2022 19:36:29 -0400
+Subject: [PATCH 3/3] includes/environment.inc: default fifth parameter in
+ error handler.
+
+The fifth parameter was removed in php-8.0:
+
+  https://www.php.net/manual/en/function.set-error-handler.php
+
+We now default it to the empty array in drush_error_handler().
+---
+ includes/environment.inc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/includes/environment.inc b/includes/environment.inc
+index 7837104..8f2f414 100644
+--- a/includes/environment.inc
++++ b/includes/environment.inc
+@@ -24,7 +24,7 @@ define('CONSOLE_TABLE_BASE_URL', 'https://github.com/RobLoach/Console_Table/arch
+  * Log PHP errors to the Drush log. This is in effect until Drupal's error
+  * handler takes over.
+  */
+-function drush_error_handler($errno, $message, $filename, $line, $context) {
++function drush_error_handler($errno, $message, $filename, $line, $context=[]) {
+   // E_DEPRECATED was added in PHP 5.3. Drupal 6 will not fix all the
+   // deprecated errors, but suppresses them. So we suppress them as well.
+   if (defined('E_DEPRECATED')) {
+-- 
+2.35.1
+